From b95cf857269f4031a0fefa3d871b2e292ac886a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?= <7507756+jiang_yuqi@user.noreply.gitee.com> Date: Mon, 28 Aug 2023 22:23:01 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=BD=A2=E8=B1=A1=E8=BF=9B?= =?UTF-8?q?=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- miniprogram/app.json | 5 +- .../pageage/project_checking/add/index.wxml | 2 +- .../pageage/project_checking/info/index.js | 13 +- .../pageage/project_checking/info/index.wxml | 2 +- .../pageage/project_checking/list/index.js | 4 +- .../pageage/project_checking/list/index.wxml | 2 +- .../quality/add/index.wxml | 2 +- .../quality/check/index.wxml | 2 +- .../quality/info/index.js | 3 + .../quality/info/index.wxml | 2 +- .../quality/list/index.js | 8 +- .../quality/list/index.wxml | 2 +- .../quality/modify/index.wxml | 2 +- .../security/add/index.wxml | 2 +- .../security/check/index.wxml | 2 +- .../security/info/index.js | 3 + .../security/info/index.wxml | 2 +- .../security/list/index.js | 8 +- .../security/list/index.wxml | 2 +- .../security/modify/index.wxml | 2 +- .../pageage/project_schedule/add/index.js | 364 ++++++++++++++++++ .../pageage/project_schedule/add/index.json | 7 + .../pageage/project_schedule/add/index.wxml | 166 ++++++++ .../pageage/project_schedule/add/index.wxss | 13 + .../pageage/project_schedule/info/index.js | 179 +++++++++ .../pageage/project_schedule/info/index.json | 7 + .../pageage/project_schedule/info/index.wxml | 116 ++++++ .../pageage/project_schedule/info/index.wxss | 23 ++ .../pageage/project_schedule/list/index.js | 145 +++++++ .../pageage/project_schedule/list/index.json | 8 + .../pageage/project_schedule/list/index.wxml | 60 +++ .../pageage/project_schedule/list/index.wxss | 1 + 32 files changed, 1131 insertions(+), 28 deletions(-) create mode 100644 miniprogram/pageage/project_schedule/add/index.js create mode 100644 miniprogram/pageage/project_schedule/add/index.json create mode 100644 miniprogram/pageage/project_schedule/add/index.wxml create mode 100644 miniprogram/pageage/project_schedule/add/index.wxss create mode 100644 miniprogram/pageage/project_schedule/info/index.js create mode 100644 miniprogram/pageage/project_schedule/info/index.json create mode 100644 miniprogram/pageage/project_schedule/info/index.wxml create mode 100644 miniprogram/pageage/project_schedule/info/index.wxss create mode 100644 miniprogram/pageage/project_schedule/list/index.js create mode 100644 miniprogram/pageage/project_schedule/list/index.json create mode 100644 miniprogram/pageage/project_schedule/list/index.wxml create mode 100644 miniprogram/pageage/project_schedule/list/index.wxss diff --git a/miniprogram/app.json b/miniprogram/app.json index 4302484..31a8538 100644 --- a/miniprogram/app.json +++ b/miniprogram/app.json @@ -84,7 +84,10 @@ "project_problemmodify/quality/info/index", "project_problemmodify/quality/modify/index", "project_problemmodify/quality/check/index", - "project_problemmodify/quality/add/index" + "project_problemmodify/quality/add/index", + "project_schedule/list/index", + "project_schedule/add/index", + "project_schedule/info/index" ], "independent": false } diff --git a/miniprogram/pageage/project_checking/add/index.wxml b/miniprogram/pageage/project_checking/add/index.wxml index 8378fc0..df7569f 100644 --- a/miniprogram/pageage/project_checking/add/index.wxml +++ b/miniprogram/pageage/project_checking/add/index.wxml @@ -2,7 +2,7 @@ - + diff --git a/miniprogram/pageage/project_checking/info/index.js b/miniprogram/pageage/project_checking/info/index.js index b228107..1ad1e47 100644 --- a/miniprogram/pageage/project_checking/info/index.js +++ b/miniprogram/pageage/project_checking/info/index.js @@ -53,10 +53,12 @@ Page({ if(res.code == 200){ let urls = []; let minUrls = []; - res.data.imageUrls.split(',').forEach(element => { - urls.push(that.data.request+element); - minUrls.push(that.data.request+element+'.min.jpg'); - }); + if(res.data.imageUrls){ + res.data.imageUrls.split(',').forEach(element => { + urls.push(that.data.request+element); + minUrls.push(that.data.request+element+'.min.jpg'); + }); + } that.setData({ infoData:res.data, imageList:urls, @@ -94,6 +96,9 @@ Page({ let {id} = this.data wx.request({ url: app.globalData.reqUrl+'/wechat/projectchecking/remove', + header: { + "Username": this.data.loginName, + }, data:{ id:id }, diff --git a/miniprogram/pageage/project_checking/info/index.wxml b/miniprogram/pageage/project_checking/info/index.wxml index 8a2e72a..dc7148b 100644 --- a/miniprogram/pageage/project_checking/info/index.wxml +++ b/miniprogram/pageage/project_checking/info/index.wxml @@ -2,7 +2,7 @@ - + diff --git a/miniprogram/pageage/project_checking/list/index.js b/miniprogram/pageage/project_checking/list/index.js index 653d4f1..011b3dc 100644 --- a/miniprogram/pageage/project_checking/list/index.js +++ b/miniprogram/pageage/project_checking/list/index.js @@ -26,14 +26,14 @@ Page({ }, skipAdd(){ - wx.navigateTo({ + wx.redirectTo({ url: `../add/index?projectId=${this.data.initData.id}&projectName=`+this.data.initData.text, }) }, getInfo(e){ let {id} = e.currentTarget.dataset.set - wx.navigateTo({ + wx.redirectTo({ url: `../info/index?id=${id}`, }) }, diff --git a/miniprogram/pageage/project_checking/list/index.wxml b/miniprogram/pageage/project_checking/list/index.wxml index cde445a..c11b7b4 100644 --- a/miniprogram/pageage/project_checking/list/index.wxml +++ b/miniprogram/pageage/project_checking/list/index.wxml @@ -1,7 +1,7 @@ - + diff --git a/miniprogram/pageage/project_problemmodify/quality/add/index.wxml b/miniprogram/pageage/project_problemmodify/quality/add/index.wxml index fb72c25..8c7a8bd 100644 --- a/miniprogram/pageage/project_problemmodify/quality/add/index.wxml +++ b/miniprogram/pageage/project_problemmodify/quality/add/index.wxml @@ -2,7 +2,7 @@ - + diff --git a/miniprogram/pageage/project_problemmodify/quality/check/index.wxml b/miniprogram/pageage/project_problemmodify/quality/check/index.wxml index 336c4c2..e88e18e 100644 --- a/miniprogram/pageage/project_problemmodify/quality/check/index.wxml +++ b/miniprogram/pageage/project_problemmodify/quality/check/index.wxml @@ -2,7 +2,7 @@ - + diff --git a/miniprogram/pageage/project_problemmodify/quality/info/index.js b/miniprogram/pageage/project_problemmodify/quality/info/index.js index 63782c0..4351865 100644 --- a/miniprogram/pageage/project_problemmodify/quality/info/index.js +++ b/miniprogram/pageage/project_problemmodify/quality/info/index.js @@ -130,6 +130,9 @@ Page({ let {id} = this.data wx.request({ url: app.globalData.reqUrl+'/wechat/projectProblemmodify/removeQuality', + header: { + "Username": this.data.loginName, + }, data:{ id:id }, diff --git a/miniprogram/pageage/project_problemmodify/quality/info/index.wxml b/miniprogram/pageage/project_problemmodify/quality/info/index.wxml index 55fd25a..b91eaf3 100644 --- a/miniprogram/pageage/project_problemmodify/quality/info/index.wxml +++ b/miniprogram/pageage/project_problemmodify/quality/info/index.wxml @@ -2,7 +2,7 @@ - + diff --git a/miniprogram/pageage/project_problemmodify/quality/list/index.js b/miniprogram/pageage/project_problemmodify/quality/list/index.js index 584b011..8e53ca8 100644 --- a/miniprogram/pageage/project_problemmodify/quality/list/index.js +++ b/miniprogram/pageage/project_problemmodify/quality/list/index.js @@ -30,7 +30,7 @@ Page({ }, skipAdd(){ - wx.navigateTo({ + wx.redirectTo({ url: `../add/index?projectId=${this.data.initData.id}&projectName=`+this.data.initData.text, }) }, @@ -39,16 +39,16 @@ Page({ let {id,checkState,lordSentUser,recheckSendUser} = e.currentTarget.dataset.set if((checkState==0 || checkState==3) && lordSentUser==this.data.loginName){ //整改页面（状态时待整改&&整改人是当前登录人） - wx.navigateTo({ + wx.redirectTo({ url: `../modify/index?id=${id}`, }) }else if(checkState==1 && recheckSendUser==this.data.loginName){ //复检页面 (状态时待复检&&复检人是当前登录人) - wx.navigateTo({ + wx.redirectTo({ url: `../check/index?id=${id}`, }) }else{ - wx.navigateTo({ + wx.redirectTo({ url: `../info/index?id=${id}`, }) } diff --git a/miniprogram/pageage/project_problemmodify/quality/list/index.wxml b/miniprogram/pageage/project_problemmodify/quality/list/index.wxml index 94d7f13..1227817 100644 --- a/miniprogram/pageage/project_problemmodify/quality/list/index.wxml +++ b/miniprogram/pageage/project_problemmodify/quality/list/index.wxml @@ -1,7 +1,7 @@ - + diff --git a/miniprogram/pageage/project_problemmodify/quality/modify/index.wxml b/miniprogram/pageage/project_problemmodify/quality/modify/index.wxml index 8743bc2..81cc6b0 100644 --- a/miniprogram/pageage/project_problemmodify/quality/modify/index.wxml +++ b/miniprogram/pageage/project_problemmodify/quality/modify/index.wxml @@ -2,7 +2,7 @@ - + diff --git a/miniprogram/pageage/project_problemmodify/security/add/index.wxml b/miniprogram/pageage/project_problemmodify/security/add/index.wxml index b50b020..c945926 100644 --- a/miniprogram/pageage/project_problemmodify/security/add/index.wxml +++ b/miniprogram/pageage/project_problemmodify/security/add/index.wxml @@ -2,7 +2,7 @@ - + diff --git a/miniprogram/pageage/project_problemmodify/security/check/index.wxml b/miniprogram/pageage/project_problemmodify/security/check/index.wxml index 6b8ef9b..a13e3f3 100644 --- a/miniprogram/pageage/project_problemmodify/security/check/index.wxml +++ b/miniprogram/pageage/project_problemmodify/security/check/index.wxml @@ -2,7 +2,7 @@ - + diff --git a/miniprogram/pageage/project_problemmodify/security/info/index.js b/miniprogram/pageage/project_problemmodify/security/info/index.js index ace3677..5dc08dc 100644 --- a/miniprogram/pageage/project_problemmodify/security/info/index.js +++ b/miniprogram/pageage/project_problemmodify/security/info/index.js @@ -128,6 +128,9 @@ Page({ let {id} = this.data wx.request({ url: app.globalData.reqUrl+'/wechat/projectProblemmodify/removeSafety', + header: { + "Username": this.data.loginName, + }, data:{ id:id }, diff --git a/miniprogram/pageage/project_problemmodify/security/info/index.wxml b/miniprogram/pageage/project_problemmodify/security/info/index.wxml index 2e3d5c6..93c66e0 100644 --- a/miniprogram/pageage/project_problemmodify/security/info/index.wxml +++ b/miniprogram/pageage/project_problemmodify/security/info/index.wxml @@ -2,7 +2,7 @@ - + diff --git a/miniprogram/pageage/project_problemmodify/security/list/index.js b/miniprogram/pageage/project_problemmodify/security/list/index.js index 6d14801..ea15890 100644 --- a/miniprogram/pageage/project_problemmodify/security/list/index.js +++ b/miniprogram/pageage/project_problemmodify/security/list/index.js @@ -30,7 +30,7 @@ Page({ }, skipAdd(){ - wx.navigateTo({ + wx.redirectTo({ url: `../add/index?projectId=${this.data.initData.id}&projectName=`+this.data.initData.text, }) }, @@ -39,16 +39,16 @@ Page({ let {id,checkState,lordSentUser,recheckSendUser} = e.currentTarget.dataset.set if((checkState==0 || checkState==3) && lordSentUser==this.data.loginName){ //整改页面（状态时待整改&&整改人是当前登录人） - wx.navigateTo({ + wx.redirectTo({ url: `../modify/index?id=${id}`, }) }else if(checkState==1 && recheckSendUser==this.data.loginName){ //复检页面 (状态时待复检&&复检人是当前登录人) - wx.navigateTo({ + wx.redirectTo({ url: `../check/index?id=${id}`, }) }else{ - wx.navigateTo({ + wx.redirectTo({ url: `../info/index?id=${id}`, }) } diff --git a/miniprogram/pageage/project_problemmodify/security/list/index.wxml b/miniprogram/pageage/project_problemmodify/security/list/index.wxml index 62073bb..192248c 100644 --- a/miniprogram/pageage/project_problemmodify/security/list/index.wxml +++ b/miniprogram/pageage/project_problemmodify/security/list/index.wxml @@ -1,7 +1,7 @@ - + diff --git a/miniprogram/pageage/project_problemmodify/security/modify/index.wxml b/miniprogram/pageage/project_problemmodify/security/modify/index.wxml index 4379996..1d4542b 100644 --- a/miniprogram/pageage/project_problemmodify/security/modify/index.wxml +++ b/miniprogram/pageage/project_problemmodify/security/modify/index.wxml @@ -2,7 +2,7 @@ - + diff --git a/miniprogram/pageage/project_schedule/add/index.js b/miniprogram/pageage/project_schedule/add/index.js new file mode 100644 index 0000000..3fdb15e --- /dev/null +++ b/miniprogram/pageage/project_schedule/add/index.js @@ -0,0 +1,364 @@ +// pageage/safetyManagement/addSafetyInspect/index.js +const app = getApp() +Page({ + + /** + * 页面的初始数据 + */ + data: { + maxDate:new Date(2088,1,1).getTime(), + currentDate:new Date().getTime(), + deptId:"", + projectId:"", + loginName:"", + userName:"", + imageInfoData:[], + data:{}, + projectType:"", + projectTypeName:"", + uploadImages:[], + request:app.globalData.reqUrl + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + let {projectId} = options + //获取缓存数据 + wx.getStorage({ + key: 'userinfo', + success:res=>{ + this.setData({ + projectId, + deptId:res.data.deptId, + loginName:res.data.loginName, + userName:res.data.nickName + }) + this.getProjectScheduleData() + } + }) + }, + + //查询项目历史形象进度数据 + getProjectScheduleData(){ + let that = this + wx.request({ + url: app.globalData.reqUrl+'/wechat/projectSchedule/lastInfo', + method:"get", + data:{ + projectId:that.data.projectId + }, + header:{ + 'content-type': 'application/x-www-form-urlencoded' + }, + success(res){ + res = res.data + if(res.code == 200){ + let type = res.data.projectType; + let typeName = ""; + switch(type){ + case "1" : typeName = "在建"; break; + case "2" : typeName = "拟建"; break; + case "3" : typeName = "前期"; break; + case "4" : typeName = "完工"; break; + } + let minUrls = []; + if(res.data.image){ + res.data.image.split(',').forEach(element => { + minUrls.push(that.data.request+element+'.min.jpg'); + }); + } + that.setData({ + data:res.data, + projectType:type, + projectTypeName:typeName, + uploadImages:minUrls, + imageInfoData:minUrls + }) + } + } + }) + }, + + // list 上传图片 + onImagesArr(e){ + var data = this.data.imageInfoData; + data = e.detail + this.setData({ + imageInfoData:data + }) + }, + + //取消页面 + cancelSaveView(){ + wx.navigateBack() + }, + + //保存 + onProblemSubmitSave(){ + this.setData({ + loadShow:true + }) + let that = this + let {projectId,loginName,imageInfoData,data,projectType} = that.data; + //数据效验 + if(projectId==""||loginName==""){ + app.toast("数据异常，请刷新页面重试!") + that.setData({ + loadShow:false + }) + return; + } + if(imageInfoData.length==0){ + app.toast("请上传形象进度图片!") + that.setData({ + loadShow:false + }) + return; + } + if(data.plannedNode==""){ + app.toast("请填写计划节点描述!") + that.setData({ + loadShow:false + }) + return; + } + if(data.actualNode==""){ + app.toast("请填写实际节点描述!") + that.setData({ + loadShow:false + }) + return; + } + if(data.purchaseProgress==""){ + if(projectType==4){ + app.toast("请填写结算进展描述!") + }else{ + app.toast("请填写报建、设计进展描述!") + } + that.setData({ + loadShow:false + }) + return; + } + if(data.designProgress==""){ + if(projectType==4){ + app.toast("请填写运维进展描述!") + }else{ + app.toast("请填写报建、设计进展描述!") + } + that.setData({ + loadShow:false + }) + return; + } + if(data.constructionProgress==""){ + app.toast("请填施工进展描述!") + that.setData({ + loadShow:false + }) + return; + } + if(data.acceptanceProgress==""){ + app.toast("请填写验收进展描述!") + that.setData({ + loadShow:false + }) + return; + } + if(data.planForNextWeek==""){ + app.toast("请填写下周计划描述!") + that.setData({ + loadShow:false + }) + return; + } + if(data.existingProblem==""){ + app.toast("请填写存在问题描述!") + that.setData({ + loadShow:false + }) + return; + } + if(data.problemProgress==""){ + app.toast("请填写问题推进情况描述!") + that.setData({ + loadShow:false + }) + return; + } + + let fileUrls = []; + imageInfoData.forEach(async (item)=>{ + let uploadUrl = app.globalData.uploadUrl+'/common/upload' + let name = "file" + //这里复杂的图片上传，改为同步上传，因为小程序只能上传一张图片 + if(item.indexOf(that.data.request)==-1){ + let obj = await that.syncUploadImage(uploadUrl,item,name); + fileUrls.push(obj.data.fileName); + }else{ + fileUrls.push(item.replace(that.data.request,"").replace(".min.jpg","")); + } + //验证图片上传完毕 + if(fileUrls.length == imageInfoData.length){ + let params = { + projectId, + image:fileUrls.toString(), + plannedNode:data.plannedNode, + actualNode:data.actualNode, + purchaseProgress:data.purchaseProgress, + designProgress:data.designProgress, + constructionProgress:data.constructionProgress, + acceptanceProgress:data.acceptanceProgress, + planForNextWeek:data.planForNextWeek, + existingProblem:data.existingProblem, + problemProgress:data.problemProgress, + dataTemplate:projectType, + createBy:loginName + } + wx.request({ + url: app.globalData.reqUrl + '/wechat/projectSchedule/add', + 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) + } + }); + }) + }, + + plannedNodeAction: function (options) { + this.data.data.plannedNode = options.detail.value; + }, + actualNodeAction: function (options) { + this.data.data.actualNode=options.detail.value; + }, + purchaseProgressAction: function (options) { + this.data.data.purchaseProgress = options.detail.value + }, + designProgressAction: function (options) { + this.data.data.designProgress = options.detail.value + }, + constructionProgressAction: function (options) { + this.data.data.constructionProgress = options.detail.value + }, + acceptanceProgressAction: function (options) { + this.data.data.acceptanceProgress = options.detail.value + }, + planForNextWeekAction: function (options) { + this.data.data.planForNextWeek = options.detail.value + }, + existingProblemAction: function (options) { + this.data.data.existingProblem = options.detail.value + }, + problemProgressAction: function (options) { + this.data.data.problemProgress = options.detail.value + }, + + returnToPage: function () { + /*关闭当前页面，跳转到应用内的某个页面。但是不允许跳转到 tabbar 页面*/ + wx.navigateTo({ + url: '../list/index', + }) + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + } +}) \ No newline at end of file diff --git a/miniprogram/pageage/project_schedule/add/index.json b/miniprogram/pageage/project_schedule/add/index.json new file mode 100644 index 0000000..a1cc9bf --- /dev/null +++ b/miniprogram/pageage/project_schedule/add/index.json @@ -0,0 +1,7 @@ +{ + "usingComponents": { + "van-overlay": "@vant/weapp/overlay/index" + }, + "navigationStyle":"custom", + "navigationBarTitleText": "新增形象进度" +} \ No newline at end of file diff --git a/miniprogram/pageage/project_schedule/add/index.wxml b/miniprogram/pageage/project_schedule/add/index.wxml new file mode 100644 index 0000000..efa3a43 --- /dev/null +++ b/miniprogram/pageage/project_schedule/add/index.wxml @@ -0,0 +1,166 @@ + + + + + + + + + 新增形象进度 + + + + + + + + {{data.projectName}} + + + 形象进度图片 + + + + + + 计划节点 + +