From a54a5823bd7b13e9eda3239813e914db53229ac9 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: Sun, 27 Aug 2023 15:42:43 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pageage/project_checking/list/index.js | 7 ++ .../pageage/project_checking/list/index.json | 1 + .../pageage/project_checking/list/index.wxml | 21 ++++-- .../quality/check/index.js | 71 +++++++++---------- .../quality/check/index.wxml | 6 +- .../quality/info/index.js | 20 +++--- .../quality/list/index.js | 7 ++ .../quality/list/index.json | 1 + .../quality/list/index.wxml | 22 ++++-- .../quality/modify/index.js | 18 +++-- .../security/check/index.js | 67 +++++++++-------- .../security/check/index.wxml | 6 +- .../security/info/index.js | 20 +++--- .../security/list/index.js | 7 ++ .../security/list/index.json | 1 + .../security/list/index.wxml | 22 ++++-- .../security/modify/index.js | 18 +++-- .../pages/gengduogongneng/gengduogongneng.js | 5 +- .../gengduogongneng/gengduogongneng.wxml | 9 ++- 19 files changed, 194 insertions(+), 135 deletions(-) diff --git a/miniprogram/pageage/project_checking/list/index.js b/miniprogram/pageage/project_checking/list/index.js index 9c46319..95f0d43 100644 --- a/miniprogram/pageage/project_checking/list/index.js +++ b/miniprogram/pageage/project_checking/list/index.js @@ -80,6 +80,13 @@ Page({ }) }, + returnToPage: function () { + /*关闭当前页面，跳转到应用内的某个页面。但是不允许跳转到 tabbar 页面*/ + wx.redirectTo({ + url: '../../../pages/gengduogongneng/gengduogongneng', + }) + }, + /** * 生命周期函数--监听页面初次渲染完成 */ diff --git a/miniprogram/pageage/project_checking/list/index.json b/miniprogram/pageage/project_checking/list/index.json index 460908e..9f00a0e 100644 --- a/miniprogram/pageage/project_checking/list/index.json +++ b/miniprogram/pageage/project_checking/list/index.json @@ -3,5 +3,6 @@ "van-overlay": "@vant/weapp/overlay/index" , "van-popup": "@vant/weapp/popup/index" }, + "navigationStyle":"custom", "navigationBarTitleText": "举牌验收管理" } \ No newline at end of file diff --git a/miniprogram/pageage/project_checking/list/index.wxml b/miniprogram/pageage/project_checking/list/index.wxml index 60d5c2c..b564806 100644 --- a/miniprogram/pageage/project_checking/list/index.wxml +++ b/miniprogram/pageage/project_checking/list/index.wxml @@ -1,8 +1,17 @@ - - - - - + + + + + + + + 举牌验收管理 + + + + + + @@ -44,7 +53,7 @@ 新增 - + diff --git a/miniprogram/pageage/project_problemmodify/quality/check/index.js b/miniprogram/pageage/project_problemmodify/quality/check/index.js index 928f282..ee80874 100644 --- a/miniprogram/pageage/project_problemmodify/quality/check/index.js +++ b/miniprogram/pageage/project_problemmodify/quality/check/index.js @@ -59,10 +59,12 @@ Page({ if(res.code == 200){ let urls = []; let minUrls = []; - res.data.smarkUrl.split(',').forEach(element => { - urls.push(that.data.request+element); - minUrls.push(that.data.request+element+'.min.jpg'); - }); + if(res.data.smarkUrl){ + res.data.smarkUrl.split(',').forEach(element => { + urls.push(that.data.request+element); + minUrls.push(that.data.request+element+'.min.jpg'); + }); + } that.setData({ infoData:res.data, imageList:urls, @@ -88,10 +90,12 @@ Page({ if(res.code == 200 && res.data){ let urls = []; let minUrls = []; - res.data.fileUrls.split(',').forEach(element => { - urls.push(that.data.request+element); - minUrls.push(that.data.request+element+'.min.jpg'); - }); + if(res.data.fileUrls){ + res.data.fileUrls.split(',').forEach(element => { + urls.push(that.data.request+element); + minUrls.push(that.data.request+element+'.min.jpg'); + }); + } that.setData({ auditInfo:res.data, auditImageList:urls, @@ -163,33 +167,27 @@ Page({ //审核驳回 onRejectSave(){ let that = this; - if(that.data.reject){ - if(that.data.rejectOpinion!=""){ - //弹出确认 - wx.showModal({ - title: '提示', - content: '是否确认复检驳回？', - success: function (sm) { - if (sm.confirm) { - // 用户点击了确定 可以调用了 - that.onSubmitSave(2); - } else if (sm.cancel) { - console.log('用户点击取消'); - } - } - }) - }else{ - app.toast("请填写整改驳回意见!") - that.setData({ - loadShow:false - }) - return; - } - }else{ - that.setData({ - reject:true - }); - } + if(that.data.rejectOpinion!=""){ + //弹出确认 + wx.showModal({ + title: '提示', + content: '是否确认复检驳回？', + success: function (sm) { + if (sm.confirm) { + // 用户点击了确定 可以调用了 + that.onSubmitSave(2); + } else if (sm.cancel) { + console.log('用户点击取消'); + } + } + }) + }else{ + app.toast("请填写整改驳回意见!") + that.setData({ + loadShow:false + }) + return; + } }, //审核通过 onPassSave(){ @@ -202,8 +200,7 @@ Page({ if (sm.confirm) { // 用户点击了确定 可以调用了 that.setData({ - reject:false, - rejectOpinion:"" + reject:false }); that.onSubmitSave(4); } else if (sm.cancel) { diff --git a/miniprogram/pageage/project_problemmodify/quality/check/index.wxml b/miniprogram/pageage/project_problemmodify/quality/check/index.wxml index 5df8172..6b459b9 100644 --- a/miniprogram/pageage/project_problemmodify/quality/check/index.wxml +++ b/miniprogram/pageage/project_problemmodify/quality/check/index.wxml @@ -109,14 +109,14 @@ - + - 整改驳回意见 + 整改复检意见 -