7

src/views/ecw/box/batchMarkup.vue

@@ -207,7 +207,7 @@
     </div>
     <el-table v-loading="loading" ref="orderTable" border :data="list || []" @selection-change="handleSelectionChange" class="mt-10">
       <el-table-column type="selection" width="50"></el-table-column>
-      <el-table-column align="center" :label="$t('序号')" width="50" prop="tidanNum" />
+      <el-table-column :label="$t('序号')" width="50" type="index" align="center" />
       <el-table-column prop="orderNo" :label="$t('订单号')" align="center" width="150">
         <template slot-scope="{ row }">
           <router-link :to="'/order/detail?orderId=' + row.orderId"> {{ row.orderNo }}</router-link>
@@ -227,10 +227,20 @@
         <template v-slot="scope"> {{ scope.row.destAdjustToStartWarehouseName }}-{{ scope.row.destAdjustToDestWarehouseName }} </template>
       </el-table-column>
       <el-table-column :label="$t('额外费用')" align="center">
-        <template v-slot="scope"></template>
+        <template slot-scope="{ row }">
+          <div v-for="(item, feeIndex) in row.costVO.feeDtoList" :key="feeIndex">
+            <div v-if="item.amount">
+              <dict-tag :type="DICT_TYPE.ECW_COST_FEE_TYPE" :value="item.feeType" />
+              {{ item.amount }} {{ currencyMap[item.currencyId] }}
+            </div>
+          </div>
+        </template>
       </el-table-column>
       <el-table-column :label="$t('加价单价')" align="center">
-        <template v-slot="scope"></template>
+        <template slot-scope="scope">
+          <div>{{ $t("运费") }}：{{ form.freightFee || 0 }}{{ currencyMap[form.freightCurrencyId] }}/{{ unitMap[form.freightUnitId] }}</div>
+          <div>{{ $t("清关费") }}：{{ form.clearanceFee || 0 }}{{ currencyMap[form.clearanceCurrencyId] }}/{{ unitMap[form.clearanceUnitId] }}</div>
+        </template>
       </el-table-column>
       <el-table-column prop="salesmanName" :label="$t('客户经理')" align="center"></el-table-column>
       <el-table-column prop="firstInTime" :label="$t('首次入仓时间')" align="center" width="150"></el-table-column>

src/views/ecw/box/batchMarkupComList.vue

 <template>
-  <div style="padding: 20px 20px 20px 100px; background: #f4f4f4; margin: -10px 0">
+  <div style="padding: 20px; background: #f4f4f4; margin: -10px 0 -10px 100px">
     <el-table :data="list" border style="width: 100%" size="mini">
       <el-table-column :label="$t('序号')" width="90px" type="index" align="center"></el-table-column>
       <el-table-column prop="prodTitleZh" :label="$t('品名')" width="220px">

src/views/ecw/box/cancelClear.vue

 <template>
   <div class="shipping-update-error">
-    <div class="message-title">{{$t(`您确定撤销${cancelClearInfo.orderNo}已清关状态吗?`)}}</div>
+    <div class="message-title">{{ $t(`您确定撤销${cancelClearInfo.orderNo}已清关状态吗?`) }}</div>
     <el-form ref="arrivalForm" :rules="rules" :model="cusClearanceObj" label-width="120px">
       <el-form-item :label="$t('撤销理由')" prop="clEstTime">
         <el-input v-if="!flag" v-model="cusClearanceObj.applyReason" type="textarea" :rows="4"></el-input>
         <template v-else>
-          {{apply.applyReason}}
+          {{ apply.applyReason }}
         </template>
       </el-form-item>
     </el-form>
 
     <el-row class="operate-button">
-      <el-button v-if="!flag" type="primary" @click="onSubmit">{{$t('确定')}}</el-button>
-      <el-button v-if="flag" type="primary" @click="$router.push({path: '/bpm/process-instance/detail', query: {id: apply.bpmProcessId}})">{{$t('审核中')}}</el-button>
-      <el-button v-if="flag" plain type="primary" @click="canclAudit">{{$t('取消审核')}}</el-button>
-      <el-button @click="cancel">{{$t('取消')}}</el-button>
+      <el-button v-if="!flag" type="primary" @click="onSubmit">{{ $t("确定") }}</el-button>
+      <el-button v-if="flag" type="primary" @click="$router.push({ path: '/bpm/process-instance/detail', query: { id: apply.bpmProcessId } })">{{ $t("审核中") }}</el-button>
+      <el-button v-if="flag" plain type="primary" @click="canclAudit">{{ $t("取消审核") }}</el-button>
+      <el-button @click="cancel">{{ $t("取消") }}</el-button>
     </el-row>
   </div>
 </template>
 
 <script>
-import { approvalCreate } from "@/api/ecw/boxSea";
-import {cancelProcessInstance} from "@/api/bpm/processInstance";
+import { approvalCreate } from "@/api/ecw/boxSea"
+import { cancelProcessInstance } from "@/api/bpm/processInstance"
 
 export default {
   name: "updateError",
@@ -29,7 +29,7 @@ export default {
   components: {},
   props: {
     shipmentObj: Object,
-    cancelClearInfo: Object,
+    cancelClearInfo: Object
   },
   data() {
     return {
@@ -37,21 +37,19 @@ export default {
       cusClearanceObj: {},
       // 校验
       rules: {
-        applyReason: [
-          { required: true, message: this.$t("必填"), trigger: "change" },
-        ]
+        applyReason: [{ required: true, message: this.$t("必填"), trigger: "change" }]
       },
       apply: {},
       flag: false
-    };
+    }
   },
   created() {
     let orders = this.shipmentObj.clearanceInfo?.clearanceOrderBackList
-    let order = orders.find(item=>item.orderId == this.cancelClearInfo.orderId)
-    console.log(order,11,this.cancelClearInfo.orderId,orders);
-    if(order){
+    let order = orders.find((item) => item.orderId == this.cancelClearInfo.orderId)
+    console.log(order, 11, this.cancelClearInfo.orderId, orders)
+    if (order) {
       this.apply = order
-      if(this.apply.approvalStatus == 1){
+      if (this.apply.approvalStatus == 1) {
         this.flag = true
       }
     }
@@ -66,24 +64,24 @@ export default {
             approvalType: 21,
             orderId: this.cancelClearInfo.orderId,
             applyReason: this.cusClearanceObj.applyReason
-          }).then(()=>{
-              this.$message.success("成功");
-              this.cancel()
-            })
+          }).then(() => {
+            this.$message.success("成功")
+            this.cancel()
+          })
         }
-      });
+      })
     },
     /* 取消审核 */
     canclAudit() {
       cancelProcessInstance(this.apply.bpmProcessId, this.$t("取消审核")).then(() => {
-        this.$emit("closeDialog","edit");
-      });
+        this.$emit("closeDialog", "edit")
+      })
     },
     cancel() {
-      this.$emit("closeDialog","edit");
-    },
-  },
-};
+      this.$emit("closeDialog", "edit")
+    }
+  }
+}
 </script>
 
 <style lang="scss" scoped>