From 75078a0ccb2a109d0c23e6c1ad148209bad350a8 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Fri, 28 Jun 2024 15:48:03 +0800
Subject: [PATCH] md

---
 .../emis/customerService/traceRecordList.vue  |  2 +-
 src/views/emis/emisSite/emisSiteForm.vue      |  6 ++++++
 src/views/emis/emisWaybill/feeItemForm.vue    | 12 ++++++++----
 src/views/emis/emisWaybill/waybillRecord.vue  | 19 +++++++++++--------
 4 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/src/views/emis/customerService/traceRecordList.vue b/src/views/emis/customerService/traceRecordList.vue
index 3bef3034..70cae162 100644
--- a/src/views/emis/customerService/traceRecordList.vue
+++ b/src/views/emis/customerService/traceRecordList.vue
@@ -152,7 +152,7 @@ export default {
          }
          // 合包扫描
          else if(scanType=="200"){
-             content='快件在<span class="siteOrManHighlight" >['+scanRecord.scanSite+']</span>合包，合包号[<span class="siteOrManHighlight" >['+scanRecord.bagNo+']</span>下一站发往[<span class="siteOrManHighlight" >['+scanRecord.preOrNextStation+']</span>';
+             content='快件在<span class="siteOrManHighlight" >['+scanRecord.scanSite+']</span>已合包，下一站发往[<span class="siteOrManHighlight" >['+scanRecord.preOrNextStation+']</span>,合包号[<span class="siteOrManHighlight" >['+scanRecord.bagNo+']</span>,操作人:'+scanRecord.scanMan;
          }
           // 拆包扫描
          else if(scanType=="201"){
diff --git a/src/views/emis/emisSite/emisSiteForm.vue b/src/views/emis/emisSite/emisSiteForm.vue
index df2a719e..d8e52601 100644
--- a/src/views/emis/emisSite/emisSiteForm.vue
+++ b/src/views/emis/emisSite/emisSiteForm.vue
@@ -331,6 +331,12 @@ export default {
         // cutOffTime: [
         //   { required: true, message: "截单时间不能为空", trigger: "blur" }
         // ],
+        sizeCode2: [
+          { required: true, message: "二字码不能为空", trigger: "blur" }
+        ],
+        sizeCode3: [
+          { required: true, message: "三字码不能为空", trigger: "blur" }
+        ],
         superiorFinanceCenterCode: [
           { required: true, message: "财务中心不能为空", trigger: ["blur","change"] }
         ],
diff --git a/src/views/emis/emisWaybill/feeItemForm.vue b/src/views/emis/emisWaybill/feeItemForm.vue
index a22ea1a6..42bca11d 100644
--- a/src/views/emis/emisWaybill/feeItemForm.vue
+++ b/src/views/emis/emisWaybill/feeItemForm.vue
@@ -3,7 +3,7 @@
        <el-form ref="form" :model="form" size="mini" :rules="rules" label-width="60px">
          <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
           <el-col :span="24">
-            <el-form-item :label="$t('费用')" prop="realFee" >
+            <el-form-item :label="$t('费用')" prop="feeCode" >
               <el-select v-model="form.feeCode" placeholder="费用"
               style="width:100%"
               @change="feeChange"
@@ -20,17 +20,21 @@
           </el-col>
           <el-col :span="24">
             <el-form-item :label="$t('实收')" prop="realFee" >
-              <el-input v-model="form.realFee" placeholder="" />
+              <el-input-number v-model="form.realFee" :min="1.00" :controls="false" :precision="2"></el-input-number>
+              <!-- <el-input v-model="form.realFee" oninput="value=value.replace(/[^0-9.]/g,'')"  placeholder="" /> -->
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item :label="$t('首重费')" prop="initialWeightFee" >
-              <el-input v-model="form.initialWeightFee" placeholder="" />
+              <el-input-number v-model="form.initialWeightFee" :min="0.00" :controls="false" :precision="2"></el-input-number>
+
+              <!-- <el-input v-model="form.initialWeightFee" placeholder="" oninput="value=value.replace(/[^0-9.]/g,'')"/> -->
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item :label="$t('续重单价')" prop="addWeightPrice" >
-              <el-input v-model="form.addWeightPrice" placeholder="" />
+              <el-input-number v-model="form.addWeightPrice" :min="0.00" :controls="false" :precision="2"></el-input-number>
+              <!-- <el-input v-model="form.addWeightPrice" placeholder="" oninput="value=value.replace(/[^0-9.]/g,'')"/> -->
             </el-form-item>
           </el-col>
 
diff --git a/src/views/emis/emisWaybill/waybillRecord.vue b/src/views/emis/emisWaybill/waybillRecord.vue
index 3ee5b542..549d1787 100644
--- a/src/views/emis/emisWaybill/waybillRecord.vue
+++ b/src/views/emis/emisWaybill/waybillRecord.vue
@@ -25,7 +25,7 @@
                           <div>
                             <el-input v-model="form.billCode" placeholder="" @blur="onBillCodeChange" style="font-weight:600;color:black" />
                           </div>
-                          <div style="padding-left:5px"> <el-checkbox style="font-size:400;margin-right:10px;font-size:10px" @change="checked=>handleBillCodeChange(checked)"><span style="font-size:10px">{{ $t('电子主单') }}</span></el-checkbox></div>
+                          <div style="padding-left:5px"> <el-checkbox v-model="form.blSelfBillCode" style="font-size:400;margin-right:10px;font-size:10px" @change="checked=>handleBillCodeChange(checked)" :true-label="'1'" :false-label="'0'"><span style="font-size:10px">{{ $t('电子主单') }}</span></el-checkbox></div>
                       </div>
                     </el-form-item>
                 </el-col>
@@ -1142,12 +1142,12 @@ methods: {
           orderList.push(this.form.billCode);
 
            // 客户联
-           let customerItem ={
-              "tplCode":"TAN-CM-130",
-              "printerName":this.$refs.tanexPrinter.getDefaultPrinter(),
-              "orderList":orderList.toString()
-            }
-            printDataList.push(customerItem);
+          //  let customerItem ={
+          //     "tplCode":"TAN-CM-130",
+          //     "printerName":this.$refs.tanexPrinter.getDefaultPrinter(),
+          //     "orderList":orderList.toString()
+          //   }
+          //   printDataList.push(customerItem);
 
             // 主单
             let mainBillItem ={
@@ -1471,6 +1471,7 @@ methods: {
       blSensitive:null,
       lockFlag:null,
       lockReason:null,
+      blSelfBillCode:null,
   };
     this.resetForm("form");
   },
@@ -1991,7 +1992,9 @@ methods: {
   },
   // 实时获取运单号
   handleBillCodeChange(checked,item){
-    if(checked){
+    // console.log("=handleBillCodeChange==>",checked);
+
+    if(checked==1){
       let useSiteCode=this.form.sendSiteCode;
       realMatchWaybill(useSiteCode).then(response => {
           this.form.billCode=response.data;