Pārlūkot izejas kodu

feat: 待审批、我收到、认领、已审批、我的申请 详情操作按钮保存提示语添加 100%

luoyali 1 gadu atpakaļ
vecāks
revīzija
c8913fc4f4

+ 7 - 2
src/views/approve/components/addSignDialog.vue

@@ -1,6 +1,6 @@
 <template>
 	<!-- 加签审批弹窗 -->
-	<el-dialog class="le-dialog" v-model="reviewVisibleDialog" title="审批加签" width="700" destroy-on-close>
+	<el-dialog v-model="reviewVisibleDialog" class="le-dialog" title="审批加签" width="700" destroy-on-close>
 		<el-form ref="formRef" v-loading="uploadLoading" label-position="top" element-loading-text="图片上传中..." :model="form" label-width="80px">
 			<el-form-item label="加签方式" prop="type">
 				<el-radio-group v-model="form.type">
@@ -54,6 +54,7 @@ import FileUpload from '@/components/FileUpload.vue'
 import { QuestionFilled } from '@element-plus/icons-vue'
 import user from '@/api/system/user'
 import { processAppendNodeApi } from '@/api/flow/processTask'
+import {ElMessage} from "element-plus";
 
 const props = defineProps({
 	modelValue: {
@@ -111,13 +112,17 @@ const submitForm = () => {
 				})
 				console.log(formData, '===')
 				await processAppendNodeApi(formData)
-        $myEmit('successCb')
+				$myEmit('successCb')
 				closeDialog()
 				btnDisabled.value = false
 			}
 		})
 		.catch(err => {
 			btnDisabled.value = false
+			ElMessage({
+				message: '操作失败',
+				type: 'error'
+			})
 		})
 }
 

+ 14 - 9
src/views/approve/components/approvedContent.vue

@@ -355,15 +355,20 @@ const getTaskDetail = () => {
  * 详情页面操作按钮回调
  */
 const closeDetailEv = () => {
-	// 存储表单 todo.....
-	// 如果这里有表单,是否要把所有表单的内容进行存储,存储完毕后,才能关闭这个详情,刷新左侧的列表 todo
-	if (currentType.value === 'review') {
-		// 评论按钮,不要刷新左侧的列表,只更新右侧的详情即可
-		getTaskDetail()
-		return
-	}
-	taskProcessInfo.refresh = true
-	taskProcessInfo.setCurrentTaskRow({})
+	ElMessage({
+		message: '操作成功',
+		type: 'success'
+	})
+	setTimeout(() => {
+		// 如果这里有表单,是否要把所有表单的内容进行存储,存储完毕后,才能关闭这个详情,刷新左侧的列表 todo
+		if (currentType.value === 'review') {
+			// 评论按钮,不要刷新左侧的列表,只更新右侧的详情即可
+			getTaskDetail()
+			return
+		}
+		taskProcessInfo.refresh = true
+		taskProcessInfo.setCurrentTaskRow({})
+	}, 1000)
 }
 
 /** 认领任务 **/

+ 20 - 19
src/views/approve/components/approvedItem.vue

@@ -185,20 +185,6 @@ const instanceState = ref(null) // 流程状态
 const beginTime = ref(null) // 开始时间
 const endTime = ref(null) // 结束时间
 const searchMoreVisible = ref(false)
-// 重置
-const searchReset = () => {
-	createBy.value = undefined
-	instanceState.value = undefined
-	beginTime.value = undefined
-	endTime.value = undefined
-	// searchMoreVisible.value = false
-}
-
-// 搜索条件更多
-const searchSubmit = () => {
-	searchMoreVisible.value = false
-	getPagedSatellites('clear')
-}
 
 // store值
 const taskProcessInfo = useTaskProcessStore()
@@ -215,6 +201,21 @@ const condition = reactive({
 const satelliteList = ref([]) // 列表数据
 // 下拉滚动属性值 end
 
+// 搜索条件更多重置
+const searchReset = () => {
+	createBy.value = undefined
+	instanceState.value = undefined
+	beginTime.value = undefined
+	endTime.value = undefined
+	// searchMoreVisible.value = false
+}
+
+// 搜索条件更多
+const searchSubmit = () => {
+	searchMoreVisible.value = false
+	getPagedSatellites('clear')
+}
+
 // 初始化
 const initList = () => {
 	loading.value = false
@@ -366,7 +367,7 @@ const disabledInfinite = computed(() => noMore.value)
 	}
 
 	.flow-list-box {
-		background-color: #fff;
+		background-color: var(--el-bg-color);
 		padding: 0 12px;
 		height: calc(100vh - 192px);
 		overflow: hidden auto;
@@ -385,14 +386,14 @@ const disabledInfinite = computed(() => noMore.value)
 			user-select: none;
 			border-radius: 6px;
 			overflow: hidden;
-			border: 1px solid #e9ebef;
+			border: 1px solid var(--el-border-color);
 			padding: 10px 12px;
 			cursor: pointer;
 			transition: box-shadow 0.2s cubic-bezier(0, 0, 1, 1);
 
 			&.flow-card-box-hoverable {
 				&:hover {
-					box-shadow: 4px 4px 12px rgb(229, 230, 235);
+					box-shadow: 4px 4px 12px var(--el-border-color-hover);
 				}
 			}
 
@@ -410,13 +411,13 @@ const disabledInfinite = computed(() => noMore.value)
 					display: flex;
 					min-height: 20px;
 					.label {
-						color: #9ba5b3;
+						color: var(--el-text-color-secondary);
 						overflow: hidden;
 						white-space: nowrap;
 						flex-shrink: 0;
 					}
 					.value {
-						color: #232730;
+						color: var(--el-text-color-primary);
 						overflow: hidden;
 						text-overflow: ellipsis;
 						white-space: nowrap;

+ 6 - 2
src/views/approve/components/consentOrRefuseDialog.vue

@@ -1,6 +1,6 @@
 <template>
 	<!-- 同意 拒绝 弹窗  同意/拒绝审批 -->
-	<el-dialog class="le-dialog" v-model="operaVisibleDialog" :title="currentTip + '审批'" width="700" destroy-on-close>
+	<el-dialog v-model="operaVisibleDialog" class="le-dialog" :title="currentTip + '审批'" width="700" destroy-on-close>
 		<el-form ref="formRef" v-loading="uploadLoading" label-position="top" element-loading-text="图片上传中..." :model="form" label-width="80px">
 			<el-form-item label="审批意见" prop="content" :rules="[{ required: true, message: '审批意见不能为空' }]">
 				<el-input v-model="form.content" type="textarea" placeholder="请输入内容" maxlength="64" show-word-limit> </el-input>
@@ -81,13 +81,17 @@ const submitForm = () => {
 					// 拒绝
 					await processRejectionTaskApi(formData)
 				}
-        $myEmit('successCb')
+				$myEmit('successCb')
 				closeDialog()
 				btnDisabled.value = false
 			}
 		})
 		.catch(err => {
 			btnDisabled.value = false
+			ElMessage({
+				message: '操作失败',
+				type: 'error'
+			})
 		})
 }
 

+ 7 - 2
src/views/approve/components/deliverToReviewDialog.vue

@@ -1,6 +1,6 @@
 <template>
 	<!-- 转交审批弹窗 -->
-	<el-dialog class="le-dialog" v-model="reviewVisibleDialog" title="转交审批" width="700" destroy-on-close>
+	<el-dialog v-model="reviewVisibleDialog" class="le-dialog" title="转交审批" width="700" destroy-on-close>
 		<el-form ref="formRef" v-loading="uploadLoading" label-position="top" element-loading-text="图片上传中..." :model="form" label-width="80px">
 			<el-form-item label="转交方式" prop="type">
 				<el-radio-group v-model="form.type">
@@ -54,6 +54,7 @@ import FileUpload from '@/components/FileUpload.vue'
 import { QuestionFilled } from '@element-plus/icons-vue'
 import user from '@/api/system/user'
 import { processTransferApi } from '@/api/flow/processTask'
+import { ElMessage } from 'element-plus'
 
 const props = defineProps({
 	modelValue: {
@@ -109,7 +110,7 @@ const submitForm = () => {
 				})
 				console.log(formData, '===')
 				await processTransferApi(formData)
-        $myEmit('successCb')
+				$myEmit('successCb')
 				closeDialog()
 				btnDisabled.value = false
 			}
@@ -117,6 +118,10 @@ const submitForm = () => {
 		.catch(err => {
 			console.error('挂起订单表单拦截', err)
 			btnDisabled.value = false
+			ElMessage({
+				message: '操作失败',
+				type: 'error'
+			})
 		})
 }
 

+ 8 - 3
src/views/approve/components/loseSignDialog.vue

@@ -1,6 +1,6 @@
 <template>
 	<!-- 减签审批弹窗 -->
-	<el-dialog class="le-dialog" v-model="reviewVisibleDialog" title="审批减签" width="700" destroy-on-close>
+	<el-dialog v-model="reviewVisibleDialog" class="le-dialog" title="审批减签" width="700" destroy-on-close>
 		<el-form ref="formRef" v-loading="uploadLoading" label-position="top" element-loading-text="图片上传中..." :model="form" label-width="80px">
 			<el-form-item label="给谁减签" prop="review" :rules="[{ required: true, message: '请选择减签人员' }]">
 				<el-select v-model="form.deliverTo" placeholder="请选择减签人员">
@@ -35,6 +35,7 @@
 <script setup>
 import { computed, reactive, ref } from 'vue'
 import FileUpload from '@/components/FileUpload.vue'
+import { ElMessage } from 'element-plus'
 
 const props = defineProps({
 	modelValue: {
@@ -86,14 +87,18 @@ const submitForm = () => {
 		.validate()
 		.then(valid => {
 			if (valid) {
-        $myEmit('successCb', formData)
-        closeDialog()
+				$myEmit('successCb', formData)
+				closeDialog()
 				btnDisabled.value = false
 			}
 		})
 		.catch(err => {
 			console.error('挂起订单表单拦截', err)
 			btnDisabled.value = false
+			ElMessage({
+				message: '操作失败',
+				type: 'error'
+			})
 		})
 }
 

+ 5 - 0
src/views/approve/components/reviewDialog.vue

@@ -31,6 +31,7 @@
 import { computed, reactive, ref } from 'vue'
 import { processReviewTaskApi, processRevokeTaskApi } from '@/api/flow/processTask'
 import FileUpload from '@/components/FileUpload.vue'
+import { ElMessage } from 'element-plus'
 
 const props = defineProps({
 	modelValue: {
@@ -82,6 +83,10 @@ const submitForm = () => {
 		})
 		.catch(err => {
 			btnDisabled.value = false
+			ElMessage({
+				message: '操作失败',
+				type: 'error'
+			})
 		})
 }
 

+ 7 - 2
src/views/approve/components/rollbackDialog.vue

@@ -1,6 +1,6 @@
 <template>
 	<!-- 回退审批弹窗 -->
-	<el-dialog class="le-dialog" v-model="reviewVisibleDialog" title="回退审批" width="700" destroy-on-close>
+	<el-dialog v-model="reviewVisibleDialog" class="le-dialog" title="回退审批" width="700" destroy-on-close>
 		<el-form ref="formRef" v-loading="uploadLoading" label-position="top" element-loading-text="图片上传中..." :model="form" label-width="80px">
 			<el-form-item label="回退到" prop="nodeName" :rules="[{ required: true, message: '请选择回退节点' }]">
 				<el-select v-model="form.nodeName" placeholder="请选择回退节点">
@@ -36,6 +36,7 @@
 import { computed, onMounted, reactive, ref } from 'vue'
 import FileUpload from '@/components/FileUpload.vue'
 import { processPreviousNodeNameApi, processTaskJumpApi } from '@/api/flow/processTask'
+import { ElMessage } from 'element-plus'
 
 const props = defineProps({
 	modelValue: {
@@ -73,13 +74,17 @@ const submitForm = () => {
 		.then(async valid => {
 			if (valid) {
 				await processTaskJumpApi(formData)
-        $myEmit('successCb')
+				$myEmit('successCb')
 				closeDialog()
 				btnDisabled.value = false
 			}
 		})
 		.catch(err => {
 			btnDisabled.value = false
+			ElMessage({
+				message: '操作失败',
+				type: 'error'
+			})
 		})
 }