Merge remote-tracking branch 'origin/project9-8' into project9-8

src/views/template/outcomeWmsJbapplyTemp.vue

@@ -79,6 +79,16 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item label="cj" prop="dealStatus">
+        <el-select v-model="queryParams.cj" placeholder="请选择cj" clearable size="small" :maxlength="1">
+          <el-option
+            v-for="(dict,index) in manufacturer"
+            :key="index"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button
           :class="commonField.queryClass"
@@ -241,20 +251,6 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="cj" prop="cj">
-          <el-select
-            v-model="form.cj"
-            class="normalSelect"
-            placeholder="请选择厂家"
-          >
-            <el-option
-              v-for="item in manufacturer"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
-          </el-select>
-        </el-form-item>
         <el-form-item label="ptype" prop="ptype">
           <el-select
             v-model="form.ptype"
@@ -273,6 +269,22 @@
             />
           </el-select>
         </el-form-item>
+        <el-form-item label="cj" prop="cj"  :rules="[{required: form.ptype === '1', message: '请输入rank的值', trigger: 'blur' }]">
+          <el-select
+            :disabled="isDisabled"
+            v-model="form.cj"
+            style="width: 100%"
+            class="normalSelect"
+            placeholder="请选择厂家"
+          >
+            <el-option
+              v-for="item in manufacturer"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
         <el-form-item label="code" prop="orderCode">
           <el-input
             v-model.trim="form.orderCode"
@@ -517,7 +529,7 @@ export default {
           value: '20'
         }
       ],
-      manufacturer: {},
+      manufacturer: [],
       // 导入列表
       files: [],
       // 下载模板loading
@@ -673,7 +685,6 @@ export default {
   },
 
   created() {
-    console.log('manufacturer', manufacturer)
     this.manufacturer = manufacturer
     this.getList() // 列表查询
     this.getwareHouse() // 查询数据字典
@@ -704,12 +715,13 @@ export default {
           this.warehousedata.qty = null
         }
       } else if (this.form.ptype && this.form.ptype !== '' && this.form.ptype === '1') {
-        if (this.form.pn && this.form.pn !== '' && this.form.lot && this.form.lot !== '' && this.form.rank && this.form.rank !== '') {
+        if (this.form.pn && this.form.pn !== '' && this.form.lot && this.form.lot !== '' && this.form.rank && this.form.rank !== '' && this.form.cj && this.form.cj !== '') {
           const obj = {
             pn: this.form.pn,
             lot: this.form.lot,
             ptype: this.form.ptype,
-            rank: this.form.rank
+            rank: this.form.rank,
+            cj: this.form.cj
           }
           queryByPnAndPtypeAndLot(obj).then(res => {
             this.warehousedata.qty = res.data
@@ -803,6 +815,7 @@ export default {
     },
     clearRank() {
       this.form.rank = null
+      this.form.cj = null
     },
     // 获取所选行详情信息操作
     handleDetail(row) {