From 52192a106a681eaea04bff6a6343b01aa83a192d 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, 14 Apr 2024 23:43:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4diamond?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../project_checkDetection/list/index.js | 63 ++-
.../project_checkDetection/list/index.wxml | 96 +++--
.../pageage/project_checking/list/index.js | 63 ++-
.../pageage/project_checking/list/index.wxml | 128 +++---
.../project_materialSeal/list/index.js | 65 +++-
.../project_materialSeal/list/index.wxml | 120 +++---
.../pageage/project_measure/list/index.js | 65 +++-
.../pageage/project_measure/list/index.wxml | 122 +++---
.../security/info/index.js | 368 +++++++++---------
9 files changed, 626 insertions(+), 464 deletions(-)
diff --git a/miniprogram/pageage/project_checkDetection/list/index.js b/miniprogram/pageage/project_checkDetection/list/index.js
index 9023d3f..8715ca0 100644
--- a/miniprogram/pageage/project_checkDetection/list/index.js
+++ b/miniprogram/pageage/project_checkDetection/list/index.js
@@ -17,6 +17,10 @@ Page({
activeState: "jxz",
jxzCount: 0,
ywcCount: 0,
+ pageNum: 1,
+ pageSize: 10,
+ lastDataSize: 10,
+ list: [],
request: app.globalData.reqUrl
},
@@ -133,8 +137,12 @@ Page({
loginName: res.data.loginName,
projectId: app.globalData.projectId,
minRoleId: res.data.minRoleId,
+ pageNum: 1,
+ pageSize: 10,
+ lastDataSize: 10,
+ listData: []
})
- this.getListData(app.globalData.projectId, res.data.deptId, res.data.minRoleId);
+ this.getListData();
},
fail: err => {
//未获取用户信息时,重新登录
@@ -148,29 +156,59 @@ Page({
/**
* 查询项目材料进场验收数据
*/
- getListData(projectId, deptId, minRoleId) {
+ getListData() {
+ //进入这里说明数据加载完毕
+ if (this.data.lastDataSize < this.data.pageSize) {
+ //app.toast("已经到底了,暂无可继续加载数据!")
+ return;
+ }
var that = this;
//判断角色,
- if (minRoleId == 2 || minRoleId == 3 || minRoleId == 4) {
+ let mr = this.data.minRoleId;
+ let deptId = this.data.deptId;
+ if (mr == 2 || mr == 3 || mr == 4) {
deptId = 0;
}
+ this.queryCount(this.data.projectId, deptId);
let param = {
- "projectId": projectId,
+ "projectId": this.data.projectId,
"deptId": deptId,
"nowUserName": this.data.loginName,
"activeName": that.data.activeState
}
+ param.pageNum = that.data.pageNum;
+ param.pageSize = that.data.pageSize;
wx.request({
url: app.globalData.reqUrl + '/wechat/projectDetection/list',
data: param,
method: "get",
success: function (res) {
- that.setData({
- listData: res.data.data
- })
+ res = res.data;
+ if (res.code == "200") {
+ //这里处理this.data.lastDataSize=this.data.pageSize
+ if (that.data.list.length > 0 && res.data.length > 0 && that.data.list[0].id == res.data[0].id) {
+ that.setData({
+ lastDataSize: 0,
+ })
+ } else {
+ that.setData({
+ pageNum: that.data.pageNum + 1,
+ lastDataSize: res.data.length,
+ list: res.data,
+ listData: that.data.listData.concat(res.data)
+ })
+ }
+ }
}
});
- this.queryCount(projectId, deptId);
+ },
+
+ /**
+ * 加载更多数据
+ */
+ onScrollToLower() {
+ console.log("滚动条到底了,开始加载新数据");
+ this.getListData();
},
//查询统计
@@ -207,9 +245,14 @@ Page({
nav = 'ywc';
}
this.setData({
- activeState: nav
+ activeState: nav,
+ pageNum: 1,
+ pageSize: 10,
+ lastDataSize: 10,
+ listData: [],
+ list: []
});
- this.getListData(this.data.projectId, this.data.deptId, this.data.minRoleId);
+ this.getListData();
},
/**
diff --git a/miniprogram/pageage/project_checkDetection/list/index.wxml b/miniprogram/pageage/project_checkDetection/list/index.wxml
index 6c69b5b..9331e05 100644
--- a/miniprogram/pageage/project_checkDetection/list/index.wxml
+++ b/miniprogram/pageage/project_checkDetection/list/index.wxml
@@ -2,7 +2,9 @@
-
-
-
- 进行中({{jxzCount}})
- 已完成({{ywcCount}})
+
+
+
+ 进行中({{jxzCount}})
+ 已完成({{ywcCount}})
-
-
-
-
-
-
- {{index < 9 ?'0'+(index+1):(index+1)}}
- 送检时间:{{item.checkTime}}
- 送检中
- 待审批
- 合格
- 不合格
-
-
-
-
-
- 送检类型:{{item.checkTypeName}}
- 材料名称:{{item.materialName}}
- 使用部位:{{item.usePosition}}
-
-
-
-
-
-
-
-
- 暂无数据
+
+
+
+
+
+ {{index < 9 ?'0'+(index+1):(index+1)}}
+ 送检时间:{{item.checkTime}}
+ 送检中
+ 待审批
+ 合格
+ 不合格
-
-
-
-
-
-
- 新增
-
-
-
-
-
-
-
-
-
+
+
+
+
+ 送检类型:{{item.checkTypeName}}
+ 材料名称:{{item.materialName}}
+ 使用部位:{{item.usePosition}}
+
+
+
+
+
+
+
+
+ 暂无数据
+
+
+
+
+
+
+ 新增
+
+
+
\ No newline at end of file
diff --git a/miniprogram/pageage/project_checking/list/index.js b/miniprogram/pageage/project_checking/list/index.js
index 9db4f5f..304f520 100644
--- a/miniprogram/pageage/project_checking/list/index.js
+++ b/miniprogram/pageage/project_checking/list/index.js
@@ -19,6 +19,10 @@ Page({
jxzCount: 0,
ywcCount: 0,
activeState: "jxz",
+ pageNum: 1,
+ pageSize: 10,
+ lastDataSize: 10,
+ list: [],
request: app.globalData.reqUrl
},
@@ -141,8 +145,12 @@ Page({
minRoleId: res.data.minRoleId,
projectId: app.globalData.projectId,
projectNameArgs: app.globalData.projectName,
+ pageNum: 1,
+ pageSize: 10,
+ lastDataSize: 10,
+ listData: []
})
- this.getProjectCheckingData(app.globalData.projectId, res.data.loginName, res.data.deptId, res.data.minRoleId);
+ this.getProjectCheckingData();
},
fail: err => {
//未获取用户信息时,重新登录
@@ -156,31 +164,61 @@ Page({
/**
* 查询项目举牌验收数据
*/
- getProjectCheckingData(projectId, loginName, deptId, minRoleId) {
+ getProjectCheckingData() {
+ //进入这里说明数据加载完毕
+ if (this.data.lastDataSize < this.data.pageSize) {
+ //app.toast("已经到底了,暂无可继续加载数据!")
+ return;
+ }
var that = this;
//判断角色,
- if (minRoleId == 2 || minRoleId == 3 || minRoleId == 4) {
+ let mr = this.data.minRoleId;
+ let deptId = this.data.deptId;
+ if (mr == 2 || mr == 3 || mr == 4) {
deptId = 0;
}
let param = {
- "projectId": projectId,
- "nowUserName": loginName,
+ "projectId": this.data.projectId,
"deptId": deptId,
+ "nowUserName": this.data.loginName,
"activeName": this.data.activeState
}
this.queryCount(param);
+ param.pageNum = that.data.pageNum;
+ param.pageSize = that.data.pageSize;
wx.request({
url: app.globalData.reqUrl + '/wechat/projectchecking/list',
data: param,
method: "get",
success: function (res) {
- that.setData({
- listData: res.data.data
- })
+ res = res.data;
+ if (res.code == "200") {
+ //这里处理this.data.lastDataSize=this.data.pageSize
+ if (that.data.list.length > 0 && res.data.length > 0 && that.data.list[0].id == res.data[0].id) {
+ that.setData({
+ lastDataSize: 0,
+ })
+ } else {
+ that.setData({
+ pageNum: that.data.pageNum + 1,
+ lastDataSize: res.data.length,
+ list: res.data,
+ listData: that.data.listData.concat(res.data)
+ })
+ }
+ }
}
})
},
+ /**
+ * 加载更多数据
+ */
+ onScrollToLower() {
+ console.log("滚动条到底了,开始加载新数据");
+ this.getProjectCheckingData();
+ },
+
//查询统计
queryCount(param) {
//查询统计数量
@@ -210,9 +248,14 @@ Page({
nav = 'ywc';
}
this.setData({
- activeState: nav
+ activeState: nav,
+ pageNum: 1,
+ pageSize: 10,
+ lastDataSize: 10,
+ listData: [],
+ list: []
});
- this.getProjectCheckingData(this.data.projectId, this.data.loginName, this.data.deptId, this.data.minRoleId)
+ this.getProjectCheckingData();
},
returnToPage: function () {
diff --git a/miniprogram/pageage/project_checking/list/index.wxml b/miniprogram/pageage/project_checking/list/index.wxml
index 8730d8e..0ac3dff 100644
--- a/miniprogram/pageage/project_checking/list/index.wxml
+++ b/miniprogram/pageage/project_checking/list/index.wxml
@@ -1,71 +1,65 @@
-
-
-
- 进行中({{jxzCount}})
- 已完成({{ywcCount}})
-
-
-
-
-
-
-
- {{index < 9 ?'0'+(index+1):(index+1)}}
- {{item.dataTypeLvl2Name}}
- {{item.dataTypeLvl1Name}}
- {{item.dataTypeLvl1Name}}
-
-
-
-
-
- 待审批
- 合格
- 不合格
-
-
-
- 工具部位:{{item.checkWorkingPosition}}
- 质量专员:{{item.qualityUserName}}
- 监理专员:{{item.superviseUserName}}
- 验收时间:{{item.checkingDate}}
-
-
- 验收描述:{{item.intro}}
-
-
-
-
-
-
-
- 暂无数据
-
+
+
+
+
+ 进行中({{jxzCount}})
+ 已完成({{ywcCount}})
+
+
+
+
+
+
+ {{index < 9 ?'0'+(index+1):(index+1)}}
+ {{item.dataTypeLvl2Name}}
+ {{item.dataTypeLvl1Name}}
+ {{item.dataTypeLvl1Name}}
+
+
+
+
+
+ 待审批
+ 合格
+ 不合格
+
+
+
+ 工具部位:{{item.checkWorkingPosition}}
+ 质量专员:{{item.qualityUserName}}
+ 监理专员:{{item.superviseUserName}}
+ 验收时间:{{item.checkingDate}}
+
+
+ 验收描述:{{item.intro}}
+
+
+
+
+
+
+ 暂无数据
+
+
+
-
-
-
- 新增
-
-
-
-
-
-
-
-
-
+
+
+
+ 新增
+
+
+
\ No newline at end of file
diff --git a/miniprogram/pageage/project_materialSeal/list/index.js b/miniprogram/pageage/project_materialSeal/list/index.js
index 9e9f165..2c7bfa9 100644
--- a/miniprogram/pageage/project_materialSeal/list/index.js
+++ b/miniprogram/pageage/project_materialSeal/list/index.js
@@ -15,6 +15,10 @@ Page({
jxzCount: 0,
ywcCount: 0,
activeState: "jxz",
+ pageNum: 1,
+ pageSize: 10,
+ lastDataSize: 10,
+ list: [],
request: app.globalData.reqUrl
},
@@ -124,12 +128,12 @@ Page({
loginName: res.data.loginName,
projectId: app.globalData.projectId,
minRoleId: res.data.minRoleId,
- initData: {
- text: app.globalData.projectName,
- id: app.globalData.projectId
- }
+ pageNum: 1,
+ pageSize: 10,
+ lastDataSize: 10,
+ listData: []
})
- this.getListData(app.globalData.projectId, res.data.deptId, res.data.minRoleId);
+ this.getListData();
},
fail: err => {
//未获取用户信息时,重新登录
@@ -143,31 +147,61 @@ Page({
/**
* 查询项目材料封样数据
*/
- getListData(projectId, deptId, minRoleId) {
+ getListData() {
+ //进入这里说明数据加载完毕
+ if (this.data.lastDataSize < this.data.pageSize) {
+ //app.toast("已经到底了,暂无可继续加载数据!")
+ return;
+ }
var that = this;
//判断角色,
- if (minRoleId == 2 || minRoleId == 3 || minRoleId == 4) {
+ let mr = this.data.minRoleId;
+ let deptId = this.data.deptId;
+ if (mr == 2 || mr == 3 || mr == 4) {
deptId = 0;
}
let param = {
+ "projectId": this.data.projectId,
"deptId": deptId,
- "projectId": projectId,
"nowUserName": this.data.loginName,
"activeName": this.data.activeState,
}
this.queryCount(param);
+ param.pageNum = that.data.pageNum;
+ param.pageSize = that.data.pageSize;
wx.request({
url: app.globalData.reqUrl + '/wechat/projectMaterialSeal/list',
data: param,
method: "get",
success: function (res) {
- that.setData({
- listData: res.data.data
- })
+ res = res.data;
+ if (res.code == "200") {
+ //这里处理this.data.lastDataSize=this.data.pageSize
+ if (that.data.list.length > 0 && res.data.length > 0 && that.data.list[0].id == res.data[0].id) {
+ that.setData({
+ lastDataSize: 0,
+ })
+ } else {
+ that.setData({
+ pageNum: that.data.pageNum + 1,
+ lastDataSize: res.data.length,
+ list: res.data,
+ listData: that.data.listData.concat(res.data)
+ })
+ }
+ }
}
})
},
+ /**
+ * 加载更多数据
+ */
+ onScrollToLower() {
+ console.log("滚动条到底了,开始加载新数据");
+ this.getListData();
+ },
+
//查询统计
queryCount(param) {
//查询统计数量
@@ -197,9 +231,14 @@ Page({
nav = 'ywc';
}
this.setData({
- activeState: nav
+ activeState: nav,
+ pageNum: 1,
+ pageSize: 10,
+ lastDataSize: 10,
+ listData: [],
+ list: []
});
- this.getListData(this.data.projectId, this.data.deptId, this.data.minRoleId);
+ this.getListData();
},
returnToPage: function () {
diff --git a/miniprogram/pageage/project_materialSeal/list/index.wxml b/miniprogram/pageage/project_materialSeal/list/index.wxml
index e4bce98..c0df5e7 100644
--- a/miniprogram/pageage/project_materialSeal/list/index.wxml
+++ b/miniprogram/pageage/project_materialSeal/list/index.wxml
@@ -1,67 +1,61 @@
-
-
-
- 进行中({{jxzCount}})
- 已完成({{ywcCount}})
-
-
-
-
-
-
-
- {{index < 9 ?'0'+(index+1):(index+1)}}
- 封样时间:{{item.sealDate}}
-
-
-
-
-
- 待审批
- 合格
- 不合格
-
-
-
- 封样名称:{{item.materialName}}
- 使用部位:{{item.usePosition}}
- 拟用品牌:{{item.useBrand}}
-
-
-
-
-
-
-
-
-
- 暂无数据
-
+
+
+
+
+ 进行中({{jxzCount}})
+ 已完成({{ywcCount}})
+
+
+
+
+
+
+ {{index < 9 ?'0'+(index+1):(index+1)}}
+ 封样时间:{{item.sealDate}}
+
+
+
+
+
+ 待审批
+ 合格
+ 不合格
+
+
+
+ 封样名称:{{item.materialName}}
+ 使用部位:{{item.usePosition}}
+ 拟用品牌:{{item.useBrand}}
+
+
+
+
+
+
+
+
+ 暂无数据
+
+
+
-
-
-
- 新增
-
-
-
-
-
-
-
-
-
+
+
+
+ 新增
+
+
+
\ No newline at end of file
diff --git a/miniprogram/pageage/project_measure/list/index.js b/miniprogram/pageage/project_measure/list/index.js
index b057a85..d408a10 100644
--- a/miniprogram/pageage/project_measure/list/index.js
+++ b/miniprogram/pageage/project_measure/list/index.js
@@ -17,6 +17,10 @@ Page({
jxzCount: 0,
ywcCount: 0,
activeState: "jxz",
+ pageNum: 1,
+ pageSize: 10,
+ lastDataSize: 10,
+ list:[],
request: app.globalData.reqUrl
},
@@ -130,9 +134,13 @@ Page({
initData: {
text: app.globalData.projectName,
id: app.globalData.projectId
- }
+ },
+ pageNum: 1,
+ pageSize: 10,
+ lastDataSize: 10,
+ listData: []
})
- this.getListData(app.globalData.projectId, res.data.deptId, res.data.minRoleId);
+ this.getListData();
},
fail: err => {
//未获取用户信息时,重新登录
@@ -146,31 +154,61 @@ Page({
/**
* 查询项目实测实量数据
*/
- getListData(projectId, deptId, minRoleId) {
+ getListData() {
+ //进入这里说明数据加载完毕
+ if (this.data.lastDataSize < this.data.pageSize) {
+ //app.toast("已经到底了,暂无可继续加载数据!")
+ return;
+ }
var that = this;
- //判断角色,
- if (minRoleId == 2 || minRoleId == 3 || minRoleId == 4) {
+ //判断角色
+ let mr = this.data.minRoleId;
+ let deptId = this.data.deptId;
+ if (mr == 2 || mr == 3 || mr == 4) {
deptId = 0;
}
let param = {
- "projectId": projectId,
+ "projectId": this.data.projectId,
"deptId": deptId,
"nowUserName": this.data.loginName,
"activeName": this.data.activeState,
}
this.queryCount(param);
+ param.pageNum=that.data.pageNum;
+ param.pageSize=that.data.pageSize;
wx.request({
url: app.globalData.reqUrl + '/wechat/projectMeasure/list',
data: param,
method: "get",
success: function (res) {
- that.setData({
- listData: res.data.data
- })
+ res = res.data;
+ if (res.code == "200") {
+ //这里处理this.data.lastDataSize=this.data.pageSize
+ if (that.data.list.length > 0 && res.data.length > 0 && that.data.list[0].id == res.data[0].id) {
+ that.setData({
+ lastDataSize: 0,
+ })
+ } else {
+ that.setData({
+ pageNum: that.data.pageNum + 1,
+ lastDataSize: res.data.length,
+ list: res.data,
+ listData: that.data.listData.concat(res.data)
+ })
+ }
+ }
}
});
},
+ /**
+ * 加载更多数据
+ */
+ onScrollToLower(){
+ console.log("滚动条到底了,开始加载新数据");
+ this.getListData();
+ },
+
//查询统计
queryCount(param) {
//查询统计数量
@@ -200,9 +238,14 @@ Page({
nav = 'ywc';
}
this.setData({
- activeState: nav
+ activeState: nav,
+ pageNum:1,
+ pageSize:10,
+ lastDataSize:10,
+ listData:[],
+ list:[]
});
- this.getListData(this.data.projectId, this.data.deptId, this.data.minRoleId);
+ this.getListData();
},
/**
diff --git a/miniprogram/pageage/project_measure/list/index.wxml b/miniprogram/pageage/project_measure/list/index.wxml
index a60c15b..2d031ab 100644
--- a/miniprogram/pageage/project_measure/list/index.wxml
+++ b/miniprogram/pageage/project_measure/list/index.wxml
@@ -1,67 +1,61 @@
-
-
-
- 进行中({{jxzCount}})
- 已完成({{ywcCount}})
-
-
-
-
-
-
-
- {{index < 9 ?'0'+(index+1):(index+1)}}
- 测量时间:{{item.measureTime}}
-
-
-
-
-
- 待审批
- 合格
- 不合格
-
-
-
- 测量类型:{{item.measureTypeName}}
- 测量内容:{{item.measureInfoName}}
- 测量点位:{{item.measurePointPosition}}
-
-
- 测量部位:{{item.measurePosition}}
-
-
-
-
-
-
- 暂无数据
+
+
+
+ 进行中({{jxzCount}})
+ 已完成({{ywcCount}})
+
+
+
+
+
+
+ {{index < 9 ?'0'+(index+1):(index+1)}}
+ 测量时间:{{item.measureTime}}
+
+
+
+
+
+ 待审批
+ 合格
+ 不合格
+
+
+
+ 测量类型:{{item.measureTypeName}}
+ 测量内容:{{item.measureInfoName}}
+ 测量点位:{{item.measurePointPosition}}
+
+
+ 测量部位:{{item.measurePosition}}
+
+
-
-
-
-
-
-
- 新增
-
-
-
-
-
-
-
-
-
+
+
+
+ 暂无数据
+
+
+
+
+
+
+ 新增
+
+
+
\ No newline at end of file
diff --git a/miniprogram/pageage/project_problemmodify/security/info/index.js b/miniprogram/pageage/project_problemmodify/security/info/index.js
index bcaafad..04c875a 100644
--- a/miniprogram/pageage/project_problemmodify/security/info/index.js
+++ b/miniprogram/pageage/project_problemmodify/security/info/index.js
@@ -2,61 +2,75 @@
const app = getApp()
Page({
- /**
- * 页面的初始数据
- */
- data: {
- id:"",
- infoData:{},
- auditInfo:{},
- showDel:false,
- loginName:"",
- imageList:[],
- minImageList:[],
- auditImageList:[],
- auditMinImageList:[],
- request:app.globalData.reqUrl,
- flowNodes:[{text:'开始'},{text:'提交隐患'},{text:'隐患整改'},{text:'隐患复检'},{text:'结束'}],
- active: 100
- },
+ /**
+ * 页面的初始数据
+ */
+ data: {
+ id: "",
+ infoData: {},
+ auditInfo: {},
+ showDel: false,
+ loginName: "",
+ imageList: [],
+ minImageList: [],
+ auditImageList: [],
+ auditMinImageList: [],
+ request: app.globalData.reqUrl,
+ flowNodes: [{
+ text: '开始'
+ }, {
+ text: '提交隐患'
+ }, {
+ text: '隐患整改'
+ }, {
+ text: '隐患复检'
+ }, {
+ text: '结束'
+ }],
+ active: 100
+ },
- /**
- * 生命周期函数--监听页面加载
- */
- onLoad(options) {
- let {id} = options
- //获取缓存数据
- wx.getStorage({
- key: 'userinfo',
- success:res=>{
- this.setData({
- id,
- loginName:res.data.loginName
- })
- this.getInfo();
- this.getAuditinfo();
- }
- })
- },
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad(options) {
+ let {
+ id
+ } = options
+ //获取缓存数据
+ wx.getStorage({
+ key: 'userinfo',
+ success: res => {
+ this.setData({
+ id,
+ loginName: res.data.loginName
+ })
+ this.getInfo();
+ this.getAuditinfo();
+ }
+ })
+ },
- /**
- * 获取安全检查详情信息
- *
- */
- getInfo(){
- let {id} = this.data
- let that = this
- wx.request({
- url: app.globalData.reqUrl+'/wechat/projectProblemmodify/info',
- method:"get",
- data:{
- id:id
- },
- success(res){
- res = res.data
- if(res.code == 200){
- let state = that.data.active;
+ /**
+ * 获取安全检查详情信息
+ *
+ */
+ getInfo() {
+ let {
+ id
+ } = this.data
+ let that = this
+ wx.request({
+ url: app.globalData.reqUrl + '/wechat/projectProblemmodify/info',
+ method: "get",
+ data: {
+ id: id
+ },
+ success(res) {
+ res = res.data
+ if (res.code == 200) {
+ let state = that.data.active;
if (res.data.checkState == "0") {
state = 2;
} else if (res.data.checkState == "1") {
@@ -67,61 +81,63 @@ Page({
that.setData({
active: state
})
- let urls = [];
- let minUrls = [];
- 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,
- minImageList:minUrls
- })
- //判断当前能否删除
- if(res.data.checkState!=4 && res.data.createUser==that.data.loginName){
- that.setData({
- showDel:true
- })
- }
- }
+ let urls = [];
+ let minUrls = [];
+ if (res.data.smarkUrl) {
+ res.data.smarkUrl.split(',').forEach(element => {
+ urls.push(that.data.request + element);
+ minUrls.push(that.data.request + element + '.min.jpg');
+ });
}
- })
- },
-
- getAuditinfo(){
- let {id} = this.data
- let that = this
- wx.request({
- url: app.globalData.reqUrl+'/wechat/projectProblemmodify/queryAuditInfo',
- method:"get",
- data:{
- id:id
- },
- success(res){
- res = res.data
- if(res.code == 200 && res.data){
- let urls = [];
- let minUrls = [];
- 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,
- auditMinImageList:minUrls
- })
+ that.setData({
+ infoData: res.data,
+ imageList: urls,
+ minImageList: minUrls
+ })
+ //判断当前能否删除
+ if (res.data.checkState != 4 && res.data.createUser == that.data.loginName) {
+ that.setData({
+ showDel: true
+ })
}
}
- })
- },
+ }
+ })
+ },
- onDelete(){
+ getAuditinfo() {
+ let {
+ id
+ } = this.data
+ let that = this
+ wx.request({
+ url: app.globalData.reqUrl + '/wechat/projectProblemmodify/queryAuditInfo',
+ method: "get",
+ data: {
+ id: id
+ },
+ success(res) {
+ res = res.data
+ if (res.code == 200 && res.data) {
+ let urls = [];
+ let minUrls = [];
+ 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,
+ auditMinImageList: minUrls
+ })
+ }
+ }
+ })
+ },
+
+ onDelete() {
//弹出确认
let that = this
wx.showModal({
@@ -129,104 +145,106 @@ Page({
content: '是否确定删除此条数据?',
success: function (sm) {
if (sm.confirm) {
- // 用户点击了确定 可以调用了
- that.deleteData();
- } else if (sm.cancel) {
- console.log('用户点击取消');
- }
+ // 用户点击了确定 可以调用了
+ that.deleteData();
+ } else if (sm.cancel) {
+ console.log('用户点击取消');
}
- })
- },
- deleteData(){
- let {id} = this.data
- wx.request({
- url: app.globalData.reqUrl+'/wechat/projectProblemmodify/removeSafety',
- header: {
- "Username": this.data.loginName,
- },
- data:{
- id:id
- },
- method:"get",
- success(res){
- app.toast("删除成功!")
- wx.redirectTo({
- url: `../list/index`,
- })
- }
- })
+ }
+ })
},
- //展示图片
- showImg:function(e){
- var that=this;
- wx.previewImage({
- urls: that.data.imageList,
- current: that.data.imageList[e.currentTarget.dataset.index]
- })
+ deleteData() {
+ let {
+ id
+ } = this.data
+ wx.request({
+ url: app.globalData.reqUrl + '/wechat/projectProblemmodify/removeSafety',
+ header: {
+ "Username": this.data.loginName,
+ },
+ data: {
+ id: id
+ },
+ method: "get",
+ success(res) {
+ app.toast("删除成功!")
+ wx.redirectTo({
+ url: `../list/index`,
+ })
+ }
+ })
+ },
+ //展示图片
+ showImg: function (e) {
+ var that = this;
+ wx.previewImage({
+ urls: that.data.imageList,
+ current: that.data.imageList[e.currentTarget.dataset.index]
+ })
},
//展示图片
- showAuditinfoImg:function(e){
- var that=this;
+ showAuditinfoImg: function (e) {
+ var that = this;
wx.previewImage({
- urls: that.data.auditImageList,
- current: that.data.auditImageList[e.currentTarget.dataset.index]
+ urls: that.data.auditImageList,
+ current: that.data.auditImageList[e.currentTarget.dataset.index]
})
},
returnToPage: function () {
/*关闭当前页面,跳转到应用内的某个页面。但是不允许跳转到 tabbar 页面*/
wx.redirectTo({
- url: '../list/index',
+ url: '../list/index',
})
},
- /**
- * 生命周期函数--监听页面初次渲染完成
- */
- onReady() {
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ onReady() {
- },
+ },
- /**
- * 生命周期函数--监听页面显示
- */
- onShow() {
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow() {
- },
+ },
- /**
- * 生命周期函数--监听页面隐藏
- */
- onHide() {
+ /**
+ * 生命周期函数--监听页面隐藏
+ */
+ onHide() {
- },
+ },
- /**
- * 生命周期函数--监听页面卸载
- */
- onUnload() {
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload() {
- },
+ },
- /**
- * 页面相关事件处理函数--监听用户下拉动作
- */
- onPullDownRefresh() {
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh() {
- },
+ },
- /**
- * 页面上拉触底事件的处理函数
- */
- onReachBottom() {
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom() {
- },
+ },
- /**
- * 用户点击右上角分享
- */
- onShareAppMessage() {
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage() {
- }
+ }
})
\ No newline at end of file