sale-client 4.2.59 → 4.2.61

package/.gradle/buildOutputCleanup/cache.properties

@@ -0,0 +1,2 @@
+#Fri Sep 26 18:11:39 CST 2025
+gradle.version=5.2.1

package/package.json

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

package/src/filiale/fugou/components/revenue/comprehen/ComprehenOperation/newchangemeter/ChangeMeter.vue

@@ -677,8 +677,9 @@ export default {
         console.log('1239999998', change)
         let hasUnhand = change && change.data && change.data.unhand && change.data.unhand.length > 0
         let hasOwe = change && change.data && change.data.owe && change.data.owe.length > 0
-        if (hasUnhand || hasOwe) {
-          let r = await this.$showMessage('存在相关异常/欠费记录，是否继续换表？', ['confirm', 'cancel'])
+        let hasCardUnread = change && change.data && change.data.cardunread && change.data.cardunread.length > 0
+        if (hasUnhand || hasOwe || hasCardUnread) {
+          let r = await this.$showMessage('存在抄表计划未执行，是否继续换表？', ['confirm', 'cancel'])
           if (r !== 'confirm') { return }
         }
       } catch (e) {

package/src/filiale/jinhong/CardMeterCenterInner.vue

@@ -17,7 +17,7 @@
             <div class="col-sm-4" v-if="row.f_collection_type == '按气量'"
                  :class="[$v.f_pregas.required || $v.f_pregas.dctest? 'has-error' : 'has-success']">
               <label for="f_pregas" class=" font_normal_body">*预购气量</label>
-              <input class="input_search" style="width:60%" type="number" :disabled="config.calculatePreByCollection"
+              <input class="input_search" style="width:60%" type="number"
                      @blur="pregas()" v-model="model.f_pregas" v-el:fpregas
                      v-validate:f_pregas='{required: true, dctest: [maxgas, "<=" ]}' placeholder="预购气量"
                      v-scale="[model.f_pregas, row.f_gas_decimal||4 ]"
@@ -28,14 +28,13 @@
               <input class="input_search" style="width:60%" type="number" v-el:fpregas
                      @keyup.enter="pregas('enter')"    @blur="pregas()" v-model="model.f_pregas" placeholder="预购气量"
                      v-scale="[model.f_pregas, row.f_gas_decimal||4 ]"
-                     v-next-el='fcollection' :disabled="config.calculatePreByCollection"/>
+                     v-next-el='fcollection' />
             </div>
             <div class="col-sm-4"
                  :class="[$v.f_preamount.required || $v.f_preamount.dctest || model.f_preamount === 0 ? 'has-error' : 'has-success']">
               <label for="f_pregas" class=" font_normal_body">*预购金额</label>
               <input class="input_search" style="width:60%" type="number"
                      @blur="preamount()" v-model="model.f_preamount"
-                     :disabled="config.calculatePreByCollection"
                      v-scale="[model.f_preamount, row.f_fee_decimal||4 ]"
                      v-validate:f_preamount='{required: true, dctest: [maxmoney, "<=" ]}' placeholder="预购金额">
             </div><!--

package/src/filiale/jinhong/MachineMeterCenter.vue

@@ -73,13 +73,13 @@
           <div  class="col-sm-3 form-group" v-if="config.hasfindaReail" :class="[$v.f_collection.required || $v.f_collection.dctest ? 'has-error select-error' : '']">
             <label for="f_collection" class="font_normal_body">燃气收款</label>
             <input id="f_collection" class="input_search" style="width:60%" type="number" v-model="data.f_collection"
-                   v-validate:f_collection='{required: true, dctest: [data.f_totalcost, ">=" ]}'  v-scale = "[data.f_collection, 2]"
+                   v-validate:f_collection='{required: true, dctest: [0, ">=" ]}'  v-scale = "[data.f_collection, 2]"
                    @mousewheel.native.prevent @keyup.enter="confirm()" :disabled="$refs.givechange.promptText != ''">
           </div>
           <div  class="col-sm-4 form-group" v-if="!config.hasfindaReail" :class="[$v.f_collection.required || $v.f_collection.dctest ? 'has-error select-error' : '']">
             <label for="f_collection" class="font_normal_body">燃气收款</label>
             <input id="f_collection" class="input_search" style="width:60%" type="number" v-model="data.f_collection"
-                   v-validate:f_collection='{required: true, dctest: [data.f_totalcost, ">=" ]}'  v-scale = "[data.f_collection, 2]"
+                   v-validate:f_collection='{required: true, dctest: [0, ">=" ]}'  v-scale = "[data.f_collection, 2]"
                    @mousewheel.native.prevent @keyup.enter="confirm()" :disabled="$refs.givechange.promptText != ''">
           </div>
           <div class="col-sm-1 form-group" v-if="config.hasfindaReail">

package/src/filiale/ruihua/FilesManage/MeterinfoTest.vue

@@ -22,18 +22,18 @@
                       v-model='row.gasmodel' :disabled="row.gasbrand.length === 0" v-ref:model></v-select>
           </div>
 
-          <div class="col-sm-4 form-group" v-if="isiot" :class="[$m.f_meternumber.required ? 'has-error' : '']">
+          <div class="col-sm-4 form-group"  :class="[$m.f_meternumber.required ? 'has-error' : '']">
             <label for="f_meternumber" class="font_normal_body">&ensp;表&emsp;&emsp;号</label>
             <input type="text" class="input_search" style="width:60%" v-model="row.f_meternumber"
                    @blur="meternumberValidate()" placeholder='表号' v-validate:f_meternumber='{required: true }'
-                   v-next-el="{id: 'metertitles'}" :disabled="meterNumberDisabled && meterChangeDisabled">
-          </div>
-          <div class="col-sm-4 form-group" v-else>
-            <label for="f_meternumber" class="font_normal_body">&ensp;表&emsp;&emsp;号</label>
-            <input type="text" class="input_search" style="width:60%" v-model="row.f_meternumber"
-                   @blur="meternumberValidate()" placeholder='表号'
-                   v-next-el="{id: 'metertitles'}">
+                   v-next-el="{id: 'metertitles'}" :disabled="isiot&&(meterNumberDisabled && meterChangeDisabled)">
           </div>
+<!--          <div class="col-sm-4 form-group" v-else>-->
+<!--            <label for="f_meternumber" class="font_normal_body">&ensp;表&emsp;&emsp;号</label>-->
+<!--            <input type="text" class="input_search" style="width:60%" v-model="row.f_meternumber"-->
+<!--                   @blur="meternumberValidate()" placeholder='表号'-->
+<!--                   v-next-el="{id: 'metertitles'}">-->
+<!--          </div>-->
           <div class="col-sm-4 form-group" :class="[$m.f_defendcard.required ? 'has-error' : '']"
                v-show="(formconfig && formconfig.f_defendcard && formconfig.f_defendcard.required) || !onlyshowmust"
                v-if="getConfigShowItem('f_defendcard',false)">

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/yuncheng/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'