|
|
@@ -35,7 +35,7 @@
|
|
|
:size="size"
|
|
|
>编辑</el-button
|
|
|
>
|
|
|
- <el-button
|
|
|
+
|
|
|
<!-- <el-button
|
|
|
|
|
|
|
|
|
@@ -51,17 +51,17 @@
|
|
|
@click="handle(row, index, 1)"
|
|
|
type="primary"
|
|
|
v-if="row.state === 0"
|
|
|
-<<<<<<< .mine
|
|
|
+
|
|
|
size="small"
|
|
|
>确认返工</el-button>-->
|
|
|
<!-- <el-button
|
|
|
|
|
|
-=======
|
|
|
+
|
|
|
size="small"
|
|
|
>确认返工</el-button
|
|
|
>
|
|
|
- <!-- <el-button
|
|
|
->>>>>>> .theirs
|
|
|
+ <el-button
|
|
|
+
|
|
|
link
|
|
|
v-if="row.state === 1"
|
|
|
@click="handle(row, index, 3)"
|
|
|
@@ -87,26 +87,26 @@
|
|
|
>领料单</el-button
|
|
|
>
|
|
|
|
|
|
-<<<<<<< .mine
|
|
|
+
|
|
|
<!-- <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 >-->
|
|
|
->>>>>>> .theirs
|
|
|
|
|
|
- <!-- <el-button link v-if="row.flowState !== '0'" icon="el-icon-copy-document" @click="showFlowSteps(row)"-->
|
|
|
- <!-- >流程</el-button>-->
|
|
|
|
|
|
-<<<<<<< .mine
|
|
|
+ <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"
|
|
|
@@ -114,7 +114,7 @@
|
|
|
@click="onCancelFlow(row)"
|
|
|
>撤销</el-button
|
|
|
>-->
|
|
|
-=======
|
|
|
+
|
|
|
<!-- <el-button-->
|
|
|
<!-- link-->
|
|
|
<!-- icon="el-icon-copy-document"-->
|
|
|
@@ -122,7 +122,7 @@
|
|
|
<!-- @click="onCancelFlow(row)"-->
|
|
|
<!-- >撤销</el-button-->
|
|
|
<!-- >-->
|
|
|
->>>>>>> .theirs
|
|
|
+
|
|
|
</template>
|
|
|
|
|
|
<template #menu-right="{}">
|
