From c4de100f95b987d8d5b12bc16b66446068f79b47 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Tue, 19 Nov 2024 16:21:51 +0800
Subject: [PATCH] md

---
 .../panel/BigBatchEditForm.vue                | 73 ++++++++-----------
 1 file changed, 29 insertions(+), 44 deletions(-)

diff --git a/src/views/emis/emisTmsSiteBatch/panel/BigBatchEditForm.vue b/src/views/emis/emisTmsSiteBatch/panel/BigBatchEditForm.vue
index 704a39b3..70452390 100644
--- a/src/views/emis/emisTmsSiteBatch/panel/BigBatchEditForm.vue
+++ b/src/views/emis/emisTmsSiteBatch/panel/BigBatchEditForm.vue
@@ -11,10 +11,7 @@
             </el-col> -->
               <el-col :span="16">
                 <el-form-item :label="$t('批次名称')" prop="batchName">
-                  <span slot="label">
-                    <span style="color: red">{{ $t('批次名称') }}</span>
-                  </span>
-                  <el-input v-model="coData.batchName" clearable="" placeholder="" key="test"></el-input>
+                  <el-input v-model="coData.batchName" clearable="" placeholder=""></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
@@ -27,33 +24,33 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item :label="$t('目的国家')" prop="destCountry">
-                  <span slot="label">
-                    <span style="color: red">{{ $t('目的国家') }}</span>
-                  </span>
                   <CountryPicker :placeholder="$t('选择国家')" v-model="coData.destCountry" ></CountryPicker>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item :label="$t('起始网点')" prop="startSiteCode">
-                  <span slot="label">
-                    <span style="color: red">{{ $t('起始网点') }}</span>
-                  </span>
                   <EmisSiteSimplePicker :placeholder="$t('请选择')" @change="onSiteSelect"  v-model="coData.startSiteCode" :disabled="$store.getters.ownerSiteCode != '88888'" ></EmisSiteSimplePicker>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item :label="$t('下一网点')" prop="nextSiteCode">
-                  <span slot="label">
-                    <span style="color: red">{{ $t('下一网点') }}</span>
-                  </span>
                   <EmisSiteSimplePicker :placeholder="$t('请选择')"  @change="onNextSiteSelect"  v-model="coData.nextSiteCode"  ></EmisSiteSimplePicker>
                 </el-form-item>
               </el-col>
+              <el-col :span="8">
+                <el-form-item :label="$t('承运重量')" prop="transWeight">
+                  <el-input v-model="coData.transWeight" clearable="" placeholder="" >
+                    <span slot="suffix">(kg)</span>
+                  </el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item :label="$t('包裹数')" prop="packNum">
+                  <el-input v-model="coData.packNum" clearable="" placeholder="" ></el-input>
+                </el-form-item>
+              </el-col>
               <el-col :span="8">
                 <el-form-item label="运输方式" prop="transType">
-                  <span slot="label">
-                    <span style="color: red">{{ $t('运输方式') }}</span>
-                  </span>
                   <el-select v-model="coData.transType" placeholder="运输方式" clearable filterable >
                     <el-option
                       v-for="dict in dict.type.emis_biz_shipping_method"
@@ -66,17 +63,11 @@
               </el-col>
               <el-col :span="8" v-if="coData.transType == 2">
                 <el-form-item :label="$t('航空单号')" prop="airBilllNo">
-                  <span slot="label">
-                    <span style="color: red">{{ $t('航空单号') }}</span>
-                  </span>
                   <el-input v-model="coData.airBilllNo" />
                 </el-form-item>
               </el-col>
               <el-col :span="8" v-if="coData.transType == 2">
                 <el-form-item label="起飞时间" prop="airTime">
-                  <span slot="label">
-                    <span style="color: red">{{ $t('起飞时间') }}</span>
-                  </span>
                   <el-date-picker clearable
                     v-model="coData.airTime"
                     type="date"
@@ -87,17 +78,11 @@
               </el-col>
               <el-col :span="8" v-if="coData.transType == 4">
                 <el-form-item :label="$t('船次号')" prop="shipNo">
-                  <span slot="label">
-                    <span style="color: red">{{ $t('船次号') }}</span>
-                  </span>
                   <el-input v-model="coData.shipNo" />
                 </el-form-item>
               </el-col>
               <el-col :span="8" v-if="coData.transType == 4">
                 <el-form-item label="开船时间" prop="shipTime">
-                  <span slot="label">
-                    <span style="color: red">{{ $t('开船时间') }}</span>
-                  </span>
                   <el-date-picker clearable
                     v-model="coData.shipTime"
                     type="date"
@@ -108,17 +93,11 @@
               </el-col>
               <el-col :span="8" v-if="['1','3','5'].indexOf(coData.transType) > -1">
                 <el-form-item :label="$t('车牌号')" prop="carNo">
-                  <span slot="label">
-                    <span style="color: red">{{ $t('车牌号') }}</span>
-                  </span>
                   <el-input v-model="coData.carNo" clearable="" placeholder=""></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8"  v-if="['1','3','5'].indexOf(coData.transType) > -1">
                 <el-form-item label="发车时间" prop="carTime">
-                  <span slot="label">
-                    <span style="color: red">{{ $t('发车时间') }}</span>
-                  </span>
                   <el-date-picker clearable
                     v-model="coData.carTime"
                     type="date"
@@ -155,7 +134,7 @@
             </el-row>
           </el-col>
 
-          <el-col :span="24" style="" >
+          <el-col :span="24" style="" v-if="['3','4','5'].indexOf(coData.transType) > -1">
             <div style="margin-top:20px;padding: 3px 5px;font-size: 14px;">
               装柜示意图
             </div>
@@ -270,7 +249,10 @@
             <span>{{ parseTime(scope.row.estimateDate || '') }}</span>
           </template>
         </el-table-column>
-        <el-table-column :label="$t('件数')" align="center" prop="parcelQty" min-width="100" />
+        <el-table-column :label="$t('承运重量')" align="center" prop="transWeight" min-width="100" />
+        <el-table-column :label="$t('包裹数')" align="center" prop="packNum" min-width="100" />
+
+        <el-table-column :label="$t('总票数')" align="center" prop="parcelQty" min-width="100" />
         <el-table-column :label="$t('实际重量')" align="center" prop="billWeight" min-width="100" />
         <!-- <el-table-column :label="$t('总重量')" align="center" prop="totalWeight" min-width="100" /> -->
         <el-table-column :label="$t('总体积')" align="center" prop="totalVolume" min-width="100" />
@@ -601,6 +583,12 @@ export default {
         carTime: [
           { required: true, message: "发车时间不能为空", trigger: ["blur","change"] },
         ],
+        transWeight: [
+          { required: true, message: "承运重量不能为空", trigger: ["blur","change"] },
+        ],
+        packNum: [
+          { required: true, message: "包裹数量不能为空", trigger: ["blur","change"] },
+        ],
 
 
       },
@@ -739,20 +727,24 @@ export default {
         batchNo: null,
         batchName: null,
         batchDate: null,
+        transLineType: null,
+        productType: null,
         batchType: null,
         transType: null,
         startSiteCode: null,
+        sendCountry: null,
         nextSiteCode: null,
         airBilllNo: null,
         etd: null,
         eta: null,
-        packNum: null,
         carNo: null,
         shipNo: null,
         clearanceResStatus: null,
         declareResStatus: null,
         destCountry: null,
         destCountryName: null,
+        transWeight: null,
+        packNum: null,
         totalParcelQty: null,
         totalWaybillQty: null,
         totalVolume: null,
@@ -760,13 +752,6 @@ export default {
         opMan: null,
         remark: null,
         tenantId: null,
-        delFlag: null,
-        createBy: null,
-        createTime: null,
-        updateBy: null,
-        updateTime: null,
-        createSite: null,
-        updateSite: null
       };
       this.resetForm("formCo");
     },