sale-client 3.5.245 → 3.5.246

package/package.json

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

package/src/filiale/wenxi/HandplanQuery.vue

@@ -738,6 +738,7 @@
       return {
         iswork:false,
         other:[],
+        condition:'',
         footer:[],
         data: {},
         model: new PagedList('rs/sql/salehandplanQuery', 20, {}, {
@@ -1041,6 +1042,7 @@
         }
 
         args.condition = `${args.condition} and f_meter_classify = '机表' ` + this.orgCondtionStr
+        this.condition = args.condition
         this.model.search(args.condition, args.model)
         this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
       },
@@ -1183,7 +1185,8 @@
         return {
           startDate: this.$refs.paged.$refs.cri.model.startDate,
           endDate: this.$refs.paged.$refs.cri.model.endDate,
-          condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr}
+          condition: this.condition
+        }
       },
       getfield() {
         return this.config.excelHeaders

package/src/sale.js

@@ -118,7 +118,7 @@ export default function () {
   // 读卡后，卡上信息
   Vue.component('cardinfo', (resolve) => { require(['./components/revenue/base/leftview/CardInfo'], resolve) })
   // 当前选择用户的用户基本信息
-  Vue.component('userinfo', (resolve) => { require(['./components/revenue/base/leftview/Userinfo'], resolve) })
+  Vue.component('sale-userinfo', (resolve) => { require(['./components/revenue/base/leftview/Userinfo'], resolve) })
   // 当前选择用户的表具基本信息
   Vue.component('user-meterinfodetail', (resolve) => { require(['./components/revenue/base/leftview/meterinfodetail'], resolve) })
   // 当前选择用户的其他信息