sale-client 4.3.50 → 4.3.51

package/.gradle/buildOutputCleanup/cache.properties

@@ -0,0 +1,2 @@
+#Fri May 08 17:34:18 CST 2026
+gradle.version=5.2.1

package/package.json

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

package/src/filiale/jinhuang/Userinfo.vue

@@ -0,0 +1,424 @@
+<template>
+  <partial-view v-ref:pv>
+    <validator name='m'>
+    <div class="panel panel-info auto" style="margin-top: auto">
+      <div class="panel-heading" style="height: 35px">
+        <h4 style="display:inline-block;margin-top: auto">档案信息</h4>
+      </div>
+      <div class="auto info-content">
+        <div class="row" v-if="warninginfo.data.insMsg">
+          <p align="center"><font color="red" style="font-weight: bold">{{ warninginfo.data.insMsg }}</font></p>
+        </div>
+
+        <div class="row" :class="[config.f_userinfo_code ? 'highlight' : '']">
+          <label class="col-sm-5">客户编号</label>
+          <span class="col-sm-7"><a
+            @click="dealmsg(data)">{{ data ? data.f_userinfo_code : dafault.f_userinfo_code }}</a></span>
+        </div>
+        <div class="row" :class="[config.f_user_name ? 'highlight' : '']">
+          <label class="col-sm-5">客户名称</label>
+          <span class="col-sm-7">{{ data ? data.f_user_name : dafault.f_user_name }}</span>
+        </div>
+        <div class="row" v-if="data.f_name_pinyin">
+          <label class="col-sm-5">名称首拼</label>
+          <span class="col-sm-7">{{ data ? data.f_name_pinyin : dafault.f_name_pinyin }}</span>
+        </div>
+        <div class="row" :class="[config.f_user_type ? 'highlight' : '']">
+          <label class="col-sm-5">客户类型</label>
+          <span class="col-sm-7">{{ data ? data.f_user_type : dafault.f_user_type }}</span>
+        </div>
+        <div class="row">
+          <label class="col-sm-5">账户余额</label>
+          <span class="col-sm-7">{{ data ? data.f_balance : dafault.f_user_type }}</span>
+        </div>
+        <div class="row" v-show="data.f_project_money && data.f_project_money > 0">
+          <label class="col-sm-5">未结金额</label>
+          <span class="col-sm-7">{{ data ?data.f_project_money: '' }} | {{ data ?data.f_gas_type: '' }}</span>
+        </div>
+        <div class="row" v-show="data &&  data.f_sys_balance !== 0">
+          <label class="col-sm-5">系统余额</label>
+          <span class="col-sm-7">{{ data.f_sys_balance ? data.f_sys_balance : dafault.f_user_type }}</span>
+        </div>
+        <div class="row" :class="[config.f_idnumber ? 'highlight' : '']">
+          <label class="col-sm-5" style="color: brown">证件号码</label>
+          <span class="col-sm-7" style="word-break: break-all;color: brown">{{ data ? data.f_idnumber : dafault.f_idnumber }}
+            <span v-if="data"
+                  @click.stop="changeuseridnumber"
+                  class="glyphicon glyphicon-pencil clickchange"
+                  title="修正客户证件号码">
+            </span>
+          </span>
+        </div>
+        <div class="row" :class="[config.f_user_phone ? 'highlight' : '']">
+          <label class="col-sm-5" style="color: brown">客户电话</label>
+          <span class="col-sm-7" style="color: brown">{{ data ? data.f_user_phone : dafault.f_user_phone }}
+            <span v-if="data" @click.stop="changeuserphone"
+                  class="glyphicon glyphicon-pencil  clickchange" title="修正客户电话"></span>
+          </span>
+        </div>
+        <div class="row">
+          <label class="col-sm-5" style="color: brown">备用电话</label>
+          <span class="col-sm-7" style="color: brown">{{ data ? data.f_rent_phone : dafault.f_rent_phone }}
+            <span v-if="data" @click.stop="changerentphone"
+                  class="glyphicon glyphicon-pencil  clickchange" title="修正备用电话"></span>
+          </span>
+        </div>
+        <div class="row" :class="[config.f_user_state ? 'highlight' : '']">
+          <label class="col-sm-5">客户状态</label>
+          <span class="col-sm-7">{{ data ? data.f_user_state : dafault.f_user_state }}</span>
+        </div>
+        <div class="row" :class="[config.f_comments ? 'highlight' : '']">
+          <label class="col-sm-5" style="color: brown">备注信息</label>
+          <span class="col-sm-7" style="color: brown">{{ data ? data.f_comments : dafault.f_comments }}
+            <span v-if="data" @click.stop="change_reason"
+                  class="glyphicon glyphicon-pencil  clickchange" title="修改备注信息"></span>
+          </span>
+        </div>
+        <div class="row" :class="[config.f_address ? 'highlight' : '']">
+          <label class="col-sm-5">客户地址</label>
+          <span class="col-sm-7">{{ data ? data.f_address : dafault.f_address }}</span>
+        </div>
+        <div class="row" :class="[config.f_open_date ? 'highlight' : '']">
+          <label class="col-sm-5">开户时间</label>
+          <span class="col-sm-7">{{ data ? data.f_createfile_date.substr(0, 10) : dafault.f_open_date }}</span>
+        </div>
+        <div class="row" :class="[config.f_input_date ? 'highlight' : '']">
+          <label class="col-sm-5">安装时间</label>
+          <span class="col-sm-7">{{ data ? data.f_install_date.substr(0, 10) : dafault.f_input_date }}</span>
+        </div>
+        <div class="row" :class="[config.f_people_num ? 'highlight' : '']">
+          <label class="col-sm-5">&emsp;人&ensp;口&ensp;数</label>
+          <span class="col-sm-7"
+                style="word-break: break-all">{{ data ? data.f_people_num : dafault.f_people_num }}</span>
+        </div>
+        <div class="row">
+          <label class="col-sm-5">客户等级</label>
+          <span class="col-sm-7"
+                style="word-break: break-all">{{ data ? data.f_user_level : dafault.f_people_num }}</span>
+        </div>
+        <div class="row">
+          <label class="col-sm-5">旧客户编号</label>
+          <span class="col-sm-7">{{ data ? data.f_olduserinfo_code : dafault.f_userinfo_code }}</span>
+        </div>
+        <div class="row">
+          <label class="col-sm-5">合同编号</label>
+          <span class="col-sm-7">{{ data ? data.f_contract_id : dafault.f_contract_id }}</span>
+        </div>
+        <modal v-if="showselectncuserinfo" :show.sync="showselectncuserinfo" width="40%" title="修正客户电话号码"
+               v-ref:modal large backdrop="false">
+          <article slot="modal-body" class="modal-body">
+            <div class="form-horizontal">
+              <div class="row">
+                <div class="col-sm-12 form-group">
+                  <label class="font_normal_body">旧客户电话</label>
+                  <input disabled readonly type="text" style="width:80%" class="input_search"
+                         v-model="data.f_user_phone" placeholder='旧客户电话'>
+                </div>
+              </div>
+              <div class="row">
+                <div class="col-sm-12 form-group">
+                  <label class="font_normal_body">新客户电话</label>
+                  <input type="text" style="width:80%" class="input_search" v-model="newuserphone"
+                         v-validate:newuserphone='{ minlength: 11, maxlength: 11 }'
+                         @blur="validatePhone('newuserphone')"
+                         placeholder='新客户电话'>
+                </div>
+              </div>
+            </div>
+          </article>
+          <footer slot="modal-footer" class="modal-footer">
+            <button class="button_search" :disabled='!$m.valid' @click="modifyUser">确定</button>
+            <button type="button" class="button_clear" @click='close'>取消</button>
+          </footer>
+        </modal>
+        <modal v-if="showselectncuserrent" :show.sync="showselectncuserrent" width="40%" title="修正客户备用电话"
+               v-ref:modal large backdrop="false">
+          <article slot="modal-body" class="modal-body">
+            <div class="form-horizontal">
+              <div class="row">
+                <div class="col-sm-12 form-group">
+                  <label class="font_normal_body">旧客户备用电话</label>
+                  <input disabled readonly type="text" style="width:80%" class="input_search"
+                         v-model="data.f_rent_phone" placeholder='旧客户备用电话'>
+                </div>
+              </div>
+              <div class="row">
+                <div class="col-sm-12 form-group">
+                  <label class="font_normal_body">新客户备用电话</label>
+                  <input type="text" style="width:80%" class="input_search" v-model="newrentphone"
+                         v-validate:newrentphone='{ minlength: 11, maxlength: 11 }'
+                         @blur="validatePhone('newrentphone')"
+                         placeholder='新客户备用电话'>
+                </div>
+              </div>
+            </div>
+          </article>
+          <footer slot="modal-footer" class="modal-footer">
+            <button class="button_search" :disabled='!$m.valid' @click="modifyUserRent">确定</button>
+            <button type="button" class="button_clear" @click='close'>取消</button>
+          </footer>
+        </modal>
+        <modal v-if="reason_show" :show.sync="reason_show" width="40%" title="修改备注信息"
+               v-ref:modal large backdrop="false">
+          <article slot="modal-body" class="modal-body">
+            <div class="form-horizontal">
+              <div class="row">
+                <div class="col-sm-12 form-group">
+                  <label class="font_normal_body">旧备注信息</label>
+                  <input disabled readonly type="text" style="width:80%" class="input_search"
+                         v-model="data.f_comments" placeholder='旧备注信息'>
+                </div>
+              </div>
+              <div class="row">
+                <div class="col-sm-12 form-group">
+                  <label class="font_normal_body">新备注信息</label>
+                  <input type="text" style="width:80%" class="input_search" v-model="new_reason"
+                         placeholder='新备注信息'>
+                </div>
+              </div>
+            </div>
+          </article>
+          <footer slot="modal-footer" class="modal-footer">
+            <button class="button_search" :disabled='!$m.valid ' @click="modifyUserSpecialReson">确定</button>
+            <button type="button" class="button_clear" @click='close'>取消</button>
+          </footer>
+        </modal>
+        <modal v-if="showselectncuseridnumber" :show.sync="showselectncuseridnumber" width="40%" title="修改证件号码"
+               v-ref:modal large backdrop="false">
+          <article slot="modal-body" class="modal-body">
+            <div class="form-horizontal">
+              <div class="row">
+                <div class="col-sm-12 form-group">
+                  <label class="font_normal_body">旧证件号码</label>
+                  <input readonly type="text" style="width:80%" class="input_search"
+                         v-model="data.f_idnumber" placeholder='旧证件号码'>
+                </div>
+              </div>
+              <div class="row">
+                <div class="col-sm-12 form-group">
+                  <label class="font_normal_body">新证件号码</label>
+                  <input type="text" style="width:80%" class="input_search" v-model="newuseridnumber"
+                         v-validate:newuseridnumber='{identityCardValid: true}'
+                         @blur="validateIdNumber"
+                         placeholder='新证件号码'>
+                </div>
+              </div>
+            </div>
+          </article>
+          <footer slot="modal-footer" class="modal-footer">
+            <button class="button_search" :disabled='!$m.valid' @click="modifyUserIdNumberReason">确定</button>
+            <button type="button" class="button_clear" @click='close'>取消</button>
+          </footer>
+        </modal>
+
+      </div>
+    </div>
+    </validator>
+  </partial-view>
+</template>
+
+<script>
+/**
+ *用户档案相关信息组件
+ */
+
+export default {
+  ready () {
+    console.log('看看userinfo里面接收的data数据：', this.data)
+    this.$getConfig(this, 'getUserInfo')
+  },
+  title: '客户基本信息',
+  data () {
+    return {
+      dafault: {
+        f_user_name: '***',
+        f_userinfo_code: '********',
+        f_people_num: '**',
+        f_idnumber: '****',
+        f_user_phone: '************',
+        f_address: '*****',
+        f_user_type: '***',
+        f_open_date: '****年**月**日',
+        f_input_date: '****年**月**日',
+        f_hand_date: '****年**月**日',
+        f_rent_phone: '************',
+        f_comments: '**',
+        f_user_state: '****',
+        f_contract_id: '*************'
+      },
+      config: {
+        f_user_name: false,
+        f_userinfo_code: false,
+        f_people_num: false,
+        f_idnumber: false,
+        f_user_phone: false,
+        f_address: false,
+        f_user_type: false,
+        f_open_date: false,
+        f_input_date: false,
+        f_comments: false,
+        f_user_state: false
+      },
+      model: null,
+      showselectncuserinfo: false,
+      showselectncuserrent: false,
+      showselectncuseridnumber: false,
+      newuserphone: '',
+      newrentphone: '',
+      newuseridnumber: '',
+      reason_show: false,
+      new_reason: ''
+    }
+  },
+  props: ['data', 'warninginfo'],
+  methods: {
+    validatePhone (field) {
+      let phone = field === 'newuserphone' ? this.newuserphone : this.newrentphone
+      if (phone) {
+        let phoneRegex = /^1[3-9]\d{9}$/
+        if (!phoneRegex.test(phone)) {
+          this.$showAlert('请输入有效的电话号码（11位手机号码）', 'warning', 3000)
+          if (field === 'newuserphone') {
+            this.newuserphone = ''
+          } else {
+            this.newrentphone = ''
+          }
+        }
+      }
+    },
+    validateIdNumber () {
+      if (this.newuseridnumber) {
+        let idNumberRegex = /^[1-9]\d{5}(18|19|20)\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/
+        if (!idNumberRegex.test(this.newuseridnumber)) {
+          this.$showAlert('请输入有效的证件号码（18位身份证号码）', 'warning', 3000)
+          this.newuseridnumber = ''
+        }
+      }
+    },
+    async modifyUserSpecialReson () {
+      let param = {
+        new_reason: this.new_reason,
+        f_userinfo_id: this.data.f_userinfo_id,
+        f_user_id: this.data.f_user_id,
+        f_operator: this.$login.f.name,
+        f_operatorid: this.$login.f.id,
+        f_orgid: this.$login.f.orgid,
+        f_orgname: this.$login.f.orgs,
+        f_depid: this.$login.f.depids,
+        f_depname: this.$login.f.deps
+      }
+      await this.$resetpost('/api/af-revenue/logic/changeuserinfo', {data: param}, {resolveMsg: '修正成功', rejectMsg: null})
+      this.data.f_comments = this.new_reason
+      this.$parent.$parent.close()
+      this.$parent.$parent.clean()
+      this.$parent.$parent.$refs.list.searchNoData()
+      this.close()
+    },
+    async modifyUserIdNumberReason () {
+      let param = {
+        new_idnumber: this.newuseridnumber,
+        f_userinfo_id: this.data.f_userinfo_id,
+        f_user_id: this.data.f_user_id,
+        f_operator: this.$login.f.name,
+        f_operatorid: this.$login.f.id,
+        f_orgid: this.$login.f.orgid,
+        f_orgname: this.$login.f.orgs,
+        f_depid: this.$login.f.depids,
+        f_depname: this.$login.f.deps
+      }
+      await this.$resetpost('/api/af-revenue/logic/changeuserinfo', {data: param}, {resolveMsg: '修正成功', rejectMsg: null})
+      this.data.f_idnumber = this.newuseridnumber
+      this.$parent.$parent.close()
+      this.$parent.$parent.clean()
+      this.$parent.$parent.$refs.list.searchNoData()
+      this.close()
+    },
+    change_reason () {
+      // 修正客户电话
+      this.reason_show = true
+      this.new_reason = ''
+    },
+    dealmsg (val) {
+      if (val.f_userinfo_code !== '********') {
+        this.$dispatch('deal-msg', val)
+      }
+    },
+    changeuserphone () {
+      // 修正客户电话
+      this.showselectncuserinfo = true
+      this.newuserphone = ''
+    },
+    changeuseridnumber () {
+      // 修正客户证件号码
+      this.showselectncuseridnumber = true
+      this.newuseridnumber = ''
+    },
+    changerentphone () {
+      // 修正客户电话
+      this.showselectncuserrent = true
+      this.newrentphone = ''
+    },
+    async modifyUser () {
+      let param = {
+        new_userphone: this.newuserphone,
+        f_userinfo_id: this.data.f_userinfo_id,
+        f_user_id: this.data.f_user_id,
+        f_operator: this.$login.f.name,
+        f_operatorid: this.$login.f.id,
+        f_orgid: this.$login.f.orgid,
+        f_orgname: this.$login.f.orgs,
+        f_depid: this.$login.f.depids,
+        f_depname: this.$login.f.deps
+      }
+      await this.$resetpost('/api/af-revenue/logic/changeuserinfo', {data: param}, {resolveMsg: '修正成功', rejectMsg: null})
+      this.data.f_user_phone = this.newuserphone
+      this.$parent.$parent.close()
+      this.$parent.$parent.clean()
+      this.$parent.$parent.$refs.list.searchNoData()
+      this.close()
+    },
+    async modifyUserRent () {
+      let param = {
+        new_rentphone: this.newrentphone,
+        f_userinfo_id: this.data.f_userinfo_id,
+        f_user_id: this.data.f_user_id,
+        f_operator: this.$login.f.name,
+        f_operatorid: this.$login.f.id,
+        f_orgid: this.$login.f.orgid,
+        f_orgname: this.$login.f.orgs,
+        f_depid: this.$login.f.depids,
+        f_depname: this.$login.f.deps
+      }
+      await this.$resetpost('/api/af-revenue/logic/changeuserinfo', {data: param}, {resolveMsg: '修正成功', rejectMsg: null})
+      this.data.f_rent_phone = this.newrentphone
+      this.$parent.$parent.close()
+      this.$parent.$parent.clean()
+      this.$parent.$parent.$refs.list.searchNoData()
+      this.close()
+    },
+    close () {
+      this.showselectncuserinfo = false
+      this.showselectncuserrent = false
+      this.reason_show = false
+      this.showselectncuseridnumber = false
+      this.newuserphone = ''
+      this.new_reason = ''
+      this.new_idnumber = ''
+    }
+  },
+  watch: {
+    'data' (val) {
+    }
+  }
+}
+</script>
+<style scoped>
+.clickchange:hover {
+  color: #3592ef;
+  cursor: pointer;
+}
+.highlight {
+  color: brown;
+}
+
+</style>

package/src/filiale/jinhuang/sale.js

@@ -11,4 +11,6 @@ export default function () {
   Vue.component('change-meter', (resolve) => { require(['./ChangeMeter'], resolve) })
   Vue.component('charge-oper', (resolve) => { require(['./ChargeOper'], resolve) })
   Vue.component('charge-manage', (resolve) => { require(['./ChargeManage'], resolve) })
+  // 机表收费引导
+  Vue.component('sale-userinfo', (resolve) => { require(['./Userinfo.vue'], resolve) })
 }

package/src/filiale/yangchun/CardList.vue

@@ -448,7 +448,7 @@
           name = 'api/af-revenue/report/overuse_bill'
         } else if (type === '超用收费') {
           name = 'api/af-revenue/report/gascharge_bill'
-        } else if (type === '其他收费' || type === '其他收费撤销') {
+        } else if (type === '其他收费' || type === '其他收费撤销' || type === '维修收费') {
           name = 'api/af-revenue/report/otherCharge_bill'
         } else if (type === '补卡') {
           name = 'api/af-revenue/report/replace_sell'

package/src/main.js

@@ -2,7 +2,7 @@ import Vue from 'vue'
 import all from 'vue-client/src/all'
 import App from './App'
 import system from 'system-clients/src/system'
-import FilialeSale from './filiale/meihekou/sale'
+import FilialeSale from './filiale/jinhuang/sale'
 import sale from './sale'
 import address from 'address-client/src/address'
 import ldap from 'ldap-clients/src/ldap'