Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-pc-cloud

src/views/wallet/wallet-foreign/index.vue

@@ -50,7 +50,7 @@
 				<el-table-column type="index" label="#" width="40" />
 				<el-table-column prop="username" label="申请人" />
 				<el-table-column prop="deptName" label="部门" />
-				<el-table-column prop="applyStartTime" label="申请使用时间">
+				<el-table-column prop="applyStartTime" width="200" label="申请使用时间">
 					<template #default="{ row }">
 						<span>{{ row.applyStartTime }}</span>
 						<span class="mx-1">-</span>
@@ -68,13 +68,17 @@
 				<el-table-column prop="createTime" label="创建时间" />
 				<el-table-column label="操作" width="200">
 					<template #default="{ row }">
-						<el-button icon="Promotion" text type="primary" @click="doInfo(row)"> 查看审批 </el-button>
+						<div class="flex">
-						<el-button v-if="row.processStatus == 2" icon="InfoFilled" text type="primary" @click="codeUseTableRef.openDialog(row.id)">
+							<el-button v-if="row.processStatus == 1 && row.isCheckUser" icon="VideoPlay" text type="primary" @click="deal(row)">
-							使用情况
+								开始处理
-						</el-button>
+							</el-button>
-						<el-button v-if="false" icon="delete" text type="primary" v-auth="'wallet_walletForeign_del'" @click="handleDelete([row.id])">
+							<el-button v-if="row.processStatus == 2" icon="InfoFilled" text type="primary" @click="codeUseTableRef.openDialog(row.id)">
-							删除
+								使用情况
-						</el-button>
+							</el-button>
+							<el-button v-if="false" icon="delete" text type="primary" v-auth="'wallet_walletForeign_del'" @click="handleDelete([row.id])">
+								删除
+							</el-button>
+						</div>
 					</template>
 				</el-table-column>
 			</el-table>
@@ -84,6 +88,8 @@
 		<!-- 编辑、新增  -->
 		<form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
 		<code-use-table ref="codeUseTableRef" />
+		<!-- 审批抽屉 -->
+		<process-drawer ref="processDrawerRef" @task-submit-event="taskSubmitEvent" />
 	</div>
 </template>
 
@@ -93,6 +99,8 @@ import { fetchList, pageJoin, delObjs } from "/@/api/wallet/wallet-foreign"
 import { useMessage, useMessageBox } from "/@/hooks/message"
 import { useDict } from "/@/hooks/dict"
 
+import ProcessDrawer from "/@/components/processDrawer/index.vue"
+
 // 引入组件
 const FormDialog = defineAsyncComponent(() => import("./form.vue"))
 const CodeUseTable = defineAsyncComponent(() => import("../components/code-use-table.vue"))
@@ -101,6 +109,7 @@ const { check_status } = useDict("check_status")
 // 定义变量内容
 const formDialogRef = ref()
 const codeUseTableRef = ref()
+const processDrawerRef = ref()
 // 搜索变量
 const queryRef = ref()
 const showSearch = ref(true)
@@ -142,6 +151,17 @@ const selectionChangHandle = (objs: { id: string }[]) => {
 	multiple.value = !objs.length
 }
 
+// 审批提交事件
+const taskSubmitEvent = () => {
+	getDataList()
+}
+
+// 点击开始处理
+const deal = (row: any) => {
+	if (!row.processId) return useMessage().warning("流程id不存在")
+	processDrawerRef.value.openProcessDrawer(row)
+}
+
 // 删除操作
 const handleDelete = async (ids: string[]) => {
 	try {

src/views/wallet/wallet-stride/index.vue

@@ -61,31 +61,37 @@
 				<el-table-column prop="createTime" label="创建时间" />
 				<el-table-column label="操作" width="200">
 					<template #default="{ row }">
-						<el-button
+						<div class="flex">
-							v-if="false"
+							<el-button
-							icon="edit-pen"
+								v-if="false"
-							text
+								icon="edit-pen"
-							type="primary"
+								text
-							v-auth="'admin_walletStride_edit'"
+								type="primary"
-							@click="formDialogRef.openDialog(row.id)"
+								v-auth="'admin_walletStride_edit'"
-							>编辑</el-button
+								@click="formDialogRef.openDialog(row.id)"
-						>
+							>
-						<el-button v-if="false" icon="delete" text type="primary" v-auth="'admin_walletStride_del'" @click="handleDelete([row.id])"
+								编辑
-							>删除</el-button
+							</el-button>
-						>
+							<el-button v-if="false" icon="delete" text type="primary" v-auth="'admin_walletStride_del'" @click="handleDelete([row.id])">
-						<el-button icon="Promotion" text type="primary" @click="doInfo(row)"> 查看审批 </el-button>
+								删除
-						<el-button v-if="row.processStatus == 2" icon="InfoFilled" text type="primary" @click="codeUseTableRef.openDialog(row.id)">
+							</el-button>
-							使用情况
+							<el-button v-if="row.processStatus == 1 && row.isCheckUser" icon="VideoPlay" text type="primary" @click="deal(row)">
-						</el-button>
+								开始处理
+							</el-button>
+							<el-button v-if="row.processStatus == 2" icon="InfoFilled" text type="primary" @click="codeUseTableRef.openDialog(row.id)">
+								使用情况
+							</el-button>
+						</div>
 					</template>
 				</el-table-column>
 			</el-table>
 			<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
 		</div>
-
 		<!-- 编辑、新增  -->
 		<form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
 		<code-use-table ref="codeUseTableRef" />
+		<!-- 审批抽屉 -->
+		<process-drawer ref="processDrawerRef" @task-submit-event="taskSubmitEvent" />
 	</div>
 </template>
 
@@ -95,6 +101,8 @@ import { fetchList, delObjs, pageJoin } from "/@/api/wallet/wallet-stride"
 import { useMessage, useMessageBox } from "/@/hooks/message"
 import { useDict } from "/@/hooks/dict"
 
+import ProcessDrawer from "/@/components/processDrawer/index.vue"
+
 const { push } = useRouter()
 
 // 引入组件
@@ -105,6 +113,7 @@ const { check_status, yes_no_type } = useDict("check_status", "yes_no_type")
 // 定义变量内容
 const formDialogRef = ref()
 const codeUseTableRef = ref()
+const processDrawerRef = ref()
 // 搜索变量
 const queryRef = ref()
 const showSearch = ref(true)
@@ -144,6 +153,17 @@ const selectionChangHandle = (objs: { id: string }[]) => {
 	multiple.value = !objs.length
 }
 
+// 审批提交事件
+const taskSubmitEvent = () => {
+	getDataList()
+}
+
+// 点击开始处理
+const deal = (row: any) => {
+	if (!row.processId) return useMessage().warning("流程id不存在")
+	processDrawerRef.value.openProcessDrawer(row)
+}
+
 // 删除操作
 const handleDelete = async (ids: string[]) => {
 	try {