From f139bf20d08f15e11f1f63157ea8f9d4187f9590 Mon Sep 17 00:00:00 2001
From: kun <1422840143@qq.com>
Date: Sun, 8 Oct 2023 18:47:33 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                         |  2 --
 .../components/Header/components/Message.vue        |  6 +++++-
 .../memberManage/components/addMemberForm.vue       |  8 ++++++++
 src/views/jxjview/government/index.vue              |  3 ++-
 src/views/login/CompanyLogon/basic-form.scss        |  9 +++++++++
 src/views/login/CompanyLogon/basic-form.vue         | 13 +++----------
 src/views/login/CompanyLogon/unit-table.scss        |  8 ++++++++
 src/views/login/ProJectForm/index.vue               | 11 +++++++++--
 .../memberManage/components/addMemberForm.vue       |  8 ++++++++
 9 files changed, 52 insertions(+), 16 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index e85c41c..3a623ec 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -123,7 +123,6 @@ const onUpdate = async row => {
 	}
 };
 onMounted(async () => {
-	console.log(7777777777777);
 	const res = await getSystemConfig({ configKey: "system_login_background" });
 	console.log(res);
 	if (res.result && res.result.length > 0) {
@@ -150,7 +149,6 @@ watch(
 	() => route.path,
 	n => {
 		tabsShow.value = route.meta.showSidebar;
-		console.log(tabsShow.value, "====我是首页");
 	}
 );
 </script>
diff --git a/src/layouts/components/Header/components/Message.vue b/src/layouts/components/Header/components/Message.vue
index 129ef11..bf19c76 100644
--- a/src/layouts/components/Header/components/Message.vue
+++ b/src/layouts/components/Header/components/Message.vue
@@ -14,7 +14,7 @@
 			</template>
 			<el-tabs v-model="activeName" @tab-change="tabsChange">
 				<el-tab-pane :label="`通知(${messageList.length})`" name="first">
-					<div class="message-list">
+					<div class="message-list" v-if="messageList.length > 0">
 						<div class="message-item" v-for="(item, index) in messageList" :key="index" @click="changeStatus(item)">
 							<div class="message-content">
 								<!-- <span class="message-title">{{ item.type == 1 ? "通知公告" : item.type == 2 ? "政策法规" : "无标题" }}</span> -->
@@ -26,6 +26,10 @@
 							</div>
 						</div>
 					</div>
+					<div class="message-empty" v-else>
+						<img src="@/assets/images/notData.png" alt="notData" />
+						<div>暂无通知</div>
+					</div>
 				</el-tab-pane>
 				<el-tab-pane label="消息(0)" name="second">
 					<div class="message-empty">
diff --git a/src/views/enterprise/laborRealName/memberManage/components/addMemberForm.vue b/src/views/enterprise/laborRealName/memberManage/components/addMemberForm.vue
index 9aa1eff..0085b3e 100644
--- a/src/views/enterprise/laborRealName/memberManage/components/addMemberForm.vue
+++ b/src/views/enterprise/laborRealName/memberManage/components/addMemberForm.vue
@@ -943,4 +943,12 @@ onMounted(() => {
 	justify-content: center;
 	align-items: center;
 }
+:deep() {
+	.el-progress-bar {
+		display: none;
+	}
+	.el-progress__text {
+		display: none;
+	}
+}
 </style>
diff --git a/src/views/jxjview/government/index.vue b/src/views/jxjview/government/index.vue
index a433e81..6478498 100644
--- a/src/views/jxjview/government/index.vue
+++ b/src/views/jxjview/government/index.vue
@@ -384,7 +384,8 @@ const formConfig = {
 		governmentTel: [
 			{
 				required: true,
-				message: "请输入手机号码",
+				pattern: /^(13[0-9]|14[579]|15[0-3,5-9]|16[6]|17[0135678]|18[0-9]|19[89])\d{8}$/,
+				message: "请输入正确的手机号",
 				trigger: "blur"
 			}
 		],
diff --git a/src/views/login/CompanyLogon/basic-form.scss b/src/views/login/CompanyLogon/basic-form.scss
index 3cb1949..c443d31 100644
--- a/src/views/login/CompanyLogon/basic-form.scss
+++ b/src/views/login/CompanyLogon/basic-form.scss
@@ -55,3 +55,12 @@ $primary: #409eff;
 		}
 	}
 }
+
+:deep() {
+	.el-progress-bar {
+		display: none;
+	}
+	.el-progress__text {
+		display: none;
+	}
+}
diff --git a/src/views/login/CompanyLogon/basic-form.vue b/src/views/login/CompanyLogon/basic-form.vue
index 92c23b6..0bc91dd 100644
--- a/src/views/login/CompanyLogon/basic-form.vue
+++ b/src/views/login/CompanyLogon/basic-form.vue
@@ -33,25 +33,18 @@
 				</el-form-item>
 			</el-col>
 			<el-col :span="12">
-				<el-form-item
-					label="营业执照:"
-					prop="businessLicense"
-					style="display: flex; align-items: center; justify-content: center"
-				>
+				<el-form-item label="营业执照:" prop="businessLicense">
 					<el-upload
 						v-model:file-list="filelist"
 						class="upload-demo"
 						:action="`${baseUrl}` + '/xmgl/file/upload'"
-						multiple
 						:limit="1"
 						:on-success="uploadSuccess"
 						style="display: flex; align-items: center; justify-content: center"
 					>
 						<el-button plain color="#47A99D" size="small">选择文件</el-button>
 						<template #tip>
-							<div v-show="!ruleForm.businessLicense" style="margin-left: 10px; margin-top: 10px; color: #aeaeae">
-								未选择任何文件
-							</div>
+							<div v-show="!ruleForm.businessLicense" style="margin-left: 10px; color: #aeaeae">未选择任何文件</div>
 						</template>
 					</el-upload>
 				</el-form-item>
@@ -80,7 +73,7 @@
 		<el-row :gutter="120">
 			<el-col :span="12">
 				<el-form-item label="企业地址:" prop="registerPlace">
-					<el-input v-model="ruleForm.registerPlace" placeholder="请选择企业地址">
+					<el-input disabled v-model="ruleForm.registerPlace" placeholder="请选择企业地址">
 						<template #append>
 							<el-icon color="#fff" size="22" @click="openMap"><Location /></el-icon>
 						</template>
diff --git a/src/views/login/CompanyLogon/unit-table.scss b/src/views/login/CompanyLogon/unit-table.scss
index 7088196..db8a3e6 100644
--- a/src/views/login/CompanyLogon/unit-table.scss
+++ b/src/views/login/CompanyLogon/unit-table.scss
@@ -76,3 +76,11 @@ $primary: #409eff;
 		}
 	}
 }
+:deep() {
+	.el-progress-bar {
+		display: none;
+	}
+	.el-progress__text {
+		display: none;
+	}
+}
diff --git a/src/views/login/ProJectForm/index.vue b/src/views/login/ProJectForm/index.vue
index 0c24b8d..0f4079a 100644
--- a/src/views/login/ProJectForm/index.vue
+++ b/src/views/login/ProJectForm/index.vue
@@ -41,7 +41,7 @@
 						</el-select>
 					</el-form-item>
 					<el-form-item label="坐标定位:" prop="projectAddress">
-						<el-input v-model="logonForm.projectAddress" size="large" placeholder="请定位坐标">
+						<el-input v-model="logonForm.projectAddress" disabled size="large" placeholder="请定位坐标">
 							<template #append>
 								<el-icon class="mapIcon" size="18px" @click="openMap"><Location /></el-icon>
 							</template>
@@ -97,7 +97,14 @@ const rules = reactive<FormRules>({
 	],
 	projectName: [{ required: true, message: "请输入项目名称", trigger: "blur" }],
 	governmentSn: [{ required: true, message: "请选择住建局", trigger: "change" }],
-	phone: [{ required: true, trigger: "blur", message: "手机号格式不正确", pattern: /^((0\d{2,3}-\d{7,8})|(1[34578]\d{9}))$/ }],
+	phone: [
+		{
+			required: true,
+			trigger: "blur",
+			message: "手机号格式不正确",
+			pattern: /^(13[0-9]|14[579]|15[0-3,5-9]|16[6]|17[0135678]|18[0-9]|19[89])\d{8}$/
+		}
+	],
 
 	password: [{ required: true, message: "请输入密码", trigger: "blur" }],
 	projectAddress: [{ required: true, message: "请输入定位", trigger: "change" }],
diff --git a/src/views/project/laborRealName/memberManage/components/addMemberForm.vue b/src/views/project/laborRealName/memberManage/components/addMemberForm.vue
index fa76402..14b4374 100644
--- a/src/views/project/laborRealName/memberManage/components/addMemberForm.vue
+++ b/src/views/project/laborRealName/memberManage/components/addMemberForm.vue
@@ -968,4 +968,12 @@ onMounted(() => {
 	justify-content: center;
 	align-items: center;
 }
+:deep() {
+	.el-progress-bar {
+		display: none;
+	}
+	.el-progress__text {
+		display: none;
+	}
+}
 </style>