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

src/views/ecw/order/warehousing/components/editDialog.vue

@@ -73,6 +73,9 @@
                 :data="tableData"
                 style="width: 100%">
                 <el-table-column label="箱数" width="150px">
+                  <template v-slot:header>
+                    <span style="color: red">*</span> 箱数
+                  </template>
                   <template v-slot="{r,c,$index}">
                     <el-form-item :rules="tableFormRules.cartonsNum" :prop="$index + '.cartonsNum'">
                       <span v-if="tableData[$index].id && !edit">
@@ -86,6 +89,9 @@
                   </template>
                 </el-table-column>
                 <el-table-column label="包装类型" width="100px">
+                  <template v-slot:header>
+                    <span style="color: red">*</span> 包装类型
+                  </template>
                   <template v-slot="{r,c,$index}">
                     <el-form-item>
                       <span v-if="tableData[$index].id && !edit">{{ getDictDataLabel(DICT_TYPE.ECW_PACKAGING_TYPE, tableData[$index].unit) }}</span>
@@ -118,6 +124,9 @@
                   </template>
                 </el-table-column>
                 <el-table-column label="体积(m³)">
+                  <template v-slot:header>
+                    <span style="color: red">*</span> 体积(m³)
+                  </template>
                   <template v-slot="{r,c,$index}">
                     <el-form-item :rules="tableFormRules.volume" :prop="$index + '.volume'">
                       <span v-if="tableData[$index].id && !edit">{{ tableData[$index].volume }}</span>
@@ -126,6 +135,9 @@
                   </template>
                 </el-table-column>
                 <el-table-column label="重量(Kg)">
+                  <template v-slot:header>
+                    <span style="color: red">*</span> 重量(Kg)
+                  </template>
                   <template v-slot="{r,c,$index}">
                     <el-form-item :rules="tableFormRules.weight" :prop="$index + '.weight'">
                       <span v-if="tableData[$index].id && !edit">{{ tableData[$index].weight }}</span>
@@ -134,6 +146,9 @@
                   </template>
                 </el-table-column>
                 <el-table-column label="数量" width="130px">
+                  <template v-slot:header>
+                    <span style="color: red">*</span> 数量
+                  </template>
                   <template v-slot="{r,c,$index}">
                     <el-form-item :rules="tableFormRules.quantityAll" :prop="$index + '.quantityAll'">
                       <span v-if="tableData[$index].id && !edit">{{ tableData[$index].quantityAll }}</span>

src/views/ecw/order/warehousing/index.vue

@@ -42,7 +42,7 @@
         label="入库货物属性">
         <template v-slot="{row}">
           <template v-if="row.warehouseInInfoVO">
-            品牌：{{ ['无牌', '有牌', '中性'][row.brandType] }}<br>
+            品牌：{{ ['无牌', '有牌', '中性'][row.feeType] }}<br>
             箱数：{{ row.warehouseInInfoVO.cartonsNum }}<br>
             体积：{{ row.warehouseInInfoVO.volume }}m³<br>
             重量：{{ row.warehouseInInfoVO.weight }}Kg
@@ -343,12 +343,14 @@ export default {
         if (r.code === 0) {
           this.escapeBol = false;
           this.finishVisible = false
+          const message = r.data ? '该订单已成功入仓，是否打印？' : "<h3>货物已入仓，存在异常</h3>该订单已成功入仓，是否打印？"
           this.$confirm(
-            '该订单已成功入仓，是否打印？',
+            message,
             '货物已入仓',
             {
               confirmButtonText: '是',
-              cancelButtonText: '否'
+              cancelButtonText: '否',
+              dangerouslyUseHTMLString: true
             }
           ).then(() => {
             this.isShowPrint = true