完善批量加价及其审核

src/components/WorkFlow/index.vue

@@ -12,7 +12,7 @@
         </div>
         <el-form label-position="left" label-width="100px">
           <el-form-item :label="$t('抄送')">
-            <el-select v-model="valueSync" multiple :placeholder="$t('请选择抄送人')" style="width:100%" filterable >
+            <el-select v-model="valueSync" multiple :placeholder="$t('请选择抄送人')" style="width:100%" filterable :disabled="disabled" >
                 <el-option
                 v-for="item in users"
                 :key="item.id"
@@ -45,7 +45,8 @@ export default {
         taskData: { // 任务实例的数据。传递时，可展示 UserTask 审核相关的信息
             type: Array,
             default: () => [],
-        }
+        },
+        disabled: Boolean
     },
     data(){
         return {
@@ -87,4 +88,4 @@ export default {
 .workflow ::v-deep .my-process-designer{
     height: auto;
 }
-</style>
+</style>
\ No newline at end of file

src/views/ecw/box/components/batchMakeUpDetail.vue

@@ -36,23 +36,22 @@
         <template v-slot="{row}">
           <section>
             <div v-for="(item, index) in row.goodsList" :key="index">
-              <div>{{index+1}}：{{item.prodTitleZh}}</div>
-              <div>{{index+1}}：{{item.prodTitleEn}}</div>
+              <div>{{index+1}}：{{$l(item, 'prodTitle')}}</div>
             </div>
           </section>
         </template>
       </el-table-column>
       <el-table-column :label="$t('收费箱数')" align="center" prop="num"></el-table-column>
-      <el-table-colume :label="$t('收费体积')" align="center" prop="chargeVolume"></el-table-colume>
+      <el-table-column :label="$t('收费体积')" align="center" prop="chargeVolume"></el-table-column>
       <el-table-column :label="$t('收费重量')" align="center" prop="chargeWeight"></el-table-column>
-      <el-table-column :label="$t('原成交单价')" align="center">
-        <template>
-          // TODO
-        </template>
-      </el-table-column>
-      <el-table-column :label="$t('新成交单价')" align="center">
-        <template>
-          // TODO
+      <el-table-column :label="$t('加价金额')" align="center">
+        <template slot-scope="{row}" v-if="details">
+          <div>
+            {{$t('运费')}}：{{details.freightFee || 0}}{{ currencyMap[details.freightCurrencyId]}}/{{unitMap[details.freightUnitId]}}
+          </div>
+          <div>
+            {{$t('清关费')}}：{{details.clearanceFee || 0}}{{ currencyMap[details.clearanceCurrencyId]}}/{{unitMap[details.clearanceUnitId]}}
+          </div>
         </template>
       </el-table-column>
     </el-table>
@@ -66,6 +65,8 @@ import { getCabinetPage } from "@/api/ecw/cabinet";
 import { getChannelList } from "@/api/ecw/channel";
 import Decimal from "decimal.js";
 import Template from "@/views/cms/template/index.vue";
+import {getUnitList} from "@/api/ecw/unit";
+import {getCurrencyList} from "@/api/ecw/currency";
 
 /**
  * 批量加价审核详情
@@ -81,6 +82,8 @@ export default {
   },
   data() {
     return {
+      unitList:[],
+      currencyList:[],
       approvalInfo: {},
       boxBackVO: {},
       loadDetail: {},
@@ -97,6 +100,8 @@ export default {
     };
   },
   created() {
+    getUnitList().then(res => this.unitList = res.data)
+    getCurrencyList().then(res => this.currencyList = res.data)
     getChannelList().then((res) => (this.channelList = res.data));
   },
   methods: {
@@ -169,6 +174,24 @@ export default {
         return getSeaStatus(shippingVO) >= 182 ? true : false;
       };
     },
+    details(){
+      if(!this.approvalInfo) return null
+      return JSON.parse(this.approvalInfo?.details)
+    },
+    currencyMap(){
+      let map = {}
+      this.currencyList.forEach(item => {
+        map[item.id] = this.$l(item, 'title')
+      })
+      return map
+    },
+    unitMap(){
+      let map = {}
+      this.unitList.forEach(item => {
+        map[item.id] = this.$l(item, 'title')
+      })
+      return map
+    },
   },
 };
 </script>