sale-client 4.3.59 → 4.3.61

package/CHANGELOG.md

@@ -1,6 +1,11 @@
 # Change Log
 所有关于本产品的变化都在该文档里。
 
+## **🚀 V4.3.60 -2026-05-26 `@张科科`**
+### `🌟` 功能调整
+---洪雅 综合收费界面  增加合同编号的查询条件
+
+
 ## **🚀 V4.3.56 -2026-05-18 `@张科科`**
 ### `🌟` 功能调整
 ---金煌 物联网表收费  物联收费未开户提示是否开启 这个不要 改成单值表配置控制的

package/build/dev-server.js

@@ -1,7 +1,7 @@
 var path = require('path')
 var checkVersion = require('./versionCheck.js')
 checkVersion()
-const [ serverRul, localUrl ] = ['http://36.134.191.191:31467/', 'http://36.134.191.191:31467/']
+const [ serverRul, localUrl ] = ['http://192.168.50.67:31567/', 'http://192.168.50.67:31567/']
 var merge = require('webpack-merge')
 var baseConfig = require('./webpack.dev.conf')
 var devConfig = {

package/package.json

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

package/src/filiale/beifangshiye/AddGasModelInfo.vue

@@ -0,0 +1,133 @@
+<template>
+  <!--在该页面添加参数管理按钮-->
+  <div class="flex-row auto" style="margin-top:10px;height: auto" >
+    <validator name='m' @valid="mValid(true)"  @invalid="mValid(false)">
+      <form class="form-horizontal" style="flex: 1;">
+        <div class="row auto">
+          <div class="col-sm-4 form-group" :class="[$m.f_meter_style.required ? 'has-error' : 'has-success']">
+            <label for="f_meter_style"  class="font_normal_body">气表型号</label>
+            <input type="text" class="input_search" style="width: 60%" v-model="row.f_meter_style" placeholder='气表型号' v-validate:f_meter_style='{required: true }' >
+          </div>
+          <div class="col-sm-4 form-group">
+            <label for="f_topup_ceil" class="font_normal_body ">充值上限</label>
+            <input class="input_search" style="width: 60%" type="number" v-model="row.f_topup_ceil"  >
+          </div>
+          <div class="col-sm-4 form-group">
+            <label for="f_police_gas" class="font_normal_body">报警气量</label>
+            <input class="input_search" style="width: 60%" type="number" v-model="row.f_police_gas"  >
+          </div>
+          <div class="col-sm-4 form-group">
+            <label for="f_overdr_lines" class="font_normal_body">透支额度</label>
+            <input class="input_search" style="width: 60%" type="number" v-model="row.f_overdr_lines"  >
+          </div>
+          <div class="col-sm-4 form-group">
+            <label  class="font_normal_body ">最大量程</label>
+            <input class="input_search" placeholder="最大量程" style="width:60%" type="number" v-model="row.f_capacity">
+          </div>
+          <div class="col-sm-4 form-group" :class="[$m.mtype.required ? 'has-error' : '']">
+            <label for="f_meter_style"  class="font_normal_body">表类型&emsp;</label>
+            <input type="text" class="input_search" v-show="false" v-model="$refs.mtype.selectedItems" v-validate:mtype='{required: true }'>
+            <v-select :value.sync="row.type"
+                      :options='metertitles'
+                      placeholder='表类型'
+                      v-model="row.type"
+                      close-on-select  v-ref:mtype>
+            </v-select>
+          </div>
+          <div class="col-sm-4 form-group">
+            <label for="f_coding"  class="font_normal_body">卡类型&emsp;</label>
+            <input type="text" class="input_search"  style="width: 60%" v-model="row.f_coding" placeholder='卡类型' >
+          </div>
+          <div class="col-sm-4 form-group">
+            <label for="f_meter_style"  class="font_normal_body">气表协议</label>
+            <input type="text" class="input_search" style="width: 60%" v-model="row.f_size_card" placeholder='气表协议'>
+          </div>
+        </div>
+      </form>
+    </validator>
+    <div style="width: 60px;">
+      <img :src="imgdelete" alt="图片加载失败" style="padding-top: 10px;height: 40px;;cursor: pointer;" @click="deleteMeter()" v-if="!row.model_used">
+      <!--<button type="button" class="btn btn-primary" v-if="row.id && !row.f_param_list" @click='gasParamter(row)'>添加参数</button>-->
+      <!--<button type="button" class="btn btn-primary" v-if="row.id && row.f_param_list" @click='gasParamter(row)'>修改参数</button>-->
+    </div>
+  </div>
+  <modal :show.sync="showParame"  v-ref:modal backdrop="false" >
+    <header slot="modal-header" class="modal-header">
+      <button type="button" class="close" @click="cancel"><span>&times;</span></button>
+      <h3 class="modal-title" style="text-align: center;">添加参数</h3>
+    </header>
+    <article slot="modal-body" class="modal-body">
+      <add-json-parameter v-ref:addparamlist :gasmodel_id="gasmodel_id" :gastype="gastype"></add-json-parameter>
+    </article>
+    <footer slot="modal-footer" class="modal-footer">
+      <button type="button" class="btn btn-primary"  @click='confirm()'>确认</button>
+    </footer>
+  </modal>
+</template>
+
+<script>
+import Vue from 'vue'
+import { HttpResetClass } from 'vue-client'
+
+export default {
+  title: '气表型号管理',
+  data () {
+    return {
+      addGasModelArr: [],
+      imgsrc: '/images/mainicon/biaopan.png',
+      imgdelete: '/images/mainicon/deletedevice.png',
+      f_meter_type: '',
+      show: false,
+      showParame: false,
+      selectGas: null, // 选中的表类型
+      gasmodel_id: '',
+      gastype: 'gasmodel',
+      metertitles: this.$appdata.getParam('表类型'),
+      isSetInitBase: [{label: '是', value: '是'}, {label: '否', value: '否'}]
+
+    }
+  },
+  props: ['row', 'index', 'meterType'],
+  ready () {
+    this.isIOT(this.meterType)
+  },
+  watch: {
+    'meterType' (val) {
+      this.isIOT(val)
+    },
+    'row' (val) {
+      console.log(val, '=================row')
+    }
+  },
+  methods: {
+    async confirm () {
+      if (this.$refs.addparamlist.confirm()) {
+        var paramlist = this.$refs.addparamlist.addGasParameter
+        await this.$resetpost('api/af-revenue/logic/updateGasParam', {data: {id: this.selectGas.id, paramlist: paramlist, gastype: 'gasmodel'}}, {resolveMsg: '更新成功', rejectMsg: '更新失败'})
+        this.showParame = false
+      }
+    },
+    gasParamter (val) {
+      this.selectGas = val
+      this.gasmodel_id = val.id
+      this.showParame = true
+    },
+    cancel () {
+      this.gasmodel_id = ''
+      this.showParame = false
+    },
+    deleteMeter () {
+      console.log('删除气表型号', this.index)
+      this.$dispatch('delete-meter', this.index)
+    },
+    mValid (bool) {
+      this.row.valid = bool
+      this.$dispatch('self-valid', bool)
+    },
+    isIOT (val) {
+      this.f_meter_type = val
+      this.show = val === '物联网表'
+    }
+  }
+}
+</script>

package/src/filiale/beifangshiye/sale.js

@@ -26,4 +26,6 @@ export default function () {
   Vue.component('high-meter', (resolve) => { require(['../../components/UserFiles/HighMeterCard.vue'], resolve) })
   // 用户基本信息test
   Vue.component('file-user-essential-info', (resolve) => { require(['./FilesManage/UserEssentialInfoTest'], resolve) })
+  // 添加或修改气表型号组件
+  Vue.component('add-gas-model-info', (resolve) => { require(['./AddGasModelInfo'], resolve) })
 }

package/src/filiale/hongYa/components/charge/ChargeList.vue

@@ -132,7 +132,12 @@
                           condition="i.f_whether_zbf = '{}'"
                           close-on-select style="width: 60%"></v-select>
               </div>
-
+              <div class="form-group col-sm-3">
+                <label class="font_normal_body">合同编号</label>
+                <input type="text" class="input_search" style="width:60%"
+                       v-model="model.f_contract_id" placeholder='合同编号'
+                       condition="i.f_contract_id = '{}'">
+              </div>
             </div>
           </div>
           <div class="form-group col-sm-6" style="float:right;white-space: nowrap;width: auto">

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

package/.gradle/buildOutputCleanup/cache.properties

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