Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev

src/views/bpm/processInstance/detail.vue

@@ -265,6 +265,10 @@ export default {
           component: "shippingDetail",
           processId: this.processInstance.businessKey,
         },
+        close_container_no: {
+          component: "shippingDetail",
+          processId: this.processInstance.businessKey,
+        },
         // 拆单审核
         split_detail: {
           component: "SplitDetail",
@@ -328,6 +332,7 @@ export default {
           path: this.processInstance.processDefinition?.formCustomViewPath
         },
       }
+      console.log(this.processInstance.processDefinition.formCustomViewPath.trim())
       return map[this.processInstance.processDefinition.formCustomViewPath.trim()]
     }
   },
@@ -404,6 +409,7 @@ export default {
         }
         // 设置流程信息
         this.processInstance = response.data;
+        console.log(this.processInstance)
 
         // 设置表单信息
         if (this.processInstance.processDefinition.formType === 10) {

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

@@ -45,7 +45,16 @@
                   <dict-tag :type="DICT_TYPE.PRODUCT_RECORD_ATTRIBUTE" :value="row.productRecord" />
                 </template>
               </el-table-column>
-              <el-table-column :label="$t('箱数')" align="center" prop="num" />
+              <el-table-column :label="$t('箱数')" align="center" prop="num">
+                <template slot-scope="scope">
+                  <div>
+                    {{scope.row.num}}
+                  </div>
+                  <div style="color:blue;fontWeight:bold;">
+                    {{ scope.row.multiSpecification === true ? '(多规格)' : ''}}
+                  </div>
+                </template>
+              </el-table-column>
               <el-table-column :label="$t('纸箱尺寸')" align="center" prop="warehouseInInfo.boxGauge">
               </el-table-column>
               <el-table-column :label="$t('体积')" align="center" prop="volume">
@@ -138,6 +147,7 @@ export default {
             list.push({
               ...oItem,
               warehouseInInfo,
+              multiSpecification: item.multiSpecification,
               positionNo: item.positionNo,
               tallyStatus: item.tallyStatus,
               tallyTime: item.tallyTime,
@@ -181,9 +191,9 @@ export default {
         orderIds = [data.orderId];
       }
 
-      let msgTitle = this.$t('您确定要将 {no} 移出 {selfNo} 吗？', {
+      let msgTitle = this.$t("您确定要将 {no} 移出 {selfNo} 吗？", {
         no: orderNos.join("，"),
-        selfNo: this.shipmentObj.selfNo
+        selfNo: this.shipmentObj.selfNo,
       });
 
       this.$confirm(msgTitle, this.$t("提示"), {
@@ -241,7 +251,7 @@ export default {
     getCityName() {
       return (id) => {
         let arr = this.$attrs.warehouseList.filter((item) => item.id == id);
-        return arr.length > 0 ? this.$l(arr[0], 'title') : this.$t("无");
+        return arr.length > 0 ? this.$l(arr[0], "title") : this.$t("无");
       };
     },
   },

src/views/ecw/order/transferWarehousing.vue

@@ -18,15 +18,16 @@
       </el-table-column>
       <el-table-column :label="$t('填单货物属性')">
         <template v-slot="{row}">
-        <div>{{$t('品牌')}}：{{ row.brand }}</div><div>{{$t('箱数')}}：{{row.num}}</div><div>{{$t('体积')}}：{{ row.volume }}m³</div><div>{{$t('重量')}}{{row.weight}}Kg</div>
+        <div>{{$t('品牌')}}：无</div><div>{{$t('箱数')}}：{{row.num}}</div><div>{{$t('体积')}}：{{ row.volume }}m³</div><div>{{$t('重量')}}：{{row.weight}}Kg</div>
         </template>
       </el-table-column>
       <el-table-column :label="$t('入库货物属性')">
         <template v-slot="{row}">
           <div v-for="(item,index) in row.orderWarehouseInBackItemDoList" :key="index">
-            <div>{{$t('规格')}}：{{item.boxGauge}}</div>
-            <div style="display: flex;justify-content: space-between;">
-              <div>{{$t('品牌')}}：{{row.brand}}</div>
+            <div>{{$t('规格')}}：{{item.boxGauge.split('*').map(item =>`${item}cm`).join('*')}}</div>
+            <div style="display: flex;justify-content: space-between;white-space: nowrap">
+
+              <div>{{$t('品牌')}}：{{brandList.find(item => item.id == row.brand).titleZh}}</div>
               <div>{{$t('箱数')}}：{{item.cartonsNum}}</div>
               <div>{{$t('体积')}}：{{item.volume}} CMB</div>
               <div>{{$t('重量')}}：{{item.weight}}KG</div>
@@ -160,6 +161,7 @@ import {getByWarehouseId} from "@/api/ecw/warehouseArea";
 import {adjustLastWithStatus, warehouseApprovalCancel} from "@/api/ecw/batchSingleApplication";
 import warehouseLocation from "@/views/ecw/order/components/warehouseLocation";
 import imageUpload from "@/components/ImageUpload";
+import {getProductBrankPage} from "@/api/ecw/productBrank";
 export default {
   name: "transferWarehousing",
   components: {
@@ -200,7 +202,8 @@ export default {
       expressList:[],
       storageSpaceList:[],
       applyStatus:{},
-      orderItemVOList:[]
+      orderItemVOList:[],
+      brandList:[]
 
     }
   },
@@ -251,6 +254,9 @@ export default {
     }
   },
   created() {
+    getProductBrankPage({pageNo:1,pageSize:10000,}).then(r => {
+        this.brandList = r.data.list
+    })
     if(this.type == 1){
       adjustLastWithStatus({orderId:this.orderId,lang:0}).then(r =>{
         this.applyStatus = r.data})