sale-client 4.3.34 → 4.3.35

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +1,2 @@
-#Mon Mar 09 11:40:35 CST 2026
+#Mon Jan 05 11:37:36 CST 2026
 gradle.version=5.2.1

package/package.json

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

package/src/filiale/jiaxian/meterinfodetail.vue

@@ -0,0 +1,486 @@
+<template>
+  <partial-view v-ref:pv>
+    <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 ">
+        <div class="row" v-if="data.f_customer">
+          <label class = "col-sm-5 " style="color: brown">团缴编号</label>
+          <span class = "col-sm-7" style="color: brown">{{data.f_customer?data.f_customer:'无'}}</span>
+        </div>
+        <div class="row">
+          <label class = "col-sm-5 " >气表类型</label>
+          <span class = "col-sm-7">{{data?data.f_meter_type:dafault.f_meter_brand}}</span>
+        </div>
+        <div class="row">
+          <label class = "col-sm-5 " >气表品牌</label>
+          <span class = "col-sm-7">{{data?data.f_meter_brand:dafault.f_meter_brand}}</span>
+        </div>
+        <div class="row">
+          <label class = "col-sm-5 " >气表型号</label>
+          <span class = "col-sm-7">{{data?data.f_meter_style:dafault.f_meter_style}}</span>
+        </div>
+        <div class="row" v-if="data.f_meter_type.includes('物联网')">
+          <label class = "col-sm-5 " >计费终端</label>
+          <span class = "col-sm-7" >{{data?data.f_calculation:dafault.f_calculation}}</span>
+        </div>
+        <div class="row" v-if="data.f_meter_type.includes('物联网')">
+          <label class = "col-sm-5 " >结算方式</label>
+          <span class = "col-sm-7" >{{data?data.f_collection_type:dafault.f_collection_type}}</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_table_state:dafault.f_table_state}}</span>
+        </div>
+        <div class="row" v-if="data.f_meter_type.includes('物联网') && data.f_collection_type === '按金额'">
+          <label class = "col-sm-5 " style="color: brown">系统余额</label>
+          <span class = "col-sm-7" style="color: brown">{{data?data.f_balance_amount:dafault.f_balance_amount}}</span>
+        </div>
+        <div class="row" v-if="data.f_meter_type.includes('物联网') && data.f_collection_type === '按气量'">
+          <label class = "col-sm-5 " style="color: brown">系统余量</label>
+          <span class = "col-sm-7" style="color: brown">{{data?data.f_balance_gas:dafault.f_balance_gas}}</span>
+        </div>
+        <div class="row" v-if="data.f_calculation.includes('表端结算') && data.f_meter_type.includes('物联网')">
+          <label class = "col-sm-5 " style="color: brown">表端上报余额</label>
+          <span class = "col-sm-7" style="color: brown">{{data?data.f_jval:dafault.f_jval}}</span>
+        </div>
+        <div class="row">
+          <label class = "col-sm-5 " >欠费金额</label>
+          <span class = "col-sm-7">{{f_arrears_fee ? f_arrears_fee : 0}}</span>
+        </div>
+        <div class="row">
+          <label class = "col-sm-5 " >初始表底数</label>
+          <span class = "col-sm-7" >{{data?data.f_initial_base:dafault.f_initial_base}}</span>
+        </div>
+        <div class="row">
+          <label class = "col-sm-5 " >表当前底数</label>
+          <span class = "col-sm-7" >{{data?data.f_meter_base:dafault.f_meter_base}}</span>
+        </div>
+        <div class="row" v-show="data.f_times">
+          <label class = "col-sm-5 " >写卡次数</label>
+          <span class = "col-sm-7" >{{data?data.f_times:dafault.f_times}}</span>
+        </div>
+        <div class="row" v-if="data.f_meter_type.includes('物联网')">
+          <label class = "col-sm-5 ">指令上表次数</label>
+          <span class = "col-sm-7" >{{data?data.f_iot_times:dafault.f_iot_times}}</span>
+        </div>
+        <div class="row" v-if="data.f_meter_type.includes('物联网')">
+          <label class = "col-sm-5 ">表累购金额</label>
+          <span class = "col-sm-7" >{{data?data.f_total_fee:dafault.f_total_fee}}
+            <span v-if="data && this.$login.r.includes('收费页面修改累购')" @click.stop="changeMeterFee"
+                  class="glyphicon glyphicon-pencil  click-change"  title="修改累购金额">
+            </span>
+          </span>
+        </div>
+        <div class="row" v-if="data.f_meter_type.includes('物联网')">
+          <label class = "col-sm-5 ">户累购金额</label>
+          <span class = "col-sm-7" >{{data?data.f_total_fee_all:dafault.f_total_fee_all}}</span>
+        </div>
+        <div class="row" v-if="(data.f_meter_type === '机表' || data.f_meter_type === '物联网表') && data.f_deduction_gas > 0">
+          <label class = "col-sm-5 " >剩余抵扣量</label>
+          <span class = "col-sm-7" >{{data?data.f_deduction_gas:dafault.f_deduction_gas}}</span>
+        </div>
+        <div class="row" v-if="data.f_meter_type.includes('卡表')">
+          <label class = "col-sm-5 " style="color: brown" >户累购气量</label>
+          <span class = "col-sm-7" style="color: brown">{{data?data.f_total_gas_all:dafault.f_total_gas_all}}</span>
+        </div>
+        <div class="row" v-if="(data.f_meter_brand.includes('数码表'))">
+          <label class = "col-sm-5 " style="color: brown" >累购气量</label>
+          <span class = "col-sm-7" style="color: brown">{{data?data.f_total_gas:dafault.f_total_gas}}</span>
+        </div>
+        <div class="row" v-if="data.f_meter_type.includes('卡表') && data.f_meter_type === '气量卡表'">
+          <label class = "col-sm-5 " style="color: brown" >累购气量</label>
+          <span class = "col-sm-7" style="color: brown">{{data?data.f_total_gas:dafault.f_total_gas}}
+            <span v-if="data && this.$login.r.includes('收费页面修改累购')" @click.stop="changeMeterGas"
+                  class="glyphicon glyphicon-pencil  click-change"  title="修改累购气量">
+            </span>
+          </span>
+        </div>
+        <div class="row" v-if="data.f_meter_type.includes('卡表')">
+          <label class = "col-sm-5 " style="color: brown">累购金额</label>
+          <span class = "col-sm-7" style="color: brown">{{data?data.f_total_fee:dafault.f_total_fee}}
+            <span v-if="data && this.$login.r.includes('收费页面修改累购')" @click.stop="changeMeterFee"
+                  class="glyphicon glyphicon-pencil  click-change"  title="修改累购金额">
+            </span>
+          </span>
+        </div>
+        <div class="row" v-if="data.f_meter_type.includes('卡表')">
+          <label class = "col-sm-5 " style="color: brown">累购写卡金额</label>
+          <span class = "col-sm-7" style="color: brown">{{data?data.f_write_totalfee:dafault.f_total_fee}}
+            <span v-if="data && this.$login.r.includes('收费页面修改累购')" @click.stop="changeMeterWriteFee"
+                            class="glyphicon glyphicon-pencil  click-change"  title="修改累购写卡金额">
+            </span>
+          </span>
+        </div>
+        <div class="row">
+          <label class = "col-sm-5 " >气表表号</label>
+          <span class = "col-sm-7">{{data?data.f_meternumber:dafault.f_meternumber}}</span>
+        </div>
+        <div class="row" v-if="data.f_meter_type.includes('卡表') || (data.f_meter_type.includes('物联网表') && data.f_hascard==='是')">
+          <label class = "col-sm-5 " >卡&emsp;&emsp;号</label>
+          <span class = "col-sm-7">{{data?data.f_card_id:dafault.f_card_id}}</span>
+        </div>
+        <div class="row">
+          <label class = "col-sm-5 " >表封号</label>
+          <span class="col-sm-7">{{data?data.f_metertitles:dafault.f_metertitles}}
+            <span v-if="data" @click.stop="changemetertitles"
+                  class="glyphicon glyphicon-pencil  click-change"  title="修正表封号"></span>
+          </span>
+        </div>
+<!--        <div class="row" v-if="data.f_meter_type.includes('卡表') || data.f_meter_type.includes('物联网表') && data.f_hascard==='是'">-->
+<!--          <label class = "col-sm-5 " >写卡次数</label>-->
+<!--          <span class = "col-sm-7">{{data?data.f_times:dafault.f_times}}</span>-->
+<!--        </div>-->
+        <div class="row">
+          <label class = "col-sm-5 " >用气性质</label>
+          <span class = "col-sm-7">{{data?data.f_gasproperties:dafault.f_gasproperties}}</span>
+        </div>
+        <div class="row">
+          <label class = "col-sm-5 " >气价名称</label>
+          <span class = "col-sm-7">{{data?data.f_price_name:dafault.f_price_name}}</span>
+        </div>
+        <!--<div class="row" v-if="data.f_balance < 0">-->
+        <!--<label class = "col-sm-5 "  >账户欠费</label>-->
+        <!--<span class = "col-sm-7" title="不包含违约金">{{data?0 - (data.f_balance - 0):dafault.f_balance}}</span>-->
+        <!--</div>-->
+        <!--<div class="row" v-else>-->
+        <!--<label class = "col-sm-5 " >账户余额</label>-->
+        <!--<span class = "col-sm-7">{{data?data.f_balance:dafault.f_balance}}</span>-->
+        <!--</div>-->
+        <div class="row" v-if="data.f_remanent_money > 0">
+          <label class = "col-sm-5 " >应补金额</label>
+          <span class = "col-sm-7">{{data?data.f_remanent_money:dafault.f_remanent_money}}</span>
+        </div>
+        <div class="row" v-if="data.f_remanent_gas > 0">
+          <label class = "col-sm-5 " >应补气量</label>
+          <span class = "col-sm-7">{{data?data.f_remanent_gas:dafault.f_remanent_gas}}</span>
+        </div>
+        <div class="row">
+          <label class = "col-sm-5 " >表&emsp;&emsp;向</label>
+          <span class = "col-sm-7">{{data?data.f_aroundmeter:dafault.f_hand_date}}</span>
+        </div>
+        <div class="row" v-if="!data.f_meter_type.includes('物联网')">
+          <label class = "col-sm-5 " >抄表册名</label>
+          <span class = "col-sm-7">{{data?'['+data.f_book_code + '] '+ (data.f_book_name ? data.f_book_name:''):dafault.f_book_name}}</span>
+        </div>
+        <div class="row" v-if="!data.f_meter_type.includes('物联网')">
+          <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_position:dafault.f_position}}</span>
+        </div>
+        <div class="row">
+          <label class = "col-sm-5 " >置换人员</label>
+          <span class = "col-sm-7">{{data?data.f_gas_person:dafault.f_hand_date}}</span>
+        </div>
+        <div class="row">
+          <label class = "col-sm-5 " >置换时间</label>
+          <span class = "col-sm-7">{{data?data.f_gas_date.substring(0,7):dafault.f_hand_date}}</span>
+        </div>
+        <div class="row" v-if="!data.f_meter_type.includes('物联网')">
+          <label class = "col-sm-5 " >抄表员</label>
+          <span class = "col-sm-7">{{data?data.f_inputtor:dafault.f_inputtor}}</span>
+        </div>
+        <div class="row" v-if="!data.f_meter_type.includes('物联网')">
+          <label class = "col-sm-5 " >上次抄表日</label>
+          <span class = "col-sm-7">{{data?data.f_hand_date.substring(0,7):dafault.f_hand_date}}</span>
+        </div>
+        <div class="row">
+          <label class = "col-sm-5 " >建档日期</label>
+          <span class = "col-sm-7">{{data?data.f_input_date.substring(0,7):dafault.f_input_date}}</span>
+        </div>
+        <div class="row">
+          <label class = "col-sm-5 " >备&emsp;&emsp;注</label>
+          <span class = "col-sm-7">{{data?data.comments:dafault.comments}}</span>
+        </div>
+        <modal v-if="showselectncuserfile" :show.sync="showselectncuserfile" 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_metertitles" 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="newmetertitles"
+                         placeholder='新表封号'>
+                </div>
+              </div>
+            </div>
+          </article>
+          <footer slot="modal-footer" class="modal-footer">
+            <button class="button_search" :disabled='!$m.valid ' @click="modifyUserFile('表封号')">确定</button>
+            <button type="button" class="button_clear" @click='close'>取消</button>
+          </footer>
+        </modal>
+        <modal v-if="showSelectUserFee" :show.sync="showSelectUserFee" 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_total_fee" placeholder='原累购金额' disabled>
+                </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="newMeterFee"
+                         placeholder='修改后累购金额'>
+                </div>
+              </div>
+            </div>
+          </article>
+          <footer slot="modal-footer" class="modal-footer">
+            <button class="button_search" :disabled='!$m.valid ' @click="modifyUserFile('累购金额')">确定</button>
+            <button type="button" class="button_clear" @click='close'>取消</button>
+          </footer>
+        </modal>
+        <modal v-if="showSelectUserWriteFee" :show.sync="showSelectUserWriteFee" 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_write_totalfee" placeholder='原表累购写卡金额' disabled>
+                </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="newMeterWriteFee"
+                         placeholder='修改后累购写卡金额'>
+                </div>
+              </div>
+            </div>
+          </article>
+          <footer slot="modal-footer" class="modal-footer">
+            <button class="button_search" :disabled='!$m.valid ' @click="modifyUserFile('累购写卡金额')">确定</button>
+            <button type="button" class="button_clear" @click='close'>取消</button>
+          </footer>
+        </modal>
+        <modal v-if="showSelectUserGas" :show.sync="showSelectUserGas" 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_total_gas" placeholder='原表累购气量' disabled>
+                </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="newMeterGas"
+                         placeholder='新表累购气量'>
+                </div>
+              </div>
+            </div>
+          </article>
+          <footer slot="modal-footer" class="modal-footer">
+            <button class="button_search" :disabled='!$m.valid ' @click="modifyUserFile('累购气量')">确定</button>
+            <button type="button" class="button_clear" @click='close'>取消</button>
+          </footer>
+        </modal>
+      </div>
+    </div>
+  </partial-view>
+</template>
+
+import { HttpResetClass } from 'vue-client'
+
+<script>
+  /* 用户档案相关信息组件 */
+import {HttpResetClass} from 'vue-client'
+
+export default {
+    ready () {
+      console.log('看看userinfo里面接收的data数据', this.data)
+    },
+    title: '客户基本信息',
+    data () {
+      return {
+        dafault: {
+          f_total_gas_all: 0,
+          f_total_fee_all: 0,
+          f_balance_amount: 0,
+          f_balance_gas: 0,
+          f_initial_base: 0,
+          f_meter_base: 0,
+          f_deduction_gas: 0,
+          f_total_gas: 0,
+          f_total_fee: 0,
+          f_card_id: '*****',
+          f_times: 0,
+          f_iot_times: 0,
+          f_meternumber: 0,
+          f_metertitles: '',
+          f_gasproperties: '****',
+          f_price_name: '****',
+          f_meter_brand: '****',
+          f_balance: 0,
+          f_user_type: '**',
+          f_remanent_gas: 0,
+          f_position: '****',
+          f_inputtor: '****',
+          f_jval: 0,
+          f_table_state: 0
+        },
+        f_arrears_fee: 0,
+        model: null,
+        showselectncuserfile: false,
+        showSelectUserFee: false,
+        showSelectUserWriteFee: false,
+        showSelectUserGas: false,
+        newmetertitles: '',
+        newMeterGas: 0,
+        newMeterFee: 0,
+        newMeterWriteFee: 0
+      }
+    },
+    props: ['data'],
+    methods: {
+      async getArrears () {
+        let http = new HttpResetClass()
+        let arrearsFee = 0
+        let res = await http.load('POST', 'api/af-revenue/logic/sale_getOwe', {
+          data: {
+            f_userinfo_id: this.data.f_userinfo_id
+          }
+        }, {resolveMsg: null, rejectMsg: '获取欠费出错！！'})
+        if (res.data.length > 0) {
+          const owes = res.data.flatMap(item => item.rows)
+          for (let i = 0; i < owes.length; i++) {
+            arrearsFee = arrearsFee + owes[i].f_oughtfee
+          }
+        }
+        this.list = res.data
+        if (this.data.f_meter_type == '物联网表') {
+          this.f_arrears_fee = (this.data.f_balance_amount - arrearsFee) > 0 ? 0 : 0 - (this.data.f_balance_amount - arrearsFee)
+        } else if (this.data.f_meter_type == '机表') {
+          this.f_arrears_fee = (this.data.f_balance - arrearsFee) > 0 ? 0 : 0 - (this.data.f_balance - arrearsFee)
+        } else {
+          this.f_arrears_fee = (this.data.f_balance - arrearsFee) > 0 ? 0 : 0 - this.data.f_balance
+        }
+        this.f_arrears_fee = parseFloat(this.f_arrears_fee.toFixed(2))
+      },
+      dealmsg (val) {
+        this.$dispatch('deal-msg', val)
+      },
+      changemetertitles () {
+        // 修正表封号
+        this.showselectncuserfile = true
+        this.newmetertitles = 0
+      },
+      changeMeterGas () {
+        // 修改累购气量
+        this.showSelectUserGas = true
+      },
+      changeMeterFee () {
+        // 修改累购金额
+        this.showSelectUserFee = true
+      },
+      changeMeterWriteFee () {
+        // 修改累购写卡金额
+        this.showSelectUserWriteFee = true
+      },
+      async modifyUserFile (type) {
+        let param = {
+          f_userinfo_id: this.data.f_userinfo_id,
+          f_user_id: this.data.f_user_id,
+          f_userfiles_id: this.data.f_userfiles_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
+        }
+        if (type === '表封号') {
+          param.new_metertitles = this.newmetertitles
+        } else if (type === '累购气量') {
+          param.new_metergas = this.newMeterGas
+        } else if (type === '累购金额') {
+          param.new_meterfee = this.newMeterFee
+        } else if (type === '累购写卡金额') {
+          param.new_meterwritefee = this.newMeterWriteFee
+        }
+        await this.$resetpost('/api/af-revenue/logic/changeuserfilesmetertitles', {data: param}, {resolveMsg: '修正成功', rejectMsg: null})
+        this.data.f_metertitles = this.newmetertitles
+        if (type === '表封号') {
+          this.data.f_metertitles = this.newmetertitles
+        } else if (type === '累购气量') {
+          this.data.f_total_gas = this.newMeterGas
+        } else if (type === '累购金额') {
+          this.data.f_total_fee = this.newMeterFee
+        } else if (type === '累购写卡金额') {
+          this.data.f_write_totalfee = this.newMeterWriteFee
+        }
+        this.$parent.$parent.close()
+        this.$parent.$parent.clean()
+        this.$parent.$parent.$refs.list.searchNoData()
+        this.close()
+      },
+      close () {
+        this.showselectncuserfile = false
+        this.showSelectUserGas = false
+        this.showSelectUserFee = false
+        this.newmetertitles = 0
+        this.newMeterGas = 0
+        this.newMeterFee = 0
+        this.newMeterWriteFee = 0
+      }
+    },
+    watch: {
+      'data' (val) {
+        console.log('val========', val)
+        if (val) {
+          this.getArrears()
+        }
+      }
+    }
+  }
+</script>
+<style lang="less">
+  .row {
+    /*border-bottom:1px solid #F2F6FA;*/
+    margin-left: 0;
+    margin-right: 0;
+  }
+  .click-change:hover {
+    color: #3592ef;
+    cursor: pointer;
+  }
+  // . {
+  //   height: 23px;
+  //   border-right: 1px solid #F2F6FA;
+  //   margin-bottom: 0;
+  //   text-align: left;
+  // }
+  // #address {
+  //   border-left: 1px solid #F2F6FA;
+  // }
+  // #user-info {
+  //   padding:6px;
+  //   span {
+  //     padding-left: 5px;
+  //   }
+  // }
+  // #address1 {
+  //   border-right: 0;
+  // }
+</style>

package/src/filiale/jiaxian/sale.js

@@ -16,4 +16,5 @@ export default function () {
   Vue.component('automatic-purse', (resolve) => { require(['./AutomaticPurse'], resolve) })
   Vue.component('charge-manage', (resolve) => { require(['./ChargeManage'], resolve) })
   Vue.component('device-message', (resolve) => { require(['./deviceMessage'], resolve) })
+  Vue.component('user-meterinfodetail', (resolve) => { require(['./meterinfodetail'], resolve) })
 }

package/src/filiale/yuncheng/ChangeMeter.vue

@@ -252,6 +252,10 @@
                       close-on-select
                       v-model='model.f_newaroundmeter'></v-select>
           </div>
+          <div class="col-sm-4 form-group" :class="[$v.f_defendcard_two.required ? 'has-error' : '']">
+            <label  class="font_normal_body">防盗卡号2</label>
+            <input type="text"  v-model="model.f_defendcard_two" v-validate:f_defendcard_two='{required: true }'>
+          </div>
         </div>
         <div class="row auto">
           <div class="col-sm-4 form-group">