作业分派和生产工单

src/api/mes/pro/protask.js

@@ -18,6 +18,15 @@ export function listGanttTaskList(query) {
   });
 }
 
+// 作业分派
+export function putProtaskSplit(query) {
+  return request({
+    url: "/mes/pro/protask/split",
+    method: "put",
+    data: query,
+  });
+}
+
 // 查询生产任务列表加上了字段workunitName
 export function listTaskListDetail(query) {
   return request({

src/views/mes/pro/workorder/components/ProogingProcess.vue

@@ -4,6 +4,7 @@
       <el-table-column label="序号" prop="idx" width="80" align="center"  />
       <el-table-column label="工序编码" prop="processCode" width="150" align="center" />
       <el-table-column label="工序名称" prop="processName" align="center" />
+      <el-table-column label="工序顺序" prop="idx" align="center" />
       <el-table-column label="工作中心编码" prop="workstationCode" width="150" align="center" />
       <el-table-column label="工作中心" prop="workstationName" align="center" />
       <el-table-column v-if="mode === 'make'" label="工作单元名称" width="200" prop="workunitName" align="center" >

src/views/mes/pro/workorder/indexApply.vue

@@ -155,15 +155,19 @@
           v-hasPermi="['mes:pro:workorder:dofinish']">生产打样下达
         </el-button>
       </el-col>
-      <el-col :span="1.5">
+      <el-col :span="1.2">
         <el-button type="warning" plain size="mini" v-print="printContent" id="printbtn" style="display: none"
           >打印工单
         </el-button>
-        <el-button type="warning" plain size="mini" ref="printbtn" @click="handlePrint" :loading="printloading"
+        <el-button type="warning" plain size="mini" style="margin-left: 0;" icon="el-icon-printer" ref="printbtn" @click="handlePrint" :loading="printloading" v-hasPermi="['mes:pro:workorder:print']"
           >打印工单
         </el-button>
       </el-col>
-      
+      <el-col :span="1.5">
+        <el-button type="warning" plain icon="el-icon-close" size="mini" @click="handleClose"
+          v-hasPermi="['mes:pro:workorder:close']">关闭
+        </el-button>
+      </el-col>
       <!-- <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"
@@ -559,7 +563,7 @@ import {
   updateWorkorder,
   dofinish,
   printInfo,
-  doCheckToolNum
+  doCheckToolNum,
 } from "@/api/mes/pro/workorder";
 
 import { addProtaskList } from "@/api/mes/pro/protask";
@@ -790,6 +794,15 @@ export default {
       }
       this.combinationCodes = [combinationCode];
     },
+    handleClose(){
+      if(this.ids.length === 0) return this.$message.warning('请勾选要关闭的工单')
+      updateWorkorder({
+        "workorderId": this.ids.join(','),
+        "status": "CLOSE"
+      }).then(({data}) => {
+
+      })
+    },
     showArrangDetail(row, arrangeCode) {
       this.arrangeOpen = true;
       if (row.status === 'ORCHESTRATED') {

src/views/mes/qc/ipqc/index.vue

@@ -60,7 +60,7 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="primary"
           plain
@@ -69,7 +69,7 @@
           @click="handleAdd"
           v-hasPermi="['mes:qc:ipqc:add']"
         >新增</el-button>
-      </el-col>
+      </el-col> -->
       <el-col :span="1.5">
         <el-button
           type="success"