manage-client 3.2.124 → 3.2.127

package/src/filiale/qingtongxia/SellPeopleQuery.vue

@@ -80,19 +80,14 @@
                             condition="f_payment in {}"
                             close-on-select></v-select>
                 </div>
-                <!--<div class="col-sm-2 form-group">-->
-                  <!--<label class="font_normal_body">收费类型</label>-->
-                 <!--&lt;!&ndash; <v-select :value.sync="model.f_type"-->
-                            <!--v-model="model.f_type"-->
-                            <!--:options='$parent.$parent.chargetype' placeholder='请选择'-->
-                            <!--condition="f_type = '{}'"-->
-                            <!--close-on-select></v-select>&ndash;&gt;-->
-                  <!--<v-select :value.sync="model.f_type" multiple-->
-                            <!--:options='$parent.$parent.chargetype' placeholder='请选择'-->
-                            <!--close-on-select clear-button-->
-                            <!--condition="f_type in {}"-->
-                            <!--v-model="model.f_type"></v-select>-->
-                <!--</div>-->
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">收费类型</label>
+                  <v-select :value.sync="model.f_type" multiple
+                            :options='$parent.$parent.chargetype' placeholder='请选择'
+                            close-on-select clear-button
+                            condition="f_type in {}"
+                            v-model="model.f_type"></v-select>
+                </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">客户类型</label>
                   <v-select :value.sync="model.f_user_type"

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

@@ -380,7 +380,7 @@ export default{
   priceChangeConfig: {
     'f_userinfo_id': '客户编号', 'f_user_name': '客户名称', 'f_user_type': '客户类型',
     'f_address': '客户地址', 'f_user_phone': '客户电话', 'f_meter_classify': '气表类型',
-    'old_price_name': '旧气价名称', 'new_price_name': '新气价名称', 'f_charge_type': '变更类型', 'f_operate_date': '变更时间',
+    'old_price_name': '旧气价名称', 'new_price_name': '新气价名称', 'f_change_type': '变更类型', 'f_operate_date': '变更时间',
     'f_perform_date': '执行时间', 'f_operator': '变更操作员', 'f_sendsuccess': '是否同步成功'
   },
   ysConfig: {
@@ -402,7 +402,7 @@ export default{
     'f_ssgas': '实收气量',
     'f_ssfee': '实收金额',
     'f_monthqgas': '欠费气量',
-    'f_monthqfee': '欠费金额',
+   'f_monthqfee': '欠费金额',
     'f_sumqgas': '累计欠费气量',
     'f_sumqfee': '累计欠费金额',
     'f_qqgas': '清欠气量',

package/src/reportManage.js

@@ -558,6 +558,10 @@ export default function (filiale) {
   Vue.component('price-report-whwu', (resolve) => {
     require(['./components/SellReport/PriceReportWHwu'], resolve)
   })
+  // 天然气售气表具月报表
+  Vue.component('market-month-money', (resolve) => {
+    require(['./components/SellReport/MarketMonthMoney'], resolve)
+  })
   if (filiale) {
     let filialeComp = require(`./filiale/${filiale}/reportManage`).specialComp
     Vue.filialeInfo = Vue.prototype.$filialeInfo = filiale

package/src/saleManage.js

@@ -238,6 +238,10 @@ export default function (filiale) {
   Vue.component('hand-book-query', (resolve) => {
     require(['./components/sale/businessquery/HandBookQuery'], resolve)
   })
+  // 抄表册汇总表2
+  Vue.component('hand-book-two-query', (resolve) => {
+    require(['./components/sale/businessquery/HandBookTwoQuery'], resolve)
+  })
   // 用气性质抄表率汇总表
   Vue.component('hand-gas-properties-query', (resolve) => {
     require(['./components/sale/businessquery/HandGasPropertiesQuery'], resolve)