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

src/views/ecw/box/ladingBill/index.vue

@@ -16,7 +16,8 @@
               <div v-for="(item, index) in scope.row.orderItemList" :key="index" class="goodList-div">
                 <p>{{$t('品名')}}：{{item.prodTitleZh}}</p>
                 <p>{{$t('品牌')}}：【
-                  <dict-tag :type="DICT_TYPE.PRODUCT_RECORD_ATTRIBUTE" :value="item.feeType" />
+                  <span v-if="item.feeType === 0">无品牌</span>
+                  <dict-tag v-else :type="DICT_TYPE.PRODUCT_RECORD_ATTRIBUTE" :value="item.feeType" />
                   】
                 </p>
                 <p>{{$t('其他')}}：{{getTotlContent(item)}}</p>

src/views/ecw/box/shippingSea/nodePage/unloading/index.vue

@@ -55,6 +55,8 @@ export default {
     let oldData = { ...this.$attrs.shipmentObj[voName] };
     oldData = formatDateStr(oldData, ["ulWarehouseTime", "ulBoxTime"]);
     this.unloadingObj = oldData;
+    // 进入卸柜，仓库给了默认值为0，并且底下显示无匹配数据。应该默认为空，让手动去选择
+    if(this.unloadingObj.ulOutletsId === 0) this.unloadingObj.ulOutletsId = ''
     getNodePage({ pageNo: 1, pageSize: 1000, status: 0 }).then((res) => {
       const { data } = res;
       this.nodes = data?.list ?? [];