From f56c7e195f6a988276be625f616de98cdba827b7 Mon Sep 17 00:00:00 2001 From: yunkexin <760754045@qq.com> Date: Mon, 12 Jan 2026 15:03:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9F=B9=E8=AE=AD=E9=80=9A=E7=9F=A5=20?= =?UTF-8?q?=E5=9F=B9=E8=AE=AD=E8=AE=B0=E5=BD=95=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/apply/subPages/SE/11safeSurveyEdit.vue | 100 ++--------- pages/apply/subPages/SE/1trainNotifyEdit.vue | 78 +++----- pages/apply/subPages/SE/1trainNotifyShow.vue | 178 +++++++++---------- pages/apply/subPages/SE/2trainRecordEdit.vue | 130 ++++++-------- pages/apply/subPages/SE/2trainRecordShow.vue | 20 ++- 5 files changed, 187 insertions(+), 319 deletions(-) diff --git a/pages/apply/subPages/SE/11safeSurveyEdit.vue b/pages/apply/subPages/SE/11safeSurveyEdit.vue index 04c76c0..83ff183 100644 --- a/pages/apply/subPages/SE/11safeSurveyEdit.vue +++ b/pages/apply/subPages/SE/11safeSurveyEdit.vue @@ -17,13 +17,13 @@ - + - + @@ -38,13 +38,10 @@ - - @@ -85,76 +82,15 @@ return { showDelModalIndex: undefined, showDelModalIndex1: undefined, - subsectionList: ['无隐患', '有隐患', '不涉及'], isMultiple: false, defaultChecked: [], - RiskLevel: ['一般', '重大'], - showPopupUnit: false, - UnitDefaultIndex: [0], - RiskLevelDefaultIndex: [0], - UnitLists: [], - showPopupRiskLevel: false, - TypeLists: [], - showPopupType: false, - TypeDefaultIndex: [0], - PeriodLists: [], - showPopupPeriod: false, - PeriodDefaultIndex: [0], - LevelLists: [], - showPopupStep: false, - showPopupLevel: false, - curTotalStep: 0, - stepLists: [], - LevelDefaultIndex: [0], - showPopupDate: false, - listPropUpload: ['NOTIFY_ID'], - listPropValUpload: [], ORG_ID: uni.getStorageSync('orgId'), - checkListData: {}, - monitorLists: [], - currentOperateMonitor: {}, - showPopupMonitor: false, - curTotalMonitor: 0, model: { - Nav_ApplyUser: { - NAME: '' - }, - Nav_ApplyDepartment: { - NAME: '' - }, - Nav_ProductionUnit: { - NAME: '' - }, - Nav_OperationStep: { - NAME: '' - }, - Nav_FireDepartment: { - NAME: '' - }, - Nav_FireUser: { - NAME: '' - }, - Nav_SafeUser: { - NAME: '' - }, - Nav_Area: { - NAME: '' - }, - Nav_Type: { - NAME: '' - }, - IS_HOLIDAY: false, - IS_HOLIDAYName: '否', - EVALUATE_LEVEL: '', - EVALUATE_LEVELName: '', - JOB_LOCATION: '', - JOB_CONTENT: '', - JOB_DATE: '', - JOB_END_DATE: '', - Nav_Users: [], - Nav_Risks: [], - Nav_Details: [], - Nav_Files: [] + Nav_JoinDepartment: [], + Nav_Points: [], + NAME:'', + END_TIME:'', + }, peopleSelectOption: { showSelector: false, @@ -194,24 +130,8 @@ name: '' }, dateTime: uni.$u.timeFormat(new Date(), 'yyyy-mm-dd hh:MM'), - stepsText: ['发起', '归档'], stepsPage: 0, stepsPageList: 0, - Pu: '', - Check_Type_ID: '', - TypeListres: {}, - TaskID: '', - poparr: '', - currentOperateStep: {}, - chooseCheckContent: '', - chooseCheckArea: '', - currentOperateArea: {}, - areaLists: [], - curTotalArea: 0, - showPopupArea: false, - nowIndex: {}, - nowName: '', - newCheckList: false, stepLoad: true, enumsData: {}, // 存储所有枚举数据（键：枚举名称，值：处理后的枚举列表） enumsText: {} // 存储枚举文本列表（用于下拉选择等场景） @@ -445,9 +365,9 @@ delete this.modelEdit.Nav_ProductionUnit delete this.modelEdit.Nav_SafeUser delete this.modelEdit.Nav_Type - if(this.model.Nav_Risks&&this.model.Nav_Risks.length>0){ - this.model.Nav_Risks.map(item=>{ - delete item.Nav_Risk + if(this.model.Nav_JoinDepartment&&this.model.Nav_JoinDepartment.length>0){ + this.model.Nav_JoinDepartment.map(item=>{ + delete item.Nav_Department }) } if (this.modelEdit.Nav_Users && this.modelEdit.Nav_Users.length > 0) { diff --git a/pages/apply/subPages/SE/1trainNotifyEdit.vue b/pages/apply/subPages/SE/1trainNotifyEdit.vue index 07eb3ea..d11e391 100644 --- a/pages/apply/subPages/SE/1trainNotifyEdit.vue +++ b/pages/apply/subPages/SE/1trainNotifyEdit.vue @@ -12,7 +12,7 @@ - + @@ -35,12 +35,12 @@ - + - - + + @@ -144,7 +144,7 @@ trigger: ['blur', 'change'], message: '请选择培训类型' }, - 'LEVEL': { + 'LEVEL_SHOW': { type: 'number', required: true, trigger: ['blur', 'change'], @@ -170,7 +170,7 @@ message: '请填写培训地点' }, 'HOURS': { - type: 'string', + type: 'number', required: true, trigger: ['blur', 'change'], message: '请填写培训学时' @@ -181,13 +181,13 @@ trigger: ['blur', 'change'], message: '请填写培训老师' }, - 'TRAIN_MODEL': { + 'TRAINTYPE_SHOW': { type: 'string', required: true, trigger: ['blur', 'change'], message: '请选择培训形式' }, - 'Nav_TrainCheckType.NAME': { + 'CHECKTYPE_SHOW': { type: 'string', required: true, trigger: ['blur', 'change'], @@ -239,7 +239,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']); + this.fetchEnums(['TrainType', 'PlanCheckType', 'FMDepartmentType']); this.isAdd = option.isAdd }, @@ -515,16 +515,17 @@ extendInclude(json, "Nav_TrainContentList.Nav_Point") extendInclude(json, "Nav_LaunchDepartment") extendInclude(json, "Nav_TrainType") - extendInclude(json, "Nav_TrainCheckType") + extendInclude(json, "Nav_UserTeacher") extendInclude(json, "Nav_RecordUser") extendInclude(json, "Nav_TrainContentList") - extendInclude(json, "Nav_TrainUserList.Nav_User.Nav_Person") + extendInclude(json, "Nav_TrainUserList.Nav_User") + extendInclude(json, "Nav_TrainUserList") extendInclude(json, "Nav_Files.Nav_ImgFile") // TODO: id 未获取 extendRule(json, 'ID', 1, this.model.ID) getRequest(json, "/SE/TrainNotify/Get").then(res => { this.model = res - this.model.LEVEL_SHOW = this.transLevel(this.model.LEVEL) + 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 : ''; }) @@ -542,43 +543,7 @@ async handleShowSheet(p, index) { let column = [] this.levelIndex = index; - if (p.name === 'LEVEL') { - column = [{ - NAME: '部门', - ID: 0 - }, - { - NAME: '车间', - ID: 1 - }, - { - NAME: '班组', - ID: 2 - }, - { - NAME: '公司', - ID: 3 - } - ] - } else if (p.name === 'TRAIN_MODEL') { - column = [{ - NAME: '讲授法', - ID: "_1_" - }, - { - NAME: '视听法', - ID: "_2_" - }, - { - NAME: '研讨法', - ID: "_3_" - }, - { - NAME: '演示法', - ID: "_4_" - } - ] - } else if (p.name === 'NEED_EVALUATION') { + if (p.name === 'NEED_EVALUATION') { column = [{ NAME: '否', ID: 0 @@ -588,7 +553,7 @@ ID: 1 }, ] - } else if (p.name == 'TrainType' || p.name == 'PlanCheckType') { + } else if (p.name == 'TrainType' || p.name == 'PlanCheckType' || p.name == 'FMDepartmentType') { column = this.enumsData[p.name] } if (column.length) { @@ -608,17 +573,20 @@ name, formIndex } = this.comPickerInfo - if(name == 'TrainType'){ + if (name == 'TrainType') { this.model.TRAINTYPE_SHOW = e.value[0].name this.model.TRAINTYPE = this.enumsData['TrainType'][e.indexs[0]].code - }else if(name == 'PlanCheckType'){ + } else if (name == 'PlanCheckType') { this.model.CHECKTYPE_SHOW = e.value[0].name this.model.CHECKTYPE = this.enumsData['PlanCheckType'][e.indexs[0]].code - }else{ + } 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 + this.model[name + '_SHOW'] = e.value[0].NAME } - + this.comPickerInfo.showSheet = false diff --git a/pages/apply/subPages/SE/1trainNotifyShow.vue b/pages/apply/subPages/SE/1trainNotifyShow.vue index 163d651..fd4a6f1 100644 --- a/pages/apply/subPages/SE/1trainNotifyShow.vue +++ b/pages/apply/subPages/SE/1trainNotifyShow.vue @@ -1,91 +1,76 @@ @@ -125,7 +110,7 @@ this.model.ID = option.ID; this.TaskID = option.taskID; this.tableKey = option.tableKey ? option.tableKey : '0' - this.fetchEnums(['TrainType', 'PlanCheckType']); + this.fetchEnums(['TrainType', 'PlanCheckType','FMDepartmentType']); }, methods: { async fetchEnums(enumNames) { @@ -146,7 +131,7 @@ }; }); }); - + // 等待所有枚举请求完成 const results = await Promise.all(enumPromises); // 存储枚举结果到data中（键为枚举名称，值为处理后的数据） @@ -174,7 +159,8 @@ extendInclude(json, 'Nav_LaunchDepartment'); extendInclude(json, 'Nav_LaunchUser'); extendInclude(json, 'Nav_TrainType'); - extendInclude(json, 'Nav_TrainCheckType'); + extendInclude(json, 'Nav_RecordUser'); + // extendInclude(json, 'Nav_TrainCheckType'); extendInclude(json, 'Nav_TrainContentList'); extendInclude(json, 'Nav_TrainContentList.Nav_Point'); extendInclude(json, 'Nav_TrainUserList'); @@ -210,6 +196,7 @@ 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 : ''; 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.isLoadOK = true; @@ -251,8 +238,7 @@ onChargeUserAgree(type) { if (type == 2) { if (this.LEAVE_REASON == "" || this.LEAVE_REASON == null) { - uni.$showMsgFunc('请填写请假理由!', () => { - }, 'error', 1000); + uni.$showMsgFunc('请填写请假理由!', () => {}, 'error', 1000); return } } @@ -291,16 +277,19 @@ background: #edf1fd; z-index: -1; } + .todo-page { /* padding-bottom: 10px; */ overflow: hidden; } + .card { margin: 20px 16px 180px 16px; padding: 20px 30px 80px 30px; background-color: #ffffff; border-radius: 10px; } + .upload-title { font-size: 14px; color: #8e8b9c; @@ -319,10 +308,11 @@ background: #fff; box-shadow: 0 -1px 2px 0 rgba(0, 0, 0, .05); } + .btn-wrap>>>.u-textarea__field { font-size: 14px; } - + .btn-wrap>>>.u-cell__title-text { font-size: 14px; } @@ -336,24 +326,26 @@ .buttons .first-btn { margin-right: 20px; } + .demo-ruleForm>>>.u-form-item__body__left__content__label { font-size: 14px; color: #8e8b9c; /* justify-content: flex-start; */ } - + .demo-ruleForm>>>.u-form-item__body__left__content__ { left: -11px; top: 0px } - + .demo-ruleForm>>>.u-textarea__field { font-size: 14px; } + .demo-ruleForm>>>.u-textarea { font-size: 14px; } - + .demo-ruleForm>>>.u-cell__title-text { font-size: 14px; } diff --git a/pages/apply/subPages/SE/2trainRecordEdit.vue b/pages/apply/subPages/SE/2trainRecordEdit.vue index 866758e..da2b51c 100644 --- a/pages/apply/subPages/SE/2trainRecordEdit.vue +++ b/pages/apply/subPages/SE/2trainRecordEdit.vue @@ -3,96 +3,72 @@ - + - + - + - + - + - - + + - - + + - + - + - + - + - + 附件： - + - + - - - - - + + + + + - - - + + + 提交 @@ -171,7 +147,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']); + this.fetchEnums(['TrainType', 'PlanCheckType','FMDepartmentType']); }, methods: { async fetchEnums(enumNames) { @@ -192,7 +168,7 @@ }; }); }); - + // 等待所有枚举请求完成 const results = await Promise.all(enumPromises); // 存储枚举结果到data中（键为枚举名称，值为处理后的数据） @@ -264,25 +240,28 @@ if (this.listPropValUpload.length == 0) { this.listPropValUpload.push(this.model.ID) } - extendInclude(json, "Nav_Users.Nav_User") - 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_TrainContentList.Nav_Point") - extendInclude(json, "Nav_Files.Nav_ImgFile") + extendInclude(json, 'Nav_Notify'); + extendInclude(json, 'Nav_Notify.Nav_TrainContentList.Nav_Point'); + 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_Users.Nav_User'); + extendInclude(json, 'Nav_Files.Nav_ImgFile'); + extendInclude(json, 'Nav_Users'); extendRule(json, 'ID', 1, this.model.ID) getRequest(json, "/SE/TrainRecord/Get").then(res => { this.model = res - if (this.model.Nav_Notify.LEVEL == 0) { - this.model.Nav_Notify.LEVEL_SHOW = "部门"; - } else if (this.model.Nav_Notify.LEVEL == 1) { - this.model.Nav_Notify.LEVEL_SHOW = "车间"; - } else if (this.model.Nav_Notify.LEVEL == 2) { - this.model.Nav_Notify.LEVEL_SHOW = "班组"; - } else if (this.model.Nav_Notify.LEVEL == 3) { - this.model.Nav_Notify.LEVEL_SHOW = "公司"; - } + // if (this.model.Nav_Notify.LEVEL == 0) { + // this.model.Nav_Notify.LEVEL_SHOW = "部门"; + // } else if (this.model.Nav_Notify.LEVEL == 1) { + // this.model.Nav_Notify.LEVEL_SHOW = "车间"; + // } else if (this.model.Nav_Notify.LEVEL == 2) { + // this.model.Nav_Notify.LEVEL_SHOW = "班组"; + // } else if (this.model.Nav_Notify.LEVEL == 3) { + // this.model.Nav_Notify.LEVEL_SHOW = "公司"; + // } + this.model.Nav_Notify.LEVEL_SHOW= res.Nav_Notify.LEVEL !== undefined ? this.enumsData['FMDepartmentType'].find(item => item.code === res.Nav_Notify.LEVEL).name : ''; 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.Nav_Notify.TRAIN_MODEL_SHOW = ""; @@ -353,6 +332,7 @@ /* padding: 16px 16px 70px; */ overflow: hidden; } + .card { margin: 20px 16px 40px 16px; /* border: 1px solid #EBEEF5; */ @@ -361,6 +341,7 @@ background-color: #ffffff; border-radius: 10px; } + .background { position: fixed; top: 0; @@ -370,39 +351,44 @@ background: #edf1fd; z-index: -1; } + .upload-title { font-size: 14px; color: #8e8b9c; line-height: 22px; padding: 8px 0px; } + .demo-ruleForm>>>.u-form-item__body__left__content__label { font-size: 14px; color: #8e8b9c; /* justify-content: flex-start; */ } - + .demo-ruleForm>>>.u-form-item__body__left__content__ { left: -11px; top: 0px } - + .demo-ruleForm>>>.u-textarea__field { font-size: 14px; } - + .demo-ruleForm>>>.u-cell__title-text { font-size: 14px; } + .sub-form { margin: 20px 16px 140px 16px; padding: 20px 10px 10px 10px; background-color: #ffffff; border-radius: 10px; } + .sub-form>>>.u-form-item__body__left__content { margin-right: 10px; } + .bottom-button { position: fixed; bottom: 0; diff --git a/pages/apply/subPages/SE/2trainRecordShow.vue b/pages/apply/subPages/SE/2trainRecordShow.vue index 38f2619..acdc814 100644 --- a/pages/apply/subPages/SE/2trainRecordShow.vue +++ b/pages/apply/subPages/SE/2trainRecordShow.vue @@ -11,7 +11,7 @@ - + @@ -54,11 +54,11 @@ 查看试卷 - + - 签到 + 签到 审核 @@ -101,8 +101,8 @@ this.model.ID = option.ID; this.TaskID = option.taskID; this.tableKey = option.tableKey ? option.tableKey : '0' - this.fetchEnums(['TrainType', 'PlanCheckType']); - + this.fetchEnums(['TrainType', 'PlanCheckType', 'FMDepartmentType']); + }, methods: { async fetchEnums(enumNames) { @@ -123,7 +123,7 @@ }; }); }); - + // 等待所有枚举请求完成 const results = await Promise.all(enumPromises); // 存储枚举结果到data中（键为枚举名称，值为处理后的数据） @@ -148,14 +148,15 @@ loadData() { const json = initFilter(this.ORG_ID, "", "", 1) extendRule(json, 'ID', 1, this.model.ID); + extendInclude(json, 'Nav_Notify'); + extendInclude(json, 'Nav_Notify.Nav_TrainContentList.Nav_Point'); 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_TrainContentList'); - extendInclude(json, 'Nav_Notify.Nav_TrainContentList.Nav_Point'); extendInclude(json, 'Nav_Users.Nav_User'); extendInclude(json, 'Nav_Files.Nav_ImgFile'); + extendInclude(json, 'Nav_Users.Nav_User'); + extendInclude(json, 'Nav_Papers'); getRequest(json, "/SE/TrainRecord/Get").then(res => { this.model = res //数据组装 @@ -202,6 +203,7 @@ } } + this.model.Nav_Notify.LEVEL_SHOW= res.Nav_Notify.LEVEL !== undefined ? this.enumsData['FMDepartmentType'].find(item => item.code === res.Nav_Notify.LEVEL).name : ''; 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);