sale-client 4.2.56 → 4.2.58

package/package.json

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

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: [0, ">=" ]}'  v-scale = "[data.f_collection, 2]"
+                   v-validate:f_collection='{required: true, dctest: [data.f_totalcost, ">=" ]}'  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: [0, ">=" ]}'  v-scale = "[data.f_collection, 2]"
+                   v-validate:f_collection='{required: true, dctest: [data.f_totalcost, ">=" ]}'  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">
@@ -151,36 +151,6 @@
         <button class="button_clear btn-gn" @click="clean()">取消</button>
       </div>
     </validator>
-    <!--<modal :show.sync="showOverdueModal" v-ref:modal backdrop="false">-->
-    <!--<header slot="modal-header" class="modal-header">-->
-    <!--<button type="button" class="close" @click="closeOverdue"><span>&times;</span></button>-->
-    <!--<h4 class="modal-title">修改违约金</h4>-->
-    <!--</header>-->
-    <!--<article slot="modal-body" class="modal-body">-->
-    <!--<validator name='m'>-->
-    <!--<form class="form-horizontal">-->
-    <!--<div class="row">-->
-    <!--<div class="col-sm-6">-->
-    <!--<label for="oldOverdue" class="font_normal_body">原违约金</label>-->
-    <!--<input type="text" class="input_search" style="width:60%" v-once v-model="overdueModal.f_old_overdue" disabled>-->
-    <!--</div>-->
-    <!--</div>-->
-    <!--<div class="row">-->
-    <!--<div class="col-sm-6" :class="[$m.f_new_overdue.required ? 'has-error select-error' : '']">-->
-    <!--<label for="newOverdue" class="font_normal_body">新违约金</label>-->
-    <!--<input type="text" class="input_search" style="width:60%" v-model="overdueModal.f_new_overdue"-->
-    <!--v-validate:f_new_overdue='{required: true}'>-->
-    <!--</div>-->
-    <!--</div>-->
-    <!--</form>-->
-    <!--</validator>-->
-    <!--</article>-->
-
-    <!--<footer slot="modal-footer" class="modal-footer">-->
-    <!--<button type="button" class="button_search" :disabled='!$m.valid' @click='confirmOverdue()'>确认</button>-->
-    <!--<button type="button" class="button_clear" @click='closeOverdue'>取消</button>-->
-    <!--</footer>-->
-    <!--</modal>-->
     <payment-code v-ref:paymentcode :payment="data.f_payment" :row="row" :money="data.f_after_discount"></payment-code>
   </div>
   <upload :blodid="row.f_userinfo_id" v-if="config.showupload" :businessid="randomBusinessId" isremark="true" fusetype="机表收费"></upload>

package/src/plugins/CardService.js

@@ -1819,7 +1819,12 @@ let sellgasGen = async function (model, row) {
       }
       // 将回写表号或者用户号
       model.f_meterid = row.cardInfo.Yhh ? row.cardInfo.Yhh : row.f_meterid
-
+      if (row.f_alias === 'TaiYuan_JE') {
+        model.f_total_fee = (row.cardInfo.TotalMoney - 0) + (model.f_write_money - 0)
+        model.f_write_totalfee = (row.cardInfo.TotalMoney - 0) + (model.f_write_money - 0)
+        row.f_write_totalfee = (row.cardInfo.TotalMoney - 0)
+        row.f_total_fee = (row.cardInfo.TotalMoney - 0)
+      }
       let cardid = row.f_card_id
       if (row.f_tag) {
         // 截取用户编号后四位