From c3dacfb1deb770e6137f98c839e446b3f826e74a Mon Sep 17 00:00:00 2001
From: wangchengming <15110151257@163.com>
Date: Tue, 8 Jul 2025 21:51:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5ESC=E4=BB=BB=E5=8A=A1=20?=
 =?UTF-8?q?=E6=A0=87=E7=AD=BE=E7=94=B3=E8=AF=B7=E5=88=97=E8=A1=A8=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../escTask/components/LableApply.vue         | 43 ++++++++++---------
 .../components/LableDetaiForm.vue             |  6 +--
 2 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/src/views/qualification/escTask/components/LableApply.vue b/src/views/qualification/escTask/components/LableApply.vue
index 50271e7..fbf2c6d 100644
--- a/src/views/qualification/escTask/components/LableApply.vue
+++ b/src/views/qualification/escTask/components/LableApply.vue
@@ -3,19 +3,20 @@
         <el-row class="myRow">
             <el-col :span="20">
                 <el-form-item label="员工姓名">
-                    <el-input v-model="queryParams.userName" placeholder="请输入员工姓名" clearable style="width: 160px"
-                        @keyup.enter="handleQuery" />
-                </el-form-item>
-                <el-form-item label="部门">
-                    <el-select v-model="queryParams.deptId" placeholder="请选择部门" clearable style="width: 160px">
-                        <el-option label="Zone one" value="shanghai" />
-                        <el-option label="Zone two" value="beijing" />
+                    <el-select v-model="queryParams.userId" filterable placeholder="请选择员工">
+                        <el-option v-for="item in allUsers" :key="item.userId"
+                            :label="`${item.nickName}（${item.dept?.deptName || '无部门'}）`" :value="item.userId" />
                     </el-select>
                 </el-form-item>
-                <el-form-item label="当前标签">
-                    <el-select v-model="queryParams.qualification" placeholder="请选择当前标签" clearable style="width: 160px">
-                        <el-option label="Zone one" value="shanghai" />
-                        <el-option label="Zone two" value="beijing" />
+                <el-form-item label="部门">
+                    <el-tree-select v-model="queryParams.deptId" :data="enabledDeptOptions"
+                        :props="{ value: 'id', label: 'label', children: 'children' }" value-key="id"
+                        placeholder="请选择部门" check-strictly style="width: 160px" />
+                </el-form-item>
+                <el-form-item label="申请标签">
+                    <el-select v-model="queryParams.labelId" placeholder="请选择申请标签" clearable style="width: 160px">
+                        <el-option v-for="dict in bus_label" :key="dict.value" :label="dict.label"
+                            :value="dict.value" />
                     </el-select>
                 </el-form-item>
             </el-col>
@@ -66,14 +67,14 @@
             </template>
         </el-table-column>
     </el-table>
-    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
-        v-model:limit="queryParams.pageSize" @pagination="getList" />
+    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageIndex"
+        v-model:limit="queryParams.pageSize" @pagination="getUserLablePageList" />
 </template>
 <script setup>
 import { onMounted, ref } from 'vue'
 import { useRouter } from 'vue-router'
 import applyIcon from '@/assets/images/applyIcon.png'
-import { getcurrentUserPageList, deleteBusUserLabel } from "@/api/labelManage/labelManage"
+import { getUserLabelPageList, deleteBusUserLabel } from "@/api/labelManage/labelManage"
 import { deptTreeSelect, listUser } from "@/api/system/user"
 
 const router = useRouter()
@@ -86,7 +87,7 @@ const queryParams = ref({
     node: 0,
     userId: undefined,
     deptId: undefined,
-    qualificationId: undefined
+    labelId: undefined
 })
 const loading = ref(true)
 const total = ref(0)
@@ -97,7 +98,7 @@ const tableData = ref([])
 onMounted(() => {
     getAllUser();
     getDeptTree();
-    getCurUserLablePageList();
+    getUserLablePageList();
 });
 
 // 用户数据
@@ -133,9 +134,9 @@ const filterDisabledDept = (deptList) => {
     })
 }
 
-const getCurUserLablePageList = () => {
+const getUserLablePageList = () => {
     loading.value = true
-    getcurrentUserPageList(queryParams.value).then(res => {
+    getUserLabelPageList(queryParams.value).then(res => {
         console.log('标签申请结果', res)
         if (res.code == 200) {
             tableData.value = res.data.list
@@ -150,14 +151,14 @@ const getCurUserLablePageList = () => {
 /** 搜索按钮操作 */
 const handleQuery = () => {
     queryParams.value.pageIndex = 1
-    getCurUserLablePageList()
+    getUserLablePageList()
 }
 
 /** 重置按钮操作 */
 const resetQuery = () => {
     queryParams.value.userId = undefined
     queryParams.value.deptId = undefined
-    queryParams.value.qualificationId = undefined
+    queryParams.value.labelId = undefined
     proxy.resetForm("queryRef")
     handleQuery()
 }
@@ -181,7 +182,7 @@ const handleDetele = (record) => {
     proxy.$modal.confirm('是否确认删除该项数据项？').then(function () {
         return deleteBusUserLabel(rowId)
     }).then(() => {
-        getCurUserLablePageList();
+        getUserLablePageList();
         proxy.$modal.msgSuccess("删除成功")
     }).catch(() => { })
 }
diff --git a/src/views/qualification/myQualifications/components/LableDetaiForm.vue b/src/views/qualification/myQualifications/components/LableDetaiForm.vue
index 010043d..c434d24 100644
--- a/src/views/qualification/myQualifications/components/LableDetaiForm.vue
+++ b/src/views/qualification/myQualifications/components/LableDetaiForm.vue
@@ -92,7 +92,7 @@
                 <el-form ref="beforeConditionInfoRef" label-position="top">
                     <div class="headerTitle">申请信息</div>
                     <div class="applyFormContainer" v-if="detailForm.labelId">
-                        <el-table :data="tableData" style="width: 100%">
+                        <el-table :data="detailForm.userQualificationCertificateList" style="width: 100%">
                             <el-table-column prop="qualificationName" label="资质名称" width="100" />
                             <el-table-column prop="certificateUrl" label="资质证书" align="center">
                                 <template #default="scope">
@@ -203,6 +203,7 @@ const getLabelApprovalRecord = (_id) => {
         userLabelId: _id
     }
     getBusUserrLabelRecord(queryParamsRecord).then(res => {
+        console.log('审批记录', res.data.list)
         if (res.code == 200) tableData.value = res.data.list
     })
 }
@@ -225,8 +226,7 @@ onMounted(() => {
 const getDetailInfo = (_id) => {
     getBusUserLabelDetail(_id).then(res => {
         if (res.code == 200) {
-            detailForm.value = res.data
-            tableData.value = res.data.userQualificationCertificateList
+            detailForm.value = res.data 
             console.log('标签详情', detailForm.value)
         }
     })