sale-client 3.6.77 → 3.6.79

package/build/dev-server.js

@@ -1,5 +1,5 @@
 var path = require('path')
-const [serverRul, localUrl ] = ['http://121.36.106.17:8400/', 'http://localhost:8080/']
+const [serverRul, localUrl ] = ['http://59.48.150.94:8300', 'http://59.48.150.94:8300']
 var merge = require('webpack-merge')
 var baseConfig = require('./webpack.dev.conf')
 var devConfig = {

package/package.json

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

package/src/components/FilesManage/UserGeneralInfoTest.vue

@@ -24,7 +24,12 @@
       <div style="height: auto;width: 100%">
         <div style="margin-bottom: 2%; margin-top: 2%">
           <img style="margin-top: -5px" src="../../../static/images/lefticon/矩形1183.png">
+          <span   v-if="!usertype">
           <a style="font-size: 20px;font-weight: 500;">发票信息</a>&nbsp;<a style="color: #999999"></a>
+          </span>
+          <span   v-if="usertype">
+          <a style="font-size: 20px;font-weight: 500;">企业信息</a>&nbsp;<a style="color: #999999"></a>
+          </span>
         </div>
         <user-paper-info-test :baseinfo="data.baseinfo"></user-paper-info-test>
       </div>
@@ -425,7 +430,7 @@ export default {
 
           // 将oldAddress 置为空，
       this.oldAddress = {}
-      this.data.baseinfo.base.f_user_state = this.data.baseinfo.base.f_user_state === '预备' ? ['正常'] : [this.data.baseinfo.base.f_user_state]
+      this.data.baseinfo.base.f_user_state = this.data.baseinfo.base.f_user_state === '预备' ? '正常' : this.data.baseinfo.base.f_user_state
           // this.data.baseinfo.base.f_user_nature = this.data.baseinfo.base.f_user_nature ? [this.data.baseinfo.base.f_user_nature] : '民用'
           // this.data.baseinfo.base.f_credentials = this.data.baseinfo.base.f_credentials ? [this.data.baseinfo.base.f_credentials] : '身份证'
       this.data.baseinfo.base.f_cost_type = this.data.baseinfo.base.f_cost_type ? [this.data.baseinfo.base.f_cost_type] : '现金缴费'
@@ -649,6 +654,12 @@ export default {
     }
   },
   computed: {
+    usertype () {
+      if (this.row && this.row.f_user_type) {
+        return this.row.f_user_type == '非民用'
+      }
+      return this.$refs.useressential.$refs.useraddressinfile.usertype
+    },
     meterbrands () {
       return this.$GetSaleParam.getGasbrand()
     },

package/src/components/FilesManageNew/UserGeneralInfoTest.vue

@@ -20,7 +20,12 @@
       <div style="height: auto;width: 100%">
         <div style="margin-bottom: 2%; margin-top: 2%">
           <img style="margin-top: -5px" src="../../../static/images/lefticon/矩形1183.png">
+          <span   v-if="!usertype">
           <a style="font-size: 20px;font-weight: 500;">发票信息</a>&nbsp;<a style="color: #999999"></a>
+          </span>
+          <span   v-if="usertype">
+          <a style="font-size: 20px;font-weight: 500;">企业信息</a>&nbsp;<a style="color: #999999"></a>
+          </span>
         </div>
         <user-paper-info-test :baseinfo="data.baseinfo"></user-paper-info-test>
       </div>
@@ -581,6 +586,12 @@ export default {
     }
   },
   computed: {
+    usertype () {
+      if (this.row && this.row.f_user_type) {
+        return this.row.f_user_type == '非民用'
+      }
+      return this.$refs.useressential.$refs.useraddressinfile.usertype
+    },
     meterbrands () {
       return this.$GetSaleParam.getGasbrand()
     },

package/src/components/revenue/comprehen/ComprehenOperation/MeterDisable/DisableManage.vue

@@ -74,6 +74,7 @@
                   userid: array,
                   instructtype: '阀门控制',
                   isOpen:  '关阀',
+                  reasonInfo: '表具停用自动关阀',
                   f_instruct_state: '待发送',
                   inputtor: this.$login.f.name
                 }

package/src/components/webMeter/MeterManage/WebMeterBatchOperationValve.vue

@@ -660,6 +660,7 @@ import axios from 'axios'
               userid: array,
               instructtype: f_apply_type,
               isOpen: f_apply_value,
+              reasonInfo: this.f_beizhu,
               f_instruct_state: '待发送',
               inputtor: Vue.$login.f.name
             }

package/src/filiale/rongcheng/ChargeModal.vue

@@ -0,0 +1,178 @@
+<template>
+  <modal :show.sync="modalShow" backdrop="false" width="50%" title="提示信息">
+    <article slot="modal-body">
+      <div style="width:98%;margin: auto" v-show="showInformation">
+        <div v-show="filesNotComplete" style="font-size: 15px;padding: 10px"> 用户档案信息不全，请完善
+          <span style="float: right">
+            <button class="button_search" @click="operational('files_complete')"
+                    style="width: max-content;">完善信息</button>
+            <button class="button_search" @click="close">取消</button>
+          </span>
+        </div>
+        <div v-show="isBlackList" style="font-size: 15px;padding: 10px"> 黑名单用户,无法进行收费操作,{{ userproperties }}
+        </div>
+        <div v-show="isInvoList" style="font-size: 15px;padding: 10px"> {{ involists }}
+        </div>
+        <span v-show="isInvoList || isBlackList" style="float: right">
+            <button class="button_search" @click="close">确定</button>
+          </span>
+        <div v-show="!isBlackList&&isBasicLiving" style="font-size: 15px;padding: 10px"> {{ basicinformation }}
+          <span style="float: right">
+            <button class="button_search" @click="operational('basic-living')"
+                    style="width: max-content;">低保续保</button>
+            <button class="button_search" @click="operational('stop-basic-living')" v-if="stopBasicLiving"
+                    style="width: max-content;">停止续保</button>
+            <button class="button_search btn-gn" @click="success('isBasicLiving')" v-if="!stopBasicLiving">确认</button>
+          </span>
+        </div>
+        <p>{{ authorityInformation }}</p>
+      </div>
+      <div style="width:98%;margin: auto" v-show="!showInformation">
+        <route v-ref:route @close="close" @success="success" v-show="!showInformation" :data="row"></route>
+      </div>
+    </article>
+    <footer slot="modal-footer" class="modal-footer" style="text-align: center;border: 0">
+      <!--如果想忽略到期信息，modal的值设为null-->
+      <!--      <button class="button_clear" @click="ignore" v-if="basicLiving">忽略</button>-->
+    </footer>
+  </modal>
+</template>
+<script>
+
+let initGen = async function (self) {
+  if (!self.row.f_price_id || !self.row.f_gasmodel_id || !self.row.f_gasbrand_id) {
+    self.filesNotComplete = true
+  }
+  let _this = self
+  self.$login.f.functions[1].children.forEach(function (value) {
+    if (value.name === '特殊用户') {
+      _this.basicLivingAuthority = true
+    }
+  })
+  console.log('============================', self.data)
+  console.log('============================', self.data2)
+  if (self.data2.data.length > 0) {
+    // isInvoList  involists
+    _this.isInvoList = true
+    self.data2.data.forEach(function (value) {
+      _this.involists = '尊敬的' + (value.f_invoice_name) + '用户您好, 您有一张未领取发票, 发票金额为' + (value.f_invoice_money) +
+        ', 发票日期为' + (value.f_invoice_date) + ', 请您及时领取'
+    })
+  }
+
+  self.data.data.forEach(function (value) {
+    if (value.f_parameter_key === 'dibaohu_endDate' && _this.basicLivingAuthority) {
+      if (value.days <= 0) {
+        _this.isBasicLiving = true
+        _this.basicinformation = '低保已到期' + (-value.days) + '天'
+        _this.stopBasicLiving = true
+      } else if (value.days > 0 && value.days < self.dibao_remind) {
+        _this.isBasicLiving = true
+        _this.basicinformation = '低保还有' + (value.days) + '天到期'
+      } else {
+        console.log('低保剩余天数大于提醒天数')
+      }
+    } else if (value.f_parameter_key === 'blackList' && _this.filesCompleteAuthority) {
+      _this.isBlackList = true
+      _this.userproperties = '该用户为黑名单用户,被限制购气,原因为' + (value.f_comments)
+      if (value.f_offsite_time) {
+        _this.userproperties += '(安检日期)' + (value.f_offsite_time)
+      }
+    }
+  })
+  if (!self.filesNotComplete && !self.isBlackList && !self.isBasicLiving) {
+    self.authorityInformation = '您没有相关的业务操作权限, 请联系管理员！！'
+  }
+}
+
+export default {
+  title: '收费弹出框',
+  props: {
+    // 动态属性表数据
+    data: {
+      type: Object
+    },
+    // 动态属性表数据
+    data2: {
+      type: Object
+    },
+    // 双击用户的数据
+    row: {
+      type: Object
+    },
+    modalShow: {
+      type: Boolean
+    }
+  },
+  data() {
+    return {
+      showInformation: true,
+      informationtype: '',
+      // 档案不完善
+      filesNotComplete: false,
+      // 黑名单
+      isBlackList: false,
+      // 未领发票
+      isInvoList: false,
+      // 低保户到期
+      isBasicLiving: false,
+      // 终止低保户 必选低保户到期
+      stopBasicLiving: false,
+      // 低保户信息
+      basicinformation: '',
+      // 黑名单信息
+      userproperties: '',
+      // 发票未领取信息
+      involists: '',
+      // 低保户到期提醒时间
+      dibao_remind: this.$appdata.getSingleValue('低保快到期提醒') ? this.$appdata.getSingleValue('低保快到期提醒') : 0,
+      // 低保户权限
+      basicLivingAuthority: false,
+      // 档案完善权限
+      filesCompleteAuthority: true
+    }
+  },
+  methods: {
+    close () {
+      this.$emit('close')
+    },
+    async success(val) {
+      //
+      if (val === 'filesNotComplete') {
+        this.filesNotComplete = false
+      } else if (val === 'isBasicLiving') {
+        this.isBasicLiving = false
+      }
+      // 如果所有提示信息均处理，获取改户数据，进入收费操作
+      if (!this.filesNotComplete && !this.isBlackList && !this.isBasicLiving) {
+        this.showInformation = false
+        let data = await this.$resetpost('rs/sql/sale_getUser', {data: {condition: `1=1 and f_userinfo_code = '${this.row.f_userinfo_code}' and u.f_filialeid = ${this.$login.f.orgid}`}}, {
+          resolveMsg: '',
+          rejectMsg: ''
+        })
+        this.$emit('modalsuccess', data.data[0])
+      } else {
+        // 没有处理完，显示提示信息
+        this.showInformation = true
+      }
+    },
+    operational(val) {
+      this.showInformation = false
+      this.$refs.route.init(val, {data: this.row})
+    }
+  },
+  ready () {
+    initGen(this)
+  }
+  // watch: {
+  //   'modalShow' (val) {
+  //     this.modal = val
+  //   }
+  // }
+}
+</script>
+<style>
+.basic-main {
+  width: 79%;
+}
+</style>

package/src/filiale/rongcheng/sale.js

@@ -105,4 +105,6 @@ export default function () {
 
   // 用户表具信息test
   Vue.component('file-user-meter-info', (resolve) => { require(['./UserMeterInfoTest'], resolve) })
+  // 售气收费 --弹出框
+  Vue.component('charge-modal', (resolve) => { require(['./ChargeModal'], resolve) })
 }

package/src/filiale/shanxian/components/webMeter/WebMeterBatchOperationValve.vue

@@ -662,6 +662,7 @@ import axios from 'axios'
               instructtype: f_apply_type,
               isOpen: f_apply_value,
               f_instruct_state: '待发送',
+              reasonInfo: this.f_beizhu,
               inputtor: Vue.$login.f.name
             }
           }

package/src/filiale/wenxi/UserGeneralInfoTest.vue

@@ -440,7 +440,7 @@ export default {
 
       // 将oldAddress 置为空，
       this.oldAddress = {}
-      this.data.baseinfo.base.f_user_state = this.data.baseinfo.base.f_user_state === '预备' ? ['正常'] : [this.data.baseinfo.base.f_user_state]
+      this.data.baseinfo.base.f_user_state = this.data.baseinfo.base.f_user_state === '预备' ? '正常' : this.data.baseinfo.base.f_user_state
       // this.data.baseinfo.base.f_user_nature = this.data.baseinfo.base.f_user_nature ? [this.data.baseinfo.base.f_user_nature] : '民用'
       // this.data.baseinfo.base.f_credentials = this.data.baseinfo.base.f_credentials ? [this.data.baseinfo.base.f_credentials] : '身份证'
       this.data.baseinfo.base.f_cost_type = this.data.baseinfo.base.f_cost_type ? [this.data.baseinfo.base.f_cost_type] : '现金缴费'

package/src/filiale/wenxi/plugins/FileManageService.js

@@ -209,7 +209,7 @@ let FileManageService = {
       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 = 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('机表') ? '未发' : '无卡'
         // 所有表变成未发

package/src/main.js

@@ -3,7 +3,7 @@ import all from 'vue-client/src/all'
 import App from './App'
 import system from 'system-clients/src/system'
 import sale from './sale'
-import wenxi from './filiale/yuansheng/sale'
+import wenxi from './filiale/wenxi/sale'
 // import FilialeSale from './filiale/yuansheng/sale'
 import address from 'address-client/src/address'
 import ldap from 'ldap-clients/src/ldap'

package/src/plugins/FileManageService.js

@@ -210,7 +210,7 @@ let FileManageService = {
       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 = 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('机表') ? '未发' : '无卡'
         // 所有表变成未发