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

---
 .../proProjectInfoSubdeptsUsers/index.vue     | 36 +++++++++----------
 .../trouble/problemmodifyDraft/index.vue      |  3 +-
 2 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/yanzhu-ui-vue3/src/views/manage/proProjectInfoSubdeptsUsers/index.vue b/yanzhu-ui-vue3/src/views/manage/proProjectInfoSubdeptsUsers/index.vue
index 889b09dc..dcc3ef14 100644
--- a/yanzhu-ui-vue3/src/views/manage/proProjectInfoSubdeptsUsers/index.vue
+++ b/yanzhu-ui-vue3/src/views/manage/proProjectInfoSubdeptsUsers/index.vue
@@ -128,7 +128,7 @@
           <el-button v-if="scope.row.subDeptType != '4' && scope.row.subDeptType != '5'" link disabled> - </el-button>
         </template>
       </el-table-column>
-      <el-table-column label="人员岗位" align="center" prop="craftPost">
+      <el-table-column label="人员岗位" align="center" prop="craftPost" v-if="1==2">
         <template #default="scope">
           {{ getWorkType(scope.row.workType) }}
         </template>
@@ -146,7 +146,7 @@
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="200">
         <template #default="scope">
-          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
+          <el-button link type="primary" icon="Edit" v-if="scope.row.userPost!=66" @click="handleUpdate(scope.row)"
             v-hasPermi="['manage:proProjectInfoSubdeptsUsers:edit']">修改</el-button>
           <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
             v-hasPermi="['manage:proProjectInfoSubdeptsUsers:remove']" v-if="1 == 2">删除</el-button>
@@ -187,15 +187,15 @@
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="身份证信息" prop="identificationCard">
+            <el-form-item label="身份证信息" prop="cardImgPos">
               <el-col :span="8">
                 <div class="div-header">头像面</div>
-                <image-upload v-model="form.certificatePhoto1" :limit="1" class="identification-card-1"
+                <image-upload v-model="form.cardImgPos" :limit="1" class="identification-card-1"
                   @change="doImageUpload(1)" />
               </el-col>
               <el-col :span="8">
                 <div class="div-header">国徽面</div>
-                <image-upload v-model="form.certificatePhoto2" :limit="1" class="identification-card-2"
+                <image-upload v-model="form.cardImgInv" :limit="1" class="identification-card-2"
                   @change="doImageUpload(2)" />
               </el-col>
               <el-col :span="8">
@@ -259,8 +259,7 @@
               <el-input v-model="form.craftTypeName" disabled />
             </el-form-item>
           </el-col>
-
-          <el-col :span="12" v-if="form.userPost==66">
+          <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"
@@ -396,7 +395,7 @@ const data = reactive({
       { validator: validatePhone, trigger: 'blur' }],
     certificateCode: [{ required: true, trigger: ['blur', 'change'], message: "请输入证件号码" }],
     craftPost: [{ required: true, trigger: ['blur', 'change'], message: "请选择工种" }],
-    identificationCard: [{ required: true, trigger: ['blur', 'change'], message: "请上传身份证信息" }],
+    cardImgPos: [{ required: true, trigger: ['blur', 'change'], message: "请上传身份证信息" }],
     subDeptGroup: [{ required: true, trigger: ['blur', 'change'], message: "请选择班组" }],
   },
   subdepts: [],
@@ -452,10 +451,9 @@ function handleBatchEnterState(state) {
 //图片上传
 function doImageUpload(type) {
   setTimeout(() => {
-    let url = '';
-    form.value.identificationCard = form.value.certificatePhoto1 && form.value.certificatePhoto2 && form.value.faceImage ? "yes" : ''
+    let url = '';    
     if (type == 1) {
-      url = form.value.certificatePhoto1;
+      url = form.value.cardImgPos;
       if (url) {
         url = location.origin + url;
         //url="http://62.234.3.186/statics/2025/01/19/4491f170cd1609142f9a6f097cbf681f_20250119000046A004.jpg"
@@ -485,7 +483,7 @@ function doImageUpload(type) {
       }
     } else if (type == 2) {
       /*
-      url=form.value.certificatePhoto2;
+      url=form.value.cardImgInv;
       if(url){
         url=location.origin+url;
         //url="https://gss0.baidu.com/9fo3dSag_xI4khGko9WTAnF6hhy/zhidao/pic/item/a8014c086e061d95103a068779f40ad162d9ca14.jpg"
@@ -725,6 +723,7 @@ function handleAdd() {
     form.value.projectName = userStore.currentProName;
     form.value.nation = data.nationOpts[0];
     form.value.sex = "0";
+    form.value.userPost="";
     loading.value=false;
   });
 }
@@ -754,8 +753,8 @@ function handleUpdate(row) {
       obj.bankName = obj.info.bankName;
       obj.bankCardNo = obj.info.bankCardNo;
       obj.bankOffice = obj.info.bankOffice;
-      obj.certificatePhoto1 = obj.info.certificatePhoto1;
-      obj.certificatePhoto2 = obj.info.certificatePhoto2;
+      obj.cardImgPos = obj.info.cardImgPos;
+      obj.cardImgInv = obj.info.cardImgInv;
       obj.faceImage = obj.userPicture;
       obj.educationalType = obj.degreeGrade
       obj.userPost=obj.userPost;
@@ -864,8 +863,8 @@ function showEditUser(user) {
   form.value.certificateType = user.cardType;
   form.value.certificateCode = user.cardCode;
   form.value.faceImage = user.userPicture;
-  form.value.certificatePhoto1 = user.cardImgPos;
-  form.value.certificatePhoto2 = user.cardImgInv;
+  form.value.cardImgPos = user.cardImgPos;
+  form.value.cardImgInv = user.cardImgInv;
 
   form.value.nation = info.nation;
   form.value.sex = user.sex;
@@ -888,6 +887,7 @@ function imgUrl(url) {
 }
 /** 提交按钮 */
 function submitForm() {
+  debugger
   proxy.$refs["proProjectInfoSubdeptsUsersRef"].validate(valid => {
     if (valid) {
       let depts = data.subdepts.filter(d => d.id == form.value.subDeptId);
@@ -902,8 +902,8 @@ function submitForm() {
         bankName: form.value.bankName,
         bankCardNo: form.value.bankCardNo,
         bankOffice: form.value.bankOffice,
-        certificatePhoto1: form.value.certificatePhoto1,
-        certificatePhoto2: form.value.certificatePhoto2
+        cardImgPos: form.value.cardImgPos,
+        cardImgInv: form.value.cardImgInv
       };
       let postData = {
         comId: form.value.comId,
diff --git a/yanzhu-ui-vue3/src/views/trouble/problemmodifyDraft/index.vue b/yanzhu-ui-vue3/src/views/trouble/problemmodifyDraft/index.vue
index a9b970ad..c1fc3303 100644
--- a/yanzhu-ui-vue3/src/views/trouble/problemmodifyDraft/index.vue
+++ b/yanzhu-ui-vue3/src/views/trouble/problemmodifyDraft/index.vue
@@ -404,8 +404,7 @@ getUserTree();
     }
   }
 
-  .td-select {
-    .el-select {
+  .td-select {    .el-select {
       width: 100%;
     }
   }