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

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

@@ -174,13 +174,16 @@
 
         <el-tab-pane label="添加新品名" name="second" v-if="!edit">
           <el-descriptions border :column="2">
-            <el-descriptions-item label="中文品名">
+            <el-descriptions-item>
+              <template slot="label"><span style="color: red">*</span> 中文品名</template>
               <product-selector v-model="form1.prodId" @change="onProductChange"/>
             </el-descriptions-item>
-            <el-descriptions-item label="英文品名">
+            <el-descriptions-item>
+              <template slot="label"><span style="color: red">*</span> 英文品名</template>
               <product-selector lang="En" v-model="form1.prodId" @change="onProductChange"/>
             </el-descriptions-item>
             <el-descriptions-item label="品牌">
+              <template slot="label"><span style="color: red">*</span> 品牌</template>
               <el-select
                 v-model="form1.brand"
                 placeholder="可修改"
@@ -195,8 +198,14 @@
                 </el-option>
               </el-select>
             </el-descriptions-item>
-            <el-descriptions-item label="是否备案">{{ isBeian1 }}</el-descriptions-item>
-            <el-descriptions-item label="收费模式">{{ feeType1 }}</el-descriptions-item>
+            <el-descriptions-item label="是否备案">
+              <template slot="label"><span style="color: red">*</span> 是否备案</template>
+              {{ isBeian1 }}
+            </el-descriptions-item>
+            <el-descriptions-item label="收费模式">
+              <template slot="label"><span style="color: red">*</span> 收费模式</template>
+              {{ feeType1 }}
+            </el-descriptions-item>
             <el-descriptions-item label="填单参数">非填单货物</el-descriptions-item>
           </el-descriptions>
           <el-form ref="form" :model="form" label-width="80px" style="margin-top: 20px">
@@ -219,6 +228,9 @@
                 :data="tableData1"
                 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="tableData1[$index].id">
@@ -232,6 +244,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="tableData1[$index].id">{{ getDictDataLabel(DICT_TYPE.ECW_PACKAGING_TYPE, tableData1[$index].unit) }}</span>
@@ -264,6 +279,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="tableData1[$index].id">{{ tableData1[$index].volume }}</span>
@@ -272,6 +290,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="tableData1[$index].id">{{ tableData1[$index].weight }}</span>
@@ -280,6 +301,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="tableData1[$index].id">{{ tableData1[$index].quantityAll }}</span>
@@ -424,7 +448,7 @@ export default {
         quantityAll: [{required: true, message: "数量不能为空", trigger: "change"}]
       },
       form1: {
-        "brand": "0",
+        "brand": undefined,
         "brandType": 0,
         "inTime": "",
         "material": "",
@@ -463,7 +487,7 @@ export default {
     opened(val) {
       if (val) {
         this.form.material = this.warehousing.material
-        this.form.brand = this.warehousing.brand || '0'
+        this.form.brand = this.warehousing.brand
         this.handleBrandChange(this.form.brand)
       } else {
         this.$emit('update:visible', false)