Merge remote-tracking branch 'origin/master'

src/views/flow/test/business.vue

@@ -29,24 +29,26 @@
 				<template #statusSlot="scope">
 					<el-tag v-if="scope.row.status === 1" type="warning">审批中</el-tag>
 					<el-tag v-else-if="scope.row.status === 2" type="success">已通过</el-tag>
-					<el-tag v-if="scope.row.status === 3" type="danger">已拒绝</el-tag>
+					<el-tag v-else-if="scope.row.status === 3" type="danger">已拒绝</el-tag>
 					<el-tag v-else type="info">待审批</el-tag>
 				</template>
 
 				<template #actionSlot="scope">
-					<el-tooltip content="提交审批" placement="bottom" effect="light">
-						<el-icon class="ibt0" @click="submitProcessEv(scope.row)">
-							<Promotion />
-						</el-icon>
-					</el-tooltip>
-					<el-divider direction="vertical"></el-divider>
-					<el-popconfirm title="确定删除吗？" @confirm="table_del(scope.row)">
-						<template #reference>
-							<el-icon class="ibt0">
-								<Delete />
+					<div v-if="scope.row.status === 0">
+						<el-tooltip content="提交审批" placement="bottom" effect="light">
+							<el-icon class="ibt0" @click="submitProcessEv(scope.row)">
+								<Promotion />
 							</el-icon>
-						</template>
-					</el-popconfirm>
+						</el-tooltip>
+						<el-divider direction="vertical"></el-divider>
+						<el-popconfirm title="确定删除吗？" @confirm="table_del(scope.row)">
+							<template #reference>
+								<el-icon class="ibt0">
+									<Delete />
+								</el-icon>
+							</template>
+						</el-popconfirm>
+					</div>
 				</template>
 			</LeTable>
 		</div>

src/views/flow/test/businessLaunch.vue

@@ -103,6 +103,16 @@ const onSubmit = async () => {
 					assigneeMap: assigneeMap_
 				}
 			}
+			// 待优化
+			purchaseOrder
+				.postlaunchApi(params)
+				.then(res => {
+					ElMessage.success('提交成功')
+					updateModelValue(false)
+				})
+				.finally(() => {
+					validateForm.value.loading = false
+				})
 		})
 	} else {
 		const formData = dyVueComponentRef.value.getData()
@@ -119,17 +129,19 @@ const onSubmit = async () => {
 				assigneeMap: assigneeMap_
 			}
 		}
+		// 待优化
+		purchaseOrder
+			.postlaunchApi(params)
+			.then(res => {
+				ElMessage.success('提交成功')
+				updateModelValue(false)
+			})
+			.finally(() => {
+				validateForm.value.loading = false
+			})
 	}
 
-	purchaseOrder
-		.postlaunchApi(params)
-		.then(res => {
-			ElMessage.success('提交成功')
-			updateModelValue(false)
-		})
-		.finally(() => {
-			validateForm.value.loading = false
-		})
+
 }
 
 // 获取当前表单中的详情