批量加价

src/i18n/languages/en_US.json

@@ -3897,5 +3897,6 @@
     "收费方数": "",
     "可放入重量": "",
     "可放入收费重量": "",
-    "确定注销并退出系统吗？": "Are you sure to log out and exit the system?"
+    "确定注销并退出系统吗？": "Are you sure to log out and exit the system?",
+  "若线路价格为全包价，输入清关费不生效":"If the line price is all-inclusive, the input of clearance fees will not take effect."
 }

src/views/ecw/box/batchMarkup.vue

@@ -5,21 +5,21 @@
     <div>
         {{$t('运费或全包加价')}}
         <!--货币-->
-        <selector  v-model="form.freightCurrencyId" :options="currencyList" label-field="titleZh" value-field="id" defaultable class="w-100 ml-10" />
+        <selector  v-model="form.freightCurrencyId" :options="currencyList" :label-field="$l('title')" value-field="id" defaultable class="w-100 ml-10" />
         <!--金额-->
-        <el-input type="number" v-model="form.freightFee"  @keyup.native="checkPositive(form, 'cashCondition')"  class="w-100 ml-10" />
+        <el-input type="number" v-model="form.freightFee"  @keyup.native="checkPositive(form, 'freightFee')"  class="w-100 ml-10" />
         <!--单位-->
-        <selector v-model="form.freightUnitId" :options="unitList" label-field="titleZh" value-field="id" defaultable  class="w-100 ml-10" />
+        <selector v-model="form.freightUnitId" :options="unitList" :label-field="$l('title')" value-field="id" defaultable  class="w-100 ml-10" />
     </div>
     <div class="mt-10">
         {{$t('清关费加价价')}}
         <!--货币-->
-        <selector  v-model="form.clearanceCurrencyId" :options="currencyList" label-field="titleZh" value-field="id" defaultable  class="w-100 ml-10" />
+        <selector  v-model="form.clearanceCurrencyId" :options="currencyList" :label-field="$l('title')" value-field="id" defaultable  class="w-100 ml-10" />
         <!--金额-->
-        <el-input type="number" v-model="form.clearanceFee"  @keyup.native="checkPositive(form, 'cashCondition')"  class="w-100 ml-10" />
+        <el-input type="number" v-model="form.clearanceFee"  @keyup.native="checkPositive(form, 'clearanceFee')"  class="w-100 ml-10" />
         <!--单位-->
-        <selector v-model="form.clearanceUnitId" :options="unitList" label-field="titleZh" value-field="id" defaultable  class="w-100 ml-10" />
-        <span>*若线路价格为全包价，输入清关费不生效</span>
+        <selector v-model="form.clearanceUnitId" :options="unitList" :label-field="$l('title')" value-field="id" defaultable  class="w-100 ml-10" />
+        <span>*{{$t('若线路价格为全包价，输入清关费不生效')}}</span>
     </div>
 
     <el-card class="mt-20" v-if="shipmentObj">
@@ -58,14 +58,22 @@
       <div slot="header">
         {{$t('明细')}}
       </div>
-      <div>
+      <div class="flex-row" style="display: flex">
+        <div class="flex-1">
           {{$t('当前部分')}}：
           <el-select :placeholder="$t('请选择')" v-model="sectionId" @change="sectionChange">
             <el-option key="0" :label="$t('全部')" :value="0"></el-option>
             <el-option v-for="item in sectionList" :key="item.id" :label="item.title" :value="item.id"></el-option>
           </el-select>
         </div>
-      <el-table border :data="orderList" @selection-change="handleSelectionChange" class="mt-10">
+        <div class="document-status" v-if="sectionObj">
+          <span>{{$t('单证状态')}}：</span>
+          <template v-for="(item, index) in getDocStatus(sectionObj.sectionOrderList)">
+            <dict-tag :type="DICT_TYPE.ECW_CUSTOMS_TYPE" :value="item" :key="index" />
+          </template>
+        </div>
+      </div>
+      <el-table v-if="sectionObj" border :data="sectionObj.sectionOrderList || []" @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 prop="orderNo" :label="$t('订单号')" align="center">
@@ -77,7 +85,7 @@
           <template v-slot="{row}">
             <section>
               <div v-for="(item, index) in row.goodsList" :key="index">
-                {{index+1}}：{{item.prodTitleZh}}
+                <div>{{index+1}}：{{$l(item, 'prodTitle')}}</div>
               </div>
             </section>
           </template>
@@ -97,14 +105,17 @@
           </template>
         </el-table-column>
         <el-table-column prop="customsFee" :label="$t('报关费用')" align="center"></el-table-column>
-        <el-table-column prop="" :label="$t('当前成交价')" align="center" width="120px">
+        <el-table-column prop="" :label="$t('加价单价')" align="center" width="200px">
           <template slot-scope="scope">
-            // TODO
-          </template>
-        </el-table-column>
-        <el-table-column prop="" :label="$t('加价后成交价')" align="center" width="120px">
-          <template slot-scope="scope">
-            // TODO
+            <div>
+              {{$t('运费')}}：{{form.freightFee || 0}}{{ currencyMap[form.freightCurrencyId]}}/{{unitMap[form.freightUnitId]}}
+            </div>
+            <div>
+              {{$t('清关费')}}：{{form.clearanceFee || 0}}{{ currencyMap[form.clearanceCurrencyId]}}/{{unitMap[form.clearanceUnitId]}}
+            </div>
+            <div>
+              {{$t('全包价')}}：{{form.freightFee || 0}}{{ currencyMap[form.freightCurrencyId]}}/{{unitMap[form.freightUnitId]}}
+            </div>
           </template>
         </el-table-column>
       </el-table>
@@ -129,7 +140,7 @@ import {getChannelList} from "@/api/ecw/channel";
 import {getCabinetPage} from "@/api/ecw/cabinet";
 import {getWarehouseList} from "@/api/ecw/warehouse";
 import {getSupplierPage} from "@/api/ecw/supplier";
-import {boxGoodsDetail, createApproval, getSectionList} from "@/api/ecw/boxSea";
+import {boxGoodsDetail, createApproval, getSectionList, loadSecGoodsList} from "@/api/ecw/boxSea";
 import {getAbnormalList, getbox, getLogList} from "@/api/ecw/box";
 import {getTotlContent} from "@/views/ecw/box/shippingSea/utils";
 import WorkFlow from "@/components/WorkFlow";
@@ -156,20 +167,42 @@ export default {
       shipmentObj: null,
       shipmentId: null,
       // 当前选择的部分
-      sectionId: 0
+      sectionId: 0,
+      sectionObj: null
     }
   },
   computed:{
+    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
+    },
     // 订单
     orderList(){
       let arr = []
-      this.sectionList.forEach(item => {
+      this.sectionObj?.sectionOrderList.forEach(item => {
         if(!this.sectionId || this.sectionId == item.id){
-          arr = arr.concat(item.orderList)
+          arr = arr.concat(item.sectionOrderList)
         }
       })
       return arr
     },
+    // 提取部分
+    sectionNameList(){
+      let arr = this.sectionObj?.sectionOrderList.map(item => {
+        return item.sectionName
+      })
+      return Array.from(new Set(arr))
+    },
     /* 渠道 */
     getShipChannelName() {
       return (shippingChannelId) => {
@@ -214,6 +247,14 @@ export default {
         return getTotlContent(secStatistics);
       }
     },
+    getDocStatus() {
+      return (list = []) => {
+        // 获取类型
+        let customsTypes = list.map((item) => item.customsType);
+        // 去重
+        return Array.from(new Set(customsTypes));
+      };
+    },
   },
   created() {
     getUnitList().then(res => this.unitList = res.data)
@@ -259,6 +300,10 @@ export default {
         const { data } = res;
         this.allSupplier = data.list;
       });*/
+      /*loadSecGoodsList({shipmentId: this.shipmentId}).then(res => {
+        this.sectionList = res.data
+      })*/
+      this.getBoxGoodsDetail()
     },
     // 出货信息
     getBoxDetail() {