sale-client 4.2.69 → 4.2.71

package/src/filiale/yuncheng/IndustryCommerceHand.vue

@@ -235,6 +235,9 @@
               <th>
                 <nobr>用气量</nobr>
               </th>
+              <th>
+                <nobr>剩余气量</nobr>
+              </th>
               <th>
                 <nobr>
                   <data-order field="f_last_input_date" name="上次抄表录入日期"
@@ -326,6 +329,7 @@
               {{ row.f_tablebase }}
             </td>
             <td style="text-align: center;">{{ $parent.$parent.$parent.calculationBase(row) }}</td>
+            <td style="text-align: center;">{{ row.f_surplus_gas }}</td>
             <td style="text-align: center;">{{ row.f_last_input_date }}</td>
             <td style="text-align: center;">{{ row.f_hand_date }}</td>
             <td style="text-align: center;">
@@ -496,6 +500,7 @@ export default {
           'f_last_tablebase': '上期底数',
           'f_tablebase': '本期指数',
           'f_oughtamount': '应交气量',
+          'f_surplus_gas': '剩余气量',
           'f_input_person': '录入人员',
           'f_meter_classify': '气表分类',
           'f_meter_brand': '气表品牌',

package/src/filiale/yuncheng/IndustryCommerceHandAudit.vue

@@ -741,6 +741,7 @@
         // 兼容原有弹窗方式
         let id = row ? row.id : this.nopassId
         let reviewReason = reason !== undefined ? reason : this.reasonText
+        // 修改现有记录
         let handplan = {
           id: id,
           f_input_date: null,
@@ -755,6 +756,43 @@
           resolveMsg: null,
           rejectMsg: '未通过，抄表数据返回未抄表保存出错!!!'
         })
+
+        // 先查询这条记录的完整数据
+        let originalData = null
+        if (id) {
+          try {
+            let result = await this.$resetpost('api/af-revenue/sql/saleSingleTable', {
+              data: {
+                tablename: 't_yccustom_handplan',
+                condition: `id = '${id}'`
+              }
+            }, {resolveMsg: null, rejectMsg: '查询原记录失败'})
+            if (result.data && result.data.length > 0) {
+              originalData = result.data[0]
+            }
+          } catch (error) {
+            console.error('查询原记录失败:', error)
+          }
+        }
+
+        // 插入新记录（不传id，让数据库自动生成）
+        let newHandplan = {
+          f_meter_state: '未通过',
+        }
+        // 复制原记录的其他字段到新记录
+        if (originalData) {
+          Object.keys(originalData).forEach(key => {
+            if (!newHandplan.hasOwnProperty(key) && key !== 'id') {
+              newHandplan[key] = originalData[key]
+            }
+          })
+        }
+
+        await this.$resetpost('api/af-revenue/entity/save/t_yccustom_handplan', newHandplan, {
+          resolveMsg: null,
+          rejectMsg: '插入新记录失败!!!'
+        })
+
         this.search()
       },
       loadMeterBooks () {

package/src/plugins/FileManageServicets.js

@@ -0,0 +1,214 @@
+import Vue from 'vue'
+import co from 'co'
+
+let cancelUserGen = function * (data, type) {
+  console.log('销户。。', data)
+  if (type === '销户') {
+    let owe = yield Vue.resetpost('rs/logic/hasOweWithUser', {data: {f_userinfo_id: data.f_userinfo_id.f_userinfo_id}}, {resolveMsg: null, rejectMsg: null})
+    let hasHandplan = yield Vue.resetpost('rs/sql/saleSingleTable', {data: {tablename: 't_handplan', condition: `f_meter_state = '未抄表' and f_userinfo_id = '${data.record_userinfo}'`}}, {resolveMsg: null, rejectMsg: null})
+    if (owe.data === 1 && hasHandplan.data.length > 0) {
+      Vue.showAlert('该客户还有欠费，不能销户！！', 'danger', 0)
+    } else {
+      Vue.resetpost('rs/entity/t_cancellation', data, {resolveMsg: `${type}成功`, rejectMsg: `${type}失败`})
+    }
+  } else {
+    Vue.resetpost('rs/entity/t_cancellation', data, {resolveMsg: `${type}成功`, rejectMsg: `${type}失败`})
+  }
+}
+
+let FileManageServicets = {
+  install (Vue, options) {
+    // 给vue增添对话框显示方法
+    Vue.FileManageServicets = Vue.prototype.$FileManageServicets = FileManageServicets
+  },
+
+  fileSave (data) {
+    let result = Object.assign({}, result, data.baseinfo.base)
+    if(data.baseinfo.civill && data.baseinfo.civill.f_civill_id){
+      result.civill ={};
+      result.civill.f_civill_id = data.baseinfo.civill.f_civill_id;
+    }
+    result.f_userinfo_id = result.f_userinfo_id ? result.f_userinfo_id + '' : null
+    result.f_cost_type = result.f_cost_type.length > 0 ? result.f_cost_type[0] : ''
+    result.f_credentials = result.f_credentials.length > 0 ? result.f_credentials[0] : ''
+    result.f_is_mgq = result.f_is_mgq.length > 0 ? result.f_is_mgq[0] : ''
+    if(result.f_out_user instanceof Array){
+      result.f_out_user =result.f_out_user && result.f_out_user.length > 0 ? result.f_out_user : '否';
+    }else{
+      result.f_out_user ==result.f_out_user ? result.f_out_user :'否';
+    }
+    result.f_paper_type = result.f_paper_type.length > 0 ? result.f_paper_type[0] : ''
+    result.f_predeposit = result.f_predeposit ? result.f_predeposit : 0
+    result.f_people_num = result.f_people_num ? result.f_people_num : 0
+    if (result.f_slice_area instanceof Array) {
+      result.f_slice_area = result.f_slice_area.length > 0 ? result.f_slice_area[0] : null
+    }
+    if (result.f_user_level instanceof Array) {
+      result.f_user_level = result.f_user_level.length > 0 ? result.f_user_level[0] : null
+    }
+    if (data.baseinfo.base.f_cost_type[0] === '银行代扣') {
+      let bank = Object.assign({}, bank, data.baseinfo.bank)
+      result.infobank = bank
+      result.infobank.f_bank_name = bank.f_bank_name.length > 0 ? bank.f_bank_name[0] : ''
+    }
+    // 获取分公司id (通过ids拆分)
+    result.f_filialeid = data.f_filialeid
+    if (result.f_userinfo_id === null) {
+      result.f_createfile_person = Vue.$login.f.name
+      result.f_createfile_date =  Vue.$login.toStandardTimeString ()
+
+      result.f_operator = Vue.$login.f.name
+      result.f_operatorid = Vue.$login.f.id
+      result.f_orgid = data.f_filialeid
+      result.f_orgname = Vue.$login.f.orgs
+      result.f_depid = Vue.$login.f.depids
+      result.f_depname = Vue.$login.f.deps
+    }
+
+    // 档案变更时，获取档案登录人信息进行操作记录的保存
+    result.f_operator_record = Vue.$login.f.name
+    result.f_operatorid_record = Vue.$login.f.id
+    result.f_orgid_record = Vue.$login.f.orgid
+    result.f_orgname_record = Vue.$login.f.orgs
+    result.f_depid_record = Vue.$login.f.depids
+    result.f_depname_record = Vue.$login.f.deps
+    result.f_user_state = result.f_user_state.length > 0 ? result.f_user_state[0] : '正常'
+    result.userfiles = []
+    // 表具信息
+    data.meterinfo.forEach((item) => {
+      // item.f_user_id = result.f_user_id ? result.f_user_id : null
+      let meter = Object.assign({}, meter, item)
+      if (meter.f_user_id) {
+        meter.f_user_id = meter.f_user_id
+      }
+      meter.f_filialeid = data.f_filialeid
+      meter.f_position = meter.f_position ? meter.f_position : null
+      meter.f_gasbrand_id = meter.gasbrand[0].id
+      meter.f_show_way = meter.f_show_way ? meter.f_show_way[0] : null
+      meter.f_inputtor = meter.f_inputtor.length > 0 ? meter.f_inputtor[0] : null
+      // meter.f_install_person = meter.f_install_person.length > 0 ? meter.f_install_person[0] : null
+      meter.f_aroundmeter = meter.f_aroundmeter.length > 0 ? meter.f_aroundmeter[0] : null
+      meter.f_garbage_fee = meter.f_garbage_fee.length > 0 ? meter.f_garbage_fee[0] : '否'
+      meter.f_valve_state = meter.f_valve_state.length > 0 ? meter.f_valve_state[0] : '开阀'
+      meter.f_meter_base = isNaN(meter.f_meter_base) || meter.f_meter_base === '' ? 0.00 : (meter.f_meter_base - 0).toFixed(4)
+      meter.f_initial_base = isNaN(meter.f_initial_base) || meter.f_initial_base === '' ? 0.00 : (meter.f_initial_base - 0).toFixed(4)
+      meter.f_remanent_gas = isNaN(meter.f_remanent_gas) || meter.f_remanent_gas === '' ? 0.00 : (meter.f_remanent_gas - 0).toFixed(4)
+      meter.f_remanent_gas = isNaN(meter.f_remanent_gas) || meter.f_remanent_gas === '' ? 0.00 : (meter.f_remanent_gas - 0).toFixed(4)
+      meter.f_meternumber = meter.f_meternumber ? meter.f_meternumber.trim() : null;
+      meter.f_cardmeternumber = meter.f_cardmeternumber ? meter.f_cardmeternumber.trim() : meter.f_meternumber;
+      meter.f_price_ratio = meter.f_price_ratio ? meter.f_price_ratio : null
+      meter.f_fire_state = meter.f_fire_state1 ? '1' : '0'
+      meter.f_gasmodel_id = meter.gasmodel[0].id
+      meter.f_meter_classify = meter.gasbrand[0].f_meter_type
+      meter.f_user_type = meter.f_user_type.length > 0 ? meter.f_user_type[0] : ''
+      meter.f_price_id = meter.pricename[0].f_price_id
+      meter.f_gasproperties = meter.f_gasproperties.length > 0 ? meter.f_gasproperties[0] : ''
+      meter.f_adjustable_id = meter.f_adjustable.length > 0 ? meter.f_adjustable[0].id : null
+      meter.f_userfiles_address = meter.f_userfiles_address ? meter.f_userfiles_address : null
+    meter.f_total_fee = meter.f_total_fee == null || meter.f_total_fee == '' ? 0:meter.f_total_fee
+    meter.f_total_gas = meter.f_total_gas == null || meter.f_total_gas == '' ? 0:meter.f_total_gas
+    meter.f_history_gas = meter.f_history_gas == null || meter.f_history_gas == '' ? 0:meter.f_history_gas
+    meter.f_history_fee = meter.f_history_fee == null || meter.f_history_fee == '' ? 0:meter.f_history_fee
+      if (!meter.f_userfiles_id) {
+        // 气表状态需要根据表型判断是否需要开通操作 目前物联网表需要做开通操作
+        meter.f_table_state = '正常'
+        //meter.f_whether_hairpin = !item.gasbrand[0].f_meter_type.includes('机表') ? '未发' : '无卡'
+        //所有表变成未发
+        meter.f_whether_hairpin = '未发'
+        meter.f_input_person = Vue.$login.f.name
+        meter.f_input_date =  Vue.$login.toStandardTimeString ()
+        meter.f_card_password = item.gasbrand[0].f_card_password
+        meter.f_meter_base = isNaN(meter.f_initial_base) || meter.f_initial_base === '' ? 0.00 : (meter.f_initial_base - 0).toFixed(4)
+        meter.f_operator = Vue.$login.f.name
+        meter.f_operatorid = Vue.$login.f.id
+        meter.f_orgid = data.f_filialeid
+        meter.f_orgname = Vue.$login.f.orgs
+        meter.f_depid = Vue.$login.f.depids
+        meter.f_depname = Vue.$login.f.deps
+      }
+      // 之前建立的是卡表在档案中改成了物联网表（需验证建立的卡表是不是未发，如果是未发，表状态给成待开通）后端处理
+
+      meter.img = meter.img ? meter.img : {content: null, filename: null}
+      meter.img.content = meter.img.content ? meter.img.content : null
+      meter.img.filename = meter.img.filename ? meter.img.filename : null
+
+      // 处理表具的设备信息
+      let userfilesdevices = []
+      meter.devicesinfo.forEach((devitem) => {
+        let userfilesdevice = Object.assign({}, userfilesdevice, devitem)
+        userfilesdevice.f_user_id = data.meterinfo[0].f_user_id ? data.meterinfo[0].f_user_id : null
+        userfilesdevice.f_devices_type = userfilesdevice.f_devices_type
+        userfilesdevice.f_state = userfilesdevice.f_state ? userfilesdevice.f_state : '有效'
+        userfilesdevice.f_devices_no = userfilesdevice.f_devices_no ? userfilesdevice.f_devices_no : null
+        userfilesdevice.f_brand = userfilesdevice.f_brand ? userfilesdevice.f_brand : null
+        userfilesdevice.f_devices_model = userfilesdevice.f_devices_model ? userfilesdevice.f_devices_model : null
+        userfilesdevice.f_devices_num = userfilesdevice.f_devices_num ? userfilesdevice.f_devices_num : null
+        userfilesdevice.img = userfilesdevice.img ? userfilesdevice.img : {content: null, filename: null}
+        userfilesdevice.img.content = userfilesdevice.img.content ? userfilesdevice.img.content : null
+        userfilesdevice.img.filename = userfilesdevice.img.filename ? userfilesdevice.img.filename : null
+        if (!userfilesdevice.id) {
+          userfilesdevice.f_input_person = Vue.$login.f.name
+          userfilesdevice.f_input_date =  Vue.$login.toStandardTimeString ()
+        }
+        userfilesdevices.push(userfilesdevice)
+      })
+      meter.devicesinfo = userfilesdevices
+      result.userfiles.push(meter)
+    })
+
+    // 组织地址数据，更新地址管理中的数据
+    // 地址信息
+    let address = {}
+    address = {
+      id: data.addressinfo.id,
+    }
+
+    if (data.oldaddressinfo.id) {
+      address.oldid = data.oldaddressinfo.id
+    }
+    if (!data.checkRefund){
+      return Vue.resetpost('rs/logic/filemanage_fileSave_ts', {data: {userinfo: result,  address: address, limit_gas: data.limit_gas}})
+    } else {
+      return Vue.resetpost('rs/logic/checkRefund', {data: {userinfo: result,  address: address, limit_gas: data.limit_gas}})
+    }
+
+  },
+  batchOperate (model, type) {
+    let operateType = type
+    if (type === '启用') {
+      operateType = '销户启用'
+    }
+    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_comments: model.f_reason,
+      f_operator: Vue.$login.f.name,
+      f_operatorid: Vue.$login.f.id,
+      f_orgid: Vue.$login.f.orgid,
+      f_orgname: Vue.$login.f.orgs,
+      f_depid: Vue.$login.f.depids,
+      f_depname: Vue.$login.f.deps
+    }
+    if (type === '销户') {
+      data.f_userinfo_id = {
+        f_userinfo_id: model.userinfo.f_userinfo_id,
+        f_user_state: '销户',
+        version: model.userinfo.version
+      }
+    } else if (type === '启用') {
+      data.f_describe = `${Vue.$login.f.name}对客户${model.userinfo.f_user_name}进行启用`
+      data.f_userinfo_id = {
+        f_userinfo_id: model.userinfo.f_userinfo_id,
+        f_user_state: '正常',
+        version: model.userinfo.version
+      }
+    }
+    let cancelUser = cancelUserGen(data, type)
+    return co(cancelUser)
+  }
+}
+
+export default FileManageServicets

package/src/plugins/GetImg.js

@@ -0,0 +1,53 @@
+import axios from 'axios'
+export async function fetchImage (imagePath, options = {}) {
+  const defaultOptions = {
+    timeout: 3000, // 默认超时时间，单位为毫秒
+    maxRetries: 1,  // 默认最大重试次数
+    onTimeout: () => {
+      console.log('请求超时')
+    },
+    onError: (error) => {
+      console.log('请求失败', error)
+    },
+    onSuccess: () => {}
+  }
+  const finalOptions = Object.assign({}, defaultOptions, options)
+  let retries = 0
+
+  const fetch = async () => {
+    try {
+      const response = await axios.get(imagePath, {
+        responseType: 'blob',
+        timeout: finalOptions.timeout
+      })
+      return URL.createObjectURL(response.data)
+    } catch (error) {
+      finalOptions.onError(error)
+      retries++
+      if (retries < finalOptions.maxRetries) {
+        return fetch()
+      } else {
+        return ''
+      }
+    }
+  }
+  return fetch()
+}
+
+export async function fetchImages (imageItems,rowName) {
+  const fetchPromises = imageItems.map(async (item) => {
+    return fetchImage(item[rowName], {
+      onSuccess: () => {
+        console.log(`图片 ${item.id} 请求成功`)
+      },
+      onError: (error) => {
+        console.log(`图片 ${item.id} 请求失败`, error)
+      }
+    })
+  })
+  const results = await Promise.all(fetchPromises);
+  results.forEach((imageUrl, index) => {
+    imageItems[index][rowName] = imageUrl
+  })
+  return imageItems
+}