sale-client 3.6.160 → 3.6.162

package/build/dev-server.js

@@ -1,5 +1,5 @@
 var path = require('path')
-const [ serverRul, localUrl ] = ['http://121.36.106.17:8400/', 'http://121.36.106.17:8400/']
+const [ serverRul, localUrl ] = ['http://140.249.18.101:8400/', 'http://140.249.18.101:8400/']
 var merge = require('webpack-merge')
 var baseConfig = require('./webpack.dev.conf')
 var devConfig = {

package/package.json

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

package/src/components/charge/ChargeManage.vue

@@ -225,6 +225,7 @@ export default {
       'row' (val) {
 
       },
+
       'success' (name, row, res) {
         this.setsustainMoney()
         // name === '发卡售气' ? this.$refs.list.toNext(this.index) : null
@@ -265,6 +266,9 @@ export default {
       'resflushrowdata' () {
         this.toBusiness(this.row)
       },
+      'resflushdata' (data) {
+        this.toBusiness(data)
+      },
       'refreshrow' (val) {
         console.log(val)
         this.row = val

package/src/components/charge/ChargeOper.vue

@@ -227,6 +227,18 @@ export default {
       // 发生换表成功
       getNewmetermsg(this, row)
     },
+    'toroute' (buttonObj, data) {
+      console.log('指定按钮。。', buttonObj)
+      this.$resetpost('rs/sql/sale_getUser', {
+        data: {condition: `i.f_userinfo_code='${data.f_userinfo_code}' and u.f_filialeid = '${data.f_filialeid}'`, orderitem: `f_userinfo_id Desc`}
+      }, {resolveMsg: null, rejectMsg: '获取用户信息失败'}).then((res)=>{
+        if (buttonObj) {
+          this.$dispatch('resflushdata', res.data[0])
+          this.styleChange(buttonObj.name)
+          this.$refs.route.init(buttonObj.value, {row: res.data[0]})
+        }
+      })
+    },
     'button-specifies'(buttonObj, data) {
       console.log('指定按钮。。', buttonObj)
       // buttonObj  格式：  {name:'机表收费', value: 'machine-meter-center'}

package/src/components/charge/business/IOTMeterCenter.vue

@@ -657,7 +657,6 @@
       // 校验发票信息
       checkInvoiceMsg (flag) {
         if (flag) return
-        if (this.config.quickSale) {
         // 校验是否超出最大透支余额
           if (this.model.f_payment == '系统余额透支') {
             const maxOverdraftBalance = -(((this.$appdata.getSingleValue('最大透支余额') - 0) || 1000) - 0)
@@ -684,7 +683,6 @@
             this.confirm()
           }
 
-        }
       },
       eticket_toggle () {
         this.eticket_show = false

package/src/components/common/userinfo_detail/ic_detail/PriceChangeQueryUser.vue

@@ -45,6 +45,7 @@
               <th><nobr>生效时间</nobr></th>
               <th><nobr>操作时间</nobr></th>
               <th><nobr>操作人</nobr></th>
+              <th><nobr>变更原因</nobr></th>
             </tr>
           </template>
           <template partial='body' partial='list' v-ref:grid>
@@ -58,6 +59,7 @@
               <td style="text-align:center"><nobr>{{row.f_perform_date}}</nobr></td>
               <td style="text-align:center"><nobr>{{row.f_operate_date}}</nobr></td>
               <td style="text-align:center"><nobr>{{row.f_operator}}</nobr></td>
+              <td style="text-align:center"><nobr>{{row.f_change_reason}}</nobr></td>
             </tr>
           </template>
           <template partial='foot'></template>

package/src/components/revenue/comprehen/StairPrice/GasPriceUser.vue

@@ -197,7 +197,12 @@
                 </div>
 
               </div>
-
+              <div class="row" style="margin-top: 2%">
+              <div class="col-sm-12 flex-row" v-if="newinfo.f_comments==='其他原因'">
+                <label class="control-label">其他原因</label>
+                <input type="text" class="input_search" style="width:80%" v-model="newinfo.f_other_comments" placeholder='其他原因' >
+              </div>
+              </div>
             </div>
           </form>
         </div>
@@ -236,6 +241,7 @@
           f_gasproperties: '',
           pricetype: '',
           pricename: '',
+          f_other_comments: '',
           f_comments: ''
         },
         oldinfo: {
@@ -312,6 +318,7 @@
         })
       },
       async modifyUser () {
+
         let rowdata = this.$refs.paged.$refs.grid.getRowData()
         if (rowdata.length === 0) {
           // 提示
@@ -340,7 +347,7 @@
           f_perform_date: this.newinfo.pricename[0].f_perform_date,
           f_stairprice_id: this.newinfo.pricename[0].id,
           // 修改原因
-          f_comments: this.newinfo.f_comments,
+          f_comments: this.newinfo.f_other_comments ? this.newinfo.f_other_comments:this.newinfo.f_comments,
           // 操作人组织机构信息
           f_operator: this.$login.f.name,
           f_operatorid: this.$login.f.id,
@@ -379,7 +386,7 @@
       },
       userTypeChange () {
         this.gasproperties = []
-        if (this.newinfo.f_user_type.length === 1) {
+        if (this.newinfo.f_user_type && this.newinfo.f_user_type.length === 1) {
           this.gasproperties = this.$appdata.getParam(this.newinfo.f_user_type[0])
         }
       },

package/src/filiale/qianneng/machine/MachineMeterCenter.vue

@@ -530,7 +530,7 @@ let asyncMachineMeterCenter = async function (self) {
         this.billData.bill = val.bill
       },
       printok () {
-        this.$dispatch('success')
+        this.$dispatch('refresh')
       },
       checkOverdue () {
         this.$nextTick(() => {

package/src/filiale/yuncheng/ChangeMeter.vue

@@ -864,12 +864,15 @@ export default {
             }
             this.$resetpost(url, {data: data}, {resolveMsg: '生成欠费成功', rejectMsg: '生成欠费失败'}).then((res) => {
               console.log('成功')
+              // this.$dispatch('resflushrowdata')
               if (this.row.f_meter_type.includes('物联网表')) {
-                this.$dispatch('refresh')
+                this.$dispatch('toroute', {name: '物联网表收费', value: 'iot-meter-center'}, this.row)
               } else {
-                this.$dispatch('resflushrowdata')
-                // this.$dispatch('button-specifies', {name: '机表收费', value: 'machine-charge'}, this.row)
+                this.$dispatch('toroute', {name: '机表收费', value: 'machine-charge'}, this.row)
               }
+              // if (this.row.f_meter_type.includes('机表')) {
+              //   this.$dispatch('button-specifies', {name: '机表收费', value: 'machine-charge'}, this.row)
+              // }
             })
           }
         })