生产排产

src/views/mes/pro/scheduleList/index.vue

@@ -505,7 +505,17 @@
           </el-col>
         </el-row>
       </el-form>
+      <el-table :data="AssignList" >
+        <el-table-column type="index" width="55" align="center" />
+        <el-table-column label="编排单号" width="120" prop="arrangeCode" />
+        <el-table-column label="排产数量" width="120" prop="quantity" />
+        <el-table-column label="工作单元" width="120" prop="workunitName" />
+      </el-table>
       <div slot="footer" class="dialog-footer">
+        <el-button
+          type="primary"
+          @click="handleCheckJobAssignment"
+          >检 查</el-button>
         <el-button
           type="primary"
           @click="handleSubmitJobAssignment"
@@ -630,9 +640,10 @@ export default {
         workshopId: null,
         workstationId: null
       },
+      AssignList: [],
       taskId: null,
       Assignform: {
-        quantity: 1,
+        quantity: 0,
         workunitName: ''
       },
       scheduleBtnDis: false,
@@ -712,8 +723,10 @@ export default {
       this.arrangCodeVisible = true
     },
     handleSubmitJobAssignment() {
+      if(!this.Assignform.quantity || this.Assignform.quantity === 0) return this.$modal.msgError("分派任务数量不可为0")
+      if(!this.AssignList || this.AssignList.length === 0) return this.$modal.msgError("请先点击检查按钮，检查数据")
       let datas = Object.assign({}, this.selectedRows[0]);
-      datas.taskWorkunit = this.Assignform;
+      datas.taskWorkunit = this.AssignList[0];
       delete datas.proWorkorderList;
       putProtaskSplit(datas).then((res) => {
         // console.log(res, 'res333')
@@ -723,6 +736,10 @@ export default {
         }
       });
     },
+    handleCheckJobAssignment() {
+      if(!this.Assignform.quantity || this.Assignform.quantity === 0) return this.$modal.msgError("分派任务数量不可为0")
+      this.AssignList = [JSON.parse(JSON.stringify(this.Assignform))]
+    },
     handleSubmitSplit() {
       let datas = Object.assign({}, this.splitform);
       datas['taskId'] = this.selectedRows[0].taskId
@@ -780,8 +797,9 @@ export default {
       this.workstationList = response.rows
     },
     handleJobAssignment() {
+      this.AssignList = []
       this.Assignform = {
-        quantity: 1,
+        quantity: 0,
         workunitName: null,
         workunitId: null
       };

src/views/mes/tm/tool/index.vue

@@ -18,7 +18,7 @@
             />
           </el-form-item>
           <el-form-item label="刀模版具类型" prop="toolTypeId">
-            <el-select v-model="queryParams.toolTypeId" placeholder="请选择类型">
+            <el-select v-model="queryParams.toolTypeId" placeholder="请选择类型" clearable>
               <el-option
                 v-for="dict in toolTypeOptions"
                 :key="dict.toolTypeId"