manage-client 3.3.18 → 3.3.20

package/src/filiale/lixianV3/config/tableConfig.js

@@ -0,0 +1,54 @@
+export default{
+  //查询页面的字段名和中文对应
+  ReportDataQuery:
+    {
+      "用户编号":"f_userinfo_code",
+      "用户名称":"f_user_name",
+      "表号":"f_meternumber",
+      "本次抄表底数":"f_tablebase",
+      "上次抄表底数":"f_last_tablebase",
+      "表上余额":"f_jval",
+      "抄表日期":"f_hand_date",
+
+      "上次抄表日期":"f_last_hand_date",
+      "开户日期":"f_gas_date",
+      "软件版本号":"f_software_version",
+      "表状态信息":"f_table_msg",
+      "上次表状态信息":"f_last_meter_state_msg",
+
+      "插入日期":"f_insert_date",
+      "上次插入日期":"f_last_insertdate",
+      "是否结算":"f_whether_clear",
+      "超用气量":"f_super_gas",
+      "电量等级":"f_electricity",
+
+      "购气次数":"f_times",
+      "单价":"f_price",
+      "信号强度":"f_signal",
+      "信噪比":"f_snr",
+      "电压":"f_batterylevel",
+
+      "阀门强制状态":"f_networkshutvalve",
+      "阀门状态":"f_valvestate",
+      "计量类型":"f_wmprepaytype",
+      "上报类型":"f_upload_type",
+      "金额状态":"f_moneystate",
+
+      "增加工况瞬时":"operatingModeFlow",
+      "标况瞬时":"standardConditionFlow",
+      "开盖状态" :"f_SplitAlarm",
+      "液晶状态" : "f_XTIpllStopFlag",
+      "声速" :"soundVelocity",
+
+      "外电低电":"f_lowlithiumbattery",
+      "磁干扰异常":"f_magneticinterference",
+      "表内剩余金额":"f_meterbalanceamt",
+      "表内累计充值金额":"f_meterdebitamt",
+      "补偿状态":"f_compensatestate",
+      "气表品牌":"f_meter_brand",
+      "气表型号":"f_meter_style",
+      "分公司":"f_orgname"
+
+    }
+
+}

package/src/filiale/lixianV3/sale.js

@@ -0,0 +1,11 @@
+// 分公司特殊组件页面注册
+import Vue from 'vue'
+
+export default function () {
+  // 气量年比
+  Vue.component('use-gas-year-ratio', (resolve) => { require(['./GasYearRatioQuery'], resolve) })
+  // 发票查询
+  Vue.component('invoice-details-query', (resolve) => { require(['./InvoiceDetailsQuery.vue'], resolve) })
+  // 业务查询
+  Vue.component('business-manage', (resolve) => {require(['./BusinessManage'], resolve)})
+}

package/src/filiale/qianneng/QnAqzz.vue

@@ -1,8 +1,5 @@
 <template>
   <tab-button v-ref:list :active="-1">
-    <tabs header="加装花名册" >
-      <qn-aqzz-hmc v-if="show.includes('加装花名册')" @deal-msg="dealMsg" :data="data"></qn-aqzz-hmc>
-    </tabs>
     <tabs header="缴费明细" >
       <qn-aqzz-jfmx v-if="show.includes('缴费明细')" @deal-msg="dealMsg" :data="data"></qn-aqzz-jfmx>
     </tabs>
@@ -12,6 +9,9 @@
     <tabs header="乡镇居委会汇总" >
       <qn-aqzz-xzjwhhz v-if="show.includes('乡镇居委会汇总')" @deal-msg="dealMsg" :data="data"></qn-aqzz-xzjwhhz>
     </tabs>
+    <tabs header="加装花名册" >
+      <qn-aqzz-hmc v-if="show.includes('加装花名册')" @deal-msg="dealMsg" :data="data"></qn-aqzz-hmc>
+    </tabs>
   </tab-button>
 
 </template>

package/src/filiale/qianneng/QnAqzzHmc.vue

@@ -29,15 +29,12 @@
                   </div>
 
                   <div class="col-sm-2 form-group">
-                    <label class="font_normal_body">用户编号</label>
-                    <input type="text" style="width:60%" class="input_search" v-model="model.b_yhh"
-                           condition="f_userinfo_code = '{}' " placeholder="用户编号">
-                  </div>
-
-                  <div class="col-sm-2 form-group">
-                    <label class="font_normal_body">姓名</label>
-                    <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
-                           condition="f_user_name like '%{}%' " placeholder="姓名">
+                    <label class="font_normal_body">是否合规</label>
+                    <v-select :value.sync="model.sfhg"
+                              :options='$parent.$parent.sfhgArray' placeholder='请选择' v-model="model.sfhg"
+                              condition="sfhg in {}"
+                              closeOnSelect
+                    ></v-select>
                   </div>
 
                   <div class="span" style="float:right;">
@@ -56,6 +53,18 @@
                   </div>
                 </div>
                 <div class="row" v-show="$parent.$parent.criteriaShow">
+                  <div class="col-sm-2 form-group">
+                    <label class="font_normal_body">用户编号</label>
+                    <input type="text" style="width:60%" class="input_search" v-model="model.b_yhh"
+                           condition="f_userinfo_code = '{}' " placeholder="用户编号">
+                  </div>
+
+                  <div class="col-sm-2 form-group">
+                    <label class="font_normal_body">姓名</label>
+                    <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
+                           condition="f_user_name like '%{}%' " placeholder="姓名">
+                  </div>
+
                   <div class="col-sm-2 form-group">
                     <label class="font_normal_body">乡镇</label>
                     <v-select :value.sync="model.f_community"
@@ -212,8 +221,8 @@ let readySomething = async function (self) {
   self.$MagGetSaleParam.initinputtor();
   self.getinputtores();
   // 获取区县
-  self.$refs.paged.$refs.cri.model.startDate = self.$login.toStandardDateString() + ' 00:00:00'
-  self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString() + ' 23:59:59'
+  self.$refs.paged.$refs.cri.model.startDate = self.$login.addDate(self.$login.toStandardDateString() + ' 00:00:00', -1) ;
+  self.$refs.paged.$refs.cri.model.endDate = self.$login.addDate(self.$login.toStandardDateString() + ' 23:59:59', -1) ;
   // await self.$refs.paged.$refs.cri.search()
   self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
   self.defaultfield = [...self.defaultfield, ...self.config.defaultPrint]
@@ -277,6 +286,7 @@ export default {
       allorgid:[],
       f_filialeid: this.$login.f.f_orgid,
       dypayment:[{label:"全部",value:""},{label:"银行代扣",value:"银行代扣",},{label:"现金缴费",value:"现金缴费",}],
+      sfhgArray:[{label:"全部",value:""},{label:"是",value:"是",},{label:"否",value:"否",}],
     }
   },
   ready() {
@@ -598,7 +608,12 @@ export default {
     },
 
     getCondition() {
-      return {condition: this.condition2,orderitem:this.orderitem}
+      return {
+        startDate: this.$refs.paged.$refs.cri.model.startDate,
+        endDate: this.$refs.paged.$refs.cri.model.endDate,
+        condition: this.condition2,
+        orderitem:this.orderitem
+      }
     },
     getfield() {
       let data = {}

package/src/filiale/qianneng/QnAqzzJfmx.vue

@@ -29,15 +29,12 @@
                   </div>
 
                   <div class="col-sm-2 form-group">
-                    <label class="font_normal_body">用户编号</label>
-                    <input type="text" style="width:60%" class="input_search" v-model="model.b_yhh"
-                           condition="f_userinfo_code = '{}' " placeholder="用户编号">
-                  </div>
-
-                  <div class="col-sm-2 form-group">
-                    <label class="font_normal_body">姓名</label>
-                    <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
-                           condition="f_user_name like '%{}%' " placeholder="姓名">
+                    <label class="font_normal_body">是否合规</label>
+                    <v-select :value.sync="model.sfhg"
+                              :options='$parent.$parent.sfhgArray' placeholder='请选择' v-model="model.sfhg"
+                              condition="sfhg in {}"
+                              closeOnSelect
+                    ></v-select>
                   </div>
 
                   <div class="span" style="float:right;">
@@ -56,6 +53,17 @@
                   </div>
                 </div>
                 <div class="row" v-show="$parent.$parent.criteriaShow">
+                  <div class="col-sm-2 form-group">
+                    <label class="font_normal_body">用户编号</label>
+                    <input type="text" style="width:60%" class="input_search" v-model="model.b_yhh"
+                           condition="f_userinfo_code = '{}' " placeholder="用户编号">
+                  </div>
+
+                  <div class="col-sm-2 form-group">
+                    <label class="font_normal_body">姓名</label>
+                    <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
+                           condition="f_user_name like '%{}%' " placeholder="姓名">
+                  </div>
                   <div class="col-sm-2 form-group">
                     <label class="font_normal_body">乡镇</label>
                     <v-select :value.sync="model.f_community"
@@ -75,7 +83,7 @@
                   <div class="col-sm-2 form-group">
                     <label class="font_normal_body">安装联系电话</label>
                     <input type="text" style="width:60%" class="input_search" v-model="model.azlxdh"
-                           condition="azlxdh like '%{}%' " placeholder="安装联系电话">
+                           condition="f_contact_phone like '%{}%' " placeholder="安装联系电话">
                   </div>
                 </div>
               </div>
@@ -154,7 +162,7 @@
                   <nobr>{{row.f_user_phone}}</nobr>
                 </td>
                 <td style="text-align: center;">
-                  <nobr>{{row.azlxdh}}</nobr>
+                  <nobr>{{row.f_contact_phone}}</nobr>
                 </td>
                 <td style="text-align: center;">
                   <nobr>{{row.f_typename}}</nobr>
@@ -212,8 +220,8 @@ let readySomething = async function (self) {
   self.$MagGetSaleParam.initinputtor();
   self.getinputtores();
   // 获取区县
-  self.$refs.paged.$refs.cri.model.startDate = self.$login.toStandardDateString() + ' 00:00:00'
-  self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString() + ' 23:59:59'
+  self.$refs.paged.$refs.cri.model.startDate = self.$login.addDate(self.$login.toStandardDateString() + ' 00:00:00', -1) ;
+  self.$refs.paged.$refs.cri.model.endDate = self.$login.addDate(self.$login.toStandardDateString() + ' 23:59:59', -1) ;
   // await self.$refs.paged.$refs.cri.search()
   self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
   self.defaultfield = [...self.defaultfield, ...self.config.defaultPrint]
@@ -277,6 +285,7 @@ export default {
       allorgid:[],
       f_filialeid: this.$login.f.f_orgid,
       dypayment:[{label:"全部",value:""},{label:"银行代扣",value:"银行代扣",},{label:"现金缴费",value:"现金缴费",}],
+      sfhgArray:[{label:"全部",value:""},{label:"是",value:"是",},{label:"否",value:"否",}],
     }
   },
   ready() {
@@ -598,7 +607,12 @@ export default {
     },
 
     getCondition() {
-      return {condition: this.condition2,orderitem:this.orderitem}
+      return {
+          startDate: this.$refs.paged.$refs.cri.model.startDate,
+          endDate: this.$refs.paged.$refs.cri.model.endDate,
+          condition: this.condition2,
+          orderitem:this.orderitem
+      }
     },
     getfield() {
       let data = {}

package/src/filiale/qianneng/QnAqzzXzhz.vue

@@ -139,8 +139,8 @@ let readySomething = async function (self) {
   self.$MagGetSaleParam.initinputtor();
   self.getinputtores();
   // 获取区县
-  self.$refs.paged.$refs.cri.model.startDate = self.$login.toStandardDateString() + ' 00:00:00'
-  self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString() + ' 23:59:59'
+  self.$refs.paged.$refs.cri.model.startDate = self.$login.addDate(self.$login.toStandardDateString() + ' 00:00:00', -1) ;
+  self.$refs.paged.$refs.cri.model.endDate = self.$login.addDate(self.$login.toStandardDateString() + ' 23:59:59', -1) ;
   // await self.$refs.paged.$refs.cri.search()
   self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
   self.defaultfield = [...self.defaultfield, ...self.config.defaultPrint]
@@ -525,7 +525,12 @@ export default {
     },
 
     getCondition() {
-      return {condition: this.condition2,orderitem:this.orderitem}
+      return {
+        startDate: this.$refs.paged.$refs.cri.model.startDate,
+        endDate: this.$refs.paged.$refs.cri.model.endDate,
+        condition: this.condition2,
+        orderitem:this.orderitem
+      }
     },
     getfield() {
       let data = {}

package/src/filiale/qianneng/QnAqzzXzjwhhz.vue

@@ -153,8 +153,8 @@ let readySomething = async function (self) {
   self.$MagGetSaleParam.initinputtor();
   self.getinputtores();
   // 获取区县
-  self.$refs.paged.$refs.cri.model.startDate = self.$login.toStandardDateString() + ' 00:00:00'
-  self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString() + ' 23:59:59'
+  self.$refs.paged.$refs.cri.model.startDate = self.$login.addDate(self.$login.toStandardDateString() + ' 00:00:00', -1) ;
+  self.$refs.paged.$refs.cri.model.endDate = self.$login.addDate(self.$login.toStandardDateString() + ' 23:59:59', -1) ;
   // await self.$refs.paged.$refs.cri.search()
   self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
   self.defaultfield = [...self.defaultfield, ...self.config.defaultPrint]
@@ -539,7 +539,12 @@ export default {
     },
 
     getCondition() {
-      return {condition: this.condition2,orderitem:this.orderitem}
+      return {
+        startDate: this.$refs.paged.$refs.cri.model.startDate,
+        endDate: this.$refs.paged.$refs.cri.model.endDate,
+        condition: this.condition2,
+        orderitem:this.orderitem
+      }
     },
     getfield() {
       let data = {}

package/src/filiale/qianneng/sale.js

@@ -1,6 +1,7 @@
 // 分公司特殊组件页面注册
 import Vue from 'vue'
 export default function () {
+
   Vue.component('other-charge-query', (resolve) => { require(['./OtherChargeQuery'], resolve) })
   Vue.component('arrears-query', (resolve) => { require(['./ArrearsQuery'], resolve) })
   Vue.component('charge-query', (resolve) => { require(['./ChargeQuery'], resolve) })

package/src/filiale/shanxian/ChargeQuery.vue

@@ -9,12 +9,12 @@
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">用户编号</label>
                   <input type="text" style="width:60%" class="input_search" v-model="model.f_userinfo_code"
-                         condition="f_userinfo_code = '{}' " placeholder="用户编号">
+                         condition="f_userinfo_code like '%{}%' " placeholder="用户编号">
                 </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">用户名称</label>
                   <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
-                         condition="f_user_name = '{}'" placeholder="用户名称">
+                         condition="f_user_name like '%{}%'" placeholder="用户名称">
                 </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">用户地址</label>

package/src/filiale/shanxian/UserQuery.vue

@@ -10,12 +10,12 @@
                   <div class="col-sm-2 form-group">
                     <label class="font_normal_body">{{$parent.$parent.usertitle}}编号</label>
                     <input type="text" style="width:60%" class="input_search" v-model="model.f_userinfo_code"
-                           condition="f_userinfo_code = '{}' " placeholder={{$parent.$parent.usertitle}}编号>
+                           condition="f_userinfo_code like '%{}%' " placeholder={{$parent.$parent.usertitle}}编号>
                   </div>
                   <div class="col-sm-2 form-group">
                     <label class="font_normal_body">{{$parent.$parent.usertitle}}名称</label>
                     <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
-                           condition="f_user_name = '{}'" placeholder={{$parent.$parent.usertitle}}名称>
+                           condition="f_user_name like '%{}%'" placeholder={{$parent.$parent.usertitle}}名称>
                   </div>
                   <div class="col-sm-2 form-group">
                     <label class="font_normal_body">{{$parent.$parent.usertitle}}地址</label>