sale-client 3.6.315 → 3.6.317

package/package.json

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

package/src/components/revenue/base/leftview/Userinfo.vue

@@ -51,7 +51,10 @@
         </div>
         <div class="row">
           <label class="col-sm-5">备用电话</label>
-          <span class="col-sm-7">{{ data ? data.f_rent_phone : dafault.f_rent_phone }}</span>
+          <span class="col-sm-7">{{ data ? data.f_rent_phone : dafault.f_rent_phone }}
+            <span v-if="data" @click.stop="changerentphone"
+                  class="glyphicon glyphicon-pencil  clickchange" title="修正备用电话"></span>
+          </span>
         </div>
         <div class="row" :class="[config.f_user_state ? 'highlight' : '']">
           <label class="col-sm-5">客户状态</label>
@@ -119,6 +122,31 @@
             <button type="button" class="button_clear" @click='close'>取消</button>
           </footer>
         </modal>
+        <modal v-if="showselectncuserrent" :show.sync="showselectncuserrent" width="40%" title="修正客户备用电话"
+               v-ref:modal large backdrop="false">
+          <article slot="modal-body" class="modal-body">
+            <div class="form-horizontal">
+              <div class="row">
+                <div class="col-sm-12 form-group">
+                  <label class="font_normal_body">旧客户备用电话</label>
+                  <input disabled readonly type="text" style="width:80%" class="input_search"
+                         v-model="data.f_rent_phone" placeholder='旧客户备用电话'>
+                </div>
+              </div>
+              <div class="row">
+                <div class="col-sm-12 form-group">
+                  <label class="font_normal_body">新客户备用电话</label>
+                  <input type="text" style="width:80%" class="input_search" v-model="newrentphone"
+                         placeholder='新客户备用电话'>
+                </div>
+              </div>
+            </div>
+          </article>
+          <footer slot="modal-footer" class="modal-footer">
+            <button class="button_search" :disabled='!$m.valid ' @click="modifyUserRent">确定</button>
+            <button type="button" class="button_clear" @click='close'>取消</button>
+          </footer>
+        </modal>
         <modal v-if="reason_show" :show.sync="reason_show" width="40%" title="修改备注信息"
                v-ref:modal large backdrop="false">
           <article slot="modal-body" class="modal-body">
@@ -194,7 +222,9 @@ export default {
       },
       model: null,
       showselectncuserinfo: false,
+      showselectncuserrent: false,
       newuserphone: '',
+      newrentphone: '',
       reason_show: false,
       new_reason: ''
     }
@@ -235,6 +265,11 @@ export default {
       this.showselectncuserinfo = true
       this.newuserphone = ''
     },
+    changerentphone () {
+      // 修正客户电话
+      this.showselectncuserrent = true
+      this.newrentphone = ''
+    },
     async modifyUser () {
       let param = {
         new_userphone: this.newuserphone,
@@ -254,8 +289,28 @@ export default {
       this.$parent.$parent.$refs.list.searchNoData()
       this.close()
     },
+    async modifyUserRent () {
+      let param = {
+        new_rentphone: this.newrentphone,
+        f_userinfo_id: this.data.f_userinfo_id,
+        f_user_id: this.data.f_user_id,
+        f_operator: this.$login.f.name,
+        f_operatorid: this.$login.f.id,
+        f_orgid: this.$login.f.orgid,
+        f_orgname: this.$login.f.orgs,
+        f_depid: this.$login.f.depids,
+        f_depname: this.$login.f.deps
+      }
+      await this.$resetpost('/rs/logic/changeuserinfo', {data: param}, {resolveMsg: '修正成功', rejectMsg: null})
+      this.data.f_rent_phone = this.newrentphone
+      this.$parent.$parent.close()
+      this.$parent.$parent.clean()
+      this.$parent.$parent.$refs.list.searchNoData()
+      this.close()
+    },
     close () {
       this.showselectncuserinfo = false
+      this.showselectncuserrent = false
       this.reason_show = false
       this.newuserphone = ''
       this.new_reason = ''

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: '*',