From fa97a6c039e28cd9ebb9e4f2af62e32938b22877 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: Wed, 13 Sep 2023 13:01:30 +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
---
.../quality/add/index.js | 37 ++++++++++++++++++-
.../quality/add/index.wxml | 7 +++-
.../security/add/index.js | 37 ++++++++++++++++++-
.../security/add/index.wxml | 7 +++-
.../pages/gengduogongneng/gengduogongneng.js | 2 +-
5 files changed, 81 insertions(+), 9 deletions(-)
diff --git a/miniprogram/pageage/project_problemmodify/quality/add/index.js b/miniprogram/pageage/project_problemmodify/quality/add/index.js
index 7f292ab..6072a2b 100644
--- a/miniprogram/pageage/project_problemmodify/quality/add/index.js
+++ b/miniprogram/pageage/project_problemmodify/quality/add/index.js
@@ -27,11 +27,12 @@ Page({
recheckSendUser:"",
workParts:"",
changeInfo:"",
- dangerType:"",
+ dangerType:"1",
dangerTypeList:[],
selectValue:"",
selectIndex:"",
problemType:"1",
+ showHis:false,
problemTypeList:[{id:"1",text:"常规检查"},{id:"2",text:"专项检查"}]
},
@@ -54,6 +55,7 @@ Page({
})
this.getAllProjectUserData();
this.getDangerTypeList();
+ this.getHisInfo();
}
})
},
@@ -84,6 +86,37 @@ Page({
})
},
+ getHisInfo(){
+ //这里查询当前登录人上次提交隐患，自动填充整改人，复检人，抄送人
+ let that = this
+ wx.request({
+ url: app.globalData.reqUrl+'/wechat/projectProblemmodify/findLastDataByParams',
+ method:"get",
+ data:{
+ projectId:that.data.projectId,
+ createUser:that.data.loginName,
+ infoType:1
+ },
+ header:{
+ 'content-type': 'application/x-www-form-urlencoded'
+ },
+ success(res){
+ res = res.data
+ if(res.code == 200 && res.data){
+ that.setData({
+ showHis:true,
+ lordSent:res.data.lordSent,
+ lordSentUser:res.data.lordSentUser,
+ recheckSend:res.data.recheckSend,
+ recheckSendUser:res.data.recheckSendUser,
+ copySend:res.data.copySend,
+ copySendUser:res.data.copySendUser
+ })
+ }
+ }
+ })
+ },
+
getDangerTypeList(){
let that = this
wx.request({
@@ -290,7 +323,7 @@ Page({
copySend,
copySendUser,
checkState:0,
- nickedTime:nickedTime+" 23:59",
+ nickedTime:nickedTime+" 23:59:59",
smarkUrl:fileUrls.toString(),
createUser:loginName,
dangerType,
diff --git a/miniprogram/pageage/project_problemmodify/quality/add/index.wxml b/miniprogram/pageage/project_problemmodify/quality/add/index.wxml
index f07e0a1..0f1f348 100644
--- a/miniprogram/pageage/project_problemmodify/quality/add/index.wxml
+++ b/miniprogram/pageage/project_problemmodify/quality/add/index.wxml
@@ -57,7 +57,7 @@
整改人
-
+
@@ -71,10 +71,13 @@
抄送人
-
+
+
+ 已自动填充上次隐患的整改人，复检人，抄送人。
+
取消
diff --git a/miniprogram/pageage/project_problemmodify/security/add/index.js b/miniprogram/pageage/project_problemmodify/security/add/index.js
index 9600724..6b90d44 100644
--- a/miniprogram/pageage/project_problemmodify/security/add/index.js
+++ b/miniprogram/pageage/project_problemmodify/security/add/index.js
@@ -27,11 +27,12 @@ Page({
recheckSendUser:"",
workParts:"",
changeInfo:"",
- dangerType:"",
+ dangerType:"1",
dangerTypeList:[],
selectValue:"",
selectIndex:"",
problemType:"1",
+ showHis:false,
problemTypeList:[{id:"1",text:"常规检查"},{id:"2",text:"专项检查"}]
},
@@ -54,6 +55,7 @@ Page({
})
this.getAllProjectUserData();
this.getDangerTypeList();
+ this.getHisInfo();
}
})
},
@@ -84,6 +86,37 @@ Page({
})
},
+ getHisInfo(){
+ //这里查询当前登录人上次提交隐患，自动填充整改人，复检人，抄送人
+ let that = this
+ wx.request({
+ url: app.globalData.reqUrl+'/wechat/projectProblemmodify/findLastDataByParams',
+ method:"get",
+ data:{
+ projectId:that.data.projectId,
+ createUser:that.data.loginName,
+ infoType:0
+ },
+ header:{
+ 'content-type': 'application/x-www-form-urlencoded'
+ },
+ success(res){
+ res = res.data
+ if(res.code == 200 && res.data){
+ that.setData({
+ showHis:true,
+ lordSent:res.data.lordSent,
+ lordSentUser:res.data.lordSentUser,
+ recheckSend:res.data.recheckSend,
+ recheckSendUser:res.data.recheckSendUser,
+ copySend:res.data.copySend,
+ copySendUser:res.data.copySendUser
+ })
+ }
+ }
+ })
+ },
+
getDangerTypeList(){
let that = this
wx.request({
@@ -297,7 +330,7 @@ Page({
copySend,
copySendUser,
checkState:0,
- nickedTime:nickedTime+" 23:59",
+ nickedTime:nickedTime+" 23:59:59",
smarkUrl:fileUrls.toString(),
createUser:loginName,
dangerType,
diff --git a/miniprogram/pageage/project_problemmodify/security/add/index.wxml b/miniprogram/pageage/project_problemmodify/security/add/index.wxml
index 5e187c5..a954f51 100644
--- a/miniprogram/pageage/project_problemmodify/security/add/index.wxml
+++ b/miniprogram/pageage/project_problemmodify/security/add/index.wxml
@@ -57,7 +57,7 @@
整改人
-
+
@@ -71,10 +71,13 @@
抄送人
-
+
+
+ 已自动填充上次隐患的整改人，复检人，抄送人。
+
取消
diff --git a/miniprogram/pages/gengduogongneng/gengduogongneng.js b/miniprogram/pages/gengduogongneng/gengduogongneng.js
index 3e30012..93ab174 100644
--- a/miniprogram/pages/gengduogongneng/gengduogongneng.js
+++ b/miniprogram/pages/gengduogongneng/gengduogongneng.js
@@ -152,7 +152,7 @@ Page({
//跳转到质量管理
ZLGL:function(){
wx.redirectTo({
- url:'../quality_manage/index.js'
+ url:'../quality_manage/index'
})
},
//跳转到进度管理