manage-client 3.2.281 → 3.2.282

package/package.json

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

package/src/filiale/wenxi/WebHandQuery.vue

@@ -18,7 +18,7 @@
                 <div class="col-sm-2">
                   <label class="font_normal_body">客户编号</label>
                   <input @keyup.enter="search"  style="width:60%"  type="text" class="input_search" v-model="model.f_userinfo_code" placeholder='客户编号'
-                         condition="f_userinfo_code = '{}'" v-next-el='f_userinfo_code' v-el:meternumber
+                         condition="f_userinfo_code = '{}'" v-next-el='f_userinfo_code' v-el:meternumber @change="$parent.$parent.inputChange"
                   >
                 </div>
                 <div class="col-sm-2">
@@ -281,7 +281,7 @@
         orgCondtionStr: '',
         model: new PagedList('rs/sql/manage_webmeterHandQuery', 50,{
           startDate: 'this.model.startDate',
-          endDate: 'this.model.endDate'
+          endDate: 'this.model.endDate',f_userinfo_code: 'this.model.f_userinfo_code'
         }),
         showbottomsum:false  //页面下方是否有合计: 默认为false, 在watch修改
       }
@@ -293,11 +293,20 @@
       }).catch((error) => {
         this.$emit('error', error)
       })
-      // this.$refs.paged.$refs.criteria.model.startDate = Util.addDate(new Date(),0).substring(0,10) + ' 00:00:00'
-      // this.$refs.paged.$refs.criteria.model.endDate = Util.addDate(new Date(),0).substring(0,10) + ' 23:59:59'
+      this.$refs.paged.$refs.criteria.model.startDate = Util.addDate(new Date(),0).substring(0,10) + ' 00:00:00'
+      this.$refs.paged.$refs.criteria.model.endDate = Util.addDate(new Date(),0).substring(0,10) + ' 23:59:59'
       // this.$refs.paged.$refs.criteria.search()
     },
     methods: {
+      inputChange () {
+        if (this.$refs.paged.$refs.criteria.model.f_userinfo_code){
+          this.$refs.paged.$refs.criteria.model.startDate = ''
+          this.$refs.paged.$refs.criteria.model.endDate = ''
+        }else{
+          this.$refs.paged.$refs.criteria.model.startDate = Util.addDate(new Date(),0).substring(0,10) + ' 00:00:00'
+          this.$refs.paged.$refs.criteria.model.endDate = Util.addDate(new Date(),0).substring(0,10) + ' 23:59:59'
+        }
+      },
       initParams() {
         // 初始化气表品牌
         let brandArr = []
@@ -354,15 +363,6 @@
       },
 
       search (args) {
-        if (this.$refs.paged.$refs.criteria.model.startDate == '' || this.$refs.paged.$refs.criteria.model.endDate == ''){
-          if (this.$refs.paged.$refs.criteria.model.f_userinfo_code){
-            this.$refs.paged.$refs.criteria.model.startDate = '1990-01-01 00:00:00'
-            this.$refs.paged.$refs.criteria.model.endDate = Util.addDate(new Date(),1).substring(0,10) + ' 00:00:00'
-          }else{
-            this.$refs.paged.$refs.criteria.model.startDate = Util.addDate(new Date(),0).substring(0,10) + ' 00:00:00'
-            this.$refs.paged.$refs.criteria.model.endDate = Util.addDate(new Date(),0).substring(0,10) + ' 23:59:59'
-          }
-        }
         args.condition =  `${args.condition}`+this.orgcondition
         this.condition = args.condition
         this.model.search(args.condition, args.model)

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

@@ -867,22 +867,22 @@ export default{
   },
   // 物联网表抄表
   webmeterHandConfig: {
-    'f_userinfo_code': '用户编号',
-    'f_user_name': '用户名称',
+    'f_userinfo_code': '客户编号',
+    'f_user_name': '客户名称',
     'f_residential_area': '小区名称',
     'f_address': '地址',
-    'f_meter_brand': '气表品牌',
     'f_meternumber': '表号',
-    'f_oughtamount': '本期气量',
-    'f_oughtfee': '本期金额',
-    'f_jval': '表内剩余余额',
+    'f_meter_brand': '气表品牌',
     'f_hand_date': '抄表日期',
     'f_total_fee': '累计购气金额',
     'f_last_tablebase': '上期底数',
     'f_tablebase': '本期底数',
-    'f_balance_amount': '系统余额',
+    'f_curbalance': '系统余额',
+    'f_jval': '表上余额',
     'cyclegas': '当前周期已用气量',
     'cyclefee': '当前周期消费金额',
+    'f_oughtamount': '本次气量',
+    'f_oughtfee': '本次金额',
     'f_stair1price': '一阶气价',
     'f_stairamount1': '一阶气量',
     'f_stair1fee': '一阶金额',