Merge remote-tracking branch 'origin/master'

src/views/plan/whiteOrder/index.vue

@@ -244,16 +244,20 @@
       <el-form ref="form" :model="form" :rules="addrules" label-width="80px">
         <!-- 第一行 -->
         <el-row>
+
           <!-- 第一列 -->
-          <el-col :offset="1" :span="9">
+          <el-col :offset="1" :span="18">
-            <el-form-item label-width="100px" label="物料号" prop="prodCode">
+            <el-form-item label-width="100px" label="物料名称" prop="prodDesc">
-              <el-input @focus="selectMateriel" readonly v-model="form.prodCode" placeholder="点击选择物料"/>
+              <el-input type="textarea" clearable v-model="form.prodDesc" placeholder="点击选择物料"/>
             </el-form-item>
           </el-col>
+          <el-col :offset="0" :span="2">
+              <el-button icon="el-icon-search" circle @click="selectMateriel()"></el-button>
+          </el-col>
           <!-- 第二列 -->
-          <el-col :offset="1" :span="9">
+          <el-col :offset="1" :span="18" >
-            <el-form-item label-width="100px" label="物料名称" prop="prodDesc">
+            <el-form-item label-width="100px" label="物料编码" prop="prodCode">
-              <el-input @focus="selectMateriel" readonly v-model="form.prodDesc" placeholder="点击选择物料"/>
+              <el-input type="textarea"clearable v-model="form.prodCode" placeholder="点击选择物料"/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -561,8 +565,8 @@ export default {
         factoryCode: null,
         orderType: null,
         orderCode: null,
-        prodCode: null,
+        prodCode: '',
-        prodDesc: null,
+        prodDesc: '',
         quantity: null,
         quantitySplit: null,
         unit: null,
@@ -580,8 +584,8 @@ export default {
       },
       // 表单参数
       form: {
-        prodCode: null,
+        prodCode: '',
-        prodDesc: null,
+        prodDesc: '',
         planProDate: null,
         planComplete: null,
         quantity: null,
@@ -973,11 +977,21 @@ export default {
       var code = '';
       var desc = '';
       for (let i = 0; i < this.selectMaterielList.length; i++) {
-        code = code + this.selectMaterielList[i].productCode + ',';
+        if(this.form.prodCode.indexOf(this.selectMaterielList[i].productCode)<0){
-        desc = desc + this.selectMaterielList[i].productDescZh + ',';
+          code = code + this.selectMaterielList[i].productCode + ',';
+        }
+        
+        if(this.form.prodDesc.indexOf(this.selectMaterielList[i].productDescZh)<0){
+          desc = desc + this.selectMaterielList[i].productDescZh + ',';
+        }else{
+          this.$message({
+            message: this.selectMaterielList[i].productDescZh+'已经选择',
+            type: 'warning'
+          })
+        }
       }
-      this.form.prodCode = code;
+      this.form.prodCode += code;
-      this.form.prodDesc = desc;
+      this.form.prodDesc += desc;
       // 关闭选择物料弹窗
       this.innerVisible = false;
     },
@@ -1168,8 +1182,8 @@ export default {
         factoryCode: null,
         orderType: null,
         orderCode: null,
-        prodCode: null,
+        prodCode: '',
-        prodDesc: null,
+        prodDesc: '',
         quantity: null,
         quantitySplit: null,
         unit: null,