From 057303a09df9ac6447273634b08ae21f22a78552 Mon Sep 17 00:00:00 2001 From: dx <1242347652@qq.com> Date: Fri, 14 Feb 2025 17:36:45 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=89=A7=E6=B3=95=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/enterpriseinspections/index.vue | 19 +++++++++++-------- src/views/system/user/examine.vue | 2 +- src/views/system/user/index.vue | 8 +------- 3 files changed, 13 insertions(+), 16 deletions(-) diff --git a/src/views/enterpriseinspections/index.vue b/src/views/enterpriseinspections/index.vue index 6020239..43bbdec 100644 --- a/src/views/enterpriseinspections/index.vue +++ b/src/views/enterpriseinspections/index.vue @@ -71,16 +71,24 @@ :show-overflow-tooltip="true" @selection-change="handleSelectionChange" > - + - + + + - + + + @@ -160,11 +168,6 @@ const getList = async () => { loading.value = true try { const data = await EnterpriseInspectionsApi.getEnterpriseInspectionsPage(queryParams) - - data.list.forEach(item => { - item.tagList = item.tagList.join() - }); - list.value = data.list total.value = data.total } finally { diff --git a/src/views/system/user/examine.vue b/src/views/system/user/examine.vue index 920266f..be6e089 100644 --- a/src/views/system/user/examine.vue +++ b/src/views/system/user/examine.vue @@ -153,7 +153,7 @@ const queryParams = reactive({ status: undefined, deptId: undefined, audit: [1,3], - userType: "1,2", + userType: "2, 3", createTime: [] }) diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index 9bc1349..6ef0e76 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -100,13 +100,7 @@ - Date: Thu, 20 Feb 2025 10:41:06 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=AE=A1=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/user/examineform.vue | 9 ++++++--- src/views/task/index.vue | 11 +++++++++++ 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/src/views/system/user/examineform.vue b/src/views/system/user/examineform.vue index 8167aa5..0941505 100644 --- a/src/views/system/user/examineform.vue +++ b/src/views/system/user/examineform.vue @@ -46,11 +46,14 @@ function open(param) { function submit(type) { form.value.audit = type; - UserApi.examineUser(form.value).then((res) => { - proxy.$modal.msgSuccess("审批成功"); + try { + UserApi.examineUser(form.value).then((res) => { emits("success"); - show.value = false; }); + + } finally { + show.value = false + } } defineExpose({ open }); diff --git a/src/views/task/index.vue b/src/views/task/index.vue index dfcd32d..edae37f 100644 --- a/src/views/task/index.vue +++ b/src/views/task/index.vue @@ -187,6 +187,17 @@ > 删除 + + + 审核 + + From 87ac06d7e54f3c4c64decbd3f13884b662554bbf Mon Sep 17 00:00:00 2001 From: dx <1242347652@qq.com> Date: Thu, 20 Feb 2025 17:40:59 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=AE=A1=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/enterprises/index.ts | 6 ++++ src/api/system/user/index.ts | 5 +++ src/views/enterpriseinspections/index.vue | 2 -- src/views/enterprises/update.vue | 33 +++++++++++++++++-- src/views/task/create.vue | 40 +++++------------------ 5 files changed, 50 insertions(+), 36 deletions(-) diff --git a/src/api/enterprises/index.ts b/src/api/enterprises/index.ts index a6279ba..bf32a56 100644 --- a/src/api/enterprises/index.ts +++ b/src/api/enterprises/index.ts @@ -55,4 +55,10 @@ export const EnterprisesApi = { exportEnterprises: async (params) => { return await request.download({ url: `/system/enterprise/export-excel`, params }) }, + + // 标签查询 + tagList: async (params) => { + return await request.get({ url: `"/system/system/tag-library/list`, params }) + }, + } diff --git a/src/api/system/user/index.ts b/src/api/system/user/index.ts index 365db18..425afe2 100644 --- a/src/api/system/user/index.ts +++ b/src/api/system/user/index.ts @@ -94,6 +94,11 @@ export const getSimpleUserZGList = (): Promise => { return request.get({ url: '/system/user/simple-zg-list' }) } +// 通过用户类型获取用户列表 +export const getSimpleUserListByUserType = (params:number) => { + return request.get({ url: '/system/user/simple-user-by-userType?type='+ params }) +} + /** * 查询审核列表 */ diff --git a/src/views/enterpriseinspections/index.vue b/src/views/enterpriseinspections/index.vue index b07fc3a..0204ffb 100644 --- a/src/views/enterpriseinspections/index.vue +++ b/src/views/enterpriseinspections/index.vue @@ -69,9 +69,7 @@ :data="list" :stripe="true" :show-overflow-tooltip="true" - @selection-change="handleSelectionChange" > - diff --git a/src/views/enterprises/update.vue b/src/views/enterprises/update.vue index 3be1d30..ed979bf 100644 --- a/src/views/enterprises/update.vue +++ b/src/views/enterprises/update.vue @@ -12,7 +12,7 @@ - + - + + + + + @@ -188,7 +202,10 @@ import { getStrDictOptions, DICT_TYPE } from '@/utils/dict' import { EnterprisesApi, EnterprisesVO } from '@/api/enterprises' import { EnterpriseQualificationApi, EnterpriseQualificationVO } from '@/api/qualification' +import { UserVO, getSimpleUserListByUserType } from '@/api/system/user' + import { EnterpriseInspectionsApi, EnterpriseInspectionsVO } from '@/api/enterpriseinspections' + import { UploadImgs } from '@/components/UploadFile' import * as FileApi from '@/api/infra/file' import { ElMessage } from 'element-plus' @@ -213,6 +230,7 @@ const fileIds = ref([]); const qualificationlist = ref([]); const inspectionslist = ref([]); const inspectionsLogList = ref([]); +const enterpriseUserList = ref([]) const formData = ref({ id: undefined, @@ -233,8 +251,18 @@ const formData = ref({ managerDeptId: undefined, ides: undefined, startUserSelectAssignees:undefined, + enterpriseUserId: undefined, fileIds:[] }) + +const getEnterpriseUserList = async () => { + const type:number = 2 + const data = await getSimpleUserListByUserType(type) + console.log("datadata===>", data) + +} + + const formRules = reactive({ type: [{ required: true, message: '企业类型不能为空', trigger: 'change' }], enterprisesName: [{ required: true, message: '企业名称不能为空', trigger: 'blur' }], @@ -341,6 +369,7 @@ onMounted(() => { init() getQualificationList() getInspectionslList() + getEnterpriseUserList() //getInspectionsLogList() const openMapAndInit = async () => { if (showMap.value) { diff --git a/src/views/task/create.vue b/src/views/task/create.vue index 74a8eea..2d9e69d 100644 --- a/src/views/task/create.vue +++ b/src/views/task/create.vue @@ -16,7 +16,6 @@ value-format="YYYY-MM-DD" /> - - -
@@ -125,8 +122,6 @@ /> - - @@ -144,8 +139,6 @@ - - 搜索 @@ -158,7 +151,6 @@ -
-
- 提 交 + 审核通过 + 删除 - - + \ No newline at end of file