From bb75a476bedf5467a81a7b1956b1397e06e868a3 Mon Sep 17 00:00:00 2001
From: X_Rian <904416525@qq.com>
Date: Mon, 23 Sep 2024 16:35:43 +0800
Subject: [PATCH] =?UTF-8?q?flx=EF=BC=9A=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../constructionManage/projectTeamManage.vue  |  3 ++-
 .../laborManage/admissionPersons.vue          |  2 +-
 .../laborManage/admissionPersons/detail.vue   | 22 +++++++++++++------
 .../projectFront/laborManage/rosterNew.vue    |  3 ++-
 4 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/src/views/projectFront/constructionManage/projectTeamManage.vue b/src/views/projectFront/constructionManage/projectTeamManage.vue
index f022c937..37acb373 100644
--- a/src/views/projectFront/constructionManage/projectTeamManage.vue
+++ b/src/views/projectFront/constructionManage/projectTeamManage.vue
@@ -123,6 +123,7 @@ import {
     getProjectGroupById,
     setProjectGroupEdit,
     setProjectGroupDelete,
+    setProjectGroupSaveObj,
 } from '@/assets/js/api/project'
 export default {
     data() {
@@ -305,7 +306,7 @@ export default {
                             ); //添加成功！
                         });
                     } else if (this.isAdd == 2) {
-                        setProjectGroupEdit({ 
+                        setProjectGroupSaveObj({ 
                             ...this.cardForm, 
                             projectGroupUnitList: result, 
                         }).then((res) => {
diff --git a/src/views/projectFront/laborManage/admissionPersons.vue b/src/views/projectFront/laborManage/admissionPersons.vue
index 49e57b67..972a9c89 100644
--- a/src/views/projectFront/laborManage/admissionPersons.vue
+++ b/src/views/projectFront/laborManage/admissionPersons.vue
@@ -207,7 +207,7 @@
             </detail>
         </div>
         <!-- 添加卡片弹框 -->
-        <el-dialog :destroy-on-close="true" :modal-append-to-body="false" title="" :visible.sync="cardDialog2"
+        <el-dialog :destroy-on-close="true" :modal-append-to-body="false" title="下载人员申请表" :visible.sync="cardDialog2"
                     width="900px">
             <div class="dialog_content">
                 <div class="percentage_title">
diff --git a/src/views/projectFront/laborManage/admissionPersons/detail.vue b/src/views/projectFront/laborManage/admissionPersons/detail.vue
index 5e93cd90..1d78779a 100644
--- a/src/views/projectFront/laborManage/admissionPersons/detail.vue
+++ b/src/views/projectFront/laborManage/admissionPersons/detail.vue
@@ -3,10 +3,10 @@
     <div style="height: 100%">
       <div class="search-box" style="margin-top: 20px">
         <el-form :inline="true" :model="formInline" class="demo-form-inline" size="small">
-          <el-form-item label="所属单位">
+          <!-- <el-form-item label="所属单位">
             <el-input placeholder="请输入" v-model="formInline.enterpriseName" clearable style="width: 200px">
             </el-input>
-          </el-form-item>
+          </el-form-item> -->
           <el-form-item label="姓名">
             <el-input placeholder="请输入" v-model="formInline.workerName" clearable style="width: 200px">
             </el-input>
@@ -236,7 +236,7 @@
               <div>
                 劳动合同：
                 <div>
-                  <div class="download" @click="downloadFn(item)" v-for="item in cardForm.laborContract" :key="item.id">
+                  <div class="download" @click="previewFn(item)" v-for="item in cardForm.laborContract" :key="item.id">
                     {{ item.name }}
                   </div>
                 </div>
@@ -244,7 +244,7 @@
               <div>
                 保险：
                 <div>
-                  <div class="download" @click="downloadFn(item)" v-for="item in cardForm.insurance" :key="item.id">
+                  <div class="download" @click="previewFn(item)" v-for="item in cardForm.insurance" :key="item.id">
                     {{ item.name }}
                   </div>
                 </div>
@@ -252,7 +252,7 @@
               <div>
                 体检报告：
                 <div>
-                  <div class="download" @click="downloadFn(item)" v-for="item in cardForm.examinationImage" :key="item.id">
+                  <div class="download" @click="previewFn(item)" v-for="item in cardForm.examinationImage" :key="item.id">
                     {{ item.name }}
                   </div>
                 </div>
@@ -282,13 +282,13 @@
                 <el-table-column align="center" label="截止日期" prop="effectTime" show-overflow-tooltip></el-table-column>
                 <el-table-column align="center" label="人员资质" prop="deviceName" show-overflow-tooltip>
                   <template slot-scope="scope">
-                    <div class="download" @click="downloadFn(item)" v-for="item in scope.row.photoUrl"
+                    <div class="download" @click="previewFn(item)" v-for="item in scope.row.photoUrl"
                       :key="item.uid">{{ item.name }}</div>
                   </template>
                 </el-table-column>
                 <el-table-column align="center" label="人员资质验证" prop="deviceName" show-overflow-tooltip>
                   <template slot-scope="scope">
-                    <div class="download" @click="downloadFn(item)" v-for="item in scope.row.qualificationVerification"
+                    <div class="download" @click="previewFn(item)" v-for="item in scope.row.qualificationVerification"
                       :key="item.uid">{{ item.name }}</div>
                   </template>
                 </el-table-column>
@@ -310,6 +310,7 @@ import {
   getWorkerAdmissionCertificateDetailListApi,
 } from "@/assets/js/api/laborPerson";
 import { isJSON } from "@/util/nowDate/index";
+import { encode } from 'js-base64'
 import moment from "moment";
 export default {
   props: ["workDetail"],
@@ -456,6 +457,13 @@ export default {
         });
       });
     },
+    previewFn(row){
+      let src = row.url.includes('http://') ? row.url : this.fileUrl + row.url;
+      this.previewUrl = `http://jxjzw.zhgdyun.com:8012/onlinePreview?url=${encodeURIComponent(encode(src))}`;
+      // console.log(this.previewUrl);
+      window.open(this.previewUrl, "_blank");
+      // this.cardDialog = true;
+    },
     downloadFn(row) {
       // "http://42.180.188.17:11211/image/669b96b66b90a34a1aa4ec9c.jpg"
       const url = row.url.includes('http://') ? row.url : this.fileUrl + row.url;
diff --git a/src/views/projectFront/laborManage/rosterNew.vue b/src/views/projectFront/laborManage/rosterNew.vue
index e03d7998..6c27065e 100644
--- a/src/views/projectFront/laborManage/rosterNew.vue
+++ b/src/views/projectFront/laborManage/rosterNew.vue
@@ -1047,7 +1047,8 @@ export default {
           const result = res.result.records instanceof Array ? res.result.records : [];
           this.unitInfo.dataList = this.unitInfo.dataList.concat(result);
           console.log(this.unitInfo.dataList);
-          if(this.unitInfo.pageNo == 1){
+          const find = this.unitInfo.dataList.find(item => item.certificateIssuingUnitName == "全部");
+          if(this.unitInfo.pageNo == 1 && !find){
             this.unitInfo.dataList.unshift({
               id: "",
               certificateIssuingUnitName: "全部",