sale-client 3.5.2 → 3.5.3

package/package.json

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

package/src/components/FilesManage/FileUserFiles.vue

@@ -437,6 +437,7 @@
         </div>
       </article>
       <footer slot="modal-footer" class="modal-footer">
+        <button class="button_search button_spacing" type="button" @click="goChargeManage()">去收费</button>
         <button class="button_search button_spacing" type="button" @click="doCopy()">复制</button>
         <button class="button_search button_spacing" type="button" @click="close2()">取消</button>
       </footer>
@@ -636,6 +637,9 @@ let loadParamGem = async function (self) {
         this.isShowDetailInfo = true
         this.rowData = obj
       },
+      goChargeManage () {
+        this.$goto('charge-manage', {f: this.$login.f}, 'main')
+      },
       async doCopy () {
         await this.$copyText(this.resdata)
         this.resshow = false

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>
@@ -93,7 +93,7 @@
         </div>
         <div class="row">
           <div class="col-sm-2"></div>
-          <input v-if="fileSaveData.reason ==='其他'" class="input_search" style="width:60%" placeholder='修改原因' v-model="fileSaveData.modifyReason"/>
+          <input v-if="fileSaveData.reason==='其他'" class="input_search" style="width:60%" placeholder='修改原因' v-model="fileSaveData.modifyReason"/>
         </div>
       </article>
       <footer slot="modal-footer" class="modal-footer">
@@ -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/common/userinfo_detail/UserBaseInfoNew.vue

@@ -151,6 +151,7 @@
     </div>
     <div class="auto" style="float: right;">
       <button class="button_clear " @click="cancelmain()" >返回</button>
+      <button class="button_search" type="button" @click="goChargeManage">去收费</button>
       <button v-if="row.f_meter_brand.includes('西美')&&row.f_meter_type.includes('物联网表')"
               class="button_search" type="button" @click="clearBarrier">清除障碍</button>
       <button v-if="row.f_meter_type.includes('物联网表')"
@@ -316,6 +317,9 @@
         uuidA = s.join('');
         return uuidA;
       },
+      goChargeManage () {
+        this.$goto('charge-manage', {f: this.$login.f}, 'main')
+      },
       openUser () {
         this.$showMessage(`是否需要给用户进行开户？`, ['confirm', 'cancel']).then(async (res) => {
           if (res === 'confirm') {

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/components/revenue/concentrator/ncArchivesList.vue

@@ -80,7 +80,7 @@
             <td v-show="$parent.$parent.$parent.listshow"  style="text-align:center"><nobr>{{row.f_mpc_state}}</nobr></td>
             <td v-show="$parent.$parent.$parent.listshow"  style="text-align:center"><nobr>{{row.f_mpc_network}}</nobr></td>
             <td v-show="$parent.$parent.$parent.listshow"  style="text-align:center"><nobr>{{row.f_last_message_date}}</nobr></td>
-            <td v-show="$parent.$parent.$parent.listshow"  style="text-align:center"><nobr>{{row.f_newmessage}}</nobr></td>
+            <td v-show="$parent.$parent.$parent.listshow"  style="text-align:center"><nobr>{{row.f_new_message}}</nobr></td>
             <td v-show="$parent.$parent.$parent.listshow"  style="text-align:center"><nobr>{{row.f_modify_user}}</nobr></td>
             <td v-show="$parent.$parent.$parent.listshow"  style="text-align:center"><nobr>{{row.f_modify_date}}</nobr></td>
             <td v-show="$parent.$parent.$parent.listshow" style="text-align:center"><nobr>{{row.sumuserfiles}}</nobr></td>

package/src/components/revenue/concentrator/ncUserfilesList2.vue

@@ -28,6 +28,7 @@
                            condition="f_address like '%{}%'" placeholder='客户地址'>
                   </div>
                   <div class="span" style="float:right;">
+                    <button class="button_search button_spacing" @click="$parent.$parent.networking()">组网</button>
                     <button class="button_search button_spacing" @click="$parent.$parent.meterRead()">抄表</button>
                     <button class="button_search button_spacing" @click="$parent.$parent.confirmaddress()">取消关联</button>
                     <button class="button_search button_spacing" @click="search()">查询</button>
@@ -292,6 +293,35 @@ export default {
         this.search()
       }
     },
+    async networking () {
+      let res = await this.$showMessage('确定对选择的表具进行组网操作吗?', ['confirm', 'cancel'])
+      if (res === 'confirm') {
+        let rowdata = this.$refs.paged.$refs.grid.getRowData()
+        if (rowdata.length <= 0) {
+          this.$showMessage('请至少选择一个表具!')
+          return
+        }
+        console.log(rowdata)
+        let userfilesids = []
+        for (let row of rowdata) {
+          userfilesids.push({
+            f_userfiles_id: row.f_userfiles_id,
+            f_meternumber: row.f_meternumber
+          })
+        }
+        let param = {
+          f_orgid: this.$login.f.orgid,
+          f_orgname: this.$login.f.name,
+          concentratorid: this.fileinfo.id,
+          f_mpc_number: this.fileinfo.f_mpc_number,
+          userfilesid: '',
+          userfilesids: userfilesids,
+          state: 'delete'
+        }
+        await this.$resetpost('rs/logic/concentratorNetWorking', param, {resolveMsg: '组网操作成功!', rejectMsg: '组网操作失败!'})
+        this.search()
+      }
+    },
     search () {
       this.$refs.paged.$refs.cri.search()
     },

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/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 === '启用' ? '正常' : '销户',