From c3cf671949d00de347d82bb29c61cb3bfec72c65 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: Fri, 3 May 2024 10:37:27 +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
---
miniprogram/api/login.js | 36 +-
miniprogram/api/publics.js | 8 +
miniprogram/app.js | 17 +-
miniprogram/app.json | 1 +
miniprogram/app.wxss | 4 +
miniprogram/config.js | 3 +-
.../pageage/flow_labour/check/index.wxml | 4 +-
miniprogram/pageage/flow_labour/list/index.js | 30 +-
.../pageage/flow_labour/list/index.wxml | 12 +-
.../project_checkDetection/add/index.js | 497 ++++++-----
.../project_checkDetection/add/index.wxml | 173 ++--
.../project_checkDetection/check/index.js | 708 ++++++++-------
.../project_checkDetection/check/index.wxml | 23 +-
.../project_checkDetection/edit/index.js | 722 +++++++++------
.../project_checkDetection/edit/index.wxml | 259 +++---
.../project_checkDetection/info/index.js | 59 +-
.../project_checkDetection/info/index.wxml | 286 +++---
.../project_checkDetection/list/index.js | 17 +-
.../project_checkDetection/list/index.wxml | 2 +-
.../pageage/project_checking/add/index.js | 493 ++++++-----
.../pageage/project_checking/add/index.wxml | 13 +-
.../pageage/project_checking/edit/index.js | 640 ++++++++------
.../pageage/project_checking/edit/index.wxml | 10 +-
.../pageage/project_checking/info/index.js | 39 +-
.../pageage/project_checking/info/index.wxml | 17 +-
.../pageage/project_checking/list/index.js | 11 +-
.../pageage/project_checking/list/index.wxml | 2 +-
.../pageage/project_insurance/add/index.wxml | 2 +-
.../project_materialSeal/add/index.wxml | 6 +-
.../project_materialSeal/edit/index.wxml | 6 +-
.../project_materialSeal/list/index.js | 17 +-
.../project_materialSeal/list/index.wxml | 2 +-
.../pageage/project_measure/add/index.wxml | 4 +-
.../pageage/project_measure/edit/index.wxml | 4 +-
.../pageage/project_measure/list/index.js | 17 +-
.../pageage/project_measure/list/index.wxml | 2 +-
.../quality/add/index.wxml | 2 +-
.../quality/list/index.js | 17 +-
.../quality/list/index.wxml | 4 +-
.../security/add/index.wxml | 2 +-
.../security/list/index.js | 18 +-
.../security/list/index.wxml | 4 +-
.../pageage/project_schedule/add/index.wxml | 2 +-
.../pageage/project_special/add/index.wxml | 2 +-
.../pageage/project_standard/add/index.js | 305 ++++---
.../pageage/project_standard/add/index.json | 4 +-
.../pageage/project_standard/add/index.wxml | 133 +--
.../pageage/project_standard/add/index.wxss | 94 +-
.../pageage/project_standard/info/index.js | 371 ++++----
.../pageage/project_standard/info/index.wxml | 10 +-
.../pageage/project_standard/list/index.js | 10 +-
.../pageage/project_train/add/index.wxml | 6 +-
.../addSafetyInspect/index.wxml | 6 +-
miniprogram/pages/alter-ps/index.js | 218 +++++
miniprogram/pages/alter-ps/index.json | 4 +
miniprogram/pages/alter-ps/index.wxml | 47 +
miniprogram/pages/alter-ps/index.wxss | 139 +++
.../components/file-uploader-all/index.wxss | 2 +-
.../pages/components/file-uploader/index.wxss | 2 +-
.../pages/components/project-select/index.js | 8 +
.../components/project-select/index.wxml | 2 +-
.../pages/components/user-infos/index.js | 42 +-
.../components/voucher-many-select/index.js | 3 +-
.../components/voucher-many-select/index.wxml | 2 +-
.../components/voucher-many-select/index.wxss | 2 +-
miniprogram/pages/gengduogongneng/index.js | 5 +-
miniprogram/pages/gongchengliebiao/index.js | 4 +-
miniprogram/pages/login/index.js | 107 ++-
miniprogram/pages/login/index.wxml | 13 +-
miniprogram/pages/login/index.wxss | 63 +-
miniprogram/pages/map/map.js | 4 +-
.../approveCheckDetection/index.js | 57 +-
.../approveCheckDetection/index.wxml | 23 +-
.../project_approve/approveChecking/index.js | 14 +-
.../approveChecking/index.wxml | 313 +++----
.../project_flowable/approveTask/index.js | 46 +-
.../project_flowable/approveTask/index.wxml | 67 +-
.../project_flowable/approveTask/index.wxss | 11 +-
.../pages/project_flowable/await/index.js | 32 +-
.../pages/project_flowable/await/index.json | 3 +-
.../pages/project_flowable/await/index.wxml | 3 +-
.../pages/project_flowable/await/index.wxss | 3 +
.../project_flowable/detailTask/index.js | 47 +-
.../project_flowable/detailTask/index.wxml | 69 +-
.../project_flowable/detailTask/index.wxss | 11 +-
.../project_flowable/editLeaveTask/index.wxml | 2 +-
.../pages/project_flowable/editTask/index.js | 822 ++++++++++++------
.../project_flowable/editTask/index.json | 3 +-
.../project_flowable/editTask/index.wxml | 57 ++
.../project_flowable/editTask/index.wxss | 3 +
.../pages/project_flowable/initTask/index.js | 254 +++++-
.../project_flowable/initTask/index.json | 3 +-
.../project_flowable/initTask/index.wxml | 57 ++
.../project_flowable/initTask/index.wxss | 3 +
.../myFlowDefinition/index.js | 6 +-
.../myFlowDefinition/index.wxml | 2 +-
.../project_flowable/myProcessIns/index.js | 10 +-
.../project_flowable/myProcessIns/index.wxml | 3 +-
miniprogram/pages/wx-auth/index.js | 3 +-
miniprogram/pages/wx-auth/index.json | 3 +-
miniprogram/utils/format.wxs | 6 +
miniprogram/utils/json.js | 397 +++++++++
miniprogram/utils/request.js | 4 +-
project.config.json | 2 +-
project.private.config.json | 6 +-
105 files changed, 5442 insertions(+), 2706 deletions(-)
create mode 100644 miniprogram/pages/alter-ps/index.js
create mode 100644 miniprogram/pages/alter-ps/index.json
create mode 100644 miniprogram/pages/alter-ps/index.wxml
create mode 100644 miniprogram/pages/alter-ps/index.wxss
create mode 100644 miniprogram/utils/json.js
diff --git a/miniprogram/api/login.js b/miniprogram/api/login.js
index 14ec30a..5398245 100644
--- a/miniprogram/api/login.js
+++ b/miniprogram/api/login.js
@@ -1,4 +1,6 @@
-import {request} from '../utils/request'
+import {
+ request
+} from '../utils/request'
// 获取验证码
export function getCodeImg() {
@@ -8,19 +10,28 @@ export function getCodeImg() {
})
}
-// 登录方法
+// 用户登录
export function login(data) {
return request({
- url: '/wxApi/login',
+ url: '/wechat/login',
method: 'post',
data: data,
})
}
-// 登录方法
+// 修改密码
export function updatePwd(data) {
return request({
- url: '/wxApi/updatePwd',
+ url: '/wechat/v1/updatePassword',
+ method: 'post',
+ data: data,
+ })
+}
+
+// 修改密码
+export function codeUpdatePwd(data) {
+ return request({
+ url: '/wechat/v1/codeUpdatePwd',
method: 'post',
data: data,
})
@@ -34,10 +45,21 @@ export function loginOut() {
})
}
+// 发送短信验证码
+export function sendPhoneMessage(phoneNumber) {
+ return request({
+ url: '/wechat/v1/sendPhoneMessage',
+ method: 'post',
+ data: {
+ 'phoneNumber': phoneNumber
+ }
+ })
+}
+
// 查询公众号消息授权
export function findOpenUserMsgId(openId) {
return request({
- 'url': '/wechat/findOpenUserMsgId/'+openId,
+ 'url': '/wechat/findOpenUserMsgId/' + openId,
'method': 'get'
})
}
@@ -45,7 +67,7 @@ export function findOpenUserMsgId(openId) {
// 删除公众号消息授权
export function delOpenUserMsgId(openId) {
return request({
- 'url': '/wechat/delOpenUserMsgId/'+openId,
+ 'url': '/wechat/delOpenUserMsgId/' + openId,
'method': 'get'
})
}
\ No newline at end of file
diff --git a/miniprogram/api/publics.js b/miniprogram/api/publics.js
index ba00d99..a58078d 100644
--- a/miniprogram/api/publics.js
+++ b/miniprogram/api/publics.js
@@ -56,4 +56,12 @@ export function findProjectApplyData(id){
url: '/wxApi/publics/projectApply/'+id,
method: 'get'
})
+}
+
+// 获取系统字典信息
+export function getDictCache(type){
+ return request({
+ url: '/wechat/publics/v1/getDictCache/'+type,
+ method: 'get'
+ })
}
\ No newline at end of file
diff --git a/miniprogram/app.js b/miniprogram/app.js
index 5c72ef6..b47fde9 100644
--- a/miniprogram/app.js
+++ b/miniprogram/app.js
@@ -1,4 +1,6 @@
-//app.js
+import {
+ getToken
+} from '/utils/auth'
//全局分享
!function(){
@@ -78,11 +80,18 @@ App({
})
}
this.autoUpdate();
+ if(!getToken()){
+ setTimeout(() => {
+ this.toast("请使用手机号码登录",1500);
+ }, 1000);
+ wx.redirectTo({
+ url: '/pages/login/index',
+ });
+ return false;
+ }
},
- onLoad(){
-
- },
+ onLoad(){},
//页面弹窗
toast: function (msg) {
diff --git a/miniprogram/app.json b/miniprogram/app.json
index a66a2d1..3f737fc 100644
--- a/miniprogram/app.json
+++ b/miniprogram/app.json
@@ -1,6 +1,7 @@
{
"pages": [
"pages/login/index",
+ "pages/alter-ps/index",
"pages/wx-auth/index",
"pages/gongchengliebiao/index",
"pages/gengduogongneng/index",
diff --git a/miniprogram/app.wxss b/miniprogram/app.wxss
index 01559e0..c18b197 100644
--- a/miniprogram/app.wxss
+++ b/miniprogram/app.wxss
@@ -1867,4 +1867,8 @@ swiper-item video {
}
.van-steps--horizontal{
padding: 10px 20px !important;
+}
+
+.files_parent{
+ margin-bottom: 20rpx;
}
\ No newline at end of file
diff --git a/miniprogram/config.js b/miniprogram/config.js
index 1091789..5e6756d 100644
--- a/miniprogram/config.js
+++ b/miniprogram/config.js
@@ -4,6 +4,5 @@ module.exports = {
appId: "wx9997d071b4996f23",
//baseUrl: 'http://127.0.0.1:8091',
baseUrl: 'https://szgcwx.jhncidg.com',
- manageUrl: 'https://szgc.jhncidg.com',
- noSecuritys:['/wechat/captchaImage','/wxApi/login']
+ noSecuritys:['/wechat/captchaImage','/wechat/login','/wechat/v1/sendPhoneMessage','/wechat/v1/codeUpdatePwd']
};
\ No newline at end of file
diff --git a/miniprogram/pageage/flow_labour/check/index.wxml b/miniprogram/pageage/flow_labour/check/index.wxml
index eab6e8a..04cdd66 100644
--- a/miniprogram/pageage/flow_labour/check/index.wxml
+++ b/miniprogram/pageage/flow_labour/check/index.wxml
@@ -151,14 +151,14 @@
- 处理意见 [必填项]
+ 处理意见 [必填项]
- 凭证附件 [非必填]
+ 凭证附件 [非必填项]
diff --git a/miniprogram/pageage/flow_labour/list/index.js b/miniprogram/pageage/flow_labour/list/index.js
index 8a8c2e6..2b6c2ff 100644
--- a/miniprogram/pageage/flow_labour/list/index.js
+++ b/miniprogram/pageage/flow_labour/list/index.js
@@ -1,4 +1,7 @@
import {list,findGroupCountByApprove} from "../../../api/flowLabour"
+import {
+ getToken
+} from '../../../utils/auth'
const app = getApp()
Page({
@@ -38,19 +41,19 @@ Page({
wx.redirectTo({
url: `../check/index?id=${id}`,
})
- }else if(this.data.minRoleId=='4' (approveStatus == '20' || approveStatus == '31')){
+ }else if(this.data.minRoleId=='4' && (approveStatus == '20' || approveStatus == '31')){
wx.redirectTo({
url: `../check/index?id=${id}`,
})
- }else if(this.data.minRoleId=='4' (approveStatus == '10' || approveStatus == '21')){
+ }else if(this.data.minRoleId=='4' && (approveStatus == '10' || approveStatus == '21')){
wx.redirectTo({
url: `../info/index?id=${id}`,
})
- }else if(this.data.minRoleId!='4' (approveStatus == '10' || approveStatus == '21')){
+ }else if(this.data.minRoleId!='4' && (approveStatus == '10' || approveStatus == '21')){
wx.redirectTo({
url: `../check/index?id=${id}`,
})
- }else if(this.data.minRoleId!='4' (approveStatus == '20' || approveStatus == '31')){
+ }else if(this.data.minRoleId!='4' && (approveStatus == '20' || approveStatus == '31')){
wx.redirectTo({
url: `../info/index?id=${id}`,
})
@@ -66,6 +69,11 @@ Page({
* 生命周期函数--监听页面加载
*/
onLoad(options) {
+ if(!getToken()){
+ wx.redirectTo({
+ url: '../../../pages/login/index',
+ })
+ }
if (options && options.barProId) {
//数据未加载完毕，从文件读取数据
if (app.globalData.projectInfoList.length == 0) {
@@ -95,12 +103,8 @@ Page({
id: app.globalData.projectId
}
})
- },
- fail: err => {
- //未获取用户信息时，重新登录
- wx.redirectTo({
- url: '../pages/login/index',
- })
+ let myProjects = this.selectComponent("#projectSel");
+ myProjects.load();
}
})
} else {
@@ -175,13 +179,17 @@ Page({
//判断角色，
let mr = this.data.minRoleId;
let deptId = this.data.deptId;
+ let projDept = this.data.deptId;
if (mr == 2 || mr == 3 || mr == 4) {
deptId = 0;
}
+ if(mr == 4){
+ projDept = app.globalData.projectInfoList[0].deptId
+ }
let param = {
"projectId": this.data.projectId,
"deptId": deptId,
- "nowDept": deptId,
+ "nowDept": projDept,
"nowRole": mr,
"nowUser": this.data.loginName,
"activeName": that.data.activeState
diff --git a/miniprogram/pageage/flow_labour/list/index.wxml b/miniprogram/pageage/flow_labour/list/index.wxml
index 18a9743..ae7b4ab 100644
--- a/miniprogram/pageage/flow_labour/list/index.wxml
+++ b/miniprogram/pageage/flow_labour/list/index.wxml
@@ -14,7 +14,7 @@
-
+
进行中（{{jxzCount}}）
已完成（{{ywcCount}}）
@@ -26,11 +26,11 @@
{{index < 9 ?'0'+(index+1):(index+1)}}
投诉时间：{{format.parseDate(item.createTime)}}
- 待项目经理审批
- 甲方代表审批驳回
- 待甲方代表审批
- 集团公司审批驳回
- 待集团公司审批
+ 待项目经理办
+ 甲方代表驳回
+ 待甲方代表审
+ 集团公司驳回
+ 待集团公司审
审批完成
diff --git a/miniprogram/pageage/project_checkDetection/add/index.js b/miniprogram/pageage/project_checkDetection/add/index.js
index 1754ac9..06630e7 100644
--- a/miniprogram/pageage/project_checkDetection/add/index.js
+++ b/miniprogram/pageage/project_checkDetection/add/index.js
@@ -1,4 +1,6 @@
-// pageage/safetyManagement/addSafetyInspect/index.js
+import {
+ syncFileUpload
+} from '../../../utils/request'
const app = getApp()
Page({
@@ -6,92 +8,116 @@ Page({
* 页面的初始数据
*/
data: {
- maxDate:new Date(2088,1,1).getTime(),
- currentDate:new Date().getTime(),
- deptId:"",
- projectId:"",
- projectName:"",
- loginName:"",
- rectifierData:[],
- loadShow:false,
- checkTypeList:[],
- checkType:"1",
- materialName:"",
- usePosition:"",
- sampleNum:"",
- qualifiedFlag:"Y",
- witnessUser:"",
- witnessUserName:"",
- checkTime:"",
- laboratoryName:"",
- qualifiedFlagList:[{id:'Y',text:"是"},{id:'N',text:"否"}],
- flowNodes:[{text:'开始'},{text:'提交申请'},{text:'检测报告'},{text:'监理审批'},{text:'结束'}],
- active: 0
+ maxDate: new Date(2088, 1, 1).getTime(),
+ deptId: "",
+ projectId: "",
+ projectName: "",
+ loginName: "",
+ rectifierData: [],
+ loadShow: false,
+ checkTypeList: [],
+ checkType: "1",
+ materialName: "",
+ usePosition: "",
+ sampleNum: "",
+ qualifiedFlag: "Y",
+ witnessUser: "",
+ witnessUserName: "",
+ checkTime: "",
+ laboratoryName: "",
+ qualifiedFlagList: [{
+ id: 'Y',
+ text: "是"
+ }, {
+ id: 'N',
+ text: "否"
+ }],
+ flowNodes: [{
+ text: '开始'
+ }, {
+ text: '提交申请'
+ }, {
+ text: '检测报告'
+ }, {
+ text: '监理审批'
+ }, {
+ text: '结束'
+ }],
+ active: 0,
+ trustDeed: [],
+ attachment: [],
+ fileType: ["doc", "docx", "xls", "xlsx", "ppt", "pptx", "pdf", "png", "jpg", "jpeg"]
},
/**
* 生命周期函数--监听页面加载
*/
onLoad(options) {
- let {projectId,projectName} = options
+ let {
+ projectId,
+ projectName
+ } = options
//获取缓存数据
wx.getStorage({
- key: 'userinfo',
- success:res=>{
- this.setData({
- projectId,
- projectName,
- deptId:res.data.deptId,
- loginName:res.data.loginName,
- })
- this.getProjectUserData();
- this.getTypeList();
- }
- })
+ key: 'userinfo',
+ success: res => {
+ this.setData({
+ projectId,
+ projectName,
+ deptId: res.data.deptId,
+ loginName: res.data.loginName,
+ })
+ this.getProjectUserData();
+ this.getTypeList();
+ }
+ })
},
//查询项目人员数据
- getProjectUserData(){
+ getProjectUserData() {
let that = this
wx.request({
- url: app.globalData.reqUrl+'/wechat/projectuserinfo/selectProjectUnitUser',
- method:"get",
- data:{
- unitType:"4",
- projectId:that.data.projectId
+ url: app.globalData.reqUrl + '/wechat/projectuserinfo/selectProjectUnitUser',
+ method: "get",
+ data: {
+ unitType: "4",
+ projectId: that.data.projectId
},
- header:{
- 'content-type': 'application/x-www-form-urlencoded'
+ header: {
+ 'content-type': 'application/x-www-form-urlencoded'
},
- success(res){
+ success(res) {
res = res.data
- if(res.code == 200){
+ if (res.code == 200) {
that.setData({
- rectifierData:res.data
+ rectifierData: res.data
})
}
}
})
},
- getTypeList(){
+ getTypeList() {
let that = this
wx.request({
- url: app.globalData.reqUrl+'/wechat/projectDetection/queryType',
- method:"get",
- data:{},
- header:{
- 'content-type': 'application/x-www-form-urlencoded'
+ url: app.globalData.reqUrl + '/wechat/projectDetection/queryType',
+ method: "get",
+ data: {},
+ header: {
+ 'content-type': 'application/x-www-form-urlencoded'
},
- success(res){
+ success(res) {
res = res.data
- if(res.code == 200){
- let list=[];
- res.data.forEach(it =>{
- list.push({"id":it.dictValue,"text":it.dictLabel});
+ if (res.code == 200) {
+ let list = [];
+ res.data.forEach(it => {
+ list.push({
+ "id": it.dictValue,
+ "text": it.dictLabel
+ });
})
that.setData({
- checkTypeList:list
+ checkTypeList: list
})
}
}
@@ -99,7 +125,7 @@ Page({
},
//材料名称
- onInputMaterialNameValue(e){
+ onInputMaterialNameValue(e) {
let materialName = e.detail.value
this.setData({
materialName
@@ -107,29 +133,29 @@ Page({
},
//使用部位
- onInputUsePositionValue(e){
+ onInputUsePositionValue(e) {
let usePosition = e.detail.value
this.setData({
usePosition
})
},
//取样数量
- onInputSampleNumValue(e){
+ onInputSampleNumValue(e) {
let sampleNum = e.detail.value
this.setData({
sampleNum
})
},
//送检实验室名称
- onInputLaboratoryNameValue(e){
+ onInputLaboratoryNameValue(e) {
let laboratoryName = e.detail.value
this.setData({
laboratoryName
})
},
-
+
//验收时间
- onInputTime(e){
+ onInputTime(e) {
let checkTime = e.detail
this.setData({
checkTime
@@ -137,118 +163,38 @@ Page({
},
//添加监理专员
- onAddSend(e){
- if(e.detail.length>0){
- let phoneNumbers="";
- let userNames="";
- e.detail.forEach(it =>{
- phoneNumbers+=","+it.phoneNumber;
- userNames+=","+it.userName;
+ onAddSend(e) {
+ if (e.detail.length > 0) {
+ let phoneNumbers = "";
+ let userNames = "";
+ e.detail.forEach(it => {
+ phoneNumbers += "," + it.phoneNumber;
+ userNames += "," + it.userName;
});
this.setData({
- witnessUserName:userNames.substring(1),
- witnessUser:phoneNumbers.substring(1)
+ witnessUserName: userNames.substring(1),
+ witnessUser: phoneNumbers.substring(1)
})
- }else{
+ } else {
this.setData({
- witnessUser:"",
- witnessUserName:""
+ witnessUser: "",
+ witnessUserName: ""
})
}
},
-
+
//取消页面
- cancelSaveView(){
+ cancelSaveView() {
this.returnToPage()
},
//保存
- onSubmitSave(){
+ onSubmitSave() {
this.setData({
- loadShow:true
+ loadShow: true
})
let that = this
- let {projectId,deptId,checkType,
- materialName,
- usePosition,
- sampleNum,
- qualifiedFlag,
- witnessUser,
- witnessUserName,
- checkTime,
- laboratoryName,loginName} = that.data;
- //数据效验
- if(projectId==""||loginName==""||deptId==""){
- app.toast("数据异常，请刷新页面重试!")
- that.setData({
- loadShow:false
- })
- return;
- }
- if(checkType==""){
- app.toast("请选择送检类型!")
- that.setData({
- loadShow:false
- })
- return;
- }
- if(materialName==""){
- app.toast("请填写材料名称!")
- that.setData({
- loadShow:false
- })
- return;
- }
- if(sampleNum==""){
- app.toast("请填写取样数量!")
- that.setData({
- loadShow:false
- })
- return;
- }
- if(usePosition==""){
- app.toast("请填写使用部位!")
- that.setData({
- loadShow:false
- })
- return;
- }
- if(qualifiedFlag==""){
- app.toast("请选择是否提供合格证!")
- that.setData({
- loadShow:false
- })
- return;
- }
- if(qualifiedFlag==""){
- app.toast("请选择是否提供合格证!")
- that.setData({
- loadShow:false
- })
- return;
- }
- if(witnessUser==""||witnessUserName==""){
- app.toast("请选择见证人!")
- that.setData({
- loadShow:false
- })
- return;
- }
- if(checkTime==""){
- app.toast("请选择送检时间!")
- that.setData({
- loadShow:false
- })
- return;
- }
- if(laboratoryName==""){
- app.toast("请填写送检实验室名称!")
- that.setData({
- loadShow:false
- })
- return;
- }
- let params = {
+ let {
projectId,
deptId,
checkType,
@@ -258,54 +204,209 @@ Page({
qualifiedFlag,
witnessUser,
witnessUserName,
- checkTime:checkTime+":00",
+ checkTime,
laboratoryName,
- createBy:loginName
+ loginName,
+ trustDeed,
+ attachment
+ } = that.data;
+ //数据效验
+ if (projectId == "" || loginName == "" || deptId == "") {
+ app.toast("数据异常，请刷新页面重试!")
+ that.setData({
+ loadShow: false
+ })
+ return;
}
- wx.request({
- url: app.globalData.reqUrl + '/wechat/projectDetection/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.redirectTo({
- url: '../list/index',
- })
- },200)
+ if (checkType == "") {
+ app.toast("请选择送检类型!")
+ that.setData({
+ loadShow: false
+ })
+ return;
+ }
+ if (materialName == "") {
+ app.toast("请填写材料名称!")
+ that.setData({
+ loadShow: false
+ })
+ return;
+ }
+ if (sampleNum == "") {
+ app.toast("请填写取样数量!")
+ that.setData({
+ loadShow: false
+ })
+ return;
+ }
+ if (usePosition == "") {
+ app.toast("请填写使用部位!")
+ that.setData({
+ loadShow: false
+ })
+ return;
+ }
+ if (qualifiedFlag == "") {
+ app.toast("请选择是否提供合格证!")
+ that.setData({
+ loadShow: false
+ })
+ return;
+ }
+ if (qualifiedFlag == "") {
+ app.toast("请选择是否提供合格证!")
+ that.setData({
+ loadShow: false
+ })
+ return;
+ }
+ if (witnessUser == "" || witnessUserName == "") {
+ app.toast("请选择见证人!")
+ that.setData({
+ loadShow: false
+ })
+ return;
+ }
+ if (checkTime == "") {
+ app.toast("请选择送检时间!")
+ that.setData({
+ loadShow: false
+ })
+ return;
+ }
+ if (laboratoryName == "") {
+ app.toast("请填写送检实验室名称!")
+ that.setData({
+ loadShow: false
+ })
+ return;
+ }
+ if (trustDeed.length == 0) {
+ app.toast("请上传检验委托单!")
+ that.setData({
+ loadShow: false
+ })
+ return;
+ }
+ if (attachment.length > 0) {
+ for (let i = 0; i < attachment.length; i++) {
+ let _fileType = attachment[i].path.split('.');
+ _fileType = _fileType[_fileType.length - 1].toLowerCase();
+ //判断附件类型，如果是图片直接展示，非图片则显示附件
+ if (this.data.fileType.indexOf(_fileType) == -1) {
+ app.toast("当前 [ " + _fileType + " ] 文件不支持上传!")
+ that.setData({
+ loadShow: false
+ });
+ return;
}
}
- })
+ }
+ let _files = [];
+ trustDeed.forEach(item => {
+ syncFileUpload(item).then(res => {
+ if (res.code == 200) {
+ let params = {
+ projectId,
+ deptId,
+ checkType,
+ materialName,
+ usePosition,
+ sampleNum,
+ qualifiedFlag,
+ witnessUser,
+ witnessUserName,
+ checkTime: checkTime,
+ laboratoryName,
+ createBy: loginName,
+ trustDeed: res.fileName
+ }
+ if (attachment.length > 0) {
+ attachment.forEach(file => {
+ syncFileUpload(file.path).then(res => {
+ _files.push(res.fileName);
+ if (attachment.length == _files.length) {
+ params.attachment = JSON.stringify(_files);
+ this.submitForm(params);
+ }
+ });
+ });
+ } else {
+ this.submitForm(params);
+ }
+ }
+ });
+ });
+ },
+
+ /**
+ * 提交表单
+ * @param {*} params
+ */
+ submitForm(params) {
+ let that = this;
+ wx.request({
+ url: app.globalData.reqUrl + '/wechat/projectDetection/add',
+ method: "POST",
+ data: params,
+ header: {
+ "Username": that.data.loginName,
+ "Content-Type": "application/json"
+ },
+ success(res) {
+ that.setData({
+ loadShow: false
+ })
+ res = res.data
+ if (res.code == 200) {
+ app.toast("添加成功!")
+ setTimeout(() => {
+ wx.redirectTo({
+ url: '../list/index',
+ })
+ }, 200)
+ }
+ }
+ })
},
//选择检测类型
- onSelectCheckType(e){
+ onSelectCheckType(e) {
this.setData({
- checkType:e.detail.id
+ checkType: e.detail.id
})
- },
- //选择是否提供合格证
- onSelectQualifiedFlag(e){
+ },
+ //选择是否提供合格证
+ onSelectQualifiedFlag(e) {
this.setData({
- qualified:e.detail.id
+ qualified: e.detail.id
})
- },
-
- returnToPage: function () {
- /*关闭当前页面，跳转到应用内的某个页面。但是不允许跳转到 tabbar 页面*/
- wx.redirectTo({
- url: '../list/index',
- })
- },
+ },
+
+ // list 上传图片
+ onImagesArr(e) {
+ this.setData({
+ trustDeed: e.detail
+ })
+ },
+
+ /**
+ * 相关附件上传
+ * @param {*} options
+ */
+ otherFileUpload(options) {
+ let file = options.detail;
+ this.setData({
+ attachment: file
+ });
+ },
+
+ returnToPage: function () {
+ /*关闭当前页面，跳转到应用内的某个页面。但是不允许跳转到 tabbar 页面*/
+ wx.redirectTo({
+ url: '../list/index',
+ })
+ },
/**
* 生命周期函数--监听页面初次渲染完成
diff --git a/miniprogram/pageage/project_checkDetection/add/index.wxml b/miniprogram/pageage/project_checkDetection/add/index.wxml
index 826e902..10da52b 100644
--- a/miniprogram/pageage/project_checkDetection/add/index.wxml
+++ b/miniprogram/pageage/project_checkDetection/add/index.wxml
@@ -1,130 +1,95 @@
-
- {{projectName}}
-
-
+
+ {{projectName}}
+
+
送检类型
-
-
-
-
- 材料名称
-
-
+
+
-
-
- 取样数量
-
-
+
+ 材料名称
+
+
+
-
-
- 使用部位
-
-
+
+ 取样数量
+
+
+
-
-
- 是否提供合格证
-
-
+
+ 使用部位
+
+
+
-
-
+
+ 是否提供合格证
+
+
+
+
+
监理专员
-
-
-
- 送检时间
-
-
+
+
+
+ 送检时间
+
+
+
+
+
+ 送检实验室名称
+
+
+
+
+
+ 检验委托单
+
+
+
+
+
+ 其它附件 [非必填项]
+
+
+
-
- 送检实验室名称
-
-
-
+
+ 取消
+ 提交送检
-
- 取消
- 提交送检
-
-
数据加载中！请稍后...
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
\ No newline at end of file
diff --git a/miniprogram/pageage/project_checkDetection/check/index.js b/miniprogram/pageage/project_checkDetection/check/index.js
index 6616eaa..a0e70da 100644
--- a/miniprogram/pageage/project_checkDetection/check/index.js
+++ b/miniprogram/pageage/project_checkDetection/check/index.js
@@ -2,333 +2,417 @@
const app = getApp()
Page({
- /**
- * 页面的初始数据
- */
- data: {
- id:"",
- infoData:{},
- loadShow:false,
- loginName:"",
- showDel:false,
- detectionImageList:[],
- minDetectionFileImages:[],
- detectionFiles:[],
- list:[{id:1,text:"合格"},{id:2,text:"不合格"}],
- detectionResult:"1",
- detectionFileData:[],
- fileType:["pdf","png","jpg","jpeg"],
- request:app.globalData.reqUrl,
- flowNodes:[{text:'开始'},{text:'提交申请'},{text:'检测报告'},{text:'监理审批'},{text:'结束'}],
- active: 2
- },
-
- /**
- * 生命周期函数--监听页面加载
- */
- onLoad(options) {
- let {id} = options
- //获取缓存数据
- wx.getStorage({
- key: 'userinfo',
- success:res=>{
- this.setData({
- id,
- loginName:res.data.loginName
- })
- this.getInfo();
- }
- })
- },
-
- //取消页面
- cancelSaveView(){
- this.returnToPage()
- },
-
- /**
- * 获取安全检查详情信息
- *
- */
- getInfo(){
- let {id} = this.data
- let that = this
- wx.request({
- url: app.globalData.reqUrl+'/wechat/projectDetection/info',
- method:"get",
- data:{
- id:id
- },
- success(res){
- res = res.data
- if(res.code == 200){
- let imageUrls = [];
- let minImageUrls = [];
- let fileUrls = [];
- //判断附件
- if(res.data.detectionFile){
- res.data.detectionFile.split(',').forEach(element => {
- let _file = element.split('.');
- _file = _file[_file.length-1].toLocaleUpperCase();
- //判断附件类型，如果是图片直接展示，非图片则显示附件
- if(_file=="PNG"||_file=="JPG"||_file=="JPEG"){
- imageUrls.push(that.data.request+element);
- minImageUrls.push(that.data.request+element+'.min.jpg');
- }else{
- fileUrls.push(element);
- }
- });
- }
- that.setData({
- infoData:res.data,
- detectionImageList:imageUrls,
- minDetectionFileImages:minImageUrls,
- detectionFiles:fileUrls,
- loadShow:false
- })
- //判断当前能否删除
- if(res.data.createBy==that.data.loginName){
- that.setData({
- showDel:true
- })
- }
- }
- }
- })
- },
-
- //保存
- onSubmitSave(){
- this.setData({
- loadShow:true
- })
- let that = this
- let {id,detectionResult,detectionFileData,loginName} = that.data;
- //数据效验
- if(id==""||loginName==""){
- app.toast("数据异常，请刷新页面重试!")
- that.setData({
- loadShow:false
- })
- return;
- }
- // if(detectionResult==""){
- // app.toast("请选择检测结果!")
- // that.setData({
- // loadShow:false
- // })
- // return;
- // }
- if(detectionFileData.length==0){
- app.toast("请上传检测报告!")
- that.setData({
- loadShow:false
- })
- return;
- }
- let _fileType = detectionFileData[0].path.split('.');
- _fileType = _fileType[_fileType.length-1].toLowerCase();
- //判断附件类型，如果是图片直接展示，非图片则显示附件
- if(this.data.fileType.indexOf(_fileType)==-1){
- app.toast("检测报告不支持 [ "+_fileType+" ] 格式!")
- that.setData({
- loadShow:false
- });
- return;
- }
- detectionFileData.forEach(async (item)=>{
- let uploadUrl = app.globalData.uploadUrl+'/common/upload'
- let uploadName = "file"
- //这里复杂的图片上传，改为同步上传，因为小程序只能上传一张图片
- let obj = await that.syncUploadImage(uploadUrl,item.path,uploadName);
- let params = {
- id,
- checkState:"2",
- //detectionResult,
- detectionFile:obj.data.fileName,
- approveStatus:"1",
- updateBy:loginName
- }
-
- wx.request({
- url: app.globalData.reqUrl + "/wechat/projectDetection/edit",
- 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.redirectTo({
- 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)
- }
- });
- })
+ /**
+ * 页面的初始数据
+ */
+ data: {
+ id: "",
+ infoData: {},
+ loadShow: false,
+ loginName: "",
+ showDel: false,
+ detectionImageList: [],
+ minDetectionFileImages: [],
+ detectionFiles: [],
+ list: [{
+ id: 1,
+ text: "合格"
+ }, {
+ id: 2,
+ text: "不合格"
+ }],
+ detectionResult: "1",
+ detectionFileData: [],
+ fileType: ["pdf", "png", "jpg", "jpeg"],
+ request: app.globalData.reqUrl,
+ flowNodes: [{
+ text: '开始'
+ }, {
+ text: '提交申请'
+ }, {
+ text: '检测报告'
+ }, {
+ text: '监理审批'
+ }, {
+ text: '结束'
+ }],
+ active: 2,
+ attachments: []
},
- onDelete(){
- //弹出确认
- let that = this
- wx.showModal({
- title: '提示',
- content: '是否确定删除此条数据？',
- success: function (sm) {
- if (sm.confirm) {
- // 用户点击了确定 可以调用了
- that.deleteData();
- } else if (sm.cancel) {
- console.log('用户点击取消');
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad(options) {
+ let {
+ id
+ } = options
+ //获取缓存数据
+ wx.getStorage({
+ key: 'userinfo',
+ success: res => {
+ this.setData({
+ id,
+ loginName: res.data.loginName
+ })
+ this.getInfo();
+ }
+ })
+ },
+
+ //取消页面
+ cancelSaveView() {
+ this.returnToPage()
+ },
+
+ /**
+ * 获取安全检查详情信息
+ *
+ */
+ getInfo() {
+ let {
+ id
+ } = this.data
+ let that = this
+ wx.request({
+ url: app.globalData.reqUrl + '/wechat/projectDetection/info',
+ method: "get",
+ data: {
+ id: id
+ },
+ success(res) {
+ res = res.data
+ if (res.code == 200) {
+ let imageUrls = [];
+ let minImageUrls = [];
+ let fileUrls = [];
+ //判断附件
+ if (res.data.detectionFile) {
+ res.data.detectionFile.split(',').forEach(element => {
+ let _file = element.split('.');
+ _file = _file[_file.length - 1].toLocaleUpperCase();
+ //判断附件类型，如果是图片直接展示，非图片则显示附件
+ if (_file == "PNG" || _file == "JPG" || _file == "JPEG") {
+ imageUrls.push(that.data.request + element);
+ minImageUrls.push(that.data.request + element + '.min.jpg');
+ } else {
+ fileUrls.push(element);
+ }
+ });
+ }
+ let attachments = [];
+ if (res.data.attachment) {
+ let files = JSON.parse(res.data.attachment);
+ if (files && files.length > 0) {
+ files.forEach(item => {
+ let it = item.split('/');
+ attachments.push({
+ 'name': it[it.length - 1],
+ path: item
+ });
+ });
}
}
- })
- },
- deleteData(){
- let {id} = this.data
- wx.request({
- url: app.globalData.reqUrl+'/wechat/projectDetection/remove',
- header: {
- "Username": this.data.loginName,
- },
- data:{
- id:id
- },
- method:"get",
- success(res){
- app.toast("删除成功！")
- wx.redirectTo({
- url: `../list/index`,
+ that.setData({
+ infoData: res.data,
+ attachments,
+ detectionImageList: imageUrls,
+ minDetectionFileImages: minImageUrls,
+ detectionFiles: fileUrls,
+ loadShow: false
+ })
+ //判断当前能否删除
+ if (res.data.createBy == that.data.loginName) {
+ that.setData({
+ showDel: true
})
}
+ }
+ }
+ })
+ },
+
+ //保存
+ onSubmitSave() {
+ this.setData({
+ loadShow: true
+ })
+ let that = this
+ let {
+ id,
+ detectionResult,
+ detectionFileData,
+ loginName
+ } = that.data;
+ //数据效验
+ if (id == "" || loginName == "") {
+ app.toast("数据异常，请刷新页面重试!")
+ that.setData({
+ loadShow: false
+ })
+ return;
+ }
+ // if(detectionResult==""){
+ // app.toast("请选择检测结果!")
+ // that.setData({
+ // loadShow:false
+ // })
+ // return;
+ // }
+ if (detectionFileData.length == 0) {
+ app.toast("请上传检测报告!")
+ that.setData({
+ loadShow: false
+ })
+ return;
+ }
+ let _fileType = detectionFileData[0].path.split('.');
+ _fileType = _fileType[_fileType.length - 1].toLowerCase();
+ //判断附件类型，如果是图片直接展示，非图片则显示附件
+ if (this.data.fileType.indexOf(_fileType) == -1) {
+ app.toast("检测报告不支持 [ " + _fileType + " ] 格式!")
+ that.setData({
+ loadShow: false
+ });
+ return;
+ }
+ detectionFileData.forEach(async (item) => {
+ let uploadUrl = app.globalData.uploadUrl + '/common/upload'
+ let uploadName = "file"
+ //这里复杂的图片上传，改为同步上传，因为小程序只能上传一张图片
+ let obj = await that.syncUploadImage(uploadUrl, item.path, uploadName);
+ let params = {
+ id,
+ checkState: "2",
+ //detectionResult,
+ detectionFile: obj.data.fileName,
+ approveStatus: "1",
+ updateBy: loginName
+ }
+
+ wx.request({
+ url: app.globalData.reqUrl + "/wechat/projectDetection/edit",
+ 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.redirectTo({
+ 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)
+ }
+ });
+ })
+ },
+
+ 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/projectDetection/remove',
+ header: {
+ "Username": this.data.loginName,
+ },
+ data: {
+ id: id
+ },
+ method: "get",
+ success(res) {
+ app.toast("删除成功！")
+ wx.redirectTo({
+ url: `../list/index`,
})
- },
+ }
+ })
+ },
//跳转修改页面
- onUpdate:function(){
+ onUpdate: function () {
let id = this.data.id;
wx.redirectTo({
url: `../edit/index?id=${id}`,
})
},
- //展示图片
- showImg:function(e){
- var that=this;
- wx.previewImage({
- urls: that.data.imageList,
- current: that.data.imageList[e.currentTarget.dataset.index]
- })
+ //展示图片
+ showImg: function (e) {
+ var that = this;
+ wx.previewImage({
+ urls: that.data.imageList,
+ current: that.data.imageList[e.currentTarget.dataset.index]
+ })
},
- //选择检测类型
- onSelect(e){
- this.setData({
- detectionResult:e.detail.id
- })
- },
-
- fileUpload(options){
- let file=options.detail;
- this.setData({
- detectionFileData: file
- });
- },
-
- returnToPage: function () {
- /*关闭当前页面，跳转到应用内的某个页面。但是不允许跳转到 tabbar 页面*/
- wx.redirectTo({
- url: '../list/index',
- })
- },
-
- /**
- * 生命周期函数--监听页面初次渲染完成
- */
- onReady() {
-
- },
-
- /**
- * 生命周期函数--监听页面显示
- */
- onShow() {
-
- },
-
- /**
- * 生命周期函数--监听页面隐藏
- */
- onHide() {
-
- },
-
- /**
- * 生命周期函数--监听页面卸载
- */
- onUnload() {
-
- },
-
- /**
- * 页面相关事件处理函数--监听用户下拉动作
- */
- onPullDownRefresh() {
-
- },
-
- /**
- * 页面上拉触底事件的处理函数
- */
- onReachBottom() {
-
- },
-
- /**
- * 用户点击右上角分享
- */
- onShareAppMessage() {
-
+ //展示图片
+ showImg2: function (e) {
+ if (this.data.infoData.trustDeed != null) {
+ let imgs = this.data.infoData.trustDeed.split(',');
+ let list = [];
+ imgs.forEach(item => {
+ list.push(this.data.request + item);
+ })
+ wx.previewImage({
+ urls: list,
+ current: imgs[e.currentTarget.dataset.index]
+ })
}
+ },
+
+ //选择检测类型
+ onSelect(e) {
+ this.setData({
+ detectionResult: e.detail.id
+ })
+ },
+
+ fileUpload(options) {
+ let file = options.detail;
+ this.setData({
+ detectionFileData: file
+ });
+ },
+
+ /**
+ * 下载附件
+ * @param {*} e
+ */
+ downFile: function (e) {
+ let {
+ path,
+ } = e.currentTarget.dataset.set
+ wx.downloadFile({
+ url: app.globalData.uploadUrl + '/common/download/resource?resource=' + path,
+ success: function (res) {
+ const filePath = res.tempFilePath
+ wx.openDocument({
+ filePath: filePath,
+ success: function (res) {
+ console.log('打开文档成功')
+ },
+ fail: function (res) {
+ console.log(res)
+ }
+ })
+ }
+ })
+ },
+
+ returnToPage: function () {
+ /*关闭当前页面，跳转到应用内的某个页面。但是不允许跳转到 tabbar 页面*/
+ wx.redirectTo({
+ url: '../list/index',
+ })
+ },
+
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ onReady() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面隐藏
+ */
+ onHide() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload() {
+
+ },
+
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh() {
+
+ },
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom() {
+
+ },
+
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage() {
+
+ }
})
\ No newline at end of file
diff --git a/miniprogram/pageage/project_checkDetection/check/index.wxml b/miniprogram/pageage/project_checkDetection/check/index.wxml
index 499ede0..56f91d3 100644
--- a/miniprogram/pageage/project_checkDetection/check/index.wxml
+++ b/miniprogram/pageage/project_checkDetection/check/index.wxml
@@ -1,4 +1,4 @@
-
+
-
+
+ 删除
+ 修改
+
+
\ No newline at end of file
diff --git a/miniprogram/pageage/project_checkDetection/list/index.js b/miniprogram/pageage/project_checkDetection/list/index.js
index 8715ca0..6b338ad 100644
--- a/miniprogram/pageage/project_checkDetection/list/index.js
+++ b/miniprogram/pageage/project_checkDetection/list/index.js
@@ -1,4 +1,6 @@
-// pageage/safetyManagement/securityCheckGR/index.js
+import {
+ getToken
+} from '../../../utils/auth'
const app = getApp()
Page({
@@ -58,6 +60,11 @@ Page({
* 生命周期函数--监听页面加载
*/
onLoad(options) {
+ if(!getToken()){
+ wx.redirectTo({
+ url: '../../../pages/login/index',
+ })
+ }
if (options && options.barProId) {
//数据未加载完毕，从文件读取数据
if (app.globalData.projectInfoList.length == 0) {
@@ -87,12 +94,8 @@ Page({
id: app.globalData.projectId
}
})
- },
- fail: err => {
- //未获取用户信息时，重新登录
- wx.redirectTo({
- url: '../pages/login/index',
- })
+ let myProjects = this.selectComponent("#projectSel");
+ myProjects.load();
}
})
} else {
diff --git a/miniprogram/pageage/project_checkDetection/list/index.wxml b/miniprogram/pageage/project_checkDetection/list/index.wxml
index 9331e05..b214c6c 100644
--- a/miniprogram/pageage/project_checkDetection/list/index.wxml
+++ b/miniprogram/pageage/project_checkDetection/list/index.wxml
@@ -13,7 +13,7 @@
-
+
进行中（{{jxzCount}}）
已完成（{{ywcCount}}）
diff --git a/miniprogram/pageage/project_checking/add/index.js b/miniprogram/pageage/project_checking/add/index.js
index 201f5e8..b0b098f 100644
--- a/miniprogram/pageage/project_checking/add/index.js
+++ b/miniprogram/pageage/project_checking/add/index.js
@@ -1,4 +1,6 @@
-// pageage/safetyManagement/addSafetyInspect/index.js
+import {
+ syncFileUpload
+} from '../../../utils/request'
const app = getApp()
Page({
@@ -6,98 +8,117 @@ Page({
* 页面的初始数据
*/
data: {
- maxDate:new Date(2088,1,1).getTime(),
- currentDate:new Date().getTime(),
- deptId:"",
- projectId:"",
- projectName:"",
- loginName:"",
- userName:"",
- rectifierData:[],
- rectifierData2:[],
- imageInfoData:[],
- checkingResult:"1",
+ maxDate: new Date(2088, 1, 1).getTime(),
+ minDate: new Date(2001, 1, 1).getTime(),
+ deptId: "",
+ projectId: "",
+ projectName: "",
+ loginName: "",
+ userName: "",
+ rectifierData: [],
+ rectifierData2: [],
+ imageInfoData: [],
+ checkingResult: "1",
//验收时间
- checkTime:'',
- loadShow:false,
- qualityUser:"",
- qualityUserName:"",
- superviseUser:"",
- superviseUserName:"",
- checkWorkingPosition:"",
- intro:"",
- dataTypeLvl1:"1",
- dataTypeLvl2:"",
- dataTypeLvl1List:[],
- dataTypeLvl2List:[],
- dataTypeLvl2AllList:[],
- list:[{id:1,text:"合格"},{id:2,text:"不合格"}],
- flowNodes:[{text:'开始'},{text:'提交申请'},{text:'监理审批'},{text:'结束'}],
- active: 0
+ checkTime: '',
+ loadShow: false,
+ qualityUser: "",
+ qualityUserName: "",
+ superviseUser: "",
+ superviseUserName: "",
+ checkWorkingPosition: "",
+ intro: "",
+ dataTypeLvl1: "1",
+ dataTypeLvl2: "",
+ dataTypeLvl1List: [],
+ dataTypeLvl2List: [],
+ dataTypeLvl2AllList: [],
+ list: [{
+ id: 1,
+ text: "合格"
+ }, {
+ id: 2,
+ text: "不合格"
+ }],
+ flowNodes: [{
+ text: '开始'
+ }, {
+ text: '提交申请'
+ }, {
+ text: '监理审批'
+ }, {
+ text: '结束'
+ }],
+ active: 0,
+ checkingFiles: "",
+ fileType: ["doc", "docx", "xls", "xlsx", "ppt", "pptx", "pdf", "png", "jpg", "jpeg"]
},
/**
* 生命周期函数--监听页面加载
*/
onLoad(options) {
- let {projectId,projectName} = options
+ let {
+ projectId,
+ projectName
+ } = options
//获取缓存数据
wx.getStorage({
- key: 'userinfo',
- success:res=>{
- this.setData({
- projectId,
- projectName,
- deptId:res.data.deptId,
- loginName:res.data.loginName,
- userName:res.data.nickName
- })
- this.getProjectUserData();
- this.getDataTypeLvlList();
- }
- })
+ key: 'userinfo',
+ success: res => {
+ this.setData({
+ projectId,
+ projectName,
+ deptId: res.data.deptId,
+ loginName: res.data.loginName,
+ userName: res.data.nickName
+ })
+ this.getProjectUserData();
+ this.getDataTypeLvlList();
+ }
+ })
},
//查询项目人员数据
- getProjectUserData(){
+ getProjectUserData() {
let that = this
wx.request({
- url: app.globalData.reqUrl+'/wechat/projectuserinfo/selectProjectUnitUser',
- method:"get",
- data:{
- unitType:"4",
- projectId:that.data.projectId
+ url: app.globalData.reqUrl + '/wechat/projectuserinfo/selectProjectUnitUser',
+ method: "get",
+ data: {
+ unitType: "4",
+ projectId: that.data.projectId
},
- header:{
- 'content-type': 'application/x-www-form-urlencoded'
+ header: {
+ 'content-type': 'application/x-www-form-urlencoded'
},
- success(res){
+ success(res) {
res = res.data
- if(res.code == 200){
+ if (res.code == 200) {
let tempData = []
that.setData({
- rectifierData:res.data,
+ rectifierData: res.data,
})
}
}
})
wx.request({
- url: app.globalData.reqUrl+'/wechat/projectuserinfo/selectProjectUnitUser',
- method:"get",
- data:{
- unitType:"2",
- projectId:that.data.projectId
+ url: app.globalData.reqUrl + '/wechat/projectuserinfo/selectProjectUnitUser',
+ method: "get",
+ data: {
+ unitType: "2",
+ projectId: that.data.projectId
},
- header:{
- 'content-type': 'application/x-www-form-urlencoded'
+ header: {
+ 'content-type': 'application/x-www-form-urlencoded'
},
- success(res){
+ success(res) {
res = res.data
- if(res.code == 200){
+ if (res.code == 200) {
let tempData = []
that.setData({
- rectifierData2:res.data,
+ rectifierData2: res.data,
})
}
}
@@ -105,53 +126,59 @@ Page({
},
//查询验收类型数据
- getDataTypeLvlList(){
+ getDataTypeLvlList() {
let that = this
wx.request({
- url: app.globalData.reqUrl+'/wechat/projectchecking/queryDictType',
- method:"get",
- data:{
- type:"project_checking_data_type_lvl1"
+ url: app.globalData.reqUrl + '/wechat/projectchecking/queryDictType',
+ method: "get",
+ data: {
+ type: "project_checking_data_type_lvl1"
},
- header:{
- 'content-type': 'application/x-www-form-urlencoded'
+ header: {
+ 'content-type': 'application/x-www-form-urlencoded'
},
- success(res){
+ success(res) {
res = res.data
- if(res.code == 200){
- let list=[];
- res.data.forEach(it =>{
- list.push({"id":it.dictValue,"text":it.dictLabel});
+ if (res.code == 200) {
+ let list = [];
+ res.data.forEach(it => {
+ list.push({
+ "id": it.dictValue,
+ "text": it.dictLabel
+ });
})
that.setData({
- dataTypeLvl1List:list,
+ dataTypeLvl1List: list,
})
}
}
})
wx.request({
- url: app.globalData.reqUrl+'/wechat/projectchecking/queryDictType',
- method:"get",
- data:{
- type:"project_checking_data_type_lvl2"
+ url: app.globalData.reqUrl + '/wechat/projectchecking/queryDictType',
+ method: "get",
+ data: {
+ type: "project_checking_data_type_lvl2"
},
- header:{
- 'content-type': 'application/x-www-form-urlencoded'
+ header: {
+ 'content-type': 'application/x-www-form-urlencoded'
},
- success(res){
+ success(res) {
res = res.data
- if(res.code == 200){
+ if (res.code == 200) {
let tempData = []
- res.data.forEach(it =>{
- if(it.remark=="1"){
- tempData.push({"id":it.dictValue,"text":it.dictLabel});
+ res.data.forEach(it => {
+ if (it.remark == "1") {
+ tempData.push({
+ "id": it.dictValue,
+ "text": it.dictLabel
+ });
}
})
that.setData({
- dataTypeLvl2List:tempData,
- dataTypeLvl2AllList:res.data,
- dataTypeLvl2:tempData[0].id,
+ dataTypeLvl2List: tempData,
+ dataTypeLvl2AllList: res.data,
+ dataTypeLvl2: tempData[0].id,
})
}
}
@@ -159,42 +186,45 @@ Page({
},
//切换验收结果
- onSelectType(e){
+ onSelectType(e) {
this.setData({
- checkingResult:e.detail.id
+ checkingResult: e.detail.id
})
},
//验收类型
- onSelectTypeLvl1(e){
+ onSelectTypeLvl1(e) {
this.setData({
- dataTypeLvl1:e.detail.id
+ dataTypeLvl1: e.detail.id
})
let tempData = []
- this.data.dataTypeLvl2AllList.forEach(it =>{
- if(it.remark==e.detail.id){
- tempData.push({"id":it.dictValue,"text":it.dictLabel});
+ this.data.dataTypeLvl2AllList.forEach(it => {
+ if (it.remark == e.detail.id) {
+ tempData.push({
+ "id": it.dictValue,
+ "text": it.dictLabel
+ });
}
})
this.setData({
- dataTypeLvl2List:tempData,
- dataTypeLvl2:tempData[0].id,
+ dataTypeLvl2List: tempData,
+ dataTypeLvl2: tempData[0].id,
})
- },
+ },
//类型分类
- onSelectTypeLvl2(e){
+ onSelectTypeLvl2(e) {
this.setData({
- dataTypeLvl2:e.detail.id
+ dataTypeLvl2: e.detail.id
})
- },
+ },
//工序部位
- onInputCheckWorkingPositionValue(e){
+ onInputCheckWorkingPositionValue(e) {
let checkWorkingPosition = e.detail.value
this.setData({
checkWorkingPosition
})
},
//验收描述
- onInputIntroValue(e){
+ onInputIntroValue(e) {
let intro = e.detail.value
this.setData({
intro
@@ -202,7 +232,7 @@ Page({
},
//验收时间
- onInputTime(e){
+ onInputTime(e) {
let checkTime = e.detail
this.setData({
checkTime
@@ -210,107 +240,124 @@ Page({
},
// list 上传图片
- onImagesArr(e){
+ onImagesArr(e) {
var data = this.data.imageInfoData
data = e.detail
this.setData({
- imageInfoData:data
+ imageInfoData: data
})
},
//添加质量专员
- onAddQualityUser(e){
- if(e.detail.length>0){
+ onAddQualityUser(e) {
+ if (e.detail.length > 0) {
this.setData({
- qualityUser:e.detail[0].phoneNumber,
- qualityUserName:e.detail[0].userName
+ qualityUser: e.detail[0].phoneNumber,
+ qualityUserName: e.detail[0].userName
})
}
},
//添加监理专员
- onAddSuperviseUser(e){
- if(e.detail.length>0){
+ onAddSuperviseUser(e) {
+ if (e.detail.length > 0) {
this.setData({
- superviseUser:e.detail[0].phoneNumber,
- superviseUserName:e.detail[0].userName
+ superviseUser: e.detail[0].phoneNumber,
+ superviseUserName: e.detail[0].userName
})
}
},
//取消页面
- cancelSaveView(){
+ cancelSaveView() {
this.returnToPage()
},
//保存
- onProblemSubmitSave(){
+ onProblemSubmitSave() {
this.setData({
- loadShow:true
+ loadShow: true
})
let that = this
- let {projectId,deptId,qualityUser,qualityUserName,superviseUser,superviseUserName,checkWorkingPosition,intro,checkTime,checkingResult,imageInfoData,loginName,userName,dataTypeLvl1,dataTypeLvl2} = that.data;
+ let {
+ projectId,
+ deptId,
+ qualityUser,
+ qualityUserName,
+ superviseUser,
+ superviseUserName,
+ checkWorkingPosition,
+ intro,
+ checkTime,
+ checkingResult,
+ imageInfoData,
+ loginName,
+ userName,
+ dataTypeLvl1,
+ dataTypeLvl2,
+ checkingFiles
+ } = that.data;
//数据效验
- if(projectId==""||deptId==""||loginName==""){
+ if (projectId == "" || deptId == "" || loginName == "") {
app.toast("数据异常，请刷新页面重试!")
that.setData({
- loadShow:false
+ loadShow: false
})
return;
}
- if(imageInfoData.length==0){
+ if (imageInfoData.length == 0) {
app.toast("请上传举牌验收现场图片!")
that.setData({
- loadShow:false
+ loadShow: false
})
return;
}
- if(dataTypeLvl1==""){
+ if (dataTypeLvl1 == "") {
app.toast("请选择验收类型!")
that.setData({
- loadShow:false
+ loadShow: false
})
return;
}
- if(dataTypeLvl2==""){
+ if (dataTypeLvl2 == "") {
app.toast("请选择类型分类!")
that.setData({
- loadShow:false
+ loadShow: false
})
return;
}
- if(qualityUser==""||qualityUserName==""){
+ if (qualityUser == "" || qualityUserName == "") {
app.toast("请选择质量专员!")
that.setData({
- loadShow:false
+ loadShow: false
})
return;
}
- if(superviseUser==""||superviseUserName==""){
+ if (superviseUser == "" || superviseUserName == "") {
app.toast("请选择监理专员!")
that.setData({
- loadShow:false
+ loadShow: false
})
return;
}
- if(checkWorkingPosition==""){
+ if (checkWorkingPosition == "") {
app.toast("请填写验收工序部位!")
that.setData({
- loadShow:false
+ loadShow: false
})
return;
}
- if(intro==""){
+ if (intro == "") {
app.toast("请填写验收结果描述!")
that.setData({
- loadShow:false
+ loadShow: false
})
return;
}
- if(checkTime==""){
+ if (checkTime == "") {
app.toast("请选择验收时间!")
that.setData({
- loadShow:false
+ loadShow: false
})
return;
}
@@ -321,100 +368,148 @@ Page({
// })
// return;
// }
-
+ if (checkingFiles.length > 0) {
+ for (let i = 0; i < checkingFiles.length; i++) {
+ let _fileType = checkingFiles[i].path.split('.');
+ _fileType = _fileType[_fileType.length - 1].toLowerCase();
+ //判断附件类型，如果是图片直接展示，非图片则显示附件
+ if (this.data.fileType.indexOf(_fileType) == -1) {
+ app.toast("当前 [ " + _fileType + " ] 文件不支持上传!")
+ that.setData({
+ loadShow: false
+ });
+ return;
+ }
+ }
+ }
let fileUrls = [];
- imageInfoData.forEach(async (item)=>{
- let uploadUrl = app.globalData.uploadUrl+'/common/upload'
- let name = "file"
+ let _checkingFiles = [];
+ imageInfoData.forEach(async (item) => {
+ let uploadUrl = app.globalData.uploadUrl + '/common/upload'
+ let name = "file"
//这里复杂的图片上传，改为同步上传，因为小程序只能上传一张图片
- let obj = await that.syncUploadImage(uploadUrl,item,name);
+ let obj = await that.syncUploadImage(uploadUrl, item, name);
fileUrls.push(obj.data.fileName);
//验证图片上传完毕
- if(fileUrls.length == imageInfoData.length){
+ if (fileUrls.length == imageInfoData.length) {
let params = {
projectId,
- deptId:deptId,
+ deptId: deptId,
qualityUser,
qualityUserName,
superviseUser,
superviseUserName,
checkWorkingPosition,
intro,
- checkingDate:checkTime,
+ checkingDate: checkTime,
//checkResult:checkingResult,
- approveStatus:"1",
- createBy:loginName,
- imageUrls:fileUrls.toString(),
+ approveStatus: "1",
+ createBy: loginName,
+ imageUrls: fileUrls.toString(),
dataTypeLvl1,
- dataTypeLvl2,
+ dataTypeLvl2
}
- wx.request({
- url: app.globalData.reqUrl + '/wechat/projectchecking/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.redirectTo({
- url: '../list/index',
- })
- },200)
- }
+ if (checkingFiles.length > 0) {
+ for (let i = 0; i < checkingFiles.length; i++) {
+ syncFileUpload(checkingFiles[i].path).then(res => {
+ _checkingFiles.push(res.fileName);
+ if (checkingFiles.length == _checkingFiles.length) {
+ params.checkingFiles = JSON.stringify(_checkingFiles);
+ this.submitForm(params);
+ }
+ });
}
- })
+ } else {
+ this.submitForm(params);
}
- })
+ }
+ })
+ },
+
+ /**
+ * 提交表单
+ * @param {*} params
+ */
+ submitForm(params) {
+ let that = this
+ wx.request({
+ url: app.globalData.reqUrl + '/wechat/projectchecking/add',
+ method: "POST",
+ data: params,
+ header: {
+ "Username": that.data.loginName,
+ "Content-Type": "application/json"
+ },
+ success(res) {
+ that.setData({
+ loadShow: false
+ })
+ res = res.data
+ if (res.code == 200) {
+ app.toast("添加成功!")
+ setTimeout(() => {
+ wx.redirectTo({
+ url: '../list/index',
+ })
+ }, 200)
+ }
+ }
+ })
},
/**
* 这里考虑上传图片异步问题，封装为同步
*/
- syncUploadImage(url,uploadFile,name) {
+ 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)
- }
+ 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)
+ }
});
})
},
+ /**
+ * 相关附件上传
+ * @param {*} options
+ */
+ otherFileUpload(options) {
+ let file = options.detail;
+ this.setData({
+ checkingFiles: file
+ });
+ },
+
returnToPage: function () {
/*关闭当前页面，跳转到应用内的某个页面。但是不允许跳转到 tabbar 页面*/
wx.redirectTo({
url: '../list/index',
})
- },
+ },
/**
* 生命周期函数--监听页面初次渲染完成
diff --git a/miniprogram/pageage/project_checking/add/index.wxml b/miniprogram/pageage/project_checking/add/index.wxml
index dcc3bac..0e68607 100644
--- a/miniprogram/pageage/project_checking/add/index.wxml
+++ b/miniprogram/pageage/project_checking/add/index.wxml
@@ -1,4 +1,4 @@
-
+
-
+
进行中（{{jxzCount}}）
已完成（{{ywcCount}}）
diff --git a/miniprogram/pageage/project_insurance/add/index.wxml b/miniprogram/pageage/project_insurance/add/index.wxml
index 9686428..7e6110c 100644
--- a/miniprogram/pageage/project_insurance/add/index.wxml
+++ b/miniprogram/pageage/project_insurance/add/index.wxml
@@ -38,7 +38,7 @@
保险合同
[仅可上传PDF格式]
-
+
diff --git a/miniprogram/pageage/project_materialSeal/add/index.wxml b/miniprogram/pageage/project_materialSeal/add/index.wxml
index b0ee414..653db61 100644
--- a/miniprogram/pageage/project_materialSeal/add/index.wxml
+++ b/miniprogram/pageage/project_materialSeal/add/index.wxml
@@ -19,7 +19,7 @@
封样图片
-
+
@@ -65,13 +65,13 @@
会签单图片
-
+
变更单图片
-
+
合同指定品牌和拟用品牌不一致时需要上传
diff --git a/miniprogram/pageage/project_materialSeal/edit/index.wxml b/miniprogram/pageage/project_materialSeal/edit/index.wxml
index 0b07517..7870db0 100644
--- a/miniprogram/pageage/project_materialSeal/edit/index.wxml
+++ b/miniprogram/pageage/project_materialSeal/edit/index.wxml
@@ -48,7 +48,7 @@
封样图片
-
+
@@ -94,13 +94,13 @@
会签单图片
-
+
变更单图片
-
+
合同指定品牌和拟用品牌不一致时需要上传
diff --git a/miniprogram/pageage/project_materialSeal/list/index.js b/miniprogram/pageage/project_materialSeal/list/index.js
index 2c7bfa9..d7ec4d1 100644
--- a/miniprogram/pageage/project_materialSeal/list/index.js
+++ b/miniprogram/pageage/project_materialSeal/list/index.js
@@ -1,4 +1,6 @@
-// pageage/safetyManagement/securityCheckGR/index.js
+import {
+ getToken
+} from '../../../utils/auth'
const app = getApp()
Page({
@@ -49,6 +51,11 @@ Page({
* 生命周期函数--监听页面加载
*/
onLoad(options) {
+ if(!getToken()){
+ wx.redirectTo({
+ url: '../../../pages/login/index',
+ })
+ }
if (options && options.barProId) {
//数据未加载完毕，从文件读取数据
if (app.globalData.projectInfoList.length == 0) {
@@ -78,12 +85,8 @@ Page({
id: app.globalData.projectId
}
})
- },
- fail: err => {
- //未获取用户信息时，重新登录
- wx.redirectTo({
- url: '../pages/login/index',
- })
+ let myProjects = this.selectComponent("#projectSel");
+ myProjects.load();
}
})
} else {
diff --git a/miniprogram/pageage/project_materialSeal/list/index.wxml b/miniprogram/pageage/project_materialSeal/list/index.wxml
index c0df5e7..6c04e87 100644
--- a/miniprogram/pageage/project_materialSeal/list/index.wxml
+++ b/miniprogram/pageage/project_materialSeal/list/index.wxml
@@ -13,7 +13,7 @@
-
+
进行中（{{jxzCount}}）
已完成（{{ywcCount}}）
diff --git a/miniprogram/pageage/project_measure/add/index.wxml b/miniprogram/pageage/project_measure/add/index.wxml
index aa2e8dd..fe29655 100644
--- a/miniprogram/pageage/project_measure/add/index.wxml
+++ b/miniprogram/pageage/project_measure/add/index.wxml
@@ -19,7 +19,7 @@
测量图片
-
+
@@ -80,7 +80,7 @@
测量附件
[可上传PDF/图片/WORD/PPT/XLS格式]
-
+
diff --git a/miniprogram/pageage/project_measure/edit/index.wxml b/miniprogram/pageage/project_measure/edit/index.wxml
index 93fb0a1..60882de 100644
--- a/miniprogram/pageage/project_measure/edit/index.wxml
+++ b/miniprogram/pageage/project_measure/edit/index.wxml
@@ -48,7 +48,7 @@
测量图片
-
+
@@ -101,7 +101,7 @@
测量附件
[可上传PDF/图片/WORD/PPT/XLS格式]
-
+
diff --git a/miniprogram/pageage/project_measure/list/index.js b/miniprogram/pageage/project_measure/list/index.js
index d408a10..9a019fe 100644
--- a/miniprogram/pageage/project_measure/list/index.js
+++ b/miniprogram/pageage/project_measure/list/index.js
@@ -1,4 +1,6 @@
-// pageage/safetyManagement/securityCheckGR/index.js
+import {
+ getToken
+} from '../../../utils/auth'
const app = getApp()
Page({
@@ -51,6 +53,11 @@ Page({
* 生命周期函数--监听页面加载
*/
onLoad(options) {
+ if(!getToken()){
+ wx.redirectTo({
+ url: '../../../pages/login/index',
+ })
+ }
if (options && options.barProId) {
//数据未加载完毕，从文件读取数据
if (app.globalData.projectInfoList.length == 0) {
@@ -80,12 +87,8 @@ Page({
id: app.globalData.projectId
}
})
- },
- fail: err => {
- //未获取用户信息时，重新登录
- wx.redirectTo({
- url: '../pages/login/index',
- })
+ let myProjects = this.selectComponent("#projectSel");
+ myProjects.load();
}
})
} else {
diff --git a/miniprogram/pageage/project_measure/list/index.wxml b/miniprogram/pageage/project_measure/list/index.wxml
index 2d031ab..7b0213a 100644
--- a/miniprogram/pageage/project_measure/list/index.wxml
+++ b/miniprogram/pageage/project_measure/list/index.wxml
@@ -13,7 +13,7 @@
-
+
进行中（{{jxzCount}}）
已完成（{{ywcCount}}）
diff --git a/miniprogram/pageage/project_problemmodify/quality/add/index.wxml b/miniprogram/pageage/project_problemmodify/quality/add/index.wxml
index 3ade737..8e07d8a 100644
--- a/miniprogram/pageage/project_problemmodify/quality/add/index.wxml
+++ b/miniprogram/pageage/project_problemmodify/quality/add/index.wxml
@@ -19,7 +19,7 @@
隐患图片
-
+
diff --git a/miniprogram/pageage/project_problemmodify/quality/list/index.js b/miniprogram/pageage/project_problemmodify/quality/list/index.js
index 3e676f3..0dee197 100644
--- a/miniprogram/pageage/project_problemmodify/quality/list/index.js
+++ b/miniprogram/pageage/project_problemmodify/quality/list/index.js
@@ -1,4 +1,6 @@
-// pageage/safetyManagement/securityCheckGR/index.js
+import {
+ getToken
+} from '../../../../utils/auth'
const app = getApp()
Page({
@@ -64,6 +66,11 @@ Page({
* 生命周期函数--监听页面加载
*/
onLoad(options) {
+ if(!getToken()){
+ wx.redirectTo({
+ url: '../../../../pages/login/index',
+ })
+ }
if (options && options.barProId) {
//数据未加载完毕，从文件读取数据
if (app.globalData.projectInfoList.length == 0) {
@@ -93,12 +100,8 @@ Page({
id: app.globalData.projectId
}
})
- },
- fail: err => {
- //未获取用户信息时，重新登录
- wx.redirectTo({
- url: '../pages/login/index',
- })
+ let myProjects = this.selectComponent("#projectSel");
+ myProjects.load();
}
})
} else {
diff --git a/miniprogram/pageage/project_problemmodify/quality/list/index.wxml b/miniprogram/pageage/project_problemmodify/quality/list/index.wxml
index ca24763..b6e7875 100644
--- a/miniprogram/pageage/project_problemmodify/quality/list/index.wxml
+++ b/miniprogram/pageage/project_problemmodify/quality/list/index.wxml
@@ -13,7 +13,7 @@
-
+
整改（{{dzgCount}}）
复检（{{dfjCount}}）
@@ -57,7 +57,7 @@
-
+
暂无数据
diff --git a/miniprogram/pageage/project_problemmodify/security/add/index.wxml b/miniprogram/pageage/project_problemmodify/security/add/index.wxml
index 58e9f2f..09c035f 100644
--- a/miniprogram/pageage/project_problemmodify/security/add/index.wxml
+++ b/miniprogram/pageage/project_problemmodify/security/add/index.wxml
@@ -19,7 +19,7 @@
隐患图片
-
+
diff --git a/miniprogram/pageage/project_problemmodify/security/list/index.js b/miniprogram/pageage/project_problemmodify/security/list/index.js
index 2c0df72..3fef8a8 100644
--- a/miniprogram/pageage/project_problemmodify/security/list/index.js
+++ b/miniprogram/pageage/project_problemmodify/security/list/index.js
@@ -1,7 +1,8 @@
-// pageage/safetyManagement/securityCheckGR/index.js
+import {
+ getToken
+} from '../../../../utils/auth'
const app = getApp()
Page({
-
/**
* 页面的初始数据
*/
@@ -57,6 +58,11 @@ Page({
* 生命周期函数--监听页面加载
*/
onLoad(options) {
+ if(!getToken()){
+ wx.redirectTo({
+ url: '../../../../pages/login/index',
+ })
+ }
if (options && options.barProId) {
//数据未加载完毕，从文件读取数据
if (app.globalData.projectInfoList.length == 0) {
@@ -86,12 +92,8 @@ Page({
id: app.globalData.projectId
}
})
- },
- fail: err => {
- //未获取用户信息时，重新登录
- wx.redirectTo({
- url: '../pages/login/index',
- })
+ let myProjects = this.selectComponent("#projectSel");
+ myProjects.load();
}
})
} else {
diff --git a/miniprogram/pageage/project_problemmodify/security/list/index.wxml b/miniprogram/pageage/project_problemmodify/security/list/index.wxml
index f29687d..515f78f 100644
--- a/miniprogram/pageage/project_problemmodify/security/list/index.wxml
+++ b/miniprogram/pageage/project_problemmodify/security/list/index.wxml
@@ -11,7 +11,7 @@
-
+
整改（{{dzgCount}}）
复检（{{dfjCount}}）
@@ -56,7 +56,7 @@
-
+
暂无数据
diff --git a/miniprogram/pageage/project_schedule/add/index.wxml b/miniprogram/pageage/project_schedule/add/index.wxml
index d62ca5e..dd0c3c3 100644
--- a/miniprogram/pageage/project_schedule/add/index.wxml
+++ b/miniprogram/pageage/project_schedule/add/index.wxml
@@ -18,7 +18,7 @@
形象进度图片
-
+
diff --git a/miniprogram/pageage/project_special/add/index.wxml b/miniprogram/pageage/project_special/add/index.wxml
index be8348a..61220f7 100644
--- a/miniprogram/pageage/project_special/add/index.wxml
+++ b/miniprogram/pageage/project_special/add/index.wxml
@@ -56,7 +56,7 @@
证书附件
[可上传PDF和图片格式]
-
+
diff --git a/miniprogram/pageage/project_standard/add/index.js b/miniprogram/pageage/project_standard/add/index.js
index 8e06faf..ca11aaa 100644
--- a/miniprogram/pageage/project_standard/add/index.js
+++ b/miniprogram/pageage/project_standard/add/index.js
@@ -1,4 +1,4 @@
-// pageage/safetyManagement/addSafetyInspect/index.js
+import jsonConfig from '../../../utils/json'
const app = getApp()
Page({
@@ -6,58 +6,119 @@ Page({
* 页面的初始数据
*/
data: {
- deptId:"",
- projectId:"",
- projectName:"",
- loginName:"",
- imageInfoData:[],
- loadShow:false,
- standardType:"1",
- standardTypeList:[],
- info:"",
- standardDesc:""
+ deptId: "",
+ projectId: "",
+ projectName: "",
+ loginName: "",
+ imageInfoData: [],
+ loadShow: false,
+ standardType: "1",
+ standardTypeList: [],
+ info: "",
+ standardDesc: "",
+ standardNotes:[],
+ showPopup:false,
+ showDetailsName:"",
+ activeId:null,
+ mainActiveIndex:0,
},
/**
* 生命周期函数--监听页面加载
*/
onLoad(options) {
- let {projectId,projectName} = options
+ let {
+ projectId,
+ projectName
+ } = options
//获取缓存数据
wx.getStorage({
- key: 'userinfo',
- success:res=>{
- this.setData({
- projectId,
- projectName,
- deptId:res.data.deptId,
- loginName:res.data.loginName
- })
+ key: 'userinfo',
+ success: res => {
+ this.setData({
+ projectId,
+ projectName,
+ deptId: res.data.deptId,
+ loginName: res.data.loginName
+ })
this.getStandardTypeList();
- }
- })
+ this.initStandardTypeListNotes(this.data.standardType);
+ }
+ })
},
- getStandardTypeList(){
+ /**
+ * 初始化标准类型
+ */
+ initStandardTypeListNotes(type) {
+ let index = type - 1;
+ this.setData({
+ activeId: null,
+ mainActiveIndex: 0,
+ showDetailsName: "",
+ standardNotes:jsonConfig.standardTypeListNotes[index]
+ })
+ },
+
+ //关闭申请明细选择
+ onShowPopup(e) {
+ this.setData({
+ showPopup: true
+ })
+ },
+
+ //关闭申请明细选择
+ onClosePopup(e) {
+ this.setData({
+ showPopup: false
+ })
+ },
+
+ /**
+ * 栏目触发事件
+ */
+ onClickNav(e) {
+ this.setData({
+ activeId: null,
+ mainActiveIndex: e.detail.index
+ })
+ },
+
+ /**
+ * 选项触发事件
+ */
+ onClickItem(e) {
+ this.setData({
+ activeId:e.detail.id,
+ showDetailsName: e.detail.text
+ })
+ this.onClosePopup();
+ },
+
+ getStandardTypeList() {
let that = this
wx.request({
- url: app.globalData.reqUrl+'/wechat/projectStandard/queryStandardType',
- method:"get",
- data:{},
- header:{
- 'content-type': 'application/x-www-form-urlencoded'
+ url: app.globalData.reqUrl + '/wechat/projectStandard/queryStandardType',
+ method: "get",
+ data: {},
+ header: {
+ 'content-type': 'application/x-www-form-urlencoded'
},
- success(res){
+ success(res) {
res = res.data
- if(res.code == 200){
- let list=[];
- res.data.forEach(it =>{
- list.push({"id":it.dictValue,"text":it.dictLabel,"info":it.remark});
+ if (res.code == 200) {
+ let list = [];
+ res.data.forEach(it => {
+ list.push({
+ "id": it.dictValue,
+ "text": it.dictLabel,
+ "info": it.remark
+ });
})
that.setData({
- standardTypeList:list,
- standardType:res.data[0].dictValue,
- info:res.data[0].remark
+ standardTypeList: list,
+ standardType: res.data[0].dictValue,
+ info: res.data[0].remark
})
}
}
@@ -65,7 +126,7 @@ Page({
},
//图片描述
- onInputStandardDesc(e){
+ onInputStandardDesc(e) {
let standardDesc = e.detail.value
this.setData({
standardDesc
@@ -73,148 +134,166 @@ Page({
},
// list 上传图片
- onImagesArr(e){
+ onImagesArr(e) {
var data = this.data.imageInfoData
data = e.detail
this.setData({
- imageInfoData:data
+ imageInfoData: data
})
},
//取消页面
- cancelSaveView(){
+ cancelSaveView() {
this.returnToPage()
},
//保存
- onSave(){
+ onSave() {
this.setData({
- loadShow:true
+ loadShow: true
})
let that = this
- let {projectId,loginName, deptId,standardType,standardDesc,imageInfoData} = that.data;
+ let {
+ projectId,
+ loginName,
+ deptId,
+ standardType,
+ standardDesc,
+ imageInfoData,
+ activeId
+ } = that.data;
//数据效验
- if(projectId==""||loginName==""||deptId==""){
+ if (projectId == "" || loginName == "" || deptId == "") {
app.toast("数据异常，请刷新页面重试!")
that.setData({
- loadShow:false
+ loadShow: false
})
return;
}
- if(imageInfoData.length==0){
- app.toast("请上传标准图片!")
- that.setData({
- loadShow:false
- })
- return;
- }
- if(standardType==""){
+ if (standardType == "") {
app.toast("请选择标准类型!")
that.setData({
- loadShow:false
+ loadShow: false
})
return;
}
- if(standardDesc==""){
+ if(!activeId){
+ app.toast("请选择类型明细!")
+ that.setData({
+ loadShow: false
+ })
+ return;
+ }
+ if (imageInfoData.length == 0) {
+ app.toast("请上传标准图片!")
+ that.setData({
+ loadShow: false
+ })
+ return;
+ }
+ if (standardDesc == "") {
app.toast("请填写图片描述!")
that.setData({
- loadShow:false
+ loadShow: false
})
return;
}
let fileUrls = [];
- imageInfoData.forEach(async (item)=>{
- let uploadUrl = app.globalData.uploadUrl+'/common/upload'
- let name = "file"
+ imageInfoData.forEach(async (item) => {
+ let uploadUrl = app.globalData.uploadUrl + '/common/upload'
+ let name = "file"
//这里复杂的图片上传，改为同步上传，因为小程序只能上传一张图片
- let obj = await that.syncUploadImage(uploadUrl,item,name);
+ let obj = await that.syncUploadImage(uploadUrl, item, name);
fileUrls.push(obj.data.fileName);
//验证图片上传完毕
- if(fileUrls.length == imageInfoData.length){
+ if (fileUrls.length == imageInfoData.length) {
let params = {
projectId,
deptId,
- imageFile:fileUrls.toString(),
- standardType,
+ imageFile: fileUrls.toString(),
+ standardType:activeId,
standardDesc,
- ord:1,
- createBy:loginName
+ ord: 1,
+ createBy: loginName
}
wx.request({
url: app.globalData.reqUrl + '/wechat/projectStandard/add',
- method:"POST",
- data:params,
+ method: "POST",
+ data: params,
header: {
"Username": loginName,
"Content-Type": "application/json"
},
- success(res){
+ success(res) {
that.setData({
- loadShow:false
+ loadShow: false
})
res = res.data
- if(res.code == 200){
+ if (res.code == 200) {
app.toast("添加成功!")
- setTimeout(()=>{
- wx.redirectTo({
- url: '../list/index',
- })
- },200)
+ setTimeout(() => {
+ wx.redirectTo({
+ url: '../list/index',
+ })
+ }, 200)
}
}
- })
- }
- })
+ })
+ }
+ })
},
/**
* 这里考虑上传图片异步问题，封装为同步
*/
- syncUploadImage(url,uploadFile,name) {
+ 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)
- }
+ 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)
+ }
});
})
},
- //选择测量类型
- onSelectStandardType(e){
+ //选择项目标准类型
+ onSelectStandardType(e) {
this.setData({
- standardType:e.detail.id,
- info:e.detail.info
+ standardType: e.detail.id,
+ info: e.detail.info
})
+ this.initStandardTypeListNotes(e.detail.id);
},
- returnToPage: function () {
- /*关闭当前页面，跳转到应用内的某个页面。但是不允许跳转到 tabbar 页面*/
- wx.redirectTo({
- url: '../list/index',
- })
- },
+ returnToPage: function () {
+ /*关闭当前页面，跳转到应用内的某个页面。但是不允许跳转到 tabbar 页面*/
+ wx.redirectTo({
+ url: '../list/index',
+ })
+ },
/**
* 生命周期函数--监听页面初次渲染完成
diff --git a/miniprogram/pageage/project_standard/add/index.json b/miniprogram/pageage/project_standard/add/index.json
index aeb0384..20b69e0 100644
--- a/miniprogram/pageage/project_standard/add/index.json
+++ b/miniprogram/pageage/project_standard/add/index.json
@@ -1,6 +1,8 @@
{
"usingComponents": {
- "van-overlay": "@vant/weapp/overlay/index"
+ "van-overlay": "@vant/weapp/overlay/index",
+ "van-popup": "@vant/weapp/popup",
+ "van-tree-select": "@vant/weapp/tree-select/index"
},
"navigationStyle":"custom"
}
\ No newline at end of file
diff --git a/miniprogram/pageage/project_standard/add/index.wxml b/miniprogram/pageage/project_standard/add/index.wxml
index dc6f4bf..aff88db 100644
--- a/miniprogram/pageage/project_standard/add/index.wxml
+++ b/miniprogram/pageage/project_standard/add/index.wxml
@@ -1,48 +1,59 @@
-
- {{projectName}}
-
-
- 标准类型
-
-
+
+ {{projectName}}
-
- {{info}}
+
+ 标准类型
+
+
+
+
+ {{info}}
+
+
+
+ 类型明细
+
+
+
+
+
+
+
+
+
+ 标准图片
+
+
+
+
+
+ 图片描述
+
+
+
-
- 标准图片
-
-
-
+
+ 取消
+ 提交
-
- 图片描述
-
-
-
-
-
-
- 取消
- 提交
-
@@ -50,52 +61,4 @@
数据加载中！请稍后...
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
\ No newline at end of file
diff --git a/miniprogram/pageage/project_standard/add/index.wxss b/miniprogram/pageage/project_standard/add/index.wxss
index 38bd48d..cf6435d 100644
--- a/miniprogram/pageage/project_standard/add/index.wxss
+++ b/miniprogram/pageage/project_standard/add/index.wxss
@@ -1,7 +1,99 @@
-/* pageage/safetyManagement/addSafetyInspect/index.wxss */
.van-popup{
background: none !important;
}
.van-image__img{
border-radius: 10rpx !important;
}
+.radio_custom_class{
+ padding: 10rpx 100rpx 10rpx 0;
+}
+.radio_label_class{
+ color: #ffffff !important;
+}
+.max_tab_name{
+ padding: 0 40rpx;
+ font-size:30rpx;
+ height: 460rpx;
+ overflow: auto;
+ margin-top: 20rpx;
+ text-align: center;
+ }
+ .van-popup.van-popup--bottom{
+ background: #232a44;
+ }
+ .van-popup {
+ background-color: var(--popup-background-color,#232a44) !important;
+ }
+ .font_color{
+ padding: 15rpx 0;
+ color: #157dd2;
+ }
+ .active{
+ font-size:30rpx;
+ font-weight: 600;
+ color: #14feff
+ }
+ .van-collapse.van-hairline--top-bottom:after{
+ border-width: 0px 0;
+ }
+ .van-cell.van-cell--borderless{
+ background-color: #2b345b;
+ color: #fff;
+ margin-top: 30rpx;
+ border-radius: 5rpx;
+ }
+ .van-cell.van-cell--borderless:active{
+ background-color: #2b345b;
+ }
+ .van-collapse-item__title.van-collapse-item__title--expanded:active{
+ background-color: #2b345b;
+ }
+ .van-collapse-item .van-cell:after{
+ border-bottom: 0;
+ }
+ .van-collapse-item.van-hairline--top:after{
+ border-top-width:0
+ }
+ .van-cell.van-cell--clickable{
+ background-color: #2b345b;
+ margin-top: 30rpx;
+ color: #fff;
+ border-radius: 15rpx;
+
+ }
+ .van-cell.van-cell--clickable:active{
+ background-color: #2b345b;
+ }
+ .van-collapse-item__wrapper .van-collapse-item__content{
+ background-color: #1e2336;
+ color:#8ca4ec ;
+ border-width: 0px 0;
+ }
+ .text_active{
+ padding-left: 5rpx;
+ color: #8369f5;
+ }
+ .van-sidebar{
+ background-color: #212737!important;
+ }
+ .van-sidebar-item{
+ color: #EFEFEF!important;
+ background-color: #212737!important;
+ }
+ .van-sidebar-item--selected{
+ border-color:var(--sidebar-selected-border-color,#8369f5)!important;
+ background-color: #252d41 !important;
+ color: #83a5ef !important;
+ }
+ .van-tree-select__content{
+ background-color:#252d41 !important;
+ }
+ .van-tree-select__item--active {
+ color: var(--tree-select-item-active-color,#8369f5) !important;
+ }
+ .van-tree-select{
+ height: 800rpx !important;
+ }
+ .van-popup.van-popup--bottom {
+ margin-bottom: -55rpx !important;
+}
\ No newline at end of file
diff --git a/miniprogram/pageage/project_standard/info/index.js b/miniprogram/pageage/project_standard/info/index.js
index a3683da..60d84c6 100644
--- a/miniprogram/pageage/project_standard/info/index.js
+++ b/miniprogram/pageage/project_standard/info/index.js
@@ -1,182 +1,235 @@
-// pageage/project_checking/info/index.js
+import jsonConfig from '../../../utils/json'
+import {
+ getDictCache
+} from '../../../api/publics'
const app = getApp()
Page({
- /**
- * 页面的初始数据
- */
- data: {
- id:"",
- infoData:{},
- loadShow:false,
- loginName:"",
- projectName:"",
- showDel:false,
- imageList:[],
- minImageList:[],
- request:app.globalData.reqUrl
- },
+ /**
+ * 页面的初始数据
+ */
+ data: {
+ id: "",
+ type: "",
+ infoData: {},
+ loadShow: false,
+ loginName: "",
+ projectName: "",
+ showDel: false,
+ imageList: [],
+ minImageList: [],
+ request: app.globalData.reqUrl,
+ standardTypeName: "",
+ standardTypeRemark: "",
+ standardNotesName: "",
+ },
- /**
- * 生命周期函数--监听页面加载
- */
- onLoad(options) {
- let {id} = options
- //获取缓存数据
- wx.getStorage({
- key: 'userinfo',
- success:res=>{
- this.setData({
- id,
- loginName:res.data.loginName,
- projectName:app.globalData.projectName
- })
- this.getInfo();
- }
- })
- },
-
-
- /**
- * 获取安全检查详情信息
- *
- */
- getInfo(){
- let {id} = this.data
- let that = this
- wx.request({
- url: app.globalData.reqUrl+'/wechat/projectStandard/info',
- method:"get",
- data:{
- id:id
- },
- success(res){
- res = res.data
- if(res.code == 200){
- let urls = [];
- let minUrls = [];
- if(res.data.imageFile){
- res.data.imageFile.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,
- loadShow:false
- })
- //判断当前能否删除
- if(res.data.createBy!=that.data.loginName){
- that.setData({
- showDel:true
- })
- }
- }
- }
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad(options) {
+ let {
+ id,
+ standardType
+ } = options
+ //获取缓存数据
+ wx.getStorage({
+ key: 'userinfo',
+ success: res => {
+ this.setData({
+ id,
+ type: standardType.substring(0, 1),
+ loginName: res.data.loginName,
+ projectName: app.globalData.projectName
})
- },
-
- 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
- let that = this;
- wx.request({
- url: app.globalData.reqUrl+'/wechat/projectStandard/remove',
- header: {
- "Username": that.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]
+ this.getDicts();
+ this.getInfo();
+ }
})
},
- returnToPage: function () {
- /*关闭当前页面，跳转到应用内的某个页面。但是不允许跳转到 tabbar 页面*/
- wx.redirectTo({
- url: '../list/index',
- })
- },
+ //获取字典信息
+ getDicts() {
+ let that = this;
+ /*关闭当前页面，跳转到应用内的某个页面。但是不允许跳转到 tabbar 页面*/
+ getDictCache('prj_standard_type').then(res => {
+ if (res.code == 200) {
+ res.data.forEach(item => {
+ if (item.dictValue == that.data.type) {
+ that.setData({
+ standardTypeName: item.dictLabel,
+ standardTypeRemark: item.remark
+ })
+ }
+ })
+ }
+ });
+ },
- /**
- * 生命周期函数--监听页面初次渲染完成
- */
- onReady() {
+ /**
+ * 获取安全检查详情信息
+ *
+ */
+ getInfo() {
+ let {
+ id
+ } = this.data
+ let that = this
+ wx.request({
+ url: app.globalData.reqUrl + '/wechat/projectStandard/info',
+ method: "get",
+ data: {
+ id: id
+ },
+ success(res) {
+ res = res.data
+ if (res.code == 200) {
+ let urls = [];
+ let minUrls = [];
+ if (res.data.imageFile) {
+ res.data.imageFile.split(',').forEach(element => {
+ urls.push(that.data.request + element);
+ minUrls.push(that.data.request + element + '.min.jpg');
+ });
+ }
+ if (that.data.type != res.data.standardType) {
+ let index = that.data.type - 1;
+ jsonConfig.standardTypeListNotes[index].forEach(it => {
+ if (it.children && it.children.length > 0) {
+ it.children.forEach(i => {
+ if (i.id == res.data.standardType) {
+ that.setData({
+ standardNotesName: i.text
+ })
+ }
+ })
+ } else {
+ if (it.id == res.data.standardType) {
+ that.setData({
+ standardNotesName: it.text
+ })
+ }
+ }
+ });
+ }
+ that.setData({
+ infoData: res.data,
+ imageList: urls,
+ minImageList: minUrls,
+ loadShow: false
+ })
+ //判断当前能否删除
+ if (res.data.createBy == that.data.loginName) {
+ that.setData({
+ showDel: true
+ })
+ }
+ }
+ }
+ })
+ },
- },
+ 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
+ let that = this;
+ wx.request({
+ url: app.globalData.reqUrl + '/wechat/projectStandard/remove',
+ header: {
+ "Username": that.data.loginName,
+ },
+ data: {
+ id: id
+ },
+ method: "get",
+ success(res) {
+ app.toast("删除成功！")
+ wx.redirectTo({
+ url: `../list/index`,
+ })
+ }
+ })
+ },
- /**
- * 生命周期函数--监听页面显示
- */
- onShow() {
+ //展示图片
+ showImg: function (e) {
+ var that = this;
+ wx.previewImage({
+ urls: that.data.imageList,
+ current: that.data.imageList[e.currentTarget.dataset.index]
+ })
+ },
- },
+ returnToPage: function () {
+ /*关闭当前页面，跳转到应用内的某个页面。但是不允许跳转到 tabbar 页面*/
+ wx.redirectTo({
+ url: '../list/index',
+ })
+ },
- /**
- * 生命周期函数--监听页面隐藏
- */
- onHide() {
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ onReady() {
- },
+ },
- /**
- * 生命周期函数--监听页面卸载
- */
- onUnload() {
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow() {
- },
+ },
- /**
- * 页面相关事件处理函数--监听用户下拉动作
- */
- onPullDownRefresh() {
+ /**
+ * 生命周期函数--监听页面隐藏
+ */
+ onHide() {
- },
+ },
- /**
- * 页面上拉触底事件的处理函数
- */
- onReachBottom() {
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload() {
- },
+ },
- /**
- * 用户点击右上角分享
- */
- onShareAppMessage() {
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh() {
- }
+ },
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom() {
+
+ },
+
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage() {
+
+ }
})
\ No newline at end of file
diff --git a/miniprogram/pageage/project_standard/info/index.wxml b/miniprogram/pageage/project_standard/info/index.wxml
index b0c2547..1cd63c8 100644
--- a/miniprogram/pageage/project_standard/info/index.wxml
+++ b/miniprogram/pageage/project_standard/info/index.wxml
@@ -21,10 +21,16 @@
标准类型
- {{infoData.standardTypeName}}
+ {{standardTypeName}}
- {{infoData.standardTypeRemark}}
+ {{standardTypeRemark}}
+
+
+ 类型明细
+ {{standardNotesName}}
+
+
标准图片
diff --git a/miniprogram/pageage/project_standard/list/index.js b/miniprogram/pageage/project_standard/list/index.js
index 6907c32..ad437bd 100644
--- a/miniprogram/pageage/project_standard/list/index.js
+++ b/miniprogram/pageage/project_standard/list/index.js
@@ -63,10 +63,10 @@ Page({
getInfo(e) {
let {
- id
+ id,standardType
} = e.currentTarget.dataset.set
wx.redirectTo({
- url: `../info/index?id=${id}`
+ url: `../info/index?id=${id}&standardType=${standardType}`
})
},
@@ -79,7 +79,11 @@ Page({
standard = options.standard;
app.globalData.standard = options.standard;
} else {
- standard = app.globalData.standard;
+ if(app.globalData.standard){
+ standard = app.globalData.standard;
+ }else{
+ standard = 1;
+ }
}
//获取缓存数据
wx.getStorage({
diff --git a/miniprogram/pageage/project_train/add/index.wxml b/miniprogram/pageage/project_train/add/index.wxml
index 7a2fb16..01f9922 100644
--- a/miniprogram/pageage/project_train/add/index.wxml
+++ b/miniprogram/pageage/project_train/add/index.wxml
@@ -18,7 +18,7 @@
{{minTitle}}图片
-
+
@@ -57,7 +57,7 @@
相关文件
[可上传PDF/图片/WORD/PPT/XLS格式]
-
+
@@ -77,7 +77,7 @@
取消
- 请选择协作团队
+ 请选择协作团队
确认
{{item.deptName}}
diff --git a/miniprogram/pageage/safetyManagement/addSafetyInspect/index.wxml b/miniprogram/pageage/safetyManagement/addSafetyInspect/index.wxml
index 09c9c15..4931d5a 100644
--- a/miniprogram/pageage/safetyManagement/addSafetyInspect/index.wxml
+++ b/miniprogram/pageage/safetyManagement/addSafetyInspect/index.wxml
@@ -36,20 +36,20 @@
存在问题
-
+
检查图片
-
+
整改责任人
-
+
+