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

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

@@ -11,7 +11,7 @@
             <el-descriptions-item label="中文品名">{{ warehousing.prodTitleZh }}</el-descriptions-item>
             <el-descriptions-item label="英文品名">{{ warehousing.prodTitleEn }}</el-descriptions-item>
             <el-descriptions-item label="品牌">
-              <span v-if="warehousing.orderWarehouseInBackItemDoList && warehousing.orderWarehouseInBackItemDoList.length">{{ form.brand ? brand : '无' }}</span>
+              <span v-if="false">{{ form.brand ? brand : '无' }}</span>
               <el-select
                 v-else v-model="form.brand"
                 placeholder="可修改"
@@ -29,16 +29,22 @@
             <el-descriptions-item label="是否备案">{{ isBeian }}</el-descriptions-item>
             <el-descriptions-item label="收费模式">{{ feeType }}</el-descriptions-item>
             <el-descriptions-item label="填单参数">
-              箱数：{{ warehousing.num }}<br>
-              体积：{{ warehousing.volume }}m³<br>
-              重量：{{ warehousing.weight }}Kg
+              箱数：
+              <el-input size="mini" v-if="edit" v-model="warehousing.num" style="display: inline-block;width: 100px"></el-input>
+              <span v-else>{{ warehousing.num }}</span><br>
+              体积：
+              <el-input size="mini" v-if="edit" v-model="warehousing.volume" style="display: inline-block;width: 100px"></el-input>
+              <span v-else>{{ warehousing.volume }}</span>m³<br>
+              重量：
+              <el-input size="mini" v-if="edit" v-model="warehousing.weight" style="display: inline-block;width: 100px"></el-input>
+              <span v-else>{{ warehousing.weight }}</span>Kg
             </el-descriptions-item>
           </el-descriptions>
           <el-form ref="form" :model="form" label-width="80px" style="margin-top: 20px">
             <el-form-item label="材质">
               <dict-selector :type="DICT_TYPE.ECW_PRODUCT_MATERIAL" v-model="form.material"></dict-selector>
             </el-form-item>
-            <el-form-item label="入仓时间">
+            <el-form-item label="入仓时间" v-if="!edit">
               <el-date-picker v-model="form.inTime" type="datetime" placeholder="请选择入仓时间" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
             </el-form-item>
           </el-form>
@@ -56,7 +62,7 @@
                 <el-table-column label="箱数" width="150px">
                   <template v-slot="{r,c,$index}">
                     <el-form-item :rules="tableFormRules.cartonsNum" :prop="$index + '.cartonsNum'">
-                      <span v-if="tableData[$index].id">
+                      <span v-if="tableData[$index].id && !edit">
                         {{ tableData[$index].cartonsNum }}
                         {{ getDictDataLabel(DICT_TYPE.ECW_PACKAGE_TYPE, tableData[$index].unit) }}
                       </span>
@@ -69,31 +75,31 @@
                 <el-table-column label="包装类型" width="100px">
                   <template v-slot="{r,c,$index}">
                     <el-form-item>
-                      <span v-if="tableData[$index].id">{{ getDictDataLabel(DICT_TYPE.ECW_PACKAGE_TYPE, tableData[$index].unit) }}</span>
+                      <span v-if="tableData[$index].id && !edit">{{ getDictDataLabel(DICT_TYPE.ECW_PACKAGE_TYPE, tableData[$index].unit) }}</span>
                       <dict-selector v-else :type="DICT_TYPE.ECW_PACKAGE_TYPE" v-model="tableData[$index].unit"></dict-selector>
                     </el-form-item>
                   </template>
                 </el-table-column>
                 <el-table-column label="长(cm)">
                   <template v-slot="{r,c,$index}">
-                    <el-form-item :rules="tableFormRules.boxGauge1" :prop="$index + '.boxGauge1'">
-                      <span v-if="tableData[$index].id">{{ tableData[$index].boxGauge ? tableData[$index].boxGauge.split('*')[0] : '' }}</span>
+                    <el-form-item :rules="tableFormRules.boxGauge1" :prop="!tableData[$index].id && $index + '.boxGauge1'">
+                      <span v-if="tableData[$index].id && !edit">{{ tableData[$index].boxGauge ? tableData[$index].boxGauge.split('*')[0] : '' }}</span>
                       <el-input v-else v-model.number="tableData[$index].boxGauge1" placeholder="" @blur="handleVolume($index)"></el-input>
                     </el-form-item>
                   </template>
                 </el-table-column>
                 <el-table-column label="宽(cm)">
                   <template v-slot="{r,c,$index}">
-                    <el-form-item :rules="tableFormRules.boxGauge2" :prop="$index + '.boxGauge2'">
-                      <span v-if="tableData[$index].id">{{ tableData[$index].boxGauge ? tableData[$index].boxGauge.split('*')[1] : '' }}</span>
+                    <el-form-item :rules="tableFormRules.boxGauge2" :prop="!tableData[$index].id && $index + '.boxGauge2'">
+                      <span v-if="tableData[$index].id && !edit">{{ tableData[$index].boxGauge ? tableData[$index].boxGauge.split('*')[1] : '' }}</span>
                       <el-input v-else v-model.number="tableData[$index].boxGauge2" placeholder="" @blur="handleVolume($index)"></el-input>
                     </el-form-item>
                   </template>
                 </el-table-column>
                 <el-table-column label="高(cm)">
                   <template v-slot="{r,c,$index}">
-                    <el-form-item :rules="tableFormRules.boxGauge3" :prop="$index + '.boxGauge3'">
-                      <span v-if="tableData[$index].id">{{ tableData[$index].boxGauge ? tableData[$index].boxGauge.split('*')[2] : '' }}</span>
+                    <el-form-item :rules="tableFormRules.boxGauge3" :prop="!tableData[$index].id && $index + '.boxGauge3'">
+                      <span v-if="tableData[$index].id && !edit">{{ tableData[$index].boxGauge ? tableData[$index].boxGauge.split('*')[2] : '' }}</span>
                       <el-input v-else v-model.number="tableData[$index].boxGauge3" placeholder="" @blur="handleVolume($index)"></el-input>
                     </el-form-item>
                   </template>
@@ -101,7 +107,7 @@
                 <el-table-column label="体积(m³)">
                   <template v-slot="{r,c,$index}">
                     <el-form-item :rules="tableFormRules.volume" :prop="$index + '.volume'">
-                      <span v-if="tableData[$index].id">{{ tableData[$index].volume }}</span>
+                      <span v-if="tableData[$index].id && !edit">{{ tableData[$index].volume }}</span>
                       <el-input v-else v-model.number="tableData[$index].volume" placeholder=""></el-input>
                     </el-form-item>
                   </template>
@@ -109,7 +115,7 @@
                 <el-table-column label="重量(Kg)">
                   <template v-slot="{r,c,$index}">
                     <el-form-item :rules="tableFormRules.weight" :prop="$index + '.weight'">
-                      <span v-if="tableData[$index].id">{{ tableData[$index].weight }}</span>
+                      <span v-if="tableData[$index].id && !edit">{{ tableData[$index].weight }}</span>
                       <el-input v-else v-model.number="tableData[$index].weight" placeholder=""></el-input>
                     </el-form-item>
                   </template>
@@ -117,7 +123,7 @@
                 <el-table-column label="数量" width="130px">
                   <template v-slot="{r,c,$index}">
                     <el-form-item :rules="tableFormRules.quantityAll" :prop="$index + '.quantityAll'">
-                      <span v-if="tableData[$index].id">{{ tableData[$index].quantityAll }}</span>
+                      <span v-if="tableData[$index].id && !edit">{{ tableData[$index].quantityAll }}</span>
                       <el-input v-else v-model.number="tableData[$index].quantityAll" placeholder="">
                         <template slot="append">个</template>
                       </el-input>
@@ -127,7 +133,7 @@
                 <el-table-column label="快递单号">
                   <template v-slot="{r,c,$index}">
                     <el-form-item>
-                      <span v-if="tableData[$index].id">{{ tableData[$index].expressNo }}</span>
+                      <span v-if="tableData[$index].id && !edit">{{ tableData[$index].expressNo }}</span>
                       <el-input v-else v-model="tableData[$index].expressNo" placeholder=""></el-input>
                     </el-form-item>
                   </template>
@@ -588,7 +594,13 @@ export default {
       return this.brandList.find(e => e.id === this.form1.brand) || ''
     },
     tableData() {
-      return [...this.warehousing.orderWarehouseInBackItemDoList, ...this.form.orderWarehouseInItemDoList]
+      if (!this.edit){
+        return [...this.warehousing.orderWarehouseInBackItemDoList, ...this.form.orderWarehouseInItemDoList]
+      }
+
+      // 入仓修改的时候
+      this.form.orderWarehouseInItemDoList = this.warehousing.orderWarehouseInBackItemDoList
+      return this.form.orderWarehouseInItemDoList
     },
     tableData1() {
       return this.form1.orderWarehouseInItemDoList
@@ -638,7 +650,7 @@ export default {
           return brand.titleZh
         }
       }
-      return ''
+      return '0'
     }
   }
 }

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

@@ -87,7 +87,7 @@
 
     <h2 v-if="orderSpecialNeeds.length > 0">特殊需求</h2>
     <el-form ref="form" :model="form" label-width="120px" style="max-width: 550px;">
-      <el-form-item :label="item.label" v-for="(item, index) in orderSpecialNeeds" :key="item.value">
+      <el-form-item :label="item.label" v-for="(item, index) in orderSpecialNeeds" :key="item.value" style="width: 300px">
         <el-input v-model="form.orderSpecialNeedReceivableReqVoList[index].receivableMoney" :placeholder="'请输入' + item.label">
           <el-select v-model="form.orderSpecialNeedReceivableReqVoList[index].receivableMoneyCurrency" placeholder="请选择" slot="append" style="width: 100px">
             <el-option