sale-client 4.1.4 → 4.1.6

package/build/dev-server.js

@@ -1,8 +1,7 @@
 var path = require('path')
 var checkVersion = require('./versionCheck.js')
 checkVersion()
-// const [ serverRul, localUrl ] = ['http://218.93.226.210:31467/', 'http://218.93.226.210:31467/']
-const [ serverRul, localUrl ] = ['http://192.168.50.67:31467/', 'http://127.0.0.1:9026/']
+const [ serverRul, localUrl ] = ['http://192.168.50.67:31467/', 'http://localhost:9026/']
 var merge = require('webpack-merge')
 var baseConfig = require('./webpack.dev.conf')
 var devConfig = {
@@ -20,12 +19,12 @@ var devConfig = {
       children: false // 不输出子模块构建信息
     },
     proxy: {
-      // '/api/af-revenue/logic/changeMeterCardHand': {
-      //   pathRewrite: {
-      //     '/api/af-revenue/logic': '/logic'
-      //   },
-      //   target: 'http://127.0.0.1:9026'
-      // },
+    '/api/af-revenue/batchdeduction/all': {
+      pathRewrite: {
+        '/api/af-revenue/batchdeduction/all': '/batchdeduction/all'
+      },
+      target: localUrl
+    },
       '/api/af-revenue/logic': {
         pathRewrite: {
           '/api/af-revenue/logic': '/logic'
@@ -33,12 +32,12 @@ var devConfig = {
         target: localUrl
       },
       '/api/af-revenue/file': {
-        pathRewrite: {
-          '/api/af-revenue/file': '/file'
-        },
+        // pathRewrite: {
+        //   '/api/af-revenue/file': '/file'
+        // },
         target: localUrl
       },
-      '/weixin2/rs': {
+      '/weixin2/rs':{
 
         target: 'http://410663id1ia4.vicp.fun'
       },

package/package.json

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

package/src/components/UserFiles/UserPriceChangeManage.vue

@@ -167,7 +167,6 @@
         </div>
 
         <div class="panel panel-primary datapanel">
-          <form class="form-horizontal select-overspread">
             <div class="form-group">
               <div class="row bg-info text-center text-center" style="height:35px">
                 <div style="float: left">
@@ -339,7 +338,6 @@
                 </div>
               </div>
             </div>
-          </form>
         </div>
 
         <upload :blodid="row.f_userinfo_id" v-if="config.showupload" isremark="true" fusetype="单户调价"></upload>

package/src/components/charge/business/CardChangeFill.vue

@@ -264,7 +264,7 @@
       }
       self.model.payments = self.paymentModel
       // 加入扫码盒付款码支付流水号
-      self.model.f_serial_id = self.$refs.paymentcode.paymentCodeReturnData.f_out_trade_no
+      self.model.f_serial_id = self.$refs.paymentcode.paymentCodeReturnData.transactionId
       let res = await self.$CardService.remanentinitCard(self.model, self.row, self.cardallot)
       console.log('换表发卡数据返回', res.data.sellid, res.data.fillgasid, res, self.model)
       if (self.config.showupload) {

package/src/components/charge/business/CardMeterCenter.vue

@@ -348,7 +348,7 @@
 
       self.model.payments = self.paymentModel
       // 加入扫码盒付款码支付流水号
-      self.model.f_serial_id = self.$refs.paymentcode.paymentCodeReturnData.f_out_trade_no
+      self.model.f_serial_id = self.$refs.paymentcode.paymentCodeReturnData.transactionId
       let res = await self.$CardService.sellgas(self.model, self.row)
       let localeSustainMoney = window.localStorage.getItem('sustainMoney')
       if (localeSustainMoney != null) {

package/src/components/charge/business/DigitalCharge.vue

@@ -208,7 +208,7 @@
         self.model.f_write_money = self.model.f_write_money.toFixed(2)
       }
       // 加入扫码盒付款码支付流水号
-      self.model.f_serial_id = self.$refs.paymentcode.paymentCodeReturnData.f_out_trade_no
+      self.model.f_serial_id = self.$refs.paymentcode.paymentCodeReturnData.transactionId
 
       let res = await self.$CardService.DigtialSellGas(self.model, self.row, self.cardallot)
       console.log('卡表收费返回id', res, self.model)

package/src/components/charge/business/IOT/IotChangeFill.vue

@@ -250,7 +250,7 @@
         }
       }
       // 加入扫码盒付款码支付流水号
-      param.f_serial_id = self.$refs.paymentcode.paymentCodeReturnData.f_out_trade_no
+      param.f_serial_id = self.$refs.paymentcode.paymentCodeReturnData.transactionId
       let res = await self.$resetpost('api/af-revenue/logic/sale_iotRemanentGas', {data: param}, {
         warnMsg: `确定对客户${self.row.f_user_name}进行物联网表缴费吗？`,
         resolveMsg: '物联网收费成功！！',

package/src/components/charge/business/IOTMeterCenter.vue

@@ -317,7 +317,7 @@
       param.f_print = self.model.f_print.toString()
       param.f_serial_number = self.model.f_serial_number ? self.model.f_serial_number : ''
       // 加入扫码盒付款码支付流水号
-      param.f_serial_id = self.$refs.paymentcode.paymentCodeReturnData.f_out_trade_no
+      param.f_serial_id = self.$refs.paymentcode.paymentCodeReturnData.transactionId
       let res = await self.$resetpost('api/af-revenue/logic/sale_IOTCharge_logic', {data: param}, {
         resolveMsg: '物联网收费成功！！',
         rejectMsg: '物联网收费出错!!!'

package/src/components/charge/business/NoCardMeterCenter.vue

@@ -231,7 +231,7 @@
         self.model.f_write_money = self.model.f_write_money.toFixed(2)
       }
       // 加入扫码盒付款码支付流水号
-      self.model.f_serial_id = self.$refs.paymentcode.paymentCodeReturnData.f_out_trade_no
+      self.model.f_serial_id = self.$refs.paymentcode.paymentCodeReturnData.transactionId
 
       let res = await self.$CardService.noCardSellGas(self.model, self.row, self.cardallot)
       console.log('卡表收费返回id', res, self.model)

package/src/components/charge/business/OtherCharge.vue

@@ -141,7 +141,7 @@
   let otherChargeGen = async function (self) {
     try {
       // 加入扫码盒付款码支付流水号
-      self.model.f_serial_id = self.$refs.paymentcode.paymentCodeReturnData.f_out_trade_no
+      self.model.f_serial_id = self.$refs.paymentcode.paymentCodeReturnData.transactionId
       let resid = await self.$LogicService.otherCharge(self.model, self.row)
       console.log('其他收费返回id', resid)
 

package/src/components/charge/business/OtherChargeByPay.vue

@@ -158,7 +158,7 @@
   let otherChargeGen = async function (self, parameter) {
     try {
       // 加入扫码盒付款码支付流水号
-      self.model.f_serial_id = self.$refs.paymentcode.paymentCodeReturnData.f_out_trade_no
+      self.model.f_serial_id = self.$refs.paymentcode.paymentCodeReturnData.transactionId
       console.log('11111', self.model)
       let resid = await self.$LogicService.otherChargeByPay(self.model, self.row)
       console.log('其他收费返回id', resid, self.config.hasPrint, self.$login.r.includes('不打印发票'))

package/src/components/charge/business/OtherChargeNew.vue

@@ -162,7 +162,7 @@ import {HttpResetClass} from 'vue-client'
 let otherChargeGen = async function (self, parameter) {
   try {
     // 加入扫码盒付款码支付流水号
-    self.model.f_serial_id = self.$refs.paymentcode.paymentCodeReturnData.f_out_trade_no
+    self.model.f_serial_id = self.$refs.paymentcode.paymentCodeReturnData.transactionId
     console.log('11111', self.model)
     let resid = await self.$LogicService.otherCharge(self.model, self.row)
     console.log('其他收费返回id', resid, self.config.hasPrint, self.$login.r.includes('不打印发票'))

package/src/components/charge/business/PriceChangeCompensation/IotCompensation.vue

@@ -105,7 +105,7 @@
       param.f_payment = self.model.f_payment.toString()
       param.f_print = self.model.f_print.toString()
       // 加入扫码盒付款码支付流水号
-      param.f_serial_id = self.$refs.paymentcode.paymentCodeReturnData.f_out_trade_no
+      param.f_serial_id = self.$refs.paymentcode.paymentCodeReturnData.transactionId
       let res = await self.$resetpost('api/af-revenue/logic/sale_compensationJB_logic', {data: param}, {
         warnMsg: `确定对客户${self.row.f_user_name}进行调价补差吗？`,
         resolveMsg: '调价补差成功！！',

package/src/components/charge/business/PriceChangeCompensation/JbCompensation.vue

@@ -124,7 +124,7 @@
       param.f_payment = self.model.f_payment.toString()
       param.f_print = self.model.f_print.toString()
       // 加入扫码盒付款码支付流水号
-      param.f_serial_id = self.$refs.paymentcode.paymentCodeReturnData.f_out_trade_no
+      param.f_serial_id = self.$refs.paymentcode.paymentCodeReturnData.transactionId
       let res = await self.$resetpost('api/af-revenue/logic/sale_compensationJB_logic', {data: param}, {
         warnMsg: `确定对客户${self.row.f_user_name}进行调价补差吗？`,
         resolveMsg: '调价补差成功！！',

package/src/components/charge/business/ShowCardSellGas.vue

@@ -361,7 +361,7 @@ let initCardGen = async function (self) {
 
     self.model.payments = self.paymentModel
     // 加入扫码盒付款码支付流水号
-    self.model.f_serial_id = self.$refs.paymentcode.paymentCodeReturnData.f_out_trade_no
+    self.model.f_serial_id = self.$refs.paymentcode.paymentCodeReturnData.transactionId
     let res = await self.$CardService.initCard(self.model, self.row, self.cardallot)
     let localeSustainMoney = window.localStorage.getItem('sustainMoney')
     if (localeSustainMoney != null) {

package/src/components/charge/business/depositCharge/DepositCharge.vue

@@ -171,7 +171,7 @@
   let machineChargeGen = async function (self) {
     try {
       // 加入扫码盒付款码支付流水号
-      self.data.f_serial_id = self.$refs.paymentcode.paymentCodeReturnData.f_out_trade_no
+      self.data.f_serial_id = self.$refs.paymentcode.paymentCodeReturnData.transactionId
       let res = await self.$MachineChargeService.depositCharge(self.data, self.row, self.floor)
       console.log('res:+++====', res)
       let param = []

package/src/components/charge/business/machine/MachineMeterCenter.vue

@@ -202,7 +202,7 @@ let asyncMachineMeterCenter = async function (self) {
     try {
       if (!self.model) self.model = {}
       // 加入扫码盒付款码支付流水号
-      self.model.f_serial_id = self.$refs.paymentcode.paymentCodeReturnData.f_out_trade_no
+      self.model.f_serial_id = self.$refs.paymentcode.paymentCodeReturnData.transactionId
       console.log('查看传过来的数据=====================>', self)
       let res = await self.$MachineChargeService.marchineCharge(self.data, self.model, self.row, self.floor)
       let localeSustainMoney = window.localStorage.getItem('sustainMoney')

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

@@ -82,7 +82,7 @@
   let gasLossGen = async function (self) {
     try {
       // 加入扫码盒付款码支付流水号
-      // self.model.f_serial_id = self.$refs.paymentcode.paymentCodeReturnData.f_out_trade_no
+      // self.model.f_serial_id = self.$refs.paymentcode.paymentCodeReturnData.transactionId
       // let resid = await self.$LogicService.otherCharge(self.model, self.row)
       let http = new HttpResetClass()
       self.model.f_describe=`${Vue.$login.f.name}对${self.model.f_charge_person}进行气损收费`

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

@@ -138,7 +138,7 @@
   let gasLossGen = async function (self) {
     try {
       // 加入扫码盒付款码支付流水号
-      self.model.f_serial_id = self.$refs.paymentcode.paymentCodeReturnData.f_out_trade_no
+      self.model.f_serial_id = self.$refs.paymentcode.paymentCodeReturnData.transactionId
       self.model.f_bill_style = self.model.f_print
       let http = new HttpResetClass()
       self.model.f_describe = `${Vue.$login.f.name}对${self.model.f_charge_person}进行气损收费`

package/src/components/chargeBatch/BatchCharge.vue

@@ -249,7 +249,7 @@ export default {
       let param = {
         uuid: uuid,
         chargeUser: [],
-        f_serial_id: this.$refs.paymentcode.paymentCodeReturnData.f_out_trade_no,
+        f_serial_id: this.$refs.paymentcode.paymentCodeReturnData.transactionId,
         f_balance: this.data.f_balance,
         f_curbalance: this.curbalance,
         f_pregas: this.data.oughtamount_all,

package/src/components/common/userinfo_detail/UserInfoDetailManage.vue

@@ -118,9 +118,6 @@ export default {
       },
       async search () {
         let http = new HttpResetClass()
-
-        let condition = `f_userinfo_id = '${this.f_userinfo_id}'`
-
         let getBaseInfo = await http.load('POST', 'api/af-revenue/logic/iot_getUserBaseData',
           {data: {f_userfiles_id: this.f_userfiles_id}}, {resolveMsg: null, rejectMsg: '获取基本信息出错'})
         this.row = getBaseInfo.data

package/src/components/common/userinfo_detail/UserInfoDetailManageNew.vue

@@ -212,20 +212,18 @@ export default {
       },
       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}'`
-        }else{
+        if (!this.f_userfiles_id && !this.f_userinfo_id && !this.f_userinfo_code) {
           this.$showMessage('用户信息缺失，查询详情信息失败')
           return
         }
-
         let getBaseInfo = await http.load('POST', 'api/af-revenue/logic/iot_getUserBaseData',
-          {data: {f_userfiles_id: this.f_userfiles_id}}, {resolveMsg: null, rejectMsg: '获取基本信息出错'})
+          {
+            data: {
+              f_userfiles_id: this.f_userfiles_id,
+              f_userinfo_id: this.f_userinfo_id,
+              f_userinfo_code: this.f_userinfo_code
+            }
+          }, {resolveMsg: null, rejectMsg: '获取基本信息出错'})
         this.row = getBaseInfo.data
         this.row.parentname = this.parentname || ''
       },

package/src/components/revenue/Common/PaymentCode.vue

@@ -144,7 +144,7 @@
       // 付款成功更新收费记录订单号
       async updateSellinggas () {
         if (this.payment.toString().indexOf('&') !== -1) {
-          let sqldata = `update t_sellinggas set f_serial_id = '${this.paymentCodeReturnData.f_out_trade_no}' where id = '${this.sellinggasId}'`
+          let sqldata = `update t_sellinggas set f_serial_id = '${this.paymentCodeReturnData.transactionId}' where id = '${this.sellinggasId}'`
           await this.$resetpost('api/af-revenue/logic/runSQL', {data: {sql: sqldata}}, {resolveMsg: null, rejectMsg: '更新收费记录订单号失败'})
         }
       },

package/src/components/revenue/comprehen/ComprehenOperation/OverCharge/OverUseCharge.vue

@@ -180,7 +180,7 @@ let overChargeGen = async function (self) {
     }]
 
     // 加入扫码盒付款码支付流水号
-    self.model.f_serial_id = self.$refs.paymentcode.paymentCodeReturnData.f_out_trade_no
+    self.model.f_serial_id = self.$refs.paymentcode.paymentCodeReturnData.transactionId
 
     let res = await self.$ChangeMeterService.overCharge(self.model, self.row)
     console.log('超用收费返回id', res)

package/src/components/revenue/comprehen/ComprehenOperation/ReplaceCard/ReplaceCardManage.vue

@@ -331,7 +331,7 @@
           if (!ss.result) return
         }
         // 加入扫码盒付款码支付流水号
-        this.model.f_serial_id = this.$refs.paymentcode.paymentCodeReturnData.f_out_trade_no
+        this.model.f_serial_id = this.$refs.paymentcode.paymentCodeReturnData.transactionId
         this.row.cardInfo = this.cardData
         this.$CardService.replaceCard(this.model, this.row).then(async (res) => {
           if (this.config.showupload) {

package/src/components/webMeter/common/NewWatchMsg.vue

@@ -397,7 +397,6 @@
       // 发送请求去数据
       search () {
         let http = new HttpResetClass()
-        console.log('iot_getUserBaseData=======')
         http.load('POST', 'api/af-revenue/logic/iot_getUserBaseData',
           {data: {f_userfiles_id: this.watchmsg.f_userfiles_id}},
           {resolveMsg: null, rejectMsg: null}).then((res) => {

package/src/filiale/bayan/UserInfoDetailManageNew.vue

@@ -200,17 +200,18 @@ export default {
     },
     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}'`
+      if (!this.f_userfiles_id && !this.f_userinfo_id && !this.f_userinfo_code) {
+        this.$showMessage('用户信息缺失，查询详情信息失败')
+        return
       }
-
       let getBaseInfo = await http.load('POST', 'api/af-revenue/logic/iot_getUserBaseData',
-        {data: {f_userfiles_id: this.f_userfiles_id}}, {resolveMsg: null, rejectMsg: '获取基本信息出错'})
+        {
+          data: {
+            f_userfiles_id: this.f_userfiles_id,
+            f_userinfo_id: this.f_userinfo_id,
+            f_userinfo_code: this.f_userinfo_code
+          }
+        }, {resolveMsg: null, rejectMsg: '获取基本信息出错'})
       this.row = getBaseInfo.data
       this.row.parentname = this.parentname || ''
     },

package/src/filiale/dongguan/components/common/userinfo_detail/UserInfoDetailManageNew.vue

@@ -157,16 +157,20 @@ export default {
       },
       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}'`
+        if (!this.f_userfiles_id && !this.f_userinfo_id && !this.f_userinfo_code) {
+          this.$showMessage('用户信息缺失，查询详情信息失败')
+          return
         }
-
         let getBaseInfo = await http.load('POST', 'api/af-revenue/logic/iot_getUserBaseData',
-          {data: {f_userfiles_id: this.f_userfiles_id}}, {resolveMsg: null, rejectMsg: '获取基本信息出错'})
+          {
+            data: {
+              f_userfiles_id: this.f_userfiles_id,
+              f_userinfo_id: this.f_userinfo_id,
+              f_userinfo_code: this.f_userinfo_code
+            }
+          }, {resolveMsg: null, rejectMsg: '获取基本信息出错'})
         this.row = getBaseInfo.data
+        this.row.parentname = this.parentname || ''
       },
 
       cancel (val) {

package/src/filiale/fugou/UserInfoDetailManageNew.vue

@@ -194,20 +194,18 @@ export default {
       },
       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}'`
-        }else{
+        if (!this.f_userfiles_id && !this.f_userinfo_id && !this.f_userinfo_code) {
           this.$showMessage('用户信息缺失，查询详情信息失败')
           return
         }
-
         let getBaseInfo = await http.load('POST', 'api/af-revenue/logic/iot_getUserBaseData',
-          {data: {f_userfiles_id: this.f_userfiles_id}}, {resolveMsg: null, rejectMsg: '获取基本信息出错'})
+          {
+            data: {
+              f_userfiles_id: this.f_userfiles_id,
+              f_userinfo_id: this.f_userinfo_id,
+              f_userinfo_code: this.f_userinfo_code
+            }
+          }, {resolveMsg: null, rejectMsg: '获取基本信息出错'})
         this.row = getBaseInfo.data
         this.row.parentname = this.parentname || ''
       },

package/src/filiale/gehua/userinfo_detail/UserInfoDetailManageNew.vue

@@ -167,17 +167,18 @@ export default {
       },
       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}'`
+        if (!this.f_userfiles_id && !this.f_userinfo_id && !this.f_userinfo_code) {
+          this.$showMessage('用户信息缺失，查询详情信息失败')
+          return
         }
-
         let getBaseInfo = await http.load('POST', 'api/af-revenue/logic/iot_getUserBaseData',
-          {data: {f_userfiles_id: this.f_userfiles_id}}, {resolveMsg: null, rejectMsg: '获取基本信息出错'})
+          {
+            data: {
+              f_userfiles_id: this.f_userfiles_id,
+              f_userinfo_id: this.f_userinfo_id,
+              f_userinfo_code: this.f_userinfo_code
+            }
+          }, {resolveMsg: null, rejectMsg: '获取基本信息出错'})
         this.row = getBaseInfo.data
         this.row.parentname = this.parentname || ''
       },

package/src/filiale/jiaxian/UserInfoDetailManageNew.vue

@@ -212,24 +212,21 @@ export default {
       },
       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}'`
-        }else{
+        if (!this.f_userfiles_id && !this.f_userinfo_id && !this.f_userinfo_code) {
           this.$showMessage('用户信息缺失，查询详情信息失败')
           return
         }
-
         let getBaseInfo = await http.load('POST', 'api/af-revenue/logic/iot_getUserBaseData',
-          {data: {f_userfiles_id: this.f_userfiles_id}}, {resolveMsg: null, rejectMsg: '获取基本信息出错'})
+          {
+            data: {
+              f_userfiles_id: this.f_userfiles_id,
+              f_userinfo_id: this.f_userinfo_id,
+              f_userinfo_code: this.f_userinfo_code
+            }
+          }, {resolveMsg: null, rejectMsg: '获取基本信息出错'})
         this.row = getBaseInfo.data
         this.row.parentname = this.parentname || ''
       },
-
       cancel (val) {
         // 判断当前是否在 iframe 环境中
         this.$emit('cancel-main', val)

package/src/filiale/jingyang/UserInfoDetailManageNew.vue

@@ -197,17 +197,18 @@ export default {
       },
       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}'`
+        if (!this.f_userfiles_id && !this.f_userinfo_id && !this.f_userinfo_code) {
+          this.$showMessage('用户信息缺失，查询详情信息失败')
+          return
         }
-
         let getBaseInfo = await http.load('POST', 'api/af-revenue/logic/iot_getUserBaseData',
-          {data: {f_userfiles_id: this.f_userfiles_id}}, {resolveMsg: null, rejectMsg: '获取基本信息出错'})
+          {
+            data: {
+              f_userfiles_id: this.f_userfiles_id,
+              f_userinfo_id: this.f_userinfo_id,
+              f_userinfo_code: this.f_userinfo_code
+            }
+          }, {resolveMsg: null, rejectMsg: '获取基本信息出错'})
         this.row = getBaseInfo.data
         this.row.parentname = this.parentname || ''
       },

package/src/filiale/liuan/UserInfoDetailManageNew.vue

@@ -186,17 +186,18 @@ export default {
     },
     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}'`
+      if (!this.f_userfiles_id && !this.f_userinfo_id && !this.f_userinfo_code) {
+        this.$showMessage('用户信息缺失，查询详情信息失败')
+        return
       }
-
       let getBaseInfo = await http.load('POST', 'api/af-revenue/logic/iot_getUserBaseData',
-        {data: {f_userfiles_id: this.f_userfiles_id}}, {resolveMsg: null, rejectMsg: '获取基本信息出错'})
+        {
+          data: {
+            f_userfiles_id: this.f_userfiles_id,
+            f_userinfo_id: this.f_userinfo_id,
+            f_userinfo_code: this.f_userinfo_code
+          }
+        }, {resolveMsg: null, rejectMsg: '获取基本信息出错'})
       this.row = getBaseInfo.data
       this.row.parentname = this.parentname || ''
     },

package/src/filiale/lixianV3/UserInfoDetailManageNew.vue

@@ -169,17 +169,18 @@ export default {
       },
       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}'`
+        if (!this.f_userfiles_id && !this.f_userinfo_id && !this.f_userinfo_code) {
+          this.$showMessage('用户信息缺失，查询详情信息失败')
+          return
         }
-
         let getBaseInfo = await http.load('POST', 'api/af-revenue/logic/iot_getUserBaseData',
-          {data: {f_userfiles_id: this.f_userfiles_id}}, {resolveMsg: null, rejectMsg: '获取基本信息出错'})
+          {
+            data: {
+              f_userfiles_id: this.f_userfiles_id,
+              f_userinfo_id: this.f_userinfo_id,
+              f_userinfo_code: this.f_userinfo_code
+            }
+          }, {resolveMsg: null, rejectMsg: '获取基本信息出错'})
         this.row = getBaseInfo.data
         this.row.parentname = this.parentname || ''
       },

package/src/filiale/macheng/UserInfoDetailManageNew.vue

@@ -167,17 +167,18 @@ export default {
       },
       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}'`
+        if (!this.f_userfiles_id && !this.f_userinfo_id && !this.f_userinfo_code) {
+          this.$showMessage('用户信息缺失，查询详情信息失败')
+          return
         }
-
         let getBaseInfo = await http.load('POST', 'api/af-revenue/logic/iot_getUserBaseData',
-          {data: {f_userfiles_id: this.f_userfiles_id}}, {resolveMsg: null, rejectMsg: '获取基本信息出错'})
+          {
+            data: {
+              f_userfiles_id: this.f_userfiles_id,
+              f_userinfo_id: this.f_userinfo_id,
+              f_userinfo_code: this.f_userinfo_code
+            }
+          }, {resolveMsg: null, rejectMsg: '获取基本信息出错'})
         this.row = getBaseInfo.data
         this.row.parentname = this.parentname || ''
       },

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

@@ -142,16 +142,20 @@ export default {
       },
       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}'`
+        if (!this.f_userfiles_id && !this.f_userinfo_id && !this.f_userinfo_code) {
+          this.$showMessage('用户信息缺失，查询详情信息失败')
+          return
         }
-
         let getBaseInfo = await http.load('POST', 'api/af-revenue/logic/iot_getUserBaseData',
-          {data: {f_userfiles_id: this.f_userfiles_id}}, {resolveMsg: null, rejectMsg: '获取基本信息出错'})
+          {
+            data: {
+              f_userfiles_id: this.f_userfiles_id,
+              f_userinfo_id: this.f_userinfo_id,
+              f_userinfo_code: this.f_userinfo_code
+            }
+          }, {resolveMsg: null, rejectMsg: '获取基本信息出错'})
         this.row = getBaseInfo.data
+        this.row.parentname = this.parentname || ''
       },
 
       cancel (val) {