sale-client 3.6.310 → 3.6.311-wenxi-2

package/build/dev-server.js

@@ -11,7 +11,7 @@ var devConfig = {
     publicPath: baseConfig.output.publicPath,
     historyApiFallback: true,
     host: '127.0.0.1',
-    port: 8089,
+    port: 8087,
     open: false,
     stats: {
       colors: false, // 配置控制台输出彩色日志

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "3.6.310",
+  "version": "3.6.311-wenxi-2",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {

package/src/components/FilesManage/UserEssentialInfoTest.vue

@@ -245,7 +245,7 @@
           </div>
           <div class="col-sm-4 form-group" v-if="getConfigShowItem('f_reminder_amount')"
                v-show="(formconfig && formconfig.f_reminder_amount && formconfig.f_reminder_amount.required) || !onlyshowmust"
-               :class="[$v.f_reminder_amount.required ? 'has-error' : '']">
+               :class="[$v.f_reminder_amount.required ? 'has-error' : '']" title="余额小于该值后，微信公众号或短信推送余额不足提醒">
             <label for="f_reminder_amount" :style="{color: baseinfo.base.f_reminder_amount === null || baseinfo.base.f_reminder_amount === '' ? 'red' : null}" class="font_normal_body">{{getConfigLabelName('f_reminder_amount','提示金额')}}</label>
             <input type="number" v-model="baseinfo.base.f_reminder_amount" class="input_search" style="width:60%"
                    v-validate:f_reminder_amount=getConfigValidate("f_reminder_amount",false)
@@ -471,7 +471,7 @@
     },
     watch: {
       'baseinfo.base.f_userinfo_id' (val) {
-        if (this.baseinfo.base.f_reminder_amount === null) {
+        if (this.baseinfo.base.f_reminder_amount === null && this.formconfig.f_reminder_amount.required) {
           this.$showAlert('当前用户还未设置余额提示金额，请在提示金额字段进行设置', 'warning', 3000)
         }
       },

package/src/components/revenue/Common/LimitGas.vue

@@ -144,16 +144,16 @@
           f_limit_times: '',
           f_time_value: '0',
           f_limit_type: '气量',
-          f_limit_style:'',
+          f_limit_style: '',
           f_limit_value: '',
           f_limit_amount: '',
           f_start_date: this.$login.toStandardDateString()
         },
         limitshow: false,
-        thirdPays: [{label: '支持', value: '1'},{label: '不支持', value: '0'}],
-        timeTypes: [{label: '按月', value: '按月'},{label: '按日', value: '按日'}],
-        limitTypes: [{label: '气量', value: '气量'},{label: '金额', value: '金额'}],
-        limitstyle: [{label: '按次数', value: '按次数'},{label: '按总量', value: '按总量'}]
+        thirdPays: [{label: '包含', value: '1'}, {label: '不包含', value: '0'}, {label: '仅第三方', value: '-1'}],
+        timeTypes: [{label: '按月', value: '按月'}, {label: '按日', value: '按日'}],
+        limitTypes: [{label: '气量', value: '气量'}, {label: '金额', value: '金额'}],
+        limitstyle: [{label: '按次数', value: '按次数'}, {label: '按总量', value: '按总量'}]
       }
     },
     props: ['show', 'f_price_id', 'f_userinfo_id'],
@@ -214,7 +214,7 @@
           f_limit_times: '',
           f_time_value: '',
           f_limit_type: '气量',
-          f_limit_style:'',
+          f_limit_style: '',
           f_limit_value: 0,
           f_limit_amount: 0,
           f_start_date: this.$login.toStandardDateString()

package/src/filiale/wenxi/CardHand.vue

@@ -320,7 +320,30 @@
                 {{row.f_hand_date}}
               </div></td>
             <td style="text-align: center;">{{row.f_last_hand_date}}</td>
-            <td style="text-align: center;">{{row.f_last_tablebase}}</td>
+<!--            <td style="text-align: center;">{{row.f_last_tablebase}}</td>-->
+            <td style="text-align: center;">
+              <!--              民用-->
+              <div v-if="!(row.f_user_type==='非民用')">
+                {{ row.f_last_tablebase }}
+              </div>
+              <!--              非民用、未抄表、states!=0-->
+              <div v-if="row.f_user_type==='非民用' && row.f_meter_state === '未抄表' && row.states !== 0 && ($parent.$parent.$parent.inputType==='rw' && $index+1===$parent.$parent.$parent.inputIndex)">
+                <input type="text" class="form-control" v-model="row.f_last_tablebase"
+                       @blur="$parent.$parent.$parent.enter(row)"
+                       v-next-el="{id: $index+1}" :id="$index" style="width: 100px;padding: 6px;"
+                       :disabled="row.state === '开始'"
+                       @change="$parent.$parent.$parent.inputType='ro'"
+                       @focus="$parent.$parent.$parent.clearError(row)">
+              </div>
+              <div v-if="row.f_user_type==='非民用' && row.f_meter_state === '未抄表' && row.states !== 0 && $parent.$parent.$parent.inputType!=='rw'">
+                {{ row.f_last_tablebase }}
+              </div>
+              <!--              非民用、未抄表、states=0-->
+              <div v-if="row.f_user_type==='非民用' && (row.f_meter_state !== '未抄表' || row.states === 0)">
+                {{ row.f_last_tablebase }}
+              </div>
+
+            </td>
             <td style="text-align: center;">
               <div class="form-group" style="margin-bottom:0px;" :class="{
 						'has-success has-feedback': row.f_tablebase ? ((row.f_last_tablebase-0) <= (row.f_tablebase -0)) : false,
@@ -359,7 +382,7 @@
             </td>
 
 
-            <td style="text-align: center;">{{row.f_actualtablebase}}</td>
+            <td style="text-align: center;">{{row.f_tablebase - row.f_last_tablebase}}</td>
             <td style="text-align: center;">
               <div class="form-group" style="margin-bottom:0px;"
                    v-if="row.f_meter_state === '未抄表' ">
@@ -473,10 +496,17 @@
                  <button type="button" name="button" class="btn btn-link"
                          @click.stop="$parent.$parent.$parent.nopass(row)"
                          v-if="row.f_meter_state === '待审核' && $parent.$parent.$parent.jurisdiction.includes('审核权限')">不通过</button>-->
-              <button type="button" name="button" class="button_search button_spacing width-60" title="权限名称:(卡表抄表冲正)"
-                      @click.stop="$parent.$parent.$parent.cardhandCenter(row)"
-                      v-if="row.f_meter_state === '已抄表'">冲正
-              </button>
+              <nobr>
+                <button type="button" name="button" class="button_search button_spacing width-60" title="权限名称:(卡表抄表冲正)"
+                        @click.stop="$parent.$parent.$parent.cardhandCenter(row)"
+                        v-if="row.f_meter_state === '已抄表'">冲正
+                </button>
+                <button type="button" name="button" class="button_search button_spacing width-60" title="替换表抄表"
+                        @click.stop="$parent.$parent.$parent.changeInput(row,$index+1)"
+                        v-if="row.f_user_type==='非民用' && row.f_meter_state === '未抄表' && row.states !== 0">
+                  替换表抄表
+                </button>
+              </nobr>
             </td>
             <td><span title="{{row.f_card_reason}}" v-if="row.f_card_reason !== ''">{{row.f_card_reason.substring(0,5)}} ...</span>
             </td>
@@ -596,7 +626,10 @@ import {HttpResetClass, PagedList} from 'vue-client'
           dep: [],
           user: []
         },
-        orgCondtionStr: ''
+        orgCondtionStr: '',
+        inputType: 'ro',
+        inputIndex: -1,
+        f_cardhand_type: null,
       }
     },
     ready () {
@@ -757,6 +790,7 @@ import {HttpResetClass, PagedList} from 'vue-client'
           row.f_user_id = row.f_user_id + ''
           // 余气量=累购-(本期指数-表初始指数)
           // row.f_shengyu_gas = (row.f_total_gas - (row.f_tablebase - row.f_initial_base)).toFixed(2)
+          row.f_cardhand_type = this.f_cardhand_type
           console.log('录入完毕。。', row)
           this.$resetpost('rs/logic/cardhands', row, {resolveMsg: null, rejectMsg: '录入数据出错!!!'}).then((res) => {
             console.log('返回数据', res)
@@ -769,6 +803,7 @@ import {HttpResetClass, PagedList} from 'vue-client'
         } else {
 
         }
+        this.f_cardhand_type = null
       },
       batchAudit () {
         // 批量审核
@@ -799,6 +834,11 @@ import {HttpResetClass, PagedList} from 'vue-client'
       nopass (row) {
         co(modifyGen(this, row, 'rs/logic/cardhandnopass'))
       },
+      changeInput(row,num){
+        this.inputType = 'rw'
+        this.inputIndex = num
+        this.f_cardhand_type='替换表抄表'
+      },
       cardhandCenter (row) {
         // let load = new HttpResetClass()
         // load.load('POST', 'rs/logic/Correct', {data: row}, {warnMsg: null, resolveMsg: null})

package/src/filiale/wenxi/cardsHand.vue

@@ -327,17 +327,23 @@
               </div>
             </td>
             <td style="text-align: center;">
+              <!--              民用-->
               <div v-if="!(row.f_user_type==='非民用')">
                 {{ row.f_last_tablebase }}
               </div>
-              <div v-if="row.f_user_type==='非民用' && row.f_meter_state === '未抄表' && row.states !== 0">
+              <!--              非民用、未抄表、states!=0-->
+              <div v-if="row.f_user_type==='非民用' && row.f_meter_state === '未抄表' && row.states !== 0 && ($parent.$parent.$parent.inputType==='rw' && $index+1===$parent.$parent.$parent.inputIndex)">
                 <input type="text" class="form-control" v-model="row.f_last_tablebase"
                        @blur="$parent.$parent.$parent.enter(row)"
                        v-next-el="{id: $index+1}" :id="$index" style="width: 100px;padding: 6px;"
                        :disabled="row.state === '开始'"
-                       @change="row.f_card_reason = '替换表抄表'"
+                       @change="$parent.$parent.$parent.inputType='ro'"
                        @focus="$parent.$parent.$parent.clearError(row)">
               </div>
+              <div v-if="row.f_user_type==='非民用' && row.f_meter_state === '未抄表' && row.states !== 0 && $parent.$parent.$parent.inputType!=='rw'">
+                {{ row.f_last_tablebase }}
+              </div>
+              <!--              非民用、未抄表、states=0-->
               <div v-if="row.f_user_type==='非民用' && (row.f_meter_state !== '未抄表' || row.states === 0)">
                 {{ row.f_last_tablebase }}
               </div>
@@ -464,10 +470,17 @@
                  <button type="button" name="button" class="btn btn-link"
                          @click.stop="$parent.$parent.$parent.nopass(row)"
                          v-if="row.f_meter_state === '待审核' && $parent.$parent.$parent.jurisdiction.includes('审核权限')">不通过</button>-->
-              <button type="button" name="button" class="button_search button_spacing width-60" title="权限名称:(卡表抄表冲正)"
-                      @click.stop="$parent.$parent.$parent.cardhandCenter(row)"
-                      v-if="row.f_meter_state === '已抄表'">冲正
-              </button>
+              <nobr>
+                <button type="button" name="button" class="button_search button_spacing width-60" title="权限名称:(卡表抄表冲正)"
+                        @click.stop="$parent.$parent.$parent.cardhandCenter(row)"
+                        v-if="row.f_meter_state === '已抄表'">冲正
+                </button>
+                <button type="button" name="button" class="button_search button_spacing width-60" title="替换表抄表"
+                        @click.stop="$parent.$parent.$parent.changeInput(row,$index+1)"
+                        v-if="row.f_user_type==='非民用' && row.f_meter_state === '未抄表' && row.states !== 0">
+                  替换表抄表
+                </button>
+              </nobr>
             </td>
             <td><span title="{{row.f_card_reason}}"
                       v-if="row.f_card_reason">{{ row.f_card_reason.substring(0, 5) }} ...</span>
@@ -589,7 +602,10 @@ export default {
       initres: {
         org: [this.$login.f.orgid]
       },
-      orgCondtionStr: ''
+      orgCondtionStr: '',
+      inputType: 'ro',
+      inputIndex: -1,
+      f_cardhand_type: null,
     }
   },
   beforeDestroy () {
@@ -748,6 +764,7 @@ export default {
         row.f_total_fee = row.total_fee
         // 余气量=累购-(本期指数-表初始指数)
         row.f_shengyu_gas = (row.f_total_gas - (row.f_tablebase - row.f_initial_base)).toFixed(2)
+        row.f_cardhand_type = this.f_cardhand_type
         console.log('录入完毕。。', row)
         this.$resetpost('rs/logic/cardCommonEnter', row, {resolveMsg: null, rejectMsg: '录入数据出错!!!'}).then((res) => {
           console.log('返回数据', res)
@@ -760,6 +777,7 @@ export default {
       } else {
 
       }
+      this.f_cardhand_type = null
     },
     batchAudit () {
       // 批量审核
@@ -790,6 +808,11 @@ export default {
     nopass (row) {
       co(modifyGen(this, row, 'rs/logic/cardhandnopass'))
     },
+    changeInput(row,num){
+      this.inputType = 'rw'
+      this.inputIndex = num
+      this.f_cardhand_type='替换表抄表'
+    },
     cardhandCenter (row) {
       // let load = new HttpResetClass()
       // load.load('POST', 'rs/logic/Correct', {data: row}, {warnMsg: null, resolveMsg: null})

package/src/filiale/yangchun/CardMeterCenter.vue

@@ -225,6 +225,7 @@
         <div style="text-align:right; height: 25%">
           <strong style="color:red;margin-right: 5px">{{ $refs.givechange.promptText }}</strong>
           <strong style="font-size: large" v-if="!config.notShowFormula">计算公式:{{calculatedetail ? calculatedetail : ' 暂无'}}</strong><br/>
+          <strong style="font-size: large" v-if="deductdetail">{{deductdetail ? deductdetail : ' 暂无'}}</strong><br/>
           <payment-code-button :clickable="!$v.valid || validateOk || !islegal || clickConfirm|| model.f_preamount === 0"
                                :payment.sync="model.f_payment" :payment-data="paytype"
                                @confirm-payment="confirm()">
@@ -278,7 +279,13 @@
         self.model.f_pregas = Math.floor(getGas.data.gas - 0)
       }
     }
-    self.model.f_totalcost = ((self.row.f_balance - 0) >= (self.model.f_preamount - 0) ? 0 : (self.model.f_preamount - 0 - self.row.f_balance))
+    self.model.getDeduct = 0
+    // 计算抵扣包间费用抵扣金额
+    if (self.row.f_project_money && self.row.f_project_money > 0) {
+      self.model.getDeduct = (self.$CommonService.getDeduct(self.row, self.model.f_pregas) - 0)
+    }
+    // end
+    self.model.f_totalcost = ((self.row.f_balance - 0) >= ((self.model.f_preamount - 0) + self.model.getDeduct) ? 0 : ((self.model.f_preamount - 0) + self.model.getDeduct) - self.row.f_balance)
 
     self.model.chargeprice = getGas.data.chargeprice
     Object.assign(self.model, self.model, getGas.data)
@@ -290,7 +297,7 @@
       self.model.f_totalcost = ((self.model.f_totalcost - 0) - (self.dymoney - 0)).toFixed(self.row.f_fee_decimal || 4)
     }
     self.model.f_preamount = (calFee - (self.dymoney - 0)).toFixed(self.row.f_fee_decimal || 4)
-    self.calText(getGas.data.chargeprice)
+    self.calText(getGas.data.chargeprice, self.model.getDeduct)
   }
 
   // 输入气量，换算金额
@@ -303,8 +310,13 @@
     if ((self.model.f_pregas - 0) - (self.maxgas - 0) <= 0) {
       self.model.f_meter_type = self.row.f_meter_type
       let getAmount = await self.$CommonService.gasCalculate(self.model, self.model.f_pregas)
+      self.model.getDeduct = 0
+      // 计算抵扣包间费用抵扣金额
+      if (self.row.f_project_money && self.row.f_project_money > 0) {
+        self.model.getDeduct = (self.$CommonService.getDeduct(self.row, self.model.f_pregas) - 0)
+      }
       self.model.f_preamount = getAmount.data.chargenum.toFixed(self.row.f_fee_decimal || 4)
-      self.model.f_totalcost = ((self.row.f_balance - 0) > (getAmount.data.chargenum - 0) ? 0 : ((getAmount.data.chargenum - 0) - (self.row.f_balance - 0)).toFixed(self.row.f_fee_decimal || 4))
+      self.model.f_totalcost = ((self.row.f_balance - 0) > ((getAmount.data.chargenum - 0) + self.model.getDeduct - 0) ? 0 : (((getAmount.data.chargenum - 0) + self.model.getDeduct - 0) - (self.row.f_balance - 0)).toFixed(self.row.f_fee_decimal || 4))
       Object.assign(self.model, self.model, getAmount.data)
       self.model.chargeprice = getAmount.data.chargeprice
       if (self.model.f_payment == '赠气') {
@@ -316,7 +328,7 @@
           self.model.f_collection = Math.ceil(self.model.f_collection)
         }
       }
-      self.calText(getAmount.data.chargeprice)
+      self.calText(getAmount.data.chargeprice, self.model.getDeduct)
     }
   }
   // 执行保存逻辑
@@ -399,7 +411,7 @@
           }
         }
       } else {
-        self.$dispatch('success', '卡表收费')
+        self.$dispatch('success', '卡表收费', self.row)
       }
       self.clickConfirm = false
     } catch (error) {
@@ -495,7 +507,7 @@
             self.$dispatch('refresh', self.row)
           } else {
             self.$resetpost('rs/logic/writeCardAgin', getNoWriteCard.data[0], {resolveMsg: '重新写卡成功', rejectMsg: '重新写卡失败'})
-            self.$dispatch('success', '卡表收费')
+            self.$dispatch('success', '卡表收费', self.row)
           }
         } else {
           self.$dispatch('refresh', self.row)
@@ -547,9 +559,11 @@
           f_privilege_id: 0,
           f_privilege_money: 0,
           f_privilege_gas: 0,
-          f_after_discount: 0
+          f_after_discount: 0,
+          getDeduct: 0
         },
         calculatedetail: '',
+        deductdetail: '',
 
         // 启用发票管理需要对票号进行验证
         hasValidateBill: false,
@@ -677,7 +691,7 @@
       async calculatePreByCollection () {
         console.log('调用了')
         try {
-          // this.model.f_collection = (this.model.f_collection - 0)
+          this.model.f_collection = (this.model.f_collection - 0)
           let calFee = ((this.model.f_collection - 0) + (this.row.f_balance)).toFixed(4)
           // 通过收款进行划价
           let getGas = await this.$CommonService.feeCalculate(this.model, calFee)
@@ -687,7 +701,13 @@
           Object.assign(this.model, this.model, dymoney2.data)
           this.model.f_totalcost = ((this.row.f_balance - 0) > (dymoney2.data.chargenum - 0) ? 0 : ((dymoney2.data.chargenum - 0) - (this.row.f_balance - 0)).toFixed(this.row.f_fee_decimal || 4))
           this.model.f_preamount = dymoney2.data.chargenum
-          this.calText(dymoney2.data.chargeprice)
+          this.model.getDeduct = 0
+          if (this.row.f_project_money && this.row.f_project_money > 0) {
+            this.model.getDeduct = (this.$CommonService.getDeduct(this.row, this.model.f_pregas) - 0)
+            this.model.f_totalcost = this.model.f_totalcost + this.model.getDeduct
+            this.model.f_collection = this.model.f_collection + this.model.getDeduct
+          }
+          this.calText(dymoney2.data.chargeprice, this.model.getDeduct)
         } catch (error) {
           this.$showAlert(`发卡售气划价错误，错误类型：${error}`, 'danger', 0)
           this.$dispatch('error', '发卡售气', this.model, error)
@@ -805,7 +825,7 @@
           this.$dispatch('error', '发卡售气', this.model, error)
         }
       },
-      calText (val) {
+      calText (val, getDeduct = 0) {
         let str = ''
         let num = 0
         val.forEach((item) => {
@@ -818,6 +838,13 @@
             str = str + item.f_price + ' x ' + Math.floor(item.f_gas) + '+'
           }
         })
+        if (getDeduct > 0) {
+          if ((this.model.f_pregas * this.row.f_gas_type) > this.row.f_project_money) {
+            this.deductdetail = '当前未结金额' + this.row.f_project_money + '元，不足抵扣，以未结金额为准'
+          } else {
+            this.deductdetail = '未结金额计算公式:' + this.row.f_gas_type + ' x ' + this.model.f_pregas + '=' + getDeduct
+          }
+        }
         str = str.slice(0, str.length - 1)
         this.calculatedetail = str
         if (num > 1) {

package/src/main.js

@@ -3,7 +3,7 @@ import all from 'vue-client/src/all'
 import App from './App'
 import system from 'system-clients/src/system'
 import sale from './sale'
-import FilialeSale from './filiale/rongchuang/sale'
+import FilialeSale from './filiale/wenxi/sale'
 import address from 'address-client/src/address'
 import ldap from 'ldap-clients/src/ldap'
 import VueClipboard from 'vue-clipboard2'