From 3fa61f0b66a52ab047084f19efea780f44aac36d Mon Sep 17 00:00:00 2001
From: wxz <wxz@test.com>
Date: Tue, 11 Jul 2023 12:50:56 +0800
Subject: [PATCH] =?UTF-8?q?1.=E3=80=90=E9=80=9A=E8=AE=AF=E5=BD=95=E3=80=91?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AF=81=E4=BB=B6=E5=8F=B7=202.=E3=80=90?=
 =?UTF-8?q?=E4=BA=BA=E6=88=BF=E3=80=91=E5=B1=85=E6=B0=91=E5=92=8C=E7=BB=84?=
 =?UTF-8?q?=E7=BB=87=E9=A1=B5=E9=9D=A2=E5=88=A0=E6=8E=89=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E6=97=A0=E7=94=A8=E6=97=A7=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/base/community/communityTable.vue | 50 +++++++++----------
 .../base/organization/organization.vue        | 28 ++++++++++-
 src/views/modules/base/resi.vue               | 46 ++++++++---------
 3 files changed, 75 insertions(+), 49 deletions(-)

diff --git a/src/views/modules/base/community/communityTable.vue b/src/views/modules/base/community/communityTable.vue
index bf789729b..5b798401a 100644
--- a/src/views/modules/base/community/communityTable.vue
+++ b/src/views/modules/base/community/communityTable.vue
@@ -533,7 +533,7 @@ export default {
 			diyDialog: false,
 			conditions: [],
 
-			queryConditions: [],
+			// queryConditions: [],
 		};
 	},
 
@@ -585,33 +585,33 @@ export default {
 		//     categoryKeys: ['house_info'], categoryKey: 'house_info',
 		//   }
 		// });
-		this.getQueryConditions();
+		// this.getQueryConditions();
 	},
 
 	methods: {
-		async getQueryConditions() {
-			let params = {
-				formCode: "community_info",
-				customerId: this.$store.state.user.customerId,
-			};
-
-			const { data } = await this.$http.post(
-				"/oper/customize/icform/queryItems",
-				params
-			);
-
-			if (data.code === 0) {
-				this.queryConditions = data.data.map((item) => {
-					return {
-						...item,
-						humpName: util.capitalToHump(item.columnName),
-					};
-				});
-				console.log(this.queryConditions);
-			} else {
-				this.$message.error(data.msg);
-			}
-		},
+		// async getQueryConditions() {
+		// 	let params = {
+		// 		formCode: "community_info",
+		// 		customerId: this.$store.state.user.customerId,
+		// 	};
+    //
+		// 	const { data } = await this.$http.post(
+		// 		"/oper/customize/icform/queryItems",
+		// 		params
+		// 	);
+    //
+		// 	if (data.code === 0) {
+		// 		this.queryConditions = data.data.map((item) => {
+		// 			return {
+		// 				...item,
+		// 				humpName: util.capitalToHump(item.columnName),
+		// 			};
+		// 		});
+		// 		console.log(this.queryConditions);
+		// 	} else {
+		// 		this.$message.error(data.msg);
+		// 	}
+		// },
 
 		reportForm() {
 			let paramMap = {
diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue
index e9d2fb350..af95b8aeb 100644
--- a/src/views/modules/base/organization/organization.vue
+++ b/src/views/modules/base/organization/organization.vue
@@ -384,6 +384,11 @@
             <el-input v-model="peoForm.mobile"
                       placeholder="请输入联系电话"></el-input>
           </el-form-item>
+          <el-form-item label="证件号"
+                        prop="idCard">
+            <el-input v-model="peoForm.idCard"
+                      placeholder="请输入证件号"></el-input>
+          </el-form-item>
           <!-- 性别下拉框 -->
           <el-form-item label="性别"
                         prop="gender">
@@ -466,6 +471,11 @@
           <el-input v-model="peoForm.mobile"
                     placeholder="请输入联系电话"></el-input>
         </el-form-item>
+        <el-form-item label="证件号"
+                      prop="mobile">
+          <el-input v-model="peoForm.idCard"
+                    placeholder="请输入证件号"></el-input>
+        </el-form-item>
         <el-form-item label="性别"
                       prop="gender">
           <el-select v-model="peoForm.gender"
@@ -554,6 +564,11 @@
                     placeholder="联系电话"
                     :disabled="true"></el-input>
         </el-form-item>
+        <el-form-item label="证件号">
+          <el-input v-model="peoForm.idCard"
+                    placeholder="--"
+                    :disabled="true"></el-input>
+        </el-form-item>
         <el-form-item label="组织/部门">
           <el-input v-model="peoForm.zuzhi"
                     placeholder="组织/部门"
@@ -985,6 +1000,7 @@ export default {
       peoForm: {
         name: "",
         mobile: "",
+        idCard: "",
         gender: "",
         post: "",
         duty: [],
@@ -1091,6 +1107,7 @@ export default {
       rulesPeo: {
         name: [{ required: true, message: "姓名必填", trigger: "blur" }],
         mobile: [{ required: true, message: "联系电话必填", trigger: "blur" }],
+        idCard: [{ required: true, message: "证件号必填", trigger: "blur" }],
         gender: [{ required: true, message: "性别必填", trigger: "blur" }],
         post: [{ required: true, message: "专兼职必填", trigger: "blur" }],
         duty: [{ required: true, message: "职责必填", trigger: "blur" }],
@@ -1400,6 +1417,7 @@ export default {
         orgType: this.peoForm.orgType,
         name: this.peoForm.name,
         mobile: this.peoForm.mobile,
+        idCard: this.peoForm.idCard,
         gender: this.peoForm.gender,
         workType: this.peoForm.post,
         roles: this.peoForm.duty,
@@ -1459,6 +1477,7 @@ export default {
         roles: this.peoForm.duty,
         newRoles: this.peoForm.newRoles,
         agencyId: this.currentAgencyId,
+        idCard: this.peoForm.idCard
       };
 
       const { data, code, msg } = await requestPost(url, params);
@@ -1530,12 +1549,14 @@ export default {
       this.insertForm.contacts = "";
       this.insertForm.code = "";
       this.insertForm.mobile = "";
+      this.insertForm.idCard = "";
       this.insertForm.departmentName = "";
 
       this.peoForm = {
         name: "",
         mobile: "",
         gender: "",
+        idCard: "",
         post: "",
         duty: [],
         orgType: "",
@@ -1563,6 +1584,7 @@ export default {
     peoFormRest () {
       (this.peoForm.name = ""),
         (this.peoForm.mobile = ""),
+        (this.peoForm.idCard = ""),
         (this.peoForm.gender = ""),
         (this.peoForm.post = ""),
         (this.peoForm.duty = "");
@@ -1650,6 +1672,7 @@ export default {
     // 查看弹窗
     cancelDetails () {
       this.details = false;
+      this.peoFormRest();
     },
     /** 人员调动取消按钮 */
     cancelTransfer () {
@@ -1823,6 +1846,7 @@ export default {
         this.peoForm.post = data.workType;
         // this.peoForm.gender = data.gender === 1 ? '男' : '女'
         this.peoForm.gender = data.gender;
+        this.peoForm.idCard = data.idCard;
         // 已有的权限（职责）
         let existedDutyArr = [];
         data.roleList.forEach(function (sysDuty) {
@@ -1865,6 +1889,7 @@ export default {
         // this.peoForm.gender = data.gender === 1 ? '男' : '女'
         this.peoForm.gender = data.gender;
         this.peoForm.post = data.workType;
+        this.peoForm.idCard = data.idCard;
         // 已有的权限（职责）
         let existedDutyArr = [];
         data.roleList.forEach(function (sysDuty) {
@@ -1926,13 +1951,14 @@ export default {
       };
 
       const { data, code, msg } = await requestPost(url, params);
-
+      debugger
       if (code === 0) {
         this.peoForm.name = data.name;
         this.peoForm.mobile =
           data.mobile.substr(0, 3) + "****" + data.mobile.substr(7);
         this.peoForm.activeTime = data.activeTime;
         this.peoForm.duty = data.roles;
+        this.peoForm.idCard = data.idCard;
         this.peoForm.zuzhi = data.orgName;
         if (data.enableFlag === "enable") {
           this.peoForm.disableFlag = "已启用";
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index ad646434f..8b192596a 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -1593,29 +1593,29 @@ export default {
 			}
 		},
 
-		async getQueryConditions() {
-			let params = {
-				formCode: "resident_base_info",
-				customerId: this.$store.state.user.customerId,
-			};
-
-			const { data } = await this.$http.post(
-				"/oper/customize/icform/queryItems",
-				params
-			);
-
-			if (data.code === 0) {
-				this.queryConditions = data.data.map((item) => {
-					return {
-						...item,
-						humpName: util.capitalToHump(item.columnName),
-					};
-				});
-				console.log(this.queryConditions);
-			} else {
-				this.$message.error(data.msg);
-			}
-		},
+		// async getQueryConditions() {
+		// 	let params = {
+		// 		formCode: "resident_base_info",
+		// 		customerId: this.$store.state.user.customerId,
+		// 	};
+    //
+		// 	const { data } = await this.$http.post(
+		// 		"/oper/customize/icform/queryItems",
+		// 		params
+		// 	);
+    //
+		// 	if (data.code === 0) {
+		// 		this.queryConditions = data.data.map((item) => {
+		// 			return {
+		// 				...item,
+		// 				humpName: util.capitalToHump(item.columnName),
+		// 			};
+		// 		});
+		// 		console.log(this.queryConditions);
+		// 	} else {
+		// 		this.$message.error(data.msg);
+		// 	}
+		// },
 
 		getrowInfo(id) {
 			let params = {