sale-client 3.6.409 → 3.6.411

package/package.json

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

package/src/components/charge/business/CardChangeFill.vue

@@ -40,9 +40,11 @@
                      v-next-el='sk' :disabled="row.f_collection_type !== '按气量'">
             </div>
 
-            <div class="col-sm-4 form-group">
+            <div class="col-sm-4 form-group"
+                 :class="[$v.f_preamount.required || $v.f_preamount.dctest? 'has-error' : 'has-success']">
               <label for="f_preamount" class=" font_normal_body">预购金额</label>
               <input class="input_search" style="width:60%" type="number" v-model="model.f_preamount"
+                     v-validate:f_preamount='{dctest: [maxmoney, "<=" ]}'
                      v-scale="[model.f_preamount, 4]" placeholder="预购金额" disabled>
             </div>
           </div>
@@ -77,10 +79,15 @@
                      v-validate:f_totalcost='{required: true, dctest: [(openFee - 0), ">=" ] }' placeholder="应收金额"
                      v-next-el='sk' v-scale="[model.f_totalcost, 4]" :disabled="row.f_collection_type !== '按金额'">
             </div>
-            <div class="col-sm-4 form-group" v-if="hasLimit">
+            <div class="col-sm-4 form-group" v-if="hasLimit&&limitgas">
               <label class="font_normal_body">购气上限</label>
               <input class="input_search" style="width:60%" style="width:60%" type="number" v-model="maxgas"
-                     v-scale="[maxgas, 4]" placeholder='限购余气' disabled>
+                     v-scale="[maxgas, 2]" placeholder='限购余气' disabled>
+            </div>
+            <div class="col-sm-4 form-group" v-if="hasLimit&&limitmoney">
+              <label class="font_normal_body">金额上限</label>
+              <input class="input_search" style="width:60%" style="width:60%" type="number" v-model="maxmoney"
+                     v-scale="[maxmoney, 2]" placeholder='限购金额' disabled>
             </div>
             <!--<div class="col-sm-4 form-group" v-if="!hasLimit">-->
             <!--</div>-->
@@ -330,11 +337,20 @@
     console.log('获取限购值', getLimit)
     self.hasLimit = getLimit.data.hasLimit
     if (self.hasLimit) {
-      if (getLimit.data.f_limit_value < 0) {
-        self.$showAlert(`${getLimit.data.msg}`, 'warning', 3000)
-        self.$dispatch('refresh')
-      } else {
-        self.maxgas = getLimit.data.f_limit_value
+      if (getLimit.data.f_limit_value || getLimit.data.f_limit_amount) {
+        if (getLimit.data.f_limit_value < 0 || getLimit.data.f_limit_amount < 0) {
+          self.$showAlert(`${getLimit.data.msg}`, 'warning', 3000)
+          self.$dispatch('refresh')
+        } else {
+          if (getLimit.data.f_limit_value) {
+            self.maxgas = (getLimit.data.f_limit_value - 0)
+            self.limitgas = true
+          }
+          if (getLimit.data.f_limit_amount) {
+            self.maxmoney = (getLimit.data.f_limit_amount - 0)
+            self.limitmoney = true
+          }
+        }
       }
     }
   }
@@ -392,6 +408,9 @@
         validateOk: false,
 
         maxgas: 99999999,
+        maxmoney: 99999999,
+        limitmoney: false,
+        limitgas: false,
 
         clickConfirm: false,
 
@@ -416,7 +435,7 @@
       let getResult = this.$CommonService.calRemanentMoney(this.row)
       if (this.row.f_collection_type === '按气量') {
         if (getResult > 0) {
-          this.model.f_pregas = this.model.f_fill_gas = getResult
+          this.model.f_pregas = this.model.f_fill_gas = getResult - 0
           this.model.f_preamount = 0
         } else {
           this.model.f_pregas = ''

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

@@ -550,6 +550,9 @@ let meterBookGen = function* (self) {
     let result = yield http.load('GET', `rs/vue/MeterinfoTest.json`, {}, {resolveMsg: null, rejectMsg: null})
     Object.assign(self.config, result.data)
     if (!self.row.f_open_way) self.row.f_open_way = self.config.open_way
+    if (!self.row.f_usetype || self.row.f_usetype.length === 0) {
+      self.row.f_usetype = self.config.f_usetype
+    }
   } catch (error) {
     // 忽略704,文件找不到异常
     if (error.status !== 704) {
@@ -598,6 +601,7 @@ export default {
         stuckFlowmeterShow: false,
         overduesetShow: true,
         f_install_date: true,
+        f_usetype: '',
         open_way: '指令开户'
       },
       mapShow: false,

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +0,0 @@
-#Tue Oct 22 19:40:41 CST 2024
-gradle.version=5.2.1