sale-client 3.6.315 → 3.6.316

package/package.json

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

package/src/components/revenue/comprehen/Maintenance/changeMeter/changemeterListMaintain.vue

@@ -145,7 +145,10 @@
                   <nobr>旧表具剩余金额</nobr>
                 </th>
                 <th>
-                  <nobr>备注</nobr>
+                  <nobr>换表原因</nobr>
+                </th>
+                <th>
+                  <nobr>其他备注</nobr>
                 </th>
                 <th>
                   <nobr>换表人</nobr>
@@ -206,6 +209,9 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_comments}}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_othereason}}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_change_operator}}</nobr>
               </td>
@@ -273,7 +279,8 @@ const myMap = new Map()
           'f_meter_brand': '新气表品牌',
           'f_remanent_gas': '旧表剩余补气量',
           'f_remanent_money': '旧表剩余金额',
-          'f_comments': '备注',
+          'f_comments': '换表原因',
+          'f_othereason': '其他备注',
           'f_change_operator': '换表人',
           'f_state': '状态',
           'f_operate_date': '换表日期',

package/src/components/revenue/comprehen/Maintenance/changeMeter/changemeterOperate.vue

@@ -152,16 +152,16 @@
         // 构建数组来存储对象
         editbank: true,
         recordList: [],
-        foperator:[],
+        foperator: [],
         changestate: [{label: '有效', value: '有效'}, {label: '无效', value: '无效'}],
         showfiles: false,
         // meterstate:[{label:'已抄',value:'已抄'},{label:'未抄',value:'未抄'}],
         // handstate:[{label:'有效',value:'有效'},{label:'冲正',value:'冲正'},{label:'作废',value:'作废'},{label:'待审核',value:'待审核'}],
         fileNameSet: {
-          // 'f_change_operator':'换表人',
-          'f_operate_date': '换表日期'
-          // 'f_changemeter_state':'换表状态',
-          // 'f_table_state':'旧表状态',
+          'f_change_operator': '换表人',
+          'f_operate_date': '换表日期',
+          'f_comments': '换表原因',
+          'f_othereason': '其他备注'
           // 'f_newtable_state':'新表状态'
         }
       }
@@ -227,7 +227,7 @@
             var car = {
               chinesename: this.fileNameSet[item],
               fieldname: item,
-              tablename: 't_changemeter',
+              tablename: 't_changetables',
               oldvalue: this.oldmodel[item],
               newvalue: this.model[item],
               state: '有效',
@@ -247,8 +247,23 @@
           }
         }
         await this.$resetpost('rs/logic/saveChangeMeterRecord', {data: {recordlist: this.recordList, newData: this.model}})
-        await this.$resetpost('rs/entity/t_changetables', this.model, {resolveMsg: '修改成功', rejectMsg: '未通过，修改出错!!!'})
-        console.log('this.model', this.model)
+        // let changetablesData = {
+        //   id: this.model.id,
+        //   f_change_operator: this.model.f_change_operator,
+        //   f_comments: this.model.f_comments,
+        //   f_othereason: this.model.f_othereason,
+        //   f_operate_date: this.model.f_operate_date
+        // }
+        let sqldata = `update t_changetables set
+            f_change_operator ='${this.model.f_change_operator}',
+            f_comments ='${this.model.f_comments}',
+            f_othereason ='${this.model.f_othereason}',
+            f_operate_date='${this.model.f_operate_date}'
+        where  id ='${this.model.id}'`
+        console.log('换表记录修正保存', sqldata)
+        await this.$resetpost('rs/logic/runSQL', {data: {sql: sqldata}}, {resolveMsg: null, rejectMsg: null})
+        // await this.$resetpost('rs/entity/t_changetables', changetablesData, {resolveMsg: '修改成功', rejectMsg: '未通过，修改出错!!!'})
+        // console.log('this.model', this.model)
         this.$dispatch('close')
       }
     },

package/src/components/revenue/comprehen/Maintenance/changeMeter/maintenanceChangeMeterRecords.vue

@@ -92,7 +92,7 @@
       },
       async getGroupData () {
         console.log('获取记录')
-        let condition = ' changemeter_id= ' + this.model.id + " and tablename='t_changemeter'"
+        let condition = ' changemeter_id= ' + this.model.id + " and tablename='t_changetables'"
         let res = await this.$resetpost('rs/sql/singleTable_OrderBy', {
           data: {
             items: '*',