sale-client 3.4.183 → 3.4.186

package/package.json

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

package/src/components/FilesManage/UserFireInfo.vue

@@ -340,6 +340,11 @@
                   <input type="text" class="input_search" style="width:60%" v-model="fireinfo.f_contact_method"
                          placeholder='通讯方式' >
                 </div>
+                <div class="col-sm-3 form-group" style="padding-right: 5px;">
+                  <label class="font_normal_body">&emsp;&emsp;&emsp;管道表封</label>
+                  <input type="text" class="input_search" style="width:60%" v-model="fireinfo.f_piple_number"
+                         placeholder='管道表封' >
+                </div>
                 <div class="col-sm-3 form-group" style="padding-right: 5px;">
                   <label class="font_normal_body">&emsp;&emsp;&emsp;点火人员</label>
                   <input type="text" class="input_search" style="width:60%" v-model="fireinfo.f_lgniter"

package/src/components/FilesManage/UserGeneralInfoTest.vue

@@ -82,9 +82,9 @@
         <div class="row">
           <div class="col-sm-12 form-group" >
             <label for="f_paper_account" class="col-sm-2 font_normal_body " title="参数:变更原因">变更原因:</label>
-            <v-select v-model="reason" style="width:60%"
+            <v-select v-model="fileSaveData.reason" style="width:60%"
                       placeholder='变更原因'
-                      :value.sync="reason"
+                      :value.sync="fileSaveData.reason"
                       :options='reasons'
                       :value-single="true"
                       v-ref:reason
@@ -93,12 +93,12 @@
         </div>
         <div class="row">
           <div class="col-sm-2"></div>
-          <input v-if="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">
         <button type="button" class="btn btn-default" @click='filechangeDetailsShow = false'>取消</button>
-        <button type="button" class="btn btn-success" :disabled="!fileSaveData.modifyReason" @click='confirmation()'>确认</button>
+        <button type="button" class="btn btn-success" :disabled="!fileSaveData.reason || (fileSaveData.reason === '其他' && !fileSaveData.modifyReason)" @click='confirmation()'>确认</button>
       </footer>
     </modal>
   </div>
@@ -117,11 +117,11 @@ let getFileGen = async function (self, data) {
     rejectMsg: '用户详细信息加载失败，请重新选择，如果多次失败，请检查系统是否正常！'
   })
   self.data = result.data
-  self.data.meterinfo.forEach((item)=>{
-    item.devicesinfo.forEach((item2)=>{
-      if(item2.img.content){
-        let URL = item2.img.content.substring(item2.img.content.lastIndexOf(':\\') +2)
-        item2.img.content = 'http://' + location.host + '/' +  URL
+  self.data.meterinfo.forEach((item) => {
+    item.devicesinfo.forEach((item2) => {
+      if (item2.img.content) {
+        let URL = item2.img.content.substring(item2.img.content.lastIndexOf(':\\') + 2)
+        item2.img.content = 'http://' + location.host + '/' + URL
       }
     })
   })
@@ -170,11 +170,11 @@ export default {
           fireinfo: {}
         }],
         devicesinfo: [],
-        fireinfo:{},
+        fireinfo: {},
         address: {
           id: '',
           f_address: '',
-          f_address_state:''
+          f_address_state: ''
         }
       },
       show_userinfodevices: false,
@@ -202,7 +202,8 @@ export default {
       defaultMeterInfo: '',  // 默认的表具信息
       fileSaveData: {
         // 修改原因
-        modifyReason: ''
+        modifyReason: '',
+        reason: ''
       },
       // 档案变更明细
       filechangeDetails: {rows: []},
@@ -243,7 +244,7 @@ export default {
   },
   methods: {
     async getOvedueset () {
-      let overdueset= []
+      let overdueset = []
       let res = await this.$resetpost('rs/sql/saleSingleTable', {
         data: {
           tablename: 't_overdue_set',
@@ -280,7 +281,7 @@ export default {
       this.$resetpost('rs/logic/openBankAccount', {f_userinfo_code: this.data.baseinfo.base.f_userinfo_code, f_username: this.data.baseinfo.base.f_user_name},
         {resolveMsg: null, rejectMsg: null}).then((res) => {
           this.$showMessage(res.data.resultmessage)
-      })
+        })
     },
     async confirm () {
       this.data.addressinfo.f_address = this.$refs.useressential.addressinfo.f_address
@@ -297,7 +298,7 @@ export default {
         this.data.baseinfo.base.version = this.row.version
       }
       console.log('档案保存之前，。。。', this.data)
-      if(this.data.meterinfo[0].f_gas_date != null){
+      if (this.data.meterinfo[0].f_gas_date != null) {
         this.data.addressinfo.f_address_state = '已通气'
       }
       // 获取保存数据
@@ -325,6 +326,9 @@ export default {
       //     return
       //   }
       // }
+      if (this.fileSaveData.reason && this.fileSaveData.reason !== '其他') {
+        this.fileSaveData.modifyReason = this.fileSaveData.reason
+      }
       this.$FileManageService.fileSave(this.fileSaveData).then((res) => {
         this.$parent.resdata = res.data.result[0].f_userinfo_code
         if (!this.row) {
@@ -515,16 +519,16 @@ export default {
                   // 用户电话
             f_user_phone: '',
             f_people_num: 0,
-            f_packaging:'',
+            f_packaging: '',
                   // 备用电话
             f_rent_phone: '',
             f_credentials: '身份证',
             f_cost_type: '',
-            f_bz_type:'',
+            f_bz_type: '',
             f_address: '',
             addressid: '',
             f_idnumber: '',
-            f_meter_book_num:''
+            f_meter_book_num: ''
           },
           bank: {}
         },
@@ -572,8 +576,8 @@ export default {
           f_detailprice: '',  // 价格详情显示
           devicesinfo: [], // 设备信息
           f_hand_month: '', // 抄表月份
-          fireinfo:{}, //用气信息
-          f_meter_book_num:''
+          fireinfo: {}, // 用气信息
+          f_meter_book_num: ''
         }],
         devicesinfo: []
       }

package/src/components/charge/ChargeList.vue

@@ -455,7 +455,7 @@
         getUser = await self.$resetpost('rs/sql/sale_getUser', {
           data: {
             condition: `f_meter_type in ('机表','物联网表') and u.f_card_id='${self.cardInfo.CardID}'
-          and u.f_filialeid = '${self.$login.f.orgid}' and f_whether_hairpin != '未发'`,
+          and u.f_filialeid = '${self.$login.f.orgid}' and f_whether_hairpin != '未发' `,
             orderitem: `${self.orderitem} Desc`
           }
         }, {resolveMsg: '读卡成功', rejectMsg: '读卡失败'})
@@ -464,10 +464,17 @@
         getUser = await self.$resetpost('rs/sql/sale_getUser', {
           data: {
             condition: `gb.f_meter_type in ('气量卡表', '金额卡表','物联网表') and u.f_card_id='${self.cardInfo.CardID}'
-          and u.f_filialeid = '${self.$login.f.orgid}' and f_alias='${self.cardInfo.Factory}' and f_whether_hairpin != '未发'`,
+          and u.f_filialeid = '${self.$login.f.orgid}' and f_alias='${self.cardInfo.Factory}'
+          and f_whether_hairpin != '未发' and u.f_user_state != '销户'`,
             orderitem: `${self.orderitem} Desc`
           }
-        }, {resolveMsg: '读卡成功', rejectMsg: '读卡失败'})
+        }, {resolveMsg: null, rejectMsg: null})
+        if(getUser.data.length === 0){
+          self.$showAlert('该卡号用户已销户，不允许销户用户进行读卡！！', 'warning', 5000)
+          return
+        }else{
+          self.$showAlert('读卡成功', 'sucess',200)
+        }
       }
       self.model.rows = getUser.data
   }
@@ -483,7 +490,7 @@
         getUser = await self.$resetpost('rs/sql/sale_getUser', {
           data: {
             condition: `gb.f_meter_type in ('机表','物联网表') and u.f_card_id='${self.cardInfo.CardID}'
-          and u.f_filialeid = '${self.$login.f.orgid}' and f_whether_hairpin != '未发'`,
+          and u.f_filialeid = '${self.$login.f.orgid}' and f_whether_hairpin != '未发' `,
             orderitem: `${self.orderitem} Desc`
           }
         }, {resolveMsg: '读卡成功', rejectMsg: '读卡失败'})
@@ -492,10 +499,17 @@
         getUser = await self.$resetpost('rs/sql/sale_getUser', {
           data: {
             condition: `gb.f_meter_type in ('气量卡表', '金额卡表','物联网表') and u.f_card_id='${self.cardInfo.CardID}'
-          and u.f_filialeid = '${self.$login.f.orgid}' and f_alias='${self.cardInfo.Factory}' and f_whether_hairpin != '未发'`,
+          and u.f_filialeid = '${self.$login.f.orgid}' and f_alias='${self.cardInfo.Factory}' and
+          f_whether_hairpin != '未发' and u.f_user_state != '销户'`,
             orderitem: `${self.orderitem} Desc`
           }
-        }, {resolveMsg: '读卡成功', rejectMsg: '读卡失败'})
+        }, {resolveMsg: null, rejectMsg: null})
+        if(getUser.data.length === 0){
+          self.$showAlert('该卡号用户已销户，不允许销户用户进行读卡！！', 'warning', 5000)
+          return
+        }else{
+          self.$showAlert('读卡成功', 'sucess',200)
+        }
       }
       // 判断是否是旧卡
       if (getUser.data.length > 0) {

package/src/components/charge/gasloss/gasLossOperate.vue

@@ -170,7 +170,7 @@
             self.model.f_bill_style = self.model.f_print[0]
             self.print = true
           } else {
-            self.model.id = resid
+            self.model.id = resid.data
             self.print = true
           }
         } else if (self.model.f_print === '国税发票') {

package/src/components/revenue/HandManager/CardHand.vue

@@ -796,6 +796,11 @@ import {HttpResetClass, PagedList} from 'vue-client'
           endDate: this.$refs.paged.$refs.criteria.model.endDate,
           filepath: res.f_downloadpath,
           f_operator: this.$login.f.name,
+          f_operatorid: this.$login.f.id,
+          f_orgid: this.$login.f.orgid,
+          f_orgname: this.$login.f.orgs,
+          f_depid: this.$login.f.depids,
+          f_depname: this.$login.f.deps,
           uuid: uuid
         }
         console.log('传入数据', data1)