sale-client 3.5.161 → 3.5.163

package/package.json

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

package/src/components/FilesManage/UserGeneralInfoTest.vue

@@ -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">

package/src/components/revenue/cancelHandplan/IotHandplanCanel.vue

@@ -59,24 +59,29 @@
       readyGen(this)
     },
     methods: {
-      cancel (){
-        this.$showMessage('确定要对此条抄表记录进行冲正操作吗？',['confirm', 'cancel']).then(res =>{
-          if(res === 'confirm') {
-            let param = {
-              operInfo: {
-                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
-              },
-              f_hand_id: this.model.id
+      async cancel (){
+        let res = await this.$showMessage('确定要对此条抄表记录进行冲正操作吗？',['confirm', 'cancel'])
+        if(res === 'confirm') {
+          let param = {
+            operInfo: {
+              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
+            },
+            f_hand_id: this.model.id
+          }
+          await this.$resetpost('rs/logic/iotHandplanCancel',{data: param}).then(res => {
+            if(res.data.code === 200) {
+              this.$showAlert('抄表记录冲正成功','success', 1500)
+            } else {
+              this.$showAlert(res.data.msg,'warning',2000)
             }
-            this.$resetpost('rs/logic/iotHandplanCancel',{data: param}, {resolveMsg: '对该抄表记录冲正成功！', rejectMsg: null})
             readyGen(this)
-          }
-        })
+          })
+        }
       }
     }
   }

package/src/components/revenue/machineHandManage/machineHandAudit.vue

@@ -394,7 +394,7 @@
   import * as Util from '../../../Util'
 
   let readyGen = async function (self) {
-    self.$refs.paged.$refs.cri.model.startDate = self.$login.toStartAndEndDateString()[0]
+    self.$refs.paged.$refs.cri.model.startDate =  self.$login.toStartAndEndDateString()[0]
     self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString()
     await self.$LoadParams.loadMeterBook(self.f_filialeid)
     self.loadMeterBooks()
@@ -414,13 +414,12 @@
           dep: [],
           user: []
         },
-        config: {
-          examine: false
+        config:{
+          examine: false,
         },
         imgfilename: '',
         // 小区
         residentialArea: [],
-        inputtouPerson: [],
         imgshow: false,
         criteriaShow: false,
         orgCondtionStr: '',
@@ -445,8 +444,8 @@
           'f_adjustable_name': '调压箱名称',
           'f_inputtor': '抄表员'
         },
-        auditState: [{label: '全部', value: ''}, {label: '已审核', value: '已抄表'}, {label: '未审核', value: '待审核'}],
-        auditState1: [{label: '全部', value: ''}, {label: '审核失败', value: '审核失败'}],
+        auditState:[{label: '全部', value: ''}, {label: '已审核', value: '已抄表'}, {label: '未审核', value: '待审核'}],
+        auditState1:[{label: '全部', value: ''}, {label: '审核失败', value: '审核失败'}],
         meters: [{label: '全部', value: ''}, {label: '机表', value: '机表'}, {label: '物联网表', value: '物联网表'}],
         resultstate: this.$appdata.getParam('抄表结果状态'),
         meterstates: this.$appdata.getParam('抄表状态') ? [{
@@ -476,7 +475,7 @@
     methods: {
       // 修正本期底数
       amend (row) {
-        let tablebase = window.prompt('请输入你要修正的底数值，上期底数：' + row.f_meter_base)
+        let tablebase = window.prompt('请输入你要修正的底数值，上期底数：'+ row.f_meter_base)
         if (!tablebase) return
         if (tablebase < 0) {
           this.$showAlert(`底数不能小于0，请注意!`, 'warning', 2000)
@@ -597,9 +596,9 @@
         this.imgshow = false
       },
       imgShow (val) {
-        console.log('-----------val2:', val)
+        console.log("-----------val2:",val)
         this.imgfilename = `rs/image/file/` + val
-        console.log('-----------imgfilename2:', this.imgfilename)
+        console.log("-----------imgfilename2:",this.imgfilename)
         this.imgshow = true
       },
       async getaddress () {
@@ -633,17 +632,6 @@
         } else {
           args.condition = `${args.condition}` + this.orgCondtionStr
         }
-        // 抄表员查询条件
-        this.inputtouPerson = this.$refs.paged.$refs.cri.model.f_inputtor
-        if (this.inputtouPerson.length !== 0) {
-          let str = JSON.stringify(this.inputtouPerson)
-          str = str.replace(/"/g, `'`)
-          str = str.replace(/\[/g, ``)
-          str = str.replace(/\]/g, ``)
-          console.log('=====抄表员model22222222222绑定====', str)
-          // 查询多个抄表员时条件
-          args.condition += ` and f_inputtor in  ( ${str} )`
-        }
         this.excelCondition = args.condition
         this.$refs.paged.$refs.grid.selectInit()
         this.model.search(args.condition, args.model)
@@ -708,7 +696,7 @@
       },
       loadMeterBooks () {
         this.meterbooks = this.$GetSaleParam.getMeterBooks()
-      }
+      },
 
     },
     computed: {

package/src/filiale/meihekou/common/userinfo_detail/UserInfoDetailManageNew.vue

@@ -4,7 +4,7 @@
       <div class="auto"><user-base-info-new :row="row"  @cancel-main="cancel"></user-base-info-new></div>
       <saletabbut  v-if="row" v-ref:list style="height:72%;margin-top: 1%">
         <saletab header="流水查询" v-if="permission('流水查询')">
-          <record-query-user :row="row"></record-query-user>
+          <record-query-user :row="row" v-if="show == '流水查询'"></record-query-user>
         </saletab>
         <saletab header="机表流水查询" v-if="permission('机表流水查询')&&row.f_meter_type.includes('机表')">
           <machine-record-query :row="row" v-if="show == '机表流水查询'" @deal-msg="dealMsg"></machine-record-query>

package/src/filiale/qianneng/eticket/EticketPrint.vue

@@ -132,12 +132,11 @@ export default {
             id: ticket_id,
             f_bill_code: req.fpDm,
             f_bill_number: req.fpHm,
-            f_bill_url: req.fileUrl.replace('d:\\qianNengInvoiceFile', '/Download'),
-            f_sign_url: req.shareurl,
-            f_sign_result: req.sharecode,
+            f_bill_url: req.shareurl.replace('/s/', `/s/downloadPdf?pwd=${req.sharecode}&authCode=`).replace('\\', ''),
+            f_sign_result: req.msg,
             f_bill_state: req.status
           }
-          this.eticket_src = 'https://qnjtkf.cn:7400' + model.f_bill_url
+          this.eticket_src = req.shareurl.replace('/s/', `/s/downloadPdf?pwd=${req.sharecode}&authCode=`).replace('\\', '')
         } else if (req.status === '开票中') {
           model = {
             id: ticket_id,
@@ -304,12 +303,11 @@ export default {
                   f_eticket_id: ticket_id,
                   f_bill_code: req.fpDm,
                   f_bill_number: req.fpHm,
-                  f_bill_url: req.fileUrl.replace('d:\\qianNengInvoiceFile', '/Download'),
-                  f_sign_url: req.shareurl,
-                  f_sign_result: req.sharecode,
+                  f_bill_url: req.shareurl.replace('/s/', `/s/downloadPdf?pwd=${req.sharecode}&authCode=`).replace('\\', ''),
+                  f_sign_result: req.msg,
                   f_bill_state: req.status
                 })
-                this.eticket_src = 'https://qnjtkf.cn:7400' + req.fileUrl.replace('d:\\qianNengInvoiceFile', '/Download')
+                this.eticket_src = req.shareurl.replace('/s/', `/s/downloadPdf?pwd=${req.sharecode}&authCode=`).replace('\\', '')
               } else if (req && req.status !== '开票中') {
                 clearInterval(interval)
                 // TODO 失败后保存发票详情

package/src/filiale/qianneng/revenue/common/UserInfoDetailManageNew.vue

@@ -0,0 +1,179 @@
+<template>
+  <div class="binary flex" >
+    <div class="row binary-left flex" style="width:99%;height:98%;margin-bottom:0px">
+      <div class="auto"><user-base-info-new :row="row"  @cancel-main="cancel"></user-base-info-new></div>
+      <saletabbut  v-if="row" v-ref:list style="height:72%;margin-top: 1%">
+        <saletab header="流水查询" v-if="permission('流水查询')">
+          <record-query-user :row="row"></record-query-user>
+        </saletab>
+        <saletab header="机表流水查询" v-if="permission('机表流水查询')&&row.f_meter_type.includes('机表')">
+          <machine-record-query :row="row" v-if="show == '机表流水查询'" @deal-msg="dealMsg"></machine-record-query>
+        </saletab>
+        <saletab header="收费查询" v-if="permission('收费查询')">
+          <charge-query-user  :row="row" v-if="show == '收费查询'" @deal-msg="dealMsg"></charge-query-user>
+        </saletab>
+        <saletab header="累购查询" v-if="permission('累购查询')">
+          <Repurchase  :row="row" v-if="show == '累购查询'" @deal-msg="dealMsg"></Repurchase>
+        </saletab>
+        <saletab header="下账查询" v-if="row.f_meter_type.includes('物联网表')&&permission('自动下账查询')">
+          <automatic-purse  :row="row"   @deal-msg="dealMsg"></automatic-purse>
+        </saletab>
+        <saletab header="抄表记录" v-if="row.f_meter_type.includes('卡表')&&permission('抄表记录')">
+          <card-hand-record :row="row" v-if="show == '抄表记录'" @deal-msg="dealMsg"></card-hand-record>
+        </saletab>
+        <saletab header="抄表记录" v-if="!row.f_meter_type.includes('卡表')&&permission('抄表记录')">
+          <hand-query-user  :row="row" v-if="show == '抄表记录'" @deal-msg="dealMsg"></hand-query-user>
+        </saletab>
+        <saletab header="补卡查询" v-if="row.f_meter_type.includes('卡表')&&permission('补卡查询')">
+          <fill-card-query-user :row="row" v-if="show == '补卡查询'" @deal-msg="dealMsg"></fill-card-query-user>
+        </saletab>
+        <saletab header="补气查询" v-if="permission('补气查询')">
+          <fill-gas-query-user  :row="row" v-if="show == '补气查询'" @deal-msg="dealMsg"></fill-gas-query-user>
+        </saletab>
+        <saletab header="换表查询" v-if="permission('换表查询')">
+          <change-meter-query-user  :row="row" v-if="show == '换表查询'" @deal-msg="dealMsg"></change-meter-query-user>
+        </saletab>
+        <saletab header="其他收费" v-if="permission('其他收费')">
+          <other-charge-query-user  :row="row" v-if="show == '其他收费'" @deal-msg="dealMsg"></other-charge-query-user>
+        </saletab>
+        <saletab header="过户查询" v-if="permission('过户查询')">
+          <transfer-query-user  :row="row" v-if="show == '过户查询'" @deal-msg="dealMsg"></transfer-query-user>
+        </saletab>
+        <saletab header="价格调整" v-if="permission('价格调整')">
+          <price-change-query-user  :row="row" v-if="show == '价格调整'" @deal-msg="dealMsg"></price-change-query-user>
+        </saletab>
+        <saletab header="附件查看" v-if="permission('附件查看')">
+          <upload-file-history :row="row" v-if="show == '附件查看'" @deal-msg="dealMsg"></upload-file-history>
+        </saletab>
+        <saletab header="变更记录" v-if="permission('变更记录')">
+          <change-record  :row="row" v-if="show == '变更记录'" @deal-msg="dealMsg"></change-record>
+        </saletab>
+        <saletab header="指令查看" v-if="row.f_meter_type.includes('物联网表')&&permission('指令查看')">
+          <query-instruct  :row="row" v-if="show == '指令查看'" @deal-msg="dealMsg"></query-instruct>
+        </saletab>
+        <saletab header="历史指令查看" v-if="row.f_meter_type.includes('物联网表')&&permission('历史指令查看')">
+          <query-history-instruct  :row="row" v-if="show == '历史指令查看'" @deal-msg="dealMsg"></query-history-instruct>
+        </saletab>
+        <saletab header="异常报警" v-if="row.f_meter_type.includes('物联网表')&&permission('异常报警')">
+          <watch-warning  :row="row" v-if="show == '异常报警'" @deal-msg="dealMsg"></watch-warning>
+        </saletab>
+        <saletab header="表具采集" v-if="row.f_meter_type.includes('物联网表')&&permission('表具采集')">
+          <watch-collection  :row="row" v-if="show == '表具采集'" @deal-msg="dealMsg"></watch-collection>
+        </saletab>
+        <saletab header="调价补差" v-if="permission('调价补差')">
+          <price-adjustment-query-user  :row="row" v-if="show == '调价补差'" @deal-msg="dealMsg"></price-adjustment-query-user>
+        </saletab>
+        <saletab header="设备查询" v-if="permission('设备查询')">
+          <deveice-record  :row="row" v-if="show == '设备查询'" @deal-msg="dealMsg"></deveice-record>
+        </saletab>
+        <saletab header="流量计参数查看" v-if="permission('流量计参数查看')">
+          <meter-param  :row="row" v-if="show == '流量计参数查看'" @deal-msg="dealMsg"></meter-param>
+        </saletab>
+        <saletab header="表使用量图表">
+          <table-usage-chart :row="row" v-if="show == '表使用量图表'" @deal-msg="dealMsg"></table-usage-chart>
+        </saletab>
+      </saletabbut>
+    </div>
+  </div>
+</template>
+
+<script>
+  import {HttpResetClass} from 'vue-client'
+  // 导入IC卡相关查询界面
+  import ChangeMeterQueryUser from '../../../../components/common/userinfo_detail/ic_detail/ChangeMeterQueryUser'
+  import ChargeQueryUser from './ic_detail/ChargeQueryUser'
+  import ChargeRecordQueryUser from '../../../../components/common/userinfo_detail/ic_detail/ChargeRecordQuery'
+  import FillCardQueryUser from '../../../../components/common/userinfo_detail/ic_detail/FillCardQueryUser'
+  import HandQueryUser from './ic_detail/HandQueryUser'
+  import OtherChargeQueryUser from '../../../../components/common/userinfo_detail/ic_detail/OtherChargeQueryUser'
+  import RecordQueryUser from '../../../../components/common/userinfo_detail/ic_detail/RecordQueryUser'
+  import TransferQueryUser from '../../../../components/common/userinfo_detail/ic_detail/TransferQueryUser'
+  import CardHandRecord from '../../../../components/common/userinfo_detail/ic_detail/CardHandRecord'
+  import Repurchase from '../../../../components/common/userinfo_detail/ic_detail/Repurchase'
+  import MachineRecordQuery from '../../../../components/common/userinfo_detail/ic_detail/MachineRecordQuery'
+  // 导入物联网相关查询
+  import QueryInstruct from '../../../../components/common/userinfo_detail/iot_detail/QueryInstruct'
+  import QueryHistoryInstruct from '../../../../components/common/userinfo_detail/iot_detail/QueryHistoryInstruct'
+  import WatchCollection from '../../../../components/common/userinfo_detail/iot_detail/WatchCollection'
+  import WatchWarning from '../../../../components/common/userinfo_detail/iot_detail/WatchWarning'
+  import PriceChangeQueryUser from '../../../../components/common/userinfo_detail/ic_detail/PriceChangeQueryUser'
+import ChangeRecord from '../../../../components/common/userinfo_detail/ic_detail/ChangeRecord'
+  import PriceAdjustmentQueryUser from '../../../../components/common/userinfo_detail/ic_detail/PriceAdjustmentQueryUser'
+  import MeterParam from '../../../../components/common/userinfo_detail/ic_detail/MeterParam'
+  import DeveiceRecord from '../../../../components/common/userinfo_detail/ic_detail/DeveiceRecord'
+export default {
+    title: '用户详细信息',
+    props: ['f_userfiles_id', 'f_userinfo_id','f_userinfo_code'],
+    components: {
+      PriceAdjustmentQueryUser,
+      PriceChangeQueryUser,
+      Repurchase,
+      ChangeMeterQueryUser,
+      ChargeQueryUser,
+      ChargeRecordQueryUser,
+      FillCardQueryUser,
+      HandQueryUser,
+      OtherChargeQueryUser,
+      RecordQueryUser,
+      TransferQueryUser,
+      WatchWarning,
+      WatchCollection,
+      QueryInstruct,
+      QueryHistoryInstruct,
+      ChangeRecord,
+      CardHandRecord,
+      MeterParam,
+      DeveiceRecord,
+      MachineRecordQuery
+    },
+    data () {
+      return {
+        row: null,
+        name: '自动下账查询',
+        show: ''
+      }
+    },
+    ready () {
+      this.search()
+      console.log(this.$login)
+    },
+    methods: {
+      permission (name) {
+        if (this.$login.r.find(value => value == '收费综合查询')) {
+          if (!this.$login.r.find(value => value == name)) {
+            return false
+          }
+        }
+        return true
+      },
+      async search () {
+        let http = new HttpResetClass()
+        let condition = ' 1 = 1'
+        if (this.f_userfiles_id) {
+          condition = `f_userfiles_id = '${this.f_userfiles_id}'`
+        } else if (this.f_userinfo_id) {
+          condition = `f_userinfo_id = '${this.f_userinfo_id}'`
+        }else if (this.f_userinfo_code){
+          condition = `f_userinfo_code = '${this.f_userinfo_code}'`
+        }
+
+        let getBaseInfo = await http.load('POST', 'rs/sql/iot_getUserBaseData',
+          {data: {condition: condition}}, {resolveMsg: null, rejectMsg: '获取基本信息出错'})
+        this.row = getBaseInfo.data[0]
+      },
+
+      cancel (val) {
+        this.$emit('cancel-main', val)
+      },
+
+      butOper (val) {
+        this.name = val
+      }
+    },
+    watch: {
+      'f_userinfo_id' () {
+        this.search()
+      }
+    }
+  }
+</script>