批量费用申请

src/views/ecw/box/batchMarkup.vue

@@ -205,7 +205,7 @@
         <el-button type="default" @click="listOpen" v-else>{{ $t("收起明细") }}</el-button>
       </div>
     </div>
-    <el-table v-loading="loading" ref="orderTable" border :data="list || []" @selection-change="handleSelectionChange" class="mt-10">
+    <el-table v-loading="loading" ref="orderTable" border :data="list || []" @selection-change="handleSelectionChange" :row-style="rowStyle" class="mt-10">
       <el-table-column type="selection" width="50"></el-table-column>
       <el-table-column :label="$t('序号')" width="50" type="index" align="center" />
       <el-table-column prop="orderNo" :label="$t('订单号')" align="center" width="150">
@@ -223,20 +223,20 @@
           <router-link :to="'/customer/query/' + row.consigneeCustomerId">{{ row.consigneeCustomerNumber }}</router-link>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('始发仓/渠道-目的仓')" align="center">
+      <el-table-column :label="$t('始发仓/渠道-目的仓')" align="center" width="200">
         <template v-slot="scope"> {{ scope.row.destAdjustToStartWarehouseName }}-{{ scope.row.destAdjustToDestWarehouseName }} </template>
       </el-table-column>
-      <el-table-column :label="$t('额外费用')" align="center" width="150">
+      <el-table-column :label="$t('额外费用')" width="200">
         <template slot-scope="{ row }">
           <div v-for="(item, feeIndex) in row.costVO.feeDtoList" :key="feeIndex">
             <div v-if="item.amount && item.feeType !== 1 && item.feeType !== 2"><dict-tag :type="DICT_TYPE.FEE_TYPE" :value="item.feeType" />: {{ currencyMapF[item.currencyId] }}{{ item.amount }}</div>
           </div>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('加价单价')" align="center" width="150">
+      <el-table-column :label="$t('加价单价')" width="200">
         <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>
+          <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>
@@ -296,6 +296,7 @@ export default {
   components: { Template, selector, WorkFlow, batchMarkupComList, UserSelector },
   data() {
     return {
+      prodTypeList: [],
       unitList: [],
       currencyList: [],
       form: {
@@ -536,6 +537,13 @@ export default {
     }
   },
   methods: {
+    rowStyle(row) {
+      if (row.specialPriceType) {
+        return { background: "#DBECFF" }
+      } else {
+        return {}
+      }
+    },
     listOpen() {
       this.isExpand = !this.isExpand
       this.$nextTick(() => {

src/views/ecw/box/batchMarkupComList.vue

 <template>
-  <div style="padding: 20px; background: #f4f4f4; margin: -10px 0 -10px 100px">
+  <div style="padding: 20px; background: #f4f4f4; margin: 0 20px 0 100px; border: 1px solid #e4e4e4">
     <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">