manage-client 3.3.43 → 3.3.44

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "manage-client",
-  "version": "3.3.43",
+  "version": "3.3.44",
   "description": "经营管控模块前台组件",
   "main": "src/index.js",
   "directories": {

package/src/components/webmeter/instruction/NewQueryInstruct.vue

@@ -146,6 +146,14 @@
                             v-model="model.f_end_date"
                 ></datepicker>
               </div>
+              <div class="col-sm-2 form-group">
+                <label class="font_normal_body">指令标题</label>
+                <v-select :options='$parent.$parent.instructtitle' :value.sync="model.f_instruct_title" close-on-select
+                          condition="f_instruct_title='{}'"
+                          placeholder='指令标题'
+                          style="width:60%"
+                          v-model="model.f_instruct_title"></v-select>
+              </div>
             </div>
           </div>
         </criteria>
@@ -286,6 +294,7 @@
     await self.$MagLoadParams.loadParam()
     self.initQueryParam()
     self.getinstructtype()
+    self.getinstructtitle()
     self.getinstructstate()
     await self.$getConfig(self, 'NewQueryInstruct')
     console.log('指令查看config', self.config)
@@ -327,6 +336,7 @@
             'f_orgname': '组织机构'
           }
         },
+        instructtitle: []
       }
     },
     ready () {
@@ -372,6 +382,23 @@
           })
         })
 
+      },
+      getinstructtitle(){
+        this.instructtype=[]
+        let load = new HttpResetClass()
+        load.load('POST', 'rs/sql/singleTableParam', {
+          data: {
+            items:'f_instruct_title',
+            tablename:'t_instruct',
+            condition:'f_instruct_title is not null  group by f_instruct_title'
+          }
+        },{warnMsg:null,resolveMsg:null}).then((res) => {
+          this.instructtitle.push({label: '全部', value: ''})
+          res.data.forEach((item) => {
+            this.instructtitle.push({label: item.f_instruct_title, value: item.f_instruct_title})
+          })
+        })
+
       },
       getinstructstate(){
         this.instructstate=[]

package/src/filiale/jingwei/config/exportConfig.js

@@ -212,10 +212,10 @@ export default{
     'f_meternumber': '表号'
   },
   compreConfig: {
-    'f_user_state': '客户状态', 'f_userinfo_code': '客户编号', 'f_olduserinfo_code': '档案编号', 'f_card_id': '卡号', 'f_user_name': '客户名称',
+    'f_user_state': '客户状态', 'f_userinfo_code': '客户编号', 'f_card_id': '卡号', 'f_user_name': '客户名称',
     'f_residential_area': '小区名称', 'f_building': '楼栋', 'f_unit': '单元', 'f_floor': '楼层', 'f_room': '门牌号', 'f_address': '详细地址',
     'f_user_phone': '联系电话', 'f_usetype': '使用类型',
-    'f_gas_date': '通气日期', 'f_subscribe_date': '预约通气时间', 'f_price_name': '气价名称', 'f_position': '安装位置', 'f_meter_type': '类型', 'f_meter_brand': '品牌',
+    'f_gas_date': '通气日期', 'f_price_name': '气价名称', 'f_position': '安装位置', 'f_meter_type': '类型', 'f_meter_brand': '品牌',
     'f_meternumber': '表号', 'f_metertitles': '表封号', 'f_aroundmeter': '表向', 'f_install_date': '气表安装日期', 'f_meter_base': '气表底数',
     'f_balance': '账户余额', 'f_hand_date': '最后抄表日期', 'f_whether_hairpin': '是否发卡',
     'f_valve_state': '阀门状态', 'f_user_type': '客户类型', 'f_gasproperties': '用气性质', 'value': '气价详情',
@@ -225,15 +225,12 @@ export default{
     'f_contract_id': '供气合同编号', 'f_is_mgq': '是否煤改气', 'f_send_usegas_card': '是否发放天然气使用证',
     'f_meter_style': '型号', 'f_table_state': '表具状态', 'f_initial_base': '初始气表底数',
     'f_total_usegas_amount': '累计用气金额', 'f_total_gas': '表累购气量', 'f_total_fee': '表累购金额', 'f_inputtor': '档案抄表员',
-    '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_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_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': '灶具信息'
   },
-
   compreConfigGY: {
     'f_user_state': '客户状态', 'f_userinfo_code': '客户编号', 'f_card_id': '卡号', 'f_user_name': '客户名称',
     'f_residential_area': '小区名称', 'f_address': '客户地址', 'f_user_phone': '客户电话',

package/src/filiale/qianneng/QnChaobiaomingxi.vue

@@ -328,7 +328,7 @@
       return {
         other:[],
         footer:[],
-        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_meter_classify'}, {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: [],
@@ -379,6 +379,7 @@
         allorgid:[],
         f_filialeid: this.$login.f.f_orgid,
         dypayment:[{label:"全部",value:""},{label:"银行代扣",value:"银行代扣",},{label:"现金缴费",value:"现金缴费",}],
+        f_insidemeter_tmp:'',
       }
     },
     ready() {
@@ -462,6 +463,12 @@
       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) {
@@ -665,7 +672,7 @@
                   startDate: this.$refs.paged.$refs.cri.model.startDate,
                   endDate: this.$refs.paged.$refs.cri.model.endDate,
                   f_insideorgid:this.f_filialeid,
-                  f_insidemeter:this.$refs.paged.$refs.cri.model.f_meter_classify
+                  f_insidemeter:this.f_insidemeter_tmp
                 }
       },
       getfield() {

package/src/filiale/qianneng/QnChaobiaoyhhz.vue

@@ -218,7 +218,7 @@
       return {
         other:[],
         footer:[],
-        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_meter_classify'}, {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() {
@@ -355,6 +356,14 @@
         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) {
@@ -557,7 +566,7 @@
                   startDate: this.$refs.paged.$refs.cri.model.startDate,
                   endDate: this.$refs.paged.$refs.cri.model.endDate,
                   f_insideorgid:this.f_filialeid,
-                  f_insidemeter:this.$refs.paged.$refs.cri.model.f_meter_classify
+                  f_insidemeter:this.f_insidemeter_tmp
                 }
       },
       getfield() {

package/src/filiale/qianneng/QnChaobiaoyqxzhz.vue

@@ -189,7 +189,7 @@
       return {
         other:[],
         footer:[],
-        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_meter_classify'}, {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() {
@@ -324,6 +325,14 @@
         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) {
@@ -526,7 +535,7 @@
                   startDate: this.$refs.paged.$refs.cri.model.startDate,
                   endDate: this.$refs.paged.$refs.cri.model.endDate,
                   f_insideorgid:this.f_filialeid,
-                  f_insidemeter:this.$refs.paged.$refs.cri.model.f_meter_classify
+                  f_insidemeter:this.f_insidemeter_tmp
                 }
       },
       getfield() {

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': '自动阀控'