取消完工和过程检验删除工单号

src/api/mes/pro/scheduleList.js

@@ -101,4 +101,19 @@ export function getdefaultWorkCenterList() {
   });
 }
 
+// 获取完工的任务
+export function listFinishTaskWorkunits(query) {
+  return request({
+    url: "/mes/pro/taskWorkunit/listFinishTaskWorkunits",
+    method: "get",
+    params: query
+  });
+}
+// 打开完工的任务
+export function openTaskWorkunit(id) {
+  return request({
+    url: "/mes/pro/taskWorkunit/openTaskWorkunit/" + id,
+    method: "get"
+  });
+}
 

src/api/mes/qc/ipqc.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询过程检验单列表
 export function listIpqc(query) {
   return request({
-    url: '/mes/qc/ipqc/lists',
+    url: '/mes/qc/ipqc/listNotCheckUser',
     method: 'get',
     params: query
   })

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

@@ -144,6 +144,14 @@
           @click="handleJobAssignment"
         >作业分派</el-button>
       </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          size="mini"
+          @click="handleOpenTask"
+        >取消完工</el-button>
+      </el-col>
       <!-- <el-col :span="1.5">
         <el-button
           type="primary"
@@ -485,6 +493,17 @@
         <el-button @click="arrangCodeVisible = false">取 消</el-button>
       </div>
     </el-dialog>
+    <el-dialog
+      title="取消完工"
+      :visible.sync="isVisibleTASK"
+      width="1000px"
+      append-to-body
+    >
+      <taskList v-if="isVisibleTASK" ref="taskListRef" ></taskList>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="isVisibleTASK = false">取 消</el-button>
+      </div>
+    </el-dialog>
 
     <WorkuintSelect
       ref="WorkunitSelect"
@@ -510,10 +529,11 @@ import BrandSelect from "@/components/TmTool/index.vue";
 import OrderList from './orderList.vue'
 import jobAssign from './jobAssign.vue'
 import arrangCodeList from './arrangCodeList.vue'
+import taskList from './taskList.vue'
 import WorkuintSelect from "./workunitSelectSche.vue";
 import dayjs from 'dayjs'
 export default {
-  components: {BrandSelect, OrderList, arrangCodeList, WorkuintSelect, jobAssign},
+  components: {BrandSelect, OrderList, arrangCodeList, WorkuintSelect, jobAssign, taskList},
   dicts: ['TASK_STATUS'],
   name: "scheduleList",
   data() {
@@ -570,6 +590,7 @@ export default {
         scheduleStartDate: null,
         scheduleEndDate: null,
       },
+      isVisibleTASK: false,
       editTimeLast: null,
       jobAssignmentVisible: false,
       arrangeCode: null,
@@ -585,6 +606,9 @@ export default {
     this.hanldeGetdefaultWorkCenterList()
   },
   methods: {
+    handleOpenTask(){
+      this.isVisibleTASK = true
+    },
     clickTask(arrangeCode){
       this.arrangeCode= arrangeCode
       this.isOrder = true

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

+<template>
+    <div>
+      <el-table
+        v-loading="loading"
+        :data="itemList"
+      >
+        <!-- <el-table-column type="selection" width="55" align="center"/> -->
+        <el-table-column label="编排单号" width="180" prop="arrangeCode" />
+        <el-table-column label="任务单编码" width="120" prop="taskCode" />
+        <el-table-column label="排产任务ID" width="80" prop="taskWorkunitId" />
+        <el-table-column
+          label="工序名称"
+          align="center"
+          prop="processName"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          label="工作中心"
+          align="center"
+          prop="workstationName"
+          width="140"
+        />
+        <el-table-column
+          label="作业单元名称"
+          align="center"
+          prop="workunitName"
+          width="200"
+        />
+        <el-table-column
+          label="操作"
+          align="center"
+          class-name="small-padding fixed-width"
+          fixed="right"
+        >
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-edit"
+              @click="opentask(scope.row)"
+              >打开</el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination v-show="total > 0" :total="total" 
+      :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
+    </div>
+</template>
+
+<script>
+import {
+  listFinishTaskWorkunits,
+  openTaskWorkunit
+} from "@/api/mes/pro/scheduleList";
+
+export default {
+  name: "taskList",
+  components: { },
+  data() {
+    return {
+      showFlag: false,
+      // 选中数组
+      ids: [],
+      selectedRows: [],
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10
+      },
+      total: 0,
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 物料产品表格数据
+      itemList: null,
+      loading: false,
+    };
+  },
+  created() {
+
+  },
+  mounted() {
+    this.getList();
+  },
+  methods: {
+    opentask(row) {
+      openTaskWorkunit(row.taskWorkunitId).then(res => {
+        if(res.code === 200) {
+          this.getList()
+        }
+      })
+    },
+    /** 查询物料编码列表 */
+    getList() {
+      this.loading = true;
+      listFinishTaskWorkunits(this.queryParams).then((response) => {
+        this.itemList = response.rows;
+        this.total = response.total
+        this.loading = false;
+      });
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.queryParams.statusArr = ["ORCHESTRATED"]
+      this.handleQuery();
+    },
+     // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.workorderId);
+      this.single = selection.length != 1;
+      this.multiple = !selection.length;
+      this.selectedRows = selection;
+    },
+  },
+};
+</script>

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

@@ -6,14 +6,10 @@
       </el-form-item>
       <el-form-item label="检验类型" prop="ipqcType">
         <el-select v-model="queryParams.ipqcType" placeholder="请选择检验类型" clearable>
-          <el-option v-for="dict in dict.type.mes_ipqc_type" :key="dict.value" :label="dict.label"
+          <el-option v-for="dict in dict.type.mes_ipqc_type_pc" :key="dict.value" :label="dict.label"
             :value="dict.value" />
         </el-select>
       </el-form-item>
-      <el-form-item label="工单编号" prop="workorderCode">
-        <el-input v-model="queryParams.workorderCode" placeholder="请输入工单编码" clearable
-          @keyup.enter.native="handleQuery" />
-      </el-form-item>
       <el-form-item label="编排单号" prop="arrangeCode">
         <el-input v-model="queryParams.arrangeCode" placeholder="请输入编排单号" clearable
           @keyup.enter.native="handleQuery" />
@@ -77,10 +73,9 @@
       </el-table-column>
       <el-table-column label="检验类型" align="center" prop="ipqcType">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.mes_ipqc_type" :value="scope.row.ipqcType" />
+          <dict-tag :options="dict.type.mes_ipqc_type_pc" :value="scope.row.ipqcType" />
         </template>
       </el-table-column>
-      <el-table-column label="工单编号" width="150px" align="center" prop="workorderCode" />
       <el-table-column label="编排单号" width="150px" align="center" prop="arrangeCode" />
       <el-table-column label="产品物料编码" width="120px" align="center" prop="sapItemCode" />
       <el-table-column label="产品物料名称" width="150px" align="center" prop="itemName" :show-overflow-tooltip="true" />
@@ -142,18 +137,14 @@
           <el-col :span="8">
             <el-form-item label="检验类型" prop="ipqcType">
               <el-select v-model="form.ipqcType" placeholder="请选择检验类型">
-                <el-option v-for="dict in dict.type.mes_ipqc_type" :key="dict.value" :label="dict.label"
+                <el-option v-for="dict in dict.type.mes_ipqc_type_pc" :key="dict.value" :label="dict.label"
                   :value="dict.value"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="工单编码" prop="workorderCode">
-              <el-input v-if="form.ipqcId == null" v-model="form.workorderCode" placeholder="请选择生产工单">
-                <el-button slot="append" icon="el-icon-search" @click="handleWorkorderSelect"></el-button>
-              </el-input>
-              <!--保存过则不允许修改工单，需要修改则删除重做-->
-              <el-input v-else v-model="form.workorderCode">
+            <el-form-item label="编排单号" prop="arrangeCode">
+              <el-input v-model="form.arrangeCode">
               </el-input>
             </el-form-item>
             <WorkorderSelect ref="woSelect" @onSelected="onWorkorderSelected"></WorkorderSelect>
@@ -323,7 +314,7 @@ import dayjs from 'dayjs';
 export default {
   name: "Ipqc",
   components: { WorkorderSelect, WorkstationSelect, Ipqcline },
-  dicts: ['mes_ipqc_type', 'mes_qc_result', 'mes_order_status'],
+  dicts: ['mes_ipqc_type_pc', 'mes_qc_result', 'mes_order_status'],
   data() {
     return {
       autoGenFlag: false,
@@ -357,7 +348,6 @@ export default {
         ipqcType: null,
         templateId: null,
         workorderId: null,
-        workorderCode: null,
         arrangeCode: null,
         workorderName: null,
         taskId: null,
@@ -398,11 +388,6 @@ export default {
         ipqcType: [
           { required: true, message: "请选择检验类型", trigger: "change" }
         ],
-
-        workorderCode: [
-          { required: true, message: "请选择生产工单", trigger: "blur" }
-        ],
-
         workstationCode: [
           { required: true, message: "请选择工作中心", trigger: "blur" }
         ],
@@ -459,7 +444,6 @@ export default {
         ipqcType: null,
         templateId: null,
         workorderId: null,
-        workorderCode: null,
         arrangeCode: null,
         workorderName: null,
         taskId: null,
@@ -628,7 +612,6 @@ export default {
       if (row != undefined && row != null) {
         debugger;
         this.form.workorderId = row.workorderId;
-        this.form.workorderCode = row.workorderCode;
         this.form.workorderName = row.workorderName;
         this.form.itemId = row.productId;
         this.form.itemCode = row.productCode;

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

@@ -91,7 +91,13 @@
 
     <el-table v-loading="loading" :data="qcindexList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="检测项编码" align="center" prop="indexCode" />
+      <el-table-column label="检测项编码" align="center" prop="indexCode" >
+        <template slot-scope="scope">
+          <el-button size="mini" type="text" @click="handleUpdate(scope.row)">{{
+            scope.row.indexCode }}
+          </el-button>
+        </template>
+      </el-table-column>
       <el-table-column label="检测项名称" align="center" prop="indexName" />
       <el-table-column label="检测项类型" align="center" prop="indexType">
         <template slot-scope="scope">