wzh 3 роки тому
батько
коміт
0799185839

+ 5 - 0
src/views/shipInfo/shipDetail.vue

@@ -240,9 +240,13 @@
           <el-form-item prop="cargo" label="货种">
             <el-input v-model="voyageForm.cargo"></el-input>
           </el-form-item>
+          <el-form-item> </el-form-item>
           <el-form-item prop="tons" label="吨位">
             <el-input v-model="voyageForm.tons"></el-input>
           </el-form-item>
+          <el-form-item prop="pieces" label="件数">
+            <el-input v-model="voyageForm.pieces"></el-input>
+          </el-form-item>
         </div>
       </el-form>
       <template #footer>
@@ -477,6 +481,7 @@ export default {
         ],
         cargo: [{ required: true, message: "请填写货种", trigger: "blur" }],
         tons: [{ required: true, message: "请填写吨位", trigger: "blur" }],
+        pieces: [{ required: true, message: "请填写件数", trigger: "blur" }],
       },
     });
     let voyageForm = reactive({

+ 58 - 7
src/views/voyage/voyageDetail.vue

@@ -130,12 +130,21 @@
         ></el-input>
       </div>
       <div class="info-line">
-        <div class="info-line-title">吨位</div>
+        <div style="width: 120px !important" class="info-line-title">货量</div>
         <el-input
+          style="width: 100px !important"
           class="info-line-text"
           v-model="voyage.tons"
           disabled
         ></el-input>
+        <span class="unit">吨</span>
+        <el-input
+          style="width: 80px !important"
+          class="info-line-text"
+          v-model="voyage.Pieces"
+          disabled
+        ></el-input>
+        <span class="unit">件</span>
       </div>
     </div>
     <div class="container-second-title df aic jcsb mt40">
@@ -189,13 +198,23 @@
         ></el-date-picker>
       </div>
       <div class="info-line">
-        <div class="info-line-title">实装吨位</div>
+        <div class="info-line-title">实装货量</div>
         <el-input
+          style="width: 100px !important"
           class="info-line-text"
           v-model="voyage.actualLoadTons"
           :disabled="disabledStatus"
           placeholder="实装吨位"
         ></el-input>
+        <span class="unit">吨</span>
+        <el-input
+          style="width: 80px !important"
+          class="info-line-text"
+          v-model="voyage.actualLoadPieces"
+          :disabled="disabledStatus"
+          placeholder="实装件数"
+        ></el-input>
+        <span class="unit">件</span>
       </div>
     </div>
     <div class="line">
@@ -305,13 +324,23 @@
     </div>
     <div class="line">
       <div class="info-line">
-        <div class="info-line-title">实际卸货吨位</div>
+        <div class="info-line-title">实际卸货</div>
         <el-input
+          style="width: 100px !important"
           class="info-line-text"
           placeholder="实际卸货吨位"
           v-model="voyage.actualDischargeTons"
           :disabled="disabledStatus"
         ></el-input>
+        <span class="unit">吨</span>
+        <el-input
+          style="width: 80px !important"
+          class="info-line-text"
+          placeholder="实际卸货件数"
+          v-model="voyage.actualDischargePieces"
+          :disabled="disabledStatus"
+        ></el-input>
+        <span class="unit">件</span>
       </div>
       <!-- <div class="info-line">
         <div class="info-line-title">是否购买保险</div>
@@ -369,6 +398,12 @@
         min-width="120"
         align="center"
       ></el-table-column>
+      <el-table-column
+        prop="dischargeTime"
+        label="卸货时间"
+        min-width="120"
+        align="center"
+      ></el-table-column>
       <el-table-column
         prop="dischargeTons"
         label="卸货吨位"
@@ -376,9 +411,9 @@
         align="center"
       ></el-table-column>
       <el-table-column
-        prop="dischargeTime"
-        label="卸货时间"
-        min-width="120"
+        prop="dischargePieces"
+        label="卸货件数"
+        min-width="100"
         align="center"
       ></el-table-column>
       <el-table-column label="磅单" min-width="150" align="center">
@@ -430,7 +465,14 @@
             placeholder="卸货吨位"
           ></el-input>
         </el-form-item>
-        <el-form-item label="卸货吨位">
+        <el-form-item label="卸货件数">
+          <el-input
+            class="info-line-text"
+            v-model="formInline.dischargePieces"
+            placeholder="卸货件数"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="卸货记录">
           <Uploader
             :actionUrl="store.state.wayBillUrl"
             :uploaderId="'pound'"
@@ -2248,4 +2290,13 @@ onMounted(() => {
   color: #006ebc;
   cursor: pointer;
 }
+
+.unit {
+  font-size: 14px;
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-weight: 400;
+  color: #353a42;
+  line-height: 100%;
+  margin: 0 10px;
+}
 </style>

+ 5 - 0
src/views/voyage/voyageList.vue

@@ -137,9 +137,13 @@
           <el-form-item prop="cargo" label="货种">
             <el-input v-model="voyageForm.cargo"></el-input>
           </el-form-item>
+          <el-form-item> </el-form-item>
           <el-form-item prop="tons" label="吨位">
             <el-input v-model="voyageForm.tons"></el-input>
           </el-form-item>
+          <el-form-item prop="pieces" label="件数">
+            <el-input v-model="voyageForm.pieces"></el-input>
+          </el-form-item>
         </div>
       </el-form>
       <template #footer>
@@ -356,6 +360,7 @@ export default {
         ],
         cargo: [{ required: true, message: "请填写货种", trigger: "blur" }],
         tons: [{ required: true, message: "请填写吨位", trigger: "blur" }],
+        pieces: [{ required: true, message: "请填写件数", trigger: "blur" }],
       },
     });
     let voyageForm = reactive({