From 7551d8ad6d001cf2f3dd6acaa7467142ea6d1cf6 Mon Sep 17 00:00:00 2001 From: sunhonglai Date: Mon, 28 Apr 2025 11:39:30 +0800 Subject: [PATCH 01/14] =?UTF-8?q?SZX-1091=20=E4=BC=98=E5=8C=96=E8=AE=B2?= =?UTF-8?q?=E5=B8=88=E4=BB=BD=E9=83=A8=E4=BB=BD=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/lecturer/LecturerApproval.vue | 66 +++++++++++++++++++------ src/views/lecturer/LecturerFee.vue | 17 ++++--- 2 files changed, 60 insertions(+), 23 deletions(-) diff --git a/src/views/lecturer/LecturerApproval.vue b/src/views/lecturer/LecturerApproval.vue index 6725b720..75850639 100644 --- a/src/views/lecturer/LecturerApproval.vue +++ b/src/views/lecturer/LecturerApproval.vue @@ -5,8 +5,20 @@
- + + > + + {{ item.label }} + @@ -342,6 +354,8 @@ export default { beginTime: null, endTime: null, }, + filterOrgListSearch: [], + orgListSearch: [], }) //费用类型 const courseTypeList = ref([ @@ -380,25 +394,45 @@ export default { } queryTrainOrgPor(obj).then((res) => { if (res.data.code === 200) { - let arr = res.data.data; - let array = []; - arr.map((value) => { - let obj = { - value: value.id, - label: value.affiliationName, - }; - array.push(obj); - }); - trainOrglist.value = array; - trainOrglist.value.unshift({ - value: '', - label: "全部" + state.orgList = res.data.data?.map(item => { + return { + label: item.affiliationName, + value: item.id + } }) + state.orgListSearch = res.data.data?.map(item => { + state.orgInput = item.affiliationName; + return { + label: item.affiliationName, + value: item.id + } + }) + state.orgListSearch.unshift({ + label: '全部', value: '' + }) + + state.filterOrgListSearch = state.orgListSearch } }) } trainOrglista() + const handleOrgSearch = (value) => { + console.log("handleOrgSearch value： ",value) + console.log("handleOrgSearch state.orgListSearch： ",JSON.parse(JSON.stringify(state.orgListSearch))) + //克隆数据 + let temp = JSON.parse(JSON.stringify(state.orgListSearch)); + //选择数据 + state.filterOrgListSearch = temp.filter(item => item.label.includes(value)) + + } + + const handleOrgChange = (value) => { + if(value == undefined || value == null){ + state.filterOrgListSearch = state.orgListSearch; + } + } + //课程类型 const OnTheJobStatusList = ref([ { value: 1, label: "项目开课" }, @@ -1119,6 +1153,8 @@ export default { managerChange, trainOrglist, trainOrglista, + handleOrgSearch, + handleOrgChange, handlemoreid, handleExport, lecturerSystemList, diff --git a/src/views/lecturer/LecturerFee.vue b/src/views/lecturer/LecturerFee.vue index 27ac73e1..e02c5ad9 100644 --- a/src/views/lecturer/LecturerFee.vue +++ b/src/views/lecturer/LecturerFee.vue @@ -32,6 +32,7 @@ @change="handleOrgChange" @search="handleOrgSearch" placeholder="请选择培训发生组织" + v-on:keydown.enter="enterPressHadlerSearch"> > {{ item.label }} @@ -138,7 +139,7 @@ 删除 @@ -327,11 +328,11 @@ @@ -343,10 +344,10 @@ - + 删除 @@ -332,7 +332,7 @@ @@ -347,7 +347,7 @@ {{ formParam.courseType == 2 ? '课程时长' : '授课/开发时长' }} + @change="clearNonNumber" :placeholder="formParam.courseType == 2 ? '请输入课程时长分钟数' : '请输入授课/开发分钟数'" allowClear showSearch suffix="分钟"> @@ -106,7 +106,7 @@ 查看 编辑 - 删除 + 删除 @@ -709,25 +709,25 @@ export default { ) } }, - { - title: '数据来源', - dataIndex: 'createFrom', - key: 'createFrom', - ellipsis: true, align: "center", - width: 120, - customRender: (value) => { - return ( -
- {value.record.createFrom == "0" || value.record.createFrom == "1" - ? { - "0": "系统生成", - "1": "手动录入", - }[value.record.createFrom + ""] || "" - : "-"} -
- ) - } - }, + // { + // title: '数据来源', + // dataIndex: 'createFrom', + // key: 'createFrom', + // ellipsis: true, align: "center", + // width: 120, + // customRender: (value) => { + // return ( + //
+ // {value.record.createFrom == "0" || value.record.createFrom == "1" + // ? { + // "0": "系统生成", + // "1": "手动录入", + // }[value.record.createFrom + ""] || "" + // : "-"} + //
+ // ) + // } + // }, { title: '操作 ', dataIndex: 'operation', diff --git a/src/views/lecturer/InsideLecturer.vue b/src/views/lecturer/InsideLecturer.vue index 77853041..390851f4 100644 --- a/src/views/lecturer/InsideLecturer.vue +++ b/src/views/lecturer/InsideLecturer.vue @@ -84,7 +84,7 @@ -->
{{ record.neworganizationName }}
+ :title="orgSplit(record.orgName)">{{ orgSplit(record.orgName) }}
@@ -1390,6 +1390,14 @@ export default { return roleCode.some(t => t == admin) } } + const orgSplit = (val) => { + if (val) { + const org = val.split('/'); + const reversedParts = org.reverse(); + return reversedParts.join('/'); + } + return ''; + } return { ...toRefs(state), lecturerAdmin, @@ -1456,6 +1464,7 @@ export default { createupdialog, removeList, checkMenu, + orgSplit, } }, }; diff --git a/src/views/lecturer/InsideTeaching.vue b/src/views/lecturer/InsideTeaching.vue index bed6bd73..84a66658 100644 --- a/src/views/lecturer/InsideTeaching.vue +++ b/src/views/lecturer/InsideTeaching.vue @@ -22,7 +22,7 @@ + separator="至" :placeholder="['授课/开发日期开始时间', '授课/开发日期结束时间']" v-on:keydown.enter="enterPressHadlerSearch" /> @@ -299,7 +299,7 @@ allowClear showSearch :filter-option="false" - :options="filterOrgListSearch" + :options="filterOrgListSearch2" @search="handleOrgSearch" @change="changeOrg"> @@ -578,6 +578,7 @@ export default { const state = reactive({ orgListSearch: [], filterOrgListSearch: [], + filterOrgListSearch2: [], moreid: 1, title: '导入内部授课记录', vf: false, @@ -935,10 +936,11 @@ export default { key: 'trainOrgName', ellipsis: true, align: "left", width: 200, - customRender: (value, record) => { + customRender: (value) => { + const orgName = value.record.trainOrgName ? value.record.trainOrgName.split('/').reverse().join('/') : '-'; return (
- {value.record.trainOrgName||'-'} + {orgName}
) } @@ -996,6 +998,9 @@ export default { value: item.id } }) + + state.filterOrgListSearch2 = state.orgListSearch; + state.orgListSearch.unshift({ label: '全部', value: '' }) diff --git a/src/views/lecturer/LookInsideLecturer.vue b/src/views/lecturer/LookInsideLecturer.vue index 30dacaf2..82a66fd7 100644 --- a/src/views/lecturer/LookInsideLecturer.vue +++ b/src/views/lecturer/LookInsideLecturer.vue @@ -416,6 +416,11 @@ export default{ key: 'updateName', ellipsis: true, align: "center", width: 120, + customRender: (value) => { + return ( +
{value.record.updateName || '-'}
+ ) + } }, ]) //晋级记录列表数据 From 587ba14edfd26dc17881f1c8d57f59382b4fa52a Mon Sep 17 00:00:00 2001 From: sunhonglai Date: Wed, 30 Apr 2025 14:05:19 +0800 Subject: [PATCH 09/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=80=89=E9=A1=B9?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E5=92=8C=E6=96=B0=E5=A2=9E=E5=8E=BB=E9=99=A4?= =?UTF-8?q?=E5=85=A8=E9=83=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/lecturer/ExternalTeaching.vue | 2 +- src/views/lecturer/InsideTeaching.vue | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/views/lecturer/ExternalTeaching.vue b/src/views/lecturer/ExternalTeaching.vue index 2fbb1f7f..1c538ad0 100644 --- a/src/views/lecturer/ExternalTeaching.vue +++ b/src/views/lecturer/ExternalTeaching.vue @@ -27,7 +27,7 @@ - diff --git a/src/views/lecturer/InsideTeaching.vue b/src/views/lecturer/InsideTeaching.vue index 84a66658..3628b8a3 100644 --- a/src/views/lecturer/InsideTeaching.vue +++ b/src/views/lecturer/InsideTeaching.vue @@ -21,7 +21,7 @@ - @@ -999,12 +999,14 @@ export default { } }) - state.filterOrgListSearch2 = state.orgListSearch; - state.orgListSearch.unshift({ label: '全部', value: '' }) state.filterOrgListSearch = state.orgListSearch; + + state.filterOrgListSearch2 = state.orgListSearch; + // 移除filterOrgListSearch2头部的全部选项 + state.filterOrgListSearch2.shift(); }) } //TODO5 From 033da81cbb2443f9b305e441c255772d59f9c449 Mon Sep 17 00:00:00 2001 From: sunhonglai Date: Wed, 30 Apr 2025 14:43:29 +0800 Subject: [PATCH 10/14] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8E=BB=E9=99=A4?= =?UTF-8?q?=E5=85=A8=E9=83=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/lecturer/InsideTeaching.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/views/lecturer/InsideTeaching.vue b/src/views/lecturer/InsideTeaching.vue index 3628b8a3..4f2899f0 100644 --- a/src/views/lecturer/InsideTeaching.vue +++ b/src/views/lecturer/InsideTeaching.vue @@ -1004,9 +1004,8 @@ export default { }) state.filterOrgListSearch = state.orgListSearch; - state.filterOrgListSearch2 = state.orgListSearch; // 移除filterOrgListSearch2头部的全部选项 - state.filterOrgListSearch2.shift(); + state.filterOrgListSearch2 = state.orgListSearch.filter(item => item.value !== ''); // 移除“全部”选项 }) } //TODO5 From 190054d2c5c70be9e46dc91e6b4b2804a1e7bb3d Mon Sep 17 00:00:00 2001 From: sunhonglai Date: Thu, 8 May 2025 14:40:55 +0800 Subject: [PATCH 11/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8E=86=E5=8F=B2?= =?UTF-8?q?=E9=AA=8C=E8=AF=81=E5=88=A0=E9=99=A4=E9=80=BB=E8=BE=91=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/lecturer/ExternalTeaching.vue | 2 +- src/views/lecturer/InsideTeaching.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/lecturer/ExternalTeaching.vue b/src/views/lecturer/ExternalTeaching.vue index 1c538ad0..7b884995 100644 --- a/src/views/lecturer/ExternalTeaching.vue +++ b/src/views/lecturer/ExternalTeaching.vue @@ -106,7 +106,7 @@ 查看 编辑 - 删除 + 删除 diff --git a/src/views/lecturer/InsideTeaching.vue b/src/views/lecturer/InsideTeaching.vue index 4f2899f0..f92af8f6 100644 --- a/src/views/lecturer/InsideTeaching.vue +++ b/src/views/lecturer/InsideTeaching.vue @@ -141,7 +141,7 @@ 查看 编辑 - 删除 From 2fe8f957bea9a4af83f506f5f6bc2883f55e5e2b Mon Sep 17 00:00:00 2001 From: sunhonglai Date: Thu, 8 May 2025 15:21:01 +0800 Subject: [PATCH 12/14] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E8=B4=B9=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E6=96=B0=E5=A2=9E=E5=8E=BB=E9=99=A4=E5=9F=B9=E8=AE=AD?= =?UTF-8?q?=E5=8F=91=E7=94=9F=E7=BB=84=E7=BB=87=E5=85=A8=E9=83=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/lecturer/LecturerFee.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/views/lecturer/LecturerFee.vue b/src/views/lecturer/LecturerFee.vue index 8b3849c7..52f3cc7e 100644 --- a/src/views/lecturer/LecturerFee.vue +++ b/src/views/lecturer/LecturerFee.vue @@ -318,7 +318,7 @@ allowClear showSearch :filter-option="false" - :options="filterOrgListSearch" + :options="filterOrgListSearch2" @search="handleOrgSearch" @change="changeOrg"> @@ -621,6 +621,7 @@ export default { SeeLoading: false, orgList: [], filterOrgListSearch: [], + filterOrgListSearch2: [], orgListSearch: [], selectsIds: '', visibleConfirm: false, @@ -723,6 +724,8 @@ export default { state.filterOrgListSearch = state.orgListSearch + // 移除filterOrgListSearch2头部的全部选项 + state.filterOrgListSearch2 = state.orgListSearch.filter(item => item.value !== ''); // 移除“全部”选项 }) } //费用类型 From d5a233656b2409962c15c9f1113c2fc59ea12c09 Mon Sep 17 00:00:00 2001 From: sunhonglai Date: Fri, 9 May 2025 09:39:02 +0800 Subject: [PATCH 13/14] =?UTF-8?q?=E6=8E=88=E8=AF=BE=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E5=92=8C=E8=AE=B2=E5=B8=88=E5=88=97=E8=A1=A8=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/lecturer/InsideTeaching.vue | 11 ++++++++--- src/views/lecturer/LecturerFee.vue | 13 +++++++++++-- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/src/views/lecturer/InsideTeaching.vue b/src/views/lecturer/InsideTeaching.vue index f92af8f6..30fe8d52 100644 --- a/src/views/lecturer/InsideTeaching.vue +++ b/src/views/lecturer/InsideTeaching.vue @@ -300,7 +300,7 @@ showSearch :filter-option="false" :options="filterOrgListSearch2" - @search="handleOrgSearch" + @search="handleOrgSearch2" @change="changeOrg"> @@ -1531,7 +1531,11 @@ export default { state.filterOrgListSearch = temp.filter(item => item.label.includes(value)) } - + const handleOrgSearch2 = (value) => { + let temp = JSON.parse(JSON.stringify(state.orgListSearch)); + //选择数据 + state.filterOrgListSearch2 = temp.filter(item => item.label.includes(value)) + } return { ...toRefs(state), @@ -1593,7 +1597,8 @@ export default { scoreChange, locale, checkMenu, - handleOrgSearch + handleOrgSearch, + handleOrgSearch2 } }, }; diff --git a/src/views/lecturer/LecturerFee.vue b/src/views/lecturer/LecturerFee.vue index 52f3cc7e..f6ae30cd 100644 --- a/src/views/lecturer/LecturerFee.vue +++ b/src/views/lecturer/LecturerFee.vue @@ -319,7 +319,7 @@ showSearch :filter-option="false" :options="filterOrgListSearch2" - @search="handleOrgSearch" + @search="handleOrgSearch2" @change="changeOrg"> @@ -1660,7 +1660,15 @@ export default { let temp = JSON.parse(JSON.stringify(state.orgListSearch)); //选择数据 state.filterOrgListSearch = temp.filter(item => item.label.includes(value)) - + } + + const handleOrgSearch2 = (value) => { + console.log("handleOrgSearch value： ",value) + console.log("handleOrgSearch state.orgListSearch： ",JSON.parse(JSON.stringify(state.orgListSearch))) + //克隆数据 + let temp = JSON.parse(JSON.stringify(state.orgListSearch)); + //选择数据 + state.filterOrgListSearch2 = temp.filter(item => item.label.includes(value)) } const handleOrgChange = (value) => { @@ -2000,6 +2008,7 @@ export default { getListData, changetlevel, handleOrgSearch, + handleOrgSearch2, handleOrgChange, canceleditTeacherDialog, allFee, From e600aea5096b03937ab5061360dfc251073f64bc Mon Sep 17 00:00:00 2001 From: sunhonglai Date: Fri, 9 May 2025 09:47:24 +0800 Subject: [PATCH 14/14] =?UTF-8?q?=E6=8E=88=E8=AF=BE=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E5=92=8C=E8=AE=B2=E5=B8=88=E5=88=97=E8=A1=A8=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/lecturer/InsideTeaching.vue | 2 +- src/views/lecturer/LecturerFee.vue | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/views/lecturer/InsideTeaching.vue b/src/views/lecturer/InsideTeaching.vue index 30fe8d52..a6980f98 100644 --- a/src/views/lecturer/InsideTeaching.vue +++ b/src/views/lecturer/InsideTeaching.vue @@ -1532,7 +1532,7 @@ export default { } const handleOrgSearch2 = (value) => { - let temp = JSON.parse(JSON.stringify(state.orgListSearch)); + let temp = JSON.parse(JSON.stringify(state.orgListSearch.filter(item => item.value !== ''))); //选择数据 state.filterOrgListSearch2 = temp.filter(item => item.label.includes(value)) } diff --git a/src/views/lecturer/LecturerFee.vue b/src/views/lecturer/LecturerFee.vue index f6ae30cd..24dbc2b5 100644 --- a/src/views/lecturer/LecturerFee.vue +++ b/src/views/lecturer/LecturerFee.vue @@ -1663,10 +1663,8 @@ export default { } const handleOrgSearch2 = (value) => { - console.log("handleOrgSearch value： ",value) - console.log("handleOrgSearch state.orgListSearch： ",JSON.parse(JSON.stringify(state.orgListSearch))) //克隆数据 - let temp = JSON.parse(JSON.stringify(state.orgListSearch)); + let temp = JSON.parse(JSON.stringify(state.orgListSearch.filter(item => item.value !== ''))); //选择数据 state.filterOrgListSearch2 = temp.filter(item => item.label.includes(value)) }