sale-client 3.5.197 → 3.5.199

package/package.json

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

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

@@ -100,8 +100,13 @@
               <label for="f_collection" class=" font_normal_body">*收&emsp;&emsp;款</label>
               <input id="f_collection" class="input_search" style="width:60%" type="number" v-model="model.f_collection"
                      v-validate:f_collection='{required: true, dctest: [(model.f_totalcost - 0), ">=" ] }'
+                     v-if="config.calculatePreByCollection"
                      @blur="config.calculatePreByCollection && calculatePreByCollection()"
                      v-el:fcollection @keyup.enter="checkInvoiceMsg((!$v.valid || validateOk || !islegal || clickConfirm))" v-scale="[model.f_totalcost, 4]" :disabled="$refs.givechange.promptText != ''">
+              <input id="f_collection" class="input_search" style="width:60%" type="number" v-model="model.f_collection"
+                     v-validate:f_collection='{required: true, dctest: [(model.f_totalcost - 0), ">=" ] }'
+                     v-if="!config.calculatePreByCollection"
+                     v-el:fcollection @keyup.enter="checkInvoiceMsg((!$v.valid || validateOk || !islegal || clickConfirm))" v-scale="[model.f_totalcost, 4]" :disabled="$refs.givechange.promptText != ''">
             </div>
             <div class="col-sm-3" v-if="row.f_collection_type === '按气量' && model.f_payment=='赠气' && row.f_meter_type.includes('卡表')"
                  :class="[$v.f_collection.required  || $v.f_collection.dctest ? 'has-error' : 'has-success']">

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

@@ -88,7 +88,12 @@
                  :class="[$v.f_collection.required || $v.f_collection.dctest ? 'has-error' : 'has-success']">
               <label for="f_collection" class=" font_normal_body">*收&emsp;&emsp;款</label>
               <input class="input_search" style="width:60%" type="number" v-model="model.f_collection"
-                     @blur="config.calculatePreByCollection && calculatePreByCollection()"
+                     @blur="calculatePreByCollection()"
+                     v-if="config.calculatePreByCollection"
+                     v-validate:f_collection='{required: true, dctest: [(model.f_totalcost - 0) + (openFee - 0), ">=" ] }'
+                     v-el:sk v-scale="[model.f_collection, 4]" :disabled="$refs.givechange.promptText != ''">
+              <input class="input_search" style="width:60%" type="number" v-model="model.f_collection"
+                     v-if="!config.calculatePreByCollection"
                      v-validate:f_collection='{required: true, dctest: [(model.f_totalcost - 0) + (openFee - 0), ">=" ] }'
                      v-el:sk v-scale="[model.f_collection, 4]" :disabled="$refs.givechange.promptText != ''">
             </div>

package/src/filiale/xiangyun/sale.js

@@ -1,20 +1,20 @@
-// 分公司特殊组件页面注册
-import Vue from "vue";
-
-let specialComp = {
-  // 阶梯气价
-  'stair-price': (resolve) => { require(['./StairPrice'], resolve) },
-  // 气价管理（新增）
-  'gas-price': (resolve) => { require(['./GasPrice'], resolve) },
-  // 退费管理
-  'refund-manage': (resolve) => { require(['./RefundManage'], resolve) },
-  // 卡表退费查询
-  'card-charge-query': (resolve) => { require(['./cardChargeQuery'], resolve) },
-  // 卡表收费查询（应收）
-  'card-charge-query1': (resolve) => { require(['./cardChargeQuery1'], resolve) },
-  // 机表物联网退费查询
-  'machine-charge-query': (resolve) => { require(['./machineChargeQuery'], resolve) },
-  // 机表物联网表结算查询（应收）
-  'machine-charge-query1': (resolve) => { require(['./machineChargeQuery1'], resolve) },
-}
-exports.specialComp = specialComp
+// 分公司特殊组件页面注册
+import Vue from "vue";
+
+let specialComp = {
+  // 阶梯气价
+  'stair-price': (resolve) => { require(['./StairPrice'], resolve) },
+  // 气价管理（新增）
+  'gas-price': (resolve) => { require(['./GasPrice'], resolve) },
+  // 退费管理
+  'refund-manage': (resolve) => { require(['./RefundManage'], resolve) },
+  // 卡表退费查询
+  'card-charge-query': (resolve) => { require(['./cardChargeQuery'], resolve) },
+  // 卡表收费查询（应收）
+  'card-charge-query1': (resolve) => { require(['./cardChargeQuery1'], resolve) },
+  // 机表物联网退费查询
+  'machine-charge-query': (resolve) => { require(['./machineChargeQuery'], resolve) },
+  // 机表物联网表结算查询（应收）
+  'machine-charge-query1': (resolve) => { require(['./machineChargeQuery1'], resolve) },
+}
+exports.specialComp = specialComp