manage-client 3.3.233 → 3.3.235

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

@@ -0,0 +1,59 @@
+export default {
+  // 查询页面的字段名和中文对应
+  ReportDataQuery: {
+    '用户编号': 'f_userinfo_code',
+    '用户名称': 'f_user_name',
+    '用户地址': 'f_address',
+    '小区': 'f_residential_area',
+    '用户类型': 'f_user_type',
+    '用气类型': 'f_user_nature',
+    '用气性质': 'f_gasproperties',
+    '表号': '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',
+    '部门': 'f_depname'
+
+  }
+
+}

package/src/filiale/fugou/sale.js

@@ -0,0 +1,6 @@
+// 分公司特殊组件页面注册
+import Vue from 'vue'
+export default function () {
+// 综合档案信息查询
+  Vue.component('record-info-query', (resolve) => { require(['./RecordInfoQuery'], resolve) })
+}

package/src/filiale/yangchun/OtherChargeQuery.vue

@@ -75,7 +75,7 @@
                             :value.sync="model.f_brand_spec" multiple
                             :options='$parent.$parent.chargetype'
                             @change="$parent.$parent.setTypename"
-                            close-on-select clear-button></v-select>
+                             clear-button></v-select>
                 </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">品名规格</label>
@@ -85,7 +85,7 @@
                             :value.sync="model.f_typename" multiple
                             :options='$parent.$parent.typeNameList'
                             @change="$parent.$parent.setTypenumber"
-                            close-on-select clear-button>
+                             clear-button>
                   </v-select>
                 </div>
                 <div class="col-sm-2 form-group">
@@ -138,7 +138,7 @@
                             multiple="true"
                             :value.sync="model.f_state"
                             :options='$parent.$parent.chargeState'
-                            close-on-select clear-button>
+                             clear-button>
                   </v-select>
                 </div>
 
@@ -151,7 +151,7 @@
                             multiple="true"
                             :value.sync="model.f_payment"
                             :options='$parent.$parent.payments'
-                            close-on-select clear-button>
+                             clear-button>
                   </v-select>
                 </div>
                 <div class="col-sm-2 form-group">
@@ -170,7 +170,7 @@
                   <v-select :value.sync="model.f_meter_classify" multiple
                             :options='$parent.$parent.metertypes' placeholder='请选择' v-model="model.f_meter_classify"
                             condition="f_meter_classify in {}"
-                            close-on-select></v-select>
+                            ></v-select>
                 </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">气表品牌</label>
@@ -178,7 +178,7 @@
                             v-model="model.f_meter_brand"
                             :options='$parent.$parent.meterbrands' placeholder='请选择'
                             condition="f_meter_brand in {}"
-                            close-on-select></v-select>
+                            ></v-select>
                 </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body" title="收据起始编号">收据票号</label>

package/src/filiale/yangchun/UserQuery.vue

@@ -98,7 +98,7 @@
                               v-model="model.f_payment"
                               :options='$parent.$parent.dypayment' placeholder='请选择'
                               condition="f_cost_type in {}"
-                              close-on-select></v-select>
+                              ></v-select>
                   </div>
                   <div class="col-sm-2 form-group">
                     <label class="font_normal_body">客户地址</label>
@@ -145,7 +145,7 @@
                               v-model="model.f_residential_area"
                               style="width: 60%"
                               :options='$parent.$parent.residentialArea' placeholder='选择小区'
-                              close-on-select>
+                              >
 
                     </v-select>
                   </div>
@@ -185,7 +185,7 @@
                               v-model="model.f_inputtor" condition="f_inputtor = '{}'"
                               :options='$parent.$parent.inputtores' placeholder='请选择'
                               multiple = "true"
-                              close-on-select></v-select>
+                              ></v-select>
                   </div>
 
                   <!--            <div class="col-sm-2" >-->
@@ -256,7 +256,7 @@
                               v-model="model.f_user_level" condition="f_user_level in {}"
                               :options='$parent.$parent.userLevels' placeholder='请选择'
                               multiple = "true"
-                              close-on-select></v-select>
+                              ></v-select>
                   </div>
                   <div class="col-sm-2 form-group">
                     <label class="font_normal_body">通气状态</label>

package/src/stores/MagLoadParams.js

@@ -8,7 +8,9 @@ let loadParamGen = async function (f_filialeid) {
 
   if (GetSaleParam.gasbrands.length === 0 && GetSaleParam.prices.length === 0 && GetSaleParam.adjustables.length === 0 ) {
     let getParams = await http.load('POST','api/af-revenue/logic/getSaleInitData', {data: {f_orgid: f_filialeid?f_filialeid: Vue.$login.f.orgid}}, {resolveMsg: null, rejectMsg: '获取营收参数出错！！！'})
-    if (getParams.data) {
+    if (getParams.data && getParams.data.data) {
+      MagLoadParams.organizeData(getParams.data.data)
+    }else if (getParams.data) {
       MagLoadParams.organizeData(getParams.data)
     }
   } else {
@@ -16,9 +18,11 @@ let loadParamGen = async function (f_filialeid) {
       GetSaleParam.prices = []
       GetSaleParam.adjustables = []
       let getParams = await http.load('POST','api/af-revenue/logic/getSaleInitData', {data: {f_orgid: f_filialeid ? f_filialeid : Vue.$login.f.orgid}}, {resolveMsg: null, rejectMsg: '获取营收参数出错！！！'})
-      if (getParams.data) {
-        MagLoadParams.organizeData(getParams.data)
-      }
+    if (getParams.data && getParams.data.data) {
+      MagLoadParams.organizeData(getParams.data.data)
+    }else if (getParams.data) {
+      MagLoadParams.organizeData(getParams.data)
+    }
   }
 }