wzh 3 лет назад
Родитель
Сommit
ea6a5a3b15
1 измененных файлов с 90 добавлено и 15 удалено
  1. 90 15
      src/views/voyage/voyageDetail.vue

+ 90 - 15
src/views/voyage/voyageDetail.vue

@@ -520,17 +520,17 @@
           </el-button>
         </div>
       </div>
-      <el-table :data="labTableData" stripe style="width: 1200px">
-        <el-table-column
+      <el-table :data="labTableData" stripe style="width: 90%">
+        <!-- <el-table-column
           type="index"
           label="序号"
           min-width="120"
           align="center"
-        ></el-table-column>
+        ></el-table-column> -->
         <el-table-column
-          prop="billingNum"
-          label="开单数量"
-          min-width="100"
+          prop="labNumber"
+          label="提货单编号"
+          min-width="120"
           align="center"
         ></el-table-column>
         <el-table-column
@@ -538,8 +538,72 @@
           label="开单日期"
           min-width="120"
           align="center"
+        >
+          <template v-slot="scope">
+            {{ subTimeStr(scope.row.billingDate, 10) }}
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="cargo"
+          label="产品名称"
+          min-width="100"
+          align="center"
         ></el-table-column>
-        <el-table-column label="单据" min-width="150" align="center">
+        <el-table-column
+          prop="carrier"
+          label="承运人"
+          min-width="120"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="sentPieces"
+          label="应发件数"
+          min-width="100"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="sentTons"
+          label="应发数量"
+          min-width="120"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="actualPieces"
+          label="实发件数"
+          min-width="100"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="actualTons"
+          label="实发数量"
+          min-width="120"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="pickUpShip"
+          label="提货船舶"
+          min-width="100"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="pickUpCompany"
+          label="提货单位"
+          min-width="120"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="sapNo"
+          label="SAP号"
+          min-width="120"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="salesman"
+          label="业务员"
+          min-width="120"
+          align="center"
+        ></el-table-column>
+        <el-table-column label="单据" align="center">
           <template v-slot="scope">
             <el-button
               @click="showLab(scope.row, scope.$index, '查看提单')"
@@ -550,16 +614,16 @@
             </el-button>
           </template>
         </el-table-column>
-        <el-table-column label="操作" min-width="150" align="center">
+        <el-table-column label="操作" align="center">
           <template v-slot="scope">
-            <el-button
+            <!-- <el-button
               v-auth="'LABUPDATE'"
               @click="showLab(scope.row, scope.$index, '修改提单')"
               type="primary"
               size="small"
             >
               修改
-            </el-button>
+            </el-button> -->
             <el-button
               v-auth="'LABDELETE'"
               @click="deleteLab(scope.row.id, scope.$index)"
@@ -593,7 +657,7 @@
           style="margin-bottom: 20px"
           label-width="100px"
         >
-          <el-form-item label="开单日期">
+          <!-- <el-form-item label="开单日期">
             <el-date-picker
               class="info-line-text"
               v-model="labForm.billingDate"
@@ -609,7 +673,7 @@
               v-model="labForm.billingNum"
               placeholder="开单数量"
             ></el-input>
-          </el-form-item>
+          </el-form-item> -->
           <el-form-item label="提单">
             <Uploader
               :actionUrl="store.state.wayBillUrl"
@@ -624,10 +688,18 @@
           </el-form-item>
         </el-form>
 
-        <template #footer v-if="labModalType != '查看提单'">
+        <template
+          #footer
+          v-if="labModalType != '查看提单' && labBillList.length"
+        >
           <el-button @click="cancelUploadLab">取消</el-button>
-          <el-button style="margin-left: 30px" type="primary" @click="addLab">
-            提交
+          <el-button
+            :loading="isLabLoading"
+            style="margin-left: 30px"
+            type="primary"
+            @click="addLab"
+          >
+            {{ isLabLoading ? "正在上传" : "提交" }}
           </el-button>
         </template>
       </el-dialog>
@@ -2532,6 +2604,7 @@ function cancelUploadLab() {
   currentLabId.value = -1;
 }
 let currentLabId = ref(-1);
+let isLabLoading = ref(false);
 async function addLab() {
   let postData = {
     portId: currentDiscPortId.value,
@@ -2569,6 +2642,7 @@ async function addLab() {
     delete labForm.value.file;
     delete labForm.value.fileId;
   }
+  isLabLoading.value = true;
   let res = await api[
     `${labModalType.value == "新增记录" ? "addLab" : "updateLab"}`
   ]({
@@ -2576,6 +2650,7 @@ async function addLab() {
     ...postData,
     ...labForm.value,
   });
+  isLabLoading.value = false;
   cancelUploadLab();
   getLabList();
 }