From d43856191b73d499a3673d205530eb813e1cc3f8 Mon Sep 17 00:00:00 2001 From: yunkexin <760754045@qq.com> Date: Fri, 21 Nov 2025 16:28:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9F=B9=E8=AE=AD=E8=80=83=E6=A0=B8=E6=96=B9?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/apply/subPages/SE/1trainNotifyEdit.vue | 20 ++++++++++++--- pages/apply/subPages/SE/1trainNotifyList.vue | 9 ++++--- pages/apply/subPages/SE/1trainNotifyShow.vue | 26 ++++++++++++++++--- pages/apply/subPages/SE/2trainRecordEdit.vue | 24 ++++++++++++++--- pages/apply/subPages/SE/2trainRecordList.vue | 27 +++++++++++++++++--- pages/apply/subPages/SE/2trainRecordShow.vue | 27 +++++++++++++++++--- pages/apply/subPages/SE/7answerPageEdit.vue | 2 +- 7 files changed, 113 insertions(+), 22 deletions(-) diff --git a/pages/apply/subPages/SE/1trainNotifyEdit.vue b/pages/apply/subPages/SE/1trainNotifyEdit.vue index 8dbffe5..6af6fab 100644 --- a/pages/apply/subPages/SE/1trainNotifyEdit.vue +++ b/pages/apply/subPages/SE/1trainNotifyEdit.vue @@ -143,6 +143,9 @@ import { getRequest, } from '../../../../services/apply/FOServices/FOServices'; + import { + getEnum + } from '../../../../services/common' export default { data() { return { @@ -349,7 +352,10 @@ }) }) } else if (this.currSearchType == "Nav_TrainCheckType") { - getRequest(json, "/SE/TrainCheckTypeEnum/OrderPaged").then(res => { + var dataParm = { + 'name': "PlanCheckType" + } + getEnum(dataParm).then(res => { this.Lists = res.map(i => { return { ...i, @@ -357,6 +363,14 @@ } }) }) + // getRequest(json, "/SE/TrainCheckTypeEnum/OrderPaged").then(res => { + // this.Lists = res.map(i => { + // return { + // ...i, + // name: i.NAME, + // } + // }) + // }) } else if (this.currSearchType == "Nav_RecordUser") { getRequest(json, "/FM/FMUser/OrderPagedUseful").then(res => { this.Lists = res.map(i => { @@ -376,7 +390,7 @@ this.model.TRAIN_TYPE = val.ID; } else if (this.currSearchType == 'Nav_TrainCheckType') { this.model.Nav_TrainCheckType = val; - this.model.CHECK_TYPE_ID = val.ID; + this.model.CHECKTYPE = val.ID; } else if (this.currSearchType == 'Nav_RecordUser') { this.model.Nav_RecordUser = val; this.model.RECORD_USER_ID = val.ID; @@ -503,7 +517,7 @@ extendInclude(json, "Nav_TrainContentList.Nav_Point") extendInclude(json, "Nav_LaunchDepartment") extendInclude(json, "Nav_TrainType") - extendInclude(json, "Nav_TrainCheckType") + // extendInclude(json, "Nav_TrainCheckType") extendInclude(json, "Nav_RecordUser") extendInclude(json, "Nav_TrainContentList") extendInclude(json, "Nav_TrainUserList.Nav_User.Nav_Person") diff --git a/pages/apply/subPages/SE/1trainNotifyList.vue b/pages/apply/subPages/SE/1trainNotifyList.vue index 6e40cfe..2722819 100644 --- a/pages/apply/subPages/SE/1trainNotifyList.vue +++ b/pages/apply/subPages/SE/1trainNotifyList.vue @@ -37,7 +37,7 @@ 考核方式： - {{item.Nav_TrainCheckType?item.Nav_TrainCheckType.NAME:''}} + {{item.CHECKTYPE_NAME}} 状态： @@ -90,7 +90,7 @@ } }, onLoad() { - this.fetchEnums(['SETrainNotifyStatus']); + this.fetchEnums(['SETrainNotifyStatus','PlanCheckType']); }, methods: { async fetchEnums(enumNames) { @@ -145,7 +145,7 @@ extendInclude(json, "Nav_LaunchDepartment") extendInclude(json, "Nav_LaunchUser") extendInclude(json, "Nav_TrainType") - extendInclude(json, "Nav_TrainCheckType") + // extendInclude(json, "Nav_TrainCheckType") if (this.keyword) { extendRule(json, 'NAME', 9, this.keyword) } @@ -161,7 +161,8 @@ return { ...i, title: i.NAME, - STATUS: i.STATUS !== undefined ? this.enumsData['SETrainNotifyStatus'].find(item => item.code === i.STATUS).name : '' + STATUS: i.STATUS !== undefined ? this.enumsData['SETrainNotifyStatus'].find(item => item.code === i.STATUS).name : '', + CHECKTYPE_NAME:i.CHECKTYPE !== undefined ? this.enumsData['PlanCheckType'].find(item => item.code === i.CHECKTYPE).name : '', } }) diff --git a/pages/apply/subPages/SE/1trainNotifyShow.vue b/pages/apply/subPages/SE/1trainNotifyShow.vue index a4315fd..46d5d08 100644 --- a/pages/apply/subPages/SE/1trainNotifyShow.vue +++ b/pages/apply/subPages/SE/1trainNotifyShow.vue @@ -53,7 +53,7 @@ disabledColor="#ffffff" fontSize="14px"> - @@ -101,6 +101,9 @@ import '../../../../utils/showMsg.js' import color from '../../../../uni_modules/uview-ui/libs/config/color' import config from '../../../../config/common' + import { + getEnum + } from '../../../../services/common'; export default { data() { return { @@ -114,22 +117,38 @@ orgId: uni.getStorageSync('orgId'), listPropUpload: ['NOTIFY_ID'], listPropValUpload: [], + Lists: [], } }, onLoad(option) { this.model.ID = option.ID; this.TaskID = option.taskID; this.tableKey = option.tableKey ? option.tableKey : '0' - this.loadData() + + this.getEnums() }, methods: { + getEnums(){ + var dataParm = { + 'name': "PlanCheckType" + } + getEnum(dataParm).then(res => { + this.Lists = res.map(i => { + return { + ...i, + name: i.NAME, + } + }) + this.loadData() + }) + }, loadData() { const json = initFilter(this.orgId, "", "CODE", 1) extendRule(json, 'ID', 1, this.model.ID); extendInclude(json, 'Nav_LaunchDepartment'); extendInclude(json, 'Nav_LaunchUser'); extendInclude(json, 'Nav_TrainType'); - extendInclude(json, 'Nav_TrainCheckType'); + // extendInclude(json, 'Nav_TrainCheckType'); extendInclude(json, 'Nav_TrainContentList'); extendInclude(json, 'Nav_TrainContentList.Nav_Point'); extendInclude(json, 'Nav_TrainUserList'); @@ -161,6 +180,7 @@ } } } + this.model.CHECKTYPE_NAME = res.CHECKTYPE !== undefined ? this.Lists.find(item => item.ID === res.CHECKTYPE).name : ''; this.model.TRAIN_MODEL = this.returnModel(this.model.TRAIN_MODEL); this.model.LEVEL = this.transLevel(this.model.LEVEL); this.model.TRAINCONTENT = trainContent; diff --git a/pages/apply/subPages/SE/2trainRecordEdit.vue b/pages/apply/subPages/SE/2trainRecordEdit.vue index 87d470e..e07c7f6 100644 --- a/pages/apply/subPages/SE/2trainRecordEdit.vue +++ b/pages/apply/subPages/SE/2trainRecordEdit.vue @@ -55,7 +55,7 @@ inputAlign="right" disabled disabledColor="#fff" fontSize="14px"> - @@ -113,6 +113,9 @@ import { getRequest, } from '../../../../services/apply/FOServices/FOServices'; + import { + getEnum + } from '../../../../services/common'; export default { data() { return { @@ -166,9 +169,23 @@ this.TaskID = option.taskID ? option.taskID : ''; this.model.ID = option.ID ? option.ID : ''; this.tableKey = option.tableKey ? option.tableKey : '0'; - this.loadData(); + this.getEnums(); }, methods: { + getEnums(){ + var dataParm = { + 'name': "PlanCheckType" + } + getEnum(dataParm).then(res => { + this.Lists = res.map(i => { + return { + ...i, + name: i.NAME, + } + }) + this.loadData() + }) + }, sectionChange(index, item) { item.STATUS = index; }, @@ -223,7 +240,7 @@ extendInclude(json, "Nav_Notify") extendInclude(json, "Nav_Notify.Nav_TrainType") extendInclude(json, "Nav_Notify.Nav_LaunchDepartment") - extendInclude(json, "Nav_Notify.Nav_TrainCheckType") + // extendInclude(json, "Nav_Notify.Nav_TrainCheckType") extendInclude(json, "Nav_Notify.Nav_TrainContentList.Nav_Point") extendInclude(json, "Nav_Files.Nav_ImgFile") extendRule(json, 'ID', 1, this.model.ID) @@ -248,6 +265,7 @@ } else if (this.model.Nav_Notify.TRAIN_MODEL.indexOf(4) > 0) { this.model.Nav_Notify.TRAIN_MODEL_SHOW += "演示法 "; } + this.model.Nav_Notify.CHECKTYPE_NAME = res.Nav_Notify.CHECKTYPE !== undefined ? this.Lists.find(item => item.ID === res.Nav_Notify.CHECKTYPE).name : ''; this.model.Nav_TrainContentList_SHOW = ""; for (let i = 0; i < this.model.Nav_Notify.Nav_TrainContentList.length; i++) { this.model.Nav_TrainContentList_SHOW += (i + 1) + "." + this.model.Nav_Notify diff --git a/pages/apply/subPages/SE/2trainRecordList.vue b/pages/apply/subPages/SE/2trainRecordList.vue index f13b3df..d35e121 100644 --- a/pages/apply/subPages/SE/2trainRecordList.vue +++ b/pages/apply/subPages/SE/2trainRecordList.vue @@ -39,7 +39,7 @@ 考核方式： - {{item.Nav_Notify.Nav_TrainCheckType.NAME}} + {{item.Nav_Notify.CHECKTYPE_NAME}} 状态： @@ -67,6 +67,9 @@ extendRule, initFilter } from '../../../../utils/common' + import { + getEnum + } from '../../../../services/common'; export default { data() { @@ -84,13 +87,28 @@ columns: [], title: '', name: '' - } + }, + Lists:[] } }, onLoad() { - this.loadData() + this.getEnums() }, methods: { + getEnums(){ + var dataParm = { + 'name': "PlanCheckType" + } + getEnum(dataParm).then(res => { + this.Lists = res.map(i => { + return { + ...i, + name: i.NAME, + } + }) + this.loadData() + }) + }, handleSearch(obj) { this.keyword = obj.value }, @@ -103,7 +121,7 @@ extendInclude(json, "Nav_Notify.Nav_LaunchDepartment") extendInclude(json, "Nav_Notify.Nav_RecordUser") extendInclude(json, "Nav_Notify.Nav_TrainType") - extendInclude(json, "Nav_Notify.Nav_TrainCheckType") + // extendInclude(json, "Nav_Notify.Nav_TrainCheckType") if (this.keyword) { extendRule(json, 'Nav_Notify.NAME', 9, this.keyword) } @@ -125,6 +143,7 @@ } else if (res.Data[i].STATUS == 3) { res.Data[i].STATUS = "归档"; } + res.Data[i].Nav_Notify.CHECKTYPE_NAME = res.Data[i].Nav_Notify.CHECKTYPE !== undefined ? this.Lists.find(item => item.ID === res.Data[i].Nav_Notify.CHECKTYPE).name : '' } let newRes = (res.Data || []).map(i => { return { diff --git a/pages/apply/subPages/SE/2trainRecordShow.vue b/pages/apply/subPages/SE/2trainRecordShow.vue index 27cb2c0..1a7cf72 100644 --- a/pages/apply/subPages/SE/2trainRecordShow.vue +++ b/pages/apply/subPages/SE/2trainRecordShow.vue @@ -32,7 +32,7 @@ - + @@ -52,7 +52,7 @@ - 查看试卷 + 查看试卷 @@ -79,6 +79,9 @@ import '../../../../utils/showMsg.js' import color from '../../../../uni_modules/uview-ui/libs/config/color' import config from '../../../../config/common' + import { + getEnum + } from '../../../../services/common'; export default { data() { return { @@ -90,22 +93,37 @@ listPropUpload: ['RECORD_ID'], listPropValUpload: [], isAgree: false, + Lists:[] } }, onLoad(option) { this.model.ID = option.ID; this.TaskID = option.taskID; this.tableKey = option.tableKey ? option.tableKey : '0' - this.loadData() + this.getEnums() }, methods: { + getEnums(){ + var dataParm = { + 'name': "PlanCheckType" + } + getEnum(dataParm).then(res => { + this.Lists = res.map(i => { + return { + ...i, + name: i.NAME, + } + }) + this.loadData() + }) + }, loadData() { const json = initFilter(this.ORG_ID, "", "", 1) extendRule(json, 'ID', 1, this.model.ID); extendInclude(json, 'Nav_Notify.Nav_LaunchDepartment'); extendInclude(json, 'Nav_Notify.Nav_LaunchUser'); extendInclude(json, 'Nav_Notify.Nav_TrainType'); - extendInclude(json, 'Nav_Notify.Nav_TrainCheckType'); + // extendInclude(json, 'Nav_Notify.Nav_TrainCheckType'); extendInclude(json, 'Nav_Notify.Nav_TrainContentList'); extendInclude(json, 'Nav_Notify.Nav_TrainContentList.Nav_Point'); extendInclude(json, 'Nav_Users.Nav_User'); @@ -156,6 +174,7 @@ } } + this.model.Nav_Notify.CHECKTYPE_NAME = res.Nav_Notify.CHECKTYPE !== undefined ? this.Lists.find(item => item.ID === res.Nav_Notify.CHECKTYPE).name : ''; this.model.TRAIN_MODEL = this.returnModel(this.model.Nav_Notify.TRAIN_MODEL); this.model.LEVEL = this.transLevel(this.model.Nav_Notify.LEVEL); this.model.TRAIN_TIME = this.model.Nav_Notify.TRAIN_START_TIME?.substring(0, 16) + "~" + this diff --git a/pages/apply/subPages/SE/7answerPageEdit.vue b/pages/apply/subPages/SE/7answerPageEdit.vue index 09530e2..788e173 100644 --- a/pages/apply/subPages/SE/7answerPageEdit.vue +++ b/pages/apply/subPages/SE/7answerPageEdit.vue @@ -192,7 +192,7 @@ extendInclude(json, 'Nav_Record.Nav_Notify.Nav_LaunchUser'); extendInclude(json, 'Nav_Record.Nav_Notify.Nav_TrainContentList'); extendInclude(json, 'Nav_Record.Nav_Notify.Nav_TrainType'); - extendInclude(json, 'Nav_Record.Nav_Notify.Nav_TrainCheckType'); + // extendInclude(json, 'Nav_Record.Nav_Notify.Nav_TrainCheckType'); extendInclude(json, 'Nav_Record.Nav_Notify.Nav_TrainContentList.Nav_Point'); extendInclude(json, 'Nav_Test'); extendInclude(json, 'Nav_User');