Merge branch 'master' of gitee.com:xiaopubao/aizuda-web-vue3

src/components/FileUpload.vue

@@ -48,7 +48,7 @@
 			</template>
 		</el-upload>
 
-		<el-dialog v-model="dialogVisible" :title="'预览 (' + dialogTitle + ')'" width="800px" append-to-body destroy-on-close>
+		<el-dialog class="le-dialog" v-model="dialogVisible" :title="'预览 (' + dialogTitle + ')'" width="800px" append-to-body destroy-on-close>
 			<iframe :src="dialogUrl" frameborder="0" width="100%" height="500" allowfullscreen></iframe>
 		</el-dialog>
 	</div>

src/components/scWorkflow/select.vue

@@ -1,5 +1,6 @@
 <template>
 	<el-dialog
+    class="le-dialog"
 		v-model="dialogVisible"
 		:title="titleMap[type - 1]"
 		:width="type == 1 ? 680 : 460"

src/views/approve/components/addSignDialog.vue

@@ -1,6 +1,6 @@
 <template>
 	<!-- 加签审批弹窗 -->
-	<el-dialog v-model="reviewVisibleDialog" title="审批加签" width="700" destroy-on-close>
+	<el-dialog class="le-dialog" v-model="reviewVisibleDialog" 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">
@@ -111,6 +111,7 @@ const submitForm = () => {
 				})
 				console.log(formData, '===')
 				await processAppendNodeApi(formData)
+        $myEmit('successCb')
 				closeDialog()
 				btnDisabled.value = false
 			}
@@ -121,7 +122,6 @@ const submitForm = () => {
 }
 
 const closeDialog = () => {
-	$myEmit('successCb')
 	$myEmit('update:modelValue', false)
 }
 

src/views/approve/components/approvedContent.vue

@@ -374,16 +374,16 @@ watch(
 	border-radius: 6px;
 	flex: auto;
 	.flow-detail-container {
+		position: relative;
 		height: 100%;
 		overflow: hidden;
-		position: relative;
 	}
 
 	// 通过、不通过样式
 	.flow-status-stamp {
 		position: absolute;
-		right: 30px;
-		top: 30px;
+		right: 10px;
+		top: 10px;
 		z-index: 999;
 	}
 
@@ -426,8 +426,9 @@ watch(
 			.summary-info {
 				display: flex;
 				align-items: center;
+				padding-top: 10px;
+				font-size: 24px;
 				.title {
-					font-size: 24px;
 					font-family: PingFangSC-Semibold, PingFang SC;
 					color: #1d2129;
 				}

src/views/approve/components/consentOrRefuseDialog.vue

@@ -1,6 +1,6 @@
 <template>
 	<!-- 同意 拒绝 弹窗  同意/拒绝审批 -->
-	<el-dialog v-model="operaVisibleDialog" :title="currentTip + '审批'" width="700" destroy-on-close>
+	<el-dialog class="le-dialog" v-model="operaVisibleDialog" :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,6 +81,7 @@ const submitForm = () => {
 					// 拒绝
 					await processRejectionTaskApi(formData)
 				}
+        $myEmit('successCb')
 				closeDialog()
 				btnDisabled.value = false
 			}
@@ -91,7 +92,6 @@ const submitForm = () => {
 }
 
 const closeDialog = () => {
-	$myEmit('successCb')
 	$myEmit('update:modelValue', false)
 }
 

src/views/approve/components/deliverToReviewDialog.vue

@@ -1,6 +1,6 @@
 <template>
 	<!-- 转交审批弹窗 -->
-	<el-dialog v-model="reviewVisibleDialog" title="转交审批" width="700" destroy-on-close>
+	<el-dialog class="le-dialog" v-model="reviewVisibleDialog" 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">
@@ -109,6 +109,7 @@ const submitForm = () => {
 				})
 				console.log(formData, '===')
 				await processTransferApi(formData)
+        $myEmit('successCb')
 				closeDialog()
 				btnDisabled.value = false
 			}
@@ -120,7 +121,6 @@ const submitForm = () => {
 }
 
 const closeDialog = () => {
-	$myEmit('successCb')
 	$myEmit('update:modelValue', false)
 }
 

src/views/approve/components/loseSignDialog.vue

@@ -1,6 +1,6 @@
 <template>
 	<!-- 减签审批弹窗 -->
-	<el-dialog v-model="reviewVisibleDialog" title="审批减签" width="700" destroy-on-close>
+	<el-dialog class="le-dialog" v-model="reviewVisibleDialog" 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="请选择减签人员">
@@ -86,7 +86,8 @@ const submitForm = () => {
 		.validate()
 		.then(valid => {
 			if (valid) {
-				emit('successCb', formData)
+        $myEmit('successCb', formData)
+        closeDialog()
 				btnDisabled.value = false
 			}
 		})
@@ -97,7 +98,6 @@ const submitForm = () => {
 }
 
 const closeDialog = () => {
-	$myEmit('successCb')
 	$myEmit('update:modelValue', false)
 }
 

src/views/approve/components/reviewDialog.vue

@@ -1,6 +1,6 @@
 <template>
 	<!-- 评论弹窗 -->
-	<el-dialog v-model="reviewVisibleDialog" title="评论内容" width="700" destroy-on-close>
+	<el-dialog class="le-dialog" v-model="reviewVisibleDialog" 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="content" :rules="[{ required: true, message: '评论内容不能为空' }]">
 				<el-input v-model="form.content" type="textarea" placeholder="请输入内容" maxlength="64" show-word-limit> </el-input>
@@ -61,6 +61,7 @@ const submitForm = () => {
 		.then(async valid => {
 			if (valid) {
 				await processReviewTaskApi(formData)
+        $myEmit('successCb')
 				closeDialog()
 				btnDisabled.value = false
 			}
@@ -71,7 +72,6 @@ const submitForm = () => {
 }
 
 const closeDialog = () => {
-	$myEmit('successCb')
 	$myEmit('update:modelValue', false)
 }
 

src/views/approve/components/rollbackDialog.vue

@@ -1,6 +1,6 @@
 <template>
 	<!-- 回退审批弹窗 -->
-	<el-dialog v-model="reviewVisibleDialog" title="回退审批" width="700" destroy-on-close>
+	<el-dialog class="le-dialog" v-model="reviewVisibleDialog" 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="请选择回退节点">
@@ -73,6 +73,7 @@ const submitForm = () => {
 		.then(async valid => {
 			if (valid) {
 				await processTaskJumpApi(formData)
+        $myEmit('successCb')
 				closeDialog()
 				btnDisabled.value = false
 			}
@@ -83,7 +84,6 @@ const submitForm = () => {
 }
 
 const closeDialog = () => {
-	$myEmit('successCb')
 	$myEmit('update:modelValue', false)
 }
 

src/views/approve/launch/ItemDrawer.vue

@@ -11,7 +11,7 @@
 						</el-radio-group>
 					</template>
 					<template v-else>
-						{{ v.name }}
+						<div style="padding-bottom: 6px">{{ v.name }}</div>
 						<!-- {{ v.local_name }} -->
 						<div v-if="v.type !== 0" style="display: flex; align-items: center; gap: 6px">
 							<el-button :icon="Plus" style="width: 32px" @click="selectHandler(v.name)" />
@@ -219,15 +219,16 @@ model.processDetailApi(props.record.processId).then(res => {
 </style>
 <style scoped lang="scss">
 .info-wrap {
-	display: flex;
+	//display: flex;
 	.form-wrap {
 		flex: 1;
 	}
 	.timeline-wrap {
-		margin-left: 8px;
+		//margin-left: 8px;
 		flex-shrink: 0;
-		padding: 0;
-		width: 360px;
+		padding-left: 60px;
+		//padding: 0;
+		//width: 360px;
 	}
 }
 </style>

src/views/login/index.vue

@@ -67,7 +67,7 @@
 			</div>
 		</div>
 	</div>
-	<el-dialog v-model="showWechatLogin" :title="$t('login.wechatLoginTitle')" :width="400" destroy-on-close>
+	<el-dialog class="le-dialog" v-model="showWechatLogin" :title="$t('login.wechatLoginTitle')" :width="400" destroy-on-close>
 		<div class="qrCodeLogin">
 			<!-- <sc-qr-code class="qrCode" :text="WechatLoginCode" :size="200"></sc-qr-code> -->
 			<p class="msg">{{ $tc('login.wechatLoginMsg', 1) }}<br />{{ $tc('login.wechatLoginMsg', 2) }}</p>

src/views/login/userRegister.vue

@@ -55,7 +55,7 @@
 			<el-button v-if="stepActive < 1" type="primary" @click="next">下一步</el-button>
 			<el-button v-if="stepActive == 1" type="primary" @click="save">提交</el-button>
 		</el-form>
-		<el-dialog v-model="showAgree" title="平台服务协议" :width="800" destroy-on-close>
+		<el-dialog class="le-dialog" v-model="showAgree" title="平台服务协议" :width="800" destroy-on-close>
 			平台服务协议
 			<template #footer>
 				<el-button @click="showAgree = false">取消</el-button>

src/views/setting/role/permission.vue

@@ -1,5 +1,5 @@
 <template>
-	<el-dialog title="角色权限设置" v-model="visibleDialog" :width="500" destroy-on-close @closed="handleCancel">
+	<el-dialog class="le-dialog" title="角色权限设置" v-model="visibleDialog" :width="500" destroy-on-close @closed="handleCancel">
 		<el-tabs tab-position="top">
 			<el-tab-pane label="菜单权限">
 				<div class="treeMain">

src/views/setting/user/assign-role.vue

@@ -1,5 +1,5 @@
 <template>
-	<el-dialog v-model="visibleDialog" :title="`分配${currentTypeFlag ? '角色' : '部门'}`" :width="550" destroy-on-close @closed="handleCancel">
+	<el-dialog class="le-dialog" v-model="visibleDialog" :title="`分配${currentTypeFlag ? '角色' : '部门'}`" :width="550" destroy-on-close @closed="handleCancel">
 		<el-select v-model="roleIds" style="width: 500px" multiple filterable :placeholder="`请选择分配${currentTypeFlag ? '角色' : '部门'}`">
 			<el-option v-for="item in options" :key="item.id" :label="item.name" :value="item.id">
 				<span style="float: left">{{ item.name }}</span>

src/views/setting/user/reset-pwd.vue

@@ -1,5 +1,5 @@
 <template>
-	<el-dialog v-model="visibleDialog" title="密码重置" :width="550" destroy-on-close @closed="handleCancel">
+	<el-dialog class="le-dialog" v-model="visibleDialog" title="密码重置" :width="550" destroy-on-close @closed="handleCancel">
 		<el-form :label-position="'top'" label-width="100px" :model="formLabelAlign" style="max-width: 460px">
 			<el-form-item label="请输入新的密码">
 				<el-input v-model="formLabelAlign.password" />