From 53193f94bb053dccb49d7eb849435bb0c668878e Mon Sep 17 00:00:00 2001
From: haha <lj7788@126.com>
Date: Tue, 11 Feb 2025 22:30:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=BA=E5=91=98=E8=8A=B1?=
 =?UTF-8?q?=E5=90=8D=E5=86=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/system/SysUserMapper.xml  |  2 +-
 .../proProjectInfoSubdeptsUsers/index.vue      | 18 ++++++++++--------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysUserMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysUserMapper.xml
index 8f4d9d86..1bd7537f 100644
--- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysUserMapper.xml
@@ -80,7 +80,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		from sys_user u
 		left join sys_dept d on u.dept_id = d.dept_id
 		left join sys_user_ext ex on u.user_id=ex.user_id
-		where u.del_flag = '0' and u.user_type= '00'
+		where u.del_flag = '0' 
 		<if test="userId != null and userId != 0">
 			AND u.user_id = #{userId}
 		</if>
diff --git a/yanzhu-ui-vue3/src/views/manage/proProjectInfoSubdeptsUsers/index.vue b/yanzhu-ui-vue3/src/views/manage/proProjectInfoSubdeptsUsers/index.vue
index cd0b92b5..3eb4f4d1 100644
--- a/yanzhu-ui-vue3/src/views/manage/proProjectInfoSubdeptsUsers/index.vue
+++ b/yanzhu-ui-vue3/src/views/manage/proProjectInfoSubdeptsUsers/index.vue
@@ -134,11 +134,11 @@
       v-model:limit="queryParams.pageSize" @pagination="getList" />
 
     <!-- 添加或修改分包单位工人对话框 -->
-    <el-drawer v-model="open" size="960px" class="edit-drawer">
+    <el-drawer v-model="open" size="960px" class="edit-drawer" >
       <template #header>
         <div style="position: relative;">{{ title }}</div>
       </template>
-      <el-form ref="proProjectInfoSubdeptsUsersRef" :model="form" :rules="rules" label-width="120px"
+      <el-form v-loading="loading" ref="proProjectInfoSubdeptsUsersRef" :model="form" :rules="rules" label-width="120px"
         style="position: relative;">
 
         <el-row v-if="data.phoneState || true">
@@ -199,7 +199,7 @@
                   <span style="margin-left:10px;color:#999;">此电话号码将用作登录</span>
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
+              <el-col :span="12" v-if="form.userPost==66">
                 <el-form-item label="用户岗位" prop="workType">
                   <el-select v-model="form.userWorkType" style="width:40%" @change="doWorkTypeChange">
                     <el-option v-for="item in data.prjWorkCategories" :key="item" :label="item"
@@ -286,7 +286,7 @@
         </el-row>
       </el-form>
       <template #footer>
-        <div class="dialog-footer">
+        <div class="dialog-footer" v-loading="loading">
           <el-button type="primary" @click="submitForm">确 定</el-button>
           <el-button @click="cancel">取 消</el-button>
         </div>
@@ -356,7 +356,6 @@ const data = reactive({
   rules: {
     subDeptId: [{ required: true, trigger: ['blur', 'change'], message: "请选择所属单位" }],
     userName: [{ required: true, trigger: ['blur', 'change'], message: "请输入姓名" }],
-    workType: [{ required: true, trigger: ['blur', 'change'], message: "请选择用户岗位" }],
     userPhone: [
       { required: true, trigger: ['blur', 'change'], message: "请输入手机号码" },
       { min: 11, max: 11, message: '请输入有效手机号码', trigger: 'blur' },
@@ -681,6 +680,7 @@ function handleAdd() {
   open.value = true;
   title.value = "添加劳务人员信息";
   reset();
+  loading.value=true;
   loadSubDepts(() => {
     data.editData = null;
     data.mode = 'add';
@@ -690,6 +690,7 @@ function handleAdd() {
     form.value.projectName = userStore.currentProName;
     form.value.nation = data.nationOpts[0];
     form.value.sex = "0";
+    loading.value=false;
   });
 }
 
@@ -701,6 +702,7 @@ function handleUpdate(row) {
   data.editData = row;
   open.value = true;
   title.value = "修改劳务人员信息";
+  loading.value=true;
   loadSubDepts(() => {
     getProProjectInfoSubdeptsUsers(_id).then(response => {
       let obj = JSON.parse(JSON.stringify(response.data));
@@ -721,7 +723,8 @@ function handleUpdate(row) {
       obj.certificatePhoto2 = obj.info.certificatePhoto2;
       obj.faceImage = obj.userPicture;
       obj.educationalType = obj.degreeGrade
-      form.value = obj;
+      obj.userPost=obj.userPost;
+      form.value = obj;      
       form.value.userId = obj.userId;
       form.value.projectId = row.projectId;
       form.value.projectName = row.projectName;
@@ -733,7 +736,7 @@ function handleUpdate(row) {
       }
       //showEditUser(obj.user);
       data.phoneState = "edit";
-
+      loading.value=false;
       doImageUpload();
 
       //doDeptGroupChange();
@@ -741,7 +744,6 @@ function handleUpdate(row) {
         doSubDeptChange();
         setTimeout(() => {
           form.value.craftPost = response.data.craftPost;
-          console.log("++++++>", form.value.craftPost)
         }, 400)
 
       }, 400);