sale-client 3.4.204 → 3.4.205

package/package.json

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

package/src/components/charge/business/IOT/IotChangeFill.vue

@@ -186,6 +186,8 @@
       self.model.payments = self.paymentModel
 
       let param = {
+        f_share_times: self.row.f_share_times,
+        f_hascard: self.row.f_hascard,
         f_open_way: self.row.f_open_type,
         f_user_name: self.row.f_user_name,
         f_user_type: self.row.f_user_type,

package/src/components/revenue/base/rightview/CardList.vue

@@ -63,7 +63,7 @@
               <div class="col-sm-1" v-if="$parent.$parent.$parent.isOperate" title="涉及权限:冲正权限">
                 <dropdown class="auto"
                           v-if="(row.type ==='机表收费撤销' || row.type ==='卡表收费撤销' || row.type ==='物联网收费撤销' || row.type ==='其他收费撤销' || row.type ==='气损收费撤销' ||
-                           row.type ==='预存缴费' || row.type === '补卡' || row.type === '物联网收费' || row.type === '用户退费' || row.type === '机表收费' ||
+                           row.type ==='预存缴费' || row.type === '补卡' || row.type === '物联网收费' || row.type === '用户退费' || row.type === '机表收费' || row.type === '数码表收费' ||
                           row.type === '卡表收费' || row.type === '超用收费' || row.type === '发卡售气' || row.type === '其他收费' ||
                           row.type === '换表' || row.state === 1 || row.type==='调价补费' || row.type==='卡表赠气' ||
                           row.type==='物联网赠气'|| row.type==='物联网赠费'|| row.type==='卡表赠费'|| row.type==='卡表赠气'||

package/src/components/revenue/comprehen/ComprehenOperation/newchangemeter/ChangeMeter.vue

@@ -890,7 +890,7 @@ export default {
         data: {
           items: 'f_whether_pay',
           tablename: 't_handplan',
-          condition: ` f_user_id  = '${this.row.f_user_id}' and  f_hand_state = '有效' and f_meter_state='已抄表' `,
+          condition: ` f_user_id  = '${this.row.f_user_id}' and f_oughtfee > 0 and  f_hand_state = '有效' and f_meter_state='已抄表' `,
           orderitem: ' id desc'
         }
       }, {resolveMsg: null, rejectMsg: null}

package/src/components/revenue/concentrator/ncUserfilesList2.vue

@@ -28,6 +28,7 @@
                            condition="f_address like '%{}%'" placeholder='客户地址'>
                   </div>
                   <div class="span" style="float:right;">
+                    <button class="button_search button_spacing" @click="$parent.$parent.meterRead()">抄表</button>
                     <button class="button_search button_spacing" @click="$parent.$parent.confirmaddress()">取消关联</button>
                     <button class="button_search button_spacing" @click="search()">查询</button>
                     <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
@@ -251,7 +252,7 @@ export default {
         }
         let param = {
           f_orgid: this.$login.f.orgid,
-          f_orgname: this.$login.f.orgs,
+          f_orgname: this.$login.f.name,
           concentratorid: this.fileinfo.id,
           f_mpc_number: this.fileinfo.f_mpc_number,
           userfilesid: '',
@@ -262,6 +263,35 @@ export default {
         this.search()
       }
     },
+    async meterRead () {
+      let res = await this.$showMessage('确定对选择的表具进行抄表操作吗?', ['confirm', 'cancel'])
+      if (res === 'confirm') {
+        let rowdata = this.$refs.paged.$refs.grid.getRowData()
+        if (rowdata.length <= 0) {
+          this.$showMessage('请至少选择一个表具!')
+          return
+        }
+        console.log(rowdata)
+        let userfilesids = []
+        for (let row of rowdata) {
+          userfilesids.push({
+            f_userfiles_id: row.f_userfiles_id,
+            f_meternumber: row.f_meternumber
+          })
+        }
+        let param = {
+          f_orgid: this.$login.f.orgid,
+          f_orgname: this.$login.f.name,
+          concentratorid: this.fileinfo.id,
+          f_mpc_number: this.fileinfo.f_mpc_number,
+          userfilesid: '',
+          userfilesids: userfilesids,
+          state: 'delete'
+        }
+        await this.$resetpost('rs/logic/concentratorMeterRead', param, {resolveMsg: '抄表操作成功!', rejectMsg: '抄表操作失败!'})
+        this.search()
+      }
+    },
     search () {
       this.$refs.paged.$refs.cri.search()
     },

package/src/components/revenue/machineHandManage/machineHandAudit.vue

@@ -39,6 +39,13 @@
 
                 <button class="button_search button_spacing" @click="$parent.$parent.search()">查询</button>
                 <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
+                <export-excel
+                  :data="{condition: $parent.$parent.excelCondition}"
+                  :field="$parent.$parent.fields"
+                  sqlurl="rs/logic/saleExport" progress="saleGetExportProgress" sql-name="getAuditMachineHand"
+                  template-name='抄表审核导出'
+                  :choose-col="true">
+                </export-excel>
                 <button class="button_search button_spacing width-60"
                         @click="$parent.$parent.allsuccess()" v-el:cx>全部通过</button>
                 <button class="button_search button_spacing width-60"
@@ -316,7 +323,7 @@
             <!--<td>{{row.f_building}}</td>-->
             <!--<td>{{row.f_unit}}</td>-->
             <!--<td>{{row.f_room}}</td>-->
-            <td>{{row.f_balacne}}</td>
+            <td>{{row.f_balance}}</td>
             <td style="text-align: center;">{{Math.round(row.avggas)}}</td>
             <td>{{row.f_meternumber}}</td>
             <td>{{row.f_meter_base}}</td>
@@ -416,6 +423,27 @@
         imgshow: false,
         criteriaShow:false,
         orgCondtionStr: '',
+        excelCondition: '',
+        fields: {
+          'f_userinfo_code': '客户编号',
+          'f_user_name': '客户名称',
+          'f_address': '客户地址',
+          'f_user_level': '用户等级',
+          'f_balance': '上期结余',
+          'f_meternumber': '表号',
+          'f_meter_base': '上期底数',
+          'f_tablebase': '本期底数',
+          'f_oughtamount': '应交气量',
+          'f_adjustment_volume': '增量值',
+          'f_oughtfee': '应交金额',
+          'f_result_state': '抄表结果状态',
+          'f_last_input_date': '上次抄表录入日期',
+          'f_hand_date': '下发日期',
+          'f_input_date': '抄表录入日期',
+          'f_book_name': '抄表册',
+          'f_adjustable_name': '调压箱名称',
+          'f_inputtor': '抄表员'
+        },
         auditState:[{label: '全部', value: ''}, {label: '已审核', value: '已抄表'}, {label: '未审核', value: '待审核'}],
         auditState1:[{label: '全部', value: ''}, {label: '审核失败', value: '审核失败'}],
         meters: [{label: '全部', value: ''}, {label: '机表', value: '机表'}, {label: '物联网表', value: '物联网表'}],
@@ -604,6 +632,7 @@
         } else {
           args.condition = `${args.condition}` + this.orgCondtionStr
         }
+        this.excelCondition = args.condition
         this.$refs.paged.$refs.grid.selectInit()
         this.model.search(args.condition, args.model)
       },

package/src/filiale/qianneng/ChangeMeter.vue

@@ -842,7 +842,7 @@ export default {
         data: {
           items: 'f_whether_pay',
           tablename: 't_handplan',
-          condition: ` f_user_id  = '${this.row.f_user_id}' and  f_hand_state = '有效' and f_meter_state='已抄表' `,
+          condition: ` f_user_id  = '${this.row.f_user_id}' and f_oughtfee > 0 and  f_hand_state = '有效' and f_meter_state='已抄表' `,
           orderitem: ' id desc'
         }
       }, {resolveMsg: null, rejectMsg: null}

package/src/filiale/tongchuan/ChangeMeter.vue

@@ -328,7 +328,7 @@ export default {
       usertypes: this.$appdata.getParam('用户类型') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')] : [],
       opentype: [{label: '指令开户', value: '指令开户'}, {label: '发卡开户', value: '发卡开户'}],
       pricetypes: this.$appdata.getParam('气价类型') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('气价类型')] : [],
-      changeoperator:this.$appdata.getParam('维修人') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('维修人')] : []
+      changeoperator: this.$appdata.getParam('维修人') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('维修人')] : []
     }
   },
   props: ['row'],
@@ -445,7 +445,7 @@ export default {
         this.model.f_depname = this.$login.f.deps
         this.model.f_zoneid = this.$login.f.zoneid
         this.model.f_zones = this.$login.f.zones
-        this.model.f_change_operator=this.model.f_change_operator[0]
+        this.model.f_change_operator = this.model.f_change_operator[0]
         let data = {
           model: this.model,
           f_meter_book: this.newinfo.f_meter_book[0],
@@ -682,13 +682,13 @@ export default {
             this.addbalance = true
             this.model.f_remanent_money = this.model.f_remanent_money?(this.model.f_remanent_money - 0) + (this.row.f_balance-0):(this.row.f_balance-0)
           }
-        }*/
+        } */
       }
     },
 
     remanentChange () {
       // 气量转金额 或者 金额转气量的时候对气量和金额不做限制， 可以修改， 但是只变单价
-      if (this.model.f_remanent_money>0) {
+      if (this.model.f_remanent_money > 0) {
         this.model.f_remanent_gas = ((this.model.f_remanent_money) / (this.model.f_remanent_price)).toFixed(4)
       }
     },
@@ -699,7 +699,7 @@ export default {
         data: {
           items: 'f_whether_pay',
           tablename: 't_handplan',
-          condition: ` f_user_id  = '${this.row.f_user_id}' and  f_hand_state = '有效' and f_meter_state='已抄表' `,
+          condition: ` f_user_id  = '${this.row.f_user_id}' and f_oughtfee > 0  and  f_hand_state = '有效' and f_meter_state='已抄表' `,
           orderitem: ' id desc'
         }
       }, {resolveMsg: null, rejectMsg: null}
@@ -730,16 +730,16 @@ export default {
         this.model.f_remanent_money = (val * this.model.f_remanent_price).toFixed(4)
       }
     },
-   'model.metermessage.gasbrand'(val){
-      console.log('监听',val)
-      if(val[0]){
-          if(val[0].f_meter_type ==='物联网表'&& val[0].f_hascard==='是'){
-              this.model.f_open_type  ='发卡开户'
-          }else if (val[0].f_meter_type ==='物联网表'&&  val[0].f_hascard !=='是'){
-            this.model.f_open_type  ='指令开户'
-          }
+    'model.metermessage.gasbrand' (val) {
+      console.log('监听', val)
+      if (val[0]) {
+        if (val[0].f_meter_type === '物联网表' && val[0].f_hascard === '是') {
+          this.model.f_open_type = '发卡开户'
+        } else if (val[0].f_meter_type === '物联网表' && val[0].f_hascard !== '是') {
+          this.model.f_open_type = '指令开户'
+        }
       }
-   }
+    }
 
   }
 }

package/src/plugins/CardService.js

@@ -141,6 +141,8 @@ let CardService = {
   // 补气开户发卡
   remanentinitCard (model, row, allot) {
     let param = {
+      f_share_times: row.f_share_times,
+      f_hascard: row.f_hascard,
       f_open_way: row.f_open_type,
       f_serial_id: model.f_serial_id,
       f_userinfo_id: row.f_userinfo_id,