apply-clients 5.0.35-ezhou-25-11 → 5.0.35-ezhou-25-13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apply-clients",
-  "version": "5.0.35-ezhou-25-11",
+  "version": "5.0.35-ezhou-25-13",
   "description": "报建前端模块",
   "main": "src/index.js",
   "directories": {

package/src/components/product/Function/functions/InstallFee.vue

@@ -766,7 +766,12 @@
           } else if(this.model.f_payment_account==='欣泰'){
             this.addItem.f_filiale ='欣泰工程公司'
           }else{
-            this.addItem.f_filiale='迪泰公司'
+            //提示当前支付账户是
+            this.$showMessage("当前支付账户是:"+this.model.f_payment_account, ['confirm', 'cancel']).then((res) => {
+              if (res === 'cancel') {
+                return
+              }
+            })
           }
           // this.addItem.f_filiale = this.model.f_payment_account =='安泰' ? '燃气公司.安泰天然气' : '欣泰工程公司'
           this.addItem.f_process_id = this.infee.f_process_id

package/src/plugins/commonService.js

@@ -1,241 +1,241 @@
-import Vue from 'vue'
-
-let openEticketGen = async function (param, type, conf) {
-  // 组织数据
-  let getEticket = await Vue.resetpost('rs/logic/bjcombineData', {param: param, charge_type: type, eticket: conf}, {resolveMsg: null, rejectMsg: '获取电子票数据出错'})
-  console.log('获取的电子票数据', getEticket)
-  try{
-    const openEticketParams = {
-      url: '/invoice/rs/logic/getFapiao',
-      params: {
-        eticket_id: `${getEticket.data.eticket_id}`,
-        USERNAME: ''
-      }
-    }
-    const res = await Vue.resetpost('rs/logic/callInvoicing', openEticketParams, {resolveMsg: null, rejectMsg: null})
-    this.$showAlert(res.data.RETURNMESSAGE || res.data.msg || '开票失败！', res.data.CODE === '0000' ? 'success' : 'danger', 3000)
-    return res
-  }catch (e) {
-    Vue.showAlert(`电子发票开票失败,请在发票管理处重新开具`,'warning',3000)
-  }}
-
-let correctEticketGen = async function (id, type, conf) {
-  let param = {
-    id: id,
-    type: type,
-    eticket: conf
-  }
-  let requestUrl = ''
-  if (type === '机表抄表') {
-    requestUrl = 'rs/logic/correctHandEticket'
-  } else {
-    requestUrl = 'rs/logic/correctEticket'
-  }
-
-  await Vue.resetpost(requestUrl, param, {resolveMsg: '冲红成功', rejectMsg: '冲红失败'})
-}
-
-let commonService = {
-  install (Vue, options) {
-    // 给vue增添对话框显示方法
-    Vue.commonService = Vue.prototype.$commonService = commonService
-  },
-
-
-  gasCalculate (model, pregas) {
-    return Vue.resetpost('rs/logic/CommonCal', {data: {model: model, isGasValue: 0, value: pregas}}, {resolveMsg: null, rejectMsg: '获取金额失败'})
-  },
-
-  feeCalculate (model, preamount) {
-    return Vue.resetpost('rs/logic/commonCal', {data: {model: model, isGasValue: 1, value: preamount}}, {resolveMsg: null, rejectMsg: '获取气量失败'})
-  },
-
-  async saveLiquidation(data) {
-    let param = {
-      endDate:data.endDate,
-      startDate:data.startDate,
-      f_user_name: data.f_user_name,
-      f_bill_id: data.f_bill_id,
-      f_bill_number: data.f_bill_number,
-      f_bill_type: data.f_bill_type,
-      f_userinfo_id: data.f_userinfo_id,
-      f_user_id: data.f_user_id,
-      f_operator: data.f_operator,
-      f_hand_month: data.f_hand_month,
-      f_paid_money: data.f_paid_money,
-      f_filiale : data.f_filiale,
-      f_outlets: data.f_outlets,
-      f_orgstr: data.f_orgstr,
-      f_filialeids: data.f_filialeids,
-      f_gas : data.f_gas
-    }
-    return await Vue.resetpost('rs/logic/saveLiquidation', {data: param}, {resolveMsg: null, rejectMsg: '开具发票失败，请重试或联系管理员'})
-  },
-  async operateLiquidation(data) {
-    let param = {
-      id :data.id,
-      type : data.type
-    }
-    return await Vue.resetpost('rs/logic/operateLiquidation', {data: param}, {resolveMsg: null, rejectMsg: ''})
-  },
-
-  async openPaperBill(sellId, chargeType, useType, usingBill, billType,f_operator,f_filiale,f_outlets,f_orgstr,f_filialeids) {
-    console.log("进入commonService")
-    console.log(sellId, chargeType, useType, usingBill, billType,f_operator,f_filiale,f_outlets,f_orgstr,f_filialeids)
-    let param = {
-      f_charge_id: sellId,
-      f_charge_type: '报建收费',
-      f_use_type: useType,
-      f_using_bill: usingBill,
-      f_bill_type: billType,
-      f_operator:f_operator,
-      f_outlets:f_outlets,
-      f_filiale:f_filiale,
-      f_orgstr:f_orgstr,
-      f_filialeids:f_filialeids
-      // f_filialeid: this.$login.f.f_orgids.split('.')[this.$login.f.f_orgids.split('.').length - 2] + '.'
-    }
-    console.log("进入commonService，看看参数")
-    console.log(param)
-    await Vue.resetpost('rs/logic/apply_sale_openBill', {data: param}, {resolveMsg: null, rejectMsg: '更新发票号失败，请从右侧操作卡片进行补打！！'})
-  },
-
-  async correctPaperBill(sellId, chargeType, useType, usingBill, correctType) {
-    let param = {
-      f_charge_id: sellId,
-      f_charge_type: chargeType,
-      f_use_type: useType,
-      f_using_bill: usingBill,
-      f_bill_correct_type: correctType
-    }
-    await Vue.resetpost('rs/logic/sale_correctBill', {data: param}, {resolveMsg: null, rejectMsg: '更新发票号失败，请从右侧操作卡片进行补打！！'})
-  },
-
-  async reissuePaperBill(sellId, chargeType, model, useType) {
-    let param = {
-      f_charge_id: sellId,
-      f_charge_type: chargeType,
-      model: model,
-      f_use_type: useType
-    }
-    await Vue.resetpost('rs/logic/sale_reissueBill', {data: param}, {resolveMsg: null, rejectMsg: '更新发票号失败，请从右侧操作卡片进行补打！！'})
-  },
-
-  async openEticket (param, chargeType) {
-    // 获取各分公司下的电子票配置文件
-    // 从vues目录下获取电子票配置
-    try {
-      let conf = await commonService.getSelfConfig()
-      console.log('看看配置文件', conf)
-      let tecket =await openEticketGen(param, chargeType, conf)
-      return tecket
-    } catch (error) {
-      console.log('电子发票开票失败', JSON.stringify(error))
-      Vue.showAlert(`电子发票开票失败！！请到发票管理重新开票。错误原因: ${JSON.stringify(error)}。`, 'danger', 0)
-    }
-
-  },
-
-  async correctEticket (sellId, chargeType) {
-    try {
-      let conf = await commonService.getSelfConfig()
-      console.log('看看配置文件', conf)
-      await correctEticketGen(sellId, chargeType, conf)
-    }  catch (error) {
-      console.log('电子发票冲正失败', JSON.stringify(error))
-      Vue.showAlert(`电子发票冲正失败！！请到发票管理重新开票。错误原因: ${JSON.stringify(error)}。`, 'danger', 0)
-    }
-  },
-
-  async getSelfConfig () {
-    let res = await Vue.resetget('/rs/vue/Eticket.json',{resolveMsg: null, rejectMsg: '获取电子票配置出错'})
-    console.log('获取各分公司下的电子票配置文件', res)
-    let config = res.data[Vue.$login.f.f_orgids]
-    if (config.isOne) {
-      return config.info
-    } else {
-      // 返回操作人上一级的配置 key为f_orgstr（到操作人）串的前一个即网点
-      return config[commonService.getOutlets()]
-    }
-  },
-  getOutlets () {
-    let result = ''
-    let operator = Vue.$login.f.orgpathstr
-    let tempArr = operator.split('.').splice(0, operator.split('.').length-2)
-    for(let str of tempArr) {
-      result += str + '.'
-    }
-    return result
-  },
-
-  buildSellinggas (model, row) {
-    return {
-      f_balance: row.f_meter_type === '机表' ? row.f_real_balance : row.f_balance,
-      f_curbalance: row.f_meter_type === '机表' ? (row.f_real_balance - 0) + (model.f_collection - 0) : model.f_curbalance,
-      f_user_balance: row.f_meter_type === '机表' ? row.f_balance : model.f_curbalance,
-      f_meter_type: row.f_meter_type,
-      f_payment: model.f_payment,
-      f_user_id: model.f_user_id,
-      // f_userinfo_id: row.f_userinfo_id,
-      f_user_name: row.f_user_name,
-      f_user_type: row.f_user_type,
-      f_gasproperties: row.f_gasproperties,
-      f_address: row.f_address,
-      f_meter_brand: row.f_meter_brand,
-      f_meter_style: row.f_meter_style,
-      f_meternumber: row.f_meternumber,
-      f_price_id: row.f_price_id,
-      f_collection: model.f_collection,
-      f_operator: Vue.$login.f.name,
-      f_filiale: Vue.$login.f.f_fengongsi,
-      f_outlets: Vue.$login.f.f_parentname,
-      f_orgstr: Vue.$login.f.orgpathstr,
-      f_filialeids: Vue.$login.f.f_orgids,
-      f_charge_state: '有效'
-    }
-  },
-  writeCardParams (cardParams) {
-    console.log('common写卡参数，，，', cardParams)
-    let result = {
-      csql: cardParams.data.sc,
-      lastmoney: cardParams.data.scje,
-      ccsql: cardParams.data.ssc,
-      lastlastmoney: cardParams.data.sscje,
-      ljgql: cardParams.data.f_pregas,
-      ljyql: cardParams.data.f_pregasall,
-      yhh: cardParams.data.f_meterid,
-      sxrq: cardParams.data.f_perform_date,
-      totalmoney: cardParams.data.f_collection,
-      stairversion: cardParams.data.f_stairversion
-    }
-
-    // 对阶梯进行处理
-    if (cardParams.data.stairprice.includes(';') && cardParams.data.stairamount.includes(';')) {
-      let gases = cardParams.data.stairamount.split(';')
-      let prices = cardParams.data.stairprice.split(';')
-      if (gases.length >= 2) {
-        result.stairgas1 = gases[0] !== '' ? gases[0] : 0
-        result.stairgas2 = gases[1] !== '' ? gases[1] : 0
-        result.stairgas3 = '99999999'
-      }
-      if (prices.length >= 2) {
-        result.stairprice1 = prices[0] !== '' ? prices[0] : 0
-        result.stairprice2 = prices[1] !== '' ? prices[1] : 0
-        result.stairprice3 = prices[2] !== '' ? prices[2] : 0
-      }
-    } else {
-      // 从固定气价的表换金额表的时候，气量随便写，金额用之前的固定单价
-      result.stairgas1 = '77777777'
-      result.stairgas2 = '88888888'
-      result.stairgas3 = '99999999'
-
-      result.stairprice1 = cardParams.data.stairprice
-      result.stairprice2 = cardParams.data.stairprice
-      result.stairprice3 = cardParams.data.stairprice
-    }
-
-    return result
-  }
-}
-
-export default commonService
+import Vue from 'vue'
+
+let openEticketGen = async function (param, type, conf) {
+  // 组织数据
+  let getEticket = await Vue.resetpost('rs/logic/bjcombineData', {param: param, charge_type: type, eticket: conf}, {resolveMsg: null, rejectMsg: '获取电子票数据出错'})
+  console.log('获取的电子票数据', getEticket)
+  try{
+    const openEticketParams = {
+      url: '/invoice/rs/logic/getFapiao',
+      params: {
+        eticket_id: `${getEticket.data.eticket_id}`,
+        USERNAME: ''
+      }
+    }
+    const res = await Vue.resetpost('rs/logic/callInvoicing', openEticketParams, {resolveMsg: null, rejectMsg: null})
+    this.$showAlert(res.data.RETURNMESSAGE || res.data.msg || '开票失败！', res.data.CODE === '0000' ? 'success' : 'danger', 3000)
+    return res
+  }catch (e) {
+    Vue.showAlert(`电子发票开票失败,请在发票管理处重新开具`,'warning',3000)
+  }}
+
+let correctEticketGen = async function (id, type, conf) {
+  let param = {
+    id: id,
+    type: type,
+    eticket: conf
+  }
+  let requestUrl = ''
+  if (type === '机表抄表') {
+    requestUrl = 'rs/logic/correctHandEticket'
+  } else {
+    requestUrl = 'rs/logic/correctEticket'
+  }
+
+  await Vue.resetpost(requestUrl, param, {resolveMsg: '冲红成功', rejectMsg: '冲红失败'})
+}
+
+let commonService = {
+  install (Vue, options) {
+    // 给vue增添对话框显示方法
+    Vue.commonService = Vue.prototype.$commonService = commonService
+  },
+
+
+  gasCalculate (model, pregas) {
+    return Vue.resetpost('rs/logic/CommonCal', {data: {model: model, isGasValue: 0, value: pregas}}, {resolveMsg: null, rejectMsg: '获取金额失败'})
+  },
+
+  feeCalculate (model, preamount) {
+    return Vue.resetpost('rs/logic/commonCal', {data: {model: model, isGasValue: 1, value: preamount}}, {resolveMsg: null, rejectMsg: '获取气量失败'})
+  },
+
+  async saveLiquidation(data) {
+    let param = {
+      endDate:data.endDate,
+      startDate:data.startDate,
+      f_user_name: data.f_user_name,
+      f_bill_id: data.f_bill_id,
+      f_bill_number: data.f_bill_number,
+      f_bill_type: data.f_bill_type,
+      f_userinfo_id: data.f_userinfo_id,
+      f_user_id: data.f_user_id,
+      f_operator: data.f_operator,
+      f_hand_month: data.f_hand_month,
+      f_paid_money: data.f_paid_money,
+      f_filiale : data.f_filiale,
+      f_outlets: data.f_outlets,
+      f_orgstr: data.f_orgstr,
+      f_filialeids: data.f_filialeids,
+      f_gas : data.f_gas
+    }
+    return await Vue.resetpost('rs/logic/saveLiquidation', {data: param}, {resolveMsg: null, rejectMsg: '开具发票失败，请重试或联系管理员'})
+  },
+  async operateLiquidation(data) {
+    let param = {
+      id :data.id,
+      type : data.type
+    }
+    return await Vue.resetpost('rs/logic/operateLiquidation', {data: param}, {resolveMsg: null, rejectMsg: ''})
+  },
+
+  async openPaperBill(sellId, chargeType, useType, usingBill, billType,f_operator,f_filiale,f_outlets,f_orgstr,f_filialeids) {
+    console.log("进入commonService")
+    console.log(sellId, chargeType, useType, usingBill, billType,f_operator,f_filiale,f_outlets,f_orgstr,f_filialeids)
+    let param = {
+      f_charge_id: sellId,
+      f_charge_type: '报建收费',
+      f_use_type: useType,
+      f_using_bill: usingBill,
+      f_bill_type: billType,
+      f_operator:f_operator,
+      f_outlets:f_outlets,
+      f_filiale:f_filiale,
+      f_orgstr:f_orgstr,
+      f_filialeids:f_filialeids
+      // f_filialeid: this.$login.f.f_orgids.split('.')[this.$login.f.f_orgids.split('.').length - 2] + '.'
+    }
+    console.log("进入commonService，看看参数")
+    console.log(param)
+    await Vue.resetpost('rs/logic/apply_sale_openBill', {data: param}, {resolveMsg: null, rejectMsg: '更新发票号失败，请从右侧操作卡片进行补打！！'})
+  },
+
+  async correctPaperBill(sellId, chargeType, useType, usingBill, correctType) {
+    let param = {
+      f_charge_id: sellId,
+      f_charge_type: chargeType,
+      f_use_type: useType,
+      f_using_bill: usingBill,
+      f_bill_correct_type: correctType
+    }
+    await Vue.resetpost('rs/logic/sale_correctBill', {data: param}, {resolveMsg: null, rejectMsg: '更新发票号失败，请从右侧操作卡片进行补打！！'})
+  },
+
+  async reissuePaperBill(sellId, chargeType, model, useType) {
+    let param = {
+      f_charge_id: sellId,
+      f_charge_type: chargeType,
+      model: model,
+      f_use_type: useType
+    }
+    await Vue.resetpost('rs/logic/sale_reissueBill', {data: param}, {resolveMsg: null, rejectMsg: '更新发票号失败，请从右侧操作卡片进行补打！！'})
+  },
+
+  async openEticket (param, chargeType) {
+    // 获取各分公司下的电子票配置文件
+    // 从vues目录下获取电子票配置
+    try {
+      let conf = await commonService.getSelfConfig()
+      console.log('看看配置文件', conf)
+      let tecket =await openEticketGen(param, chargeType, conf)
+      return tecket
+    } catch (error) {
+      console.log('电子发票开票失败', JSON.stringify(error))
+      Vue.showAlert(`电子发票开票失败！！请到发票管理重新开票。错误原因: ${JSON.stringify(error)}。`, 'danger', 0)
+    }
+
+  },
+
+  async correctEticket (sellId, chargeType) {
+    try {
+      let conf = await commonService.getSelfConfig()
+      console.log('看看配置文件', conf)
+      await correctEticketGen(sellId, chargeType, conf)
+    }  catch (error) {
+      console.log('电子发票冲正失败', JSON.stringify(error))
+      Vue.showAlert(`电子发票冲正失败！！请到发票管理重新开票。错误原因: ${JSON.stringify(error)}。`, 'danger', 0)
+    }
+  },
+
+  async getSelfConfig () {
+    let res = await Vue.resetget('/rs/vue/Eticket.json',{resolveMsg: null, rejectMsg: '获取电子票配置出错'})
+    console.log('获取各分公司下的电子票配置文件', res)
+    let config = res.data[Vue.$login.f.f_orgids]
+    if (config.isOne) {
+      return config.info
+    } else {
+      // 返回操作人上一级的配置 key为f_orgstr（到操作人）串的前一个即网点
+      return config[commonService.getOutlets()]
+    }
+  },
+  getOutlets () {
+    let result = ''
+    let operator = Vue.$login.f.orgpathstr
+    let tempArr = operator.split('.').splice(0, operator.split('.').length-2)
+    for(let str of tempArr) {
+      result += str + '.'
+    }
+    return result
+  },
+
+  buildSellinggas (model, row) {
+    return {
+      f_balance: row.f_meter_type === '机表' ? row.f_real_balance : row.f_balance,
+      f_curbalance: row.f_meter_type === '机表' ? (row.f_real_balance - 0) + (model.f_collection - 0) : model.f_curbalance,
+      f_user_balance: row.f_meter_type === '机表' ? row.f_balance : model.f_curbalance,
+      f_meter_type: row.f_meter_type,
+      f_payment: model.f_payment,
+      f_user_id: model.f_user_id,
+      // f_userinfo_id: row.f_userinfo_id,
+      f_user_name: row.f_user_name,
+      f_user_type: row.f_user_type,
+      f_gasproperties: row.f_gasproperties,
+      f_address: row.f_address,
+      f_meter_brand: row.f_meter_brand,
+      f_meter_style: row.f_meter_style,
+      f_meternumber: row.f_meternumber,
+      f_price_id: row.f_price_id,
+      f_collection: model.f_collection,
+      f_operator: Vue.$login.f.name,
+      f_filiale: Vue.$login.f.f_fengongsi,
+      f_outlets: Vue.$login.f.f_parentname,
+      f_orgstr: Vue.$login.f.orgpathstr,
+      f_filialeids: Vue.$login.f.f_orgids,
+      f_charge_state: '有效'
+    }
+  },
+  writeCardParams (cardParams) {
+    console.log('common写卡参数，，，', cardParams)
+    let result = {
+      csql: cardParams.data.sc,
+      lastmoney: cardParams.data.scje,
+      ccsql: cardParams.data.ssc,
+      lastlastmoney: cardParams.data.sscje,
+      ljgql: cardParams.data.f_pregas,
+      ljyql: cardParams.data.f_pregasall,
+      yhh: cardParams.data.f_meterid,
+      sxrq: cardParams.data.f_perform_date,
+      totalmoney: cardParams.data.f_collection,
+      stairversion: cardParams.data.f_stairversion
+    }
+
+    // 对阶梯进行处理
+    if (cardParams.data.stairprice.includes(';') && cardParams.data.stairamount.includes(';')) {
+      let gases = cardParams.data.stairamount.split(';')
+      let prices = cardParams.data.stairprice.split(';')
+      if (gases.length >= 2) {
+        result.stairgas1 = gases[0] !== '' ? gases[0] : 0
+        result.stairgas2 = gases[1] !== '' ? gases[1] : 0
+        result.stairgas3 = '99999999'
+      }
+      if (prices.length >= 2) {
+        result.stairprice1 = prices[0] !== '' ? prices[0] : 0
+        result.stairprice2 = prices[1] !== '' ? prices[1] : 0
+        result.stairprice3 = prices[2] !== '' ? prices[2] : 0
+      }
+    } else {
+      // 从固定气价的表换金额表的时候，气量随便写，金额用之前的固定单价
+      result.stairgas1 = '77777777'
+      result.stairgas2 = '88888888'
+      result.stairgas3 = '99999999'
+
+      result.stairprice1 = cardParams.data.stairprice
+      result.stairprice2 = cardParams.data.stairprice
+      result.stairprice3 = cardParams.data.stairprice
+    }
+
+    return result
+  }
+}
+
+export default commonService