diff --git a/pages/apply/subPages/SE/1trainNotifyEdit.vue b/pages/apply/subPages/SE/1trainNotifyEdit.vue index d11e391..5cec50b 100644 --- a/pages/apply/subPages/SE/1trainNotifyEdit.vue +++ b/pages/apply/subPages/SE/1trainNotifyEdit.vue @@ -32,8 +32,10 @@ - - + + + + @@ -145,7 +147,7 @@ message: '请选择培训类型' }, 'LEVEL_SHOW': { - type: 'number', + type: 'string', required: true, trigger: ['blur', 'change'], message: '请选择培训级别' @@ -175,7 +177,7 @@ trigger: ['blur', 'change'], message: '请填写培训学时' }, - 'TRAIN_TEACHER': { + 'Nav_UserTeacher.NAME': { type: 'string', required: true, trigger: ['blur', 'change'], @@ -369,7 +371,7 @@ } }) }) - } else if (this.currSearchType == "Nav_RecordUser") { + } else if (this.currSearchType == "Nav_RecordUser"||this.currSearchType == "Nav_UserTeacher") { getRequest(json, "/FM/FMUser/OrderPagedUseful").then(res => { this.Lists = res.map(i => { return { @@ -392,6 +394,10 @@ } else if (this.currSearchType == 'Nav_RecordUser') { this.model.Nav_RecordUser = val; this.model.RECORD_USER_ID = val.ID; + } else if (this.currSearchType == 'Nav_UserTeacher') { + this.model.Nav_UserTeacher = val; + this.model.USER_ID_TEACHER = val.ID; + this.model.TRAIN_TEACHER = val.NAME } }, handleClosePopup() { @@ -625,6 +631,7 @@ 'yyyy-mm-dd hh:MM:ss'); this.modelEdit.TRAIN_END_TIME = uni.$u.timeFormat(this.modelEdit.TRAIN_END_TIME, 'yyyy-mm-dd hh:MM:ss'); + this.modelEdit.Nav_UserTeacher = null; this.modelEdit.Nav_TrainType = null; this.modelEdit.Nav_TrainCheckType = null; this.modelEdit.Nav_RecordUser = null; diff --git a/pages/apply/subPages/SE/1trainNotifyShow.vue b/pages/apply/subPages/SE/1trainNotifyShow.vue index fd4a6f1..48bcb0f 100644 --- a/pages/apply/subPages/SE/1trainNotifyShow.vue +++ b/pages/apply/subPages/SE/1trainNotifyShow.vue @@ -35,7 +35,7 @@ - + @@ -166,6 +166,7 @@ extendInclude(json, 'Nav_TrainUserList'); extendInclude(json, 'Nav_TrainUserList.Nav_User'); extendInclude(json, 'Nav_Files.Nav_ImgFile'); + extendInclude(json, "Nav_UserTeacher") getRequest(json, "/SE/TrainNotify/Get").then(res => { this.model = res let trainContent = ''; @@ -193,7 +194,7 @@ } } this.model.TRAIN_MODEL = this.returnModel(this.model.TRAIN_MODEL); - this.model.LEVEL = this.transLevel(this.model.LEVEL); + // this.model.LEVEL = this.transLevel(this.model.LEVEL); this.model.TRAINCONTENT = trainContent; this.model.users = users; this.model.LEVEL_SHOW = res.LEVEL !== undefined ? this.enumsData['FMDepartmentType'].find(item => item.code === res.LEVEL).name : ''; diff --git a/pages/apply/subPages/SE/2trainRecordShow.vue b/pages/apply/subPages/SE/2trainRecordShow.vue index acdc814..113e905 100644 --- a/pages/apply/subPages/SE/2trainRecordShow.vue +++ b/pages/apply/subPages/SE/2trainRecordShow.vue @@ -207,7 +207,7 @@ this.model.Nav_Notify.TRAINTYPE_SHOW = res.Nav_Notify.TRAINTYPE !== undefined ? this.enumsData['TrainType'].find(item => item.code === res.Nav_Notify.TRAINTYPE).name : ''; this.model.Nav_Notify.CHECKTYPE_SHOW = res.Nav_Notify.CHECKTYPE !== undefined ? this.enumsData['PlanCheckType'].find(item => item.code === 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.LEVEL = this.transLevel(this.model.Nav_Notify.LEVEL); this.model.TRAIN_TIME = this.model.Nav_Notify.TRAIN_START_TIME?.substring(0, 16) + "~" + this .model.Nav_Notify .TRAIN_END_TIME?.substring(0, 16);