商品，路线新增字段

src/utils/dict.js

@@ -64,6 +64,9 @@ export const DICT_TYPE = {
   ECW_TRANSPORT_TYPE: 'transport_type', //货运方式
   ECW_CHARGE_TYPE: 'warehouse_charge_type',  //仓储收费方式
   ECW_SHELF_TYPE: 'shelf_type',     //货架类型
+  ECW_PRODUCT_MATERIAL: 'product_material',  //商品材质
+  ECW_PACKAGING_TYPE: 'packaging_type',   //包装要求
+  ECW_CONTAINER_LOCATION: 'container_location', //默认货柜位置
 
   //--------ecw---------
   CUSTOMER_STATUS: 'customer_status',

src/views/ecw/productPrice/index.vue

@@ -105,16 +105,16 @@
 
     <!-- 对话框(添加 / 修改) -->
     <el-dialog :title="title" :visible.sync="open" width="900px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="110px">
 
-        <el-form-item label="产品类型" prop="typeId">
+        <el-form-item label="商品类型" prop="typeId">
           <el-select v-model="form.typeId" placeholder="选择产品类型" disabled>
             <el-option v-for="type in typeList" :key="type.id" :label="type.titleZh" :value="type.id"/>
           </el-select>
         </el-form-item>
       
 
-        <el-form-item label="产品名称" prop="titleZh">
+        <el-form-item label="商品名称" prop="titleZh">
           <el-input v-model="form.titleZh"  disabled />
         </el-form-item>
 
@@ -218,6 +218,60 @@
               </el-radio-group>
         </el-form-item>
 
+
+        <div style="font-size:20px;">
+          基础信息
+        </div>
+
+        <el-form-item label="需要预约入仓" prop="needBook">
+          <el-radio v-model.number="form.needBook" :label="1">是</el-radio>
+          <el-radio v-model.number="form.needBook" :label="0">否</el-radio>
+        </el-form-item>
+
+        <el-form-item label="每日入仓上限" prop="dayLimit">
+          <el-input v-model.number="form.dayLimit" type="number">
+            <template slot="append">立方米</template>
+          </el-input>
+        </el-form-item>
+
+        <el-form-item label="货柜位置" prop="containerLocation">
+          <el-select v-model="form.containerLocation" placeholder="选择货柜位置" clearable>
+            <el-option v-for="locationItem in locationList" :key="locationItem.value" :label="locationItem.label" :value="locationItem.value"/>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="方数要求" prop="square">
+          <el-input v-model.number="form.square" type="number">
+            <!-- <template slot="append">立方米</template> -->
+          </el-input>
+        </el-form-item>
+
+        <el-form-item label="重货标准" prop="zhongLinjie">
+          <el-row  class="mb8">
+            <el-col :span="12">
+              <el-input v-model.number="form.zhongLinjie" type="number">
+                <template slot="append">kg/cbm</template>
+              </el-input>
+            </el-col>
+            <el-col :span="10">
+              <el-switch v-model="zhongLinjieFlag" @change="zhongpaoChange('zhong')"></el-switch>
+            </el-col>
+          </el-row>
+        </el-form-item>
+
+        <el-form-item label="泡货标准" prop="paoLinjie">
+          <el-row  class="mb8">
+            <el-col :span="12">
+              <el-input v-model.number="form.paoLinjie" type="number">
+                <template slot="append">kg/cbm</template>
+              </el-input>
+            </el-col>
+            <el-col :span="10">
+              <el-switch v-model="paoLinjieFlag" @change="zhongpaoChange('pao')"></el-switch>
+            </el-col>
+          </el-row>
+        </el-form-item>
+
       </el-form>
 
       <div slot="footer" class="dialog-footer">
@@ -255,6 +309,13 @@ export default {
       routeParams:{},    //路线搜索条件
       isUpdate: false,   //更新操作
 
+      //货柜位置
+      locationList:[],
+      //重货默认开启状态
+      zhongLinjieFlag: true,
+      //泡货默认开启状态
+      paoLinjieFlag: true,
+
       // 遮罩层
       loading: true,
       // 导出遮罩层
@@ -297,12 +358,18 @@ export default {
         transportPrice: [{ required: true, message: "海运费不能为空", trigger: "blur" }],
         clearancePrice: [{ required: true, message: "清关费不能为空", trigger: "blur" }],
         advanceStatus: [{ required: true, message: "是否预付不能为空", trigger: "blur" }],
+        containerLocation:[{ required: true, message: "货柜位置不能为空", trigger: "blur" }],
+        square:[{ required: true, message: "方数不能为空", trigger: "blur" }],
+        // zhongLinjie:[{ required: true, message: "默认重货标准不能为空", trigger: "blur" }],
+        // paoLinjie:[{ required: true, message: "默认泡货标准不能为空", trigger: "blur" }],
+        needBook:[{ required: true, message: "预约入仓不能为空", trigger: "blur" }],
       },
 
       transportDatas: getDictDatas(DICT_TYPE.ECW_TRANSPORT_TYPE),
       advanceStatusDictDatas: getDictDatas(DICT_TYPE.ADVANCE_STATUS),
       AuditStatusEnum: AuditStatusEnum,
       auditStatusDictDatas: getDictDatas(DICT_TYPE.AUDIT_STATUS),
+      locationList: getDictDatas(DICT_TYPE.ECW_CONTAINER_LOCATION),
       lineList: []
     };
   },
@@ -365,7 +432,10 @@ export default {
   },
 
   created() {
+    // this.transportDatas = getDictDatas(DICT_TYPE.ECW_TRANSPORT_TYPE);
+    // console.log(this.transportDatas);
     let productJson = localStorage.getItem('product');
+    // console.log(productJson);
     this.product = eval('(' + productJson + ')');
 
     let typeListJson = localStorage.getItem('typeList');
@@ -517,6 +587,14 @@ export default {
       this.form.typeId = this.product.typeId;
       this.form.titleZh = this.product.titleZh;
       this.form.titleEn = this.product.titleEn;
+
+      this.form.needBook = this.product.needBook;
+      this.form.dayLimit = this.product.dayLimit;
+      this.form.containerLocation = this.product.containerLocation;
+      this.form.square = this.product.square;
+      this.form.paoLinjie = this.product.paoLinjie;
+      this.form.zhongLinjie = this.product.zhongLinjie;
+
       if(this.currecyList) {
         let priceUnitId = this.currecyList[0].id;
         this.form.transportPriceUnit = priceUnitId;
@@ -529,7 +607,9 @@ export default {
       }
       this.isUpdate = false;
       this.open = true;
-      this.title = "添加产品价格";
+      this.title = "添加路线价格";
+      this.setZhongValue();
+      this.setPaoValue();
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -545,8 +625,10 @@ export default {
         this.form.titleZh = this.product.titleZh;
         this.form.titleEn = this.product.titleEn;
         this.isUpdate = true;
+
+        // console.log(this.form);
         this.open = true;
-        this.title = "修改产品价格";
+        this.title = "修改路线价格";
       });
     },
 
@@ -627,7 +709,28 @@ export default {
           this.$download.excel(response, '${table.classComment}.xls');
           this.exportLoading = false;
         }).catch(() => {});
-    }
+    },
+
+    zhongpaoChange(type) {
+      if(type == 'zhong') {
+        this.setZhongValue();
+      } else if(type == 'pao') {
+        this.setPaoValue();
+      }
+    },
+
+    setZhongValue() {
+      // console.log(this.product);
+      if(this.zhongLinjieFlag && this.product.zhongLinjie) {
+          this.form.zhongLinjie = parseFloat(this.product.zhongLinjie);
+      }
+    },
+
+    setPaoValue() {
+      if(this.paoLinjieFlag && this.product.paoLinjie) {
+        this.form.paoLinjie = parseFloat(this.product.paoLinjie);
+      }
+    },
   }
 };
 </script>