diff --git a/miniprogram/pageage/project_problemmodify/quality/add/index.js b/miniprogram/pageage/project_problemmodify/quality/add/index.js index 6072a2b..d8b0135 100644 --- a/miniprogram/pageage/project_problemmodify/quality/add/index.js +++ b/miniprogram/pageage/project_problemmodify/quality/add/index.js @@ -78,12 +78,32 @@ Page({ if(res.code == 200){ that.setData({ rectifierData:res.data, - rectifierData2:res.data, rectifierData3:res.data, }) } } }) + + wx.request({ + url: app.globalData.reqUrl+'/wechat/projectuserinfo/queryAllProjectUserByParams', + method:"get", + data:{ + projectId:that.data.projectId, + loginName:that.data.loginName, + selectMy:'Y' + }, + header:{ + 'content-type': 'application/x-www-form-urlencoded' + }, + success(res){ + res = res.data + if(res.code == 200){ + that.setData({ + rectifierData2:res.data, + }) + } + } + }) }, getHisInfo(){ @@ -228,7 +248,7 @@ Page({ loadShow:true }) let that = this - let {projectId,projectName,dangerType,lordSent,lordSentUser,copySend,copySendUser,workParts,changeInfo,nickedTime,recheckSend,recheckSendUser,imageInfoData,loginName,userName} = that.data; + let {projectId,projectName,dangerType,lordSent,lordSentUser,copySend,copySendUser,workParts,changeInfo,nickedTime,recheckSend,recheckSendUser,imageInfoData,loginName,problemType,userName} = that.data; //数据效验 if(projectId==""||loginName==""){ app.toast("数据异常,请刷新页面重试!") @@ -244,6 +264,13 @@ Page({ }) return; } + if(problemType==""){ + app.toast("请选择检查类型!") + that.setData({ + loadShow:false + }) + return; + } if(dangerType==""){ app.toast("请选择隐患类型!") that.setData({ @@ -316,6 +343,7 @@ Page({ projectId, infoType:"1", problemArea:projectName, + problemType, workParts, changeInfo, lordSent, diff --git a/miniprogram/pageage/project_problemmodify/security/add/index.js b/miniprogram/pageage/project_problemmodify/security/add/index.js index 6b90d44..9933165 100644 --- a/miniprogram/pageage/project_problemmodify/security/add/index.js +++ b/miniprogram/pageage/project_problemmodify/security/add/index.js @@ -12,6 +12,7 @@ Page({ projectName:"", loginName:"", userName:"", + deptId:"", rectifierData:[], rectifierData2:[], rectifierData3:[], @@ -48,6 +49,7 @@ Page({ this.setData({ projectId, projectName, + deptId:res.data.deptId, loginName:res.data.loginName, userName:res.data.nickName, recheckSend:res.data.nickName, @@ -78,9 +80,29 @@ Page({ if(res.code == 200){ that.setData({ rectifierData:res.data, - rectifierData2:res.data, rectifierData3:res.data, - }) + }); + } + } + }) + + wx.request({ + url: app.globalData.reqUrl+'/wechat/projectuserinfo/queryAllProjectUserByParams', + method:"get", + data:{ + projectId:that.data.projectId, + loginName:that.data.loginName, + selectMy:'Y' + }, + header:{ + 'content-type': 'application/x-www-form-urlencoded' + }, + success(res){ + res = res.data + if(res.code == 200){ + that.setData({ + rectifierData2:res.data, + }); } } }) @@ -228,7 +250,7 @@ Page({ loadShow:true }) let that = this - let {projectId,projectName,dangerType,lordSent,lordSentUser,copySend,copySendUser,workParts,changeInfo,nickedTime,recheckSend,recheckSendUser,imageInfoData,loginName,userName} = that.data; + let {projectId,projectName,dangerType,lordSent,lordSentUser,copySend,copySendUser,workParts,changeInfo,nickedTime,recheckSend,recheckSendUser,imageInfoData,loginName,problemType,userName} = that.data; //数据效验 if(projectId==""||loginName==""){ app.toast("数据异常,请刷新页面重试!") @@ -244,6 +266,13 @@ Page({ }) return; } + if(problemType==""){ + app.toast("请选择检查类型!") + that.setData({ + loadShow:false + }) + return; + } if(dangerType==""){ app.toast("请选择隐患类型!") that.setData({ @@ -323,6 +352,7 @@ Page({ projectId, infoType:"0", problemArea:projectName, + problemType, workParts, changeInfo, lordSent,