Merge branch '0.8.X' of http://49.232.154.205:10100/DeXun/klp-oa into 0.8.X

klp-ui/src/components/KLPService/ProductSelect/index.vue

@@ -163,6 +163,10 @@ export default {
     filters: {
       type: Object,
       default: () => ({})
+    },
+    defaultQueryParams: {
+      type: Object,
+      default: () => ({})
     }
   },
   data() {
@@ -235,6 +239,9 @@ export default {
         this.getList();
         this.listRecentlySelected();
       }
+    },
+    defaultQueryParams(val) {
+      this.queryParams = { ...this.queryParams, ...val };
     }
   },
   methods: {

klp-ui/src/components/KLPService/RawMaterialSelect/index.vue

@@ -151,6 +151,10 @@ export default {
     filters: {
       type: Object,
       default: () => ({})
+    },
+    defaultQueryParams: {
+      type: Object,
+      default: () => ({})
     }
   },
   data() {
@@ -234,6 +238,9 @@ export default {
         this.listRecentlySelected();
         this.getList();
       }
+    },
+    defaultQueryParams(val) {
+      this.queryParams = { ...this.queryParams, ...val };
     }
   },
   methods: {

klp-ui/src/components/KLPService/SchemeSelect/index.vue

@@ -72,7 +72,12 @@
           </el-select>
         </el-form-item>
       </el-form>
-      <div style="margin-bottom: 8px;">
+      <el-form :model="form" ref="taskForm" label-width="80px" size="small">
+        <el-form-item label="入场卷号" prop="enterCoilNos" :rules="[{ required: true, message: '请输入入场卷号', trigger: 'blur' }]">
+          <el-input v-model="form.enterCoilNos" placeholder="请输入入场卷号" style="width: 280px;" />
+        </el-form-item>
+      </el-form>
+      <!-- <div style="margin-bottom: 8px;">
         <CoilSelector use-trigger multiple @confirm="handleCoilConfirm">
           <el-button type="primary" plain icon="el-icon-plus" size="small">选择钢卷</el-button>
         </CoilSelector>
@@ -86,7 +91,7 @@
           <CurrentCoilNo @click.native="handleClickCoil(coil)" :currentCoilNo="coil.currentCoilNo || coil.coilNo || ''" />
           <el-button type="text" icon="el-icon-close" size="mini" @click="selectedCoils.splice(index, 1)"></el-button>
         </div>
-      </div>
+      </div> -->
     </div>
 
     <div slot="footer" class="dialog-footer">
@@ -247,7 +252,8 @@ export default {
             taskCode: this.form.taskCode,
             taskType: this.form.taskType,
             belongCompany: this.form.belongCompany || undefined,
-            coilIds: coilIds || undefined
+            coilIds: coilIds || undefined,
+            enterCoilNos: this.form.enterCoilNos || undefined
           });
           this.dialogVisible = false;
         }