sale-client 4.3.61 → 4.3.62

package/.gradle/buildOutputCleanup/cache.properties

@@ -0,0 +1,2 @@
+#Wed May 13 15:19:48 CST 2026
+gradle.version=5.2.1

package/package.json

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

package/src/filiale/liaoyuan/ChangeMeter.vue

@@ -163,7 +163,20 @@
                     :options='ladder'
                     close-on-select clear-button></v-select>
         </div>
+        <div v-if="config.hasAudit" class="col-sm-4 form-group">
+          <label class="font_normal_body" :class="[$v.f_audit_person.required ? 'has-error' : 'has-success']">&nbsp;审核人员&nbsp;</label>
+          <input v-show="false" v-model="model.f_audit_person"
+                 v-validate:f_audit_person='{required: true}'>
+          <v-select :value.sync="model.f_audit_person"
+                    :options='auditor' placeholder='请选择'
+                    selected="审核人员"
+                    :value-single="true"
+                    style="width:60%"
+                    close-on-select></v-select>
+        </div>
       </div>
+      </div>
+
       <div class="row auto" >
         <div class="col-sm-12">
           <label  class="font_normal_body ">备&emsp;&emsp;注</label>
@@ -171,19 +184,15 @@
         </div>
       </div>
       <div style="text-align:right;height:auto;">
-        <button class="button_search" type="button" @click="confirmbefore()" :disabled="(!meterinfo&& !model.f_type.includes('清零'))||!$v.valid"
+        <button class="button_search" type="button" v-if="!config.hasAudit"  @click="confirmbefore(confirm)" :disabled="(!meterinfo&& !model.f_type.includes('清零'))||!$v.valid"
         >确认
         </button>
+        <button class="button_search" type="button" v-if="config.hasAudit" @click="confirmbefore(audit)" :disabled="(!meterinfo&& !model.f_type.includes('清零'))||!$v.valid"
+        >发起审核
+        </button>
         <button class="button_clear" type="button" @click="clean()" >取消
         </button>
       </div>
-      <!--<div style="height: auto;width: 100%">-->
-        <!--<div style="height: 10%">-->
-          <!--<img style="margin-top: -5px" src="../../../../../../static/images/lefticon/矩形1183.png">-->
-          <!--<a style="font-size: 16px;font-weight: 500;color: #333;text-decoration: none;">附件信息</a>&nbsp;<a style="color: #999999"></a>-->
-        <!--</div>-->
-        <!--<upload :blodid="row.f_userinfo_id" isremark="true" fusetype="换表"></upload>-->
-      <!--</div>-->
     </form>
     </validator>
   </div>
@@ -248,12 +257,14 @@ export default {
         f_changemeter_fee: this.$appdata.getSingleValue('换表金额') ? this.$appdata.getSingleValue('换表金额') : 0
       },
       meterinfo: false,
+      auditor:[],
 
       // 控制气量和金额的转换显示
       changeType: '',
       config: {
         showupload: true, //
-        dispatch: false // 是否派工
+        dispatch: false, // 是否派工
+        hasAudit: true
       },
       // 控制气量金额的编辑
       isGas: false,
@@ -280,6 +291,7 @@ export default {
   props: ['row'],
   ready () {
     getPrice(this)
+    this.getAuditor()
   },
   events: {
     // 删除Resid数组元素
@@ -293,6 +305,10 @@ export default {
     }
   },
   methods: {
+    async getAuditor () {
+      await this.$GetSaleParam.initinputtor()
+      this.auditor = this.$GetSaleParam.getAudit(this.$login.f.orgid)
+    },
     getPricenames () {
       console.log('气价。，。。', this.newinfo.pricetype)
       let rs = []
@@ -320,7 +336,7 @@ export default {
     clean () {
       this.$dispatch('success', '换表', this.row)
     },
-    async confirmbefore () {
+    async confirmbefore (type) {
       if (this.model.metermessage.f_meter_type[0] === '物联网表') {
         let param = {
           f_userfiles_id: this.row.f_userfiles_id,
@@ -346,13 +362,13 @@ export default {
           this.$showAlert('该表有欠费，请到机表缴费界面进行缴费', 'warning', 3000)
           this.$dispatch('button-specifies', {name: '机表收费', value: 'machine-charge'}, this.row)
         } else {
-          this.confirm()
+          this.confirm(type)
         }
       } else {
-        this.confirm()
+        this.confirm(type)
       }
     },
-    async confirm () {
+    async confirm (type) {
       console.log('haunbiao', this.$refs.uploadfile.fileInfoData)
       if (this.$refs.uploadfile.fileInfoData && this.$refs.uploadfile.fileInfoData.length > 1) {
         console.log('haunbiao', this.$refs.uploadfile.fileInfoData)
@@ -394,7 +410,7 @@ export default {
               if (this.model.metermessage.f_meter_type[0] != '机表') {
                 this.$dispatch('refresh')
               } else {
-                this.saveobj()
+                this.saveobj(type)
               }
             })
           } else {
@@ -405,16 +421,122 @@ export default {
         if (this.row.f_meter_type.includes('气量卡表') && (this.model.f_using_base_old > (this.row.f_total_gas + this.row.f_initial_base + this.row.f_remanent_gas))) {
           await this.$showMessage(`该表可能存在超用，请确定是否继续进行换表操作！！！,或者取消进入超用收费！`, ['confirm', 'cancel']).then((res) => {
             if (res === 'confirm') {
-              this.saveobj()
+              if (type === 'confirm') {
+                this.saveobj()
+              } else {
+                this.auditData()
+              }
             } else {
             }
           })
         } else {
-          this.saveobj()
+          if (type === 'confirm') {
+            this.saveobj()
+          } else {
+            this.auditData()
+          }
         }
       }
     },
-    async saveobj () {
+    async auditData(){
+      let operator = {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,
+        f_zoneid : this.$login.f.zoneid,
+        f_zones : this.$login.f.zones
+      }
+      let data = {
+        model: this.model,
+        user: {
+          // ========== 基础信息 ==========
+          f_userfiles_id: this.row.f_userfiles_id,      // 用户档案ID
+          f_userinfo_code:this.row.f_userinfo_code,
+          f_user_phone:this.row.f_user_phone,
+          f_userinfo_id: this.row.f_userinfo_id,        // 用户信息ID
+          f_user_id: this.row.f_user_id,                // 用户ID
+          f_user_name: this.row.f_user_name,            // 用户姓名
+          f_user_type: this.row.f_user_type,            // 用户类型
+          f_gasproperties: this.row.f_gasproperties,    // 用气性质
+          f_address: this.row.f_address,                // 地址
+          version: this.row.version,                    // 版本号
+          // ========== 表计信息 ==========
+          f_meternumber: this.row.f_meternumber,        // 表号
+          f_meter_type: this.row.f_meter_type,          // 表类型
+          f_meter_brand: this.row.f_meter_brand,        // 表品牌
+          f_meter_base: this.row.f_meter_base,          // 表底数
+          f_gasbrand_id: this.row.f_gasbrand_id,        // 气表品牌ID
+          brand_id: this.row.brand_id,                  // 品牌ID
+          f_alias: this.row.f_alias,                    // 别名（如："TianXinNEWSystem"）
+          // ========== 卡表相关 ==========
+          f_card_id: this.row.f_card_id,                // 卡号
+          // ========== 余额和补气信息 ==========
+          f_balance: this.row.f_balance,                // 余额
+          f_balance_amount: this.row.f_balance_amount,  // 余额金额
+          f_balance_gas: this.row.f_balance_gas,        // 余额气量
+          f_remanent_gas: this.row.f_remanent_gas,      // 补气量
+          f_remanent_price: this.row.f_remanent_price,  // 补气单价
+          f_remanent_type: this.row.f_remanent_type,    // 补气类型
+          f_remanent_money: this.row.f_remanent_money,  // 补气金额
+          f_deduction_gas: this.row.f_deduction_gas,    // 扣减气量
+          // ========== 累计数据 ==========
+          f_total_gas: this.row.f_total_gas,            // 累计购气量
+          f_total_fee: this.row.f_total_fee,            // 累计购气金额
+          f_initial_base: this.row.f_initial_base,      // 初始底数
+          // ========== 使用次数 ==========
+          f_times: this.row.f_times,                    // 次数
+          f_iot_times: this.row.f_iot_times,            // 物联网次数
+          f_fillcard_times: this.row.f_fillcard_times,  // 写卡次数
+          // ========== 价格相关 ==========
+          f_price_id: this.row.f_price_id,              // 价格ID
+          f_filialeid: this.row.f_filialeid,            // 分公司ID
+          f_stairprice_id: this.row.f_stairprice_id,    // 阶梯价格ID
+          // ========== 收费类型 ==========
+          f_collection_type: this.row.f_collection_type, // 收费类型（按气量/按金额）
+          // ========== 流量计相关（如果是流量计） ==========
+          f_flowmeter_number: this.row.f_flowmeter_number,
+          f_flowmeter_pass: this.row.f_flowmeter_pass,
+          f_flowmeter_brand: this.row.f_flowmeter_brand,
+          f_flowmeter_model: this.row.f_flowmeter_model,
+          f_flowmeter_accuracy: this.row.f_flowmeter_accuracy,
+          f_flowmeter_mpa_level: this.row.f_flowmeter_mpa_level,
+          f_flowmeter_install_date: this.row.f_flowmeter_install_date
+        },
+        config: this.config,
+        operator: operator
+      }
+      data.model.f_meternumber = data.model.metermessage.f_meternumber
+      data.model.f_metertitles= data.model.metermessage.f_metertitles
+      data.model.f_meter_base = data.model.metermessage.f_meter_base
+      data.model.gasbrand  = [{
+        id: data.model.metermessage.gasbrand[0].id,
+        f_meter_type: data.model.metermessage.gasbrand[0].f_meter_type,
+        f_alias: data.model.metermessage.gasbrand[0].f_alias,
+        f_meter_brand: data.model.metermessage.gasbrand[0].f_meter_brand
+      }]
+      data.model.gasmodel = [{
+        id: data.model.metermessage.gasmodel[0].id,
+        f_meter_style: data.model.metermessage.gasmodel[0].f_meter_style
+      }]
+      data.model.f_approve_operator = data.model.f_audit_person
+      data.model.metermessage = null
+      let param = []
+      for (let row of this.resid) {
+        param.push(row.id)
+      }
+      this.model.files = param
+      this.$resetpost('api/af-revenue/logic/mobile_changeMeter', data, {
+        resolveMsg: null,
+        rejectMsg: '换表失败！！！'
+      }).then((res) => {
+        console.log(res)
+        this.$dispatch('success')
+      })
+
+    },
+    async saveobj (type) {
       try {
         this.model.f_operator = this.$login.f.name
         this.model.f_operatorid = this.$login.f.id
@@ -636,7 +758,7 @@ export default {
 
     gasModelChange (val) {
       console.log('新表信息', val)
-      if (val.length > 0) {
+      if (val && val.length > 0) {
         // 新气表信息已选
         let oldMeter = {
           f_meter_type: this.row.f_meter_type,

package/src/filiale/liaoyuan/MeterMessage.vue

@@ -0,0 +1,143 @@
+<template>
+  <!--<div class="auto">-->
+    <validator name='v'  @valid="onValid()"  @invalid="onInvalid()">
+        <form novalidate class="form-horizontal">
+          <div class="row auto" >
+
+            <div class="col-sm-4 form-group" :class="[$v.metertype.required ? 'has-error' : '']">
+              <label for="f_meter_type" class="font_normal_body">新表类型</label>
+              <input type="text" class="input_search" style="width: 60%" v-show="false" v-model="$refs.metertype.selectedItems" v-validate:metertype='{required: true }'>
+              <v-select :value.sync="metermessage.f_meter_type"
+                        v-model="metermessage.f_meter_type"
+                        :options='meterType' placeholder='气表类型'
+                        close-on-select v-ref:metertype style="width: 60%"></v-select>
+            </div>
+
+            <div class="col-sm-4 form-group" :class="[$v.brand.required ? 'has-error' : '']">
+              <label for="gasbrand" class="font_normal_body">新表品牌</label>
+              <input type="text" class="input_search" style="width:60%" v-show="false" v-model="$refs.brand.selectedItems" v-validate:brand='{required: true }'>
+              <v-select :value.sync="metermessage.gasbrand" :options='getMeterBrands(metermessage.f_meter_type)' @change='brandChange' placeholder='气表品牌' close-on-select
+                        search v-model='metermessage.gasbrand' v-ref:brand></v-select>
+            </div>
+            <div class="col-sm-4 form-group" :class="[$v.model.required ? 'has-error' : '']">
+              <label for="gasmodel" class="font_normal_body">新表型号</label>
+              <input type="text" class="input_search" style="width:60%" v-show="false" v-model="$refs.model.selectedItems"  v-validate:model='{required: true }'>
+              <v-select :value.sync="metermessage.gasmodel" :options='metermessage.gasbrand[0] ? metermessage.gasbrand[0].gasmodel : [] ' placeholder='气表型号' close-on-select
+                        v-model='metermessage.gasmodel' :disabled= 'metermessage.gasbrand.length === 0 ' @change='modelChange' v-ref:model></v-select>
+            </div>
+
+          </div>
+          <div class="row auto" >
+            <div class="col-sm-4 form-group" :class="[$v.meternumber.required ? 'has-error' : '']">
+              <label for="f_meternumber" class="font_normal_body">新&ensp;表&ensp;号</label>
+              <input type="text" class="input_search" style="width:60%" class="input_search"
+                     @blur="meternumberValidate()"  v-model="metermessage.f_meternumber" v-validate:meternumber='{required: true }' placeholder='表号' >
+            </div>
+            <div class="col-sm-4 form-group" :class="[$v.f_metertitles.required ? 'has-error' : '']">
+              <label for="f_metertitles" class="font_normal_body">新表封号</label>
+              <input type="text" class="input_search" style="width:60%" class="input_search"  v-model="metermessage.f_metertitles" placeholder='表封号'>
+            </div>
+            <div class="col-sm-4 form-group" :class="[$v.f_meter_base.required ? 'has-error' : '']" title="参数名称：【初始表底数最大值】">
+              <label for="f_meter_base" class="font_normal_body">新表底数</label>
+              <input type="text" class="input_search" style="width:60%" class="input_search" v-validate:f_meter_base='{required: true }' @blur='meterbase()' v-model="metermessage.f_meter_base" placeholder='表底数' >
+            </div>
+          </div>
+
+        </form>
+    </validator>
+  <!--</div>-->
+</template>
+
+<script>
+  import {HttpResetClass} from "vue-client";
+
+  /**
+   *公共组件
+   *获取气表信息
+   */
+  export default {
+    data () {
+      return {
+        isdecimal: '否',
+        imgsrc: '/images/mainicon/biaopan.png',
+        imgmeter: '/images/mainicon/addmeter.png',
+        f_meter_base_max: this.$appdata.getSingleValue('初始表底数最大值') ? this.$appdata.getSingleValue('初始表底数最大值') : 10000,
+        meterType: this.$appdata.getParam('气表类型')
+      }
+    },
+    props: ['f_userfiles_id', 'metermessage'],
+    methods: {
+      onValid () {
+        this.$dispatch('valid')
+      },
+      onInvalid () {
+        this.$dispatch('invalid')
+      },
+      brandChange (val) {
+        console.log(val)
+        if (val) {
+          this.isdecimal = val.length > 0 ? val[0].f_isdecimal : '否'
+          this.meternumberValidate()
+        }
+      },
+      modelChange (val) {
+        this.$dispatch('gasmodel', this.metermessage.gasbrand)
+      },
+      resetValidate () {
+        this.$resetValidation()
+      },
+      meterbase () {
+        if (this.isdecimal === '是') {
+          this.metermessage.f_meter_base = (this.metermessage.f_meter_base - 0).toFixed(4)
+        } else {
+          this.metermessage.f_meter_base = (this.metermessage.f_meter_base - 0).toFixed(0)
+        }
+        if ((this.metermessage.f_meter_base - 0) > (this.f_meter_base_max - 0)) {
+          this.$showAlert(`新表底数可录入的最大值为: ${this.f_meter_base_max}, 请核实后重新录入!!!`, 'warning', 3000)
+          this.metermessage.f_meter_base = ''
+        }
+      },
+      getMeterBrands (meterType) {
+        let res = []
+        if (meterType.length > 0) {
+          this.meterbrands.forEach((item) => {
+            if (item.value.f_meter_type === meterType[0]) {
+              res.push(item)
+            }
+          })
+        }
+        return res
+      },
+      async meternumberValidate () {
+        if(!this.metermessage.f_meternumber){
+          return
+        }
+        let param = {
+          f_userfiles_id: this.f_userfiles_id,
+          f_meternumber: this.metermessage.f_meternumber,
+          f_gasbrand_id: this.metermessage.gasbrand[0].id
+        }
+        let res = await this.$resetpost('api/af-revenue/logic/third_meter_number_check', param, {
+          resolveMsg: null,
+          rejectMsg: '表号验证失败！！'
+        })
+        console.log('标号验证返回：', res)
+        if (res.data.code !== '0000') {
+          this.metermessage.f_meternumber = ''
+          this.$showAlert(res.data.msg, 'warning', 3000)
+        }
+      }
+    },
+    computed: {
+      usertypes () {
+        return this.$appdata.getParam('用户类型')
+      },
+      positions () {
+        return this.$appdata.getParam('安装位置')
+      },
+      meterbrands () {
+        return this.$GetSaleParam.getGasbrand()
+      }
+    }
+  }
+</script>

package/src/filiale/liaoyuan/sale.js

@@ -13,6 +13,7 @@ export default function () {
   Vue.component('file-user-files', (resolve) => { require(['./FileUserFiles'], resolve) })
   // 换表管理
   Vue.component('change-meter', (resolve) => { require(['./ChangeMeter'], resolve) })
+  Vue.component('meter-message', (resolve) => { require(['./MeterMessage'], resolve) })
   // 抄表册新增
   Vue.component('meter-book-add', (resolve) => { require(['./MeterBookAdd'], resolve) })
   // 退费管理

package/src/filiale/ruihua/webInfo/WebMeterList.vue

@@ -370,7 +370,7 @@
 
         let data = {
           tablename: 't_meterinfo',
-          filepath: res.f_downloadpath,
+          filepath: res.f_realpath,
           info: {
             f_orgid: this.$login.f.orgid ? this.$login.f.orgid : '',
             f_orgname: this.$login.f.orgs ? this.$login.f.orgs : '',

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/beifangshiye/sale'
+import FilialeSale from './filiale/jinhong/sale'
 import sale from './sale'
 import address from 'address-client/src/address'
 import ldap from 'ldap-clients/src/ldap'