Merge branch 'zhipeng_dev' into shenzhen-dev

src/views/enterprise/notice/myReceive/index.vue

@@ -129,7 +129,13 @@ const columns: ColumnProps[] = [
 	{ prop: "content", label: "通知内容", search: { el: "input" } },
 	{ prop: "createByName", label: "发布人名称" },
 	{ prop: "createTime", label: "发布时间" },
-	{ prop: "isRead", label: "阅读状态" },
+	{
+		prop: "isRead",
+		label: "阅读状态",
+		render: scoped => {
+			return scoped.row.isRead === 1 ? "已读" : "未读";
+		}
+	},
 	{ prop: "operation", label: "操作", fixed: "right" }
 ];
 

src/views/enterprise/userManagement/departmentManage/index.vue

@@ -133,7 +133,19 @@ const title = ref("");
 const visible = ref(false);
 const Deptvisible = ref(false);
 const showPage = ref(false);
-const formData = ref({});
+const formData = ref({
+	realName: "",
+	userTel: "",
+	account: "",
+	password: "",
+	email: "",
+	state: 1,
+	sex: "",
+	department: "",
+	jobName: "",
+	roleId: "",
+	remark: ""
+});
 const formDataDept = ref({});
 const treeDeptList = ref([]);
 // 获取 ProTable 元素，调用其获取刷新数据方法（还能获取到当前查询参数，方便导出携带参数）
@@ -300,6 +312,13 @@ const formConfig = reactive({
 				message: "请输入名称",
 				trigger: "blur"
 			}
+		],
+		roleId: [
+			{
+				required: true,
+				message: "请选择角色",
+				trigger: "blur"
+			}
 		]
 	}
 });
@@ -415,7 +434,19 @@ const handleEditItem = async (index: number, row: any) => {
 	});
 	if (index === 1) {
 		title.value = "新增用户";
-		formData.value = reactive({});
+		formData.value = reactive({
+			realName: "",
+			userTel: "",
+			account: "",
+			password: "",
+			email: "",
+			state: 1,
+			sex: "",
+			department: "",
+			jobName: "",
+			roleId: "",
+			remark: ""
+		});
 	} else {
 		title.value = "编辑用户";
 		formData.value = reactive({ ...row });

src/views/enterprise/userManagement/userManage/index.vue

@@ -85,7 +85,19 @@ const store = GlobalStore();
 const visible = ref(false);
 const authorityVisible = ref(false);
 const title = ref("");
-const formData = ref({});
+const formData = ref({
+	realName: "",
+	userTel: "",
+	account: "",
+	password: "",
+	email: "",
+	state: 1,
+	sex: "",
+	department: "",
+	jobName: "",
+	roleId: "",
+	remark: ""
+});
 // 获取 ProTable 元素，调用其获取刷新数据方法（还能获取到当前查询参数，方便导出携带参数）
 const proTable = ref();
 const authorityTable = ref();
@@ -240,6 +252,13 @@ const formConfig = reactive({
 				message: "请输入名称",
 				trigger: "blur"
 			}
+		],
+		roleId: [
+			{
+				required: true,
+				message: "请选择角色",
+				trigger: "blur"
+			}
 		]
 	}
 });
@@ -312,7 +331,19 @@ const onSubmit = async () => {
 const handleEditItem = async (index: number, row: any) => {
 	if (index === 1) {
 		title.value = "新增用户";
-		formData.value = reactive({});
+		formData.value = reactive({
+			realName: "",
+			userTel: "",
+			account: "",
+			password: "",
+			email: "",
+			state: 1,
+			sex: "",
+			department: "",
+			jobName: "",
+			roleId: "",
+			remark: ""
+		});
 	} else {
 		title.value = "编辑用户";
 		formData.value = reactive({ ...row });

src/views/goverment/approve/company/index.vue

@@ -31,7 +31,7 @@
 				</div>
 			</template>
 		</ProTable>
-		<el-dialog class="lookDialog" v-model="visible" title="查看企业信息" width="66%" show-close>
+		<el-dialog id="lookDialog" v-model="visible" title="查看企业信息" width="66%" show-close>
 			<div>
 				<div class="littleTitle">企业基本信息</div>
 				<el-form ref="ruleFormRef" :model="ruleForm" label-width="150px" class="basic-form">
@@ -313,8 +313,8 @@ const deleteAccount = async (row: any) => {
 		text-align: left;
 	}
 }
-:deep(.el-dialog__body) {
+:deep(#lookDialog .el-dialog__body) {
-	height: 800px;
+	height: 700px;
 	overflow: auto;
 }
 </style>

src/views/goverment/userManagement/departmentManage/index.vue

@@ -132,7 +132,19 @@ const title = ref("");
 const visible = ref(false);
 const Deptvisible = ref(false);
 const showPage = ref(false);
-const formData = ref({});
+const formData = ref({
+	realName: "",
+	userTel: "",
+	account: "",
+	password: "",
+	email: "",
+	state: 1,
+	sex: "",
+	department: "",
+	jobName: "",
+	roleId: "",
+	remark: ""
+});
 const formDataDept = ref({});
 const treeDeptList = ref([]);
 // 获取 ProTable 元素，调用其获取刷新数据方法（还能获取到当前查询参数，方便导出携带参数）
@@ -297,6 +309,13 @@ const formConfig = reactive({
 				message: "请输入名称",
 				trigger: "blur"
 			}
+		],
+		roleId: [
+			{
+				required: true,
+				message: "请选择角色",
+				trigger: "blur"
+			}
 		]
 	}
 });
@@ -381,20 +400,6 @@ const dataCallback = (data: any) => {
 	};
 };
 
-const onReset = () => {
-	baseFrom.value = reactive({
-		parentId: undefined,
-		deptName: "",
-		priority: 1,
-		leader: "",
-		phone: "",
-		email: "",
-		status: 1
-	});
-
-	ElMessage.success("重置成功");
-};
-
 const onSubmit = async () => {
 	await editTreeDeptMent(baseFrom.value);
 	ElMessage.success("编辑成功");
@@ -413,7 +418,19 @@ const handleEditItem = async (index: number, row: any) => {
 	});
 	if (index === 1) {
 		title.value = "新增用户";
-		formData.value = reactive({});
+		formData.value = reactive({
+			realName: "",
+			userTel: "",
+			account: "",
+			password: "",
+			email: "",
+			state: 1,
+			sex: "",
+			department: "",
+			jobName: "",
+			roleId: "",
+			remark: ""
+		});
 	} else {
 		title.value = "编辑用户";
 		formData.value = reactive({ ...row });

src/views/goverment/userManagement/userManage/index.vue

@@ -85,7 +85,19 @@ const store = GlobalStore();
 const visible = ref(false);
 const authorityVisible = ref(false);
 const title = ref("");
-const formData = ref({});
+const formData = ref({
+	realName: "",
+	userTel: "",
+	account: "",
+	password: "",
+	email: "",
+	state: 1,
+	sex: "",
+	department: "",
+	jobName: "",
+	roleId: "",
+	remark: ""
+});
 // 获取 ProTable 元素，调用其获取刷新数据方法（还能获取到当前查询参数，方便导出携带参数）
 const proTable = ref();
 const authorityTable = ref();
@@ -240,6 +252,13 @@ const formConfig = reactive({
 				message: "请输入名称",
 				trigger: "blur"
 			}
+		],
+		roleId: [
+			{
+				required: true,
+				message: "请选择角色",
+				trigger: "blur"
+			}
 		]
 	}
 });
@@ -294,7 +313,19 @@ const onSubmit = async () => {
 const handleEditItem = async (index: number, row: any) => {
 	if (index === 1) {
 		title.value = "新增用户";
-		formData.value = reactive({});
+		formData.value = reactive({
+			realName: "",
+			userTel: "",
+			account: "",
+			password: "",
+			email: "",
+			state: 1,
+			sex: "",
+			department: "",
+			jobName: "",
+			roleId: "",
+			remark: ""
+		});
 	} else {
 		title.value = "编辑用户";
 		formData.value = reactive({ ...row });

src/views/project/notice/myReceive/index.vue

@@ -129,7 +129,13 @@ const columns: ColumnProps[] = [
 	{ prop: "content", label: "通知内容", search: { el: "input" } },
 	{ prop: "createByName", label: "发布人名称" },
 	{ prop: "createTime", label: "发布时间" },
-	{ prop: "isRead", label: "阅读状态" },
+	{
+		prop: "isRead",
+		label: "阅读状态",
+		render: scoped => {
+			return scoped.row.isRead === 1 ? "已读" : "未读";
+		}
+	},
 	{ prop: "operation", label: "操作", fixed: "right" }
 ];
 

src/views/project/userManagement/departmentManage/index.vue

@@ -133,7 +133,19 @@ const title = ref("");
 const visible = ref(false);
 const Deptvisible = ref(false);
 const showPage = ref(false);
-const formData = ref({});
+const formData = ref({
+	realName: "",
+	userTel: "",
+	account: "",
+	password: "",
+	email: "",
+	state: 1,
+	sex: "",
+	department: "",
+	jobName: "",
+	roleId: "",
+	remark: ""
+});
 const formDataDept = ref({});
 const treeDeptList = ref([]);
 // 获取 ProTable 元素，调用其获取刷新数据方法（还能获取到当前查询参数，方便导出携带参数）
@@ -300,6 +312,13 @@ const formConfig = reactive({
 				message: "请输入名称",
 				trigger: "blur"
 			}
+		],
+		roleId: [
+			{
+				required: true,
+				message: "请选择角色",
+				trigger: "blur"
+			}
 		]
 	}
 });
@@ -415,7 +434,19 @@ const handleEditItem = async (index: number, row: any) => {
 	});
 	if (index === 1) {
 		title.value = "新增用户";
-		formData.value = reactive({});
+		formData.value = reactive({
+			realName: "",
+			userTel: "",
+			account: "",
+			password: "",
+			email: "",
+			state: 1,
+			sex: "",
+			department: "",
+			jobName: "",
+			roleId: "",
+			remark: ""
+		});
 	} else {
 		title.value = "编辑用户";
 		formData.value = reactive({ ...row });

src/views/project/userManagement/userManage/index.vue

@@ -85,7 +85,19 @@ const store = GlobalStore();
 const visible = ref(false);
 const authorityVisible = ref(false);
 const title = ref("");
-const formData = ref({});
+const formData = ref({
+	realName: "",
+	userTel: "",
+	account: "",
+	password: "",
+	email: "",
+	state: 1,
+	sex: "",
+	department: "",
+	jobName: "",
+	roleId: "",
+	remark: ""
+});
 // 获取 ProTable 元素，调用其获取刷新数据方法（还能获取到当前查询参数，方便导出携带参数）
 const proTable = ref();
 const authorityTable = ref();
@@ -240,6 +252,13 @@ const formConfig = reactive({
 				message: "请输入名称",
 				trigger: "blur"
 			}
+		],
+		roleId: [
+			{
+				required: true,
+				message: "请选择角色",
+				trigger: "blur"
+			}
 		]
 	}
 });
@@ -312,7 +331,19 @@ const onSubmit = async () => {
 const handleEditItem = async (index: number, row: any) => {
 	if (index === 1) {
 		title.value = "新增用户";
-		formData.value = reactive({});
+		formData.value = reactive({
+			realName: "",
+			userTel: "",
+			account: "",
+			password: "",
+			email: "",
+			state: 1,
+			sex: "",
+			department: "",
+			jobName: "",
+			roleId: "",
+			remark: ""
+		});
 	} else {
 		title.value = "编辑用户";
 		formData.value = reactive({ ...row });