manage-client 3.3.42 → 3.3.44

package/src/filiale/qianneng/QnChaobiaomingxi.vue

@@ -8,6 +8,7 @@
               <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
                 <div class="row">
                   <res-select-group :show-component="['company']" :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
+
                   <div class="col-sm-2 form-group">
                     <label for="startDate" class="font_normal_body">审核日期起</label>
                     <datepicker id="startDate" placeholder="审核日期起" style="width:60%"
@@ -327,7 +328,7 @@
       return {
         other:[],
         footer:[],
-        model: new PagedList('rs/sql/qnChaobiaomingxi', 20, {}, {f_gas: 0, f_money: 0}),
+        model: new PagedList('rs/sql/qnChaobiaomingxi', 20, {startDate: 'this.model.startDate', endDate: 'this.model.endDate', f_insideorgid:'this.model.f_insideorgid',f_insidemeter:'this.model.f_insidemeter'}, {f_gas: 0, f_money: 0}),
         criteriaShow: false,
         orgCondtionStr: '',
         modelval: [],
@@ -378,6 +379,7 @@
         allorgid:[],
         f_filialeid: this.$login.f.f_orgid,
         dypayment:[{label:"全部",value:""},{label:"银行代扣",value:"银行代扣",},{label:"现金缴费",value:"现金缴费",}],
+        f_insidemeter_tmp:'',
       }
     },
     ready() {
@@ -459,8 +461,14 @@
         return data
       },
       search(){
-        console.log("=====search====")
-        //this.$refs.paged.$refs.cri.search()
+        console.log("=====search====9999999")
+        this.$refs.paged.$refs.cri.model.f_insideorgid = this.f_filialeid;
+        if(this.$refs.paged.$refs.cri.model.f_meter_classify[0]) {
+          this.$refs.paged.$refs.cri.model.f_insidemeter = this.$refs.paged.$refs.cri.model.f_meter_classify[0];
+        }else{
+          this.$refs.paged.$refs.cri.model.f_insidemeter = 'all'
+        }
+        this.f_insidemeter_tmp = this.$refs.paged.$refs.cri.model.f_insidemeter;
         this.$refs.paged.$refs.cri.search()
       },
       cancel(obj) {
@@ -529,6 +537,7 @@
       selfSearch(args) {
         console.log('args', args)
         console.log('this.orgCondtionStr', this.orgCondtionStr)
+
         if (!this.orgCondtionStr) {
           args.condition = `${args.condition}` + " and tr.f_orgid = " + this.$login.f.orgid
         } else {
@@ -657,7 +666,14 @@
       },
 
       getCondition() {
-        return {condition: this.condition2,orderitem:this.orderitem}
+        return {
+                  condition: this.condition2,
+                  orderitem:this.orderitem,
+                  startDate: this.$refs.paged.$refs.cri.model.startDate,
+                  endDate: this.$refs.paged.$refs.cri.model.endDate,
+                  f_insideorgid:this.f_filialeid,
+                  f_insidemeter:this.f_insidemeter_tmp
+                }
       },
       getfield() {
         let data = {}

package/src/filiale/qianneng/QnChaobiaoyhhz.vue

@@ -218,7 +218,7 @@
       return {
         other:[],
         footer:[],
-        model: new PagedList('rs/sql/qnChaobiaoyhhz', 20, {}, {f_gas: 0, f_money: 0}),
+        model: new PagedList('rs/sql/qnChaobiaoyhhz', 20, {startDate: 'this.model.startDate', endDate: 'this.model.endDate', f_insideorgid:'this.model.f_insideorgid',f_insidemeter:'this.model.f_insidemeter'}, {f_gas: 0, f_money: 0}),
         criteriaShow: false,
         orgCondtionStr: '',
         modelval: [],
@@ -269,6 +269,7 @@
         allorgid:[],
         f_filialeid: this.$login.f.f_orgid,
         dypayment:[{label:"全部",value:""},{label:"银行代扣",value:"银行代扣",},{label:"现金缴费",value:"现金缴费",}],
+        f_insidemeter_tmp:'',
       }
     },
     ready() {
@@ -354,6 +355,15 @@
       search(){
         console.log("=====search====")
         //this.$refs.paged.$refs.cri.search()
+        this.$refs.paged.$refs.cri.model.f_insideorgid = this.f_filialeid;
+
+        if(this.$refs.paged.$refs.cri.model.f_meter_classify[0]) {
+          this.$refs.paged.$refs.cri.model.f_insidemeter = this.$refs.paged.$refs.cri.model.f_meter_classify[0];
+        }else{
+          this.$refs.paged.$refs.cri.model.f_insidemeter = 'all'
+        }
+        this.f_insidemeter_tmp = this.$refs.paged.$refs.cri.model.f_insidemeter;
+
         this.$refs.paged.$refs.cri.search()
       },
       cancel(obj) {
@@ -550,7 +560,14 @@
       },
 
       getCondition() {
-        return {condition: this.condition2,orderitem:this.orderitem}
+        return {
+                  condition: this.condition2,
+                  orderitem:this.orderitem,
+                  startDate: this.$refs.paged.$refs.cri.model.startDate,
+                  endDate: this.$refs.paged.$refs.cri.model.endDate,
+                  f_insideorgid:this.f_filialeid,
+                  f_insidemeter:this.f_insidemeter_tmp
+                }
       },
       getfield() {
         let data = {}

package/src/filiale/qianneng/QnChaobiaoyqxzhz.vue

@@ -189,7 +189,7 @@
       return {
         other:[],
         footer:[],
-        model: new PagedList('rs/sql/qnChaobiaoyqxzhz', 20, {}, {f_gas: 0, f_money: 0}),
+        model: new PagedList('rs/sql/qnChaobiaoyqxzhz', 20, {startDate: 'this.model.startDate', endDate: 'this.model.endDate', f_insideorgid:'this.model.f_insideorgid',f_insidemeter:'this.model.f_insidemeter'}, {f_gas: 0, f_money: 0}),
         criteriaShow: false,
         orgCondtionStr: '',
         modelval: [],
@@ -240,6 +240,7 @@
         allorgid:[],
         f_filialeid: this.$login.f.f_orgid,
         dypayment:[{label:"全部",value:""},{label:"银行代扣",value:"银行代扣",},{label:"现金缴费",value:"现金缴费",}],
+        f_insidemeter_tmp:'',
       }
     },
     ready() {
@@ -323,6 +324,15 @@
       search(){
         console.log("=====search====")
         //this.$refs.paged.$refs.cri.search()
+        this.$refs.paged.$refs.cri.model.f_insideorgid = this.f_filialeid;
+
+        if(this.$refs.paged.$refs.cri.model.f_meter_classify[0]) {
+          this.$refs.paged.$refs.cri.model.f_insidemeter = this.$refs.paged.$refs.cri.model.f_meter_classify[0];
+        }else{
+          this.$refs.paged.$refs.cri.model.f_insidemeter = 'all'
+        }
+        this.f_insidemeter_tmp = this.$refs.paged.$refs.cri.model.f_insidemeter;
+
         this.$refs.paged.$refs.cri.search()
       },
       cancel(obj) {
@@ -519,7 +529,14 @@
       },
 
       getCondition() {
-        return {condition: this.condition2,orderitem:this.orderitem}
+        return {
+                  condition: this.condition2,
+                  orderitem:this.orderitem,
+                  startDate: this.$refs.paged.$refs.cri.model.startDate,
+                  endDate: this.$refs.paged.$refs.cri.model.endDate,
+                  f_insideorgid:this.f_filialeid,
+                  f_insidemeter:this.f_insidemeter_tmp
+                }
       },
       getfield() {
         let data = {}

package/src/filiale/qianneng/RecordInfoQuery.vue

@@ -625,6 +625,12 @@
                   <th>
                     <nobr>灶具信息</nobr>
                   </th>
+                  <th>
+                    <nobr>防盗卡号1</nobr>
+                  </th>
+                  <th>
+                    <nobr>防盗卡号2</nobr>
+                  </th>
                   <th>
                     <nobr>备注</nobr>
                   </th>
@@ -747,6 +753,8 @@
                 <td style="text-align: center;"><nobr>{{row.f_alarm_code}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_maxdate}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_devices_type}}</nobr></td>
+                <td style="text-align: center;"><nobr>{{row.f_defendcard}}</nobr></td>
+                <td style="text-align: center;"><nobr>{{row.f_defendcard_two}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_comments}}</nobr></td>
               </template>
               <template partial='foot'>

package/src/filiale/qianneng/exportConfig.js

@@ -34,7 +34,7 @@ export default{
     'f_book_inputtor': '表册抄表员',
     'f_userfiles_address': '安装地址', 'f_install_person': '安装人', 'f_gas_person': '通气人',
     'f_meter_book_num': '抄表册编号', 'f_meter_book_sort': '抄表册顺序',
-    'f_balance_amount': '表剩余金额', 'f_times': '写卡次数',
+    'f_balance_amount': '表剩余金额', 'f_times': '写卡次数', 'f_defendcard': '防盗卡号1', 'f_defendcard_two': '防盗卡号2',
     'f_fillcard_times': '补卡次数', 'f_sendsuccess': '表同步状态', 'f_isband': '微信绑定', 'f_cost_type': '缴费类型'
     , 'f_bank_accopen': '银行户名', 'f_bank_name': '银行名称', 'f_bank_account': '银行账号',
     'f_bank_idnumber': '银行身份证号', 'f_bank_pay_number': '缴费编号', 'f_maxdate': '换表时间', 'f_devices_type': '灶具信息', 'f_network_valve': '自动阀控'
@@ -216,5 +216,14 @@ export default{
     'xz':'乡镇','jwh':'居委会','bjqdr':'报警器（非补贴项）当日','bjqlj':'报警器（非补贴项）累计','fbjsrgdr':'防爆金属软管当日',
     'fbjsrglj':'防爆金属软管累计','zbfdr':'自闭阀当日','zbflj':'自闭阀累计'
   },
+  qnAqzzYsbb:{
+    'ysry':'验收人员','qjfj':'期间复检','fjlj':'复检累计','qjsgys':'期间施工验收','sgyslj':'施工验收累计',
+    'qjhj':'期间合计','zlj':'总累计'
+  },
+  qnAqzzYsmx:{
+    'title':'标题','createtimegmt':'发起时间','originator':'发起人','modifiedtimegmt':'验收时间','modifyuser':'验收人',
+    'textfield_li9rszui':'用户编号','textfield_li9rszuj':'用户姓名',
+    'textfield_li9rszuo':'地址','matchedaofeng':'与收费比对结果'
+  },
 }
 

package/src/filiale/qianneng/reportManage.js

@@ -68,6 +68,10 @@ export default function () {
   Vue.component('qn-aqzz-xzhz', (resolve) => { require(['./QnAqzzXzhz'], resolve) })
   //安全装置加装  乡镇居委会汇总
   Vue.component('qn-aqzz-xzjwhhz', (resolve) => { require(['./QnAqzzXzjwhhz'], resolve) })
+  //安全装置加装  验收明细
+  Vue.component('qn-aqzz-ysmx', (resolve) => { require(['./QnAqzzYsmx'], resolve) })
+  //安全装置加装  验收报表
+  Vue.component('qn-aqzz-ysbb', (resolve) => { require(['./QnAqzzYsbb'], resolve) })
   Vue.component('qn-aqzz', (resolve) => { require(['./QnAqzz'], resolve) })
   // **************潜能自定义报表end***************
 }

package/src/filiale/shexian/ChangeMeterQuery.vue

@@ -100,6 +100,22 @@
                             condition="f_meter_brand_old = '{}'"
                             close-on-select></v-select>
                 </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">新表型号</label>
+                  <v-select :value.sync="model.f_meter_style"
+                            v-model="model.f_meter_style"
+                            :options='$parent.$parent.meterStyle' placeholder='请选择'
+                            condition="f_meter_style = '{}'"
+                            close-on-select></v-select>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">旧表型号</label>
+                  <v-select :value.sync="model.f_meter_style_old"
+                            v-model="model.f_meter_style_old"
+                            :options='$parent.$parent.meterStyle' placeholder='请选择'
+                            condition="f_meter_style_old = '{}'"
+                            close-on-select></v-select>
+                </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">换表类型</label>
                   <v-select :value.sync="model.f_type"
@@ -523,6 +539,7 @@
         other:[],
         footer:[],
         meterbrands: [],
+        meterStyle: [],
         pricenames: [],
         model: new PagedList('rs/sql/changeMeterQuery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_operate_date desc'`}, {f_balance_amount: 0,f_changemeter_fee: 0,f_remanent_money:0,f_remanent_gas:0,hushu:0}),
         criteriaShow: false,
@@ -600,15 +617,35 @@
         this.other.push(otherInData);
       },
       async initParams() {
-    // 初始化气表品牌
-    let brandArr = []
-    await this.$MagGetSaleParam.getGasbrand().forEach((item) => {
-      let temp = {}
-      temp.label = item.label
-    temp.value = item.value.f_meter_brand
-    brandArr.push(temp)
-  })
-    this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
+        // 初始化气表品牌
+        let brandArr = []
+        await this.$MagGetSaleParam.getGasbrand().forEach((item) => {
+          let temp = {}
+          temp.label = item.label
+          temp.value = item.value.f_meter_brand
+          brandArr.push(temp)
+        })
+        this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
+        // 获取气表型号
+        let data = {
+          tablename: `t_gasmodel`,
+          items: 'distinct f_meter_style',
+          condition: `1=1`,
+          orderitem: 'f_meter_style desc'
+        }
+        let res = await this.$resetpost('rs/sql/manage_singleTable', {data: data}, {rejectMsg: '获取表型号出错', resolveMsg: null})
+        let meStu = []
+        if (res.data) {
+          res.data.forEach((itemRes) => {
+            let tempTy = {}
+            tempTy.label = itemRes.f_meter_style
+            tempTy.value = itemRes.f_meter_style
+            meStu.push(tempTy)
+          })
+        }
+        console.log('------------打印数据---------------')
+        console.log(res)
+        this.meterStyle = [{label: '全部', value: ''}, ...meStu]
   },
   async selfSearch(args) {
     if (this.data) {