|
@@ -17,49 +17,44 @@
|
|
|
@selection-change="selectionChange"
|
|
|
>
|
|
|
<template #menu="{ row, index, type }">
|
|
|
- <el-button
|
|
|
- @click="showTable(row)"
|
|
|
- link
|
|
|
- type="primary"
|
|
|
- size="small"
|
|
|
+ <el-button @click="showTable(row)" link type="primary" size="small"
|
|
|
>查看</el-button
|
|
|
>
|
|
|
<el-button
|
|
|
- type="primary"
|
|
|
- size="small"
|
|
|
- link
|
|
|
- @click="showSeq(row.seqList)"
|
|
|
- >查看管号</el-button
|
|
|
+ type="primary"
|
|
|
+ size="small"
|
|
|
+ link
|
|
|
+ @click="showSeq(row.seqList)"
|
|
|
+ >查看管号</el-button
|
|
|
>
|
|
|
<el-button
|
|
|
- link
|
|
|
+ link
|
|
|
@click="doEdit(row, index)"
|
|
|
type="primary"
|
|
|
v-if="row.state === 0 || row.state === 1"
|
|
|
:size="size"
|
|
|
>编辑</el-button
|
|
|
>
|
|
|
+ <el-button @click="operation(row)" link size="small" type="primary"
|
|
|
+ >返工工序</el-button
|
|
|
+ >
|
|
|
<el-button
|
|
|
- @click="operation(row)"
|
|
|
link
|
|
|
- size="small"
|
|
|
- type="primary"
|
|
|
- >返工工序</el-button>
|
|
|
- <el-button
|
|
|
- link
|
|
|
@click="handle(row, index, 2)"
|
|
|
type="primary"
|
|
|
v-if="row.state === 0"
|
|
|
- size="small"
|
|
|
- >驳回</el-button>
|
|
|
+ size="small"
|
|
|
+ >驳回</el-button
|
|
|
+ >
|
|
|
<el-button
|
|
|
- link
|
|
|
+ link
|
|
|
@click="handle(row, index, 1)"
|
|
|
type="primary"
|
|
|
v-if="row.state === 0"
|
|
|
- size="small"
|
|
|
- >确认返工</el-button>
|
|
|
-<!-- <el-button
|
|
|
+ size="small"
|
|
|
+ >确认返工</el-button
|
|
|
+ >
|
|
|
+ <!-- <el-button
|
|
|
link
|
|
|
v-if="row.state === 1"
|
|
|
@click="handle(row, index, 3)"
|
|
@@ -67,7 +62,7 @@
|
|
|
size="small"
|
|
|
>返工完成</el-button
|
|
|
>-->
|
|
|
-<!-- <el-button
|
|
|
+ <!-- <el-button
|
|
|
link
|
|
|
v-if="row.state === 1"
|
|
|
@click="handle(row, index, 3)"
|
|
@@ -80,28 +75,28 @@
|
|
|
@click="document(row)"
|
|
|
icon="el-icon-document"
|
|
|
text
|
|
|
- v-if="row.state > 0 && row.state!==2 "
|
|
|
+ v-if="row.state > 0 && row.state !== 2"
|
|
|
type="primary"
|
|
|
- >领料单</el-button
|
|
|
+ >领料单</el-button
|
|
|
>
|
|
|
|
|
|
- <el-button
|
|
|
- link
|
|
|
- icon="el-icon-copy-document"
|
|
|
- v-if="row.state=='1'&&(row.flowState == '0' || row.flowState == '2' || row.flowState == '-1')"
|
|
|
- @click="openCheckView(row)"
|
|
|
- >提审</el-button >
|
|
|
+ <!-- <el-button-->
|
|
|
+ <!-- link-->
|
|
|
+ <!-- icon="el-icon-copy-document"-->
|
|
|
+ <!-- v-if="row.state=='1'&&(row.flowState == '0' || row.flowState == '2' || row.flowState == '-1')"-->
|
|
|
+ <!-- @click="openCheckView(row)"-->
|
|
|
+ <!-- >提审</el-button >-->
|
|
|
|
|
|
- <el-button link v-if="row.flowState !== '0'" icon="el-icon-copy-document" @click="showFlowSteps(row)"
|
|
|
- >流程</el-button>
|
|
|
+ <!-- <el-button link v-if="row.flowState !== '0'" icon="el-icon-copy-document" @click="showFlowSteps(row)"-->
|
|
|
+ <!-- >流程</el-button>-->
|
|
|
|
|
|
- <el-button
|
|
|
- link
|
|
|
- icon="el-icon-copy-document"
|
|
|
- v-if="row.flowState == '3'"
|
|
|
- @click="onCancelFlow(row)"
|
|
|
- >撤销</el-button
|
|
|
- >
|
|
|
+ <!-- <el-button-->
|
|
|
+ <!-- link-->
|
|
|
+ <!-- icon="el-icon-copy-document"-->
|
|
|
+ <!-- v-if="row.flowState == '3'"-->
|
|
|
+ <!-- @click="onCancelFlow(row)"-->
|
|
|
+ <!-- >撤销</el-button-->
|
|
|
+ <!-- >-->
|
|
|
</template>
|
|
|
|
|
|
<template #menu-right="{}">
|
|
@@ -131,7 +126,7 @@
|
|
|
v-model="dialog1.visible"
|
|
|
:title="dialog1.title"
|
|
|
width="900px"
|
|
|
- @close="dialog1.visible=false"
|
|
|
+ @close="dialog1.visible = false"
|
|
|
:destroy-on-close="true"
|
|
|
>
|
|
|
<ReworkDocument
|
|
@@ -142,24 +137,24 @@
|
|
|
/>
|
|
|
</el-dialog>
|
|
|
<el-dialog
|
|
|
- v-model="dialog2.visible"
|
|
|
- :title="dialog2.title"
|
|
|
- width="950px"
|
|
|
- @close="dialog2.visible = false"
|
|
|
+ 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
|
|
|
+ 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" />
|
|
|
<LookFlowStep ref="LookFlowStepRef"></LookFlowStep>
|
|
|
<work-flow-check
|
|
|
- ref="workFlowCheckRef"
|
|
|
- @sureToSave="onWFSave"
|
|
|
+ ref="workFlowCheckRef"
|
|
|
+ @sureToSave="onWFSave"
|
|
|
></work-flow-check>
|
|
|
</div>
|
|
|
</template>
|
|
@@ -177,7 +172,7 @@ import ReworkDocument from "@/views/quality/rework/components/rework-document.vu
|
|
|
import WorkFlowCheck from "@/components/WorkFlows/workFlowCheck.vue";
|
|
|
import LookFlowStep from "@/views/flow/common/LookFlowStep.vue";
|
|
|
|
|
|
-import { cancelFlow,submitFlow } from "@/api/flow";
|
|
|
+import { cancelFlow, submitFlow } from "@/api/flow";
|
|
|
|
|
|
// 数据字典相关
|
|
|
const { dicts } = useDictionaryStore();
|
|
@@ -209,9 +204,10 @@ const showSeq = (seqs) => {
|
|
|
showSeqList.value = seqs;
|
|
|
dialog2.visible = true;
|
|
|
};
|
|
|
-const LookFlowStepRef=ref(null);
|
|
|
+const LookFlowStepRef = ref(null);
|
|
|
const showFlowSteps = (row) => {
|
|
|
- LookFlowStepRef.value && LookFlowStepRef.value.openFlowStepDrawer(row.flowIns);
|
|
|
+ LookFlowStepRef.value &&
|
|
|
+ LookFlowStepRef.value.openFlowStepDrawer(row.flowIns);
|
|
|
};
|
|
|
const doEdit = (row, index) => {
|
|
|
crudRef.value && crudRef.value.rowEdit(row, index);
|
|
@@ -221,8 +217,9 @@ onMounted(() => {
|
|
|
});
|
|
|
const workFlowCheckRef = ref(null);
|
|
|
const openCheckView = (row) => {
|
|
|
- row.businessId = row.id
|
|
|
- workFlowCheckRef.value && workFlowCheckRef.value.openDialog(row, "reworkService");
|
|
|
+ row.businessId = row.id;
|
|
|
+ workFlowCheckRef.value &&
|
|
|
+ workFlowCheckRef.value.openDialog(row, "reworkService");
|
|
|
};
|
|
|
|
|
|
const onWFSave = (flowForm) => {
|
|
@@ -232,12 +229,12 @@ const onWFSave = (flowForm) => {
|
|
|
dataList();
|
|
|
});
|
|
|
};
|
|
|
-const onCancelFlow=(row)=>{
|
|
|
+const onCancelFlow = (row) => {
|
|
|
cancelFlow(row).then(() => {
|
|
|
ElMessage.success("提交成功");
|
|
|
dataList();
|
|
|
});
|
|
|
-}
|
|
|
+};
|
|
|
const record = ref({});
|
|
|
const operation = (row) => {
|
|
|
record.value = row;
|