sale-client 3.6.512 → 3.6.514

package/package.json

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

package/src/components/FilesManage/MeterinfoTest.vue

@@ -519,7 +519,13 @@
                       :options='overdueset' placeholder='违约金规则'
                       close-on-select></v-select>
           </div>
-
+          <div class="col-sm-4 form-group" :class="[$m.f_seal_number.required ? 'has-error' : '']"
+               v-show="(formconfig && formconfig.f_seal_number && formconfig.f_seal_number.required) || !onlyshowmust"
+               v-if="getConfigShowItem('f_seal_number')">
+            <label for="f_seal_number" class="font_normal_body">&ensp;铅封编号</label>
+            <input type="text" class="input_search" style="width:60%" v-model="row.f_seal_number" placeholder='铅封编号'
+                   v-validate:f_comments=getConfigValidate("f_seal_number",false)>
+          </div>
           <template v-if="config.stuckFlowmeterShow">
             <div class="col-sm-4 form-group">
               <label class="font_normal_body" title="控制器通经">控制器通经</label>

package/src/filiale/lixianV3/meterinfodetail.vue

@@ -137,6 +137,10 @@
           <label class = "col-sm-5 " >抄表册册序号</label>
           <span class = "col-sm-7">{{data?data.f_meter_book_sort:dafault.f_meter_book_sort}}</span>
         </div>
+        <div class="row">
+          <label class = "col-sm-5 " >铅封编号</label>
+          <span class = "col-sm-7">{{data?data.f_seal_number:dafault.f_seal_number}}</span>
+        </div>
         <div class="row">
           <label class = "col-sm-5 " >安装位置</label>
           <span class = "col-sm-7">{{data?data.f_position:dafault.f_position}}</span>
@@ -197,6 +201,7 @@ export default {
         f_price_name: '****',
         f_meter_brand: '****',
         f_balance: 0,
+        f_seal_number: '****',
         f_user_type: '**',
         f_remanent_gas: 0,
         f_position: '****',

package/src/filiale/rongcheng/CustomerDeviceInfoTest.vue

@@ -148,7 +148,7 @@ export default {
     return {
       imgdelete: '/images/mainicon/deletedevice.png',
       imgadd: '/images/mainicon/adddevice.png',
-      devicetypes: [{label: '调压器', value: '调压器'}, {label: '报警器', value: '报警器'}, {label: '切断阀', value: '切断阀'}],
+      devicetypes: this.$appdata.getParam('表具设备类型'),
       devicesinfoShow: false
     }
   },

package/src/filiale/shimen/FileService.js

@@ -0,0 +1,273 @@
+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}}, {resolveMsg: null, rejectMsg: null})
+    console.log('销户看是否有欠费', owe.data)
+    let hasHandplan = yield Vue.resetpost('rs/sql/saleSingleTable', {data: {tablename: 't_handplan', condition: `f_meter_state = '未抄表' and f_userinfo_id = '${data.f_userinfo_id}'`}}, {resolveMsg: null, rejectMsg: null})
+    console.log('是否有未抄表数据', hasHandplan.data)
+    if (owe.data === 1 && hasHandplan.data.length > 0) {
+      Vue.showAlert('该客户还有欠费，不能销户！！', 'danger', 0)
+    } else {
+      yield Vue.resetpost('rs/logic/saveSingleCancellation', data, {resolveMsg: `${type}成功`, rejectMsg: `${type}失败`}).then(res => {
+        if (res && res.data) {
+          if (type === '销户') {
+            if (!(res.data.isaudit === null)) {
+              if (res.data.isaudit === 1) {
+                Vue.showAlert('提交成功,等待管理审核!', 'success', 2000)
+                return
+              }
+            }
+          }
+          Vue.showAlert('销户成功', 'success', 2000)
+        }
+      })
+    }
+  } else {
+    Vue.resetpost('rs/logic/saveSingleCancellation', data, {resolveMsg: `${type}成功`, rejectMsg: `${type}失败`})
+  }
+}
+//
+// let cancelAllUserGen = function * (data, type, infoIds) {
+//   console.log('FileService销户。。', infoIds)
+//
+//     let owe = yield Vue.resetpost('rs/logic/hasBatchOweWithUser', {data: {infoIds:infoIds}}, {resolveMsg: null, rejectMsg: null})
+//     console.log('销户看是否有欠费或未抄表记录', owe.data)
+//     var alertInfo='用户'
+//     if(owe.data.unsuccessUser.length>0){
+//       owe.data.unsuccessUser.forEach((item)=>{
+//         alertInfo=alertInfo+item.f_user_name+','
+//       })
+//       alertInfo=alertInfo.substr(0,alertInfo.length-1)
+//     }
+//     alertInfo+='有欠费记录'
+//    if(owe.data.successUser.length>0){
+//      Vue.resetpost('rs/logic/saveCancellation', owe.data.successUser, {resolveMsg: `${type}成功`, rejectMsg: `${type}失败`}).then((res)=>{
+//        if (owe.data.unsuccessUser.length>0) {
+//        Vue.showAlert( `${alertInfo},已成功销户${res.data.successnum}户`, 'info', 3000)
+//        }else{
+//        Vue.showAlert(`已成功销户${res.data.successnum}户`, 'info', 3000)
+//        }
+//      })
+//    }else{
+//      Vue.showAlert('没有可以销户的用户', 'info', 3000)
+//    }
+//
+// }
+
+let FileService = {
+  install (Vue, options) {
+    // 给vue增添对话框显示方法
+    Vue.FileService = Vue.prototype.$FileService = FileService
+  },
+
+  fileSave (data) {
+    console.log('档案保存，，，，，', data, Vue.$login.f)
+    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_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
+    result.f_paper_comments = result.f_paper_comments ? result.f_paper_comments : null
+
+    if (result.f_slice_area instanceof Array) {
+      result.f_slice_area = result.f_slice_area.length > 0 ? result.f_slice_area[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 = 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] : '正常'
+    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.length > 0 ? meter.f_position[0] : 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 && 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_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'
+      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_table_state = '正常'
+      if (!meter.f_userfiles_id) {
+        // 气表状态需要根据表型判断是否需要开通操作 目前物联网表需要做开通操作
+        meter.f_whether_hairpin = !item.gasbrand[0].f_meter_type.includes('机表') ? '未发' : '无卡'
+        meter.f_input_person = Vue.$login.f.name
+        meter.f_input_date = Vue.$login.toStandardTimeString()
+        meter.f_initial_base = meter.f_meter_base
+        meter.f_card_password = item.gasbrand[0].f_card_password
+        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
+      result.userfiles.push(meter)
+    })
+    let devices = []
+    data.devicesinfo.forEach((item) => {
+      let device = Object.assign({}, device, item)
+      device.f_user_id = data.meterinfo[0].f_user_id ? data.meterinfo[0].f_user_id : null
+      device.f_devices_type = device.f_devices_type[0]
+      device.f_state = device.f_state ? device.f_state : '有效'
+      device.f_devices_no = device.f_devices_no ? device.f_devices_no : null
+      device.f_brand = device.f_brand ? device.f_brand : null
+      device.f_devices_model = device.f_devices_model ? device.f_devices_model : null
+      device.f_devices_num = device.f_devices_num ? device.f_devices_num : null
+      device.img = device.img ? device.img : {content: null, filename: null}
+      device.img.content = device.img.content ? device.img.content : null
+      device.img.filename = device.img.filename ? device.img.filename : null
+      if (!device.id) {
+        device.f_input_person = Vue.$login.f.name
+        device.f_input_date = Vue.$login.toStandardTimeString()
+      }
+      devices.push(device)
+    })
+
+    // 组织地址数据，更新地址管理中的数据
+    // 地址信息
+    let address = {}
+    address = {
+      id: data.addressinfo.id,
+      f_pcd: data.addressinfo.f_pcd,
+      f_pcd_id: data.addressinfo.f_pcd_id,
+      f_area: data.addressinfo.f_area ? data.addressinfo.f_area : null,
+      f_slice_area: data.addressinfo.f_slice_area,
+      f_street: data.addressinfo.f_street ? data.addressinfo.f_street : null,
+      f_street_id: data.addressinfo.f_street_id ? data.addressinfo.f_street_id : null,
+      f_residential_area: data.addressinfo.f_residential_area ? data.addressinfo.f_residential_area : null,
+      f_residential_area_id: data.addressinfo.f_residential_area_id ? data.addressinfo.f_residential_area_id : null,
+      f_building: data.addressinfo.f_building,
+      f_building_suffix: data.addressinfo.f_building_suffix,
+      f_unit: data.addressinfo.f_unit,
+      f_unit_suffix: data.addressinfo.f_unit_suffix,
+      f_floor: data.addressinfo.f_floor,
+      f_floor_suffix: data.addressinfo.f_floor_suffix,
+      f_room: data.addressinfo.f_room,
+      f_room_suffix: data.addressinfo.f_room_suffix,
+      f_address: data.addressinfo.f_address,
+      f_create_date: Vue.$login.toStandardTimeString(),
+      f_create_person: Vue.$login.f.name,
+      f_filialeid: Vue.$login.f.orgid,
+      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
+    }
+    console.log('档案要保存了end ', result, devices, address)
+    return Vue.resetpost('rs/logic/fileSave', {data: {userinfo: result, devices: devices, 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_user_id: model.userinfo.f_user_id,
+      f_user_name: model.userinfo.f_user_name,
+      f_state: 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,
+      f_userinfo_id: model.userinfo.f_userinfo_id,
+      f_meternumber: model.userinfo.f_meternumber,
+      f_userfiles_id: model.userinfo.f_userfiles_id
+    }
+    if (type === '启用') {
+      data.f_describe = `${Vue.$login.f.name}对客户${model.userinfo.f_user_name}进行启用`
+    }
+    let cancelUser = cancelUserGen(data, type)
+    return co(cancelUser)
+  }
+  // batchOperate (model, type, infoIds) {
+  //   console.log("infoIds!!!!!",infoIds)
+  //   let operateType = type
+  //   if (type === '启用') {
+  //     operateType = '销户启用'
+  //   }
+  //   let data=[]
+  //   let describe= `${Vue.$login.f.name}对客户`
+  //   model.userinfo.forEach((item) => {
+  //     let param={
+  //       f_user_id: item.f_user_id,
+  //       f_userinfo_id :item.f_userinfo_id,
+  //       f_user_name: item.f_user_name,
+  //       f_state: '有效',
+  //       f_user_state: '销户',
+  //       f_comments: model.f_reason,
+  //       f_operat_type:'销户',
+  //       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,
+  //       f_describe:`${Vue.$login.f.name}进行批量销户`
+  //       }
+  //     data.push(param)
+  //     describe+=item.f_user_name+','
+  //   })
+  //   describe=describe.substr(0,describe.length-1)
+  // describe+= '进行'+type
+  // console.log("===========describe",infoIds)
+  // let cancelUser = cancelAllUserGen(data, type, infoIds)
+  // return co(cancelUser)
+  // }
+}
+
+export default FileService

package/src/filiale/shimen/sale.js

@@ -1,6 +1,9 @@
 // 分公司特殊组件页面注册
 import Vue from 'vue'
+import FileService from './FileService'
+
 export default function () {
+  Vue.use(FileService)
 // 用气设备信息
   Vue.component('file-user-device-info', (resolve) => { require(['./UserDeviceInfoTest.vue'], resolve) })
   // 其他收费欠费收缴

package/src/plugins/CardService.js

@@ -1800,7 +1800,7 @@ let sellgasGen = async function (model, row) {
     let cardState = await hasCardGen()
     if (JSON.parse(cardState.data).state === 1) {
       // 将卡上次数写入数据库
-      if (!(row.f_hascard == null) && !(row.f_share_times == null) && row.f_hascard === '是' && row.f_share_times === '是') {
+      if (!(row.f_hascard == null) && !(row.f_share_times == null) && row.f_hascard === '是' && row.f_share_times === '是' && row.f_meter_type === '物联网表') {
         row.cardInfo.Times = row.f_times
         model.f_times = row.f_times + 1
       } else {