From a4168b5bd3675d2e59656c0dc3351795cc70e546 Mon Sep 17 00:00:00 2001
From: Rain_ <904416525@qq.com>
Date: Fri, 27 Jun 2025 18:19:37 +0800
Subject: [PATCH] =?UTF-8?q?flx:=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/images/laborManage/opensuccess.png | Bin 1183 -> 726 bytes
 .../laborManage/attendanceGroup.vue           |  56 ++++++++++------
 .../attendanceManage/attendanceManage.vue     |  62 ++++++++++++++++--
 3 files changed, 93 insertions(+), 25 deletions(-)

diff --git a/src/assets/images/laborManage/opensuccess.png b/src/assets/images/laborManage/opensuccess.png
index 40df69adfba7252386be78e5c720680db24831e3..630d35439bd55abc8611941dcd4385d6a2ac5837 100644
GIT binary patch
delta 653
zcmV;80&@MI3DyOWReu6&Nkl<ZcmeH~k8ScW5XBGa8vrpuM#u(a1U7&TnhnARumNlk
zeG_zqOn}k_AS1Z>wYKD%I1O!R9LY~Qwc<~BclYl3ED{kB5%EkYrIu~H@K@%9mT=m}
zYYWvhP5ZA(WDd|3Kh|}v*6X$Ud`UGj2T<iU>cionmdoV_`G3!sRV|^TCAqs?E{&<W
z9a=)+&Ol3Uk7SZ0xg$@MWk~{=gb2tpsJ3L>$g+$CUL`a@{&YHdiQ7SvL3QB~@&xj_
zUaxf!cKRrJ6Z`%C!;vOU0`gT=4JM8LN%nTTVMXZZFj)dvC2rF<umtZ@ZA}^rT2F4H
ztOk8nDV9t$@qZ#1@2BMqU>|v;LV{W%;}FNT*h7A6Uku)MyY<TDcsxS9LMk#A+K1&-
zWVhS>Y8PQKD~iHvji%}{7W6iF=J+<l#&ShM@*wyQ&yf!D6h`~{s8wehtlWx`h#suL
z+T>Zjq1Ap~jcSLu1QqdVHP3T?^fd5Ubg@p;^zJ!Y?|<d!4r3D7Y&Kq}-~bvj&?MTW
z`}6rcuHHL-IO%hYAzLAb6^oaLd?C+<NdldUcz5&M_gyX}uI~SgyiJ58(7kk6pKqY)
zj@!LICvTDQ$_ahDTJG8~wc9*T^WVWFf%e6*Reb=Z=5wxPYVxH_4agxGSJ(DHyPd+x
z^xhuKGJlqJt-<=5SK87E>gHqv=W#U-S<VL29c#BqB}5>ZE@zUj9eI&ZVdkOhMm4$P
z3<aLfb}IJ+9nR49!7OT~3zqH^nG5KGS=JcrpmpB`y1*>x+uHPp)lYyUh2Z!9<mdRm
nTCJMJV(}&s5fKp)bHzJuo|y)uRPufR0000<MFvhpu0mjfH;6)$

delta 1113
zcmV-f1g87e1)m9!ReuCDNkl<ZcmeHM+fEZv6x}5V36cnrh$LbPJOGhPQHTl;mc&b9
zOcZ}W_yWoo6uyA+1!&@XF(yU{$)Hj&a=!$MvCzN+6p=!>1lotXSDhi#nQ7_0G?|r5
zrp!5W&e~_Mz0W=akq#X?bfgl2K%j`PZrmxGz=TbF30vEL0)J;`KK>anQZ_(baogeH
zap3dt_rSaNLm=-B*FTpo5yVv%mYpu+{K6{v{eG!wKioT)#sDVYd3bc(KRz*A<k|Tf
z(&qE|jqr@YU{D#7Lze(duJ`EZWN>(7Tty!6?Cj!Z(t0=J27vswXV?1i(<mJupJ?`3
zcCO)O)oRPA0e>L>du_uyJmQe+T?LP4m)J-%_ctrsGG>58o;4p;e+T#DbULU^rx`II
zR`LMk<@~j7<e!4vh_q)Rkl))oh?@M((h{nwD5vuBvi-cgD|7s4PTrnY1CS~?+gQJ_
z<|BcLQf*BY)mB%6^e8{F@iniNMh%oEpfq6evmhTX+kXI!4K)&RkRH$?Ek{~B0L`BH
zeD+A>A(hsLO;mWb0L1$)A}%5Kf{D$1v-8!#1CCPs5T>S=j9TO&7jf00Z41xym102H
zEX3q3>~g^|F@rL8km3Xiv$+MQ(Y3azYAY-(pcl{0Aa7&hO|g;(ay2FdVcW*$)*Iwr
zY%s;e*MCrpV0CO11Mm)y)4i~`s%opMyiLt_@3`~x^E%@pF2SIf(8xDCub4?bDct<}
z<r4%}MYP()SnR=dE!{&hjrG-#45aC%1dt<}(8Pfzj7`j%lq<&7Ak8m2;hFwu1{J+1
z2;Y9H$hS1tgZvQxY)_OtkunAXM1G%7v*QXERDXNkgHEk_L<9ZMz1MpX^01AwjHvgH
zXgzrm&JExJ=U9*J?T_xep-(MLPA}nRjWi%OD=xe`m0kpS9=Dh0>7gVd!~>#B+j%lK
zyIIv4RUro@szQs_V9-4dB@RWIAS2&LNrozoN=9&?xofMdR4>2_923?sUkL_z<%{IH
zPk$wOKyx3EjA&`DQ^^VBR#w+QK152v3e&Y=mgjq98-CxGD)K<sjZ7}5(i_)9+E$z{
z;uL8?=EC1%%CyeQbT6jLp=4`biHPR`$p{YYee9YNkX9W(f;yMds=#UXJY|;ODg$}E
z+eInHg$EiK!5dh|)5mSW4NZdVm}h6{oPU=JFtqi7$xZ+Bd{R<nBt&&0Lm|giVo&qE
zx{&9{HhegFB}oV5VJN5Lgm>6z5z~19pZX@Jmdq=wF3t95Oun?V1U1tDr3tZ~iMtvb
zs`uqml7OIP^0su62Vycnj0c-?lfz*|4BC{X%W#P2tHc1GSKX2qf<eoh6{RU?l~Rb=
z0FmTdF3N&`!y6pnmUIPeQh+joKQej8#%J*9+fLaCWTey6v-M2>;~|l+5+69<d$US9
fI&|pJp+kv(BndrX^D%wp00000NkvXXu0mjfG#?+Y

diff --git a/src/views/projectFront/laborManage/attendanceGroup.vue b/src/views/projectFront/laborManage/attendanceGroup.vue
index 3fea3ade..a51b7453 100644
--- a/src/views/projectFront/laborManage/attendanceGroup.vue
+++ b/src/views/projectFront/laborManage/attendanceGroup.vue
@@ -132,7 +132,7 @@
           <div>
             <div>企业名称</div>
             <el-input
-              @blur="getRiskListLibraryList"
+              @input="getRiskListLibraryList"
               size="medium"
               placeholder="请输入"
               suffix-icon="el-icon-search"
@@ -175,7 +175,16 @@
                 待选择人员({{ selectLeftTableData.length }}/{{ staffInfo.total }})
               </div>
               <div>
-                <el-checkbox @change="getUpdatePersonListFn" v-model="searchInfo.checked">包含下级</el-checkbox>
+                <template v-if="treeListDetail.id == ''">
+                  <el-checkbox disabled :value="true">包含下级</el-checkbox>
+                </template>
+                <template v-else>
+                  <el-checkbox
+                    @change="getUpdatePersonListFn"
+                    v-model="searchInfo.checked"
+                    >包含下级</el-checkbox
+                  >
+                </template>
               </div>
             </div>
             <div class="flex">
@@ -189,7 +198,7 @@
                 <el-option label="身份证号" :value="2"> </el-option>
               </el-select>
               <el-input
-                @blur="getUpdatePersonListFn"
+                @input="getUpdatePersonListFn"
                 size="medium"
                 placeholder="请输入"
                 suffix-icon="el-icon-search"
@@ -296,7 +305,7 @@
               <el-option label="身份证号" :value="2"> </el-option>
             </el-select>
             <el-input
-              @blur="selectSearchValueFilter"
+              @input="selectSearchValueFilter"
               size="medium"
               placeholder="请输入"
               suffix-icon="el-icon-search"
@@ -583,7 +592,7 @@
             <div>
               <div>企业名称</div>
               <el-input
-                @blur="getRiskListLibraryList"
+                @input="getRiskListLibraryList"
                 size="medium"
                 placeholder="请输入"
                 suffix-icon="el-icon-search"
@@ -626,7 +635,16 @@
                   待选择人员({{ selectLeftTableData.length }}/{{ staffInfo.total }})
                 </div>
                 <div>
-                  <el-checkbox @change="getUpdatePersonListFn" v-model="searchInfo.checked">包含下级</el-checkbox>
+                  <template v-if="treeListDetail.id == ''">
+                    <el-checkbox disabled :value="true">包含下级</el-checkbox>
+                  </template>
+                  <template v-else>
+                    <el-checkbox
+                      @change="getUpdatePersonListFn"
+                      v-model="searchInfo.checked"
+                      >包含下级</el-checkbox
+                    >
+                  </template>
                 </div>
               </div>
               <div class="flex">
@@ -640,7 +658,7 @@
                   <el-option label="身份证号" :value="2"> </el-option>
                 </el-select>
                 <el-input
-                  @blur="getUpdatePersonListFn"
+                  @input="getUpdatePersonListFn"
                   size="medium"
                   placeholder="请输入"
                   suffix-icon="el-icon-search"
@@ -747,7 +765,7 @@
                 <el-option label="身份证号" :value="2"> </el-option>
               </el-select>
               <el-input
-                @blur="selectSearchValueFilter"
+                @input="selectSearchValueFilter"
                 size="medium"
                 placeholder="请输入"
                 suffix-icon="el-icon-search"
@@ -1043,7 +1061,7 @@ export default {
             editWorkerAttendanceGroupV2Api(data).then((res) => {
               // console.log(res);
               if (res.code == 200) {
-                this.$message.success(this.$t("message.quality.newSuccess"));
+                this.$message.success("编辑成功");
                 this.setDialog = false;
                 this.getDataList();
               }
@@ -1092,14 +1110,14 @@ export default {
       });
     },
     onEnterpriseChange() {
-        this.selectWorkerInfo.teamId = "";
-        this.selectWorkerInfo.departmentId = "";
-        this.teamOptions = [];
-        this.departmentOptions = [];
-        if(this.selectWorkerInfo.enterpriseId) {
-            this.getTeamList();
-            this.getDepartmentList();
-        }
+      this.selectWorkerInfo.teamId = "";
+      this.selectWorkerInfo.departmentId = "";
+      this.teamOptions = [];
+      this.departmentOptions = [];
+      if (this.selectWorkerInfo.enterpriseId) {
+        this.getTeamList();
+        this.getDepartmentList();
+      }
     },
     /** 查询班组列表 */
     getTeamList() {
@@ -1386,9 +1404,9 @@ export default {
       } else if (this.searchInfo.searchType == 2) {
         data.idCard = this.searchInfo.searchValue;
       }
-      if(this.searchInfo.checked) {
+      if (this.searchInfo.checked) {
         data.containEnterpriseId = this.treeListDetail.id;
-      }else {
+      } else {
         data.enterpriseId = this.treeListDetail.id;
       }
       this.staffInfo.pageNo = 1;
diff --git a/src/views/projectFront/laborManage/attendanceManage/attendanceManage.vue b/src/views/projectFront/laborManage/attendanceManage/attendanceManage.vue
index 6f2aa5d4..fafc9923 100644
--- a/src/views/projectFront/laborManage/attendanceManage/attendanceManage.vue
+++ b/src/views/projectFront/laborManage/attendanceManage/attendanceManage.vue
@@ -110,6 +110,10 @@
           }}</el-button>
           <el-button
             type="primary"
+            v-permission="{
+                key: 'rykq_exportDetailData',
+                menuPath: '/project/labor/newAttendanceManage',
+              }"
             @click="
               selectDateType = 1;
               exportDialog = true;
@@ -553,10 +557,6 @@
               icon="el-icon-circle-check"
               @click="exportFn"
               size="medium"
-              v-permission="{
-                key: 'rykq_exportDetailData',
-                menuPath: '/project/labor/newAttendanceManage',
-              }"
               >{{ $t("message.personnelPosition.determine") }}
             </el-button>
           </div>
@@ -642,7 +642,7 @@
         </el-form-item>
         <el-form-item label="出入时间" prop="createTime">
           <el-date-picker
-            value-format="yyyy-MM-dd hh:mm:ss"
+            value-format="yyyy-MM-dd HH:mm:ss"
             type="datetime"
             placeholder="开始时间"
             v-model="uploadAttendanceForm.createTime"
@@ -792,7 +792,57 @@ export default {
 
       // 上传考勤表单
       uploadAttendanceShow: false,
-      uploadAttendanceFormRules: {},
+      uploadAttendanceFormRules: {
+        enterpriseId: [
+          {
+            required: true,
+            message: "请选择企业",
+            trigger: "change",
+          },
+        ],
+        departmentId: [
+          {
+            required: true,
+            message: "请选择部门&班组",
+            trigger: "change",
+          },
+        ],
+        workerId: [
+          {
+            required: true,
+            message: "请选择姓名",
+            trigger: "change",
+          },
+        ],
+        passType: [
+          {
+            required: true,
+            message: "请选择进入/出",
+            trigger: "change",
+          },
+        ],
+        createTime: [
+          {
+            required: true,
+            message: "请选择时间",
+            trigger: "change",
+          },
+        ],
+        inletOutletPosition: [
+          {
+            required: true,
+            message: "请选择进出位置",
+            trigger: "change",
+          },
+        ],
+        cardType: [
+          {
+            required: true,
+            message: "请选择进出方式",
+            trigger: "change",
+          },
+        ],
+      },
       uploadAttendanceForm: {
         enterpriseId: "",
         teamId: "",