manage-client 3.3.66 → 3.3.68

package/package.json

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

package/src/components/sale/businessquery/FlotsamChargeQuery.vue

@@ -49,7 +49,8 @@
                   <button class="button_search button_spacing" @click="search()">查询</button>
                   <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
                   <export-excel :data="$parent.$parent.getCondition"
-                                :field="$parent.$parent.getfield"
+                                :footer="$parent.$parent.footer"
+                                :field="$parent.$parent.getfield" :header="$parent.$parent.other"
                                 sqlurl="rs/logic/exportfile" sql-name="flotsampriceChargeQuery" template-name='垃圾费查询导出'
                                 :choose-col="true">
                   </export-excel>
@@ -168,12 +169,22 @@ export default {
       model: new PagedList('rs/sql/flotsampriceChargeQuery', 20, {orderitem: this.orderitem?`${this.orderitem}`: " 'f_operate_date desc'"}
       ,{f_money:0}),
       orgCondtionStr: '',
+      footer:[],
+      other:[],
       //排序
       orderitem:'f_operate_date desc',
       show:false,
       sumsmodel : {}
     }
   },
+  watch:{
+    sumsmodel:{
+      handler: function(val) {
+        this.getotherfooter();
+      },
+      deep: true
+    }
+  },
   ready() {
     readySomething(this).then(() => {
       this.$emit('ready')
@@ -182,6 +193,30 @@ export default {
     })
   },
   methods: {
+    getotherfooter () {
+      // this.$refs.paged.$refs.cri.$refs.exports.otherData = [];
+      // this.$refs.paged.$refs.cri.$refs.exports.footerData = [];
+      this.other = [];
+      this.footer = [];
+      let exportdata = this.getCondition;
+      let otherInData = [];
+      otherInData.push(`导出时间: ${this.$login.toStandardTimeString()}`);
+
+      // otherInData.push(``)
+      let footerData = [], exportfield = this.getfield;
+      footerData.push("合计");
+      let self = this;
+      for (var field in self.sumsmodel) {
+        footerData.push(`${exportfield[field]}合计:${self.sumsmodel[field]}`);
+      }
+      this.footer.push(footerData);
+      this.other.push(otherInData);
+      let date = []
+      date.push(`起始时间:${this.$refs.paged.$refs.cri.model.startDate}`)
+      date.push(`终止时间:${this.$refs.paged.$refs.cri.model.endDate}`)
+      this.other.push(date)
+      // this.other.push(enddate)
+    },
     search(){
       this.$refs.paged.$refs.cri.search()
     },

package/src/components/sale/businessquery/WebHandplanQuery.vue

@@ -830,6 +830,30 @@
           this.gasproperties =[{label: '全部', value: ''}]
         }
       },
+      getotherfooter () {
+        // this.$refs.paged.$refs.cri.$refs.exports.otherData = [];
+        // this.$refs.paged.$refs.cri.$refs.exports.footerData = [];
+        this.other = [];
+        this.footer = [];
+        let exportdata = this.getCondition;
+        let otherInData = [];
+        otherInData.push(`导出时间: ${this.$login.toStandardTimeString()}`);
+
+        // otherInData.push(``)
+        let footerData = [], exportfield = this.getfield;
+        footerData.push("合计");
+        let self = this;
+        for (var field in self.sumsmodel) {
+          footerData.push(`${exportfield[field]}合计:${self.sumsmodel[field]}`);
+        }
+        this.footer.push(footerData);
+        this.other.push(otherInData);
+        let date = []
+        date.push(`起始时间:${this.$refs.paged.$refs.cri.model.startDate}`)
+        date.push(`终止时间:${this.$refs.paged.$refs.cri.model.endDate}`)
+        this.other.push(date)
+        // this.other.push(enddate)
+      },
       // 对选择的列进行排序
       sortModelval() {
         let sortModel = []
@@ -885,6 +909,12 @@
           this.put()
         }
       },
+      sumsmodel:{
+        handler: function(val) {
+          this.getotherfooter();
+        },
+        deep: true
+      },
       'modelval.length'() {
         this.put()
       }

package/src/filiale/kelai/ChargeQuery.vue

@@ -1034,6 +1034,8 @@
         let exportdata = this.getCondition;
         let otherInData = [];
         otherInData.push(`导出时间: ${this.$login.toStandardTimeString()}`);
+
+        // otherInData.push(``)
         let footerData = [], exportfield = this.getfield;
         footerData.push("合计");
         let self = this;
@@ -1042,6 +1044,11 @@
         }
         this.footer.push(footerData);
         this.other.push(otherInData);
+        let date = []
+        date.push(`起始时间:${this.$refs.paged.$refs.cri.model.startDate}`)
+        date.push(`终止时间:${this.$refs.paged.$refs.cri.model.endDate}`)
+        this.other.push(date)
+        // this.other.push(enddate)
       },
       async  getaddress(){
         let HttpReset = new HttpResetClass()

package/src/filiale/shexian/ChargeQuery.vue

@@ -308,7 +308,7 @@
                   <v-select :value.sync="model.f_terminal_name" multiple
                             v-model="model.f_terminal_name"
                             :options='$parent.$parent.posEquipment' placeholder='请选择'
-                            condition="f_operator in {}"
+                            condition="f_terminal_num in {}"
                             close-on-select></v-select>
                 </div>
                 <div class="col-sm-2 form-group">
@@ -977,14 +977,14 @@
       async getEquipment () {
         let HttpReset = new HttpResetClass()
         let param = {
-          items: 'f_terminal_name',
+          items: 'f_terminal_name,f_terminal_number',
           tablename: 't_equipment',
           condition: `f_equipment_type = 'POS' and f_state = '正常' and f_orgid = '${this.$login.f.orgid}'`,
           orderitem: 'id'
         }
         var data = await HttpReset.load('POST', 'rs/sql/manage_singleTable', {data: param}, {resolveMsg: null, rejectMsg: '获取设备列表失败!'})
         for (let row of data.data) {
-          this.posEquipment.push({label: row.f_terminal_name, value: row.f_terminal_name})
+          this.posEquipment.push({label: row.f_terminal_name, value: row.f_terminal_number})
         }
       },
       openBill(row){

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

@@ -252,7 +252,8 @@ export default {
     'f_stair3fee': '三阶气费',
     'f_inputtor': '抄表员',
     'f_residential_area': '小区',
-    'f_serial_number': '业务单号'
+    'f_serial_number': '业务单号',
+    'f_terminal_num': '终端号'
   },
   loginQueryConfig: {
     'userid': '登录人编号', 'username': '登录人名称', 'logindate': '登录时间', 'type': '类型'