sale-client 4.0.25-preview → 4.0.26-preview

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +1,2 @@
-#Fri Oct 18 14:34:07 CST 2024
+#Tue Aug 20 11:56:06 CST 2024
 gradle.version=5.2.1

package/build/dev-server.js

@@ -1,7 +1,7 @@
 var path = require('path')
 var checkVersion = require('./versionCheck.js')
 checkVersion()
-const [ serverRul, localUrl, v4Url ] = ['http://192.168.50.4:8400/', 'http://localhost:8080', 'http://localhost:9026/']
+const [ serverRul, localUrl, v4Url ] = ['http://61.163.123.47:30785/', 'http://localhost:8080', 'http://61.163.123.47:30785/']
 var merge = require('webpack-merge')
 var baseConfig = require('./webpack.dev.conf')
 var devConfig = {
@@ -20,10 +20,16 @@ var devConfig = {
     },
     proxy: {
       '/api/af-revenue/logic': {
-        pathRewrite: {
-          '/api/af-revenue/logic': '/logic'
-        },
-        target: 'http://localhost:9026/'
+        target: localUrl,
+        pathRewrite:{
+          '/api/af-revenue/logic':'/rs/logic'
+        }
+      },
+      '/api/af-revenue/sql': {
+        target: localUrl,
+        pathRewrite:{
+          '/api/af-revenue/sql':'/rs/sql'
+        }
       },
       '/api/af-revenue/file': {
         pathRewrite: {

package/build/tmp/jar/MANIFEST.MF

@@ -0,0 +1,2 @@
+Manifest-Version: 1.0
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "4.0.25-preview",
+  "version": "4.0.26-preview",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {
@@ -28,7 +28,7 @@
     "yarn": "^1.22.10"
   },
   "devDependencies": {
-    "address-client": "3.2.105",
+    "address-client": "^3.2.111-fugou",
     "axios": "0.15.3",
     "babel-core": "^6.0.0",
     "babel-loader": "^6.0.0",

package/src/filiale/fugou/FileManageService.js

@@ -0,0 +1,463 @@
+import Vue from 'vue'
+import co from 'co'
+import GetTimeService from '../../plugins/GetTimeService'
+
+let cancelUserGen = function * (data, type) {
+  console.log('销户。。', data)
+  if (type === '销户') {
+    let owe = yield Vue.resetpost('api/af-revenue/logic/hasOweWithUser', {data: {f_userinfo_id: data.f_userinfo_id.f_userinfo_id}}, {resolveMsg: null, rejectMsg: null})
+    let hasHandplan = yield Vue.resetpost('api/af-revenue/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('api/af-revenue/entity/save/t_cancellation', data, {resolveMsg: `${type}成功`, rejectMsg: `${type}失败`})
+    }
+  } else {
+    Vue.resetpost('api/af-revenue/entity/save/t_cancellation', data, {resolveMsg: `${type}成功`, rejectMsg: `${type}失败`})
+  }
+}
+
+let FileManageService = {
+  install (Vue, options) {
+    // 给vue增添对话框显示方法
+    Vue.FileManageService = Vue.prototype.$FileManageService = FileManageService
+  },
+  fileSaveBefore (data) {
+    let result = Object.assign({}, result, data.baseinfo.base)
+    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 ? result.f_is_mgq[0] : ''
+   // result.f_paper_type = result.f_paper_type.length > 0 ? result.f_paper_type[0] : ''
+    while (true) {
+      if (result.f_paper_type instanceof Array) {
+        result.f_paper_type = result.f_paper_type.length > 0 ? result.f_paper_type[0] : null
+      } else if (result.f_cost_type instanceof Array) {
+        result.f_cost_type = result.f_cost_type.length > 0 ? result.f_cost_type[0] : ''
+      } else if (result.f_bz_type instanceof Array) {
+        result.f_bz_type = result.f_bz_type.length > 0 ? result.f_bz_type[0] : ''
+      } else if (result.f_credentials instanceof Array) {
+        result.f_credentials = result.f_credentials.length > 0 ? result.f_credentials[0] : ''
+      } else if (result.f_print_dh instanceof Array) {
+        result.f_print_dh = result.f_print_dh.length > 0 ? result.f_print_dh[0] : ''
+      } else {
+        break
+      }
+    }
+    result.f_credentials = result.f_credentials ? result.f_credentials : '身份证'
+    result.f_user_nature = result.f_user_nature ? result.f_user_nature : '民用'
+    result.f_predeposit = result.f_predeposit ? result.f_predeposit : 0
+    result.f_people_num = result.f_people_num ? result.f_people_num : 0
+    result.f_ins_stop_date = result.f_ins_stop_date ? result.f_ins_stop_date : null
+    result.f_paper_comments = result.f_paper_comments ? result.f_paper_comments : null
+    result.f_balance = result.f_balance ? result.f_balance : 0
+    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 = Vue.$login.f.orgid
+      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] : '正常'
+    while (true) {
+      if (result.f_user_state instanceof Array) {
+        result.f_user_state = result.f_user_state.length > 0 ? result.f_user_state[0] : '正常'
+      } else {
+        break
+      }
+    }
+    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
+      }
+      if (meter.gasbrand[0] == null) {
+        meter.f_gasbrand_id = ''
+      } else {
+        meter.f_gasbrand_id = meter.gasbrand[0].id
+        meter.f_gasbrand_id = meter.gasbrand[0].id
+      }
+      meter.f_filialeid = data.f_filialeid
+      if (meter.f_hand_month) {
+        meter.f_hand_month = meter.f_hand_month.length > 0 ? meter.f_hand_month[0] : null
+      }
+      if (meter.f_overdue_set) {
+        meter.f_overdue_set = meter.f_overdue_set.length > 0 ? meter.f_overdue_set[0] : null
+      }
+      if (meter.f_riser_shaft) {
+        meter.f_riser_shaft = meter.f_riser_shaft.length > 0 ? meter.f_riser_shaft[0] : null
+      }
+      // meter.f_position = meter.f_position ? meter.f_position : null
+      meter.f_position = meter.f_position.length > 0 ? meter.f_position[0] : null
+      meter.f_usetype = meter.f_usetype.length > 0 ? meter.f_usetype[0] : null
+      meter.f_usestate = meter.f_usestate.length > 0 ? meter.f_usestate[0] : null
+      meter.f_gas_date = meter.f_gas_date && meter.f_gas_date.trim() != '' ? meter.f_gas_date : null
+      meter.f_install_date = meter.f_install_date && meter.f_install_date.trim() != '' ? meter.f_install_date : null
+      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_gongye_type = meter.f_gongye_type ? meter.f_gongye_type[0] : null
+      meter.f_userfiles_address = meter.f_userfiles_address ? meter.f_userfiles_address : null
+      meter.f_install_person =  meter.f_install_person && meter.f_install_person.length > 0 ? meter.f_install_person : null
+      meter.f_isdc_install = meter.f_isdc_install && meter.f_isdc_install.length > 0 ? meter.f_isdc_install[0] : null
+      meter.f_limit_sms = meter.f_limit_sms == '' ? meter.f_limit_sms = 30 : parseInt(meter.f_limit_sms)
+      meter.f_card_id = meter.f_card_id ? meter.f_card_id : null
+      // 安城表前阀状态
+      meter.f_bqf_state = meter.f_bqf_state && meter.f_bqf_state.length > 0 ? meter.f_bqf_state[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] : '否'
+      while (true) {
+        if (meter.f_garbage_fee instanceof Array) {
+          meter.f_garbage_fee = meter.f_garbage_fee.length > 0 ? meter.f_garbage_fee[0] : '否'
+        } else if (meter.f_meter_book_num instanceof Array) {
+          meter.f_meter_book_num = meter.f_meter_book_num.length > 0 ? meter.f_meter_book_num[0] : ''
+        } else if (meter.f_usetype instanceof Array) {
+          meter.f_usetype = meter.f_usetype.length > 0 ? meter.f_usetype[0] : ''
+        } else if (meter.f_usestate instanceof Array) {
+          meter.f_usestate = meter.f_usestate.length > 0 ? meter.f_usestate[0] : ''
+        } else if (meter.f_valve_state instanceof Array) {
+          meter.f_valve_state = meter.f_valve_state.length > 0 ? meter.f_valve_state[0] : ''
+        } else if (meter.f_aroundmeter instanceof Array) {
+          meter.f_aroundmeter = meter.f_aroundmeter.length > 0 ? meter.f_aroundmeter[0] : null
+        } else if (meter.f_whether_hairpin && meter.f_whether_hairpin instanceof Array) {
+          meter.f_whether_hairpin = meter.f_whether_hairpin.length > 0 ? meter.f_whether_hairpin[0] : null
+        } else {
+          break
+        }
+      }
+      // 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_remanent_gas = isNaN(meter.f_remanent_gas) || meter.f_remanent_gas === '' ? 0.00 : (meter.f_remanent_gas - 0).toFixed(4)
+      meter.f_price_ratio = meter.f_price_ratio ? meter.f_price_ratio : null
+      meter.f_fire_state = meter.f_fire_state1 ? '1' : '0'
+      let forcemeasure = meter.f_force_measure
+      meter.f_force_measure = ''
+      if (forcemeasure != undefined && Object.prototype.toString.call(forcemeasure) === '[object Array]') {
+        if (forcemeasure.length > 0) {
+          for (var c = 0; c < forcemeasure.length; c++) {
+            if (forcemeasure[c]) {
+              if (c !== forcemeasure.length - 1) {
+                meter.f_force_measure = meter.f_force_measure + forcemeasure[c] + ','
+              } else {
+                meter.f_force_measure = meter.f_force_measure + forcemeasure[c]
+              }
+            }
+          }
+        }
+      } else {
+        meter.f_force_measure = null
+      }
+      if (meter.gasmodel[0] == null) {
+        meter.f_gasmodel_id = ''
+      } else {
+        meter.f_gasmodel_id = meter.gasmodel[0].id
+      }
+
+      if (meter.gasbrand[0] == null) {
+        meter.f_meter_classify = ''
+      } else {
+        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] : ''
+      if (meter.fireinfo) {
+        if (meter.f_user_type == '民用') {
+          meter.fireinfo.f_llj_scope = meter.fireinfo.f_control_brand =
+          meter.fireinfo.f_contact_method =
+          meter.fireinfo.f_control_model = meter.fireinfo.f_control_date =
+          meter.fireinfo.f_control_code = meter.fireinfo.f_control_number =
+          meter.fireinfo.f_appliance_type = meter.fireinfo.f_appliance_brand =
+          meter.fireinfo.f_appliance_model = meter.fireinfo.f_alarm_info =
+          meter.fireinfo.f_detector_number = null
+        } else {
+          meter.fireinfo.f_galvanize_pipe = meter.fireinfo.f_tee =
+          meter.fireinfo.f_nipple = meter.fireinfo.f_elbow =
+          meter.fireinfo.f_pipe_strap = meter.fireinfo.f_zqf =
+          meter.fireinfo.f_sebific_duct = meter.fireinfo.f_zbf =
+          meter.fireinfo.f_gas_appliance = meter.fireinfo.f_gas_appliance_num =
+          meter.fireinfo.f_geyser = meter.fireinfo.f_geyser_num =
+          meter.fireinfo.f_bgl = meter.fireinfo.f_bgl_style =
+          meter.fireinfo.f_bgl_num = null
+        }
+      }
+      // meter.f_industry_comments = meter.f_industry_comments.length > 0 ? meter.f_industry_comments[0] : ''
+      var va = null
+      if (meter.f_user_type == '民用') {
+        va = Vue.$appdata.getSingleValue('民用送气预约周期')
+      } else {
+        va = Vue.$appdata.getSingleValue('非民用送气预约周期')
+      }
+      console.log('asdasda', meter.f_user_type, va, meter.f_subscribe_date)
+      if (va && meter.f_subscribe_date) {
+        console.log('有值了')
+        var now = new Date(meter.f_subscribe_date)
+        var newDate = GetTimeService.DateAdd('d ', va - 0, now)
+        console.log('增加之后的时候', newDate)
+        var newtime = GetTimeService.getTimeString(newDate)
+        console.log('转化之后的时候', newtime)
+        meter.f_subscribe_date = newtime
+      }
+      if (meter.pricename[0] == null) {
+        meter.f_price_id = ''
+      } else {
+        meter.f_price_id = meter.pricename[0].f_price_id
+      }
+
+      meter.f_gasproperties = meter.f_gasproperties.length > 0 ? meter.f_gasproperties[0] : ''
+      meter.f_gasproperties_second = meter.f_gasproperties_second && meter.f_gasproperties_second.length > 0 ? meter.f_gasproperties_second[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_table_state = result.f_user_state === '预备' ? '待开通' : (meter.f_table_state === '停用'? meter.f_table_state : '正常')
+      if (!meter.f_userfiles_id) {
+        // meter.f_whether_hairpin = !item.gasbrand[0].f_meter_type.includes('机表') ? '未发' : '无卡'
+        // 所有表变成未发
+        meter.f_whether_hairpin = '未发'
+        meter.f_total_gas = 0
+        meter.f_total_fee = 0
+        meter.f_input_person = Vue.$login.f.name
+        meter.f_input_date = Vue.$login.toStandardTimeString()
+
+        if (item.gasbrand[0] == null) {
+          meter.f_card_password = ''
+        } else {
+          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 = Vue.$login.f.orgid
+        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.WatchPurchase = userfilesdevice.WatchPurchase
+        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_brand_id = userfilesdevice.f_brand_id ? userfilesdevice.f_brand_id : null
+        userfilesdevice.f_imsi = userfilesdevice.f_imsi ? userfilesdevice.f_imsi : null
+        userfilesdevice.f_imei = userfilesdevice.f_imei ? userfilesdevice.f_imei : null
+        userfilesdevice.f_builderunit = userfilesdevice.f_builderunit ? userfilesdevice.f_builderunit : null
+        userfilesdevice.f_builder_phone = userfilesdevice.f_builder_phone ? userfilesdevice.f_builder_phone : null
+        userfilesdevice.f_devices_model = userfilesdevice.f_devices_model ? userfilesdevice.f_devices_model : null
+        userfilesdevice.f_devices_model_id = userfilesdevice.f_devices_model_id ? userfilesdevice.f_devices_model_id : null
+        userfilesdevice.f_devices_num = userfilesdevice.f_devices_num ? userfilesdevice.f_devices_num : null
+        userfilesdevice.f_input_person = userfilesdevice.f_input_person ? userfilesdevice.f_input_person : null
+        userfilesdevice.f_input_date = userfilesdevice.f_input_date ? userfilesdevice.f_input_date : null
+        userfilesdevice.f_make_date = userfilesdevice.f_make_date ? userfilesdevice.f_make_date : null
+        userfilesdevice.f_service_life = userfilesdevice.f_service_life ? userfilesdevice.f_service_life : null
+        userfilesdevice.f_expire_date = userfilesdevice.f_expire_date ? userfilesdevice.f_expire_date : null
+        userfilesdevice.f_pipeinstall_date = userfilesdevice.f_pipeinstall_date ? userfilesdevice.f_pipeinstall_date : null
+        userfilesdevice.f_pipe_type = userfilesdevice.f_pipe_type ? userfilesdevice.f_pipe_type : null
+        userfilesdevice.f_pipeexpire_date = userfilesdevice.f_pipeexpire_date ? userfilesdevice.f_pipeexpire_date : null
+        userfilesdevice.f_userinfodevices_state = userfilesdevice.f_userinfodevices_state ? userfilesdevice.f_userinfodevices_state : null
+        userfilesdevice.f_comments = userfilesdevice.f_comments ? userfilesdevice.f_comments : null
+        userfilesdevice.f_install_position = userfilesdevice.f_install_position ? userfilesdevice.f_install_position : 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
+        userfilesdevice.f_operator = Vue.$login.f.name
+        userfilesdevice.f_operatorid = Vue.$login.f.id
+        // if (!userfilesdevice.id) {
+        //   userfilesdevice.f_input_person = Vue.$login.f.name
+        //   userfilesdevice.f_input_date =  Vue.$login.toStandardTimeString ()
+        // }
+        userfilesdevices.push(userfilesdevice)
+      })
+      // 这里是给荣成新增的一个模块
+      if (meter.devicesinfonew != undefined && Object.prototype.toString.call(meter.devicesinfonew) === '[object Array]') {
+        meter.devicesinfonew.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.WatchPurchase = userfilesdevice.WatchPurchase
+          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_builderunit = userfilesdevice.f_builderunit ? userfilesdevice.f_builderunit : null
+          userfilesdevice.f_builder_phone = userfilesdevice.f_builder_phone ? userfilesdevice.f_builder_phone : 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.f_input_person = userfilesdevice.f_input_person ? userfilesdevice.f_input_person : null
+          userfilesdevice.f_input_date = userfilesdevice.f_input_date ? userfilesdevice.f_input_date : null
+          userfilesdevice.f_make_date = userfilesdevice.f_make_date ? userfilesdevice.f_make_date : null
+          userfilesdevice.f_service_life = userfilesdevice.f_service_life ? userfilesdevice.f_service_life : null
+          userfilesdevice.f_expire_date = userfilesdevice.f_expire_date ? userfilesdevice.f_expire_date : null
+          userfilesdevice.f_pipeinstall_date = userfilesdevice.f_pipeinstall_date ? userfilesdevice.f_pipeinstall_date : null
+          userfilesdevice.f_pipe_type = userfilesdevice.f_pipe_type ? userfilesdevice.f_pipe_type : null
+          userfilesdevice.f_pipeexpire_date = userfilesdevice.f_pipeexpire_date ? userfilesdevice.f_pipeexpire_date : null
+          userfilesdevice.f_userinfodevices_state = userfilesdevice.f_userinfodevices_state ? userfilesdevice.f_userinfodevices_state : null
+          userfilesdevice.f_manufactor = userfilesdevice.f_manufactor ? userfilesdevice.f_manufactor : null
+          userfilesdevice.f_rate_flow = userfilesdevice.f_rate_flow ? userfilesdevice.f_rate_flow : null
+          userfilesdevice.f_pressure_range = userfilesdevice.f_pressure_range ? userfilesdevice.f_pressure_range : null
+          userfilesdevice.f_import_pressure = userfilesdevice.f_import_pressure ? userfilesdevice.f_import_pressure : null
+          userfilesdevice.f_firstcheck_date = userfilesdevice.f_firstcheck_date ? userfilesdevice.f_firstcheck_date : null
+          userfilesdevice.f_nextcheck_date = userfilesdevice.f_nextcheck_date ? userfilesdevice.f_nextcheck_date : null
+          userfilesdevice.f_comments = userfilesdevice.f_comments ? userfilesdevice.f_comments : 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
+          userfilesdevice.f_operator = Vue.$login.f.name
+          userfilesdevice.f_operatorid = Vue.$login.f.id
+          // 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)
+    })
+    // 用户设备信息
+    result.userphonelist = []
+    let userphonelist = []
+    if (data.baseinfo.userphonelist) {
+      data.baseinfo.userphonelist.forEach((item) => {
+        if (item.f_rent_phone) {
+          let userphone = Object.assign({}, userphone, item)
+          userphone.f_userinfo_id = result.f_userinfo_id ? result.f_userinfo_id + '' : null,
+          userphone.f_rent_phone = userphone.f_rent_phone ? userphone.f_rent_phone : null,
+          userphone.f_state = userphone.f_state ? userphone.f_state : '有效'
+          userphone.f_operatorid = Vue.$login.f.id
+          userphone.f_operator = Vue.$login.f.name
+          userphone.f_orgid = Vue.$login.f.orgid
+          userphone.f_orgname = Vue.$login.f.orgs
+          userphone.f_depid = Vue.$login.f.depids
+          userphone.f_depname = Vue.$login.f.deps
+          userphonelist.push(userphone)
+        }
+      })
+    }
+    result.userphonelist = userphonelist
+
+    result.userinfodevices = []
+    let userinfodevices = []
+    if (data.baseinfo.userinfodevices) {
+      data.baseinfo.userinfodevices.forEach((item) => {
+        let userinfodevice = Object.assign({}, userinfodevice, item)
+        userinfodevice.f_userinfo_id = result.f_userinfo_id ? result.f_userinfo_id + '' : null
+        userinfodevice.f_userinfodevices_type = userinfodevice.f_userinfodevices_type ? userinfodevice.f_userinfodevices_type : '默认设备'
+        userinfodevice.f_userinfodevices_state = userinfodevice.f_userinfodevices_state ? userinfodevice.f_userinfodevices_state : ''
+        userinfodevice.f_state = userinfodevice.f_state ? userinfodevice.f_state : '有效'
+        userinfodevice.f_userinfodevices_name = userinfodevice.f_userinfodevices_name ? userinfodevice.f_userinfodevices_name : null
+        userinfodevice.f_mtc_fee = userinfodevice.f_mtc_fee ? userinfodevice.f_mtc_fee : 0
+        userinfodevice.f_expire_date = userinfodevice.f_expire_date ? userinfodevice.f_expire_date : null
+        userinfodevice.f_make_date = userinfodevice.f_make_date ? userinfodevice.f_make_date : null
+        userinfodevice.f_pipeinstall_date = userinfodevice.f_pipeinstall_date ? userinfodevice.f_pipeinstall_date : null
+        userinfodevice.f_operator = Vue.$login.f.name
+        userinfodevice.f_operatorid = Vue.$login.f.id
+        userinfodevice.f_orgid = Vue.$login.f.orgid
+        userinfodevice.f_orgname = Vue.$login.f.orgs
+        userinfodevice.f_depid = Vue.$login.f.depids
+        userinfodevice.f_depname = Vue.$login.f.deps
+        // userinfodevice.img = userinfodevice.img ? userinfodevice.img : {content: null, filename: null}
+        // userinfodevice.img.content = userinfodevice.img.content ? userinfodevice.img.content : null
+        // userinfodevice.img.filename = userinfodevice.img.filename ? userinfodevice.img.filename : null
+        if (!userinfodevice.id) {
+          userinfodevice.f_input_person = Vue.$login.f.name
+          userinfodevice.f_input_date = Vue.$login.toStandardTimeString()
+        }
+        userinfodevices.push(userinfodevice)
+      })
+    }
+    result.userinfodevices = userinfodevices
+    // 组织地址数据，更新地址管理中的数据
+    // 地址信息
+    let address = {}
+    address = {
+      id: data.addressinfo.id,
+      f_userinfo_id: result.f_userinfo_id ? result.f_userinfo_id + '' : null,
+      f_area_id: data.addressinfo.f_area_id ? data.addressinfo.f_area_id : undefined,
+      f_address_state: data.addressinfo.f_address_state
+    }
+    if (data.oldaddressinfo.id) {
+      address.oldid = data.oldaddressinfo.id
+    }
+    if (!data.hasnumber) {
+      data.hasnumber = false
+    }
+    if (!data.inputcode) {
+      data.inputcode = '否'
+    }
+    return {userinfo: result, address: address, limit_gas: data.limit_gas, hasnumber: data.hasnumber, inputcode: data.inputcode}
+  },
+  fileSave (data) {
+    data.userinfo.f_user_name = data.userinfo.f_user_name? data.userinfo.f_user_name.trim():null
+    return Vue.resetpost('api/af-revenue/logic/filemanage_fileSave', {data: data})
+  },
+  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_type: type,
+      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 FileManageService