sale-client 3.5.259 → 3.5.261

package/build/dev-server.js

@@ -8,6 +8,7 @@ var devConfig = {
     hot: true,
     publicPath: baseConfig.output.publicPath,
     historyApiFallback: true,
+    host: '127.0.0.1',
     port: 8089,
     open: true,
     stats: {
@@ -23,29 +24,6 @@ var devConfig = {
       '/rs/search': {
         target: serverRul
       },
-      '/rs/sql/sale_getUser': {
-        target: localUrl
-      },
-      '/rs/logic/chargeCancel': {
-        target: localUrl
-      },
-      '/rs/sql/gasCancel': {
-        target: localUrl
-      },
-
-      '/rs/logic/marginCharge': {
-        target: localUrl
-      },
-      '/rs/logic/sale_cardCharge_logic': {
-        target: localUrl
-      },
-
-      '/rs/logic/getOperBtns': {
-        target: localUrl
-      },
-      '/rs/logic/commonCal': {
-        target: localUrl
-      },
       // 查找资源服务数据
       '/rs/logic/getLogin': {
         target: serverRul

package/package.json

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

package/src/components/revenue/batchPreloads/batchPreloadsList.vue

@@ -57,6 +57,7 @@
           <th>用户姓名</th>
           <th>用气性质</th>
           <th>收费金额</th>
+          <th>付款方式</th>
           <th>收费时间</th>
           <th>记录状态</th>
           <th>生成记录人员</th>
@@ -70,6 +71,7 @@
         <td>{{ row.f_user_name }}</td>
         <td>{{ row.f_gasproperties }}</td>
         <td>{{ row.f_collection }}</td>
+        <td>{{ row.f_payment }}</td>
         <td>{{ row.f_operate_date }}</td>
         <td>{{ row.f_state }}</td>
         <td>{{ row.f_operator }}</td>
@@ -222,4 +224,11 @@ export default {
 }
 </script>
 <style lang="less" scoped>
+.table_sy {
+  tr {
+    td {
+      text-align: center;
+    }
+  }
+}
 </style>

package/src/filiale/shanxian/ChangeMeter.vue

@@ -552,16 +552,17 @@ export default {
     },
     async confirm () {
       let msg = ''
-      if (this.row.f_meter_type.includes('机表')) {
+      if (this.row.f_meter_type.includes('机表') || this.row.f_meter_type.includes('物联网表')) {
         if ((parseInt(this.model.f_using_base_old) > parseInt(this.row.f_meter_base))) {
-          msg = '该用户表底数大于上次抄表底数，请确定是否继续生成欠费记录'
+          msg = (this.row.f_meter_type === '机表' ? '该用户表底数大于上次抄表底数，请确定是否继续生成欠费记录' : '该用户表底数大于上次抄表底数，请确定是否进行结算')
         } else if (this.row.f_capacity && this.row.f_capacity > 0 && (parseInt(this.model.f_using_base_old) < parseInt(this.row.f_meter_base))) {
           msg = '该用户表底数大于上次抄表底数，且已超越最大量程，请确定是否继续生成欠费记录'
         }
       }
-      if (this.row.f_meter_type.includes('机表') && msg) {
+      if ((this.row.f_meter_type.includes('机表') || this.row.f_meter_type.includes('物联网表')) && msg) {
         this.$showMessage(msg, ['confirm', 'cancel']).then((res) => {
           if (res === 'confirm') {
+            let url = this.row.f_meter_type.includes('物联网表') ? 'rs/logic/changeMeterWebHand' : 'rs/logic/changeMeterHand'
             let data = {
               downDate: this.$login.toStandardTimeString(),
               startDate: this.$login.toStandardDateString(),
@@ -575,9 +576,10 @@ export default {
               f_serial_number: this.model.f_serial_number,
               f_meterbase: this.model.f_using_base_old,
               f_meter_brand: this.row.f_meter_brand,
+              f_meter_classify: this.row.f_meter_type,
               f_price_id: this.row.f_price_id
             }
-            this.$resetpost('rs/logic/changeMeterHand', {data: data}, {resolveMsg: '生成欠费成功', rejectMsg: '生成欠费失败'}).then((res) => {
+            this.$resetpost(url, {data: data}, {resolveMsg: '生成欠费成功', rejectMsg: '生成欠费失败'}).then((res) => {
               console.log('成功')
               if (this.model.metermessage.f_meter_type[0] != '机表') {
                 this.$dispatch('refresh')
@@ -721,16 +723,17 @@ export default {
         this.Iotjisuan()
       }
       let msg = ''
-      if (this.row.f_meter_type.includes('机表')) {
+      if (this.row.f_meter_type.includes('机表') || this.row.f_meter_type.includes('物联网表')) {
         if ((parseInt(this.model.f_using_base_old) > parseInt(this.row.f_meter_base))) {
-          msg = '该用户表底数大于上次抄表底数，请确定是否继续生成欠费记录'
+          msg = (this.row.f_meter_type === '机表' ? '该用户表底数大于上次抄表底数，请确定是否继续生成欠费记录' : '该用户表底数大于上次抄表底数，请确定是否进行结算')
         } else if (this.row.f_capacity && this.row.f_capacity > 0 && (parseInt(this.model.f_using_base_old) < parseInt(this.row.f_meter_base))) {
           msg = '该用户表底数大于上次抄表底数，且已超越最大量程，请确定是否继续生成欠费记录'
         }
       }
-      if (this.row.f_meter_type.includes('机表') && msg) {
+      if ((this.row.f_meter_type.includes('机表') || this.row.f_meter_type.includes('物联网表')) && msg) {
         this.$showMessage(msg, ['confirm', 'cancel']).then((res) => {
           if (res === 'confirm') {
+            let url = this.row.f_meter_type.includes('物联网表') ? 'rs/logic/changeMeterWebHand' : 'rs/logic/changeMeterHand'
             let data = {
               downDate: this.$login.toStandardTimeString(),
               startDate: this.$login.toStandardDateString(),
@@ -746,9 +749,13 @@ export default {
               f_meter_brand: this.row.f_meter_brand,
               f_price_id: this.row.f_price_id
             }
-            this.$resetpost('rs/logic/changeMeterHand', {data: data}, {resolveMsg: '生成欠费成功', rejectMsg: '生成欠费失败'}).then((res) => {
+            this.$resetpost(url, {data: data}, {resolveMsg: '生成欠费成功', rejectMsg: '生成欠费失败'}).then((res) => {
               console.log('成功')
-              this.$dispatch('button-specifies', {name: '机表收费', value: 'machine-charge'}, this.row)
+              if (this.row.f_meter_type.includes('物联网表')) {
+                this.$dispatch('refresh')
+              } else {
+                this.$dispatch('button-specifies', {name: '机表收费', value: 'machine-charge'}, this.row)
+              }
             })
           }
         })

package/src/filiale/wenxi/FilesManageNew/UserEssentialInfoTest.vue

@@ -249,7 +249,6 @@
         }
       },
       ready () {
-        console.log('f_filialeid222，，，', this.f_filialeid)
         getEditUserState(this)
         this.$resetValidation()
             // this.highMeterPlugin = new HighMeter(this,this.readIDCardCallback)

package/src/filiale/wenxi/UserGeneralInfoTest.vue

@@ -11,7 +11,7 @@
           <button class="button_search" style="width: max-content" @click="openBankAccount()" v-if="data.meterinfo[0].f_user_type[0] === '非民用' && ($login.r.includes('银行开户'))">银行开户</button>
         </div>
         <file-user-essential-info :usertype="row?row.f_user_type:null" :userphonelist="data.baseinfo.userphonelist" :baseinfo="data.baseinfo" :addressinfo="data.addressinfo" @valid="essentialInfo = true"
-                             :flag="flag" @invalid="essentialInfo = false" v-ref:useressential :isedit="isedit"></file-user-essential-info>
+                             :flag="2" @invalid="essentialInfo = false" v-ref:useressential :isedit="isedit"></file-user-essential-info>
         <file-userinfo-device :userinfodevices.sync="userinfodevices" :show_userinfodevices.sync="show_userinfodevices"
                                    :userinfoid='data.baseinfo.base.f_userinfo_id'></file-userinfo-device>
       </div>
@@ -224,9 +224,9 @@ export default {
     }
   },
   async ready () {
-    if (this.data.baseinfo.base.f_userinfo_id){
+    if (this.data.baseinfo.base.f_userinfo_id) {
       this.blodid = this.data.baseinfo.base.f_userinfo_id
-    }else {
+    } else {
       this.blodid = '临时id' + Date.now()
     }
     console.log('ready，，，', this.row)
@@ -237,7 +237,7 @@ export default {
             // 将小区信息转化为综合信息的格式
       await this.areainfoInUser(this.areainfo)
     }
-    console.log('this.blodid------------>',this.blodid)
+    console.log('this.blodid------------>', this.blodid)
   },
   watch: {
     async 'row' (val) {
@@ -339,6 +339,7 @@ export default {
       if (!this.filechangeDetailsShow) this.confirmation()
     },
     confirmation () {
+      debugger
       if (this.fileSaveData.reason && this.fileSaveData.reason !== '其他') {
         this.fileSaveData.modifyReason = this.fileSaveData.reason
       }
@@ -358,6 +359,13 @@ export default {
           this.fileSaveData.userinfo.userfiles.f_depid = parentnameId
         }
       }
+      console.log('打印保存数据', this.fileSaveData)
+      console.log('打印id', this.fileSaveData.userinfo.f_userinfo_id)
+      // 如果是修改操作则修改建党人
+      if (this.fileSaveData.userinfo.f_userinfo_id) {
+        this.fileSaveData.userinfo.f_createfile_person = this.$login.f.name
+      }
+      console.log('二次打印打印保存数据', this.fileSaveData)
       FileManageService.fileSave(this.fileSaveData).then((res) => {
         this.$parent.resdata = res.data.result[0].f_userinfo_code
         if (!this.row) {

package/src/filiale/yuansheng/MeterinfoTest.vue

@@ -44,14 +44,14 @@
             <input type="text" class="input_search" style="width:60%" v-model="row.f_table_state" placeholder='表具状态' disabled>
           </div>
           <div class="col-sm-4 form-group">
-            <label for="f_meter_base" class="font_normal_body">&ensp;表&ensp;读&ensp;数</label>
+            <label for="f_meter_base" class="font_normal_body">&ensp;表&ensp;底&ensp;数</label>
             <input type="number" class="input_search" style="width:60%" v-model="row.f_meter_base" placeholder='表底数'
-                   :disabled="!jurisdiction.includes('档案信息查询修改')" :readonly="!row.f_userfiles_id">
+                   :disabled="!jurisdiction.includes('档案信息查询修改')">
           </div>
           <div class="col-sm-4 form-group" title="涉及权限:【档案信息查询修改】">
             <label for="f_meter_base" class="font_normal_body">&ensp;初始底数</label>
             <input type="number" class="input_search" style="width:60%" v-model="row.f_initial_base" placeholder='表底数'
-                   :disabled="!jurisdiction.includes('档案信息查询修改')">
+                   :disabled="!jurisdiction.includes('档案信息查询修改')" :readonly="!row.f_userfiles_id">
           </div>
 
           <div class="col-sm-4 form-group" title="涉及权限:【档案信息查询修改】">

package/src/plugins/FileManageService.js

@@ -347,6 +347,7 @@ let FileManageService = {
     return {userinfo: result, address: address, limit_gas: data.limit_gas, hasnumber: data.hasnumber, inputcode: data.inputcode}
   },
   fileSave (data) {
+    data.userinfo.f_user_name = data.userinfo.f_user_name? data.userinfo.f_user_name.trim():null
     return Vue.resetpost('rs/logic/filemanage_fileSave', {data: data})
   },
   batchOperate (model, type) {