diff --git a/pages.json b/pages.json index 630b1d3..7f2ad7c 100644 --- a/pages.json +++ b/pages.json @@ -1392,6 +1392,27 @@ "navigationBarTitleText": "安全意识调查", "onReachBottomDistance": 100 } + }, + { + "path": "12trainSurveyEdit", + "style": { + "navigationBarTitleText": "培训需求调查", + "onReachBottomDistance": 100 + } + }, + { + "path": "12trainSurveyShow", + "style": { + "navigationBarTitleText": "培训需求调查", + "onReachBottomDistance": 100 + } + }, + { + "path": "12trainSurveyList", + "style": { + "navigationBarTitleText": "培训需求调查", + "onReachBottomDistance": 100 + } } ] diff --git a/pages/apply/subPages/SE/12trainSurveyEdit.vue b/pages/apply/subPages/SE/12trainSurveyEdit.vue new file mode 100644 index 0000000..89cd4c4 --- /dev/null +++ b/pages/apply/subPages/SE/12trainSurveyEdit.vue @@ -0,0 +1,402 @@ + + + + + \ No newline at end of file diff --git a/pages/apply/subPages/SE/12trainSurveyList.vue b/pages/apply/subPages/SE/12trainSurveyList.vue new file mode 100644 index 0000000..f27eee0 --- /dev/null +++ b/pages/apply/subPages/SE/12trainSurveyList.vue @@ -0,0 +1,344 @@ + + + + + \ No newline at end of file diff --git a/pages/apply/subPages/SE/12trainSurveyShow.vue b/pages/apply/subPages/SE/12trainSurveyShow.vue new file mode 100644 index 0000000..9d24568 --- /dev/null +++ b/pages/apply/subPages/SE/12trainSurveyShow.vue @@ -0,0 +1,361 @@ + + + + + \ No newline at end of file diff --git a/pages/apply/subPages/SE/1trainNotifyEdit.vue b/pages/apply/subPages/SE/1trainNotifyEdit.vue index 0d126e5..3532b83 100644 --- a/pages/apply/subPages/SE/1trainNotifyEdit.vue +++ b/pages/apply/subPages/SE/1trainNotifyEdit.vue @@ -12,6 +12,10 @@ + + + + @@ -58,7 +62,7 @@ - + @@ -123,9 +127,11 @@ Nav_TrainUserList: [], ORG_ID: "", Nav_Files: [], - NEED_EVALUATION_SHOW: "否", - NEED_EVALUATION: "0", - CREATE_NOTIFY_RECORD: true + NEED_EVALUATION_SHOW: "", + NEED_EVALUATION: "", + CREATE_NOTIFY_RECORD: true, + IN_OUT_SHOW:'', + IN_OUT:'', }, options: [{ text: '删除', @@ -241,7 +247,7 @@ this.TaskID = option.taskID ? option.taskID : ''; this.model.ID = option.ID ? option.ID : ''; this.tableKey = option.tableKey ? option.tableKey : '0'; - this.fetchEnums(['TrainType', 'PlanCheckType', 'FMDepartmentType']); + this.fetchEnums(['TrainType', 'PlanCheckType', 'FMDepartmentType','TrainInOut','SETrainNeedSuvey']); this.isAdd = option.isAdd }, @@ -283,6 +289,8 @@ this.isAdd = 1; this.model.ID = guid(); this.model.CREATE_NOTIFY_RECORD = true; + this.model.IN_OUT_SHOW = this.enumsData['TrainInOut'][0].name + this.model.IN_OUT = this.enumsData['TrainInOut'][0].code } } catch (error) { console.error('枚举请求失败:', error); @@ -534,6 +542,8 @@ this.model.LEVEL_SHOW = res.LEVEL !== undefined ? this.enumsData['FMDepartmentType'].find(item => item.code === res.LEVEL)?.name : ''; this.model.TRAINTYPE_SHOW = res.TRAINTYPE !== undefined ? this.enumsData['TrainType'].find(item => item.code === res.TRAINTYPE)?.name : ''; this.model.CHECKTYPE_SHOW = res.CHECKTYPE !== undefined ? this.enumsData['PlanCheckType'].find(item => item.code === res.CHECKTYPE)?.name : ''; + this.model.IN_OUT_SHOW = res.IN_OUT !== undefined ? this.enumsData['TrainInOut'].find(item => item.code === res.IN_OUT)?.name : ''; + this.model.NEED_EVALUATION_SHOW = res.NEED_EVALUATION !== undefined ? this.enumsData['SETrainNeedSuvey'].find(item => item.code === res.NEED_EVALUATION)?.name : ''; }) }, closePicker() { @@ -549,19 +559,7 @@ async handleShowSheet(p, index) { let column = [] this.levelIndex = index; - if (p.name === 'NEED_EVALUATION') { - column = [{ - NAME: '否', - ID: 0 - }, - { - NAME: '是', - ID: 1 - }, - ] - } else if (p.name == 'TrainType' || p.name == 'PlanCheckType' || p.name == 'FMDepartmentType') { - column = this.enumsData[p.name] - } + column = this.enumsData[p.name] if (column.length) { this.comPickerInfo = { showSheet: true, @@ -588,10 +586,13 @@ } else if (name == 'FMDepartmentType') { this.model.LEVEL_SHOW = e.value[0].name this.model.LEVEL = this.enumsData['FMDepartmentType'][e.indexs[0]].code - } else { - this.model[name] = e.value[0].ID - this.model[name + '_SHOW'] = e.value[0].NAME - } + } else if (name == 'SETrainNeedSuvey') { + this.model.NEED_EVALUATION_SHOW = e.value[0].name + this.model.NEED_EVALUATION = this.enumsData['SETrainNeedSuvey'][e.indexs[0]].code + } else if (name == 'TrainInOut') { + this.model.IN_OUT_SHOW = e.value[0].name + this.model.IN_OUT = this.enumsData['TrainInOut'][e.indexs[0]].code + } diff --git a/pages/apply/subPages/SE/1trainNotifyShow.vue b/pages/apply/subPages/SE/1trainNotifyShow.vue index 567b05b..f477698 100644 --- a/pages/apply/subPages/SE/1trainNotifyShow.vue +++ b/pages/apply/subPages/SE/1trainNotifyShow.vue @@ -110,7 +110,7 @@ this.model.ID = option.ID; this.TaskID = option.taskID; this.tableKey = option.tableKey ? option.tableKey : '0' - this.fetchEnums(['TrainType', 'PlanCheckType','FMDepartmentType']); + this.fetchEnums(['TrainType', 'PlanCheckType','FMDepartmentType', 'TrainInOut','SETrainNeedSuvey']); }, methods: { async fetchEnums(enumNames) { @@ -200,6 +200,8 @@ this.model.LEVEL_SHOW = res.LEVEL !== undefined ? this.enumsData['FMDepartmentType'].find(item => item.code === res.LEVEL)?.name : ''; this.model.TRAINTYPE_SHOW = res.TRAINTYPE !== undefined ? this.enumsData['TrainType'].find(item => item.code === res.TRAINTYPE)?.name : ''; this.model.CHECKTYPE_SHOW = res.CHECKTYPE !== undefined ? this.enumsData['PlanCheckType'].find(item => item.code === res.CHECKTYPE)?.name : ''; + this.model.IN_OUT_SHOW = res.IN_OUT !== undefined ? this.enumsData['TrainInOut'].find(item => item.code === res.IN_OUT)?.name : ''; + this.model.NEED_EVALUATION_SHOW = res.NEED_EVALUATION !== undefined ? this.enumsData['SETrainNeedSuvey'].find(item => item.code === res.NEED_EVALUATION)?.name : ''; this.isLoadOK = true; }) }, diff --git a/utils/common.js b/utils/common.js index c12705d..438c4fb 100644 --- a/utils/common.js +++ b/utils/common.js @@ -1796,6 +1796,9 @@ export function SourceFormcode(json) { case 'SE006': //培训答题页 linkToUrl = '/pages/apply/subPages/SE/11safeSurveyEdit' break; + case 'SE008': //培训答题页 + linkToUrl = '/pages/apply/subPages/SE/12trainSurveyEdit' + break; case 'FO015': //一般作业活动记录编辑 linkToUrl = '../apply/subPages/FO2/jobEventEdit1' break;