From 273c90be57218312f93c95dd176c2aab358a7a3c Mon Sep 17 00:00:00 2001 From: zhangqihang Date: Mon, 19 Feb 2024 17:05:46 +0800 Subject: [PATCH 01/64] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/keyprojects/outsourced/index.vue | 1 + .../personnelmanagement/components/edit.vue | 42 +++++++++++++++---- .../keyprojects/personnelmanagement/index.vue | 7 +++- src/views/keyprojects/units/index.vue | 2 + 4 files changed, 43 insertions(+), 9 deletions(-) diff --git a/src/views/keyprojects/outsourced/index.vue b/src/views/keyprojects/outsourced/index.vue index 1db5ae3..0490a33 100644 --- a/src/views/keyprojects/outsourced/index.vue +++ b/src/views/keyprojects/outsourced/index.vue @@ -20,6 +20,7 @@ - + - + - + - + - + - + - + - + { await ElMessageBox.confirm( - "是否将[" + NAME + "]的密码重置为 Aa@123456789 吗?", + "是否将[" + NAME + "]的密码重置为 666666 吗?", { type: "warning", } @@ -163,6 +164,7 @@ const handleDelete = async (PERSONNELMANAGEMENT_ID) => { }); await setPersonnelmanagementDelete({ PERSONNELMANAGEMENT_ID }); fnGetData(); + ElMessage.success("删除成功"); }; const batchDel = async () => { @@ -181,6 +183,8 @@ const batchDel = async () => { .join(","); await setPersonnelmanagementDeleteAll({ DATA_IDS: ids }); fnGetData(); + ElMessage.success("删除成功"); + tableRef.value.clearSelection(); }; const fnGoEdit = async (id) => { @@ -196,6 +200,7 @@ const fnGoEdit = async (id) => { const fnResetPaginationTransfer = () => { fnGetData(searchForm); + tableRef.value.clearSelection() }; const fnAdd = () => { diff --git a/src/views/keyprojects/units/index.vue b/src/views/keyprojects/units/index.vue index 6441e09..9e1b7c4 100644 --- a/src/views/keyprojects/units/index.vue +++ b/src/views/keyprojects/units/index.vue @@ -165,6 +165,7 @@ const batchDel = async (ids) => { }); await setUnitsDeleteAll({ DATA_IDS: ids }); fnGetData(); + ElMessage.success("删除成功"); }; const handleDelete = async (UNITS_ID) => { @@ -173,6 +174,7 @@ const handleDelete = async (UNITS_ID) => { }); await setUnitsDelete({ UNITS_ID }); fnGetData(); + ElMessage.success("删除成功"); }; From 4a84899838187e7a0a7bda2bdcc407abca6052f8 Mon Sep 17 00:00:00 2001 From: dearlin <1261008090@qq.com> Date: Tue, 20 Feb 2024 08:39:01 +0800 Subject: [PATCH 02/64] =?UTF-8?q?=E5=AE=89=E5=85=A8=E4=BE=8B=E4=BC=9A?= =?UTF-8?q?=EF=BC=8C14082bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/js/data_dictionary.js | 7 ++- src/components/department/index.vue | 4 +- src/components/tooltip_img/index.vue | 4 +- src/request/data_dictionary.js | 8 ++- src/views/safety_meeting/meeting/add.vue | 59 +++++++++++++++++--- src/views/safety_meeting/meeting/details.vue | 2 +- src/views/safety_meeting/meeting/index.vue | 45 +++++---------- src/views/safety_meeting/meeting/view.vue | 21 +------ 8 files changed, 85 insertions(+), 65 deletions(-) diff --git a/src/assets/js/data_dictionary.js b/src/assets/js/data_dictionary.js index aa1b810..10dd289 100644 --- a/src/assets/js/data_dictionary.js +++ b/src/assets/js/data_dictionary.js @@ -6,7 +6,7 @@ import { getDepartmentTree, getLevelsCorp, getElectronicFenceTree, - getListSelectTree, + getListSelectTree, getDepartmentzTree } from "@/request/data_dictionary.js"; import { ref } from "vue"; @@ -384,6 +384,11 @@ export const layoutFnGetDepartmentTree = async (params) => { const resData = await getDepartmentTree(params); return ref(JSON.parse(resData.zTreeNodes)); }; +// 部门树2 +export const layoutFnGetDepartmentzTree = async (params) => { + const resData = await getDepartmentzTree(params); + return ref(JSON.parse(resData.zTreeNodes)); +}; // 电子围栏树 export const layoutFnGetElectronicFenceTree = async (params) => { const resData = await getElectronicFenceTree(params); diff --git a/src/components/department/index.vue b/src/components/department/index.vue index 374f9ec..d18fa99 100644 --- a/src/components/department/index.vue +++ b/src/components/department/index.vue @@ -18,7 +18,7 @@ diff --git a/src/components/tooltip_img/index.vue b/src/components/tooltip_img/index.vue index 2feaa3c..275579d 100644 --- a/src/components/tooltip_img/index.vue +++ b/src/components/tooltip_img/index.vue @@ -6,7 +6,9 @@ v-viewer v-for="item in imgs" :key="item.IMGFILES_ID" - :src="VITE_FILE_URL + item.FILEPATH" + :src=" + item.FILEPATH ? VITE_FILE_URL + item.FILEPATH : VITE_FILE_URL + item + " width="100" height="100" alt="" diff --git a/src/request/data_dictionary.js b/src/request/data_dictionary.js index 0084104..e2cf046 100644 --- a/src/request/data_dictionary.js +++ b/src/request/data_dictionary.js @@ -39,12 +39,18 @@ export const getUserListAllByCorp = (params) => loading: false, ...params, }); -// 部门树 +// 部门树 有限制只有主账号能选子集 export const getDepartmentTree = (params) => post("/department/listTree", { loading: false, ...params, }); +// 部门树 +export const getDepartmentzTree = (params) => + post("/department/listzTree", { + loading: false, + ...params, + }); // 电子围栏树 export const getElectronicFenceTree = (params) => post("/electronicfence/listTree", { diff --git a/src/views/safety_meeting/meeting/add.vue b/src/views/safety_meeting/meeting/add.vue index 66108c7..c1ec217 100644 --- a/src/views/safety_meeting/meeting/add.vue +++ b/src/views/safety_meeting/meeting/add.vue @@ -91,6 +91,13 @@ :value="item.USER_ID" /> + + {{ item.USER_ID.length > 0 ? "取消所有选中" : "全选" }} + + + 安全例会附件 + + + + + +
@@ -125,9 +146,11 @@ diff --git a/src/views/safety_meeting/meeting/view.vue b/src/views/safety_meeting/meeting/view.vue index 6011eb8..c0cdb36 100644 --- a/src/views/safety_meeting/meeting/view.vue +++ b/src/views/safety_meeting/meeting/view.vue @@ -15,21 +15,7 @@ {{ info.PROMISE_TERM_END }} - 承诺人 - - - - 被承诺人 + 涉及人 @@ -68,7 +50,6 @@ import { reactive, ref } from "vue"; import { getAdministrationView } from "@/request/security_commitment_pro.js"; import { useRoute } from "vue-router"; -import ViewInfo from "../template/components/view.vue"; import { uniqBy } from "lodash-es"; const route = useRoute(); From 976d62cfafffb676983d06c9c7e5b7665d094c83 Mon Sep 17 00:00:00 2001 From: fangjiakai <450850793@qq.com> Date: Tue, 20 Feb 2024 09:50:15 +0800 Subject: [PATCH 03/64] =?UTF-8?q?=E5=8A=A8=E7=81=AB=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../job_data/components/flow_chart.vue | 18 +++++++++++++++++- src/views/hot_work/job_data/index.vue | 5 ++++- src/views/keyprojects/outsourced/index.vue | 2 +- .../enterprises_occupational_health/index.vue | 2 +- 4 files changed, 23 insertions(+), 4 deletions(-) diff --git a/src/views/hot_work/job_data/components/flow_chart.vue b/src/views/hot_work/job_data/components/flow_chart.vue index a701438..d501a5d 100644 --- a/src/views/hot_work/job_data/components/flow_chart.vue +++ b/src/views/hot_work/job_data/components/flow_chart.vue @@ -4,7 +4,7 @@ - - diff --git a/src/views/safety_meeting/meeting/details.vue b/src/views/safety_meeting/meeting/details.vue deleted file mode 100644 index 9911683..0000000 --- a/src/views/safety_meeting/meeting/details.vue +++ /dev/null @@ -1,85 +0,0 @@ - - - - - diff --git a/src/views/safety_meeting/meeting/view.vue b/src/views/safety_meeting/meeting/view.vue index e2455c7..fe18a60 100644 --- a/src/views/safety_meeting/meeting/view.vue +++ b/src/views/safety_meeting/meeting/view.vue @@ -50,9 +50,9 @@ 反馈情况