sale-client 4.2.101 → 4.2.103

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +1,2 @@
-#Thu Oct 30 09:31:24 CST 2025
+#Fri Nov 28 09:22:31 CST 2025
 gradle.version=5.2.1

package/package.json

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

package/src/filiale/meihekou/ChargeList.vue

@@ -23,10 +23,10 @@
 <!--                     @keyup.enter="search(), $parent.$parent.clean()" condition="f_user_name = '{}'">-->
 <!--            </div>-->
             <div class="form-group col-sm-4">
-              <label class="font_normal_body">旧客户号</label>
-              <input type="text" class="input_search" style="width:60%" v-model="model.f_olduserinfo_code"
-                     placeholder='客户编号'
-                     condition="f_olduserinfo_code = '{}'">
+              <label class="font_normal_body">证件号&emsp;</label>
+              <input type="text" class="input_search" style="width:60%" v-model="model.f_idnumber"
+                     placeholder='证件号'
+                     condition="f_idnumber = '{}'">
             </div>
 
             <div class="form-group col-sm-4">

package/src/filiale/meihekou/MeterOperatemain.vue

@@ -0,0 +1,511 @@
+<template>
+  <div class="auto"  id="meterInfoTest">
+    <validator name='a' @valid="addressValid(true)" @invalid="addressValid(false)">
+      <form class="form-horizontal">
+        <div class="row">
+          <div class="col-sm-4 form-group">
+            <label class="font_normal_body">用户姓名</label>
+            <input type="text" v-model="model.f_user_name" disabled=disabled style="width: 60%" class="input_search">
+          </div>
+          <div class="col-sm-4 form-group">
+            <label class="font_normal_body" title="参数:收费状态, 权限:【收费记录状态修改】">收费状态</label>
+<!--            <input type="text" v-model="model.f_charge_state" disabled=disabled style="width: 60%" class="input_search">-->
+            <v-select :value.sync="model.f_state" v-model="model.f_state"
+                      :value-single="true"
+                      :search="false"
+                      :disabled="editstate"
+                      :options='positions' placeholder='收费状态'
+                      close-on-select>
+            </v-select>
+          </div>
+          <div class="col-sm-4 form-group">
+            <label class="font_normal_body">地&emsp;&emsp;址</label>
+            <input type="text" v-model="model.f_address" disabled=disabled style="width: 60%" class="input_search">
+          </div>
+          <!--<div class="col-sm-4 form-group">
+            <label class="font_normal_body">用户编号</label>
+            <input type="text" v-model="model.f_userinfo_code" disabled=disabled style="width: 60%" class="input_search">
+          </div>-->
+          <div class="col-sm-4 form-group">
+            <label class="font_normal_body" title="参数:付款方式查询">付款方式</label>
+<!--            <input type="text" v-model="model.f_payment" style="width: 60%" class="input_search">-->
+            <v-select :value.sync="model.f_payment" v-model="model.f_payment"
+                      :options='payments' placeholder='付款方式'
+                      :value-single="true"
+                      :search="false"
+                      close-on-select>
+            </v-select>
+          </div>
+          <div class="col-sm-4 form-group">
+            <label class="font_normal_body" title="参数:写卡状态">写卡状态</label>
+<!--            <input type="text" v-model="model.f_write_card" style="width: 60%" class="input_search">-->
+            <v-select :value.sync="model.f_write_card" v-model="model.f_write_card"
+                      :options='writeCards' placeholder='写卡状态'
+                      :value-single="true"
+                      :search="false"
+                      close-on-select>
+            </v-select>
+          </div>
+          <div class="col-sm-4 form-group" title="修正需权限：【收费记录维护金额权限】">
+            <label class="font_normal_body">收款金额</label>
+            <input type="text" v-model="model.f_collection" :disabled="!editcollection" style="width: 60%" class="input_search">
+          </div>
+          <!--<div class="col-sm-4 form-group">-->
+            <!--<label class="font_normal_body">收据类型</label>-->
+            <!--<input type="text" v-model="model.f_bill_style" style="width: 60%" class="input_search">-->
+          <!--</div>-->
+        </div>
+        <div class="row">
+          <div class="col-sm-4 form-group">
+            <label class="font_normal_body">转账单位</label>
+            <input type="text" v-model="model.f_banktransfer_person" :disabled="!editbank" style="width: 60%" class="input_search">
+          </div>
+          <div class="col-sm-4 form-group">
+            <label class="font_normal_body">转账金额</label>
+            <input type="text" v-model="model.f_banktransfer_money" :disabled="!editbank" style="width: 60%" class="input_search">
+          </div>
+          <div class="col-sm-4 form-group">
+            <label class="font_normal_body">转账日期</label>
+<!--            <input type="text" v-model="model.f_banktransfer_date" :disabled="!editbank" style="width: 60%" class="input_search">-->
+            <datepicker id="f_banktransfer_date" placeholder="转账日期" style="width:60%"
+                        v-model="model.f_banktransfer_date"
+                        :value.sync="model.f_banktransfer_date"
+                        :format="'yyyy-MM-dd HH:mm:ss'"
+                        :show-reset-button="true">
+            </datepicker>
+          </div>
+        </div>
+        <div class="row">
+          <div class="col-sm-4 form-group" title="参数:操作时间, 权限:【收费记录时间修改】">
+            <label class="font_normal_body">操作时间</label>
+            <!--<input type="text" v-model="model.f_delivery_date"  style="width: 60%"  class="input_search">-->
+            <datepicker id="f_delivery_date" placeholder="操作时间" style="width:60%"
+                        v-model="model.f_operate_date"
+                        :value.sync="model.f_operate_date"
+                        :disabled="editDate"
+                        :format="'yyyy-MM-dd HH:mm:ss'"
+                        :show-reset-button="true">
+            </datepicker>
+          </div>
+          <div class="col-sm-4 form-group">
+            <label class="font_normal_body">财务核算日期</label>
+            <!--<input type="text" v-model="model.f_delivery_date"  style="width: 60%"  class="input_search">-->
+            <datepicker id="f_delivery_date" placeholder="财务核算日期" style="width:60%"
+                        v-model="model.f_accounting_date"
+                        :value.sync="model.f_accounting_date"
+                        :format="'yyyy-MM-dd HH:mm:ss'"
+                        :show-reset-button="true">
+            </datepicker>
+          </div>
+          <div class="col-sm-4 form-group" title="修正需权限：【收费记录维护金额权限】">
+            <label class="font_normal_body">购气气量</label>
+            <input type="text" v-model="model.f_pregas" :disabled="!editcollection" style="width: 60%" class="input_search">
+          </div>
+          <div class="col-sm-4 form-group" title="修正需权限：【收费记录维护金额权限】">
+            <label class="font_normal_body">购气金额</label>
+            <input type="text" v-model="model.f_preamount" :disabled="!editcollection" style="width: 60%" class="input_search">
+          </div>
+        </div>
+        <div class="row">
+          <div class="col-sm-4 form-group" title="修正需权限：【收费记录维护操作员权限】">
+            <label class="font_normal_body" title="参数:操作人员">操作人员</label>
+            <v-select :value.sync="model.f_operatorid"
+                      v-model="model.f_operatorid"
+                      :disabled="!editoperator"
+                      :value-single="true"  @change="selectoperator()"
+                      :options='foperator'
+                      close-on-select></v-select>
+          </div>
+          <div class="col-sm-4 form-group">
+            <label class="font_normal_body">所属部门</label>
+            <res-select restype="department"
+                        :is-mul="false"
+                        :disabled="!editdep"
+                        :parentresid="model.f_orgid ? [model.f_orgid] : []"
+                        :initresid="model.f_depid ? [model.f_depid] : []"
+                        @res-select="onDepSelect">
+            </res-select>
+          </div>
+          <div class="col-sm-4 form-group">
+            <label class="font_normal_body">所属公司</label>
+            <input type="text" v-model="model.f_orgname" disabled=disabled style="width: 60%" class="input_search">
+          </div>
+        </div>
+        <div class="row">
+          <div class="col-sm-4 form-group">
+            <label class="font_normal_body" title="打印格式">收据类型</label>
+            <v-select id="f_bill_style"
+                      placeholder='收据类型'
+                      :value-single="true"
+                      :value.sync="model.f_bill_style"
+                      :options='equipmentType'
+                      close-on-select clear-button>
+            </v-select>
+          </div>
+          <div class="col-sm-4 form-group">
+            <label class="font_normal_body">开发票人</label>
+            <input type="text" v-model="model.f_bill_operator" disabled=disabled  style="width: 60%" class="input_search">
+          </div>
+          <div class="col-sm-4 form-group">
+            <label class="font_normal_body">发票时间</label>
+            <datepicker id="f_bill_date" placeholder="开发票时间" style="width:60%"
+                        v-model="model.f_bill_date"
+                        :value.sync="model.f_bill_date"
+                        :format="'yyyy-MM-dd'"
+                        :show-reset-button="true">
+            </datepicker>
+            <!--<input type="text" v-model="model.f_bill_date"   style="width: 60%" class="input_search">-->
+          </div>
+        </div>
+        <div class="row">
+          <div class="col-sm-4 form-group">
+            <label class="font_normal_body">流&ensp;水&ensp;号</label>
+            <input type="text" v-model="model.f_serial_id" style="width: 60%" class="input_search">
+          </div>
+          <div class="col-sm-4 form-group">
+            <label class="font_normal_body">业务单号</label>
+            <input type="text" v-model="model.f_serial_number" style="width: 60%" class="input_search">
+          </div>
+        </div>
+        <div class="row">
+          <div class="col-sm-12 form-group">
+            <label class="font_normal_body">备注信息</label>
+            <input type="text" v-model="model.f_comments"  style="width: 85%" class="input_search">
+          </div>
+        </div>
+      </form>
+      <div style="float: right">
+        <button class="button_search" @click="save">保存</button>
+        <button class="button_clear" @click="cancel">取消</button>
+      </div>
+    </validator>
+    <modal :show.sync="showfiles" width="80%" style="width:auto;"  v-ref:modal  backdrop="false">
+      <article slot="modal-body">
+        <upload :blodid="model.f_userinfo_id"  :businessid="model.id" v-ref:upload  fusetype="收费" isremark="true" style="width:auto" ></upload>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+      </footer>
+    </modal>
+    <!--文件上传按钮-->
+    <button class="button_search" style="width: max-content" @click="uploadFiles()">上传附件</button>
+  </div>
+</template>
+<script>
+  import Vue from 'vue'
+  import {HttpResetClass} from 'vue-client'
+  import * as Util from '../../Util'
+var data
+  let readyGen = async function (self) {
+    await self.$LoadParams.loadParam(self.f_filialeid)
+    await self.$GetSaleParam.initinputtor()
+  }
+  export default {
+    title: '基本信息',
+
+    data () {
+      return {
+        equipmentType: this.$appdata.getParam('打印格式') ? [{label: '', value: ''}, ...this.$appdata.getParam('打印格式')] : [],
+        // 构建数组来存储对象
+        editbank: true,
+        editcollection: false,
+        editoperator: false,
+        editdep: false,
+        uploadText: '收费',
+        showfiles: false,
+        recordList: [],
+        foperator: [],
+        fdep: [],
+        fileNameSet: {
+          'f_payment': '收费形式',
+          'f_state': '是否有效',
+          'f_bill_style': '收据类型',
+          'f_operate_date': '收费日期',
+          'f_accounting_date': '财务核算日期',
+          'f_pregas': '购气气量',
+          'f_address': '地址',
+          'f_user_type': '用气性质',
+          'f_preamount': '充值金额',
+          'f_orgname': '所属公司',
+          'f_depname': '所属部门',
+          'f_operator': '操作人',
+          'f_user_name': '用户姓名',
+          'f_write_card': '写卡状态',
+          'f_banktransfer_person': '转账单位',
+          'f_banktransfer_money': '转账金额',
+          'f_banktransfer_date': '转账日期',
+          'f_comments': '备注信息',
+          'f_bill_date': '开票时间',
+          'f_bill_operator': '开票人',
+          'f_serial_id': '流水号',
+          'f_serial_number': '业务单号'
+        },
+        editstate: true,
+        editDate: true
+      }
+    },
+    props: {
+      oldmodel: Object,
+      model: Object
+    },
+
+    async ready () {
+      if (this.$login.r.includes('维护银行转账信息')) {
+        this.editbank = true
+      }
+      if (this.$login.r.includes('收费记录维护金额权限')) {
+        this.editcollection = true
+      }
+      if (this.$login.r.includes('收费记录维护操作员权限')) {
+        this.editoperator = true
+      }
+      if (this.$login.r.includes('抄表记录维护部门权限')) {
+        this.editdep = true
+      }
+      if (this.$login.r.includes('收费记录状态修改')) {
+        this.editstate = false
+      }
+      if (this.$login.r.includes('收费记录时间修改')) {
+        this.editDate = false
+      }
+      this.oldmodel = JSON.parse(JSON.stringify(this.model))
+      this.model.f_bill_state = [this.oldmodel]
+      console.log('看看收费id', this.oldmodel)
+      await readyGen(this)
+      // 初始化操作员和部门下拉，避免下拉为空或仅显示数值
+      this.initoperator()
+      this.initdep()
+    },
+    created () {
+    },
+    methods: {
+      initoperator () {
+        this.foperator = []
+        console.log('this.$login', this.$login, this.oldmodel, this.$GetSaleParam.inputtors)
+        let arr = this.$GetSaleParam.inputtors.filter((res) => {
+          if (res.rolestr != null && res.rolestr !== '') {
+            return res.rolestr.indexOf('营业员') > -1 && res.f_orgid === this.model.f_orgid
+          }
+        })
+        arr.forEach((res) => {
+          this.foperator.push({label: res.name, value: res.id})
+        })
+      },
+      initdep () {
+        this.fdep = []
+        // 确保 inputtors 已加载
+        if (!this.$GetSaleParam || !this.$GetSaleParam.inputtors) {
+          console.warn('initdep - inputtors not loaded yet')
+          return
+        }
+        const inputtors = this.$GetSaleParam.inputtors || []
+        console.log('initdep - inputtors length:', inputtors.length, 'f_orgid:', this.model.f_orgid)
+
+        const filterdep = inputtors.filter((res) => {
+          return res.rolestr != null && res.rolestr !== '' &&
+              res.rolestr.indexOf('营业员') > -1 &&
+              res.f_organization_id === this.model.f_orgid
+        })
+        console.log('initdep - filterdep length:', filterdep.length)
+
+        filterdep.forEach((res) => {
+          if (res.parentid && res.f_department_name) {
+            if (!this.fdep.some((item) => item.value === res.parentid)) {
+              this.fdep.push({ label: res.f_department_name, value: res.parentid })
+            }
+          }
+        })
+        console.log('initdep - fdep after filter:', this.fdep.length, this.fdep)
+
+        // 如果当前 model.f_depid 有值但不在下拉列表中，需要添加进去
+        if (this.model.f_depid && !this.fdep.some((item) => item.value === this.model.f_depid)) {
+          // 如果 model.f_depname 有值，直接使用
+          if (this.model.f_depname) {
+            this.fdep.push({ label: this.model.f_depname, value: this.model.f_depid })
+          } else {
+            // 否则从数据库查询部门名称
+            this.loadDepartmentName(this.model.f_depid)
+          }
+        }
+        console.log('initdep - final fdep:', this.fdep.length, this.fdep)
+      },
+      loadDepartmentName (depid) {
+        if (!depid) return
+        let http = new HttpResetClass()
+        http.load('POST', 'api/af-revenue/sql/saleSingleTable',
+          { data: {tablename: 't_user',
+            condition: `parentid = '${depid}'`}},
+            {resolveMsg: null, rejectMsg: null}).then((res) => {
+              if (res.data.length > 0 && res.data[0].f_department_name) {
+                // 添加到下拉列表
+                if (!this.fdep.some((item) => item.value === depid)) {
+                  this.fdep.push({ label: res.data[0].f_department_name, value: depid })
+                }
+                // 更新 model.f_depname
+                if (!this.model.f_depname) {
+                  this.model.f_depname = res.data[0].f_department_name
+                }
+              }
+            })
+      },
+      selectdep () {
+        let id = this.model.f_depid
+        if (!this.model.f_depid) {
+          return
+        }
+        let http = new HttpResetClass()
+        http.load('POST', 'api/af-revenue/sql/saleSingleTable',
+          { data: {tablename: 't_user',
+            condition: `parentid = '${id}'`}},
+            {resolveMsg: null, rejectMsg: null}).then((res) => {
+              if (res.data.length > 0) {
+                this.model.f_depname = res.data[0].f_department_name
+              } else {
+                this.model.f_depid = ''
+                this.$showAlert('部门信息未找到', 'warning', 2000)
+              }
+            })
+      },
+      onDepSelect (resIds, labels) {
+        // res-select 返回选中的 id 列表和名称列表
+        if (resIds && resIds.length > 0) {
+          this.model.f_depid = resIds[0]
+          this.model.f_depname = labels && labels.length > 0 ? labels[0] : ''
+        } else {
+          this.model.f_depid = ''
+          this.model.f_depname = ''
+        }
+        // 保持向后兼容：若需要继续使用原 selectdep 逻辑，可补充调用
+      },
+      selectoperator () {
+        let id = this.model.f_operatorid
+        if (!this.model.f_operatorid) {
+          return
+        }
+        let http = new HttpResetClass()
+        http.load('POST', 'api/af-revenue/sql/saleSingleTable',
+          {data: {tablename: 't_user',
+            condition: `id = '${id}'`}},
+          {resolveMsg: null, rejectMsg: null}).then((res) => {
+            console.log('kanak,res', res)
+            if (res.data.length > 0) {
+              this.model.f_operator = res.data[0].name
+              this.model.f_depname = res.data[0].f_department_name
+              this.model.f_depid = res.data[0].parentid
+            } else {
+              this.model.f_operatorid = ''
+              this.$showAlert('操作员信息未找到', 'warning', 2000)
+            }
+            console.log('this.f_operatorid', this.model.f_operator)
+          })
+      },
+      cancel () {
+        this.$dispatch('close')
+      },
+      uploadFiles () {
+        this.showfiles = !this.showfiles
+      },
+      addressValid (val) {
+      },
+      save () {
+        // console.log(this.model.key)
+        //
+        for (var item in this.model) {
+          if (item != 'f_sendsuccess' && item !== 'f_operatorid' && item !== 'f_depid') {
+            if (this.model[item] != this.oldmodel[item] && this.model[item] !== 's_timestamp') {
+              var car = {
+                chinesename: this.fileNameSet[item],
+                fieldname: item,
+                tablename: 't_sellinggas',
+                oldvalue: this.oldmodel[item],
+                newvalue: this.model[item],
+                state: '有效',
+                modifitime: Util.toStandardTimeString(),
+                operator: this.$login.f.name,
+                sellingas_id: this.model.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
+              }
+              this.recordList.push(car)
+            }
+          }
+        }
+        if (this.model.f_bill_date !== '' || this.model.f_bill_date === undefined) {
+          this.model.f_bill_operator = this.$login.f.name
+        }
+        this.$resetpost('api/af-revenue/logic/saveing', {data: {recordlist: this.recordList, newData: this.model}}).then((res) => {
+          this.recordList = []
+          console.log('this.model', this.model)
+        })
+        this.recordList = []
+        this.$dispatch('close')
+      }
+    },
+    computed: {
+      positions () {
+        return this.$appdata.getParam('收费状态')
+      },
+      payments () {
+        return this.$appdata.getParam('付款方式查询')
+      },
+      writeCards () {
+        return this.$appdata.getParam('写卡状态')
+      },
+      billStyles () {
+        return this.$appdata.getParam('收据类型')
+      }
+    },
+    watch: {
+      'model' () {
+        this.initoperator()
+        this.initdep()
+      }
+    }
+  }
+</script>
+<style lang="less" scoped>
+#meterInfoTest{
+  #addboxmap {
+    height: 300px;
+  }
+  .glyphicon-map-marker:hover {
+    color: red;
+  }
+  .glyphicon-map-marker {
+    color: blue;
+    cursor: pointer;
+  }
+  .col-sm-4 {
+    .font_normal_body {
+      width: 73px;
+      overflow: auto;
+      white-space: nowrap;
+      // 指滚动条两边的按钮
+      &::-webkit-scrollbar-button {
+        display: none;
+      }
+      // 滚动条的宽度
+      &::-webkit-scrollbar {
+        width: 5px !important;
+        height: 5px !important;
+      }
+      // 滚动条的设置
+      &::-webkit-scrollbar-thumb {
+        background-color: #ddd;
+        background-clip: padding-box;
+      }
+      &::-webkit-scrollbar-thumb:hover {
+        background-color: #bbb;
+      }
+      &::-webkit-scrollbar-track {
+        /*滚动条里面轨道*/
+        box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
+        background: #ededed;
+      }
+    }
+  }
+}
+</style>

package/src/filiale/meihekou/UserFeeInfo.vue

@@ -0,0 +1,84 @@
+<template>
+  <div class="panel panel-info auto">
+    <div class="panel-heading auto" style="height: 30px">
+      <h4 style="display:inline-block;margin-top: auto">保险信息</h4>
+    </div>
+      <div class="auto info-content" v-if="feelist.data.length > 0">
+        <div class="row">
+          <label class="col-sm-4 ">险种:</label>
+          <span class="col-sm-8">{{row.f_insurance_type}}</span>
+        </div>
+        <div class="row">
+          <label class="col-sm-4 ">办理人:</label>
+          <span class="col-sm-8">{{row.f_operator}}</span>
+        </div>
+        <div class="row">
+          <label class="col-sm-4 ">购买时间:</label>
+          <span class="col-sm-8">{{row.f_operate_date}}</span>
+        </div>
+        <div class="row">
+          <label class="col-sm-4 ">开始时间:</label>
+          <span class="col-sm-8">{{row.f_ins_start_date}}</span>
+        </div>
+        <div class="row">
+          <label class="col-sm-4 ">到期时间:</label>
+          <span class="col-sm-8">{{row.f_expiration_date}}</span>
+        </div>
+        <div class="row">
+          <label class="col-sm-4 ">金额:</label>
+          <span class="col-sm-8">{{row.f_money}}</span>
+        </div>
+      </div>
+    <div v-else>
+      <div class="row">
+        <strong>暂无保险信息</strong>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  /**
+   *用户其他费用信息组件
+   */
+  export default {
+    props: ['userinfoid'],
+    data () {
+      return {
+        row: {},
+        feelist: []
+      }
+    },
+    methods: {
+      async userfees (userinfoid) {
+        console.log('获取保险费' + userinfoid)
+        if (userinfoid) {
+          this.feelist = await this.$resetpost('api/af-revenue/sql/singleTable_OrderBy', {data: {tablename: 't_userfees', condition: `f_userinfo_id='${userinfoid}'`, items: '*', orderitem: 'f_operate_date desc' }})
+          if (this.feelist.data.length !== 0) {
+            this.row = this.feelist.data[0]
+          }
+        } else {
+          this.feelist = []
+          this.row = {}
+        }
+      }
+    },
+    watch: {
+      'userinfoid' (val) {
+        this.userfees(val)
+      }
+    },
+    ready () {
+      this.userfees(this.userinfoid)
+    }
+  }
+</script>
+<style media="screen">
+  #table1{
+    text-align:center;
+  }
+  .self-table > tbody > tr > td {
+    padding: 3px;
+    text-align: center;
+  }
+</style>