diff --git a/miniprogram/app.json b/miniprogram/app.json
index d7e21a0..54ac93d 100644
--- a/miniprogram/app.json
+++ b/miniprogram/app.json
@@ -1,5 +1,6 @@
{
"pages": [
+ "pages/login2/login",
"pages/login/login",
"pages/gongchengliebiao/gongchengliebiao",
"pages/gengduogongneng/gengduogongneng",
@@ -71,6 +72,7 @@
"technical-management/index",
"project_checking/add/index",
"project_checking/list/index",
+ "project_checking/edit/index",
"project_checking/info/index",
"project_problemmodify/security/list/index",
"project_problemmodify/security/info/index",
@@ -93,14 +95,17 @@
"project_special/info/index",
"project_measure/list/index",
"project_measure/add/index",
+ "project_measure/edit/index",
"project_measure/info/index",
"project_materialSeal/list/index",
"project_materialSeal/add/index",
+ "project_materialSeal/edit/index",
"project_materialSeal/info/index",
"project_checkDetection/list/index",
"project_checkDetection/add/index",
"project_checkDetection/info/index",
"project_checkDetection/check/index",
+ "project_checkDetection/edit/index",
"project_insurance/add/index",
"project_insurance/info/index",
"project_insurance/list/index",
diff --git a/miniprogram/app.wxss b/miniprogram/app.wxss
index 01f2431..7152945 100644
--- a/miniprogram/app.wxss
+++ b/miniprogram/app.wxss
@@ -1238,6 +1238,7 @@ swiper-item video{
}
.inspect_list_info_data_prop{
padding: 10rpx 0;
+ word-break: break-all;
}
.color_orange{
color: #fd8401;
@@ -1526,7 +1527,17 @@ swiper-item video{
margin-left: -3rpx;
}
.code_label_2{
- font-size: 0.6rem;
+ font-size: 0.8rem;
+ width: 120rpx;
+ margin: auto;
+ text-align: center;
+ padding: 0.1rem;
+ border-radius: 0.5rem 0 0.5rem 0;
+ margin-left: -1rpx;
+ margin-bottom: 10rpx;
+}
+.code_label_3{
+ font-size: 0.8rem;
width: 120rpx;
margin: auto;
text-align: center;
@@ -1565,7 +1576,6 @@ swiper-item video{
}
.tabNum{
position: absolute;
- right: 10px;
background-color: #f56c6c;
border-radius: 10px;
color: #fff;
@@ -1576,7 +1586,8 @@ swiper-item video{
padding: 0 6px;
text-align: center;
white-space: nowrap;
- top: 10rpx;
+ margin-top: -50rpx;
+ margin-left: -15rpx;
}
.tabNum_active{
position: absolute;
@@ -1593,6 +1604,12 @@ swiper-item video{
margin-left: 110rpx;
margin-top: 16rpx;
}
+.van-col--18{
+ word-wrap:break-word;
+}
+.inspect_list_info_data_2{
+ width: 100%;
+}
diff --git a/miniprogram/miniprogram_npm/@vant/weapp/field/index.wxml b/miniprogram/miniprogram_npm/@vant/weapp/field/index.wxml
index c984d89..b7096df 100644
--- a/miniprogram/miniprogram_npm/@vant/weapp/field/index.wxml
+++ b/miniprogram/miniprogram_npm/@vant/weapp/field/index.wxml
@@ -42,7 +42,7 @@
selection-start="{{ selectionStart }}"
disable-default-padding="{{ disableDefaultPadding }}"
bindinput="onInput"
- bindblur="onBlur"
+ bindinput="onBlur"
bindfocus="onFocus"
bindconfirm="onConfirm"
bindlinechange="onLineChange"
@@ -71,7 +71,7 @@
selection-start="{{ selectionStart }}"
password="{{ password || type === 'password' }}"
bindinput="onInput"
- bindblur="onBlur"
+ bindinput="onBlur"
bindfocus="onFocus"
bindconfirm="onConfirm"
bindkeyboardheightchange="onKeyboardHeightChange"
diff --git a/miniprogram/pageage/project_checkDetection/add/index.wxml b/miniprogram/pageage/project_checkDetection/add/index.wxml
index aa03ae1..22d379e 100644
--- a/miniprogram/pageage/project_checkDetection/add/index.wxml
+++ b/miniprogram/pageage/project_checkDetection/add/index.wxml
@@ -25,20 +25,20 @@
材料名称
-
+
取样数量
-
+
使用部位
+ placeholder-style="color:#6777aa;" bindinput="onInputUsePositionValue" maxlength="200"/>
@@ -63,7 +63,7 @@
送检实验室名称
-
+
diff --git a/miniprogram/pageage/project_checkDetection/check/index.js b/miniprogram/pageage/project_checkDetection/check/index.js
index dd97199..29ddc3a 100644
--- a/miniprogram/pageage/project_checkDetection/check/index.js
+++ b/miniprogram/pageage/project_checkDetection/check/index.js
@@ -244,6 +244,14 @@ Page({
})
},
+ //跳转修改页面
+ onUpdate:function(){
+ let id = this.data.id;
+ wx.redirectTo({
+ url: `../edit/index?id=${id}`,
+ })
+ },
+
//展示图片
showImg:function(e){
var that=this;
@@ -264,7 +272,7 @@ Page({
this.setData({
detectionFileData: file
});
- },
+ },
returnToPage: function () {
/*关闭当前页面，跳转到应用内的某个页面。但是不允许跳转到 tabbar 页面*/
diff --git a/miniprogram/pageage/project_checkDetection/check/index.wxml b/miniprogram/pageage/project_checkDetection/check/index.wxml
index 0f8ab90..73f7bcd 100644
--- a/miniprogram/pageage/project_checkDetection/check/index.wxml
+++ b/miniprogram/pageage/project_checkDetection/check/index.wxml
@@ -92,7 +92,7 @@
- 登记取样复试结果
+ 登记取样复试检测报告
@@ -112,8 +112,8 @@
- 取消
删除
+ 修改
提交结果
diff --git a/miniprogram/pageage/project_checkDetection/edit/index.js b/miniprogram/pageage/project_checkDetection/edit/index.js
new file mode 100644
index 0000000..ee27328
--- /dev/null
+++ b/miniprogram/pageage/project_checkDetection/edit/index.js
@@ -0,0 +1,522 @@
+// pageage/safetyManagement/addSafetyInspect/index.js
+const app = getApp()
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+ id:"",
+ 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:"",
+ infoData:{},
+ detectionFiles:"",
+ fileUrls:"",
+ fileUrlArray:[],
+ activeName:"",
+ flowRecordList:[],
+ qualifiedFlagList:[{id:'Y',text:"是"},{id:'N',text:"否"}],
+ detectionFileData:[],
+ fileType:["pdf","png","jpg","jpeg"],
+ request:app.globalData.reqUrl
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad(options) {
+ let {id} = options
+ //获取缓存数据
+ wx.getStorage({
+ key: 'userinfo',
+ success:res=>{
+ this.setData({
+ id,
+ projectId:app.globalData.projectId,
+ projectName:app.globalData.projectName,
+ deptId:res.data.deptId,
+ loginName:res.data.loginName,
+ })
+ this.getProjectUserData();
+ this.getTypeList();
+ this.getInfo();
+ this.getAuditinfo();
+ }
+ })
+ },
+
+ //查询项目人员数据
+ getProjectUserData(){
+ let that = this
+ wx.request({
+ url: app.globalData.reqUrl+'/wechat/projectuserinfo/selectProjectUnitUser',
+ method:"get",
+ data:{
+ unitType:"4",
+ projectId:that.data.projectId
+ },
+ header:{
+ 'content-type': 'application/x-www-form-urlencoded'
+ },
+ success(res){
+ res = res.data
+ if(res.code == 200){
+ that.setData({
+ rectifierData:res.data
+ })
+ }
+ }
+ })
+ },
+
+ getTypeList(){
+ let that = this
+ wx.request({
+ url: app.globalData.reqUrl+'/wechat/projectDetection/queryType',
+ method:"get",
+ data:{},
+ header:{
+ 'content-type': 'application/x-www-form-urlencoded'
+ },
+ success(res){
+ res = res.data
+ if(res.code == 200){
+ let list=[];
+ res.data.forEach(it =>{
+ list.push({"id":it.dictValue,"text":it.dictLabel});
+ })
+ that.setData({
+ checkTypeList:list
+ })
+ }
+ }
+ })
+ },
+
+ /**
+ * 获取安全检查详情信息
+ *
+ */
+ 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 fileUrls = [];
+ let fileNames = [];
+ let fileUrlArray=[];
+ //判断附件
+ if(res.data.detectionFile){
+ res.data.detectionFile.split(',').forEach(element => {
+ let it = element.split('/');
+ fileNames.push(it[it.length-1]);
+ fileUrls.push(element);
+ fileUrlArray.push({name:it[it.length-1],path:element});
+ });
+ }
+ that.setData({
+ infoData:res.data,
+ detectionFiles:fileNames,
+ fileUrlArray,
+ fileUrls,
+ detectionFileData:fileUrlArray,
+ checkType:res.data.checkType,
+ materialName:res.data.materialName,
+ usePosition:res.data.usePosition,
+ sampleNum:res.data.sampleNum,
+ qualifiedFlag:res.data.qualifiedFlag,
+ witnessUser:res.data.witnessUser,
+ witnessUserName:res.data.witnessUserName,
+ checkTime:res.data.checkTime,
+ laboratoryName:res.data.laboratoryName,
+ loadShow:false
+ })
+ }
+ }
+ })
+ },
+
+ /**
+ * 查询流程日志
+ */
+ getAuditinfo(){
+ let that = this
+ wx.request({
+ url: app.globalData.reqUrl+'/wechat/projectAuditinfo/selectProjectAuditinfo',
+ method:"get",
+ data:{
+ fromType:"1",
+ fromId:this.data.id
+ },
+ success(res){
+ res = res.data
+ if(res.code == 200){
+ that.setData({
+ flowRecordList:res.data
+ })
+ }
+ }
+ })
+ },
+
+ fileUpload(options){
+ let file=options.detail;
+ this.setData({
+ detectionFileData: file
+ });
+ },
+
+ // 手风琴
+ onChange(event) {
+ this.setData({
+ activeName: event.detail,
+ });
+ },
+
+ //材料名称
+ onInputMaterialNameValue(e){
+ let materialName = e.detail.value
+ this.setData({
+ materialName
+ })
+ },
+
+ //使用部位
+ onInputUsePositionValue(e){
+ let usePosition = e.detail.value
+ this.setData({
+ usePosition
+ })
+ },
+ //取样数量
+ onInputSampleNumValue(e){
+ let sampleNum = e.detail.value
+ this.setData({
+ sampleNum
+ })
+ },
+ //送检实验室名称
+ onInputLaboratoryNameValue(e){
+ let laboratoryName = e.detail.value
+ this.setData({
+ laboratoryName
+ })
+ },
+
+ //验收时间
+ onInputTime(e){
+ let checkTime = e.detail
+ this.setData({
+ checkTime
+ })
+ },
+
+ //添加监理专员
+ 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)
+ })
+ }else{
+ this.setData({
+ witnessUser:"",
+ witnessUserName:""
+ })
+ }
+ },
+
+ //取消页面
+ cancelSaveView(){
+ this.returnToPage()
+ },
+
+ //保存
+ onSubmitSave(){
+ this.setData({
+ loadShow:true
+ })
+ let that = this
+ let {id,checkType,
+ materialName,
+ usePosition,
+ sampleNum,
+ qualifiedFlag,
+ witnessUser,
+ witnessUserName,
+ checkTime,
+ laboratoryName,loginName,detectionFileData} = that.data;
+ //数据效验
+ if(id==""){
+ 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;
+ }
+ if(this.data.infoData.detectionFile!=null && detectionFileData.length==0){
+ app.toast("请上传检测报告!")
+ that.setData({
+ loadShow:false
+ })
+ return;
+ }
+ let path=this.data.infoData.detectionFile;
+ if(detectionFileData.length>0){
+ 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;
+ }
+ }else{
+ detectionFileData.push(null);
+ }
+ detectionFileData.forEach(async (item)=>{
+ if(item!=null && item.path.indexOf("/profile/")==-1){
+ let uploadUrl = app.globalData.uploadUrl+'/common/upload'
+ let uploadName = "file"
+ //这里复杂的图片上传，改为同步上传，因为小程序只能上传一张图片
+ let obj = await that.syncUploadImage(uploadUrl,item.path,uploadName);
+ path = obj.data.fileName;
+ }
+ let params = {
+ id,
+ checkType,
+ materialName,
+ usePosition,
+ sampleNum,
+ qualifiedFlag,
+ witnessUser,
+ witnessUserName,
+ checkTime:checkTime+":00",
+ laboratoryName,
+ updateBy:loginName,
+ detectionFile:path,
+ approveStatus:path==null?null:"1"
+ }
+ 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)
+ }
+ });
+ })
+ },
+
+ //选择检测类型
+ onSelectCheckType(e){
+ this.setData({
+ checkType:e.detail.id
+ })
+ },
+ //选择是否提供合格证
+ onSelectQualifiedFlag(e){
+ this.setData({
+ qualified:e.detail.id
+ })
+ },
+
+ 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/edit/index.json b/miniprogram/pageage/project_checkDetection/edit/index.json
new file mode 100644
index 0000000..5c42e53
--- /dev/null
+++ b/miniprogram/pageage/project_checkDetection/edit/index.json
@@ -0,0 +1,8 @@
+{
+ "usingComponents": {
+ "van-overlay": "@vant/weapp/overlay/index",
+ "van-collapse": "@vant/weapp/collapse",
+ "van-collapse-item": "@vant/weapp/collapse-item"
+ },
+ "navigationStyle":"custom"
+}
\ No newline at end of file
diff --git a/miniprogram/pageage/project_checkDetection/edit/index.wxml b/miniprogram/pageage/project_checkDetection/edit/index.wxml
new file mode 100644
index 0000000..11b225d
--- /dev/null
+++ b/miniprogram/pageage/project_checkDetection/edit/index.wxml
@@ -0,0 +1,174 @@
+
+
+
+
+
+ {{projectName}}
+
+
+
+
+
+
+
+
+
+ {{(flowRecordList.length-index) < 9 ?'0'+(flowRecordList.length-index):(flowRecordList.length-index)}}
+
+ 提交取样复试
+ 审批取样复试
+ {{item.commentResult}}
+ 合格
+ 不合格
+
+
+
+
+ 办理用户：{{item.userName}}
+ 办理单位：{{item.deptName}}
+ 办理时间：{{item.createTime}}
+ 审批意见：{{item.comment}}
+
+
+
+
+
+
+
+
+ 送检类型
+
+
+
+
+
+ 材料名称
+
+
+
+
+
+ 取样数量
+
+
+
+
+
+ 使用部位
+
+
+
+
+
+ 是否提供合格证
+
+
+
+
+
+ 监理专员
+
+
+
+
+
+
+ 送检时间
+
+
+
+
+
+ 送检实验室名称
+
+
+
+
+
+
+
+ 登记取样复试结果
+
+
+
+ 检测报告
+ [可上传PDF和图片格式]
+
+
+
+
+
+
+
+
+ 取消
+ 提交
+
+
+
+
+
+
+ 数据加载中！请稍后...
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/miniprogram/pageage/project_checkDetection/edit/index.wxss b/miniprogram/pageage/project_checkDetection/edit/index.wxss
new file mode 100644
index 0000000..b3d0a18
--- /dev/null
+++ b/miniprogram/pageage/project_checkDetection/edit/index.wxss
@@ -0,0 +1,54 @@
+/* pageage/safetyManagement/addSafetyInspect/index.wxss */
+.van-popup{
+ background: none !important;
+}
+.van-image__img{
+ border-radius: 10rpx !important;
+}
+.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;
+ }
+ .gk_open_con view{
+ padding: 10rpx 0;
+ width: 100%;
+ }
+ .gk_open_con image{
+ width: 30rpx;
+ height: 30rpx;
+ margin-right: 5rpx;
+ position: relative;
+ top: 5rpx;
+ }
diff --git a/miniprogram/pageage/project_checkDetection/info/index.js b/miniprogram/pageage/project_checkDetection/info/index.js
index 0903701..8e37622 100644
--- a/miniprogram/pageage/project_checkDetection/info/index.js
+++ b/miniprogram/pageage/project_checkDetection/info/index.js
@@ -84,7 +84,7 @@ Page({
loadShow:false
})
//判断当前能否删除
- if(res.data.createBy==that.data.loginName){
+ if(res.data.createBy==that.data.loginName && res.data.approveStatus!="4"){
that.setData({
showDel:true
})
@@ -160,6 +160,14 @@ Page({
})
},
+ //跳转修改页面
+ onUpdate:function(){
+ let id = this.data.id;
+ wx.redirectTo({
+ url: `../edit/index?id=${id}`,
+ })
+ },
+
//展示图片
showImg:function(e){
var that=this;
diff --git a/miniprogram/pageage/project_checkDetection/info/index.wxml b/miniprogram/pageage/project_checkDetection/info/index.wxml
index 30a1718..1a872f8 100644
--- a/miniprogram/pageage/project_checkDetection/info/index.wxml
+++ b/miniprogram/pageage/project_checkDetection/info/index.wxml
@@ -26,9 +26,8 @@
提交取样复试
审批取样复试
- {{item.commentResult}}
- 合格
- 不合格
+ 合格
+ 不合格
@@ -151,12 +150,14 @@
-
+
检测结果
- 合格
- 不合格
+ 送检中
+ 待审核
+ 合格
+ 不合格
@@ -164,6 +165,7 @@
删除
+ 修改
diff --git a/miniprogram/pageage/project_checkDetection/list/index.js b/miniprogram/pageage/project_checkDetection/list/index.js
index a0f978a..4fcc118 100644
--- a/miniprogram/pageage/project_checkDetection/list/index.js
+++ b/miniprogram/pageage/project_checkDetection/list/index.js
@@ -27,15 +27,21 @@ Page({
},
getInfo(e){
- let {id,checkState} = e.currentTarget.dataset.set
- if(checkState=="1"){
+ let {id,checkState,approveStatus,witnessUser} = e.currentTarget.dataset.set
+ if(approveStatus=="1" && witnessUser==this.data.loginName){
wx.redirectTo({
- url: `../check/index?id=${id}`,
+ url: `../../../pages/project_approve/approveCheckDetection/index?id=${id}`
})
}else{
- wx.redirectTo({
- url: `../info/index?id=${id}`,
- })
+ if(checkState=="1"){
+ wx.redirectTo({
+ url: `../check/index?id=${id}`,
+ })
+ }else{
+ wx.redirectTo({
+ url: `../info/index?id=${id}`,
+ })
+ }
}
},
@@ -71,6 +77,7 @@ Page({
let param = {
"projectId": projectId,
"deptId":deptId,
+ "nowUserName":this.data.loginName,
"activeName":that.data.activeState
}
wx.request({
diff --git a/miniprogram/pageage/project_checkDetection/list/index.wxml b/miniprogram/pageage/project_checkDetection/list/index.wxml
index 6a1315d..61cf213 100644
--- a/miniprogram/pageage/project_checkDetection/list/index.wxml
+++ b/miniprogram/pageage/project_checkDetection/list/index.wxml
@@ -24,14 +24,15 @@
{{index < 9 ?'0'+(index+1):(index+1)}}
送检时间：{{item.checkTime}}
- 送检中
- 合格
- 不合格
+ 送检中
+ 待审批
+ 合格
+ 不合格
-
+
送检类型：{{item.checkTypeName}}
材料名称：{{item.materialName}}
使用部位：{{item.usePosition}}
diff --git a/miniprogram/pageage/project_checking/add/index.js b/miniprogram/pageage/project_checking/add/index.js
index cd28eeb..a987bbe 100644
--- a/miniprogram/pageage/project_checking/add/index.js
+++ b/miniprogram/pageage/project_checking/add/index.js
@@ -14,6 +14,7 @@ Page({
loginName:"",
userName:"",
rectifierData:[],
+ rectifierData2:[],
imageInfoData:[],
checkingResult:"1",
//验收时间
@@ -53,7 +54,7 @@ Page({
getProjectUserData(){
let that = this
wx.request({
- url: app.globalData.reqUrl+'/wechat/projectuserinfo/list',
+ url: app.globalData.reqUrl+'/wechat/projectuserinfo/selectProjectUnitUser',
method:"get",
data:{
unitType:"4",
@@ -72,6 +73,27 @@ Page({
}
}
})
+
+ wx.request({
+ url: app.globalData.reqUrl+'/wechat/projectuserinfo/selectProjectUnitUser',
+ method:"get",
+ data:{
+ unitType:"2",
+ projectId:that.data.projectId
+ },
+ header:{
+ 'content-type': 'application/x-www-form-urlencoded'
+ },
+ success(res){
+ res = res.data
+ if(res.code == 200){
+ let tempData = []
+ that.setData({
+ rectifierData2:res.data,
+ })
+ }
+ }
+ })
},
//切换验收结果
diff --git a/miniprogram/pageage/project_checking/add/index.wxml b/miniprogram/pageage/project_checking/add/index.wxml
index d41cc2e..af14547 100644
--- a/miniprogram/pageage/project_checking/add/index.wxml
+++ b/miniprogram/pageage/project_checking/add/index.wxml
@@ -25,7 +25,7 @@
质量专员
-
+
@@ -39,14 +39,14 @@
工序部位
-
+
验收描述
+ placeholder-style="color:#6777aa;" bindinput="onInputIntroValue" maxlength="200"/>
diff --git a/miniprogram/pageage/project_checking/edit/index.js b/miniprogram/pageage/project_checking/edit/index.js
new file mode 100644
index 0000000..1ecb12f
--- /dev/null
+++ b/miniprogram/pageage/project_checking/edit/index.js
@@ -0,0 +1,440 @@
+// pageage/safetyManagement/addSafetyInspect/index.js
+const app = getApp()
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+ maxDate:new Date(2088,1,1).getTime(),
+ currentDate:new Date().getTime(),
+ deptId:"",
+ projectId:"",
+ projectName:"",
+ loginName:"",
+ userName:"",
+ rectifierData:[],
+ rectifierData2:[],
+ imageInfoData:[],
+ checkingResult:"1",
+ //验收时间
+ checkTime:'',
+ loadShow:false,
+ qualityUser:"",
+ qualityUserName:"",
+ superviseUser:"",
+ superviseUserName:"",
+ checkWorkingPosition:"",
+ intro:"",
+ infoData:{},
+ activeName:"",
+ flowRecordList:[],
+ minUrls:[],
+ list:[{id:1,text:"合格"},{id:2,text:"不合格"}],
+ request:app.globalData.reqUrl
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad(options) {
+ let {id} = options
+ //获取缓存数据
+ wx.getStorage({
+ key: 'userinfo',
+ success:res=>{
+ this.setData({
+ id,
+ projectId:app.globalData.projectId,
+ projectName:app.globalData.projectName,
+ deptId:res.data.deptId,
+ loginName:res.data.loginName,
+ userName:res.data.nickName
+ })
+ this.getProjectUserData();
+ this.getInfo();
+ this.getAuditinfo();
+ }
+ })
+ },
+
+ //查询项目人员数据
+ getProjectUserData(){
+ let that = this
+ wx.request({
+ url: app.globalData.reqUrl+'/wechat/projectuserinfo/selectProjectUnitUser',
+ method:"get",
+ data:{
+ unitType:"4",
+ projectId:that.data.projectId
+ },
+ header:{
+ 'content-type': 'application/x-www-form-urlencoded'
+ },
+ success(res){
+ res = res.data
+ if(res.code == 200){
+ let tempData = []
+ that.setData({
+ rectifierData:res.data,
+ })
+ }
+ }
+ })
+
+ wx.request({
+ url: app.globalData.reqUrl+'/wechat/projectuserinfo/selectProjectUnitUser',
+ method:"get",
+ data:{
+ unitType:"2",
+ projectId:that.data.projectId
+ },
+ header:{
+ 'content-type': 'application/x-www-form-urlencoded'
+ },
+ success(res){
+ res = res.data
+ if(res.code == 200){
+ let tempData = []
+ that.setData({
+ rectifierData2:res.data,
+ })
+ }
+ }
+ })
+ },
+
+ //切换验收结果
+ onSelectType(e){
+ this.setData({
+ checkingResult:e.detail.id
+ })
+ },
+
+ //工序部位
+ onInputCheckWorkingPositionValue(e){
+ let checkWorkingPosition = e.detail.value
+ this.setData({
+ checkWorkingPosition
+ })
+ },
+ //验收描述
+ onInputIntroValue(e){
+ let intro = e.detail.value
+ this.setData({
+ intro
+ })
+ },
+
+ //验收时间
+ onInputTime(e){
+ let checkTime = e.detail
+ this.setData({
+ checkTime
+ })
+ },
+
+/**
+ * 获取安全检查详情信息
+ *
+ */
+ getInfo(){
+ let {id} = this.data
+ let that = this
+ wx.request({
+ url: app.globalData.reqUrl+'/wechat/projectchecking/info',
+ method:"get",
+ data:{
+ id:id
+ },
+ success(res){
+ res = res.data
+ if(res.code == 200){
+ let imageInfoData = [];
+ if(res.data.imageUrls){
+ res.data.imageUrls.split(',').forEach(element => {
+ imageInfoData.push(that.data.request+element+'.min.jpg');
+ });
+ }
+ that.setData({
+ infoData:res.data,
+ qualityUser:res.data.qualityUser,
+ qualityUserName:res.data.qualityUserName,
+ superviseUser:res.data.superviseUser,
+ superviseUserName:res.data.superviseUserName,
+ checkWorkingPosition:res.data.checkWorkingPosition,
+ intro:res.data.intro,
+ checkTime:res.data.checkTime,
+ imageInfoData,
+ loadShow:false
+ })
+ }
+ }
+ })
+ },
+
+ /**
+ * 查询流程日志
+ */
+ getAuditinfo(){
+ let that = this
+ wx.request({
+ url: app.globalData.reqUrl+'/wechat/projectAuditinfo/selectProjectAuditinfo',
+ method:"get",
+ data:{
+ fromType:"3",
+ fromId:this.data.id
+ },
+ success(res){
+ res = res.data
+ if(res.code == 200){
+ that.setData({
+ flowRecordList:res.data
+ })
+ }
+ }
+ })
+ },
+
+ // 手风琴
+ onChange(event) {
+ this.setData({
+ activeName: event.detail,
+ });
+ },
+
+ // list 上传图片
+ onImagesArr(e){
+ var data = this.data.imageInfoData
+ data = e.detail
+ this.setData({
+ imageInfoData:data
+ })
+ },
+
+ //添加质量专员
+ onAddQualityUser(e){
+ if(e.detail.length>0){
+ this.setData({
+ qualityUser:e.detail[0].phoneNumber,
+ qualityUserName:e.detail[0].userName
+ })
+ }
+ },
+
+ //添加监理专员
+ onAddSuperviseUser(e){
+ if(e.detail.length>0){
+ this.setData({
+ superviseUser:e.detail[0].phoneNumber,
+ superviseUserName:e.detail[0].userName
+ })
+ }
+ },
+
+ //取消页面
+ cancelSaveView(){
+ this.returnToPage()
+ },
+
+ //保存
+ onProblemSubmitSave(){
+ this.setData({
+ loadShow:true
+ })
+ let that = this
+ let {id,qualityUser,qualityUserName,superviseUser,superviseUserName,checkWorkingPosition,intro,checkTime,imageInfoData,loginName} = that.data;
+ //数据效验
+ if(id==""){
+ app.toast("数据异常，请刷新页面重试!")
+ that.setData({
+ loadShow:false
+ })
+ return;
+ }
+ if(imageInfoData.length==0){
+ app.toast("请上传举牌验收现场图片!")
+ that.setData({
+ loadShow:false
+ })
+ return;
+ }
+ if(qualityUser==""||qualityUserName==""){
+ app.toast("请选择质量专员!")
+ that.setData({
+ loadShow:false
+ })
+ return;
+ }
+ if(superviseUser==""||superviseUserName==""){
+ app.toast("请选择监理专员!")
+ that.setData({
+ loadShow:false
+ })
+ return;
+ }
+ if(checkWorkingPosition==""){
+ app.toast("请填写验收工序部位!")
+ that.setData({
+ loadShow:false
+ })
+ return;
+ }
+ if(intro==""){
+ app.toast("请填写验收结果描述!")
+ that.setData({
+ loadShow:false
+ })
+ return;
+ }
+ if(checkTime==""){
+ app.toast("请选择验收时间!")
+ that.setData({
+ loadShow:false
+ })
+ return;
+ }
+
+ let fileUrls = [];
+ imageInfoData.forEach(async (item)=>{
+ let uploadUrl = app.globalData.uploadUrl+'/common/upload'
+ let name = "file"
+ //这里复杂的图片上传，改为同步上传，因为小程序只能上传一张图片
+ if(item.indexOf(that.data.request)>-1){
+ fileUrls.push(item.replace(that.data.request,"").replace(".min.jpg",""));
+ }else{
+ let obj = await that.syncUploadImage(uploadUrl,item,name);
+ fileUrls.push(obj.data.fileName);
+ }
+ //验证图片上传完毕
+ if(fileUrls.length == imageInfoData.length){
+ let params = {
+ id,
+ qualityUser,
+ qualityUserName,
+ superviseUser,
+ superviseUserName,
+ checkWorkingPosition,
+ intro,
+ checkingDate:checkTime,
+ approveStatus:"1",
+ updateBy:loginName,
+ imageUrls:fileUrls.toString()
+ }
+ wx.request({
+ url: app.globalData.reqUrl + '/wechat/projectchecking/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)
+ }
+ });
+ })
+ },
+
+ 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_checking/edit/index.json b/miniprogram/pageage/project_checking/edit/index.json
new file mode 100644
index 0000000..025d779
--- /dev/null
+++ b/miniprogram/pageage/project_checking/edit/index.json
@@ -0,0 +1,9 @@
+{
+ "usingComponents": {
+ "van-overlay": "@vant/weapp/overlay/index",
+ "van-collapse": "@vant/weapp/collapse",
+ "van-collapse-item": "@vant/weapp/collapse-item"
+ },
+ "navigationStyle":"custom",
+ "navigationBarTitleText": "新增举牌验收"
+}
\ No newline at end of file
diff --git a/miniprogram/pageage/project_checking/edit/index.wxml b/miniprogram/pageage/project_checking/edit/index.wxml
new file mode 100644
index 0000000..1fb2289
--- /dev/null
+++ b/miniprogram/pageage/project_checking/edit/index.wxml
@@ -0,0 +1,148 @@
+
+
+
+
+
+ {{projectName}}
+
+
+
+
+
+
+
+
+
+ {{(flowRecordList.length-index) < 9 ?'0'+(flowRecordList.length-index):(flowRecordList.length-index)}}
+
+ 提交取样复试
+ 审批取样复试
+ {{item.commentResult}}
+ 合格
+ 不合格
+
+
+
+
+ 办理用户：{{item.userName}}
+ 办理单位：{{item.deptName}}
+ 办理时间：{{item.createTime}}
+ 审批意见：{{item.comment}}
+
+
+
+
+
+
+
+
+ 验收图片
+
+
+
+
+
+ 质量专员
+
+
+
+
+
+
+ 监理专员
+
+
+
+
+
+
+ 工序部位
+
+
+
+
+
+ 验收描述
+
+
+
+
+
+ 验收时间
+
+
+
+
+
+
+ 取消
+ 保存
+
+
+
+
+
+
+ 数据加载中！请稍后...
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/miniprogram/pageage/project_checking/edit/index.wxss b/miniprogram/pageage/project_checking/edit/index.wxss
new file mode 100644
index 0000000..21845b5
--- /dev/null
+++ b/miniprogram/pageage/project_checking/edit/index.wxss
@@ -0,0 +1,60 @@
+/* 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;
+}
+.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;
+ }
+ .gk_open_con view{
+ padding: 10rpx 0;
+ width: 100%;
+ }
+ .gk_open_con image{
+ width: 30rpx;
+ height: 30rpx;
+ margin-right: 5rpx;
+ position: relative;
+ top: 5rpx;
+ }
diff --git a/miniprogram/pageage/project_checking/info/index.js b/miniprogram/pageage/project_checking/info/index.js
index 6306714..9c5b632 100644
--- a/miniprogram/pageage/project_checking/info/index.js
+++ b/miniprogram/pageage/project_checking/info/index.js
@@ -31,12 +31,12 @@ Page({
id,
loginName:res.data.loginName
})
- this.getInfo();
+ this.getInfo();
+ this.getAuditinfo();
}
})
},
-
/**
* 获取安全检查详情信息
*
@@ -68,7 +68,7 @@ Page({
loadShow:false
})
//判断当前能否删除
- if(res.data.createBy==that.data.loginName){
+ if(res.data.createBy==that.data.loginName && res.data.approveStatus!="4"){
that.setData({
showDel:true
})
@@ -114,7 +114,15 @@ Page({
})
},
- /**
+ //跳转修改页面
+ onUpdate:function(){
+ let id = this.data.id;
+ wx.redirectTo({
+ url: `../edit/index?id=${id}`,
+ })
+ },
+
+ /**
* 查询流程日志
*/
getAuditinfo(){
diff --git a/miniprogram/pageage/project_checking/info/index.wxml b/miniprogram/pageage/project_checking/info/index.wxml
index 17d3191..dd4f437 100644
--- a/miniprogram/pageage/project_checking/info/index.wxml
+++ b/miniprogram/pageage/project_checking/info/index.wxml
@@ -24,11 +24,10 @@
{{(flowRecordList.length-index) < 9 ?'0'+(flowRecordList.length-index):(flowRecordList.length-index)}}
- 提交取样复试
- 审批取样复试
- {{item.commentResult}}
- 合格
- 不合格
+ 提交举牌验收
+ 审批举牌验收
+ 合格
+ 不合格
@@ -94,13 +93,16 @@
{{infoData.checkingDate}}
-
-
- 验收结果
- 验收合格
- 验收不合格
-
-
+
+
+ 验收结果
+
+ 待审批
+ 合格
+ 不合格
+
+
+
提交时间
@@ -116,7 +118,9 @@
-
-
- 删除
+
+ 删除
+ 修改
+
+
diff --git a/miniprogram/pageage/project_checking/list/index.js b/miniprogram/pageage/project_checking/list/index.js
index a2bb8bd..1b1a0ff 100644
--- a/miniprogram/pageage/project_checking/list/index.js
+++ b/miniprogram/pageage/project_checking/list/index.js
@@ -36,10 +36,16 @@ Page({
},
getInfo(e){
- let {id} = e.currentTarget.dataset.set
+ let {id,approveStatus,superviseUser} = e.currentTarget.dataset.set
+ if(approveStatus=="1" && superviseUser==this.data.loginName){
wx.redirectTo({
- url: `../info/index?id=${id}`,
+ url: `../../../pages/project_approve/approveChecking/index?id=${id}`
})
+ }else{
+ wx.redirectTo({
+ url: `../info/index?id=${id}`
+ })
+ }
},
/**
@@ -123,7 +129,7 @@ Page({
this.setData({
activeState:nav
});
- this.getProjectCheckingData(this.initData.id,this.data.loginName,this.data.deptId,this.data.minRoleId)
+ this.getProjectCheckingData(this.data.projectId,this.data.loginName,this.data.deptId,this.data.minRoleId)
},
returnToPage: function () {
diff --git a/miniprogram/pageage/project_checking/list/index.wxml b/miniprogram/pageage/project_checking/list/index.wxml
index 5acb729..ebf8dd9 100644
--- a/miniprogram/pageage/project_checking/list/index.wxml
+++ b/miniprogram/pageage/project_checking/list/index.wxml
@@ -29,8 +29,9 @@
- 合格
- 不合格
+ 待审批
+ 合格
+ 不合格
diff --git a/miniprogram/pageage/project_deptWorks/add/index.wxml b/miniprogram/pageage/project_deptWorks/add/index.wxml
index 7af1f5a..f02015b 100644
--- a/miniprogram/pageage/project_deptWorks/add/index.wxml
+++ b/miniprogram/pageage/project_deptWorks/add/index.wxml
@@ -19,19 +19,19 @@
劳务人员
-
+
监理人员
-
+
总包人员
-
+
diff --git a/miniprogram/pageage/project_insurance/add/index.wxml b/miniprogram/pageage/project_insurance/add/index.wxml
index 55334ac..cec967c 100644
--- a/miniprogram/pageage/project_insurance/add/index.wxml
+++ b/miniprogram/pageage/project_insurance/add/index.wxml
@@ -25,13 +25,13 @@
保险公司
-
+
保险单号
-
+
diff --git a/miniprogram/pageage/project_materialSeal/add/index.js b/miniprogram/pageage/project_materialSeal/add/index.js
index eeeff33..9f63445 100644
--- a/miniprogram/pageage/project_materialSeal/add/index.js
+++ b/miniprogram/pageage/project_materialSeal/add/index.js
@@ -42,6 +42,7 @@ Page({
deptId:res.data.deptId,
loginName:res.data.loginName
})
+ this.getProjectUserData();
}
})
},
diff --git a/miniprogram/pageage/project_materialSeal/add/index.wxml b/miniprogram/pageage/project_materialSeal/add/index.wxml
index 77c45a9..e5d2203 100644
--- a/miniprogram/pageage/project_materialSeal/add/index.wxml
+++ b/miniprogram/pageage/project_materialSeal/add/index.wxml
@@ -25,28 +25,28 @@
封样名称
-
+
使用部位
+ placeholder-style="color:#6777aa;" maxlength="800" bindinput="usePositionAction"/>
合同指定品牌
+ placeholder-style="color:#6777aa;" maxlength="800" bindinput="contractBrandAction"/>
拟用品牌
+ placeholder-style="color:#6777aa;" maxlength="800" bindinput="useBrandAction"/>
diff --git a/miniprogram/pageage/project_materialSeal/edit/index.js b/miniprogram/pageage/project_materialSeal/edit/index.js
new file mode 100644
index 0000000..c39e085
--- /dev/null
+++ b/miniprogram/pageage/project_materialSeal/edit/index.js
@@ -0,0 +1,512 @@
+// pageage/safetyManagement/addSafetyInspect/index.js
+const app = getApp()
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+ id:"",
+ maxDate:new Date(2088,1,1).getTime(),
+ currentDate:new Date().getTime(),
+ projectId:"",
+ projectName:"",
+ loginName:"",
+ imageInfoData:[],
+ signFileData:[],
+ alterationFileData:[],
+ limit:1,
+ showBgd:false,
+ rectifierData:[],
+ materialName:"",
+ usePosition:"",
+ contractBrand:"",
+ useBrand:"",
+ sealDate:"",
+ witnessUser:"",
+ witnessUserName:"",
+ activeName:"",
+ flowRecordList:[],
+ infoData:{},
+ request:app.globalData.reqUrl
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad(options) {
+ let {id} = options
+ //获取缓存数据
+ wx.getStorage({
+ key: 'userinfo',
+ success:res=>{
+ this.setData({
+ id,
+ projectId:app.globalData.projectId,
+ projectName:app.globalData.projectName,
+ deptId:res.data.deptId,
+ loginName:res.data.loginName
+ })
+ this.getInfo()
+ this.getAuditinfo();
+ this.getProjectUserData();
+ }
+ })
+ },
+
+ // list 上传图片
+ onImagesArr(e){
+ var data = this.data.imageInfoData;
+ data = e.detail
+ this.setData({
+ imageInfoData:data
+ })
+ },
+ onImagesArrSignFiles(e){
+ var data = this.data.signFileData;
+ data = e.detail
+ this.setData({
+ signFileData:data
+ })
+ },
+ onImagesArrAlterationFiles(e){
+ var data = this.data.alterationFileData;
+ data = e.detail
+ this.setData({
+ alterationFileData:data
+ })
+ },
+
+ //添加监理专员
+ onAddSend(e){
+ if(e.detail.length>0){
+ let phoneNumbers="";
+ let userNames="";
+ e.detail.forEach(it =>{
+ phoneNumbers+=","+it.phoneNumber;
+ userNames+=","+it.userName;
+ });
+ this.setData({
+ "infoData.witnessUserName":userNames.substring(1),
+ "infoData.witnessUser":phoneNumbers.substring(1)
+ })
+ }else{
+ this.setData({
+ "infoData.witnessUser":"",
+ "infoData.witnessUserName":""
+ })
+ }
+ },
+
+ //取消页面
+ cancelSaveView(){
+ /*关闭当前页面，跳转到应用内的某个页面。但是不允许跳转到 tabbar 页面*/
+ wx.redirectTo({
+ url: '../list/index'
+ })
+ },
+
+ /**
+ * 获取安全检查详情信息
+ *
+ */
+ getInfo(){
+ let {id} = this.data
+ let that = this
+ wx.request({
+ url: app.globalData.reqUrl+'/wechat/projectMaterialSeal/info',
+ method:"get",
+ data:{
+ id:id
+ },
+ success(res){
+ res = res.data
+ if(res.code == 200){
+ let imageInfoData = [];
+ if(res.data.imageUrls){
+ res.data.imageUrls.split(',').forEach(element => {
+ imageInfoData.push(that.data.request+element+'.min.jpg');
+ });
+ }
+ let signFileData = [];
+ //判断附件
+ if(res.data.signFiles){
+ res.data.signFiles.split(',').forEach(element => {
+ let type = element.split('.');
+ type = type[type.length-1].toUpperCase();
+ if(type=="PDF"){
+ app.toast("小程序不支持修改PDF格式的会签单，请前往PC后台修改!");
+ setTimeout(()=>{
+ wx.redirectTo({
+ url: '../list/index'
+ })
+ },200)
+ }
+ //let it = element.split('/');
+ //signFileData.push({name:it[it.length-1],path:element});
+ signFileData.push(that.data.request+element+'.min.jpg');
+ });
+ }
+ let alterationFileData = [];
+ //判断附件
+ if(res.data.alterationFiles){
+ res.data.alterationFiles.split(',').forEach(element => {
+ let type = element.split('.');
+ type = type[type.length-1].toUpperCase();
+ if(type=="PDF"){
+ app.toast("小程序不支持修改PDF格式的变更单，请前往PC后台修改!");
+ setTimeout(()=>{
+ wx.redirectTo({
+ url: '../list/index'
+ })
+ },200)
+ }
+ //let it = element.split('/');
+ //alterationFileData.push({name:it[it.length-1],path:element});
+ alterationFileData.push(that.data.request+element+'.min.jpg');
+ });
+ }
+ that.setData({
+ infoData:res.data,
+ signFileData,
+ alterationFileData,
+ imageInfoData,
+ loadShow:false
+ })
+ that.showBgdLabel(res.data);
+ }
+ }
+ })
+ },
+
+ /**
+ * 查询流程日志
+ */
+ getAuditinfo(){
+ let that = this
+ wx.request({
+ url: app.globalData.reqUrl+'/wechat/projectAuditinfo/selectProjectAuditinfo',
+ method:"get",
+ data:{
+ fromType:"4",
+ fromId:this.data.id
+ },
+ success(res){
+ res = res.data
+ if(res.code == 200){
+ that.setData({
+ flowRecordList:res.data
+ })
+ }
+ }
+ })
+ },
+
+ // 手风琴
+ onChange(event) {
+ this.setData({
+ activeName: event.detail,
+ });
+ },
+
+ //保存
+ onSave(){
+ this.setData({
+ loadShow:true
+ })
+ let that = this
+ let {id,loginName,imageInfoData,signFileData,alterationFileData,infoData} = that.data;
+ //数据效验
+ if(id==""){
+ app.toast("数据异常，请刷新页面重试!")
+ that.setData({
+ loadShow:false
+ })
+ return;
+ }
+ if(imageInfoData.length==0){
+ app.toast("请上传封样现场图片!")
+ that.setData({
+ loadShow:false
+ })
+ return;
+ }
+ if(infoData.materialName==""){
+ app.toast("请填写封样名称!")
+ that.setData({
+ loadShow:false
+ })
+ return;
+ }
+ if(infoData.usePosition==""){
+ app.toast("请填写使用部位!")
+ that.setData({
+ loadShow:false
+ })
+ return;
+ }
+ if(infoData.contractBrand==""){
+ app.toast("请填写合同指定品牌!")
+ that.setData({
+ loadShow:false
+ })
+ return;
+ }
+ if(infoData.useBrand==""){
+ app.toast("请填写拟用品牌!")
+ that.setData({
+ loadShow:false
+ })
+ return;
+ }
+ if(infoData.sealDate==""){
+ app.toast("请选择封样时间!")
+ that.setData({
+ loadShow:false
+ })
+ return;
+ }
+ if(infoData.witnessUser==""||infoData.witnessUserName==""){
+ app.toast("请选择监理专员!")
+ that.setData({
+ loadShow:false
+ })
+ return;
+ }
+ if(signFileData.length==0){
+ app.toast("请上传会签单照片!")
+ that.setData({
+ loadShow:false
+ });
+ return;
+ }
+ if(infoData.contractBrand.indexOf(infoData.useBrand)==-1 && alterationFileData.length==0){
+ app.toast("请上传变更单照片!")
+ that.setData({
+ loadShow:false
+ });
+ return;
+ }
+ let fileUrls = [];
+ imageInfoData.forEach(async (item)=>{
+ let uploadUrl = app.globalData.uploadUrl+'/common/upload'
+ let name = "file"
+ //这里复杂的图片上传，改为同步上传，因为小程序只能上传一张图片
+ if(item.indexOf(that.data.request)>-1){
+ fileUrls.push(item.replace(that.data.request,"").replace(".min.jpg",""));
+ }else{
+ let obj = await that.syncUploadImage(uploadUrl,item,name);
+ fileUrls.push(obj.data.fileName);
+ }
+ //验证图片上传完毕
+ if(fileUrls.length == imageInfoData.length){
+ let signFilePath="";
+ if(signFileData[0].indexOf(that.data.request)>-1){
+ signFilePath = signFileData[0].replace(that.data.request,"").replace(".min.jpg","");
+ }else{
+ //上传会签单
+ let signFile = await that.syncUploadImage(uploadUrl,signFileData[0],name);
+ signFilePath = signFile.data.fileName;
+ }
+ //上传变更单
+ let alterationFilePath = "";
+ if(alterationFileData.length>0){
+ if(alterationFileData[0].indexOf(that.data.request)>-1){
+ alterationFilePath = alterationFileData[0].replace(that.data.request,"").replace(".min.jpg","");
+ }else{
+ //上传会签单
+ let alterationFile = await that.syncUploadImage(uploadUrl,alterationFileData[0],name);
+ alterationFilePath = alterationFile.data.fileName;
+ }
+ }
+ let params = {
+ id,
+ imageUrls:fileUrls.toString(),
+ materialName:infoData.materialName,
+ usePosition:infoData.usePosition,
+ contractBrand:infoData.contractBrand,
+ useBrand:infoData.useBrand,
+ sealDate:infoData.sealDate+":00",
+ witnessUser:infoData.witnessUser,
+ witnessUserName:infoData.witnessUserName,
+ signFiles:signFilePath,
+ alterationFiles:alterationFilePath,
+ approveStatus:"1",
+ updateBy:loginName
+ }
+ wx.request({
+ url: app.globalData.reqUrl + "/wechat/projectMaterialSeal/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)
+ }
+ });
+ })
+ },
+
+ materialNameAction: function (options) {
+ this.data.infoData.materialName = options.detail.value;
+ },
+ usePositionAction: function (options) {
+ this.data.infoData.usePosition = options.detail.value
+ },
+ contractBrandAction: function (options) {
+ this.data.infoData.contractBrand = options.detail.value;
+ this.showBgdLabel(this.data.infoData);
+ },
+ useBrandAction: function (options) {
+ this.data.infoData.useBrand = options.detail.value;
+ this.showBgdLabel(this.data.infoData);
+ },
+
+ //演练训练时间
+ onInputTime(e){
+ let sealDate = e.detail
+ this.setData({
+ "infoData.sealDate":sealDate
+ })
+ },
+
+ //查询项目人员数据
+ getProjectUserData(){
+ let that = this
+ wx.request({
+ url: app.globalData.reqUrl+'/wechat/projectuserinfo/selectProjectUnitUser',
+ method:"get",
+ data:{
+ unitType:"4",
+ projectId:that.data.projectId
+ },
+ header:{
+ 'content-type': 'application/x-www-form-urlencoded'
+ },
+ success(res){
+ res = res.data
+ if(res.code == 200){
+ that.setData({
+ rectifierData:res.data
+ })
+ }
+ }
+ })
+ },
+
+ showBgdLabel(data){
+ if(data.contractBrand!="" && data.useBrand!="" && data.contractBrand.indexOf(data.useBrand)==-1){
+ this.setData({
+ showBgd:true
+ })
+ }else{
+ this.setData({
+ showBgd:false
+ })
+ }
+ },
+
+ 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_materialSeal/edit/index.json b/miniprogram/pageage/project_materialSeal/edit/index.json
new file mode 100644
index 0000000..8b96c47
--- /dev/null
+++ b/miniprogram/pageage/project_materialSeal/edit/index.json
@@ -0,0 +1,14 @@
+{
+ "usingComponents": {
+ "van-row": "@vant/weapp/row",
+ "van-col": "@vant/weapp/col",
+ "van-popup": "@vant/weapp/popup",
+ "van-picker": "@vant/weapp/picker/index",
+ "van-area": "@vant/weapp/area/index",
+ "mkl-multi-select": "/components/@mkl/multi-select/index",
+ "van-overlay": "@vant/weapp/overlay/index",
+ "van-collapse": "@vant/weapp/collapse",
+ "van-collapse-item": "@vant/weapp/collapse-item"
+ },
+ "navigationStyle":"custom"
+}
\ No newline at end of file
diff --git a/miniprogram/pageage/project_materialSeal/edit/index.wxml b/miniprogram/pageage/project_materialSeal/edit/index.wxml
new file mode 100644
index 0000000..0332861
--- /dev/null
+++ b/miniprogram/pageage/project_materialSeal/edit/index.wxml
@@ -0,0 +1,166 @@
+
+
+
+
+
+ {{projectName}}
+
+
+
+
+
+
+
+
+
+ {{(flowRecordList.length-index) < 9 ?'0'+(flowRecordList.length-index):(flowRecordList.length-index)}}
+
+ 提交材料封样
+ 审批材料封样
+ 合格
+ 不合格
+
+
+
+
+ 办理用户：{{item.userName}}
+ 办理单位：{{item.deptName}}
+ 办理时间：{{item.createTime}}
+ 审批意见：{{item.comment}}
+
+
+
+
+
+
+
+
+ 封样图片
+
+
+
+
+
+ 封样名称
+
+
+
+
+
+ 使用部位
+
+
+
+
+
+ 合同指定品牌
+
+
+
+
+
+ 拟用品牌
+
+
+
+
+
+ 封样时间
+
+
+
+
+
+ 监理专员
+
+
+
+
+
+
+ 会签单图片
+
+
+
+
+
+ 变更单图片
+
+
+ 合同指定品牌和拟用品牌不一致时需要上传
+
+
+
+
+ 取消
+ 保存
+
+
+
+
+
+ 数据加载中！请稍后...
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/miniprogram/pageage/project_materialSeal/edit/index.wxss b/miniprogram/pageage/project_materialSeal/edit/index.wxss
new file mode 100644
index 0000000..2eb6356
--- /dev/null
+++ b/miniprogram/pageage/project_materialSeal/edit/index.wxss
@@ -0,0 +1,93 @@
+/* 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
+ }
+.option_list_title{
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ padding: 20rpx 0;
+ }
+ .option_list_title_btn{
+ color: #1989fa;
+ font-size: 30rpx;
+ }
+ .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;
+ }
+ .gk_open_con view{
+ padding: 10rpx 0;
+ width: 100%;
+ }
+ .gk_open_con image{
+ width: 30rpx;
+ height: 30rpx;
+ margin-right: 5rpx;
+ position: relative;
+ top: 5rpx;
+ }
diff --git a/miniprogram/pageage/project_materialSeal/info/index.js b/miniprogram/pageage/project_materialSeal/info/index.js
index 9320075..f64a231 100644
--- a/miniprogram/pageage/project_materialSeal/info/index.js
+++ b/miniprogram/pageage/project_materialSeal/info/index.js
@@ -40,11 +40,11 @@ Page({
loginName:res.data.loginName
})
this.getInfo();
+ this.getAuditinfo();
}
})
},
-
/**
* 获取安全检查详情信息
*
@@ -124,7 +124,7 @@ Page({
loadShow:false
})
//判断当前能否删除
- if(res.data.createBy==that.data.loginName){
+ if(res.data.createBy==that.data.loginName && res.data.approveStatus!="4"){
that.setData({
showDel:true
})
@@ -171,7 +171,15 @@ Page({
})
},
- /**
+ //跳转修改页面
+ onUpdate:function(){
+ let id = this.data.id;
+ wx.redirectTo({
+ url: `../edit/index?id=${id}`,
+ })
+ },
+
+ /**
* 查询流程日志
*/
getAuditinfo(){
diff --git a/miniprogram/pageage/project_materialSeal/info/index.wxml b/miniprogram/pageage/project_materialSeal/info/index.wxml
index eee3556..5a6d03a 100644
--- a/miniprogram/pageage/project_materialSeal/info/index.wxml
+++ b/miniprogram/pageage/project_materialSeal/info/index.wxml
@@ -24,11 +24,10 @@
{{(flowRecordList.length-index) < 9 ?'0'+(flowRecordList.length-index):(flowRecordList.length-index)}}
- 提交取样复试
- 审批取样复试
- {{item.commentResult}}
- 合格
- 不合格
+ 提交材料封样
+ 审批材料封样
+ 合格
+ 不合格
@@ -123,15 +122,16 @@
-
-
- 封样结果
-
- 合格
- 不合格
-
-
-
+
+
+ 封样结果
+
+ 待审批
+ 合格
+ 不合格
+
+
+
提交单位
@@ -157,6 +157,7 @@
删除
+ 修改
diff --git a/miniprogram/pageage/project_materialSeal/list/index.js b/miniprogram/pageage/project_materialSeal/list/index.js
index c5366bc..dd864fa 100644
--- a/miniprogram/pageage/project_materialSeal/list/index.js
+++ b/miniprogram/pageage/project_materialSeal/list/index.js
@@ -25,10 +25,16 @@ Page({
},
getInfo(e){
- let {id} = e.currentTarget.dataset.set
- wx.redirectTo({
- url: `../info/index?id=${id}`
- })
+ let {id,approveStatus,witnessUser} = e.currentTarget.dataset.set
+ if(approveStatus=="1" && witnessUser==this.data.loginName){
+ wx.redirectTo({
+ url: `../../../pages/project_approve/approveMaterialSeal/index?id=${id}`
+ })
+ }else{
+ wx.redirectTo({
+ url: `../info/index?id=${id}`
+ })
+ }
},
/**
@@ -63,6 +69,7 @@ Page({
let param = {
"deptId":deptId,
"projectId": projectId,
+ "nowUserName":this.data.loginName,
"activeName": this.data.activeState,
}
this.queryCount(param);
@@ -109,7 +116,7 @@ Page({
this.setData({
activeState:nav
});
- this.getListData(this.initData.id,this.data.deptId,this.data.minRoleId);
+ this.getListData(this.data.projectId,this.data.deptId,this.data.minRoleId);
},
returnToPage: function () {
diff --git a/miniprogram/pageage/project_materialSeal/list/index.wxml b/miniprogram/pageage/project_materialSeal/list/index.wxml
index 312889e..42bc58c 100644
--- a/miniprogram/pageage/project_materialSeal/list/index.wxml
+++ b/miniprogram/pageage/project_materialSeal/list/index.wxml
@@ -29,6 +29,9 @@
+ 待审批
+ 合格
+ 不合格
diff --git a/miniprogram/pageage/project_measure/add/index.js b/miniprogram/pageage/project_measure/add/index.js
index 65b2d87..0ad86db 100644
--- a/miniprogram/pageage/project_measure/add/index.js
+++ b/miniprogram/pageage/project_measure/add/index.js
@@ -13,6 +13,7 @@ Page({
projectName:"",
loginName:"",
rectifierData:[],
+ rectifierData2:[],
imageInfoData:[],
loadShow:false,
measureType:"1",
@@ -57,7 +58,7 @@ Page({
getProjectUserData(){
let that = this
wx.request({
- url: app.globalData.reqUrl+'/wechat/projectuserinfo/list',
+ url: app.globalData.reqUrl+'/wechat/projectuserinfo/selectProjectUnitUser',
method:"get",
data:{
unitType:"4",
@@ -75,6 +76,26 @@ Page({
}
}
})
+
+ wx.request({
+ url: app.globalData.reqUrl+'/wechat/projectuserinfo/selectProjectUnitUser',
+ method:"get",
+ data:{
+ unitType:"2",
+ projectId:that.data.projectId
+ },
+ header:{
+ 'content-type': 'application/x-www-form-urlencoded'
+ },
+ success(res){
+ res = res.data
+ if(res.code == 200){
+ that.setData({
+ rectifierData2:res.data,
+ })
+ }
+ }
+ })
},
getMeasureTypeList(){
diff --git a/miniprogram/pageage/project_measure/add/index.wxml b/miniprogram/pageage/project_measure/add/index.wxml
index c5e010a..c7637e7 100644
--- a/miniprogram/pageage/project_measure/add/index.wxml
+++ b/miniprogram/pageage/project_measure/add/index.wxml
@@ -38,21 +38,21 @@
测量部位
+ placeholder-style="color:#6777aa;" bindinput="onInputMeasurePosition" maxlength="200"/>
测量点位
+ placeholder-style="color:#6777aa;" bindinput="onInputMeasurePointPosition" maxlength="200"/>
质量专员
-
+
diff --git a/miniprogram/pageage/project_measure/edit/index.js b/miniprogram/pageage/project_measure/edit/index.js
new file mode 100644
index 0000000..0825184
--- /dev/null
+++ b/miniprogram/pageage/project_measure/edit/index.js
@@ -0,0 +1,500 @@
+// pageage/safetyManagement/addSafetyInspect/index.js
+const app = getApp()
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+ maxDate:new Date(2088,1,1).getTime(),
+ currentDate:new Date().getTime(),
+ id:"",
+ projectId:"",
+ projectName:"",
+ loginName:"",
+ rectifierData:[],
+ rectifierData2:[],
+ imageInfoData:[],
+ loadShow:false,
+ measureTypeList:[],
+ measureInfoTypeList:[],
+ activeName:"",
+ flowRecordList:[],
+ request:app.globalData.reqUrl
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad(options) {
+ let {id} = options
+ //获取缓存数据
+ wx.getStorage({
+ key: 'userinfo',
+ success:res=>{
+ this.setData({
+ id,
+ projectId:app.globalData.projectId,
+ projectName:app.globalData.projectName,
+ loginName:res.data.loginName
+ })
+
+ this.getMeasureTypeList();
+ this.getMeasureInfoTypeList();
+ this.getProjectUserData();
+ this.getInfo();
+ this.getAuditinfo();
+ }
+ })
+ },
+
+ //查询项目人员数据
+ getProjectUserData(){
+ let that = this
+ wx.request({
+ url: app.globalData.reqUrl+'/wechat/projectuserinfo/selectProjectUnitUser',
+ method:"get",
+ data:{
+ unitType:"4",
+ projectId:that.data.projectId
+ },
+ header:{
+ 'content-type': 'application/x-www-form-urlencoded'
+ },
+ success(res){
+ res = res.data
+ if(res.code == 200){
+ that.setData({
+ rectifierData:res.data,
+ })
+ }
+ }
+ })
+
+ wx.request({
+ url: app.globalData.reqUrl+'/wechat/projectuserinfo/selectProjectUnitUser',
+ method:"get",
+ data:{
+ unitType:"2",
+ projectId:that.data.projectId
+ },
+ header:{
+ 'content-type': 'application/x-www-form-urlencoded'
+ },
+ success(res){
+ res = res.data
+ if(res.code == 200){
+ that.setData({
+ rectifierData2:res.data,
+ })
+ }
+ }
+ })
+ },
+
+ getMeasureTypeList(){
+ let that = this
+ wx.request({
+ url: app.globalData.reqUrl+'/wechat/projectMeasure/queryDictType',
+ method:"get",
+ data:{
+ type:'project_measure_type'
+ },
+ header:{
+ 'content-type': 'application/x-www-form-urlencoded'
+ },
+ success(res){
+ res = res.data
+ if(res.code == 200){
+ let list=[];
+ res.data.forEach(it =>{
+ list.push({"id":it.dictValue,"text":it.dictLabel});
+ })
+ that.setData({
+ measureTypeList:list
+ })
+ }
+ }
+ })
+ },
+
+ getMeasureInfoTypeList(){
+ let that = this
+ wx.request({
+ url: app.globalData.reqUrl+'/wechat/projectMeasure/queryDictType',
+ method:"get",
+ data:{
+ type:'project_measure_info_type'
+ },
+ header:{
+ 'content-type': 'application/x-www-form-urlencoded'
+ },
+ success(res){
+ res = res.data
+ if(res.code == 200){
+ let list=[];
+ res.data.forEach(it =>{
+ list.push({"id":it.dictValue,"text":it.dictLabel});
+ })
+ that.setData({
+ measureInfoTypeList:list
+ })
+ }
+ }
+ })
+ },
+
+ /**
+ * 获取安全检查详情信息
+ *
+ */
+ getInfo(){
+ let {id} = this.data
+ let that = this
+ wx.request({
+ url: app.globalData.reqUrl+'/wechat/projectMeasure/info',
+ method:"get",
+ data:{
+ id:id
+ },
+ success(res){
+ res = res.data
+ if(res.code == 200){
+ let imageInfoData = [];
+ if(res.data.imageUrls){
+ res.data.imageUrls.split(',').forEach(element => {
+ imageInfoData.push(that.data.request+element+'.min.jpg');
+ });
+ }
+ that.setData({
+ infoData:res.data,
+ imageInfoData,
+ loadShow:false
+ })
+ }
+ }
+ })
+ },
+
+ /**
+ * 查询流程日志
+ */
+ getAuditinfo(){
+ let that = this
+ wx.request({
+ url: app.globalData.reqUrl+'/wechat/projectAuditinfo/selectProjectAuditinfo',
+ method:"get",
+ data:{
+ fromType:"2",
+ fromId:this.data.id
+ },
+ success(res){
+ res = res.data
+ if(res.code == 200){
+ that.setData({
+ flowRecordList:res.data
+ })
+ }
+ }
+ })
+ },
+
+ // 手风琴
+ onChange(event) {
+ this.setData({
+ activeName: event.detail,
+ });
+ },
+
+ //测量部位
+ onInputMeasurePosition(e){
+ this.setData({
+ "infoData.measurePosition":e.detail.value
+ })
+ },
+
+ //测量点位
+ onInputMeasurePointPosition(e){
+ this.setData({
+ "infoData.measurePointPosition":e.detail.value
+ })
+ },
+
+ //验收时间
+ onInputTime(e){
+ this.setData({
+ "infoData.measureTime":e.detail.value
+ })
+ },
+
+ // list 上传图片
+ onImagesArr(e){
+ var data = this.data.imageInfoData
+ data = e.detail
+ this.setData({
+ imageInfoData:data
+ })
+ },
+
+ //添加质量专员
+ onAddQualityUser(e){
+ if(e.detail.length>0){
+ this.setData({
+ "infoData.qualityUser":e.detail[0].phoneNumber,
+ "infoData.qualityUserName":e.detail[0].userName
+ })
+ }
+ },
+
+ //添加监理专员
+ onAddSuperviseUser(e){
+ if(e.detail.length>0){
+ this.setData({
+ "infoData.superviseUser":e.detail[0].phoneNumber,
+ "infoData.superviseUserName":e.detail[0].userName
+ })
+ }
+ },
+
+ //取消页面
+ cancelSaveView(){
+ this.returnToPage()
+ },
+
+ //保存
+ onSave(){
+ this.setData({
+ loadShow:true
+ })
+ let that = this
+ let {id,loginName,imageInfoData,infoData} = that.data;
+ //数据效验
+ if(id==""){
+ app.toast("数据异常，请刷新页面重试!")
+ that.setData({
+ loadShow:false
+ })
+ return;
+ }
+ if(imageInfoData.length==0){
+ app.toast("请上传测量现场图片!")
+ that.setData({
+ loadShow:false
+ })
+ return;
+ }
+ if(infoData.measureType==""){
+ app.toast("请选择测量类型!")
+ that.setData({
+ loadShow:false
+ })
+ return;
+ }
+ if(infoData.measureInfo==""){
+ app.toast("请选择测量内容!")
+ that.setData({
+ loadShow:false
+ })
+ return;
+ }
+ if(infoData.measurePosition==""){
+ app.toast("请填写测量部位!")
+ that.setData({
+ loadShow:false
+ })
+ return;
+ }
+ if(infoData.measurePointPosition==""){
+ app.toast("请填写测量点位!")
+ that.setData({
+ loadShow:false
+ })
+ return;
+ }
+ if(infoData.qualityUser==""||infoData.qualityUserName==""){
+ app.toast("请选择质量专员!")
+ that.setData({
+ loadShow:false
+ })
+ return;
+ }
+ if(infoData.superviseUser==""||infoData.superviseUserName==""){
+ app.toast("请选择监理专员!")
+ that.setData({
+ loadShow:false
+ })
+ return;
+ }
+ if(infoData.measureTime==""){
+ app.toast("请选择测量时间!")
+ that.setData({
+ loadShow:false
+ })
+ return;
+ }
+ if(infoData.superviseUser==infoData.qualityUser){
+ app.toast("质量专员和监理专员不能是同一人!")
+ that.setData({
+ loadShow:false
+ })
+ return;
+ }
+ let fileUrls = [];
+ imageInfoData.forEach(async (item)=>{
+ //这里复杂的图片上传，改为同步上传，因为小程序只能上传一张图片
+ if(item.indexOf(that.data.request)>-1){
+ fileUrls.push(item.replace(that.data.request,"").replace(".min.jpg",""));
+ }else{
+ let uploadUrl = app.globalData.uploadUrl+'/common/upload'
+ let name = "file"
+ let obj = await that.syncUploadImage(uploadUrl,item,name);
+ fileUrls.push(obj.data.fileName);
+ }
+ //验证图片上传完毕
+ if(fileUrls.length == imageInfoData.length){
+ let params = {
+ id,
+ imageUrls:fileUrls.toString(),
+ measureType:infoData.measureType,
+ measureInfo:infoData.measureInfo,
+ measurePosition:infoData.measurePosition,
+ measurePointPosition:infoData.measurePointPosition,
+ qualityUser:infoData.qualityUser,
+ qualityUserName:infoData.qualityUserName,
+ superviseUser:infoData.superviseUser,
+ superviseUserName:infoData.superviseUserName,
+ measureTime:infoData.measureTime,
+ approveStatus:"1",
+ updateBy:loginName
+ }
+ wx.request({
+ url: app.globalData.reqUrl + '/wechat/projectMeasure/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)
+ }
+ });
+ })
+ },
+
+ //选择测量类型
+ onSelectMeasureType(e){
+ this.setData({
+ "infoData.measureType":e.detail.id
+ })
+ },
+
+ //选择测量内容
+ onSelectMeasureInfo(e){
+ this.setData({
+ "infoData.measureInfo":e.detail.id
+ })
+ },
+
+ 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_measure/edit/index.json b/miniprogram/pageage/project_measure/edit/index.json
new file mode 100644
index 0000000..5c42e53
--- /dev/null
+++ b/miniprogram/pageage/project_measure/edit/index.json
@@ -0,0 +1,8 @@
+{
+ "usingComponents": {
+ "van-overlay": "@vant/weapp/overlay/index",
+ "van-collapse": "@vant/weapp/collapse",
+ "van-collapse-item": "@vant/weapp/collapse-item"
+ },
+ "navigationStyle":"custom"
+}
\ No newline at end of file
diff --git a/miniprogram/pageage/project_measure/edit/index.wxml b/miniprogram/pageage/project_measure/edit/index.wxml
new file mode 100644
index 0000000..be3b819
--- /dev/null
+++ b/miniprogram/pageage/project_measure/edit/index.wxml
@@ -0,0 +1,159 @@
+
+
+
+
+
+ {{projectName}}
+
+
+
+
+
+
+
+
+
+ {{(flowRecordList.length-index) < 9 ?'0'+(flowRecordList.length-index):(flowRecordList.length-index)}}
+
+ 提交实测实量
+ 审批实测实量
+ 合格
+ 不合格
+
+
+
+
+ 办理用户：{{item.userName}}
+ 办理单位：{{item.deptName}}
+ 办理时间：{{item.createTime}}
+ 审批意见：{{item.comment}}
+
+
+
+
+
+
+
+
+ 测量图片
+
+
+
+
+
+ 测量类型
+
+
+
+
+
+ 测量内容
+
+
+
+
+
+ 测量部位
+
+
+
+
+
+ 测量点位
+
+
+
+
+
+
+ 质量专员
+
+
+
+
+
+
+ 监理专员
+
+
+
+
+
+
+ 测量时间
+
+
+
+
+
+
+ 取消
+ 提交
+
+
+
+
+
+
+ 数据加载中！请稍后...
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/miniprogram/pageage/project_measure/edit/index.wxss b/miniprogram/pageage/project_measure/edit/index.wxss
new file mode 100644
index 0000000..b3d0a18
--- /dev/null
+++ b/miniprogram/pageage/project_measure/edit/index.wxss
@@ -0,0 +1,54 @@
+/* pageage/safetyManagement/addSafetyInspect/index.wxss */
+.van-popup{
+ background: none !important;
+}
+.van-image__img{
+ border-radius: 10rpx !important;
+}
+.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;
+ }
+ .gk_open_con view{
+ padding: 10rpx 0;
+ width: 100%;
+ }
+ .gk_open_con image{
+ width: 30rpx;
+ height: 30rpx;
+ margin-right: 5rpx;
+ position: relative;
+ top: 5rpx;
+ }
diff --git a/miniprogram/pageage/project_measure/info/index.js b/miniprogram/pageage/project_measure/info/index.js
index 2bfd4e3..8c191b9 100644
--- a/miniprogram/pageage/project_measure/info/index.js
+++ b/miniprogram/pageage/project_measure/info/index.js
@@ -32,6 +32,7 @@ Page({
loginName:res.data.loginName
})
this.getInfo();
+ this.getAuditinfo();
}
})
},
@@ -68,7 +69,7 @@ Page({
loadShow:false
})
//判断当前能否删除
- if(res.data.createBy==that.data.loginName){
+ if(res.data.createBy==that.data.loginName && res.data.approveStatus!="4"){
that.setData({
showDel:true
})
@@ -115,7 +116,7 @@ Page({
})
},
- /**
+ /**
* 查询流程日志
*/
getAuditinfo(){
@@ -145,6 +146,14 @@ Page({
});
},
+ //跳转修改页面
+ onUpdate:function(){
+ let id = this.data.id;
+ wx.redirectTo({
+ url: `../edit/index?id=${id}`,
+ })
+ },
+
//展示图片
showImg:function(e){
var that=this;
diff --git a/miniprogram/pageage/project_measure/info/index.wxml b/miniprogram/pageage/project_measure/info/index.wxml
index 0d3abca..3b4e23e 100644
--- a/miniprogram/pageage/project_measure/info/index.wxml
+++ b/miniprogram/pageage/project_measure/info/index.wxml
@@ -24,11 +24,10 @@
{{(flowRecordList.length-index) < 9 ?'0'+(flowRecordList.length-index):(flowRecordList.length-index)}}
- 提交取样复试
- 审批取样复试
- {{item.commentResult}}
- 合格
- 不合格
+ 提交实测实量
+ 审批实测实量
+ 合格
+ 不合格
@@ -100,15 +99,16 @@
{{infoData.superviseUserName}}
-
-
- 测量结果
-
- 合格
- 不合格
-
-
-
+
+
+ 测量结果
+
+ 待审批
+ 合格
+ 不合格
+
+
+
提交单位
@@ -132,6 +132,7 @@
删除
+ 修改
diff --git a/miniprogram/pageage/project_measure/list/index.js b/miniprogram/pageage/project_measure/list/index.js
index cbf13c5..0841c17 100644
--- a/miniprogram/pageage/project_measure/list/index.js
+++ b/miniprogram/pageage/project_measure/list/index.js
@@ -27,10 +27,16 @@ Page({
},
getInfo(e){
- let {id} = e.currentTarget.dataset.set
- wx.redirectTo({
- url: `../info/index?id=${id}`,
- })
+ let {id,approveStatus,superviseUser} = e.currentTarget.dataset.set
+ if(approveStatus=="1" && superviseUser==this.data.loginName){
+ wx.redirectTo({
+ url: `../../../pages/project_approve/approveMeasure/index?id=${id}`
+ })
+ }else{
+ wx.redirectTo({
+ url: `../info/index?id=${id}`
+ })
+ }
},
/**
@@ -66,6 +72,7 @@ Page({
let param = {
"projectId": projectId,
"deptId":deptId,
+ "nowUserName":this.data.loginName,
"activeName": this.data.activeState,
}
this.queryCount(param);
diff --git a/miniprogram/pageage/project_measure/list/index.wxml b/miniprogram/pageage/project_measure/list/index.wxml
index f18d325..c3cebcc 100644
--- a/miniprogram/pageage/project_measure/list/index.wxml
+++ b/miniprogram/pageage/project_measure/list/index.wxml
@@ -29,8 +29,9 @@
- 不合格
- 合格
+ 待审批
+ 合格
+ 不合格
diff --git a/miniprogram/pageage/project_problemmodify/quality/add/index.wxml b/miniprogram/pageage/project_problemmodify/quality/add/index.wxml
index 0f1f348..cee4f47 100644
--- a/miniprogram/pageage/project_problemmodify/quality/add/index.wxml
+++ b/miniprogram/pageage/project_problemmodify/quality/add/index.wxml
@@ -38,14 +38,14 @@
隐患描述
+ placeholder-style="color:#6777aa;" bindinput="onInputWorkParts" maxlength="200"/>
整改要求
+ placeholder-style="color:#6777aa;" bindinput="onInputChangeInfoValue" maxlength="200"/>
diff --git a/miniprogram/pageage/project_problemmodify/quality/check/index.wxml b/miniprogram/pageage/project_problemmodify/quality/check/index.wxml
index c60e0e8..5305cdd 100644
--- a/miniprogram/pageage/project_problemmodify/quality/check/index.wxml
+++ b/miniprogram/pageage/project_problemmodify/quality/check/index.wxml
@@ -139,7 +139,7 @@
+ placeholder-style="color:#6777aa;" bindinput="onInputOpinion" maxlength="200"/>
diff --git a/miniprogram/pageage/project_problemmodify/quality/modify/index.wxml b/miniprogram/pageage/project_problemmodify/quality/modify/index.wxml
index d21e830..765246b 100644
--- a/miniprogram/pageage/project_problemmodify/quality/modify/index.wxml
+++ b/miniprogram/pageage/project_problemmodify/quality/modify/index.wxml
@@ -129,7 +129,7 @@
整改说明
+ placeholder-style="color:#6777aa;" bindinput="onInputOpinion" maxlength="200"/>
diff --git a/miniprogram/pageage/project_problemmodify/security/add/index.wxml b/miniprogram/pageage/project_problemmodify/security/add/index.wxml
index a954f51..f99851a 100644
--- a/miniprogram/pageage/project_problemmodify/security/add/index.wxml
+++ b/miniprogram/pageage/project_problemmodify/security/add/index.wxml
@@ -38,14 +38,14 @@
隐患描述
+ placeholder-style="color:#6777aa;" bindinput="onInputWorkParts" maxlength="200"/>
整改要求
+ placeholder-style="color:#6777aa;" bindinput="onInputChangeInfoValue" maxlength="200"/>
diff --git a/miniprogram/pageage/project_problemmodify/security/check/index.wxml b/miniprogram/pageage/project_problemmodify/security/check/index.wxml
index bea23a0..bfe9101 100644
--- a/miniprogram/pageage/project_problemmodify/security/check/index.wxml
+++ b/miniprogram/pageage/project_problemmodify/security/check/index.wxml
@@ -139,7 +139,7 @@
+ placeholder-style="color:#6777aa;" bindinput="onInputOpinion" maxlength="200"/>
diff --git a/miniprogram/pageage/project_problemmodify/security/modify/index.wxml b/miniprogram/pageage/project_problemmodify/security/modify/index.wxml
index 6731b9e..649e892 100644
--- a/miniprogram/pageage/project_problemmodify/security/modify/index.wxml
+++ b/miniprogram/pageage/project_problemmodify/security/modify/index.wxml
@@ -128,7 +128,7 @@
整改说明
+ placeholder-style="color:#6777aa;" bindinput="onInputOpinion" maxlength="200"/>
diff --git a/miniprogram/pageage/project_schedule/add/index.wxml b/miniprogram/pageage/project_schedule/add/index.wxml
index efa3a43..b1f3ca4 100644
--- a/miniprogram/pageage/project_schedule/add/index.wxml
+++ b/miniprogram/pageage/project_schedule/add/index.wxml
@@ -27,77 +27,77 @@
计划节点
+ placeholder-style="color:#6777aa;" model:value="{{data.plannedNode}}" maxlength="800" bindinput="plannedNodeAction"/>
实际节点
+ placeholder-style="color:#6777aa;" model:value="{{data.actualNode}}" maxlength="800" bindinput="actualNodeAction"/>
融资、招采进展
+ placeholder-style="color:#6777aa;" model:value="{{data.purchaseProgress}}" maxlength="800" bindinput="purchaseProgressAction"/>
结算进展
+ placeholder-style="color:#6777aa;" model:value="{{data.purchaseProgress}}" maxlength="800" bindinput="purchaseProgressAction"/>
报建、设计进展
+ placeholder-style="color:#6777aa;" model:value="{{data.designProgress}}" maxlength="800" bindinput="designProgressAction"/>
运维进展
+ placeholder-style="color:#6777aa;" model:value="{{data.designProgress}}" maxlength="800" bindinput="designProgressAction"/>
施工进展
+ placeholder-style="color:#6777aa;" model:value="{{data.constructionProgress}}" maxlength="800" bindinput="constructionProgressAction"/>
验收进展
+ placeholder-style="color:#6777aa;" model:value="{{data.acceptanceProgress}}" maxlength="800" bindinput="acceptanceProgressAction"/>
下周计划
+ placeholder-style="color:#6777aa;" model:value="{{data.planForNextWeek}}" maxlength="800" bindinput="planForNextWeekAction"/>
存在问题
+ placeholder-style="color:#6777aa;" model:value="{{data.existingProblem}}" maxlength="800" bindinput="existingProblemAction"/>
问题推进情况
+ placeholder-style="color:#6777aa;" model:value="{{data.problemProgress}}" maxlength="800" bindinput="problemProgressAction"/>
diff --git a/miniprogram/pageage/project_special/add/index.wxml b/miniprogram/pageage/project_special/add/index.wxml
index 9d64779..725d460 100644
--- a/miniprogram/pageage/project_special/add/index.wxml
+++ b/miniprogram/pageage/project_special/add/index.wxml
@@ -19,7 +19,7 @@
人员姓名
-
+
@@ -31,7 +31,7 @@
联系方式
-
+
@@ -43,7 +43,7 @@
证书编号
-
+
diff --git a/miniprogram/pageage/project_train/add/index.wxml b/miniprogram/pageage/project_train/add/index.wxml
index bb3e754..26a3748 100644
--- a/miniprogram/pageage/project_train/add/index.wxml
+++ b/miniprogram/pageage/project_train/add/index.wxml
@@ -25,7 +25,7 @@
{{minTitle}}标题
-
+
@@ -37,14 +37,14 @@
参与人数
-
+
{{minTitle}}内容
+ placeholder-style="color:#6777aa;" maxlength="800" bindinput="trainContent"/>
diff --git a/miniprogram/pageage/xiangmuhuanjing/xiangmuhuanjing.js b/miniprogram/pageage/xiangmuhuanjing/xiangmuhuanjing.js
index 87ecf02..2cc741c 100644
--- a/miniprogram/pageage/xiangmuhuanjing/xiangmuhuanjing.js
+++ b/miniprogram/pageage/xiangmuhuanjing/xiangmuhuanjing.js
@@ -909,7 +909,7 @@ Page({
wx.clearStorageSync();
wx.setStorageSync('isReload', "1")
wx.redirectTo({
- url: '../login/login',
+ url: '../login2/login',
})
},
diff --git a/miniprogram/pageage/xiangmushipin/xiangmushipin.js b/miniprogram/pageage/xiangmushipin/xiangmushipin.js
index ef51183..3e4ad1b 100644
--- a/miniprogram/pageage/xiangmushipin/xiangmushipin.js
+++ b/miniprogram/pageage/xiangmushipin/xiangmushipin.js
@@ -118,7 +118,7 @@ Page({
wx.clearStorageSync();
wx.setStorageSync('isReload', "1")
wx.redirectTo({
- url: '../login/login',
+ url: '../login2/login',
})
},
diff --git a/miniprogram/pageage/xiangmuyujing/xiangmuyujing.js b/miniprogram/pageage/xiangmuyujing/xiangmuyujing.js
index b50d8d6..59bbb0e 100644
--- a/miniprogram/pageage/xiangmuyujing/xiangmuyujing.js
+++ b/miniprogram/pageage/xiangmuyujing/xiangmuyujing.js
@@ -1378,7 +1378,7 @@ Page({
wx.clearStorageSync();
wx.setStorageSync('isReload', "1")
wx.redirectTo({
- url:'../login/login',
+ url:'../login2/login',
})
},
diff --git a/miniprogram/pages/components/file-uploader/index.js b/miniprogram/pages/components/file-uploader/index.js
index 9c28b39..57502ce 100644
--- a/miniprogram/pages/components/file-uploader/index.js
+++ b/miniprogram/pages/components/file-uploader/index.js
@@ -5,19 +5,26 @@ Component({
* 组件的属性列表
*/
properties: {
+ limit:{
+ type:Number,
+ value:5
+ },
fileUrlArray:{
type:Array
},
- limit:{
- type:Number
- }
},
/**数据监听 */
observers: {
fileUrlArray:function(val){
+ let lm = this.data.limit;
+ let showUpload=false;
+ if(val && val.length
{{todoDB}}
- {{approveDB}}
{{item.menu_name}}
@@ -144,6 +143,7 @@
style="width:40rpx; height: 40rpx;"
/>
质量管理
+ {{ad}}
@@ -176,6 +176,6 @@
style="width:40rpx; height:40rpx;"
/>
更多功能
- {{db}}
+ {{td}}
diff --git a/miniprogram/pages/gengduogongneng/gengduogongneng.wxss b/miniprogram/pages/gengduogongneng/gengduogongneng.wxss
index d276d87..8bfa544 100644
--- a/miniprogram/pages/gengduogongneng/gengduogongneng.wxss
+++ b/miniprogram/pages/gengduogongneng/gengduogongneng.wxss
@@ -20,4 +20,4 @@
.gd_min view{
padding: 10rpx;
color: #89a4eb;
-}
\ No newline at end of file
+}
diff --git a/miniprogram/pages/gongchengliebiao/gongchengliebiao.js b/miniprogram/pages/gongchengliebiao/gongchengliebiao.js
index 927bd6b..817581c 100644
--- a/miniprogram/pages/gongchengliebiao/gongchengliebiao.js
+++ b/miniprogram/pages/gongchengliebiao/gongchengliebiao.js
@@ -292,7 +292,7 @@ Page({
wx.clearStorageSync();
wx.setStorageSync('isReload', "1")
wx.redirectTo({
- url: '../login/login',
+ url: '../login2/login',
})
},
/**
diff --git a/miniprogram/pages/login/login.wxml b/miniprogram/pages/login/login.wxml
index e0d2414..8557a40 100644
--- a/miniprogram/pages/login/login.wxml
+++ b/miniprogram/pages/login/login.wxml
@@ -1,17 +1,16 @@
-
-
+
+
北跨泾河-产发工程数字管理平台
-
- 产发工程数字管理平台，请使用手机号登录
+ 请使用手机号登录
-
+
diff --git a/miniprogram/pages/login/login.wxss b/miniprogram/pages/login/login.wxss
index 3198326..a8f4606 100644
--- a/miniprogram/pages/login/login.wxss
+++ b/miniprogram/pages/login/login.wxss
@@ -6,7 +6,7 @@ page{
height: 180rpx;
line-height: 180rpx;
color: #728ce3;
- font-size: 45rpx;
+ font-size: 40rpx;
font-weight: bold;
text-align: center;
}
@@ -17,6 +17,8 @@ page{
border-radius: 20rpx;
margin: 0 40rpx;
padding: 25rpx 40rpx;
+ margin-top: 50rpx;
+ border: 1rpx solid #728ce3;
}
.login_dl{
color: #ffffff;
@@ -26,8 +28,9 @@ page{
.login_ex{
padding:20rpx 0;
font-size: 28rpx;
- color: #8ca4ee;
- text-align: center;
+ color: #c7d1f3;
+ border-bottom: 20rpx dashed #ffffff;
+ width: 45%;
}
.login_input{
margin-top: 50rpx;
@@ -35,7 +38,7 @@ page{
.login_input input{
border-bottom: 1px solid #5e6ea2;
height: 100rpx;
- width: 100%;
+ width: 93%;
color: #728ce3;
padding: 0 20rpx;
}
@@ -46,19 +49,19 @@ page{
border-radius: 80rpx;
text-align: center;
line-height: 80rpx;
+ margin-bottom: 150rpx;
}
.login_btn:active{
margin:82rpx 55rpx 0;
}
.login_logo{
width: 100%;
- height:150rpx;
+ height:80rpx;
+ margin-top: 60rpx;
text-align: center;
- padding-top: 100rpx;
}
.login_logo image{
- width: 77%;
- height: 130rpx;
+ height: 72rpx;
}
diff --git a/miniprogram/pages/login2/login.js b/miniprogram/pages/login2/login.js
new file mode 100644
index 0000000..8b8c17f
--- /dev/null
+++ b/miniprogram/pages/login2/login.js
@@ -0,0 +1,202 @@
+// pages/login/login.js
+const app = getApp();
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+ username:'',
+ password:'',
+ show:false,
+ openId:'',
+ },
+
+ //获取填写的账号信息
+ name:function(even){
+ this.setData({
+ username:even.detail.value
+ })
+ },
+ //获取填写的密码信息
+ psw:function(even){
+ this.setData({
+ password:even.detail.value
+ })
+ },
+
+ onClickShow() {
+ this.setData({ show: true });
+ },
+
+ onClickHide() {
+ this.setData({ show: false });
+ },
+
+ onLoad: function (option) {
+ this.getOPenId();
+ },
+
+ /**
+ * 获取用户openid
+ */
+ getOPenId:function () {
+ wx.login({
+ success :res=>{
+ //启动蒙版
+ let oid = wx.getStorageSync("openId");
+ if(!oid){
+ this.onClickShow();
+ wx.request({
+ url: app.globalData.reqUrl+'/wechat/getOpenId',
+ data:{
+ "code": res.code,
+ "appId": app.globalData.appId,
+ },
+ success:(res)=>{
+ res = res.data;
+ this.onClickHide();
+ this.setData({
+ openId:res.data.openid,
+ })
+ wx.setStorageSync('openId', res.data.openid)
+ //验证登录用户
+ this.selectUserInfoByOpenId(res.data.openid);
+ }
+ })
+ }else{
+ //验证登录用户
+ this.selectUserInfoByOpenId(oid);
+ }
+ }
+ })
+},
+
+ //验证用户是否是第一次登陆
+ selectUserInfoByOpenId:function(openId){
+ //跳转页面
+ let isRelogin=wx.getStorageSync("isReload");
+ if(isRelogin){
+ return;
+ }
+ this.onClickShow();
+ var that = this;
+ wx.request({
+ url: app.globalData.reqUrl+'/wechat/openIdLogin',
+ data:{
+ "openId":openId
+ },
+ method:"POST",
+ success:function(res){
+ if(res.data.code == '200'){
+ //把数据存到缓存中
+ wx.setStorage({
+ key: 'userinfo',
+ data: res.data.data.userinfo
+ });
+ // wx.setStorageSync({
+ // key: 'token',
+ // data: res.data.token
+ // });
+ that.onClickHide();
+ let rd = res.data.data;
+ //只有一个项目时直接跳转详情页
+ if(rd.projectInfo!=null || rd.projectInfo!=undefined){
+ //赋值到公共参数
+ app.globalData.projectId = rd.projectInfo.projectId;
+ app.globalData.projectName = rd.projectInfo.projectName;
+ app.globalData.projectInfoList = [];
+ app.globalData.projectInfoList.push(rd.projectInfo);
+ app.globalData.value1 = rd.projectInfo.shengName;
+ app.globalData.value2 = rd.projectInfo.shiName+'/'+rd.projectInfo.quName;
+ app.globalData.value3 = rd.projectInfo.logCompanyName;
+ wx.redirectTo({
+ url: '../xiangmugaikuang/xiangmugaikuang',
+ })
+ }else{
+ //跳转页面
+ wx.redirectTo({
+ url: '../map/map',
+ })
+ }
+ }else{
+ that.onClickHide();
+ }
+ }
+ })
+ },
+
+ //登录
+ userLogin:function(openid){
+ var that = this;
+ var username = that.data.username;
+ var password = that.data.password;
+ if(username == ""){
+ app.toast("账号不能为空");
+ return;
+ }
+ if(password == ""){
+ app.toast("密码不能为空");
+ return;
+ }
+ let openId = that.data.openId
+ if(openId==""){
+ openId = wx.getStorageSync("openId");
+ if(openId==""){
+ app.toast("获取微信授权失败，请卸载后重新进入应用！！");
+ return;
+ }
+ }
+ //启动蒙版
+ that.onClickShow();
+ //发送请求
+ wx.request({
+ url: app.globalData.reqUrl+'/wechat/login',
+ data:{
+ "username":username,
+ "password":password,
+ "openId":openId,
+ },
+ method:"POST",
+ success(res){
+ //关闭蒙版
+ that.onClickHide();
+ if(res.data.code=='200'){
+ //把数据存到缓存中
+ wx.setStorage({
+ key: 'userinfo',
+ data: res.data.data.userinfo
+ });
+ // wx.setStorageSync({
+ // key: 'token',
+ // data: res.data.token
+ // });
+ wx.setStorageSync('isReload', "");
+ let rd = res.data.data;
+ //只有一个项目时直接跳转详情页
+ if(rd.projectInfo!=null || rd.projectInfo!=undefined){
+ //赋值到公共参数
+ app.globalData.projectId = rd.projectInfo.projectId;
+ app.globalData.projectName = rd.projectInfo.projectName;
+ app.globalData.projectInfoList = [];
+ app.globalData.projectInfoList.push(rd.projectInfo);
+ app.globalData.value1 = rd.projectInfo.shengName;
+ app.globalData.value2 = rd.projectInfo.shiName+'/'+rd.projectInfo.quName;
+ app.globalData.value3 = rd.projectInfo.logCompanyName;
+ wx.redirectTo({
+ url: '../xiangmugaikuang/xiangmugaikuang',
+ })
+ }else{
+ //跳转页面
+ wx.redirectTo({
+ url: '../map/map',
+ })
+ }
+ }else{
+ app.toast(res.data.msg);
+ }
+ }
+ })
+ },
+
+})
\ No newline at end of file
diff --git a/miniprogram/pages/login2/login.json b/miniprogram/pages/login2/login.json
new file mode 100644
index 0000000..8c7f400
--- /dev/null
+++ b/miniprogram/pages/login2/login.json
@@ -0,0 +1,5 @@
+{
+ "usingComponents": {
+ "van-overlay": "@vant/weapp/overlay/index"
+ }
+}
\ No newline at end of file
diff --git a/miniprogram/pages/login2/login.wxml b/miniprogram/pages/login2/login.wxml
new file mode 100644
index 0000000..7f32480
--- /dev/null
+++ b/miniprogram/pages/login2/login.wxml
@@ -0,0 +1,58 @@
+
+
+
+
+
+
+ 北跨泾河-产发工程数字管理平台
+
+
+
+
+
+
+
+
+
+
+ 确 定
+
+
+
+
+
+ 正在登陆中！请稍后...
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/miniprogram/pages/login2/login.wxss b/miniprogram/pages/login2/login.wxss
new file mode 100644
index 0000000..3cd1629
--- /dev/null
+++ b/miniprogram/pages/login2/login.wxss
@@ -0,0 +1,72 @@
+/* pages/login/login.wxss */
+page{
+ /* background: #191d28 url("http://fileimg.makalu.cc/CORE_40247DD946964A15AA0D4000E1031E19.png") no-repeat bottom/100%; */
+}
+.login_title{
+ height: 180rpx;
+ line-height: 180rpx;
+ color: #FFFFFF;
+ font-size: 40rpx;
+ font-weight: bold;
+ text-align: center;
+}
+.login_bg{
+ border-radius: 20rpx;
+ margin: 0 40rpx;
+ padding: 25rpx 40rpx;
+ margin-top: 80rpx;
+ background-color: #000000;
+ border: 1rpx solid #FFFFFF;
+}
+.login_dl{
+ color: #ffffff;
+ font-size: 40rpx;
+ font-weight: bold;
+}
+.login_ex{
+ padding:20rpx 0;
+ font-size: 28rpx;
+ color: #c7d1f3;
+ border-bottom: 20rpx dashed #ffffff;
+ width: 45%;
+}
+.login_input{
+ margin-top: 50rpx;
+}
+.login_input input{
+ border: 1px solid #5e6ea2;
+ border-radius: 5%;
+ height: 100rpx;
+ width: 93%;
+ color: #728ce3;
+ padding: 0 20rpx;
+ border-radius: 10px;
+}
+.login_btn{
+ margin:80rpx 50rpx 0;
+ height: 80rpx;
+ background-image: linear-gradient(#5b9fff, #7655fc);
+ border-radius: 80rpx;
+ text-align: center;
+ line-height: 80rpx;
+ margin-bottom: 150rpx;
+}
+.login_btn:active{
+ margin:82rpx 55rpx 0;
+}
+.login_logo{
+ width: 100%;
+ height:80rpx;
+ margin-top: 50rpx;
+ margin-left: 45rpx;
+}
+.login_logo image{
+ height: 72rpx;
+ width: 180rpx;
+}
+
+
+
+
+
+
diff --git a/miniprogram/pages/project_approve/approveCheckDetection/index.js b/miniprogram/pages/project_approve/approveCheckDetection/index.js
index d6d2585..075e88f 100644
--- a/miniprogram/pages/project_approve/approveCheckDetection/index.js
+++ b/miniprogram/pages/project_approve/approveCheckDetection/index.js
@@ -183,7 +183,7 @@ Page({
app.toast("审批成功!")
setTimeout(()=>{
wx.redirectTo({
- url: '../index',
+ url: '../../../pageage/project_checkDetection/list/index',
})
},200)
}
@@ -247,7 +247,7 @@ Page({
returnToPage: function () {
/*关闭当前页面，跳转到应用内的某个页面。但是不允许跳转到 tabbar 页面*/
wx.redirectTo({
- url: '../index',
+ url: '../../../pageage/project_checkDetection/list/index',
})
},
diff --git a/miniprogram/pages/project_approve/approveCheckDetection/index.wxml b/miniprogram/pages/project_approve/approveCheckDetection/index.wxml
index bce59f0..7769b01 100644
--- a/miniprogram/pages/project_approve/approveCheckDetection/index.wxml
+++ b/miniprogram/pages/project_approve/approveCheckDetection/index.wxml
@@ -24,11 +24,10 @@
{{(flowRecordList.length-index) < 9 ?'0'+(flowRecordList.length-index):(flowRecordList.length-index)}}
- 提交取样复试
- 审批取样复试
- {{item.commentResult}}
- 合格
- 不合格
+ 提交取样复试
+ 审批取样复试
+ 合格
+ 不合格
@@ -151,6 +150,17 @@
+
+
+ 检测结果
+
+ 送检中
+ 待审核
+ 合格
+ 不合格
+
+
+
diff --git a/miniprogram/pages/project_approve/approveChecking/index.js b/miniprogram/pages/project_approve/approveChecking/index.js
index 30be7f8..7ed9de3 100644
--- a/miniprogram/pages/project_approve/approveChecking/index.js
+++ b/miniprogram/pages/project_approve/approveChecking/index.js
@@ -32,6 +32,7 @@ Page({
loginName:res.data.loginName
})
this.getInfo();
+ this.getAuditinfo();
}
})
},
@@ -135,7 +136,7 @@ Page({
app.toast("审批成功!")
setTimeout(()=>{
wx.redirectTo({
- url: '../index',
+ url: '../../../pageage/project_checking/list/index',
})
},200)
}
@@ -223,7 +224,7 @@ Page({
returnToPage: function () {
/*关闭当前页面，跳转到应用内的某个页面。但是不允许跳转到 tabbar 页面*/
wx.redirectTo({
- url: '../index',
+ url: '../../../pageage/project_checking/list/index',
})
},
diff --git a/miniprogram/pages/project_approve/approveChecking/index.wxml b/miniprogram/pages/project_approve/approveChecking/index.wxml
index d2f4279..6ddb409 100644
--- a/miniprogram/pages/project_approve/approveChecking/index.wxml
+++ b/miniprogram/pages/project_approve/approveChecking/index.wxml
@@ -24,11 +24,10 @@
{{(flowRecordList.length-index) < 9 ?'0'+(flowRecordList.length-index):(flowRecordList.length-index)}}
- 提交取样复试
- 审批取样复试
- {{item.commentResult}}
- 合格
- 不合格
+ 提交举牌验收
+ 审批举牌验收
+ 合格
+ 不合格
@@ -94,13 +93,16 @@
{{infoData.checkingDate}}
-
-
- 验收结果
- 验收合格
- 验收不合格
-
-
+
+
+ 验收结果
+
+ 待审批
+ 合格
+ 不合格
+
+
+
提交时间
diff --git a/miniprogram/pages/project_approve/approveMaterialSeal/index.js b/miniprogram/pages/project_approve/approveMaterialSeal/index.js
index a55151c..ce3523c 100644
--- a/miniprogram/pages/project_approve/approveMaterialSeal/index.js
+++ b/miniprogram/pages/project_approve/approveMaterialSeal/index.js
@@ -42,7 +42,8 @@ Page({
id,
loginName:res.data.loginName
})
- this.getInfo();
+ this.getInfo();
+ this.getAuditinfo();
}
})
},
@@ -200,7 +201,7 @@ Page({
app.toast("审批成功!")
setTimeout(()=>{
wx.redirectTo({
- url: '../index',
+ url: '../../../pageage/project_materialSeal/list/index',
})
},200)
}
@@ -335,7 +336,7 @@ Page({
returnToPage: function () {
/*关闭当前页面，跳转到应用内的某个页面。但是不允许跳转到 tabbar 页面*/
wx.redirectTo({
- url: '../list/index'
+ url: '../../../pageage/project_materialSeal/list/index',
})
},
diff --git a/miniprogram/pages/project_approve/approveMaterialSeal/index.wxml b/miniprogram/pages/project_approve/approveMaterialSeal/index.wxml
index 59a2b81..c5f1a9f 100644
--- a/miniprogram/pages/project_approve/approveMaterialSeal/index.wxml
+++ b/miniprogram/pages/project_approve/approveMaterialSeal/index.wxml
@@ -24,11 +24,10 @@
{{(flowRecordList.length-index) < 9 ?'0'+(flowRecordList.length-index):(flowRecordList.length-index)}}
- 提交取样复试
- 审批取样复试
- {{item.commentResult}}
- 合格
- 不合格
+ 提交材料封样
+ 审批材料封样
+ 合格
+ 不合格
@@ -123,15 +122,16 @@
-
-
- 封样结果
-
- 合格
- 不合格
-
-
-
+
+
+ 封样结果
+
+ 待审批
+ 合格
+ 不合格
+
+
+
提交单位
diff --git a/miniprogram/pages/project_approve/approveMeasure/index.js b/miniprogram/pages/project_approve/approveMeasure/index.js
index 783b208..4e37909 100644
--- a/miniprogram/pages/project_approve/approveMeasure/index.js
+++ b/miniprogram/pages/project_approve/approveMeasure/index.js
@@ -35,6 +35,7 @@ Page({
loginName:res.data.loginName
})
this.getInfo();
+ this.getAuditinfo();
}
})
},
@@ -144,7 +145,7 @@ Page({
app.toast("审批成功!")
setTimeout(()=>{
wx.redirectTo({
- url: '../index',
+ url: '../../../pageage/project_measure/list/index',
})
},200)
}
@@ -217,7 +218,7 @@ Page({
returnToPage: function () {
/*关闭当前页面，跳转到应用内的某个页面。但是不允许跳转到 tabbar 页面*/
wx.redirectTo({
- url: '../list/index',
+ url: '../../../pageage/project_measure/list/index',
})
},
diff --git a/miniprogram/pages/project_approve/approveMeasure/index.wxml b/miniprogram/pages/project_approve/approveMeasure/index.wxml
index c21e2d5..ca04b11 100644
--- a/miniprogram/pages/project_approve/approveMeasure/index.wxml
+++ b/miniprogram/pages/project_approve/approveMeasure/index.wxml
@@ -24,8 +24,8 @@
{{(flowRecordList.length-index) < 9 ?'0'+(flowRecordList.length-index):(flowRecordList.length-index)}}
- 提交取样复试
- 审批取样复试
+ 提交实测实量
+ 审批实测实量
{{item.commentResult}}
合格
不合格
@@ -101,15 +101,16 @@
{{infoData.superviseUserName}}
-
-
- 测量结果
-
- 合格
- 不合格
-
-
-
+
+
+ 测量结果
+
+ 待审批
+ 合格
+ 不合格
+
+
+
提交单位
diff --git a/miniprogram/pages/quality_manage/index.js b/miniprogram/pages/quality_manage/index.js
index a3cf4bb..5eea055 100644
--- a/miniprogram/pages/quality_manage/index.js
+++ b/miniprogram/pages/quality_manage/index.js
@@ -38,7 +38,12 @@ Page({
checkValue:0,
checkPassRate:100,
materialSealStatistics:[{ name: "其它", value: 0, prop: 0}],
- db:0,
+ todoDb:0,
+ approveDb:0,
+ qyfsDb:0,
+ scslDb:0,
+ jpysDb:0,
+ clfyDb:0,
},
/**
@@ -323,7 +328,7 @@ Page({
goMenu:function(event){
wx.setStorageSync('nav-menu', "zl");
- wx.navigateTo({
+ wx.redirectTo({
url: event.currentTarget.dataset.url
})
},
@@ -418,7 +423,7 @@ Page({
wx.clearStorageSync();
wx.setStorageSync('isReload', "1")
wx.redirectTo({
- url: '../login/login',
+ url: '../login2/login',
})
},
//修改密码
@@ -455,8 +460,14 @@ Page({
res = res.data;
if(res.code=="200"){
that.setData({
- db:(res.data.todo+res.data.approve)
- })
+ todoDb:res.data.todo,
+ approveDb:res.data.approve,
+ qyfsDb:res.data.approveQYFS,
+ scslDb:res.data.approveSCSL,
+ jpysDb:res.data.approveJPYS,
+ clfyDb:res.data.approveCLFY
+ })
+ console.log(that.data)
}
}
})
diff --git a/miniprogram/pages/quality_manage/index.wxml b/miniprogram/pages/quality_manage/index.wxml
index 000c6fe..78eae93 100644
--- a/miniprogram/pages/quality_manage/index.wxml
+++ b/miniprogram/pages/quality_manage/index.wxml
@@ -57,7 +57,11 @@
-
+ {{scslDb}}
+ {{clfyDb}}
+ {{jpysDb}}
+ {{qyfsDb}}
+
{{item.menu_name}}
@@ -442,6 +446,7 @@
style="width:40rpx; height: 40rpx;"
/>
质量管理
+ {{approveDb}}
@@ -474,6 +479,6 @@
style="width:40rpx; height:40rpx;"
/>
更多功能
- {{db}}
+ {{todoDb}}
diff --git a/miniprogram/pages/renyuanguanli/renyuanguanli.js b/miniprogram/pages/renyuanguanli/renyuanguanli.js
index 52f3134..66fb2f4 100644
--- a/miniprogram/pages/renyuanguanli/renyuanguanli.js
+++ b/miniprogram/pages/renyuanguanli/renyuanguanli.js
@@ -556,7 +556,7 @@ Page({
wx.clearStorageSync();
wx.setStorageSync('isReload', "1")
wx.redirectTo({
- url: '../login/login',
+ url: '../login2/login',
})
},
diff --git a/miniprogram/pages/safety_manage/index.js b/miniprogram/pages/safety_manage/index.js
index b5b6a41..f84ec2e 100644
--- a/miniprogram/pages/safety_manage/index.js
+++ b/miniprogram/pages/safety_manage/index.js
@@ -37,7 +37,8 @@ Page({
},
menuList:[],
request:app.globalData.reqUrl,
- db:0,
+ todoDb:0,
+ approveDb:0,
},
//项目切换 返回值
@@ -397,7 +398,7 @@ Page({
goMenu:function(event){
wx.setStorageSync('nav-menu', "aq");
- wx.navigateTo({
+ wx.redirectTo({
url: event.currentTarget.dataset.url
})
},
@@ -436,7 +437,7 @@ Page({
wx.clearStorageSync();
wx.setStorageSync('isReload', "1")
wx.redirectTo({
- url: '../login/login',
+ url: '../login2/login',
})
},
//修改密码
@@ -466,7 +467,8 @@ Page({
res = res.data;
if(res.code=="200"){
that.setData({
- db:(res.data.todo+res.data.approve)
+ todoDb:res.data.todo,
+ approveDb:res.data.approve
})
}
}
diff --git a/miniprogram/pages/safety_manage/index.wxml b/miniprogram/pages/safety_manage/index.wxml
index 3e08246..07f69d3 100644
--- a/miniprogram/pages/safety_manage/index.wxml
+++ b/miniprogram/pages/safety_manage/index.wxml
@@ -228,6 +228,7 @@
style="width:40rpx; height: 40rpx;"
/>
质量管理
+ {{approveDb}}
@@ -260,7 +261,7 @@
style="width:40rpx; height:40rpx;"
/>
更多功能
- {{db}}
+ {{todoDb}}
diff --git a/miniprogram/pages/updatePassword/updatePassword.js b/miniprogram/pages/updatePassword/updatePassword.js
index f613928..1d96524 100644
--- a/miniprogram/pages/updatePassword/updatePassword.js
+++ b/miniprogram/pages/updatePassword/updatePassword.js
@@ -122,7 +122,7 @@ Page({
wx.setStorageSync('isReload', "1");
app.toast("密码修改成功！");
wx.redirectTo({
- url: '../login/login',
+ url: '../login2/login',
});
}else{
app.toast(res.data.info);
diff --git a/miniprogram/pages/xiangmugaikuang/xiangmugaikuang.js b/miniprogram/pages/xiangmugaikuang/xiangmugaikuang.js
index 8fda6ec..4cfb3c5 100644
--- a/miniprogram/pages/xiangmugaikuang/xiangmugaikuang.js
+++ b/miniprogram/pages/xiangmugaikuang/xiangmugaikuang.js
@@ -296,7 +296,8 @@ Page({
//加载模板参数
loadShow:false,
initData:{},
- db:0,
+ todoDb:0,
+ approveDb:0,
},
//项目切换 返回值
@@ -647,7 +648,7 @@ Page({
wx.clearStorageSync();
wx.setStorageSync('isReload', "1")
wx.redirectTo({
- url: '../login/login',
+ url: '../login2/login',
})
},
@@ -691,8 +692,10 @@ Page({
res = res.data;
if(res.code=="200"){
that.setData({
- db:(res.data.todo+res.data.approve)
+ todoDb:res.data.todo,
+ approveDb:res.data.approve
})
+ console.log("db"+that.data.approveDb);
}
}
})
diff --git a/miniprogram/pages/xiangmugaikuang/xiangmugaikuang.wxml b/miniprogram/pages/xiangmugaikuang/xiangmugaikuang.wxml
index c2acad4..16b2238 100644
--- a/miniprogram/pages/xiangmugaikuang/xiangmugaikuang.wxml
+++ b/miniprogram/pages/xiangmugaikuang/xiangmugaikuang.wxml
@@ -199,6 +199,7 @@
style="width:40rpx; height: 40rpx;"
/>
质量管理
+ {{approveDb}}
@@ -231,7 +232,7 @@
style="width:40rpx; height:40rpx;"
/>
更多功能
- {{db}}
+ {{todoDb}}