|
@@ -19,65 +19,69 @@
|
|
|
<template #menu="{ row, index, type }">
|
|
|
<el-button
|
|
|
@click="showTable(row)"
|
|
|
- icon="el-icon-view"
|
|
|
- text
|
|
|
+ link
|
|
|
type="primary"
|
|
|
+ size="small"
|
|
|
>查看</el-button
|
|
|
>
|
|
|
<el-button
|
|
|
- icon="el-icon-edit"
|
|
|
- text
|
|
|
+ type="primary"
|
|
|
+ size="small"
|
|
|
+ link
|
|
|
+ @click="showSeq(row.seqList)"
|
|
|
+ >查看管号</el-button
|
|
|
+ >
|
|
|
+ <el-button
|
|
|
+ link
|
|
|
@click="doEdit(row, index)"
|
|
|
type="primary"
|
|
|
v-if="row.state === 0 || row.state === 1"
|
|
|
- :size="size"
|
|
|
+ size="small"
|
|
|
>编辑</el-button
|
|
|
>
|
|
|
<el-button
|
|
|
@click="operation(row)"
|
|
|
- icon="el-icon-link"
|
|
|
- text
|
|
|
+ link
|
|
|
+ size="small"
|
|
|
type="primary"
|
|
|
>返工工序</el-button
|
|
|
>
|
|
|
<el-button
|
|
|
- icon="el-icon-edit"
|
|
|
- text
|
|
|
+ link
|
|
|
@click="handle(row, index, 2)"
|
|
|
type="primary"
|
|
|
v-if="row.state === 0"
|
|
|
+ size="small"
|
|
|
>驳回</el-button
|
|
|
>
|
|
|
<el-button
|
|
|
- icon="el-icon-edit"
|
|
|
- text
|
|
|
+ link
|
|
|
@click="handle(row, index, 1)"
|
|
|
type="primary"
|
|
|
v-if="row.state === 0"
|
|
|
+ size="small"
|
|
|
>确认返工</el-button
|
|
|
>
|
|
|
- <el-button
|
|
|
- icon="el-icon-edit"
|
|
|
- text
|
|
|
+<!-- <el-button
|
|
|
+ link
|
|
|
v-if="row.state === 1"
|
|
|
@click="handle(row, index, 3)"
|
|
|
type="primary"
|
|
|
- :size="size"
|
|
|
+ size="small"
|
|
|
>返工完成</el-button
|
|
|
- >
|
|
|
+ >-->
|
|
|
<el-button
|
|
|
- icon="el-icon-edit"
|
|
|
- text
|
|
|
+ link
|
|
|
v-if="row.state === 1"
|
|
|
@click="handle(row, index, 3)"
|
|
|
type="primary"
|
|
|
- :size="size"
|
|
|
+ size="small"
|
|
|
>返工完成</el-button
|
|
|
>
|
|
|
<el-button
|
|
|
@click="document(row)"
|
|
|
- icon="el-icon-document"
|
|
|
- text
|
|
|
+ link
|
|
|
+ size="small"
|
|
|
v-if="row.state > 0 && row.state!==2 "
|
|
|
type="primary"
|
|
|
>领料单</el-button
|
|
@@ -120,6 +124,20 @@
|
|
|
:status="record.state"
|
|
|
/>
|
|
|
</el-dialog>
|
|
|
+ <el-dialog
|
|
|
+ v-model="dialog2.visible"
|
|
|
+ :title="dialog2.title"
|
|
|
+ width="950px"
|
|
|
+ @close="dialog2.visible = false"
|
|
|
+ >
|
|
|
+ <el-card
|
|
|
+ style="cursor: pointer; font-size: 20px"
|
|
|
+ shadow="always"
|
|
|
+ :key="item"
|
|
|
+ v-for="item in showSeqList"
|
|
|
+ >{{ item }}</el-card
|
|
|
+ >
|
|
|
+ </el-dialog>
|
|
|
<ReworkShow v-model="showState" :tableData="tableData" />
|
|
|
</div>
|
|
|
</template>
|
|
@@ -137,7 +155,7 @@ import ReworkDocument from "@/views/quality/rework/components/rework-document.vu
|
|
|
|
|
|
// 数据字典相关
|
|
|
const { dicts } = useDictionaryStore();
|
|
|
-
|
|
|
+const showSeqList = ref([]);
|
|
|
// 传入一个url,后面不带/
|
|
|
const { form, data, option, search, page, toDeleteIds, Methords, Utils } =
|
|
|
useCrud({
|
|
@@ -157,6 +175,14 @@ const dialog1 = ref({
|
|
|
title: "领料单",
|
|
|
visible: false,
|
|
|
});
|
|
|
+const dialog2 = reactive({
|
|
|
+ title: "管号列表",
|
|
|
+ visible: false,
|
|
|
+});
|
|
|
+const showSeq = (seqs) => {
|
|
|
+ showSeqList.value = seqs;
|
|
|
+ dialog2.visible = true;
|
|
|
+};
|
|
|
const doEdit = (row, index) => {
|
|
|
crudRef.value && crudRef.value.rowEdit(row, index);
|
|
|
};
|
|
@@ -227,8 +253,8 @@ option.value = Object.assign(option.value, {
|
|
|
label: "生产批号",
|
|
|
prop: "workOrderCode",
|
|
|
editDisabled: true,
|
|
|
- width: 160,
|
|
|
overHidden: true,
|
|
|
+ width: 120,
|
|
|
search: true,
|
|
|
},
|
|
|
{
|
|
@@ -244,11 +270,6 @@ option.value = Object.assign(option.value, {
|
|
|
},
|
|
|
{
|
|
|
label: "管号",
|
|
|
- prop: "seqNos",
|
|
|
- editDisabled: true,
|
|
|
- },
|
|
|
- {
|
|
|
- label: "管号",
|
|
|
prop: "seqNo",
|
|
|
search: true,
|
|
|
editDisabled: true,
|
|
@@ -303,17 +324,15 @@ option.value = Object.assign(option.value, {
|
|
|
},
|
|
|
|
|
|
{
|
|
|
- label: "返工提出者",
|
|
|
+ label: "创建人",
|
|
|
prop: "creator",
|
|
|
editDisplay: false,
|
|
|
},
|
|
|
{
|
|
|
- label: "日期",
|
|
|
+ label: "创建日期",
|
|
|
prop: "created",
|
|
|
type: "date",
|
|
|
width: 160,
|
|
|
- format: "YYYY-MM-DD",
|
|
|
- valueFormat: "YYYY-MM-DD",
|
|
|
editDisplay: false,
|
|
|
overHidden: true,
|
|
|
},
|