diff --git a/miniprogram/app.js b/miniprogram/app.js index 33494b1..6a8490c 100644 --- a/miniprogram/app.js +++ b/miniprogram/app.js @@ -32,6 +32,7 @@ App({ //reqUrl:'https://sxyanzhu.com/jhwxapp', reqUrl:'https://cf.makalu.cc', //reqUrl:'http://127.0.0.1:8091', + uploadUrl:"http://62.234.3.186/jhapi", //御景路数字化集成管控平台接口访问域名 szhUrl:'https://szh.makalu.cc', @@ -81,27 +82,7 @@ App({ onLoad(){ }, - /** - * 获取用户openid - */ - getOPenId:function () { - wx.login({ - success :res=>{ - console.log(res) - wx.request({ - url: this.globalData.reqUrl+'/weixin/userLogin/getOpenId', - data:{ - "code": res.code, - "appId":"wxc44b5d588f599758", - }, - success:(res)=>{ - wx.setStorageSync("token","eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6ImRjYzEwMTI5LWM0Y2ItNDAyMS1iNzEzLTFlOTMzODdmOWEwYyJ9.zpE5EZ7Zz0yj8Z7lJTUUnASBy7wXqVG2eZlxOu7rTHz0oeDyJY8FO5uSkWMwkQvK_Uk3tc9qt5jbtc46BCN1vQ"); - wx.setStorageSync('openId', res.data.openid) - } - }) - } - }) -}, + //页面弹窗 toast: function (msg) { wx.showToast({ diff --git a/miniprogram/app.json b/miniprogram/app.json index a4a0279..f2a2428 100644 --- a/miniprogram/app.json +++ b/miniprogram/app.json @@ -80,7 +80,17 @@ "technical-management/index", "project_checking/add/index", "project_checking/list/index", - "project_checking/info/index" + "project_checking/info/index", + "project_problemmodify/security/list/index", + "project_problemmodify/security/info/index", + "project_problemmodify/security/modify/index", + "project_problemmodify/security/check/index", + "project_problemmodify/security/add/index", + "project_problemmodify/quality/list/index", + "project_problemmodify/quality/info/index", + "project_problemmodify/quality/modify/index", + "project_problemmodify/quality/check/index", + "project_problemmodify/quality/add/index" ], "independent": false } diff --git a/miniprogram/app.wxss b/miniprogram/app.wxss index 263656c..bd10bd4 100644 --- a/miniprogram/app.wxss +++ b/miniprogram/app.wxss @@ -1485,6 +1485,36 @@ swiper-item video{ .pass{ padding-right: 25rpx; } +.problem_submit_to_delete{ + border-bottom: 1px solid red; + background-color: red; +} +.code_label{ + font-size: 0.6rem; + width: 120rpx; + margin: auto; + text-align: center; + padding: 0.1rem; + border-radius: 0.5rem 0 0.5rem 0; + margin-bottom: 15rpx; + margin-left: -3rpx; +} +.code_label_green{ + background: green; + color: #FFFFFF; +} +.code_label_red{ + background: red; + color: #FFFFFF; +} +.code_label_blueviolet{ + background: blueviolet; + color: #FFFFFF; +} +.code_label_yellow{ + background: #ff9800; + color: #FFFFFF; +} diff --git a/miniprogram/images/delete.png b/miniprogram/images/delete.png new file mode 100644 index 0000000..32ee029 Binary files /dev/null and b/miniprogram/images/delete.png differ diff --git a/miniprogram/images/loding2.gif b/miniprogram/images/loding2.gif new file mode 100644 index 0000000..d9bb3c5 Binary files /dev/null and b/miniprogram/images/loding2.gif differ diff --git a/miniprogram/images/nodata.png b/miniprogram/images/nodata.png new file mode 100644 index 0000000..17d832c Binary files /dev/null and b/miniprogram/images/nodata.png differ diff --git a/miniprogram/newComponents/select-group-person/index.js b/miniprogram/newComponents/select-group-person/index.js index d33a2a4..099f3a2 100644 --- a/miniprogram/newComponents/select-group-person/index.js +++ b/miniprogram/newComponents/select-group-person/index.js @@ -7,8 +7,11 @@ Component({ title:{ type:String }, + index:{ + type:String + }, choose:{ - type:Array + type:String }, multiple:{ type:Boolean, @@ -20,11 +23,7 @@ Component({ } }, observers: { - choose: function (val) { - this.setData({ - gridData : val - }) - }, + }, lifetimes: { created: function(){ @@ -47,8 +46,7 @@ Component({ data: { show:false, gridData:[], - selectedIndex:[], - titleValue:"" + selectedIndex:[] }, /** @@ -91,29 +89,31 @@ Component({ let _gridData=[{userName:userdata.nickName+" ["+userdata.jobTypeName+"]",phoneNumber:userdata.phonenumber}]; this.triggerEvent('selected',_gridData) this.setData({ - titleValue:_gridData[0].userName, + choose:_gridData[0].userName, rectifierData:data, show:false }) }else{ - if(of>-1){ - this.data.selectedIndex.splice(of, 1); - userdata.state = false; - }else{ - this.data.selectedIndex.push(index); - userdata.state = true; - } this.setData({ rectifierData : data }) } }, onConfirm(){ - var data = this.data.rectifierData - let gridData = data.filter(x => x.state == true); - this.triggerEvent('selected',gridData) + var data = this.data.rectifierData; + let _gridData=[]; + let chooses=""; + if(this.data.selectedIndex.length>1){ + this.data.selectedIndex.forEach((item) =>{ + let _indexs = item.split('_'); + let name = data[_indexs[0]].userinfoList[_indexs[1]].nickName+" ["+data[_indexs[0]].userinfoList[_indexs[1]].jobTypeName+"]"; + _gridData.push({userName:name,phoneNumber:data[_indexs[0]].userinfoList[_indexs[1]].phonenumber}); + chooses+=","+name; + }); + } + this.triggerEvent('selected',_gridData) this.setData({ - gridData:gridData, + choose:chooses.substring(1), show:false }) } diff --git a/miniprogram/newComponents/select-group-person/index.wxml b/miniprogram/newComponents/select-group-person/index.wxml index 9a1766c..ae6e349 100644 --- a/miniprogram/newComponents/select-group-person/index.wxml +++ b/miniprogram/newComponents/select-group-person/index.wxml @@ -2,13 +2,13 @@ - + - + {{title}} diff --git a/miniprogram/newComponents/select-group-person/index.wxss b/miniprogram/newComponents/select-group-person/index.wxss index 4d25943..3c4d8af 100644 --- a/miniprogram/newComponents/select-group-person/index.wxss +++ b/miniprogram/newComponents/select-group-person/index.wxss @@ -1,4 +1,7 @@ /* newComponents/select-person/index.wxss */ +page{ + height:100% +} .rectifier_add_to{ width: 100rpx; height: 100rpx; @@ -12,9 +15,11 @@ border-radius: 5rpx; } .rectifier_max{ - width: 600rpx; + width: 100%; background: #232a44; border-radius: 15rpx; + position: relative; + height: 100%; } .rectifier_title{ position: relative; @@ -36,13 +41,13 @@ padding:20rpx 40rpx; } .rectifier_list_height{ - height: 580rpx; + height: 990rpx; overflow: auto; } .rectifier_list_for{ display: flex; align-items: center; - padding: 8rpx 0; + padding: 18rpx 15rpx; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; @@ -86,12 +91,11 @@ } .rectifier_list-group_for{ height: 65rpx; - background-color: #58628a; + background-color: #879ff97d; line-height: 65rpx; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; - margin-top: 20rpx; } .inspect_input_fill_in { height: 90rpx; diff --git a/miniprogram/pageage/AIWarningList/index.wxml b/miniprogram/pageage/AIWarningList/index.wxml index 7eee007..a3303be 100644 --- a/miniprogram/pageage/AIWarningList/index.wxml +++ b/miniprogram/pageage/AIWarningList/index.wxml @@ -48,7 +48,7 @@ - + 数据加载中！请稍后... diff --git a/miniprogram/pageage/AIvideoAnalysis/index.wxml b/miniprogram/pageage/AIvideoAnalysis/index.wxml index 4fae5d5..035a03a 100644 --- a/miniprogram/pageage/AIvideoAnalysis/index.wxml +++ b/miniprogram/pageage/AIvideoAnalysis/index.wxml @@ -116,7 +116,7 @@ - + 数据加载中！请稍后... diff --git a/miniprogram/pageage/Material-Management/index.wxml b/miniprogram/pageage/Material-Management/index.wxml index 5a63563..e1d60f5 100644 --- a/miniprogram/pageage/Material-Management/index.wxml +++ b/miniprogram/pageage/Material-Management/index.wxml @@ -317,7 +317,7 @@ - + 数据加载中！请稍后... diff --git a/miniprogram/pageage/biangeng/index.wxml b/miniprogram/pageage/biangeng/index.wxml index abddd4d..c18b593 100644 --- a/miniprogram/pageage/biangeng/index.wxml +++ b/miniprogram/pageage/biangeng/index.wxml @@ -123,7 +123,7 @@ - + 数据加载中！请稍后... diff --git a/miniprogram/pageage/dangerousProject/index.wxml b/miniprogram/pageage/dangerousProject/index.wxml index 11f28e9..eaa51eb 100644 --- a/miniprogram/pageage/dangerousProject/index.wxml +++ b/miniprogram/pageage/dangerousProject/index.wxml @@ -107,7 +107,7 @@ - + 数据加载中！请稍后... diff --git a/miniprogram/pageage/educations-add/index.wxml b/miniprogram/pageage/educations-add/index.wxml index a5f016e..ce26ef6 100644 --- a/miniprogram/pageage/educations-add/index.wxml +++ b/miniprogram/pageage/educations-add/index.wxml @@ -73,7 +73,7 @@ - + 数据加载中！请稍后... diff --git a/miniprogram/pageage/educations-details/index.wxml b/miniprogram/pageage/educations-details/index.wxml index 97c938c..f30a55d 100644 --- a/miniprogram/pageage/educations-details/index.wxml +++ b/miniprogram/pageage/educations-details/index.wxml @@ -98,7 +98,7 @@ - + 数据加载中！请稍后... diff --git a/miniprogram/pageage/educations-list/index.wxml b/miniprogram/pageage/educations-list/index.wxml index b401ce4..df43717 100644 --- a/miniprogram/pageage/educations-list/index.wxml +++ b/miniprogram/pageage/educations-list/index.wxml @@ -159,7 +159,7 @@ - + 数据加载中！请稍后... diff --git a/miniprogram/pageage/lw-baobiaochaxun/lw-baobiaochaxun.wxml b/miniprogram/pageage/lw-baobiaochaxun/lw-baobiaochaxun.wxml index f174317..0e04b62 100644 --- a/miniprogram/pageage/lw-baobiaochaxun/lw-baobiaochaxun.wxml +++ b/miniprogram/pageage/lw-baobiaochaxun/lw-baobiaochaxun.wxml @@ -78,7 +78,7 @@ - + 数据加载中！请稍后... \ No newline at end of file diff --git a/miniprogram/pageage/lw-gerenxinxi/lw-gerenxinxi.wxml b/miniprogram/pageage/lw-gerenxinxi/lw-gerenxinxi.wxml index d60d7bd..75f7021 100644 --- a/miniprogram/pageage/lw-gerenxinxi/lw-gerenxinxi.wxml +++ b/miniprogram/pageage/lw-gerenxinxi/lw-gerenxinxi.wxml @@ -82,7 +82,7 @@ - + 数据加载中！请稍后... \ No newline at end of file diff --git a/miniprogram/pageage/lw-index/lw-index.wxml b/miniprogram/pageage/lw-index/lw-index.wxml index c20a0cc..406fa2d 100644 --- a/miniprogram/pageage/lw-index/lw-index.wxml +++ b/miniprogram/pageage/lw-index/lw-index.wxml @@ -72,7 +72,7 @@ - + 数据加载中！请稍后... diff --git a/miniprogram/pageage/lw-jibenxinxi/lw-jibenxinxi.wxml b/miniprogram/pageage/lw-jibenxinxi/lw-jibenxinxi.wxml index a970469..3f12502 100644 --- a/miniprogram/pageage/lw-jibenxinxi/lw-jibenxinxi.wxml +++ b/miniprogram/pageage/lw-jibenxinxi/lw-jibenxinxi.wxml @@ -133,7 +133,7 @@ - + 数据加载中！请稍后... --> diff --git a/miniprogram/pageage/project_checking/add/index.js b/miniprogram/pageage/project_checking/add/index.js index 0e6dfbe..c7bc98f 100644 --- a/miniprogram/pageage/project_checking/add/index.js +++ b/miniprogram/pageage/project_checking/add/index.js @@ -1,4 +1,5 @@ // pageage/safetyManagement/addSafetyInspect/index.js +import api from '../../../utils/api' const app = getApp() Page({ @@ -53,7 +54,7 @@ Page({ getProjectUserData(){ let that = this wx.request({ - url: app.globalData.reqUrl+'/weixin/projectuserinfo/list', + url: app.globalData.reqUrl+'/wechat/projectuserinfo/list', method:"get", data:{ projectId:that.data.projectId @@ -154,6 +155,13 @@ Page({ }) return; } + if(imageInfoData.length==0){ + app.toast("请上传举牌验收现场图片!") + that.setData({ + loadShow:false + }) + return; + } if(qualityUser==""||qualityUserName==""){ app.toast("请选择质量专员!") that.setData({ @@ -199,7 +207,7 @@ Page({ let fileUrls = []; imageInfoData.forEach(async (item)=>{ - let uploadUrl = app.globalData.reqUrl+'/weixin/common/upload' + let uploadUrl = app.globalData.uploadUrl+'/common/upload' let name = "file" //这里复杂的图片上传，改为同步上传，因为小程序只能上传一张图片 let obj = await that.syncUploadImage(uploadUrl,item,name); @@ -221,10 +229,11 @@ Page({ imageUrls:fileUrls.toString() } wx.request({ - url: app.globalData.reqUrl + '/weixin/projectchecking/add', + url: app.globalData.reqUrl + '/wechat/projectchecking/add', method:"POST", data:params, header: { + "Username": loginName, "Content-Type": "application/json" }, success(res){ @@ -238,7 +247,7 @@ Page({ wx.navigateTo({ url: '../list/index', }) - },2000) + },200) } } }) diff --git a/miniprogram/pageage/project_checking/add/index.json b/miniprogram/pageage/project_checking/add/index.json index fed9af1..cf633d0 100644 --- a/miniprogram/pageage/project_checking/add/index.json +++ b/miniprogram/pageage/project_checking/add/index.json @@ -1,6 +1,6 @@ { "usingComponents": { - "van-overlay": "@vant/weapp/overlay/index" + "van-overlay": "@vant/weapp/overlay/index" }, "navigationBarTitleText": "新增举牌验收" } \ No newline at end of file diff --git a/miniprogram/pageage/project_checking/add/index.wxml b/miniprogram/pageage/project_checking/add/index.wxml index e522cdd..7c11e8b 100644 --- a/miniprogram/pageage/project_checking/add/index.wxml +++ b/miniprogram/pageage/project_checking/add/index.wxml @@ -57,7 +57,7 @@ - + 数据加载中！请稍后... diff --git a/miniprogram/pageage/project_checking/info/index.js b/miniprogram/pageage/project_checking/info/index.js index e8c329a..341e5c6 100644 --- a/miniprogram/pageage/project_checking/info/index.js +++ b/miniprogram/pageage/project_checking/info/index.js @@ -9,7 +9,11 @@ Page({ id:"", infoData:{}, imgs:[], - loadShow:false + loadShow:false, + imgShow:false, + preImgUrl:"", + loginName:"", + showDel:false, }, /** @@ -22,7 +26,8 @@ Page({ key: 'userinfo', success:res=>{ this.setData({ - id + id, + loginName:res.data.loginName }) this.getInfo(); } @@ -38,7 +43,7 @@ Page({ let {id} = this.data let that = this wx.request({ - url: app.globalData.reqUrl+'/weixin/projectchecking/info', + url: app.globalData.reqUrl+'/wechat/projectchecking/info', method:"get", data:{ id:id @@ -46,16 +51,73 @@ Page({ success(res){ res = res.data if(res.code == 200){ + let urls = []; + res.data.imageUrls.split(',').forEach(element => { + urls.push(element+'.min.jpg'); + }); that.setData({ infoData:res.data, - imgs:res.data.imageUrls.split(','), + imgs:urls, loadShow:false }) + //判断当前能否删除 + if(res.data.createBy==that.data.loginName){ + that.setData({ + showDel:true + }) + } } } }) }, + //打开放大的图片 + enlargeImage(e){ + this.setData({ + preImgUrl:e.currentTarget.dataset.url, + imgShow:true + }) + }, + //关闭放大的图片 + closeImages(){ + this.setData({ + imgShow:false + }) + }, + + onDelete(){ + //弹出确认 + let that = this + wx.showModal({ + title: '提示', + content: '是否确定撤回删除此条数据？', + success: function (sm) { + if (sm.confirm) { + // 用户点击了确定 可以调用了 + that.deleteData(); + } else if (sm.cancel) { + console.log('用户点击取消'); + } + } + }) + }, + deleteData(){ + let {id} = this.data + wx.request({ + url: app.globalData.reqUrl+'/wechat/projectProblemmodify/removeSafety', + data:{ + id:id + }, + method:"get", + success(res){ + app.toast("删除成功！") + wx.navigateTo({ + url: `../list/index`, + }) + } + }) + }, + /** * 生命周期函数--监听页面初次渲染完成 */ diff --git a/miniprogram/pageage/project_checking/info/index.json b/miniprogram/pageage/project_checking/info/index.json index 0e049f9..b15d3e1 100644 --- a/miniprogram/pageage/project_checking/info/index.json +++ b/miniprogram/pageage/project_checking/info/index.json @@ -1,4 +1,6 @@ { - "usingComponents": {}, + "usingComponents": { + "van-popup": "@vant/weapp/popup/index" + }, "navigationBarTitleText": "举牌验收详情" } \ No newline at end of file diff --git a/miniprogram/pageage/project_checking/info/index.wxml b/miniprogram/pageage/project_checking/info/index.wxml index 9652d99..a1fa824 100644 --- a/miniprogram/pageage/project_checking/info/index.wxml +++ b/miniprogram/pageage/project_checking/info/index.wxml @@ -72,56 +72,7 @@ - - - - - - {{index+1}}、{{item.existing_problems}} - - 待整改 - 已整改 - - - - - - - 存在问题 - - 存在问题 - {{item.existing_problems}} - - - 整改前 - - - - - - 整改责任人 - {{item.rectify_person}} - - - - - 问题整改 - - 整改情况 - {{item.rectify_situation}} - - - 整改照片 - - - - - - 整改时间 - {{item.rectify_time}} - - - - - + + 撤回删除 + diff --git a/miniprogram/pageage/project_checking/list/index.js b/miniprogram/pageage/project_checking/list/index.js index 73999b9..b5ad5f8 100644 --- a/miniprogram/pageage/project_checking/list/index.js +++ b/miniprogram/pageage/project_checking/list/index.js @@ -24,13 +24,13 @@ Page({ this.setData({ show: true }); }, - skipCheckAdd(){ + skipAdd(){ wx.navigateTo({ url: `../add/index?projectId=${this.data.initData.id}&projectName=`+this.data.initData.text, }) }, - getProjectCheckingInfo(e){ + getInfo(e){ let {id} = e.currentTarget.dataset.set wx.navigateTo({ url: `../info/index?id=${id}`, @@ -64,7 +64,7 @@ Page({ getProjectCheckingData(projectId,loginName,deptId) { var that = this; wx.request({ - url: app.globalData.reqUrl + '/weixin/projectchecking/list', + url: app.globalData.reqUrl + '/wechat/projectchecking/list', data: { "projectId": projectId, "nowUserName":loginName, diff --git a/miniprogram/pageage/project_checking/list/index.wxml b/miniprogram/pageage/project_checking/list/index.wxml index cbe534a..bcf4436 100644 --- a/miniprogram/pageage/project_checking/list/index.wxml +++ b/miniprogram/pageage/project_checking/list/index.wxml @@ -5,7 +5,7 @@ - + @@ -16,12 +16,13 @@ + 合格 + 不合格 - 总包单位：{{item.deptName}} - 验收结果：验收合格 - 验收结果：验收不合格 + 质量专员：{{item.qualityUserName}} + 监理专员：{{item.superviseUserName}} 验收时间：{{item.checkingDate}} @@ -30,9 +31,15 @@ + + + + 暂无数据 + + - + 新增 diff --git a/miniprogram/pageage/project_problemmodify/quality/add/index.js b/miniprogram/pageage/project_problemmodify/quality/add/index.js new file mode 100644 index 0000000..2eee6e9 --- /dev/null +++ b/miniprogram/pageage/project_problemmodify/quality/add/index.js @@ -0,0 +1,414 @@ +// pageage/safetyManagement/addSafetyInspect/index.js +const app = getApp() +Page({ + + /** + * 页面的初始数据 + */ + data: { + maxDate:new Date(2088,1,1).getTime(), + minDate:new Date().getTime()+(3600*48*1000), + projectId:"", + projectName:"", + loginName:"", + userName:"", + rectifierData:[], + rectifierData2:[], + rectifierData3:[], + imageInfoData:[], + //验收时间 + nickedTime:'', + loadShow:false, + lordSent:"", + lordSentUser:"", + copySend:"", + copySendUser:"", + recheckSend:"", + recheckSendUser:"", + workParts:"", + changeInfo:"", + dangerType:"", + dangerTypeList:[], + selectValue:"", + selectIndex:"" + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + let {projectId,projectName} = options + //获取缓存数据 + wx.getStorage({ + key: 'userinfo', + success:res=>{ + this.setData({ + projectId, + projectName, + loginName:res.data.loginName, + userName:res.data.nickName, + recheckSend:res.data.nickName, + recheckSendUser:res.data.loginName + }) + this.getAllProjectUserData(); + this.getDangerTypeList(); + } + }) + }, + + //查询项目人员数据 + getAllProjectUserData(){ + let that = this + wx.request({ + url: app.globalData.reqUrl+'/wechat/projectuserinfo/queryAllProjectUserByParams', + method:"get", + data:{ + projectId:that.data.projectId, + loginName:that.data.loginName + }, + header:{ + 'content-type': 'application/x-www-form-urlencoded' + }, + success(res){ + res = res.data + if(res.code == 200){ + that.setData({ + rectifierData:res.data, + rectifierData2:res.data, + rectifierData3:res.data, + }) + } + } + }) + }, + + getDangerTypeList(){ + let that = this + wx.request({ + url: app.globalData.reqUrl+'/wechat/projectProblemmodify/queryDangerType', + method:"get", + data:{ + type:'ssp_zlyhlx' + }, + header:{ + 'content-type': 'application/x-www-form-urlencoded' + }, + success(res){ + res = res.data + if(res.code == 200){ + let list=[{"id":"",text:""}]; + res.data.forEach(it =>{ + list.push({"id":it.dictValue,"text":it.dictLabel}); + }) + that.setData({ + dangerTypeList:list + }) + } + } + }) + }, + + //隐患描述 + onInputWorkParts(e){ + let workParts = e.detail.value + this.setData({ + workParts + }) + }, + + //整改要求 + onInputChangeInfoValue(e){ + let changeInfo = e.detail.value + this.setData({ + changeInfo + }) + }, + + //验收时间 + onInputTime(e){ + let nickedTime = e.detail + this.setData({ + nickedTime + }) + }, + + // list 上传图片 + onImagesArr(e){ + var data = this.data.imageInfoData + data = e.detail + this.setData({ + imageInfoData:data + }) + }, + + //添加整改人 + onAddLordSent(e){ + if(e.detail.length>0){ + this.setData({ + lordSent:e.detail[0].userName, + lordSentUser:e.detail[0].phoneNumber + }) + } + }, + + //添加抄送人 + onAddCopySend(e){ + if(e.detail.length>0){ + let phoneNumbers=""; + let userNames=""; + e.detail.forEach(it =>{ + phoneNumbers+=","+it.phoneNumber; + userNames+=","+it.userName; + }); + this.setData({ + copySend:phoneNumbers.substring(1), + copySendUser:userNames.substring(1) + }) + }else{ + this.setData({ + copySend:"", + copySendUser:"" + }) + } + }, + + //添加复检人 + onAddRecheckSend(e){ + if(e.detail.length>0){ + this.setData({ + recheckSend:e.detail[0].phoneNumber, + recheckSendUser:e.detail[0].userName + }) + } + }, + + //取消页面 + cancelSaveView(){ + wx.navigateBack() + }, + + //保存 + onProblemSubmitSave(){ + this.setData({ + loadShow:true + }) + let that = this + let {projectId,projectName,dangerType,lordSent,lordSentUser,copySend,copySendUser,workParts,changeInfo,nickedTime,recheckSend,recheckSendUser,imageInfoData,loginName,userName} = that.data; + //数据效验 + if(projectId==""||loginName==""){ + app.toast("数据异常，请刷新页面重试!") + that.setData({ + loadShow:false + }) + return; + } + if(imageInfoData.length==0){ + app.toast("请上传隐患现场图片!") + that.setData({ + loadShow:false + }) + return; + } + if(dangerType==""){ + app.toast("请选择隐患类型!") + that.setData({ + loadShow:false + }) + return; + } + if(workParts==""){ + app.toast("请填写隐患描述!") + that.setData({ + loadShow:false + }) + return; + } + if(changeInfo==""){ + app.toast("请填写隐患整改要求!") + that.setData({ + loadShow:false + }) + return; + } + if(nickedTime==""){ + app.toast("请选择整改截至时间!") + that.setData({ + loadShow:false + }) + return; + } + if(lordSent==""||lordSentUser==""){ + app.toast("请选择整改人!") + that.setData({ + loadShow:false + }) + return; + } + if(recheckSend==""||recheckSendUser==""){ + app.toast("请选择复检人!") + that.setData({ + loadShow:false + }) + return; + } + if(copySend==""||copySendUser==""){ + app.toast("请选择抄送人!") + that.setData({ + loadShow:false + }) + return; + } + let pos = copySend.split(","); + pos.forEach(it =>{ + if(it==lordSent){ + app.toast("抄送人中不能包含整改人!") + that.setData({ + loadShow:false + }) + return; + } + }); + let fileUrls = []; + imageInfoData.forEach(async (item)=>{ + let uploadUrl = app.globalData.uploadUrl+'/common/upload' + let name = "file" + //这里复杂的图片上传，改为同步上传，因为小程序只能上传一张图片 + let obj = await that.syncUploadImage(uploadUrl,item,name); + fileUrls.push(obj.data.fileName); + //验证图片上传完毕 + if(fileUrls.length == imageInfoData.length){ + let params = { + projectId, + infoType:"1", + problemArea:projectName, + workParts, + changeInfo, + lordSent, + lordSentUser, + copySend, + copySendUser, + checkState:0, + nickedTime:nickedTime+" 23:59", + smarkUrl:fileUrls.toString(), + createUser:loginName, + dangerType, + recheckSend, + recheckSendUser + } + wx.request({ + url: app.globalData.reqUrl + '/wechat/projectProblemmodify/addQuality', + method:"POST", + data:params, + header: { + "Username": loginName, + "Content-Type": "application/json" + }, + success(res){ + that.setData({ + loadShow:false + }) + res =res.data + if(res.code == 200){ + app.toast("添加成功!") + setTimeout(()=>{ + wx.navigateTo({ + url: '../list/index', + }) + },200) + } + } + }) + } + }) + }, + + /** + * 这里考虑上传图片异步问题，封装为同步 + */ + syncUploadImage(url,uploadFile,name) { + return new Promise((resolve, reject) => { + wx.uploadFile({ + url, // 上传的服务器接口地址 + filePath: uploadFile, + header: { + "Content-Type": "application/x-www-form-urlencoded;charset=UTF-8" + }, + name, //上传的所需字段，后端提供 + formData: { user: 'test' }, + success: (res) => { + // 上传完成操作 + const data = JSON.parse(res.data) + resolve({ + data: data + }) + }, + fail: (err) => { + //上传失败：修改pedding为reject + console.log("访问接口失败", err); + wx.showToast({ + title: "网络出错,上传失败", + icon: 'none', + duration: 1000 + }); + reject(err) + } + }); + }) + }, + + //选择培训类型 + onSelectDangerType(e){ + this.setData({ + dangerType:e.detail.id + }) + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + } +}) \ No newline at end of file diff --git a/miniprogram/pageage/project_problemmodify/quality/add/index.json b/miniprogram/pageage/project_problemmodify/quality/add/index.json new file mode 100644 index 0000000..15f4f73 --- /dev/null +++ b/miniprogram/pageage/project_problemmodify/quality/add/index.json @@ -0,0 +1,6 @@ +{ + "usingComponents": { + "van-overlay": "@vant/weapp/overlay/index" + }, + "navigationBarTitleText": "新增质量隐患" +} \ No newline at end of file diff --git a/miniprogram/pageage/project_problemmodify/quality/add/index.wxml b/miniprogram/pageage/project_problemmodify/quality/add/index.wxml new file mode 100644 index 0000000..120b9df --- /dev/null +++ b/miniprogram/pageage/project_problemmodify/quality/add/index.wxml @@ -0,0 +1,118 @@ + + + + {{projectName}} + + + 隐患图片 + + + + + + 隐患类型 + + + + + + 隐患描述 + +