sale-client 3.6.6 → 3.6.7

package/package.json

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

package/src/components/revenue/comprehen/ComprehenOperation/BankPayment/BankPayment.vue

@@ -2,7 +2,7 @@
   <div class="basic-main" style="height: 98%">
     <div class="flex">
     <criteria-paged :model="model" v-ref:paged>
-      <criteria partial='criteria' @condition-changed='search' v-ref:cri>
+      <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
         <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
           <div class="row">
             <div
@@ -176,7 +176,8 @@
     data () {
       return {
         resid: [],  // 存放新增的f_files表中id
-        criteriaShow:false,
+        criteriaShow: false,
+        f_orgid: this.$login.f.orgid,
         curorgid: [this.$login.f.orgid],
         model: new PagedList('rs/sql/bankPayment', 20, {bankname: 'this.model.f_bank_name[0]', startDate: 'this.model.startDate', endDate: 'this.model.endDate', orderitem: '"delivery_date DESC "'}, {f_collection: '', f_total_charge: ''}),
         bodydata: ['f_userinfo_code', 'f_bank_name', 'f_serial_id', 'f_trade_number', 'f_collection', 'f_total_charge', 'f_operate_date', 'f_state', 'msg'],
@@ -186,6 +187,8 @@
     },
     props: [],
     ready () {
+      this.$refs.paged.$refs.cri.model.startDate = this.$login.toStandardDateString()
+      this.$refs.paged.$refs.cri.model.endDate = this.$login.toStandardDateString()
     },
     methods: {
       search () {
@@ -195,6 +198,13 @@
         if (!this.f_orgid) {
           this.getorg([this.$login.f.orgid])
         }
+        debugger
+        if (!this.$refs.paged.$refs.cri.model.startDate) {
+          this.$refs.paged.$refs.cri.model.startDate = this.$login.toStandardDateString()
+        }
+        if (!this.$refs.paged.$refs.cri.model.endDate) {
+          this.$refs.paged.$refs.cri.model.endDate = this.$login.toStandardDateString()
+        }
         console.log('查询。。。', this.f_orgid)
         if (this.f_orgid) {
           args.condition = `${args.condition} and f_orgid  in ${this.f_orgid}`
@@ -221,26 +231,26 @@
       },
       // 微信单方账单，系统可缴费
       async charge (row) {
-          row.f_operator=Vue.$login.f.name,
-          row.f_operatorid= Vue.$login.f.id,
-          row.f_orgid= Vue.$login.f.orgid,
-          row.f_orgname= Vue.$login.f.orgs,
-          row.f_depid= Vue.$login.f.depids,
-          row. f_depname= Vue.$login.f.deps,
-          row. f_zoneid= Vue.$login.f.zoneid,
-          row. f_zones= Vue.$login.f.zones
-            let res = await this.$resetpost('rs/logic/cardOneBank',row,{resolveMsg:'缴费成功',rejectMsg:'缴费失败'})
-          let param = []
-          for (let row of this.resid) {
-            param.push({id: row.id})
-          }
-          let data = {
-            param: param,
-            f_blobid: res.data
-          }
+        row.f_operator = Vue.$login.f.name,
+          row.f_operatorid = Vue.$login.f.id,
+          row.f_orgid = Vue.$login.f.orgid,
+          row.f_orgname = Vue.$login.f.orgs,
+          row.f_depid = Vue.$login.f.depids,
+          row.f_depname = Vue.$login.f.deps,
+          row.f_zoneid = Vue.$login.f.zoneid,
+          row.f_zones = Vue.$login.f.zones
+        let res = await this.$resetpost('rs/logic/cardOneBank', row, {resolveMsg: '缴费成功', rejectMsg: '缴费失败'})
+        let param = []
+        for (let row of this.resid) {
+          param.push({id: row.id})
+        }
+        let data = {
+          param: param,
+          f_blobid: res.data
+        }
 
-          await this.$resetpost('rs/logic/updatefiles', data)
-          this.$refs.paged.$refs.cri.search()
+        await this.$resetpost('rs/logic/updatefiles', data)
+        this.$refs.paged.$refs.cri.search()
       }
         // })
     },

package/src/components/webMeter/paramSave/ParamSetForm.vue

@@ -118,6 +118,7 @@
 
 <script>
   import {HttpResetClass} from 'vue-client'
+  import axios from "axios";
 
 export default {
     title: '参数设置',
@@ -282,8 +283,8 @@ export default {
           this.gasbrand = res.data[0]
         })
         this.newmeterinfo = [{}]
-
-        let res = await this.$resetpost('/webmeter/rs/logic/getParamsByGasBrand', {data: {gasBrandId: val}}, {resolveMsg: '参数已加载', rejectMsg: null})
+        let res = await axios.post('/webmeter/rs/logic/getParamsByGasBrand', {data: {gasBrandId: val}}, {timeout: 10 * 60 * 1000})
+        // let res = await this.$resetpost('/webmeter/rs/logic/getParamsByGasBrand', {data: {gasBrandId: val}}, {resolveMsg: '参数已加载', rejectMsg: null})
         this.newmeterinfo = res.data
         for (let i = 0; i < this.newmeterinfo.length; i++) {
           this.paramtypes.push({label: this.newmeterinfo[i].name, value: this.newmeterinfo[i].name})