diff --git a/pages/apply/subPages/SE/5newThreeLevelEducateShow.vue b/pages/apply/subPages/SE/5newThreeLevelEducateShow.vue
index b2b7873..dc838e3 100644
--- a/pages/apply/subPages/SE/5newThreeLevelEducateShow.vue
+++ b/pages/apply/subPages/SE/5newThreeLevelEducateShow.vue
@@ -1,86 +1,91 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- 签到
+ 签到
@@ -89,48 +94,75 @@
import {
initFilter,
extendRule,
- extendInclude
+ extendInclude,
+ transformData
} from '../../../../utils/common'
import {
getRequest,
} from '../../../../services/apply/FOServices/FOServices'
+ import {
+ GetEnumAnyOrder
+ } from '../../../../services/common';
import '../../../../utils/showMsg.js'
import config from '../../../../config/common'
export default {
data() {
return {
ID: "",
+ listPropUpload: [],
+ listPropValUpload: [],
model: {},
TaskID: "",
tableKey: '0',
isLoadOK: false,
paddingBottom: '170',
orgId: uni.getStorageSync('orgId'),
+ enumsData: {}, // 存储所有枚举数据（键：枚举名称，值：处理后的枚举列表）
+ enumsText: {} // 存储枚举文本列表（用于下拉选择等场景）
}
},
onLoad(option) {
this.ID = option.ID;
this.TaskID = option.taskID;
this.tableKey = option.tableKey ? option.tableKey : '0'
- this.loadData()
+ this.fetchEnums(['SEThreeLevelSafeTrainType', 'TrainType', 'SEExaminationResultsEnum']);
},
methods: {
+ fetchEnums(enumNames) {
+ var dataParm = {
+ 'name': enumNames.join('|')
+ }
+ GetEnumAnyOrder(dataParm).then(res => {
+ let newd = transformData(res, enumNames)
+ this.enumsData = newd[0];
+ // 生成文本列表（如需要）
+ this.enumsText = newd[1]
+ this.loadData();
+ })
+ },
loadData() {
const json = initFilter(this.orgId, "", "CODE", 1)
extendRule(json, 'ID', 1, this.ID);
- extendInclude(json, 'Nav_User');
- extendInclude(json, 'Nav_Department');
- extendInclude(json, 'Nav_Post');
extendInclude(json, 'Nav_NewUser.Nav_Department');
extendInclude(json, 'Nav_NewUser.Nav_User');
extendInclude(json, 'Nav_NewUser.Nav_Content');
+ extendInclude(json, 'Nav_NewUser.Nav_Files.Nav_ImgFile');
+ extendInclude(json, 'Nav_NewUser.Nav_Teachers.Nav_User');
+ extendInclude(json, 'Nav_User');
+ extendInclude(json, 'Nav_Department');
+ extendInclude(json, 'Nav_Post');
extendInclude(json, 'Nav_Files.Nav_ImgFile');
getRequest(json, "/SE/NewUserDetail/Get").then(res => {
let currUserId = uni.getStorageSync('appInfo')?.User?.ID;
- res.Nav_NewUser.TRAIN_MODEL = this.returnModel(res.Nav_NewUser.TRAIN_MODEL);
- res.EXAMINATION_RESULTS = res.EXAMINATION_RESULTS == 0 ? "不合格" : "合格";
this.model = res
this.model.IN_TIME = this.model.IN_TIME.substring(0, 10);
+ if (this.model.Nav_NewUser) {
+ this.model.Nav_NewUser.TRAIN_STATUS_NAME = res.Nav_NewUser.TRAIN_STATUS !== undefined ? this.enumsData['SEThreeLevelSafeTrainType'].find(item => item.code === res.Nav_NewUser.TRAIN_STATUS)
+ .name : '';
+ this.model.Nav_NewUser.TRAINTYPE_NAME = res.Nav_NewUser.TRAINTYPE !== undefined ? this.enumsData['TrainType'].find(item => item.code === res.Nav_NewUser.TRAINTYPE).name : '';
+
+ }
+ this.model.EXAMINATION_RESULTS_NAME = res.EXAMINATION_RESULTS !== undefined ? this.enumsData['SEExaminationResultsEnum'].find(item => item.code === res.EXAMINATION_RESULTS).name : '';
this.isLoadOK = true;
})
},
@@ -171,10 +203,12 @@