sale-client 3.5.1 → 3.5.4

package/package.json

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

package/src/components/FilesManage/UserEssentialInfoTest.vue

@@ -1,8 +1,5 @@
 <template>
   <div>
-    <div style="margin-bottom: 2%; margin-top: 2%">
-      <button class="button_search" style="width: max-content" @click="phoneManage()">管理备用电话</button>
-    </div>
     <validator name='v' @valid="$emit('valid')" @invalid="$emit('invalid')">
       <form class="form-horizontal select-overspread ">
         <div class="row">
@@ -17,6 +14,7 @@
             <input type="text" maxlength="11" v-model="baseinfo.base.f_user_phone"
                    v-validate:f_user_phone="{minlength: 11, maxlength: 11  }" class="input_search" style="width:60%"
                    placeholder="客户电话" v-el:phone v-next-el="area">
+            <button type="button" class="glyphicon glyphicon-plus" @click.stop="phoneManage()"></button>
           </div>
           <div class="col-sm-4 form-group" style="" v-if="true">
             <label for="f_user_state" class="font_normal_body">&ensp;客户状态</label>

package/src/components/FilesManage/UserGeneralInfoTest.vue

@@ -6,7 +6,7 @@
           <img style="margin-top: -5px" src="../../../static/images/lefticon/矩形1183.png">
           <a style="font-size: 20px;font-weight: 500;">基本信息</a>&nbsp;<a style="color: #999999;text-decoration: none"></a>
           <button class="button_search" style="width: max-content" v-show="data.baseinfo.base.f_user_nature === '单位'" @click="showUserDevices($index, data.baseinfo)">用户设备信息</button>
-          <button class="button_search" style="width: max-content" @click="uploadFiles()">上传附件</button>
+          <button class="button_search" style="width: max-content" @click="uploadFiles()">上传/查看附件</button>
           <button class="button_search" style="width: max-content" @click="uploadPictures()">拍照</button>
           <button class="button_search" style="width: max-content" @click="openBankAccount()" v-if="data.meterinfo[0].f_user_type[0] === '非民用' && ($login.r.includes('银行开户'))">银行开户</button>
         </div>
@@ -161,7 +161,7 @@ export default {
           bank: {
             f_bank_name: ''
           },
-          //用户备用电话信息
+          // 用户备用电话信息
           userphonelist: []
         },
         addressinfo: {},
@@ -533,7 +533,7 @@ export default {
             f_meter_book_num: ''
           },
           bank: {},
-          //用户备用电话信息
+          // 用户备用电话信息
           userphonelist: []
         },
         addressinfo: {

package/src/components/revenue/base/leftview/SafeCheck.vue

@@ -104,6 +104,10 @@
         <td  style="text-align: center;border: #E9E9E9 solid 1px;width: 17%" >燃气使用:</td>
         <td style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">{{ model.f_usegas }}</td>
       </tr>
+      <tr>
+        <td colspan="1" style="text-align: center;border: #E9E9E9 solid 1px;width: 17%" >机械读数:</td>
+        <td colspan="3" style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">{{ model.f_item_name ==='机械读数' ? '无': model.f_item_value }}</td>
+      </tr>
       <tr >
         <td  colspan="1" style="text-align: center;border: #E9E9E9 solid 1px;">用户满意度:</td>
         <td  colspan="1" style="text-align: center;border: #E9E9E9 solid 1px;">{{ model.f_client_evaluation }}</td>

package/src/components/revenue/comprehen/ComprehenOperation/BatchChange/BatchCancellation.vue

@@ -186,6 +186,8 @@ export default {
       if (owe.data.length > 0 && (!this.useraccount[0].f_meter_classify.includes('卡表'))) {
         this.$showAlert('该表有欠费，无法销户', 'warning', 3000)
         // this.$dispatch('button-specifies', {name:'机表收费', value: 'machine-charge'}, this.row)
+      } else if ((this.model.userinfo.f_meter_classify === '物联网表' && this.model.userinfo.f_balance_amount && this.model.userinfo.f_balance_amount > 0) || (this.model.userinfo.f_meter_classify !== '物联网表' && this.model.userinfo.f_balance && this.model.userinfo.f_balance > 0)) {
+        this.$showAlert('该表有余额，无法销户', 'warning', 3000)
       } else {
         await this.cancellation()
       }

package/src/filiale/tongchuan/HandManager.vue

@@ -955,9 +955,19 @@
           this.$showAlert(`请先查询用户信息`, 'warning', 2000)
           return
         }
-        if (this.danhu.f_tablebase < this.danhu.info.f_tablebase) {
-          this.$showAlert(`输入表底数信息有误上期底数为  ${this.danhu.info.f_tablebase}`, 'warning', 2000)
+        if (this.danhu.f_tablebase < 0) {
+          this.$showAlert(`底数不能小于0，请注意!`, 'warning', 2000)
           return
+        } else if (this.danhu.f_tablebase - parseInt(this.danhu.f_tablebase) !== 0) {
+          this.$showAlert(`底数只能输入整数，请注意!`, 'warning', 2000)
+          return
+        } else if (this.danhu.f_tablebase < this.danhu.info.f_tablebase && !this.danhu.info.f_capacity) {
+          this.$showAlert(`本期表底数不能低于上期表底数`, 'warning', 2000)
+          return
+        } else {
+          if (this.danhu.f_tablebase < this.danhu.info.f_tablebase) {
+            this.$showMessage('本次抄表已超越最大量程, 请熟知!')
+          }
         }
         let param = {
           downDate: this.downModel.downDate,
@@ -968,35 +978,36 @@
           f_operatorid: this.$login.f.id
         }
         console.log('下发参数：', param)
-        await this.$resetpost('rs/logic/downHand', {data: param}, {resolveMsg: null, rejectMsg: null}).then((res) => {
-          console.log('下发计划成功')
-        }).catch((error) => {
-          this.danhu.show = false
-          this.$showAlert(`下发失败,请注意查看，失败原因：` + JSON.toString(error), 'danger', 2000)
-        })
-        let hanid = await this.$resetpost('/rs/sql/querySingleTable', {
-          data: {
-            items: 'max(id) id',
-            tablename: 't_handplan',
-            condition: ` f_userfiles_id = '${this.danhu.info.f_userfiles_id}' `
-          }
-        }, {resolveMsg: null, rejectMsg: '查询抄表信息失败'})
-        let handParam = {
-          f_meter_classify: this.danhu.info.f_meter_classify,
-          f_meter_brand: this.danhu.info.f_meter_brand,
-          f_hand_id: hanid.data[0].id,
-          f_tablebase: this.danhu.f_tablebase,
-          f_userinfo_id: this.danhu.info.f_userinfo_id
-        }
-        await this.$resetpost('rs/logic/sale_commonEnter', {data: handParam}, {
-          resolveMsg: null,
-          rejectMsg: null
-        }).then((res) => {
-          this.$showAlert(`单户抄表成功!`, 'success', 2000)
-          this.danhuShow()
+        this.$resetpost('rs/logic/downHand', {data: param}, {resolveMsg: null, rejectMsg: '下发失败，请检查该用户是否在该归属期内已有抄表记录'}).then((res) => {
+          console.log('下发计划成功', res)
+          this.$resetpost('/rs/sql/querySingleTable', {
+            data: {
+              items: 'max(id) id',
+              tablename: 't_handplan',
+              condition: ` f_userfiles_id = '${this.danhu.info.f_userfiles_id}' `
+            }
+          }, {resolveMsg: null, rejectMsg: '查询抄表信息失败'}).then((res2) => {
+            let handParam = {
+              f_meter_classify: this.danhu.info.f_meter_classify,
+              f_meter_brand: this.danhu.info.f_meter_brand,
+              f_hand_id: res2.data[0].id,
+              f_tablebase: this.danhu.f_tablebase,
+              f_userinfo_id: this.danhu.info.f_userinfo_id
+            }
+            this.$resetpost('rs/logic/sale_commonEnter', {data: handParam}, {
+              resolveMsg: null,
+              rejectMsg: null
+            })
+          }).then((res) => {
+            this.$showAlert(`单户抄表成功!`, 'success', 2000)
+            this.danhuShow()
+          }).catch((error) => {
+            this.danhu.show = false
+            this.$showAlert(`单户抄表失败!` + JSON.toString(error), 'danger', 2000)
+          })
         }).catch((error) => {
           this.danhu.show = false
-          this.$showAlert(`单户抄表失败!` + JSON.toString(error), 'danger', 2000)
+          this.$showAlert(`抄表失败,请注意查看，失败原因：` + JSON.toString(error), 'danger', 2000)
         })
       },
       // 获得本月的最后一天。

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: 'zhongsheng'})
+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

package/src/plugins/FileService.js

@@ -11,20 +11,19 @@ let cancelUserGen = function * (data, type) {
     if (owe.data === 1 && hasHandplan.data.length > 0) {
       Vue.showAlert('该客户还有欠费，不能销户！！', 'danger', 0)
     } else {
-      yield Vue.resetpost('rs/logic/saveSingleCancellation', data, {resolveMsg: `${type}成功`, rejectMsg: `${type}失败`}).then(res=>{
-        if(res && res.data){
-          if(type =='销户'){
-            if(!(res.data.isaudit==null)){
-              if(res.data.isaudit == 1){
-                Vue.showAlert('提交成功,等待管理审核!','success',2000);
-                return;
+      yield Vue.resetpost('rs/logic/saveSingleCancellation', data, {resolveMsg: `${type}成功`, rejectMsg: `${type}失败`}).then(res => {
+        if (res && res.data) {
+          if (type === '销户') {
+            if (!(res.data.isaudit === null)) {
+              if (res.data.isaudit === 1) {
+                Vue.showAlert('提交成功,等待管理审核!', 'success', 2000)
+                return
               }
             }
           }
-          Vue.showAlert('销户成功','success',2000);
+          Vue.showAlert('销户成功', 'success', 2000)
         }
       })
-
     }
   } else {
     Vue.resetpost('rs/logic/saveSingleCancellation', data, {resolveMsg: `${type}成功`, rejectMsg: `${type}失败`})
@@ -214,7 +213,6 @@ let FileService = {
     let data = {
       f_operat_type: operateType,
       f_describe: `${Vue.$login.f.name}对客户${model.userinfo.f_user_name}进行销户`,
-      f_state: '有效',
       f_user_id: model.userinfo.f_user_id,
       f_user_name: model.userinfo.f_user_name,
       f_state: type === '启用' ? '正常' : '销户',