From c0dc65db73faffe7e59961aa6f90c73b750ba392 Mon Sep 17 00:00:00 2001
From: haha <lj7788@126.com>
Date: Thu, 13 Feb 2025 23:25:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=E5=90=88=E5=B9=B6=20"dev=5Fxd"=20?=
 =?UTF-8?q?=E5=92=8C=20"origin/dev=5Fxd"=20=E5=89=8D=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=AD=98=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../manage/proProjectInfoSubdeptsUsers/index.vue | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/yanzhu-ui-vue3/src/views/manage/proProjectInfoSubdeptsUsers/index.vue b/yanzhu-ui-vue3/src/views/manage/proProjectInfoSubdeptsUsers/index.vue
index f2df8671..880118bc 100644
--- a/yanzhu-ui-vue3/src/views/manage/proProjectInfoSubdeptsUsers/index.vue
+++ b/yanzhu-ui-vue3/src/views/manage/proProjectInfoSubdeptsUsers/index.vue
@@ -229,7 +229,7 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="12">
+          <el-col :span="12" v-if="form.userPost==66">
             <el-form-item label="工种" v-if="data.isManager" prop="craftPost">
               <el-select v-model="form.craftPost">
                 <el-option v-for="dict in data.craftPostList" :key="dict.value" :label="dict.label"
@@ -427,25 +427,25 @@ function doImageUpload(type) {
         url = location.origin + url;
         //url="http://62.234.3.186/statics/2025/01/19/4491f170cd1609142f9a6f097cbf681f_20250119000046A004.jpg"
         proxy.$http.get(`/system/tools/id/front?url=${url}`).then(d => {
-          form.value.userName = form.value.userName || d.data.name || '';
-          form.value.certificateCode = form.value.certificateCode || d.data.cardId || '';
-          form.value.address = form.value.address || d.data.address || '';
-          from.value.nativePlace = form.value.native || d.data.native || '';
+          form.value.userName = d.data.name ||form.value.userName ||  '';
+          form.value.certificateCode =  d.data.cardId || form.value.certificateCode || '';
+          form.value.address = d.data.address || form.value.address ||  '';
+          form.value.nativePlace = d.data.native || form.value.native ||  '';
           let nation = d.data.nation || "";
           if (nation) {
             let tmps = data.nationOpts.filter(it => it.indexOf(nation) >= 0);
             if (tmps.length > 0) {
-              form.value.nation = form.value.nation || tmps[0] || '';
+              form.value.nation = tmps[0] || form.value.nation ||  '';
             }
           }
           let sex = d.data.sex || '';
           if (sex) {
-            form.value.sex = form.value.sex || (sex == '男' ? 0 : 1);
+            form.value.sex = (sex == '男' ? 0 : 1) || form.value.sex  ;
           }
           let birthDay = d.data.birthDay;
           if (birthDay && birthDay.length == 8) {
             birthDay = birthDay.substr(0, 4) + "-" + birthDay.substr(4, 2) + "-" + birthDay.substr(6);
-            form.value.birthDay = form.value.birthDay || birthDay;
+            form.value.birthDay =birthDay || form.value.birthDay;
           }
 
         });