manage-client 3.2.100 → 3.2.103

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

@@ -13,7 +13,7 @@
                               :value.sync="model.startDate"
                               :format="'yyyy-MM-dd HH:mm:ss'"
                               :show-reset-button="true"
-                              condition="a.f_operate_date >= '{}'">
+                              condition="f_operate_date >= '{}'">
                   </datepicker>
                 </div>
                 <div class="col-sm-2 form-group">
@@ -23,19 +23,19 @@
                               :value.sync="model.endDate"
                               :format="'yyyy-MM-dd HH:mm:ss'"
                               :show-reset-button="true"
-                              condition="a.f_operate_date <= '{}'">
+                              condition="f_operate_date <= '{}'">
                   </datepicker>
                 </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_userinfo_code"
-                         condition="u.f_userinfo_code = '{}' " placeholder="客户编号">
+                         condition="f_userinfo_code = '{}' " placeholder="客户编号">
                 </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">气表类型</label>
                   <v-select :value.sync="model.metertypes" v-model="model.metertypes"
                             @change="$parent.$parent.metertypeschange"
-                            condition="s.f_meter_type = '{}'" multiple
+                            condition="f_meter_type = '{}'" multiple
                             placeholder='气表类型' :options="$parent.$parent.metertypes"
                             close-on-select v-ref:type>
                   </v-select>
@@ -72,7 +72,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.f_user_name"
-                         condition="s.f_user_name like '%{}%'" placeholder="客户名称">
+                         condition="f_user_name like '%{}%'" placeholder="客户名称">
                 </div>
 <!--                <div class="col-sm-2 form-group">-->
 <!--                  <label class="font_normal_body">客户电话</label>-->
@@ -94,7 +94,7 @@
                   <label class="font_normal_body">气价类型</label>
                   <v-select :value.sync="model.pricetypes" v-model="model.pricetypes"
                             @change="$parent.$parent.pricetypechanged"
-                            condition="sp.f_user_name like '%{}%'"
+                            condition="f_user_name like '%{}%'"
                             placeholder='气价类型' :options="$parent.$parent.pricetypes"
                             close-on-select v-ref:type>
                   </v-select>
@@ -113,14 +113,14 @@
                 <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_price"
-                         condition="c.f_price = '%{}%'" placeholder='单价'>
+                         condition="f_price = '%{}%'" placeholder='单价'>
                 </div>
 
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">客户类型</label>
                   <v-select :value.sync="model.usertypes" v-model="model.usertypes"
                             @change="$parent.$parent.usertypechange"
-                            condition="s.f_user_type = '{}'"
+                            condition="f_user_type = '{}'"
                             placeholder='客户类型' :options="$parent.$parent.usertypes"
                             close-on-select v-ref:type>
                   </v-select>
@@ -129,7 +129,7 @@
                   <label class="font_normal_body">用气类型</label>
                   <v-select :value.sync="model.gaspropertiestyps" v-model="model.gaspropertiestyps"
                             @change="$parent.$parent.gaspropertieschange"
-                            condition="s.f_gasproperties = '{}'"
+                            condition="f_gasproperties = '{}'"
                             placeholder='用气类型' :options="$parent.$parent.gaspropertiestyps"
                             close-on-select v-ref:type>
                   </v-select>
@@ -140,7 +140,7 @@
                   <label class="font_normal_body">收费类型</label>
                   <v-select :value.sync="model.typesss" v-model="model.typesss"
                             @change="$parent.$parent.typechangesss"
-                            condition="s.f_type = '{}'"
+                            condition="f_type = '{}'"
                             placeholder='收费类型' :options="$parent.$parent.typesss"
                             close-on-select v-ref:type>
 

package/src/components/sale/config/exportConfig.js

@@ -410,7 +410,7 @@ export default{
     'sum_oughtamount': '累计气量', 'f_oughtfee': '累计金额', 'avg_oughtamount': '月平均气量'
   },
   priceChangeConfig: {
-    'f_userinfo_id': '客户编号', 'f_user_name': '客户名称', 'f_olduserinfo_code': '档案编号', 'f_user_type': '客户类型',
+    'f_userinfo_code': '客户编号', 'f_user_name': '客户名称', 'f_olduserinfo_code': '档案编号', 'f_user_type': '客户类型',
     'f_address': '客户地址', 'f_user_phone': '客户电话', 'f_meter_classify': '气表类型',
     'old_price_name': '旧气价名称', 'new_price_name': '新气价名称', 'f_charge_type': '变更类型', 'f_operate_date': '变更时间',
     'f_perform_date': '执行时间', 'f_operator': '变更操作员', 'f_sendsuccess': '是否同步成功'
@@ -939,6 +939,50 @@ export default{
     'id': '收费编号', 'f_user_name': '客户姓名', 'f_user_type': '客户类型', 'f_address': '客户地址','f_pregas': '气量','f_preamount': '气费','f_delay': '应交滞纳金','f_delaypay': '实交滞纳金',
     'f_balance': '上期余额','f_curbalance': '本期余额','f_collection': '收款','f_state': '收费状态','f_operate_date': '收费日期','f_payment': '付款方式','f_type': '收费类型','f_comments': '备注',
     'f_operator': '收费人','f_orgname': '部门','f_depname': '公司'
+  },
+  // 上报数据
+  ReportDataConfig: {
+    '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':'金额状态',
+
+    'f_lowlithiumbattery':'电压状态',
+    'f_magneticinterference':'磁干扰异常',
+    'f_meterbalanceamt':'表内剩余金额',
+    'f_meterdebitamt':'表内累计充值金额',
+    'f_compensatestate':'补偿状态',
+    'f_meter_brand':'气表品牌',
+    'f_meter_style':'气表型号',
+    'f_orgname':'分公司'
+
   }
 }
 

package/src/components/sale/config/tableConfig.js

@@ -1,48 +1,48 @@
-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",
-
-      "电压状态":"f_lowlithiumbattery",
-      "磁干扰异常":"f_magneticinterference",
-      "表内剩余金额":"f_meterbalanceamt",
-      "表内累计充值金额":"f_meterdebitamt",
-      "补偿状态":"f_compensatestate",
-      "气表品牌":"f_meter_brand",
-      "气表型号":"f_meter_style",
-      "分公司":"f_orgname"
-
-    }
-
-}
+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",
+
+      "外电低电":"f_lowlithiumbattery",
+      "磁干扰异常":"f_magneticinterference",
+      "表内剩余金额":"f_meterbalanceamt",
+      "表内累计充值金额":"f_meterdebitamt",
+      "补偿状态":"f_compensatestate",
+      "气表品牌":"f_meter_brand",
+      "气表型号":"f_meter_style",
+      "分公司":"f_orgname"
+
+    }
+
+}

package/src/components/webmeter/DrillData/UserGasAll.vue

@@ -66,7 +66,7 @@
 <!--                  <res-select-group  :show-component="['company']" :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>-->
                   <div class="col-sm-2 form-group">
                     <label class="font_normal_body">表&emsp;&emsp;号</label>
-                    <input  style="width:60%" class="input_search" condition="f_meternumber = '{}'" placeholder='表号' type="text"
+                    <input  style="width:60%" class="input_search" condition="f_meternumber = '%{}'" placeholder='表号' type="text"
                             v-el:meternumber v-model="model.f_meternumber" v-next-el='meternumber'
                     >
                   </div>

package/src/components/webmeter/WebmeterQuery.vue

@@ -27,6 +27,9 @@
     <tabs header="未用气查询" v-if="permission('未用气查询')">
       <get-no-meteread-query v-if="show.includes('未用气查询')"></get-no-meteread-query>
     </tabs>
+    <tabs header="物联网表结算分析" v-if="permission('物联网表结算分析')">
+      <webmeter-settlement-analysis v-if="show.includes('物联网表结算分析')"></webmeter-settlement-analysis>
+    </tabs>
   </tab-button>
 
 </template>