订单详情中的到仓详情页面修改

src/views/ecw/order/components/CheckDetailProd.vue

@@ -155,10 +155,8 @@ export default {
           {{showAttrText(row.warehouseInInfoVO ? row.warehouseInProdAttrIds : row.prodAttrIds)}}
         </template>
       </el-table-column>
-      <el-table-column prop="sumNum" :label="$t('入仓信息')"  width="90px">
+      <el-table-column prop="sumNum" :label="$t('装柜/出货信息')"  width="90px">
         <template slot-scope="{row}">
-          <!--<el-link type="primary" @click.native="showWarehouseLogs(row,1)">{{row.warehouseInInfoVO ? row.warehouseInInfoVO.cartonsNum : 0}}</el-link>
-          <div v-if="row.warehouseInInfoVO && row.warehouseInInfoVO.isMultiSpecification">({{$t('多规格')}})</div>-->
           <div v-if="row.warehouseInInfoVO">
             {{row.warehouseInInfoVO.cartonsNum}}{{$t('箱')}}
             {{row.warehouseInInfoVO.weight}}Kg
@@ -167,137 +165,37 @@ export default {
           </div>
         </template>
       </el-table-column>
-      <el-table-column prop="warehouseType" :label="$t('类型')"  width="120px"/>
-      <el-table-column prop="specificationType" :label="$t('包装')"  width="120px"/>
-      <el-table-column prop="worth" :label="$t('货值')"  width="120px"/>
-      <el-table-column prop="warehouseRecordRemark" :label="$t('入仓备注')"  width="120px"/>
-      <el-table-column prop="warehouseInInfoVO.expressNo" :label="$t('快递单号')" />
-      <el-table-column prop="sumNum" :label="$t('收费数据')"  width="90px">
+      <el-table-column prop="sumNum" :label="$t('到仓信息')"  width="90px">
         <template slot-scope="{row}">
           <div v-if="row.warehouseInInfoVO">
-            {{row.chargeWeight}}Kg
-            {{row.chargeVolume}}m³
+            {{row.warehouseInInfoVO.cartonsNum}}{{$t('箱')}}
+            {{row.warehouseInInfoVO.weight}}Kg
+            {{row.warehouseInInfoVO.volume}}m³
+            {{row.warehouseInInfoVO.quantityAll}}{{$t('个')}}
           </div>
         </template>
       </el-table-column>
-      <el-table-column prop="" :label="`${$t('费用类型')}/${$t('模式')}`">
-        <template slot-scope="{row}">
-          <dict-tag :type="DICT_TYPE.ECW_PAY_ADVANCE" :value="row.isPayAdvance" />
-          <div v-if="row.charging ==0">{{ $t('运费/清关费') }}</div>
-          <div v-if="row.charging ==1">{{ $t('全包价') }}</div>
-        </template>
-      </el-table-column>
-      <el-table-column prop="" :label="$t('成交单价')"  width="220px">
-        <template slot-scope="{row}">
-
-          <template v-if="row.charging ==1">
-            <template v-if="!row.originalSeaFreight">{{ $t('未报价') }}</template>
-            <el-link type="primary" @click="showFeeDetail(row, 'clearance')" v-else>{{$t('全包价')}} {{row.oneSeaFreight}} {{currencyMap[row.seaFreightCurrency]}} / {{unitMap[row.seaFreightVolume]}}</el-link>
-          </template>
-          <template v-else-if="!row.originalSeaFreight && !row.originalClearanceFreight">{{ $t('未报价') }}</template>
-          <template v-else>
-            <el-link type="primary" @click="showFeeDetail(row, 'freight')">
-              {{$t('运费')}}：{{row.oneSeaFreight}} {{currencyMap[row.seaFreightCurrency]}} / {{unitMap[row.seaFreightVolume]}}
-            </el-link>
-            <el-link type="primary" @click="showFeeDetail(row, 'clearance')">
-              {{$t('清关费')}}：{{row.oneClearanceFreight}} {{currencyMap[row.clearanceFreightCurrency]}} / {{unitMap[row.clearanceFreightVolume]}}
-            </el-link >
-          </template>
-        </template>
-      </el-table-column>
-      <el-table-column prop="" :label="$t('材质')">
+      <el-table-column :label="$t('到仓时间')">
         <template slot-scope="{row}">
-          <dict-tag :type="DICT_TYPE.ECW_PRODUCT_MATERIAL" :value="row.material" />
+          {{row.unloadTime|parseTime}}
         </template>
       </el-table-column>
-      <el-table-column prop="" :label="$t('用途')">
+      <el-table-column :label="$t('异常类型')" >
         <template slot-scope="{row}">
-          <div v-if="row.usageIds">
-            <div v-for="(item,index) in row.usageIds.split(',')">
-              <dict-tag :type="DICT_TYPE.OREER_ITEM_USAGE" :value="item" />
-              <span v-if="(index+1)!=row.usageIds.split(',').length">,</span>
-            </div>
+          <div v-for="(exception, i) in row.itemException" :key="i" :src="row.itemException">
+            <router-link
+                :to="{
+              path: '/exception/detail',
+              query: { id: exception.id }
+            }"
+                class="link-type"
+            >
+              <span>{{exception.msg}}</span>
+            </router-link>
           </div>
         </template>
       </el-table-column>
-      <el-table-column prop="" :label="$t('储位')">
-        <template slot-scope="{row}">
-          <template v-if="row.warehouseInInfoVO">
-            {{getLocationName(row.warehouseInInfoVO.orderLocationMergeVOSet)}}
-          </template>
-        </template>
-      </el-table-column>
-      <el-table-column prop="" :label="$t('商品链接')">
-        <template slot-scope="{row}">
-          <template v-if="row.link">
-            <a target="_blank" :url="row.link">{{row.link}}</a>
-          </template>
-        </template>
-      </el-table-column>
-      <el-table-column prop="sumNum" :label="$t('填单信息')"  width="90px">
-        <template slot-scope="{row}">
-          {{row.num}}{{$t('箱')}}
-          {{row.weight}}Kg
-          {{row.volume}}m³
-          {{row.quantity}}{{$t('个')}}
-        </template>
-      </el-table-column>
-      <el-table-column prop="expressNo" :label="$t('填单快递单号')" />
     </el-table>
-    <el-dialog :title="$t('费用详情')" :visible="!!showFeeDetailDialog" :before-close="closeFeeDetail">
-      <el-row v-if="feeDetail">
-        <el-col :span="12">
-          <div>{{feeDetail.charging ? $t('全包价') : $t('运费')}}</div>
-          <div v-for="item in feeDetail.freight">
-            {{item.label}}: {{item.value}}
-            <template v-if="item.currency">
-              {{currencyMap[item.currency]}} / {{unitMap[item.volume]}} <span v-if="item.remark">【{{item.remark}}】</span>
-            </template>
-          </div>
-        </el-col>
-        <el-col :span="12" v-if="feeDetail.charging != 1">
-          <div>
-            {{$t('清关费')}}
-            <template v-if="transportId == 3 || transportId == 4">
-              {{$t('来自{source}', {source: feeDetail.airClearanceSource + feeDetail.sourceName})}}
-            </template>
-          </div>
-          <div v-for="item in feeDetail.clearance">
-            {{item.label}}: {{item.value}}
-            <template v-if="item.currency">
-              {{currencyMap[item.currency]}} / {{unitMap[item.volume]}} <span v-if="item.remark">【{{item.remark}}】</span>
-            </template>
-          </div>
-        </el-col>
-      </el-row>
-
-      <div v-if="feeDetail && feeDetail.coupons && feeDetail.coupons.length" class="page-title">{{ $t('优惠详情') }}</div>
-      <el-table v-if="feeDetail && feeDetail.coupons && feeDetail.coupons.length" :data="feeDetail.coupons">
-        <el-table-column label="优惠ID" prop="couponId"></el-table-column>
-        <el-table-column label="优惠名称">
-          <template slot-scope="{row}">
-            {{ $l(row, 'title') }}
-          </template>
-        </el-table-column>
-        <el-table-column label="类型">
-          <template slot-scope="{row}">
-            <dict-tag :type="DICT_TYPE.ECW_COUPON_TYPE" :value="row.type" ></dict-tag>
-          </template>
-        </el-table-column>
-        <el-table-column label="运费优惠">
-          <template slot-scope="{row}">
-            {{ row.freightReduceAmount}}
-            {{currencyMap[row.freightReduceCurrencyId]}}
-          </template>
-        </el-table-column>
-        <el-table-column label="清关费优惠">
-          <template slot-scope="{row}">
-            {{ row.clearanceReduceAmount}}
-            {{ currencyMap[row.clearanceReduceCurrencyId] }}
-          </template>
-        </el-table-column>
-      </el-table>
-    </el-dialog>
   </div>
 </template>