Преглед изворни кода

reactor:输入统一调整为填写;

zhangchong пре 11 месеци
родитељ
комит
a48443c07e

+ 11 - 0
src/api/system/workflow.ts

@@ -358,4 +358,15 @@ export const workflowCancel = (data: object) => {
 		method: 'post',
 		data
 	});
+};
+/**
+ * @description 流程否决
+ * @param {object} data
+ */
+export const workflowReject = (data: object) => {
+	return request({
+		url: `/api/v1/Workflow/reject`,
+		method: 'post',
+		data
+	});
 };

+ 42 - 27
src/components/ProcessAudit/index.vue

@@ -439,6 +439,7 @@ import {
 	workflowPrevious,
 	workflowRecall,
 	workflowRecallParams,
+	workflowReject,
 } from '@/api/system/workflow';
 import { delayApply, delayApproveParams, delayBaseData, delayCalcEndTime, workflowDelayParams } from '@/api/business/delay';
 import { discernApply, discernApproveParams, screenBaseData, workflowDiscernParams } from '@/api/business/discern';
@@ -997,7 +998,7 @@ const onSubmit = (formEl: FormInstance | undefined) => {
 					case '延期审批':
 						if (state.ruleForm.isPass) {
 							// 审批通过 下一步
-							workflowNext({ ...submitObj,reviewResult:1, files: handleFiles.value })
+							workflowNext({ ...submitObj, files: handleFiles.value })
 								.then(() => {
 									afterSubmit('orderProcessSuccess', true);
 								})
@@ -1005,14 +1006,19 @@ const onSubmit = (formEl: FormInstance | undefined) => {
 									afterSubmit('orderProcessFailed');
 								});
 						} else {
-              // 审批拒绝
-              workflowNext({ ...submitObj,reviewResult:2, files: handleFiles.value })
-                .then(() => {
-                  afterSubmit('orderProcessSuccess', true);
-                })
-                .catch(() => {
-                  afterSubmit('orderProcessFailed');
-                });
+							// 审批拒绝
+							const requestDelayAudit = {
+								opinion: state.ruleForm.opinion,
+								workflowId: state.workflowId,
+								files: handleFiles.value,
+							};
+							workflowReject(requestDelayAudit)
+								.then(() => {
+									afterSubmit('orderProcessSuccess', true);
+								})
+								.catch(() => {
+									afterSubmit('orderProcessFailed');
+								});
 						}
 						break;
 					case '甄别申请':
@@ -1047,10 +1053,9 @@ const onSubmit = (formEl: FormInstance | undefined) => {
 							});
 						break;
 					case '甄别审批':
-            //   reviewResult 0默认 1通过 2不通过
 						if (state.ruleForm.isPass) {
 							// 审批通过 下一步
-							workflowNext({ ...submitObj,reviewResult:1, files: handleFiles.value })
+							workflowNext({ ...submitObj, files: handleFiles.value })
 								.then(() => {
 									afterSubmit('orderProcessSuccess', true);
 								})
@@ -1059,13 +1064,18 @@ const onSubmit = (formEl: FormInstance | undefined) => {
 								});
 						} else {
 							// 审批拒绝
-              workflowNext({ ...submitObj,reviewResult:2, files: handleFiles.value })
-                .then(() => {
-                  afterSubmit('orderProcessSuccess', true);
-                })
-                .catch(() => {
-                  afterSubmit('orderProcessFailed');
-                });
+							const requestDiscernAudit = {
+								opinion: state.ruleForm.opinion,
+								workflowId: state.workflowId,
+								files: handleFiles.value,
+							};
+							workflowReject(requestDiscernAudit)
+								.then(() => {
+									afterSubmit('orderProcessSuccess', true);
+								})
+								.catch(() => {
+									afterSubmit('orderProcessFailed');
+								});
 						}
 						break;
 					case '工单退回':
@@ -1102,7 +1112,7 @@ const onSubmit = (formEl: FormInstance | undefined) => {
 					case '知识审批':
 						if (state.ruleForm.isPass) {
 							// 审批通过 下一步
-							workflowNext({ ...submitObj,reviewResult:1, files: handleFiles.value })
+							workflowNext({ ...submitObj, files: handleFiles.value })
 								.then(() => {
 									afterSubmit('orderProcessSuccess', true);
 								})
@@ -1110,14 +1120,19 @@ const onSubmit = (formEl: FormInstance | undefined) => {
 									afterSubmit('orderProcessFailed');
 								});
 						} else {
-              // 审批拒绝
-              workflowNext({ ...submitObj,reviewResult:2, files: handleFiles.value })
-                .then(() => {
-                  afterSubmit('orderProcessSuccess', true);
-                })
-                .catch(() => {
-                  afterSubmit('orderProcessFailed');
-                });
+							// 审批拒绝
+							const requestDiscernAudit = {
+								opinion: state.ruleForm.opinion,
+								workflowId: state.workflowId,
+								files: handleFiles.value,
+							};
+							workflowReject(requestDiscernAudit)
+								.then(() => {
+									afterSubmit('orderProcessSuccess', true);
+								})
+								.catch(() => {
+									afterSubmit('orderProcessFailed');
+								});
 						}
 						break;
 					case '更新新增知识':

+ 4 - 4
src/utils/theme.ts

@@ -8,7 +8,7 @@ import { ElMessage } from 'element-plus';
 export function hexToRgb(str: any) {
 	let hexes: any = '';
 	let reg = /^\#?[0-9A-Fa-f]{6}$/;
-	if (!reg.test(str)) return ElMessage.warning('输入错误的hex');
+	if (!reg.test(str)) return ElMessage.warning('填写错误的hex');
 	str = str.replace('#', '');
 	hexes = str.match(/../g);
 	for (let i = 0; i < 3; i++) hexes[i] = parseInt(hexes[i], 16);
@@ -24,7 +24,7 @@ export function hexToRgb(str: any) {
  */
 export function rgbToHex(r: any, g: any, b: any) {
 	let reg = /^\d{1,3}$/;
-	if (!reg.test(r) || !reg.test(g) || !reg.test(b)) return ElMessage.warning('输入错误的rgb颜色值');
+	if (!reg.test(r) || !reg.test(g) || !reg.test(b)) return ElMessage.warning('填写错误的rgb颜色值');
 	let hexes = [r.toString(16), g.toString(16), b.toString(16)];
 	for (let i = 0; i < 3; i++) if (hexes[i].length == 1) hexes[i] = `0${hexes[i]}`;
 	return `#${hexes.join('')}`;
@@ -38,7 +38,7 @@ export function rgbToHex(r: any, g: any, b: any) {
  */
 export function getDarkColor(color: string, level: number) {
 	let reg = /^\#?[0-9A-Fa-f]{6}$/;
-	if (!reg.test(color)) return ElMessage.warning('输入错误的hex颜色值');
+	if (!reg.test(color)) return ElMessage.warning('填写错误的hex颜色值');
 	let rgb = hexToRgb(color);
 	for (let i = 0; i < 3; i++) rgb[i] = Math.floor(rgb[i] * (1 - level));
 	return rgbToHex(rgb[0], rgb[1], rgb[2]);
@@ -52,7 +52,7 @@ export function getDarkColor(color: string, level: number) {
  */
 export function getLightColor(color: string, level: number) {
 	let reg = /^\#?[0-9A-Fa-f]{6}$/;
-	if (!reg.test(color)) return ElMessage.warning('输入错误的hex颜色值');
+	if (!reg.test(color)) return ElMessage.warning('填写错误的hex颜色值');
 	let rgb = hexToRgb(color);
 	for (let i = 0; i < 3; i++) rgb[i] = Math.floor((255 - rgb[i]) * level + rgb[i]);
 	return rgbToHex(rgb[0], rgb[1], rgb[2]);

+ 4 - 4
src/utils/toolsValidate.ts

@@ -31,7 +31,7 @@ export function verifyNumberPercentageFloat(val: string): string {
 	let v = verifyNumberIntegerAndFloat(val);
 	// 数字超过100,赋值成最大值100
 	v = v.replace(/^[1-9]\d\d{1,3}$/, '100');
-	// 超过100之后不给再输入
+	// 超过100之后不给再填写
 	v = v.replace(/^100\.$/, '100');
 	// 返回结果
 	return v;
@@ -45,9 +45,9 @@ export function verifyNumberPercentageFloat(val: string): string {
 export function verifyNumberIntegerAndFloat(val: string) {
 	// 匹配空格
 	let v = val.replace(/(^\s*)|(\s*$)/g, '');
-	// 只能是数字和小数点,不能是其他输入
+	// 只能是数字和小数点,不能是其他填写
 	v = v.replace(/[^\d.]/g, '');
-	// 以0开始只能输入一个
+	// 以0开始只能填写一个
 	v = v.replace(/^0{2}$/g, '0');
 	// 保证第一位只能是数字,不能是点
 	v = v.replace(/^\./g, '');
@@ -108,7 +108,7 @@ export function verifyEnAndSpace(val: string) {
 }
 
 /**
- * @description 禁止输入空格
+ * @description 禁止填写空格
  * @param val 当前值字符串
  * @returns {string} 返回处理后的字符串
  */

+ 1 - 1
src/views/error/404.vue

@@ -6,7 +6,7 @@
 					<div class="left-item">
 						<div class="left-item-animation left-item-num">404</div>
 						<div class="left-item-animation left-item-title">当前地址未找到~</div>
-						<div class="left-item-animation left-item-msg">您可以先检查网址,然后重新输入或给我们反馈问题。</div>
+						<div class="left-item-animation left-item-msg">您可以先检查网址,然后重新填写或给我们反馈问题。</div>
 						<div class="left-item-animation left-item-btn">
 							<el-button type="primary" round @click="onGoHome">返回首页</el-button>
 						</div>

+ 1 - 1
src/views/home/component/Entrance.vue

@@ -62,7 +62,7 @@
 							<SvgIcon name="ele-CircleCheck" class="mr3"></SvgIcon>全选</el-button
 						></span
 					>
-					<el-input v-model="state.searchKey" placeholder="请输入关键字" class="input" @keyup.enter="getEntranceSelect">
+					<el-input v-model="state.searchKey" placeholder="请填写关键字" class="input" @keyup.enter="getEntranceSelect">
 						<template #prefix>
 							<SvgIcon name="ele-Search" />
 						</template>

+ 6 - 6
src/views/login/component/Account.vue

@@ -1,11 +1,11 @@
 <template>
 	<el-form size="large" class="login-content-form" ref="ruleFormRef" :model="state.ruleForm" @submit.native.prevent>
 		<motion :delay="100">
-			<el-form-item class="mb30" prop="username" :rules="[{ required: true, message: '请输入账号', trigger: 'blur' }]">
+			<el-form-item class="mb30" prop="username" :rules="[{ required: true, message: '请填写账号', trigger: 'blur' }]">
 				<el-input
 					type="text"
 					class="inputDeep"
-					placeholder="请输入账号"
+					placeholder="请填写账号"
 					v-model="state.ruleForm.username"
 					clearable
 					@keyup.enter="onSignIn(ruleFormRef)"
@@ -19,12 +19,12 @@
 			</el-form-item>
 		</motion>
 		<motion :delay="200">
-			<el-form-item class="mb30" prop="password" :rules="[{ required: true, message: '请输入密码', trigger: 'blur' }]">
+			<el-form-item class="mb30" prop="password" :rules="[{ required: true, message: '请填写密码', trigger: 'blur' }]">
 				<el-input
 					class="inputDeep"
 					clearable
 					show-password
-					placeholder="请输入密码"
+					placeholder="请填写密码"
 					v-model="state.ruleForm.password"
 					@keyup.enter="onSignIn(ruleFormRef)"
 					autocomplete="off"
@@ -36,12 +36,12 @@
 			</el-form-item>
 		</motion>
 		<motion :delay="400" v-if="themeConfig.isLoginMessageCode">
-			<el-form-item prop="msgCode" class="mb30" :rules="[{ required: msgCodeRequired, message: '请输入短信验证码', trigger: 'blur' }]">
+			<el-form-item prop="msgCode" class="mb30" :rules="[{ required: msgCodeRequired, message: '请填写短信验证码', trigger: 'blur' }]">
 				<el-col :span="11">
 					<el-input
 						type="text"
 						maxlength="6"
-						placeholder="请输入短信验证码"
+						placeholder="请填写短信验证码"
 						v-model="state.ruleForm.msgCode"
 						clearable
 						autocomplete="off"

+ 5 - 5
src/views/login/component/Mobile.vue

@@ -4,22 +4,22 @@
 			prop="userName"
 			class="mb30"
 			:rules="[
-				{ required: true, message: '请输入手机号', trigger: 'blur' },
+				{ required: true, message: '请填写手机号', trigger: 'blur' },
 				{ validator: checkPhone, trigger: 'blur' },
 			]"
 		>
-			<el-input placeholder="请输入手机号" v-model="state.ruleForm.userName" clearable autocomplete="off" class="inputDeep">
+			<el-input placeholder="请填写手机号" v-model="state.ruleForm.userName" clearable autocomplete="off" class="inputDeep">
 				<template #prefix>
 					<SvgIcon name="ele-Phone" class="el-input__icon" />
 				</template>
 			</el-input>
 		</el-form-item>
-		<el-form-item prop="password" class="mb30" :rules="[{ required: true, message: '请输入短信验证码', trigger: 'blur' }]">
+		<el-form-item prop="password" class="mb30" :rules="[{ required: true, message: '请填写短信验证码', trigger: 'blur' }]">
 			<el-col :span="15">
 				<el-input
 					type="text"
 					maxlength="4"
-					placeholder="请输入短信验证码"
+					placeholder="请填写短信验证码"
 					v-model="state.ruleForm.code"
 					clearable
 					autocomplete="off"
@@ -85,7 +85,7 @@ const checkPhone = (rule, value, callback) => {
 		if (verifyPhone(value)) {
 			callback();
 		} else {
-			return callback(new Error('请输入正确的手机号'));
+			return callback(new Error('请填写正确的手机号'));
 		}
 	}
 };

+ 5 - 5
src/views/system/config/dict/component/Dict-add.vue

@@ -26,17 +26,17 @@
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-						<el-form-item label="字典名称" prop="dicDataName" :rules="[{ required: true, message: '请输入字典名称', trigger: 'blur' }]">
-							<el-input v-model="state.ruleForm.dicDataName" placeholder="请输入字典名称" clearable></el-input>
+						<el-form-item label="字典名称" prop="dicDataName" :rules="[{ required: true, message: '请填写字典名称', trigger: 'blur' }]">
+							<el-input v-model="state.ruleForm.dicDataName" placeholder="请填写字典名称" clearable></el-input>
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-						<el-form-item label="字典值" prop="dicDataValue" :rules="[{ required: true, message: '请输入字典值', trigger: 'blur' }]">
-							<el-input v-model="state.ruleForm.dicDataValue" placeholder="请输入字典值" clearable></el-input>
+						<el-form-item label="字典值" prop="dicDataValue" :rules="[{ required: true, message: '请填写字典值', trigger: 'blur' }]">
+							<el-input v-model="state.ruleForm.dicDataValue" placeholder="请填写字典值" clearable></el-input>
 						</el-form-item>
 					</el-col>
           <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-            <el-form-item label="排序" prop="dicDataValue" :rules="[{ required: true, message: '请输入排序', trigger: 'blur' }]">
+            <el-form-item label="排序" prop="dicDataValue" :rules="[{ required: true, message: '请填写排序', trigger: 'blur' }]">
               <el-input-number v-model="state.ruleForm.sort" :min="1" :precision="0" class="w100"/>
             </el-form-item>
           </el-col>

+ 5 - 5
src/views/system/config/dict/component/Dict-edit.vue

@@ -24,17 +24,17 @@
 					</el-form-item>
 				</el-col>
 				<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-					<el-form-item label="字典名称" prop="dicDataName" :rules="[{ required: true, message: '请输入字典名称', trigger: 'blur' }]">
-						<el-input v-model="state.ruleForm.dicDataName" placeholder="请输入字典名称" clearable></el-input>
+					<el-form-item label="字典名称" prop="dicDataName" :rules="[{ required: true, message: '请填写字典名称', trigger: 'blur' }]">
+						<el-input v-model="state.ruleForm.dicDataName" placeholder="请填写字典名称" clearable></el-input>
 					</el-form-item>
 				</el-col>
 				<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-					<el-form-item label="字典值" prop="dicDataValue" :rules="[{ required: true, message: '请输入字典值', trigger: 'blur' }]">
-						<el-input v-model="state.ruleForm.dicDataValue" disabled placeholder="请输入字典值" clearable></el-input>
+					<el-form-item label="字典值" prop="dicDataValue" :rules="[{ required: true, message: '请填写字典值', trigger: 'blur' }]">
+						<el-input v-model="state.ruleForm.dicDataValue" disabled placeholder="请填写字典值" clearable></el-input>
 					</el-form-item>
 				</el-col>
 				<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-					<el-form-item label="排序" prop="dicDataValue" :rules="[{ required: true, message: '请输入排序', trigger: 'blur' }]">
+					<el-form-item label="排序" prop="dicDataValue" :rules="[{ required: true, message: '请填写排序', trigger: 'blur' }]">
 						<el-input-number v-model="state.ruleForm.sort" :min="1" :precision="0" class="w100" />
 					</el-form-item>
 				</el-col>

+ 1 - 1
src/views/system/config/timeLimit/component/Time-limit-add.vue

@@ -4,7 +4,7 @@
 			<el-form :model="state.ruleForm" ref="ruleFormRef" label-width="100px" scroll-to-error>
 				<el-row :gutter="5">
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-						<el-form-item label="配置名称" prop="timeLimitName" :rules="[{ required: true, message: '请输入配置名称', trigger: 'blur' }]">
+						<el-form-item label="配置名称" prop="timeLimitName" :rules="[{ required: true, message: '请填写配置名称', trigger: 'blur' }]">
 							<el-input v-model="state.ruleForm.timeLimitName" placeholder="请输入配置名称" clearable max-length="50"></el-input>
 						</el-form-item>
 					</el-col>

+ 1 - 1
src/views/system/config/timeLimit/component/Time-limit-edit.vue

@@ -4,7 +4,7 @@
 			<el-form :model="state.ruleForm" ref="ruleFormRef" label-width="100px" scroll-to-error>
 				<el-row :gutter="5">
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-						<el-form-item label="配置名称" prop="timeLimitName" :rules="[{ required: true, message: '请输入配置名称', trigger: 'blur' }]">
+						<el-form-item label="配置名称" prop="timeLimitName" :rules="[{ required: true, message: '请填写配置名称', trigger: 'blur' }]">
 							<el-input v-model="state.ruleForm.timeLimitName" placeholder="请输入配置名称" clearable max-length="50"></el-input>
 						</el-form-item>
 					</el-col>

+ 1 - 1
src/views/system/config/workflow/component/Workflow-jump.vue

@@ -32,7 +32,7 @@
 					</el-form-item>
 				</el-col>
 				<el-col :xs="24" :sm="12" :md="24" :lg="24" :xl="24">
-					<el-form-item label="情况说明" prop="opinion" :rules="[{ required: true, message: '请输入情况说明', trigger: 'blur' }]">
+					<el-form-item label="情况说明" prop="opinion" :rules="[{ required: true, message: '请填写情况说明', trigger: 'blur' }]">
 						<el-input
 							v-model="state.ruleForm.opinion"
 							type="textarea"

+ 12 - 12
src/views/system/menu/component/Menu-add.vue

@@ -26,8 +26,8 @@
 					</el-form-item>
 				</el-col>
 				<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-					<el-form-item label="菜单名称" prop="pageName" :rules="[{ required: false, message: '请输入菜单名称', trigger: 'blur' }]">
-						<el-input v-model="state.ruleForm.pageName" placeholder="请输入菜单名称" clearable></el-input>
+					<el-form-item label="菜单名称" prop="pageName" :rules="[{ required: false, message: '请填写菜单名称', trigger: 'blur' }]">
+						<el-input v-model="state.ruleForm.pageName" placeholder="请填写菜单名称" clearable></el-input>
 					</el-form-item>
 				</el-col>
 				<template v-if="[1, 2].includes(state.ruleForm.menuType)">
@@ -35,36 +35,36 @@
 						<el-form-item
 							label="路由名称"
 							prop="ruleName"
-							:rules="[{ required: state.ruleForm.isKeepAlive, message: '请输入路由名称', trigger: 'blur' }]"
+							:rules="[{ required: state.ruleForm.isKeepAlive, message: '请填写路由名称', trigger: 'blur' }]"
 						>
 							<el-input v-model="state.ruleForm.ruleName" placeholder="路由中的 name 值" clearable></el-input>
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-						<el-form-item label="路由路径" prop="path" :rules="[{ required: true, message: '请输入路由路径', trigger: 'blur' }]">
+						<el-form-item label="路由路径" prop="path" :rules="[{ required: true, message: '请填写路由路径', trigger: 'blur' }]">
 							<el-input v-model="state.ruleForm.path" placeholder="路由中的 path 值" clearable></el-input>
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-						<el-form-item label="重定向" prop="redirect" :rules="[{ required: false, message: '请输入重定向', trigger: 'blur' }]">
+						<el-form-item label="重定向" prop="redirect" :rules="[{ required: false, message: '请填写重定向', trigger: 'blur' }]">
 							<el-input v-model="state.ruleForm.redirect" placeholder="重定向" clearable></el-input>
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
-						<el-form-item label="组件路径" prop="component" :rules="[{ required: false, message: '请输入组件路径', trigger: 'blur' }]">
+						<el-form-item label="组件路径" prop="component" :rules="[{ required: false, message: '请填写组件路径', trigger: 'blur' }]">
 							<el-input v-model="state.ruleForm.component" placeholder="组件路径" clearable></el-input>
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-						<el-form-item label="菜单图标" prop="icon" :rules="[{ required: false, message: '请输入菜单名称', trigger: 'blur' }]">
-							<icon-selector placeholder="请输入菜单图标" v-model="state.ruleForm.icon" type="all" />
+						<el-form-item label="菜单图标" prop="icon" :rules="[{ required: false, message: '请填写菜单名称', trigger: 'blur' }]">
+							<icon-selector placeholder="请填写菜单图标" v-model="state.ruleForm.icon" type="all" />
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
 						<el-form-item
 							label="链接地址"
 							prop="link"
-							:rules="[{ required: state.ruleForm.isLink, message: '请输入外链/内嵌时链接地址', trigger: 'blur' }]"
+							:rules="[{ required: state.ruleForm.isLink, message: '请填写外链/内嵌时链接地址', trigger: 'blur' }]"
 						>
 							<el-input v-model="state.ruleForm.link" placeholder="外链/内嵌时链接地址(http:xxx.com)" clearable :disabled="!state.ruleForm.isLink">
 							</el-input>
@@ -72,18 +72,18 @@
 					</el-col>
 				</template>
 				<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-					<el-form-item label="权限编码" prop="permissionCode" :rules="[{ required: true, message: '请输入权限编码', trigger: 'blur' }]">
+					<el-form-item label="权限编码" prop="permissionCode" :rules="[{ required: true, message: '请填写权限编码', trigger: 'blur' }]">
 						<el-input v-model="state.ruleForm.permissionCode" placeholder="权限编码" clearable> </el-input>
 					</el-form-item>
 				</el-col>
 				<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-					<el-form-item label="权限标志" prop="forePermissionCode" :rules="[{ required: false, message: '请输入权限标志', trigger: 'blur' }]">
+					<el-form-item label="权限标志" prop="forePermissionCode" :rules="[{ required: false, message: '请填写权限标志', trigger: 'blur' }]">
 						<el-input v-model="state.ruleForm.forePermissionCode" placeholder="权限标志" clearable> </el-input>
 					</el-form-item>
 				</el-col>
 				<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
 					<el-form-item label="菜单排序">
-						<el-input-number v-model="state.ruleForm.displayOrder" controls-position="right" placeholder="请输入排序" class="w100" />
+						<el-input-number v-model="state.ruleForm.displayOrder" controls-position="right" placeholder="请填写排序" class="w100" />
 					</el-form-item>
 				</el-col>
 				<template v-if="[1, 2].includes(state.ruleForm.menuType)">

+ 12 - 12
src/views/system/menu/component/Menu-edit.vue

@@ -26,8 +26,8 @@
 					</el-form-item>
 				</el-col>
 				<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-					<el-form-item label="菜单名称" prop="pageName" :rules="[{ required: false, message: '请输入菜单名称', trigger: 'blur' }]">
-						<el-input v-model="state.ruleForm.pageName" placeholder="请输入菜单名称" clearable></el-input>
+					<el-form-item label="菜单名称" prop="pageName" :rules="[{ required: false, message: '请填写菜单名称', trigger: 'blur' }]">
+						<el-input v-model="state.ruleForm.pageName" placeholder="请填写菜单名称" clearable></el-input>
 					</el-form-item>
 				</el-col>
 				<template v-if="[1, 2].includes(state.ruleForm.menuType)">
@@ -35,36 +35,36 @@
 						<el-form-item
 							label="路由名称"
 							prop="ruleName"
-							:rules="[{ required: state.ruleForm.isKeepAlive, message: '请输入路由名称', trigger: 'blur' }]"
+							:rules="[{ required: state.ruleForm.isKeepAlive, message: '请填写路由名称', trigger: 'blur' }]"
 						>
 							<el-input v-model="state.ruleForm.ruleName" placeholder="路由中的 name 值" clearable></el-input>
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-						<el-form-item label="路由路径" prop="path" :rules="[{ required: true, message: '请输入路由路径', trigger: 'blur' }]">
+						<el-form-item label="路由路径" prop="path" :rules="[{ required: true, message: '请填写路由路径', trigger: 'blur' }]">
 							<el-input v-model="state.ruleForm.path" placeholder="路由中的 path 值" clearable></el-input>
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-						<el-form-item label="重定向" prop="redirect" :rules="[{ required: false, message: '请输入重定向', trigger: 'blur' }]">
+						<el-form-item label="重定向" prop="redirect" :rules="[{ required: false, message: '请填写重定向', trigger: 'blur' }]">
 							<el-input v-model="state.ruleForm.redirect" placeholder="重定向" clearable></el-input>
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
-						<el-form-item label="组件路径" prop="component" :rules="[{ required: false, message: '请输入组件路径', trigger: 'blur' }]">
+						<el-form-item label="组件路径" prop="component" :rules="[{ required: false, message: '请填写组件路径', trigger: 'blur' }]">
 							<el-input v-model="state.ruleForm.component" placeholder="组件路径" clearable></el-input>
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-						<el-form-item label="菜单图标" prop="icon" :rules="[{ required: false, message: '请输入菜单名称', trigger: 'blur' }]">
-							<icon-selector placeholder="请输入菜单图标" v-model="state.ruleForm.icon" type="all" />
+						<el-form-item label="菜单图标" prop="icon" :rules="[{ required: false, message: '请填写菜单名称', trigger: 'blur' }]">
+							<icon-selector placeholder="请填写菜单图标" v-model="state.ruleForm.icon" type="all" />
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
 						<el-form-item
 							label="链接地址"
 							prop="link"
-							:rules="[{ required: state.ruleForm.isLink, message: '请输入外链/内嵌时链接地址', trigger: 'blur' }]"
+							:rules="[{ required: state.ruleForm.isLink, message: '请填写外链/内嵌时链接地址', trigger: 'blur' }]"
 						>
 							<el-input v-model="state.ruleForm.link" placeholder="外链/内嵌时链接地址(http:xxx.com)" clearable :disabled="!state.ruleForm.isLink">
 							</el-input>
@@ -72,18 +72,18 @@
 					</el-col>
 				</template>
 				<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-					<el-form-item label="权限编码" prop="permissionCode" :rules="[{ required: true, message: '请输入权限编码', trigger: 'blur' }]">
+					<el-form-item label="权限编码" prop="permissionCode" :rules="[{ required: true, message: '请填写权限编码', trigger: 'blur' }]">
 						<el-input v-model="state.ruleForm.permissionCode" placeholder="权限编码" clearable> </el-input>
 					</el-form-item>
 				</el-col>
 				<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-					<el-form-item label="权限标志" prop="forePermissionCode" :rules="[{ required: false, message: '请输入权限标志', trigger: 'blur' }]">
+					<el-form-item label="权限标志" prop="forePermissionCode" :rules="[{ required: false, message: '请填写权限标志', trigger: 'blur' }]">
 						<el-input v-model="state.ruleForm.forePermissionCode" placeholder="权限标志" clearable> </el-input>
 					</el-form-item>
 				</el-col>
 				<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
 					<el-form-item label="菜单排序">
-						<el-input-number v-model="state.ruleForm.displayOrder" controls-position="right" placeholder="请输入排序" class="w100" />
+						<el-input-number v-model="state.ruleForm.displayOrder" controls-position="right" placeholder="请填写排序" class="w100" />
 					</el-form-item>
 				</el-col>
 				<template v-if="[1, 2].includes(state.ruleForm.menuType)">

+ 6 - 6
src/views/system/roles/component/Role-add.vue

@@ -3,8 +3,8 @@
 		<el-form :model="state.ruleForm" label-width="90px" ref="ruleFormRef">
 			<el-row :gutter="35">
 				<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-					<el-form-item label="角色名称" prop="displayName" :rules="[{ required: true, message: '请输入角色名称', trigger: 'blur' }]">
-						<el-input v-model="state.ruleForm.displayName" placeholder="请输入角色名称" clearable></el-input>
+					<el-form-item label="角色名称" prop="displayName" :rules="[{ required: true, message: '请填写角色名称', trigger: 'blur' }]">
+						<el-input v-model="state.ruleForm.displayName" placeholder="请填写角色名称" clearable></el-input>
 					</el-form-item>
 				</el-col>
         <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
@@ -15,13 +15,13 @@
           </el-form-item>
         </el-col>
 				<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
-					<el-form-item label="角色编码" prop="name" :rules="[{ required: true, message: '请输入角色编码', trigger: 'blur' }]">
-						<el-input v-model="state.ruleForm.name" placeholder="请输入角色编码" clearable></el-input>
+					<el-form-item label="角色编码" prop="name" :rules="[{ required: true, message: '请填写角色编码', trigger: 'blur' }]">
+						<el-input v-model="state.ruleForm.name" placeholder="请填写角色编码" clearable></el-input>
 					</el-form-item>
 				</el-col>
 				<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
-					<el-form-item label="角色说明" prop="description" :rules="[{ required: false, message: '请输入角色说明', trigger: 'blur' }]">
-						<el-input v-model="state.ruleForm.description" type="textarea" placeholder="请输入角色说明" maxlength="150"></el-input>
+					<el-form-item label="角色说明" prop="description" :rules="[{ required: false, message: '请填写角色说明', trigger: 'blur' }]">
+						<el-input v-model="state.ruleForm.description" type="textarea" placeholder="请填写角色说明" maxlength="150"></el-input>
 					</el-form-item>
 				</el-col>
 			</el-row>

+ 2 - 2
src/views/system/roles/component/Role-edit.vue

@@ -3,8 +3,8 @@
 		<el-form :model="state.ruleForm" label-width="90px" ref="ruleFormRef">
 			<el-row :gutter="35">
 				<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-					<el-form-item label="角色名称" prop="displayName" :rules="[{ required: true, message: '请输入角色名称', trigger: 'blur' }]">
-						<el-input v-model="state.ruleForm.displayName" placeholder="请输入角色名称" clearable></el-input>
+					<el-form-item label="角色名称" prop="displayName" :rules="[{ required: true, message: '请填写角色名称', trigger: 'blur' }]">
+						<el-input v-model="state.ruleForm.displayName" placeholder="请填写角色名称" clearable></el-input>
 					</el-form-item>
 				</el-col>
         <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">

+ 10 - 10
src/views/system/user/component/User-add.vue

@@ -6,18 +6,18 @@
 					<el-divider content-position="left"> <el-text tag="b" size="large">基本信息</el-text> </el-divider>
 				</el-col>
 				<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-					<el-form-item label="姓名" prop="name" :rules="[{ required: true, message: '请输入姓名', trigger: 'blur' }]">
-						<el-input v-model="state.ruleForm.name" placeholder="请输入姓名" clearable></el-input>
+					<el-form-item label="姓名" prop="name" :rules="[{ required: true, message: '请填写姓名', trigger: 'blur' }]">
+						<el-input v-model="state.ruleForm.name" placeholder="请填写姓名" clearable></el-input>
 					</el-form-item>
 				</el-col>
 				<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-					<el-form-item label="账号" prop="userName" :rules="[{ required: true, message: '请输入账号', trigger: 'blur' }]">
-						<el-input v-model="state.ruleForm.userName" placeholder="请输入账号" clearable></el-input>
+					<el-form-item label="账号" prop="userName" :rules="[{ required: true, message: '请填写账号', trigger: 'blur' }]">
+						<el-input v-model="state.ruleForm.userName" placeholder="请填写账号" clearable></el-input>
 					</el-form-item>
 				</el-col>
 				<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-					<el-form-item label="手机号" prop="phoneNo" :rules="[{ required: true, message: '请输入手机号', trigger: 'blur' }]">
-						<el-input v-model="state.ruleForm.phoneNo" placeholder="请输入手机号" clearable></el-input>
+					<el-form-item label="手机号" prop="phoneNo" :rules="[{ required: true, message: '请填写手机号', trigger: 'blur' }]">
+						<el-input v-model="state.ruleForm.phoneNo" placeholder="请填写手机号" clearable></el-input>
 					</el-form-item>
 				</el-col>
 				<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
@@ -60,13 +60,13 @@
 					</el-form-item>
 				</el-col>
 				<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-					<el-form-item label="邮箱" prop="email" :rules="[{ required: false, message: '请输入邮箱', trigger: 'blur' }]">
-						<el-input v-model="state.ruleForm.email" placeholder="请输入邮箱" clearable></el-input>
+					<el-form-item label="邮箱" prop="email" :rules="[{ required: false, message: '请填写邮箱', trigger: 'blur' }]">
+						<el-input v-model="state.ruleForm.email" placeholder="请填写邮箱" clearable></el-input>
 					</el-form-item>
 				</el-col>
 				<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-					<el-form-item label="工号" prop="staffNo" :rules="[{ required: false, message: '请输入工号', trigger: 'blur' }]">
-						<el-input v-model="state.ruleForm.staffNo" placeholder="请输入工号" clearable></el-input>
+					<el-form-item label="工号" prop="staffNo" :rules="[{ required: false, message: '请填写工号', trigger: 'blur' }]">
+						<el-input v-model="state.ruleForm.staffNo" placeholder="请填写工号" clearable></el-input>
 					</el-form-item>
 				</el-col>
 				<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">

+ 10 - 10
src/views/system/user/component/User-edit.vue

@@ -8,18 +8,18 @@
 					</el-divider>
 				</el-col>
 				<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-					<el-form-item label="姓名" prop="name" :rules="[{ required: true, message: '请输入姓名', trigger: 'blur' }]">
-						<el-input v-model="state.ruleForm.name" placeholder="请输入姓名" clearable></el-input>
+					<el-form-item label="姓名" prop="name" :rules="[{ required: true, message: '请填写姓名', trigger: 'blur' }]">
+						<el-input v-model="state.ruleForm.name" placeholder="请填写姓名" clearable></el-input>
 					</el-form-item>
 				</el-col>
 				<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-					<el-form-item label="账号" prop="userName" :rules="[{ required: true, message: '请输入账号', trigger: 'blur' }]">
-						<el-input v-model="state.ruleForm.userName" disabled placeholder="请输入账号" clearable> </el-input>
+					<el-form-item label="账号" prop="userName" :rules="[{ required: true, message: '请填写账号', trigger: 'blur' }]">
+						<el-input v-model="state.ruleForm.userName" disabled placeholder="请填写账号" clearable> </el-input>
 					</el-form-item>
 				</el-col>
 				<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-					<el-form-item label="手机号" prop="phoneNo" :rules="[{ required: true, message: '请输入手机号', trigger: 'blur' }]">
-						<el-input v-model="state.ruleForm.phoneNo" placeholder="请输入手机号" clearable></el-input>
+					<el-form-item label="手机号" prop="phoneNo" :rules="[{ required: true, message: '请填写手机号', trigger: 'blur' }]">
+						<el-input v-model="state.ruleForm.phoneNo" placeholder="请填写手机号" clearable></el-input>
 					</el-form-item>
 				</el-col>
 				<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
@@ -62,13 +62,13 @@
 					</el-form-item>
 				</el-col>
 				<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-					<el-form-item label="邮箱" prop="email" :rules="[{ required: false, message: '请输入邮箱', trigger: 'blur' }]">
-						<el-input v-model="state.ruleForm.email" placeholder="请输入邮箱" clearable></el-input>
+					<el-form-item label="邮箱" prop="email" :rules="[{ required: false, message: '请填写邮箱', trigger: 'blur' }]">
+						<el-input v-model="state.ruleForm.email" placeholder="请填写邮箱" clearable></el-input>
 					</el-form-item>
 				</el-col>
 				<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-					<el-form-item label="工号" prop="staffNo" :rules="[{ required: false, message: '请输入工号', trigger: 'blur' }]">
-						<el-input v-model="state.ruleForm.staffNo" placeholder="请输入工号" clearable></el-input>
+					<el-form-item label="工号" prop="staffNo" :rules="[{ required: false, message: '请填写工号', trigger: 'blur' }]">
+						<el-input v-model="state.ruleForm.staffNo" placeholder="请填写工号" clearable></el-input>
 					</el-form-item>
 				</el-col>
 				<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">

+ 1 - 1
src/views/system/user/index.vue

@@ -3,7 +3,7 @@
 		<div class="layout-padding-auto layout-padding-view pd20">
 			<splitpanes class="h100" Vertical>
 				<pane min-size="16" max-size="25" size="16">
-					<el-input v-model="filterOrg" placeholder="请输入部门名称" class="input-with-select mb10" clearable @input="onQueryChanged"> </el-input>
+					<el-input v-model="filterOrg" placeholder="请填写部门名称" class="input-with-select mb10" clearable @input="onQueryChanged"> </el-input>
 					<el-scrollbar style="height: calc(100% - 40px);'" ref="scrollBarRef">
 						<el-skeleton :loading="state.loading" animated :rows="10">
 							<template #default>

+ 2 - 2
src/views/tels/blacklist/component/Blacklist-add.vue

@@ -3,8 +3,8 @@
 		<el-form :model="state.ruleForm" ref="blacklistFormRef" label-width="80px" label-position="left">
 			<el-row :gutter="35">
 				<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
-					<el-form-item label="电话号码" prop="phone" :rules="[{ required: true, message: '请输入电话号码', trigger: 'blur' }]">
-						<el-input v-model="state.ruleForm.phone" placeholder="请输入电话号码" clearable></el-input>
+					<el-form-item label="电话号码" prop="phone" :rules="[{ required: true, message: '请填写电话号码', trigger: 'blur' }]">
+						<el-input v-model="state.ruleForm.phone" placeholder="请填写电话号码" clearable></el-input>
 					</el-form-item>
 				</el-col>
 				<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">

+ 1 - 1
src/views/tels/blacklist/index.vue

@@ -4,7 +4,7 @@
 			<!-- 通用搜索 -->
 			<el-form :model="state.queryParams" ref="ruleFormRef" inline @submit.native.prevent>
 				<el-form-item label="黑白名单号码" prop="Phone">
-					<el-input v-model="state.queryParams.Phone" placeholder="请输入黑白名单号码" clearable @keyup.enter="handleQuery" class="keyword-input" />
+					<el-input v-model="state.queryParams.Phone" placeholder="请填写黑白名单号码" clearable @keyup.enter="handleQuery" class="keyword-input" />
 				</el-form-item>
 				<el-form-item label="类型" prop="SpecialFlag">
 					<el-select v-model="state.queryParams.SpecialFlag" placeholder="请选择类型">

+ 2 - 2
src/views/todo/seats/accept/Citizen-portrait.vue

@@ -77,11 +77,11 @@
             <el-tag v-for="tag in state.label" :closable="closable" effect="dark" @close="closeTag(tag)" :key="tag">{{ tag.label }}</el-tag>
           </div>
           <el-form :model="state.ruleForm" label-width="0" ref="ruleFormRef" @submit.native.prevent v-if="state.citizen.id && closable">
-            <el-form-item label="" prop="content" :rules="[{ required: true, message: '请输入标签内容', trigger: 'blur' }]">
+            <el-form-item label="" prop="content" :rules="[{ required: true, message: '请填写标签内容', trigger: 'blur' }]">
               <div class="flex-center-align mt10 w100">
                 <el-input
                   v-model="state.ruleForm.content"
-                  placeholder="请输入标签内容"
+                  placeholder="请填写标签内容"
                   clearable
                   show-word-limit
                   maxlength="10"

+ 1 - 1
src/views/todo/seats/accept/Map-select.vue

@@ -7,7 +7,7 @@
 				:fetch-suggestions="handleSearch"
 				:trigger-on-focus="false"
 				clearable
-				placeholder="输入城市+关键字搜索"
+				placeholder="填写城市+关键字搜索"
 				@select="handleSelect"
 				class="width400"
 			/>

+ 1 - 1
src/views/todo/seats/accept/accept.vue

@@ -233,7 +233,7 @@
                     prop="enterpriseName"
                     :rules="[{ required: state.ruleForm.identityType === 2, message: '请填写企业名称', trigger: 'blur' }]"
                   >
-                    <el-input v-model="state.ruleForm.enterpriseName" placeholder="请输入企业名称" clearable> </el-input>
+                    <el-input v-model="state.ruleForm.enterpriseName" placeholder="请填写企业名称" clearable> </el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">

+ 1 - 1
src/views/todo/seats/accept/index.vue

@@ -233,7 +233,7 @@
                     prop="enterpriseName"
                     :rules="[{ required: state.ruleForm.identityType === 2, message: '请填写企业名称', trigger: 'blur' }]"
                   >
-                    <el-input v-model="state.ruleForm.enterpriseName" placeholder="请输入企业名称" clearable> </el-input>
+                    <el-input v-model="state.ruleForm.enterpriseName" placeholder="请填写企业名称" clearable> </el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">