sale-client 3.5.3 → 3.5.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "3.5.3",
+  "version": "3.5.4",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {

package/src/filiale/tongchuan/StairPrice/GasPrice.vue

@@ -194,6 +194,9 @@
       <div v-if="data" style="text-align:right;height:auto;margin-top:6px;">
         <a @click="showChangeView">查看变更记录</a>
       </div>
+      <div>
+        <price-change-history :row="data"></price-change-history>
+      </div>
       <!--</div>-->
     </validator>
     <limit-gas :f_price_id="model.id" :show.sync="limitShow" @limit="getLimitGas"></limit-gas>

package/src/filiale/tongchuan/StairPrice/PriceChangeHistory.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="auto" style="height: 500px">
+  <div class="auto">
       <data-grid :model="model" class="list_area table_sy"  partial='list' v-ref:grid >
         <template partial='head'>
           <tr>

package/src/main.js

@@ -7,7 +7,7 @@ import VueClipboard from 'vue-clipboard2'
 Vue.use(VueClipboard)
 Vue.config.silent = true
 // 新打包写法
-Vue.use(sale, {filiale: 'tongchuan'})
+Vue.use(sale, {filiale: 'rizhao'})
 address()
 ldap()
 require('system-clients/src/styles/less/bootstrap.less')

package/src/plugins/FileManageService.js

@@ -55,7 +55,7 @@ let FileManageService = {
       result.infobank.f_bank_name = bank.f_bank_name.length > 0 ? bank.f_bank_name[0] : ''
     }
     // 获取分公司id (通过ids拆分)
-      result.f_filialeid = data.f_filialeid
+    result.f_filialeid = data.f_filialeid
     if (result.f_userinfo_id === null) {
       result.f_createfile_person = Vue.$login.f.name
       result.f_createfile_date = Vue.$login.toStandardTimeString()
@@ -101,7 +101,7 @@ let FileManageService = {
       if (meter.f_hand_month) {
         meter.f_hand_month = meter.f_hand_month.length > 0 ? meter.f_hand_month[0] : null
       }
-      if (meter.f_overdue_set){
+      if (meter.f_overdue_set) {
         meter.f_overdue_set = meter.f_overdue_set.length > 0 ? meter.f_overdue_set[0] : null
       }
       if (meter.f_riser_shaft) {
@@ -156,24 +156,24 @@ let FileManageService = {
       }
 
       meter.f_user_type = meter.f_user_type.length > 0 ? meter.f_user_type[0] : ''
-      if(meter.fireinfo){
-        if(meter.f_user_type=='民用'){
-          meter.fireinfo.f_llj_scope=meter.fireinfo.f_control_brand=
-          meter.fireinfo.f_contact_method=
-          meter.fireinfo.f_control_model=meter.fireinfo.f_control_date=
-          meter.fireinfo.f_control_code=meter.fireinfo.f_control_number=
-          meter.fireinfo.f_appliance_type=meter.fireinfo.f_appliance_brand=
-          meter.fireinfo.f_appliance_model=meter.fireinfo.f_alarm_info=
-          meter.fireinfo.f_detector_number= null
-        }else{
-          meter.fireinfo.f_galvanize_pipe=meter.fireinfo.f_tee=
-          meter.fireinfo.f_nipple=meter.fireinfo.f_elbow=
-          meter.fireinfo.f_pipe_strap=meter.fireinfo.f_zqf=
-          meter.fireinfo.f_sebific_duct=meter.fireinfo.f_zbf=
-          meter.fireinfo.f_gas_appliance=meter.fireinfo.f_gas_appliance_num=
-          meter.fireinfo.f_geyser=meter.fireinfo.f_geyser_num=
-          meter.fireinfo.f_bgl=meter.fireinfo.f_bgl_style=
-          meter.fireinfo.f_bgl_num=  null
+      if (meter.fireinfo) {
+        if (meter.f_user_type == '民用') {
+          meter.fireinfo.f_llj_scope = meter.fireinfo.f_control_brand =
+          meter.fireinfo.f_contact_method =
+          meter.fireinfo.f_control_model = meter.fireinfo.f_control_date =
+          meter.fireinfo.f_control_code = meter.fireinfo.f_control_number =
+          meter.fireinfo.f_appliance_type = meter.fireinfo.f_appliance_brand =
+          meter.fireinfo.f_appliance_model = meter.fireinfo.f_alarm_info =
+          meter.fireinfo.f_detector_number = null
+        } else {
+          meter.fireinfo.f_galvanize_pipe = meter.fireinfo.f_tee =
+          meter.fireinfo.f_nipple = meter.fireinfo.f_elbow =
+          meter.fireinfo.f_pipe_strap = meter.fireinfo.f_zqf =
+          meter.fireinfo.f_sebific_duct = meter.fireinfo.f_zbf =
+          meter.fireinfo.f_gas_appliance = meter.fireinfo.f_gas_appliance_num =
+          meter.fireinfo.f_geyser = meter.fireinfo.f_geyser_num =
+          meter.fireinfo.f_bgl = meter.fireinfo.f_bgl_style =
+          meter.fireinfo.f_bgl_num = null
         }
       }
       // meter.f_industry_comments = meter.f_industry_comments.length > 0 ? meter.f_industry_comments[0] : ''
@@ -204,7 +204,7 @@ let FileManageService = {
       meter.f_userfiles_address = meter.f_userfiles_address ? meter.f_userfiles_address : null
       if (!meter.f_userfiles_id) {
         // 气表状态需要根据表型判断是否需要开通操作 目前物联网表需要做开通操作
-        meter.f_table_state = '正常'
+        meter.f_table_state = result.f_user_state === '预备' ? '待开通' : '正常'
         // meter.f_whether_hairpin = !item.gasbrand[0].f_meter_type.includes('机表') ? '未发' : '无卡'
         // 所有表变成未发
         meter.f_whether_hairpin = '未发'
@@ -271,16 +271,16 @@ let FileManageService = {
       meter.devicesinfo = userfilesdevices
       result.userfiles.push(meter)
     })
-    //用户设备信息
+    // 用户设备信息
     result.userphonelist = []
     let userphonelist = []
-    if(data.baseinfo.userphonelist){
+    if (data.baseinfo.userphonelist) {
       data.baseinfo.userphonelist.forEach((item) => {
-        if(item.f_rent_phone){
+        if (item.f_rent_phone) {
           let userphone = Object.assign({}, userphone, item)
           userphone.f_userinfo_id = result.f_userinfo_id ? result.f_userinfo_id + '' : null,
-          userphone.f_rent_phone = userphone.f_rent_phone ? userphone.f_rent_phone :null,
-          userphone.f_state= userphone.f_state ? userphone.f_state :'有效'
+          userphone.f_rent_phone = userphone.f_rent_phone ? userphone.f_rent_phone : null,
+          userphone.f_state = userphone.f_state ? userphone.f_state : '有效'
           userphone.f_operatorid = Vue.$login.f.id
           userphone.f_operator = Vue.$login.f.name
           userphone.f_orgid = Vue.$login.f.orgid
@@ -330,7 +330,7 @@ let FileManageService = {
     address = {
       id: data.addressinfo.id,
       f_area_id: data.addressinfo.f_area_id ? data.addressinfo.f_area_id : undefined,
-      f_address_state :data.addressinfo.f_address_state
+      f_address_state: data.addressinfo.f_address_state
     }
     if (data.oldaddressinfo.id) {
       address.oldid = data.oldaddressinfo.id