Merge remote-tracking branch 'origin/dev' into dev

src/views/ecw/box/shippingSea/nodePage/preinstall.vue

@@ -484,6 +484,7 @@ export default {
       let params = this.getParams();
       // 订单号
       params.orderNo = params.toBePreOrderNo;
+      params.transportType = this.shipmentObj.transportType;
       preloadPage({ ...params, ...this.pageParam }).then((res) => {
         const { data } = res;
         this.toBePreList = data.dataList?.list ?? [];
@@ -556,7 +557,7 @@ export default {
     },
     /* 计算总和 */
     calcSum(key, data) {
-      const values = data.map((item) => Number(item[key]));
+      const values = data?.map((item) => Number(item[key])) ?? [];
       if (!values.every((value) => isNaN(value))) {
         return values.reduce((prev, curr) => {
           const value = Number(curr);
@@ -822,7 +823,7 @@ export default {
   }
 
   .preinstall-card {
-    min-height: 550px;
+    min-height: 800px;
     .el-card__body {
       height: 100%;
 

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

@@ -43,7 +43,7 @@
                 <el-table-column :label="$t('品牌')">
                     <template slot-scope="{row}">
                         <template v-if="row.brandName">{{row.brandName}}</template>
-                        <dict-tag :type="DICT_TYPE.ECW_IS_BRAND" :value="row.feeType" />
+                        <dict-tag v-else :type="DICT_TYPE.ECW_IS_BRAND" :value="row.feeType" />
                     </template>
                 </el-table-column>
                 <el-table-column :label="$t('体积')">

src/views/ecw/order/edit.vue

@@ -629,7 +629,7 @@ export default {
     },
     // 是否已完成入仓
     inWarehouse(){
-        return !!this.form.inWarehouseState && this.form.inWarehouseState > 201
+        return (!!this.form.inWarehouseState && this.form.inWarehouseState > 201) || this.form.shipmentState > 0
     },
     exportCityList(){
         return this.tradeCityList.filter(item => item.type == 2 || item.type == 3)