diff --git a/miniprogram/pageage/project_checking/add/index.js b/miniprogram/pageage/project_checking/add/index.js index a987bbe..adfa66b 100644 --- a/miniprogram/pageage/project_checking/add/index.js +++ b/miniprogram/pageage/project_checking/add/index.js @@ -26,6 +26,11 @@ Page({ superviseUserName:"", checkWorkingPosition:"", intro:"", + dataTypeLvl1:"a", + dataTypeLvl2:"", + dataTypeLvl1List:[], + dataTypeLvl2List:[], + dataTypeLvl2AllList:[], list:[{id:1,text:"合格"},{id:2,text:"不合格"}] }, @@ -45,7 +50,8 @@ Page({ loginName:res.data.loginName, userName:res.data.nickName }) - this.getProjectUserData() + this.getProjectUserData(); + this.getDataTypeLvlList(); } }) }, @@ -96,13 +102,88 @@ Page({ }) }, + //查询验收类型数据 + getDataTypeLvlList(){ + let that = this + wx.request({ + url: app.globalData.reqUrl+'/wechat/projectchecking/queryDictType', + method:"get", + data:{ + type:"project_checking_data_type_lvl1" + }, + header:{ + 'content-type': 'application/x-www-form-urlencoded' + }, + success(res){ + res = res.data + if(res.code == 200){ + let list=[]; + res.data.forEach(it =>{ + list.push({"id":it.dictValue,"text":it.dictLabel}); + }) + that.setData({ + dataTypeLvl1List:list, + }) + } + } + }) + + wx.request({ + url: app.globalData.reqUrl+'/wechat/projectchecking/queryDictType', + method:"get", + data:{ + type:"project_checking_data_type_lvl2" + }, + header:{ + 'content-type': 'application/x-www-form-urlencoded' + }, + success(res){ + res = res.data + if(res.code == 200){ + let tempData = [] + res.data.forEach(it =>{ + if(it.cssClass=="1"){ + tempData.push({"id":it.dictValue,"text":it.dictLabel}); + } + }) + that.setData({ + dataTypeLvl2List:tempData, + dataTypeLvl2AllList:res.data, + dataTypeLvl2:tempData[0].id, + }) + } + } + }) + }, + //切换验收结果 onSelectType(e){ this.setData({ checkingResult:e.detail.id }) - }, - + }, + //验收类型 + onSelectTypeLvl1(e){ + this.setData({ + dataTypeLvl1:e.detail.id + }) + let tempData = [] + this.dataTypeLvl2AllList.forEach(it =>{ + if(it.cssClass==e.detail.id){ + tempData.push({"id":it.dictValue,"text":it.dictLabel}); + } + }) + this.setData({ + dataTypeLvl2List:tempData, + dataTypeLvl2:tempData[0].id, + }) + }, + //类型分类 + onSelectTypeLvl2(e){ + this.setData({ + dataTypeLvl2:e.detail.id + }) + }, //工序部位 onInputCheckWorkingPositionValue(e){ let checkWorkingPosition = e.detail.value @@ -166,7 +247,7 @@ Page({ loadShow:true }) let that = this - let {projectId,deptId,qualityUser,qualityUserName,superviseUser,superviseUserName,checkWorkingPosition,intro,checkTime,checkingResult,imageInfoData,loginName,userName} = that.data; + let {projectId,deptId,qualityUser,qualityUserName,superviseUser,superviseUserName,checkWorkingPosition,intro,checkTime,checkingResult,imageInfoData,loginName,userName,dataTypeLvl1,dataTypeLvl2} = that.data; //数据效验 if(projectId==""||deptId==""||loginName==""){ app.toast("数据异常，请刷新页面重试!") @@ -182,6 +263,20 @@ Page({ }) return; } + if(dataTypeLvl1==""){ + app.toast("请选择验收类型!") + that.setData({ + loadShow:false + }) + return; + } + if(dataTypeLvl2==""){ + app.toast("请选择类型分类!") + that.setData({ + loadShow:false + }) + return; + } if(qualityUser==""||qualityUserName==""){ app.toast("请选择质量专员!") that.setData({ @@ -247,7 +342,9 @@ Page({ //checkResult:checkingResult, approveStatus:"1", createBy:loginName, - imageUrls:fileUrls.toString() + imageUrls:fileUrls.toString(), + dataTypeLvl1, + dataTypeLvl2, } wx.request({ url: app.globalData.reqUrl + '/wechat/projectchecking/add', diff --git a/miniprogram/pageage/project_checking/add/index.wxml b/miniprogram/pageage/project_checking/add/index.wxml index af14547..1821840 100644 --- a/miniprogram/pageage/project_checking/add/index.wxml +++ b/miniprogram/pageage/project_checking/add/index.wxml @@ -22,6 +22,18 @@ + + 验收类型 + + + + + + 类型分类 + + + + 质量专员 diff --git a/miniprogram/pageage/project_checking/edit/index.js b/miniprogram/pageage/project_checking/edit/index.js index 1ecb12f..1df2aaf 100644 --- a/miniprogram/pageage/project_checking/edit/index.js +++ b/miniprogram/pageage/project_checking/edit/index.js @@ -30,6 +30,11 @@ Page({ activeName:"", flowRecordList:[], minUrls:[], + dataTypeLvl1:"", + dataTypeLvl2:"", + dataTypeLvl1List:[], + dataTypeLvl2List:[], + dataTypeLvl2AllList:[], list:[{id:1,text:"合格"},{id:2,text:"不合格"}], request:app.globalData.reqUrl }, @@ -38,21 +43,22 @@ Page({ * 生命周期函数--监听页面加载 */ onLoad(options) { - let {id} = options + let {id,dt1} = options //获取缓存数据 wx.getStorage({ key: 'userinfo', success:res=>{ this.setData({ - id, + id,dt1, projectId:app.globalData.projectId, projectName:app.globalData.projectName, deptId:res.data.deptId, loginName:res.data.loginName, userName:res.data.nickName - }) + }) this.getProjectUserData(); - this.getInfo(); + this.getDataTypeLvlList(); + this.getInfo(); this.getAuditinfo(); } }) @@ -104,12 +110,88 @@ Page({ }) }, + //查询验收类型数据 + getDataTypeLvlList(){ + let that = this + wx.request({ + url: app.globalData.reqUrl+'/wechat/projectchecking/queryDictType', + method:"get", + data:{ + type:"project_checking_data_type_lvl1" + }, + header:{ + 'content-type': 'application/x-www-form-urlencoded' + }, + success(res){ + res = res.data + if(res.code == 200){ + let list=[]; + res.data.forEach(it =>{ + list.push({"id":it.dictValue,"text":it.dictLabel}); + }) + that.setData({ + dataTypeLvl1List:list, + }) + } + } + }) + + wx.request({ + url: app.globalData.reqUrl+'/wechat/projectchecking/queryDictType', + method:"get", + data:{ + type:"project_checking_data_type_lvl2" + }, + header:{ + 'content-type': 'application/x-www-form-urlencoded' + }, + success(res){ + res = res.data + if(res.code == 200){ + let tempData = [] + res.data.forEach(it =>{ + if(it.cssClass==that.data.dt1){ + tempData.push({"id":it.dictValue,"text":it.dictLabel}); + } + }) + that.setData({ + dataTypeLvl2List:tempData, + dataTypeLvl2AllList:res.data + }) + } + } + }) + }, + //切换验收结果 onSelectType(e){ this.setData({ checkingResult:e.detail.id }) - }, + }, + + //验收类型 + onSelectTypeLvl1(e){ + this.setData({ + dataTypeLvl1:e.detail.id + }) + let tempData = [] + this.dataTypeLvl2AllList.forEach(it =>{ + if(it.cssClass==e.detail.id){ + tempData.push({"id":it.dictValue,"text":it.dictLabel}); + } + }) + this.setData({ + dataTypeLvl2List:tempData, + dataTypeLvl2:tempData[0].id, + }) + }, + //类型分类 + onSelectTypeLvl2(e){ + this.setData({ + dataTypeLvl2:e.detail.id + }) + }, //工序部位 onInputCheckWorkingPositionValue(e){ @@ -158,6 +240,8 @@ Page({ } that.setData({ infoData:res.data, + dataTypeLvl1:res.data.dataTypeLvl1, + dataTypeLvl2:res.data.dataTypeLvl2, qualityUser:res.data.qualityUser, qualityUserName:res.data.qualityUserName, superviseUser:res.data.superviseUser, @@ -243,7 +327,7 @@ Page({ loadShow:true }) let that = this - let {id,qualityUser,qualityUserName,superviseUser,superviseUserName,checkWorkingPosition,intro,checkTime,imageInfoData,loginName} = that.data; + let {id,qualityUser,qualityUserName,superviseUser,superviseUserName,checkWorkingPosition,intro,checkTime,imageInfoData,loginName,dataTypeLvl1,dataTypeLvl2} = that.data; //数据效验 if(id==""){ app.toast("数据异常，请刷新页面重试!") @@ -259,6 +343,20 @@ Page({ }) return; } + if(dataTypeLvl1==""){ + app.toast("请选择验收类型!") + that.setData({ + loadShow:false + }) + return; + } + if(dataTypeLvl2==""){ + app.toast("请选择类型分类!") + that.setData({ + loadShow:false + }) + return; + } if(qualityUser==""||qualityUserName==""){ app.toast("请选择质量专员!") that.setData({ @@ -319,7 +417,9 @@ Page({ checkingDate:checkTime, approveStatus:"1", updateBy:loginName, - imageUrls:fileUrls.toString() + imageUrls:fileUrls.toString(), + dataTypeLvl1, + dataTypeLvl2, } wx.request({ url: app.globalData.reqUrl + '/wechat/projectchecking/edit', diff --git a/miniprogram/pageage/project_checking/edit/index.wxml b/miniprogram/pageage/project_checking/edit/index.wxml index 1fb2289..9553155 100644 --- a/miniprogram/pageage/project_checking/edit/index.wxml +++ b/miniprogram/pageage/project_checking/edit/index.wxml @@ -52,6 +52,18 @@ + + 验收类型 + + + + + + 类型分类 + + + + 质量专员 diff --git a/miniprogram/pageage/project_checking/info/index.js b/miniprogram/pageage/project_checking/info/index.js index 9c5b632..ca31ace 100644 --- a/miniprogram/pageage/project_checking/info/index.js +++ b/miniprogram/pageage/project_checking/info/index.js @@ -117,8 +117,9 @@ Page({ //跳转修改页面 onUpdate:function(){ let id = this.data.id; + let dt1= this.data.dataTypeLvl1 wx.redirectTo({ - url: `../edit/index?id=${id}`, + url: `../edit/index?id=${id}&dt1=${dt1}`, }) }, diff --git a/miniprogram/pageage/project_checking/info/index.wxml b/miniprogram/pageage/project_checking/info/index.wxml index dd4f437..23a8551 100644 --- a/miniprogram/pageage/project_checking/info/index.wxml +++ b/miniprogram/pageage/project_checking/info/index.wxml @@ -63,6 +63,18 @@ + + + 验收类型 + {{infoData.dataTypeLvl1Name}} + + + + + 类型分类 + {{infoData.dataTypeLvl2Name}} + + 质量专员 diff --git a/miniprogram/pageage/project_checking/list/index.wxml b/miniprogram/pageage/project_checking/list/index.wxml index ebf8dd9..123c1e9 100644 --- a/miniprogram/pageage/project_checking/list/index.wxml +++ b/miniprogram/pageage/project_checking/list/index.wxml @@ -23,7 +23,9 @@ {{index < 9 ?'0'+(index+1):(index+1)}} - {{item.checkWorkingPosition}} + {{item.dataTypeLvl2Name}} + {{item.dataTypeLvl1Name}} + {{item.dataTypeLvl1Name}} @@ -35,6 +37,7 @@ + 工具部位：{{item.checkWorkingPosition}} 质量专员：{{item.qualityUserName}} 监理专员：{{item.superviseUserName}} 验收时间：{{item.checkingDate}} diff --git a/miniprogram/pageage/project_train/add/index.js b/miniprogram/pageage/project_train/add/index.js index ae58cd9..f185f38 100644 --- a/miniprogram/pageage/project_train/add/index.js +++ b/miniprogram/pageage/project_train/add/index.js @@ -26,6 +26,8 @@ Page({ projectDeptList:[], navs:[], deptNames:"", + dataType:"", + trainDataTypeList:[], fileType:["doc","docx","xls","xlsx","ppt","pptx","txt","pdf","png","jpg","jpeg","mp4"] }, @@ -41,7 +43,7 @@ Page({ let title=""; let minTitle=""; if(trainType=="0"){ - title="专项培训"; + title="教育培训"; minTitle="培训"; }else{ title="应急演练"; @@ -57,7 +59,8 @@ Page({ loginName:res.data.loginName, userName:res.data.nickName }) - this.getProjectDeptList(projectId,res.data.deptId,res.data.minRoleId); + this.getProjectDeptList(projectId,res.data.deptId,res.data.minRoleId); + this.getTrainDataType(); } }) }, @@ -98,6 +101,31 @@ Page({ }) }, + //演训数据类型 + getTrainDataType(){ + let that = this + wx.request({ + url: app.globalData.reqUrl+'/wechat/projectTrain/queryTrainDataType', + method:"get", + data:{}, + success(res){ + res = res.data + if(res.code == 200){ + let tempData=[]; + res.data.forEach((item)=>{ + if(item.remark==that.data.trainType){ + tempData.push({"id":item.dictValue,"text":item.dictLabel}); + } + }) + that.setData({ + trainDataTypeList:tempData, + dataType:tempData[0].id, + }) + } + } + }) + }, + //取消页面 cancelSaveView(){ /*关闭当前页面，跳转到应用内的某个页面。但是不允许跳转到 tabbar 页面*/ @@ -112,7 +140,7 @@ Page({ loadShow:true }) let that = this - let {projectId,projectName,loginName,imageInfoData,trainType,trainTitle,trainParticipants,beginDate,trainContent,trainFileData,minTitle,deptId} = that.data; + let {projectId,projectName,loginName,imageInfoData,trainType,trainTitle,trainParticipants,beginDate,trainContent,trainFileData,minTitle,deptId,dataType} = that.data; //数据效验 if(projectId==""||loginName==""){ app.toast("数据异常，请刷新页面重试!") @@ -135,6 +163,13 @@ Page({ }) return; } + if(dataType==""){ + app.toast("请选择"+minTitle+"类型!") + that.setData({ + loadShow:false + }) + return; + } if(beginDate==""){ app.toast("请选择"+minTitle+"时间!") that.setData({ @@ -200,7 +235,8 @@ Page({ trainFile:obj.data.fileName, deptId, workTrainDeptList:depts, - createBy:loginName + createBy:loginName, + dataType, } let url=""; if(trainType=="0"){ @@ -268,7 +304,12 @@ Page({ }); }) }, - + //演训类型 + onSelectTrainDataType(e){ + this.setData({ + dataType:e.detail.id + }) + }, trainTitleAction: function (options) { this.data.trainTitle = options.detail.value; }, diff --git a/miniprogram/pageage/project_train/add/index.wxml b/miniprogram/pageage/project_train/add/index.wxml index 26a3748..b8b0258 100644 --- a/miniprogram/pageage/project_train/add/index.wxml +++ b/miniprogram/pageage/project_train/add/index.wxml @@ -28,6 +28,12 @@ + + {{minTitle}}类型 + + + + {{minTitle}}时间 diff --git a/miniprogram/pageage/project_train/info/index.js b/miniprogram/pageage/project_train/info/index.js index b2c291f..ff42d73 100644 --- a/miniprogram/pageage/project_train/info/index.js +++ b/miniprogram/pageage/project_train/info/index.js @@ -35,7 +35,7 @@ Page({ let title=""; let minTitle=""; if(trainType==0){ - title="专项培训详情"; + title="教育培训详情"; minTitle="培训"; }else{ title="应急演练详情"; diff --git a/miniprogram/pageage/project_train/info/index.wxml b/miniprogram/pageage/project_train/info/index.wxml index 77fe3ed..d27992a 100644 --- a/miniprogram/pageage/project_train/info/index.wxml +++ b/miniprogram/pageage/project_train/info/index.wxml @@ -34,6 +34,12 @@ {{infoData.trainTitle}} + + + {{minTitle}}类型 + {{infoData.dataTypeName}} + + {{minTitle}}时间 diff --git a/miniprogram/pageage/project_train/list/index.js b/miniprogram/pageage/project_train/list/index.js index e00310c..3209fdf 100644 --- a/miniprogram/pageage/project_train/list/index.js +++ b/miniprogram/pageage/project_train/list/index.js @@ -53,7 +53,7 @@ Page({ let title=""; let minTitle=""; if(trainType==0){ - title="专项培训管理"; + title="教育培训管理"; minTitle="培训"; }else{ title="应急演练管理"; diff --git a/miniprogram/pageage/project_train/list/index.wxml b/miniprogram/pageage/project_train/list/index.wxml index d6a9ed3..7bbc491 100644 --- a/miniprogram/pageage/project_train/list/index.wxml +++ b/miniprogram/pageage/project_train/list/index.wxml @@ -19,7 +19,7 @@ {{index < 9 ?'0'+(index+1):(index+1)}} - {{item.trainTitle}} + {{item.dataTypeName}} @@ -28,8 +28,9 @@ - {{minTitle}}时间：{{item.beginDate}} - 参与人数：{{item.trainParticipants}} 人 + {{minTitle}}标题：{{item.trainTitle}} + {{minTitle}}时间：{{item.beginDate}} + 参与人数：{{item.trainParticipants}} 人 协同单位：{{item.trainDeptNames}} diff --git a/miniprogram/pages/gengduogongneng/gengduogongneng.js b/miniprogram/pages/gengduogongneng/gengduogongneng.js index b339b6b..66602d1 100644 --- a/miniprogram/pages/gengduogongneng/gengduogongneng.js +++ b/miniprogram/pages/gengduogongneng/gengduogongneng.js @@ -79,7 +79,8 @@ Page({ wx.request({ url: app.globalData.reqUrl+'/wechat/selectRoleMenuList', data:{ - username:loginName + username:loginName, + type:"gdgn" }, method:"get", success:function(res){ diff --git a/miniprogram/pages/login/login.wxml b/miniprogram/pages/login/login.wxml index 2b6a77c..c4b6255 100644 --- a/miniprogram/pages/login/login.wxml +++ b/miniprogram/pages/login/login.wxml @@ -5,7 +5,7 @@ diff --git a/miniprogram/pages/project_approve/approveChecking/index.wxml b/miniprogram/pages/project_approve/approveChecking/index.wxml index 6ddb409..431e020 100644 --- a/miniprogram/pages/project_approve/approveChecking/index.wxml +++ b/miniprogram/pages/project_approve/approveChecking/index.wxml @@ -63,6 +63,18 @@ + + + 验收类型 + {{infoData.dataTypeLvl1Name}} + + + + + 类型分类 + {{infoData.dataTypeLvl2Name}} + + 质量专员 diff --git a/miniprogram/pages/safety_manage/index.wxml b/miniprogram/pages/safety_manage/index.wxml index 07f69d3..d8f9ff4 100644 --- a/miniprogram/pages/safety_manage/index.wxml +++ b/miniprogram/pages/safety_manage/index.wxml @@ -67,7 +67,7 @@ - 专项培训（{{trainTotal}}） + 教育培训（{{trainTotal}}） 查看详情