sxyanzhu
/
jhwxapp
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交diamond

main
姜玉琦 2024-04-14 23:43:48 +08:00
parent cab1ad2759
commit 52192a106a
9 changed files with 626 additions and 464 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
miniprogram/pageage/project_checkDetection/list/index.js
View File

@ -17,6 +17,10 @@ Page({
activeState: "jxz",
jxzCount: 0,
ywcCount: 0,
pageNum: 1,
pageSize: 10,
lastDataSize: 10,
list: [],
request: app.globalData.reqUrl
},
@ -133,8 +137,12 @@ Page({
loginName: res.data.loginName,
projectId: app.globalData.projectId,
minRoleId: res.data.minRoleId,
pageNum: 1,
pageSize: 10,
lastDataSize: 10,
listData: []
})
this.getListData(app.globalData.projectId, res.data.deptId, res.data.minRoleId);
this.getListData();
},
fail: err => {
//未获取用户信息时，重新登录
@ -148,29 +156,59 @@ Page({
/**
* 查询项目材料进场验收数据
*/
getListData(projectId, deptId, minRoleId) {
getListData() {
//进入这里说明数据加载完毕
if (this.data.lastDataSize < this.data.pageSize) {
//app.toast("已经到底了，暂无可继续加载数据!")
return;
}
var that = this;
//判断角色，
if (minRoleId == 2 || minRoleId == 3 || minRoleId == 4) {
let mr = this.data.minRoleId;
let deptId = this.data.deptId;
if (mr == 2 || mr == 3 || mr == 4) {
deptId = 0;
}
this.queryCount(this.data.projectId, deptId);
let param = {
"projectId": projectId,
"projectId": this.data.projectId,
"deptId": deptId,
"nowUserName": this.data.loginName,
"activeName": that.data.activeState
}
param.pageNum = that.data.pageNum;
param.pageSize = that.data.pageSize;
wx.request({
url: app.globalData.reqUrl + '/wechat/projectDetection/list',
data: param,
method: "get",
success: function (res) {
that.setData({
listData: res.data.data
})
res = res.data;
if (res.code == "200") {
//这里处理this.data.lastDataSize=this.data.pageSize
if (that.data.list.length > 0 && res.data.length > 0 && that.data.list[0].id == res.data[0].id) {
that.setData({
lastDataSize: 0,
})
} else {
that.setData({
pageNum: that.data.pageNum + 1,
lastDataSize: res.data.length,
list: res.data,
listData: that.data.listData.concat(res.data)
})
}
}
}
});
this.queryCount(projectId, deptId);
},
/**
* 加载更多数据
*/
onScrollToLower() {
console.log("滚动条到底了，开始加载新数据");
this.getListData();
},
//查询统计
@ -207,9 +245,14 @@ Page({
nav = 'ywc';
}
this.setData({
activeState: nav
activeState: nav,
pageNum: 1,
pageSize: 10,
lastDataSize: 10,
listData: [],
list: []
});
this.getListData(this.data.projectId, this.data.deptId, this.data.minRoleId);
this.getListData();
},
/**

96
miniprogram/pageage/project_checkDetection/list/index.wxml
View File

@ -2,7 +2,9 @@
<view class="header_title_row">
<van-row>
<van-col span="4">
<view class="header_img" bindtap="returnToPage"><image src="/images/left.png"></image></view>
<view class="header_img" bindtap="returnToPage">
<image src="/images/left.png"></image>
</view>
</van-col>
<van-col span="15">
<view class="header_name">材料取样复试</view>
@ -10,55 +12,47 @@
</van-row>
</view>
</view>
<view class="max_content">
<project-select init="{{initData}}" bindchange="onProjectSelect"></project-select>
<view class="modify_video_nav" style="margin-top: 5rpx;">
<view class="{{activeState=='jxz'?'active':''}}" bindtap="typeJump" data-index="1"><text>进行中（{{jxzCount}}）</text></view>
<view class="{{activeState=='ywc'?'active':''}}" bindtap="typeJump" data-index="2"><text>已完成（{{ywcCount}}）</text></view>
<scroll-view class="max_content_scroll" type="list" scroll-y bindscrolltolower="onScrollToLower">
<project-select init="{{initData}}" bindchange="onProjectSelect"></project-select>
<view class="modify_video_nav" style="margin-top: 5rpx;">
<view class="{{activeState=='jxz'?'active':''}}" bindtap="typeJump" data-index="1"><text>进行中（{{jxzCount}}）</text></view>
<view class="{{activeState=='ywc'?'active':''}}" bindtap="typeJump" data-index="2"><text>已完成（{{ywcCount}}）</text></view>
</view>
<view class="inspect_max">
<view class="inspect_list">
<view class="inspect_for" v-if="{{ listData.length>0 }}" wx:for="{{listData}}" wx:key="index" data-set="{{item}}" bindtap="getInfo">
<view class="inspect_for_bgd">
<view class="inspect_list_title">
<view class="inspect_list_title_label inspect_list_title_width">
<view class="inspect_list_title_number">{{index < 9 ?'0'+(index+1):(index+1)}}</view>
<view class="module_title module_title_flex inspect_list_title_text">送检时间：{{item.checkTime}}</view>
<view wx:if="{{item.approveStatus==null}}" class="code_label_3 code_label_yellow">送检中</view>
<view wx:if="{{item.approveStatus==1}}" class="code_label_3 code_label_blueviolet">待审批</view>
<view wx:if="{{item.approveStatus==4}}" class="code_label_3 code_label_green">合格</view>
<view wx:if="{{item.approveStatus==3}}" class="code_label_3 code_label_red">不合格</view>
</view>
</view>
<view class="inspect_list_info">
<view class="inspect_list_info_details">
<view class="inspect_list_info_data_2">
<view class="inspect_list_info_data_prop color_blue">送检类型：<text>{{item.checkTypeName}}</text></view>
<view class="inspect_list_info_data_prop safety_issue_number color_orange">材料名称：<text>{{item.materialName}}</text></view>
<view class="inspect_list_info_data_prop">使用部位：<text>{{item.usePosition}}</text></view>
</view>
</view>
</view>
</view>
</view>
<view wx:if="{{listData.length==0}}">
<view style="padding-top: 70px;text-align: -webkit-center;">
<image src="https://szgcwx.jhncidg.com/staticFiles/nodata.png" style="width: 130px;height: 105px;"></image>
<view style="color: #a5abbb;">暂无数据</view>
<view class="inspect_max_scroll">
<view class="inspect_for_scroll" v-if="{{ listData.length>0 }}" wx:for="{{listData}}" wx:key="index" data-set="{{item}}" bindtap="getInfo">
<view class="inspect_for_bgd">
<view class="inspect_list_title">
<view class="inspect_list_title_label inspect_list_title_width">
<view class="inspect_list_title_number">{{index < 9 ?'0'+(index+1):(index+1)}}</view>
<view class="module_title module_title_flex inspect_list_title_text">送检时间：{{item.checkTime}}</view>
<view wx:if="{{item.approveStatus==null}}" class="code_label_3 code_label_yellow">送检中</view>
<view wx:if="{{item.approveStatus==1}}" class="code_label_3 code_label_blueviolet">待审批</view>
<view wx:if="{{item.approveStatus==4}}" class="code_label_3 code_label_green">合格</view>
<view wx:if="{{item.approveStatus==3}}" class="code_label_3 code_label_red">不合格</view>
</view>
</view>
</view>
</view>
<view class="inspect_add_to" bindtap="skipAdd">
<view style="padding-top: 22rpx;">
<image src="/images/new_add.png"></image>
<view>新增</view>
</view>
</view>
</view>
</view>
<view class="inspect_list_info">
<view class="inspect_list_info_details">
<view class="inspect_list_info_data_2">
<view class="inspect_list_info_data_prop color_blue">送检类型：<text>{{item.checkTypeName}}</text></view>
<view class="inspect_list_info_data_prop safety_issue_number color_orange">材料名称：<text>{{item.materialName}}</text></view>
<view class="inspect_list_info_data_prop">使用部位：<text>{{item.usePosition}}</text></view>
</view>
</view>
</view>
</view>
</view>
<view wx:if="{{listData.length==0}}">
<view style="padding-top: 70px;text-align: -webkit-center;">
<image src="https://szgcwx.jhncidg.com/staticFiles/nodata.png" style="width: 130px;height: 105px;"></image>
<view style="color: #a5abbb;">暂无数据</view>
</view>
</view>
</view>
<view class="inspect_add_to" bindtap="skipAdd">
<view style="padding-top: 22rpx;">
<image src="/images/new_add.png"></image>
<view>新增</view>
</view>
</view>
</scroll-view>

63
miniprogram/pageage/project_checking/list/index.js
View File

@ -19,6 +19,10 @@ Page({
jxzCount: 0,
ywcCount: 0,
activeState: "jxz",
pageNum: 1,
pageSize: 10,
lastDataSize: 10,
list: [],
request: app.globalData.reqUrl
},
@ -141,8 +145,12 @@ Page({
minRoleId: res.data.minRoleId,
projectId: app.globalData.projectId,
projectNameArgs: app.globalData.projectName,
pageNum: 1,
pageSize: 10,
lastDataSize: 10,
listData: []
})
this.getProjectCheckingData(app.globalData.projectId, res.data.loginName, res.data.deptId, res.data.minRoleId);
this.getProjectCheckingData();
},
fail: err => {
//未获取用户信息时，重新登录
@ -156,31 +164,61 @@ Page({
/**
* 查询项目举牌验收数据
*/
getProjectCheckingData(projectId, loginName, deptId, minRoleId) {
getProjectCheckingData() {
//进入这里说明数据加载完毕
if (this.data.lastDataSize < this.data.pageSize) {
//app.toast("已经到底了，暂无可继续加载数据!")
return;
}
var that = this;
//判断角色，
if (minRoleId == 2 || minRoleId == 3 || minRoleId == 4) {
let mr = this.data.minRoleId;
let deptId = this.data.deptId;
if (mr == 2 || mr == 3 || mr == 4) {
deptId = 0;
}
let param = {
"projectId": projectId,
"nowUserName": loginName,
"projectId": this.data.projectId,
"deptId": deptId,
"nowUserName": this.data.loginName,
"activeName": this.data.activeState
}
this.queryCount(param);
param.pageNum = that.data.pageNum;
param.pageSize = that.data.pageSize;
wx.request({
url: app.globalData.reqUrl + '/wechat/projectchecking/list',
data: param,
method: "get",
success: function (res) {
that.setData({
listData: res.data.data
})
res = res.data;
if (res.code == "200") {
//这里处理this.data.lastDataSize=this.data.pageSize
if (that.data.list.length > 0 && res.data.length > 0 && that.data.list[0].id == res.data[0].id) {
that.setData({
lastDataSize: 0,
})
} else {
that.setData({
pageNum: that.data.pageNum + 1,
lastDataSize: res.data.length,
list: res.data,
listData: that.data.listData.concat(res.data)
})
}
}
}
})
},
/**
* 加载更多数据
*/
onScrollToLower() {
console.log("滚动条到底了，开始加载新数据");
this.getProjectCheckingData();
},
//查询统计
queryCount(param) {
//查询统计数量
@ -210,9 +248,14 @@ Page({
nav = 'ywc';
}
this.setData({
activeState: nav
activeState: nav,
pageNum: 1,
pageSize: 10,
lastDataSize: 10,
listData: [],
list: []
});
this.getProjectCheckingData(this.data.projectId, this.data.loginName, this.data.deptId, this.data.minRoleId)
this.getProjectCheckingData();
},
returnToPage: function () {

128
miniprogram/pageage/project_checking/list/index.wxml
View File

@ -1,71 +1,65 @@
<view class="header_title">
<view class="header_title_row">
<van-row>
<van-col span="4">
<view class="header_img" bindtap="returnToPage"><image src="/images/left.png"></image></view>
</van-col>
<van-col span="15">
<view class="header_name">举牌验收管理</view>
</van-col>
</van-row>
</view>
</view>
<view class="max_content">
<project-select init="{{initData}}" bindchange="onProjectSelect"></project-select>
<view class="modify_video_nav" style="margin-top: 5rpx;">
<view class="{{activeState=='jxz'?'active':''}}" bindtap="typeJump" data-index="1"><text>进行中（{{jxzCount}}）</text></view>
<view class="{{activeState=='ywc'?'active':''}}" bindtap="typeJump" data-index="2"><text>已完成（{{ywcCount}}）</text></view>
</view>
<view class="inspect_max">
<view class="inspect_list">
<view class="inspect_for" wx:for="{{listData}}" wx:key="index" data-set="{{item}}" bindtap="getInfo">
<view class="inspect_for_bgd">
<view class="inspect_list_title">
<view class="inspect_list_title_label inspect_list_title_width">
<view class="inspect_list_title_number">{{index < 9 ?'0'+(index+1):(index+1)}}</view>
<view class="module_title module_title_flex inspect_list_title_text">{{item.dataTypeLvl2Name}}</view>
<text class="timeline_for_state_1" wx:if="{{item.dataTypeLvl1=='a'}}">{{item.dataTypeLvl1Name}}</text>
<text class="timeline_for_state_2" wx:if="{{item.dataTypeLvl1=='b'}}">{{item.dataTypeLvl1Name}}</text>
</view>
</view>
<view class="inspect_list_info">
<view class="inspect_list_info_details">
<view class="inspect_list_info_img">
<view wx:if="{{item.approveStatus==1}}" class="code_label_2 code_label_blueviolet">待审批</view>
<view wx:if="{{item.approveStatus==4}}" class="code_label_2 code_label_green">合格</view>
<view wx:if="{{item.approveStatus==3}}" class="code_label_2 code_label_red">不合格</view>
<van-image width="120rpx" height="120rpx" fit="cover" src="{{request+item.mainImage+'.min.jpg'}}"/>
</view>
<view class="inspect_list_info_data">
<view class="inspect_list_info_data_prop">工具部位：<text>{{item.checkWorkingPosition}}</text></view>
<view class="inspect_list_info_data_prop">质量专员：<text>{{item.qualityUserName}}</text></view>
<view class="inspect_list_info_data_prop">监理专员：<text>{{item.superviseUserName}}</text></view>
<view class="inspect_list_info_data_prop">验收时间：<text class="color_blue">{{item.checkingDate}}</text></view>
</view>
</view>
<view class="inspect_list_info_position">验收描述：<text class="color_purple">{{item.intro}}</text></view>
</view>
</view>
</view>
</view>
<view wx:if="{{listData.length==0}}">
<view style="padding-top: 70px;text-align: -webkit-center;">
<image src="https://szgcwx.jhncidg.com/staticFiles/nodata.png" style="width: 130px;height: 105px;"></image>
<view style="color: #a5abbb;">暂无数据</view>
</view>
<view class="header_title_row">
<van-row>
<van-col span="4">
<view class="header_img" bindtap="returnToPage">
<image src="/images/left.png"></image>
</view>
</van-col>
<van-col span="15">
<view class="header_name">举牌验收管理</view>
</van-col>
</van-row>
</view>
</view>
<scroll-view class="max_content_scroll" type="list" scroll-y bindscrolltolower="onScrollToLower">
<project-select init="{{initData}}" bindchange="onProjectSelect"></project-select>
<view class="modify_video_nav" style="margin-top: 5rpx;">
<view class="{{activeState=='jxz'?'active':''}}" bindtap="typeJump" data-index="1"><text>进行中（{{jxzCount}}）</text></view>
<view class="{{activeState=='ywc'?'active':''}}" bindtap="typeJump" data-index="2"><text>已完成（{{ywcCount}}）</text></view>
</view>
<view class="inspect_max_scroll">
<view class="inspect_for_scroll" v-if="{{ listData.length>0 }}" wx:for="{{listData}}" wx:key="index" data-set="{{item}}" bindtap="getInfo">
<view class="inspect_for_bgd">
<view class="inspect_list_title">
<view class="inspect_list_title_label inspect_list_title_width">
<view class="inspect_list_title_number">{{index < 9 ?'0'+(index+1):(index+1)}}</view>
<view class="module_title module_title_flex inspect_list_title_text">{{item.dataTypeLvl2Name}}</view>
<text class="timeline_for_state_1" wx:if="{{item.dataTypeLvl1=='a'}}">{{item.dataTypeLvl1Name}}</text>
<text class="timeline_for_state_2" wx:if="{{item.dataTypeLvl1=='b'}}">{{item.dataTypeLvl1Name}}</text>
</view>
</view>
<view class="inspect_list_info">
<view class="inspect_list_info_details">
<view class="inspect_list_info_img">
<view wx:if="{{item.approveStatus==1}}" class="code_label_2 code_label_blueviolet">待审批</view>
<view wx:if="{{item.approveStatus==4}}" class="code_label_2 code_label_green">合格</view>
<view wx:if="{{item.approveStatus==3}}" class="code_label_2 code_label_red">不合格</view>
<van-image width="120rpx" height="120rpx" fit="cover" src="{{request+item.mainImage+'.min.jpg'}}" />
</view>
<view class="inspect_list_info_data">
<view class="inspect_list_info_data_prop">工具部位：<text>{{item.checkWorkingPosition}}</text></view>
<view class="inspect_list_info_data_prop">质量专员：<text>{{item.qualityUserName}}</text></view>
<view class="inspect_list_info_data_prop">监理专员：<text>{{item.superviseUserName}}</text></view>
<view class="inspect_list_info_data_prop">验收时间：<text class="color_blue">{{item.checkingDate}}</text></view>
</view>
</view>
<view class="inspect_list_info_position">验收描述：<text class="color_purple">{{item.intro}}</text></view>
</view>
</view>
</view>
<view wx:if="{{listData.length==0}}">
<view style="padding-top: 70px;text-align: -webkit-center;">
<image src="https://szgcwx.jhncidg.com/staticFiles/nodata.png" style="width: 130px;height: 105px;"></image>
<view style="color: #a5abbb;">暂无数据</view>
</view>
</view>
</view>
<view class="inspect_add_to" bindtap="skipAdd">
<view style="padding-top: 22rpx;">
<image src="/images/new_add.png"></image>
<view>新增</view>
</view>
</view></view>
<view class="inspect_add_to" bindtap="skipAdd">
<view style="padding-top: 22rpx;">
<image src="/images/new_add.png"></image>
<view>新增</view>
</view>
</view>
</scroll-view>

65
miniprogram/pageage/project_materialSeal/list/index.js
View File

@ -15,6 +15,10 @@ Page({
jxzCount: 0,
ywcCount: 0,
activeState: "jxz",
pageNum: 1,
pageSize: 10,
lastDataSize: 10,
list: [],
request: app.globalData.reqUrl
},
@ -124,12 +128,12 @@ Page({
loginName: res.data.loginName,
projectId: app.globalData.projectId,
minRoleId: res.data.minRoleId,
initData: {
text: app.globalData.projectName,
id: app.globalData.projectId
}
pageNum: 1,
pageSize: 10,
lastDataSize: 10,
listData: []
})
this.getListData(app.globalData.projectId, res.data.deptId, res.data.minRoleId);
this.getListData();
},
fail: err => {
//未获取用户信息时，重新登录
@ -143,31 +147,61 @@ Page({
/**
* 查询项目材料封样数据
*/
getListData(projectId, deptId, minRoleId) {
getListData() {
//进入这里说明数据加载完毕
if (this.data.lastDataSize < this.data.pageSize) {
//app.toast("已经到底了，暂无可继续加载数据!")
return;
}
var that = this;
//判断角色，
if (minRoleId == 2 || minRoleId == 3 || minRoleId == 4) {
let mr = this.data.minRoleId;
let deptId = this.data.deptId;
if (mr == 2 || mr == 3 || mr == 4) {
deptId = 0;
}
let param = {
"projectId": this.data.projectId,
"deptId": deptId,
"projectId": projectId,
"nowUserName": this.data.loginName,
"activeName": this.data.activeState,
}
this.queryCount(param);
param.pageNum = that.data.pageNum;
param.pageSize = that.data.pageSize;
wx.request({
url: app.globalData.reqUrl + '/wechat/projectMaterialSeal/list',
data: param,
method: "get",
success: function (res) {
that.setData({
listData: res.data.data
})
res = res.data;
if (res.code == "200") {
//这里处理this.data.lastDataSize=this.data.pageSize
if (that.data.list.length > 0 && res.data.length > 0 && that.data.list[0].id == res.data[0].id) {
that.setData({
lastDataSize: 0,
})
} else {
that.setData({
pageNum: that.data.pageNum + 1,
lastDataSize: res.data.length,
list: res.data,
listData: that.data.listData.concat(res.data)
})
}
}
}
})
},
/**
* 加载更多数据
*/
onScrollToLower() {
console.log("滚动条到底了，开始加载新数据");
this.getListData();
},
//查询统计
queryCount(param) {
//查询统计数量
@ -197,9 +231,14 @@ Page({
nav = 'ywc';
}
this.setData({
activeState: nav
activeState: nav,
pageNum: 1,
pageSize: 10,
lastDataSize: 10,
listData: [],
list: []
});
this.getListData(this.data.projectId, this.data.deptId, this.data.minRoleId);
this.getListData();
},
returnToPage: function () {

120
miniprogram/pageage/project_materialSeal/list/index.wxml
View File

@ -1,67 +1,61 @@
<view class="header_title">
<view class="header_title_row">
<van-row>
<van-col span="4">
<view class="header_img" bindtap="returnToPage"><image src="/images/left.png"></image></view>
</van-col>
<van-col span="15">
<view class="header_name">材料封样管理</view>
</van-col>
</van-row>
</view>
</view>
<view class="max_content">
<project-select init="{{initData}}" bindchange="onProjectSelect"></project-select>
<view class="modify_video_nav" style="margin-top: 5rpx;">
<view class="{{activeState=='jxz'?'active':''}}" bindtap="typeJump" data-index="1"><text>进行中（{{jxzCount}}）</text></view>
<view class="{{activeState=='ywc'?'active':''}}" bindtap="typeJump" data-index="2"><text>已完成（{{ywcCount}}）</text></view>
</view>
<view class="inspect_max">
<view class="inspect_list">
<view class="inspect_for" wx:for="{{listData}}" wx:key="index" data-set="{{item}}" bindtap="getInfo">
<view class="inspect_for_bgd">
<view class="inspect_list_title">
<view class="inspect_list_title_label inspect_list_title_width">
<view class="inspect_list_title_number">{{index < 9 ?'0'+(index+1):(index+1)}}</view>
<view class="module_title module_title_flex inspect_list_title_text">封样时间：{{item.sealDate}}</view>
</view>
</view>
<view class="inspect_list_info">
<view class="inspect_list_info_details">
<view class="inspect_list_info_img">
<view wx:if="{{item.approveStatus==1}}" class="code_label_2 code_label_blueviolet">待审批</view>
<view wx:if="{{item.approveStatus==4}}" class="code_label_2 code_label_green">合格</view>
<view wx:if="{{item.approveStatus==3}}" class="code_label_2 code_label_red">不合格</view>
<van-image width="120rpx" height="120rpx" fit="cover" src="{{request+item.mainImage+'.min.jpg'}}"/>
</view>
<view class="inspect_list_info_data">
<view class="inspect_list_info_data_prop color_blue">封样名称：<text class="color_blue">{{item.materialName}}</text></view>
<view class="inspect_list_info_data_prop color_orange">使用部位：<text class="color_orange">{{item.usePosition}}</text></view>
<view class="inspect_list_info_data_prop color_purple">拟用品牌：<text>{{item.useBrand}}</text></view>
</view>
</view>
</view>
</view>
</view>
</view>
<view wx:if="{{listData.length==0}}">
<view style="padding-top: 70px;text-align: -webkit-center;">
<image src="https://szgcwx.jhncidg.com/staticFiles/nodata.png" style="width: 130px;height: 105px;"></image>
<view style="color: #a5abbb;">暂无数据</view>
</view>
<view class="header_title_row">
<van-row>
<van-col span="4">
<view class="header_img" bindtap="returnToPage">
<image src="/images/left.png"></image>
</view>
</van-col>
<van-col span="15">
<view class="header_name">材料封样管理</view>
</van-col>
</van-row>
</view>
</view>
<scroll-view class="max_content_scroll" type="list" scroll-y bindscrolltolower="onScrollToLower">
<project-select init="{{initData}}" bindchange="onProjectSelect"></project-select>
<view class="modify_video_nav" style="margin-top: 5rpx;">
<view class="{{activeState=='jxz'?'active':''}}" bindtap="typeJump" data-index="1"><text>进行中（{{jxzCount}}）</text></view>
<view class="{{activeState=='ywc'?'active':''}}" bindtap="typeJump" data-index="2"><text>已完成（{{ywcCount}}）</text></view>
</view>
<view class="inspect_max_scroll">
<view class="inspect_for_scroll" v-if="{{ listData.length>0 }}" wx:for="{{listData}}" wx:key="index" data-set="{{item}}" bindtap="getInfo">
<view class="inspect_for_bgd">
<view class="inspect_list_title">
<view class="inspect_list_title_label inspect_list_title_width">
<view class="inspect_list_title_number">{{index < 9 ?'0'+(index+1):(index+1)}}</view>
<view class="module_title module_title_flex inspect_list_title_text">封样时间：{{item.sealDate}}</view>
</view>
</view>
<view class="inspect_list_info">
<view class="inspect_list_info_details">
<view class="inspect_list_info_img">
<view wx:if="{{item.approveStatus==1}}" class="code_label_2 code_label_blueviolet">待审批</view>
<view wx:if="{{item.approveStatus==4}}" class="code_label_2 code_label_green">合格</view>
<view wx:if="{{item.approveStatus==3}}" class="code_label_2 code_label_red">不合格</view>
<van-image width="120rpx" height="120rpx" fit="cover" src="{{request+item.mainImage+'.min.jpg'}}" />
</view>
<view class="inspect_list_info_data">
<view class="inspect_list_info_data_prop color_blue">封样名称：<text class="color_blue">{{item.materialName}}</text></view>
<view class="inspect_list_info_data_prop color_orange">使用部位：<text class="color_orange">{{item.usePosition}}</text></view>
<view class="inspect_list_info_data_prop color_purple">拟用品牌：<text>{{item.useBrand}}</text></view>
</view>
</view>
</view>
</view>
</view>
<view wx:if="{{listData.length==0}}">
<view style="padding-top: 70px;text-align: -webkit-center;">
<image src="https://szgcwx.jhncidg.com/staticFiles/nodata.png" style="width: 130px;height: 105px;"></image>
<view style="color: #a5abbb;">暂无数据</view>
</view>
</view>
</view>
<view class="inspect_add_to" bindtap="skipAdd">
<view style="padding-top: 22rpx;">
<image src="/images/new_add.png"></image>
<view>新增</view>
</view>
</view></view>
<view class="inspect_add_to" bindtap="skipAdd">
<view style="padding-top: 22rpx;">
<image src="/images/new_add.png"></image>
<view>新增</view>
</view>
</view>
</scroll-view>

65
miniprogram/pageage/project_measure/list/index.js
View File

@ -17,6 +17,10 @@ Page({
jxzCount: 0,
ywcCount: 0,
activeState: "jxz",
pageNum: 1,
pageSize: 10,
lastDataSize: 10,
list:[],
request: app.globalData.reqUrl
},
@ -130,9 +134,13 @@ Page({
initData: {
text: app.globalData.projectName,
id: app.globalData.projectId
}
},
pageNum: 1,
pageSize: 10,
lastDataSize: 10,
listData: []
})
this.getListData(app.globalData.projectId, res.data.deptId, res.data.minRoleId);
this.getListData();
},
fail: err => {
//未获取用户信息时，重新登录
@ -146,31 +154,61 @@ Page({
/**
* 查询项目实测实量数据
*/
getListData(projectId, deptId, minRoleId) {
getListData() {
//进入这里说明数据加载完毕
if (this.data.lastDataSize < this.data.pageSize) {
//app.toast("已经到底了，暂无可继续加载数据!")
return;
}
var that = this;
//判断角色，
if (minRoleId == 2 || minRoleId == 3 || minRoleId == 4) {
//判断角色
let mr = this.data.minRoleId;
let deptId = this.data.deptId;
if (mr == 2 || mr == 3 || mr == 4) {
deptId = 0;
}
let param = {
"projectId": projectId,
"projectId": this.data.projectId,
"deptId": deptId,
"nowUserName": this.data.loginName,
"activeName": this.data.activeState,
}
this.queryCount(param);
param.pageNum=that.data.pageNum;
param.pageSize=that.data.pageSize;
wx.request({
url: app.globalData.reqUrl + '/wechat/projectMeasure/list',
data: param,
method: "get",
success: function (res) {
that.setData({
listData: res.data.data
})
res = res.data;
if (res.code == "200") {
//这里处理this.data.lastDataSize=this.data.pageSize
if (that.data.list.length > 0 && res.data.length > 0 && that.data.list[0].id == res.data[0].id) {
that.setData({
lastDataSize: 0,
})
} else {
that.setData({
pageNum: that.data.pageNum + 1,
lastDataSize: res.data.length,
list: res.data,
listData: that.data.listData.concat(res.data)
})
}
}
}
});
},
/**
* 加载更多数据
*/
onScrollToLower(){
console.log("滚动条到底了，开始加载新数据");
this.getListData();
},
//查询统计
queryCount(param) {
//查询统计数量
@ -200,9 +238,14 @@ Page({
nav = 'ywc';
}
this.setData({
activeState: nav
activeState: nav,
pageNum:1,
pageSize:10,
lastDataSize:10,
listData:[],
list:[]
});
this.getListData(this.data.projectId, this.data.deptId, this.data.minRoleId);
this.getListData();
},
/**

122
miniprogram/pageage/project_measure/list/index.wxml
View File

@ -1,67 +1,61 @@
<view class="header_title">
<view class="header_title_row">
<van-row>
<van-col span="4">
<view class="header_img" bindtap="returnToPage"><image src="/images/left.png"></image></view>
</van-col>
<van-col span="15">
<view class="header_name">实测实量管理</view>
</van-col>
</van-row>
</view>
<view class="header_title_row">
<van-row>
<van-col span="4">
<view class="header_img" bindtap="returnToPage">
<image src="/images/left.png"></image>
</view>
</van-col>
<van-col span="15">
<view class="header_name">实测实量管理</view>
</van-col>
</van-row>
</view>
</view>
<view class="max_content">
<project-select init="{{initData}}" bindchange="onProjectSelect"></project-select>
<view class="modify_video_nav" style="margin-top: 5rpx;">
<view class="{{activeState=='jxz'?'active':''}}" bindtap="typeJump" data-index="1"><text>进行中（{{jxzCount}}）</text></view>
<view class="{{activeState=='ywc'?'active':''}}" bindtap="typeJump" data-index="2"><text>已完成（{{ywcCount}}）</text></view>
</view>
<view class="inspect_max">
<view class="inspect_list">
<view class="inspect_for" v-if="{{ listData.length>0 }}" wx:for="{{listData}}" wx:key="index" data-set="{{item}}" bindtap="getInfo">
<view class="inspect_for_bgd">
<view class="inspect_list_title">
<view class="inspect_list_title_label inspect_list_title_width">
<view class="inspect_list_title_number">{{index < 9 ?'0'+(index+1):(index+1)}}</view>
<view class="module_title module_title_flex inspect_list_title_text">测量时间：{{item.measureTime}}</view>
</view>
</view>
<view class="inspect_list_info">
<view class="inspect_list_info_details">
<view class="inspect_list_info_img">
<view wx:if="{{item.approveStatus==1}}" class="code_label_2 code_label_blueviolet">待审批</view>
<view wx:if="{{item.approveStatus==4}}" class="code_label_2 code_label_green">合格</view>
<view wx:if="{{item.approveStatus==3}}" class="code_label_2 code_label_red">不合格</view>
<van-image width="120rpx" height="120rpx" fit="cover" src="{{request+item.mainImage+'.min.jpg'}}"/>
</view>
<view class="inspect_list_info_data">
<view class="inspect_list_info_data_prop">测量类型：<text>{{item.measureTypeName}}</text></view>
<view class="inspect_list_info_data_prop">测量内容：<text>{{item.measureInfoName}}</text></view>
<view class="inspect_list_info_data_prop">测量点位：<text class="color_blue">{{item.measurePointPosition}}</text></view>
</view>
</view>
<view class="inspect_list_info_position">测量部位：<text class="color_purple">{{item.measurePosition}}</text></view>
</view>
</view>
</view>
<view wx:if="{{listData.length==0}}">
<view style="padding-top: 70px;text-align: -webkit-center;">
<image src="https://szgcwx.jhncidg.com/staticFiles/nodata.png" style="width: 130px;height: 105px;"></image>
<view style="color: #a5abbb;">暂无数据</view>
<scroll-view class="max_content_scroll" type="list" scroll-y bindscrolltolower="onScrollToLower">
<project-select init="{{initData}}" bindchange="onProjectSelect"></project-select>
<view class="modify_video_nav" style="margin-top: 5rpx;">
<view class="{{activeState=='jxz'?'active':''}}" bindtap="typeJump" data-index="1"><text>进行中（{{jxzCount}}）</text></view>
<view class="{{activeState=='ywc'?'active':''}}" bindtap="typeJump" data-index="2"><text>已完成（{{ywcCount}}）</text></view>
</view>
<view class="inspect_max_scroll">
<view class="inspect_for_scroll" v-if="{{ listData.length>0 }}" wx:for="{{listData}}" wx:key="index" data-set="{{item}}" bindtap="getInfo">
<view class="inspect_for_bgd">
<view class="inspect_list_title">
<view class="inspect_list_title_label inspect_list_title_width">
<view class="inspect_list_title_number">{{index < 9 ?'0'+(index+1):(index+1)}}</view>
<view class="module_title module_title_flex inspect_list_title_text">测量时间：{{item.measureTime}}</view>
</view>
</view>
<view class="inspect_list_info">
<view class="inspect_list_info_details">
<view class="inspect_list_info_img">
<view wx:if="{{item.approveStatus==1}}" class="code_label_2 code_label_blueviolet">待审批</view>
<view wx:if="{{item.approveStatus==4}}" class="code_label_2 code_label_green">合格</view>
<view wx:if="{{item.approveStatus==3}}" class="code_label_2 code_label_red">不合格</view>
<van-image width="120rpx" height="120rpx" fit="cover" src="{{request+item.mainImage+'.min.jpg'}}" />
</view>
<view class="inspect_list_info_data">
<view class="inspect_list_info_data_prop">测量类型：<text>{{item.measureTypeName}}</text></view>
<view class="inspect_list_info_data_prop">测量内容：<text>{{item.measureInfoName}}</text></view>
<view class="inspect_list_info_data_prop">测量点位：<text class="color_blue">{{item.measurePointPosition}}</text></view>
</view>
</view>
<view class="inspect_list_info_position">测量部位：<text class="color_purple">{{item.measurePosition}}</text></view>
</view>
</view>
</view>
</view>
</view>
</view>
<view class="inspect_add_to" bindtap="skipAdd">
<view style="padding-top: 22rpx;">
<image src="/images/new_add.png"></image>
<view>新增</view>
</view>
</view>
</view>
<view wx:if="{{listData.length==0}}">
<view style="padding-top: 70px;text-align: -webkit-center;">
<image src="https://szgcwx.jhncidg.com/staticFiles/nodata.png" style="width: 130px;height: 105px;"></image>
<view style="color: #a5abbb;">暂无数据</view>
</view>
</view>
</view>
<view class="inspect_add_to" bindtap="skipAdd">
<view style="padding-top: 22rpx;">
<image src="/images/new_add.png"></image>
<view>新增</view>
</view>
</view>
</scroll-view>

364
miniprogram/pageage/project_problemmodify/security/info/index.js
View File

@ -2,61 +2,75 @@
const app = getApp()
Page({
/**
* 页面的初始数据
*/
data: {
id:"",
infoData:{},
auditInfo:{},
showDel:false,
loginName:"",
imageList:[],
minImageList:[],
auditImageList:[],
auditMinImageList:[],
request:app.globalData.reqUrl,
flowNodes:[{text:'开始'},{text:'提交隐患'},{text:'隐患整改'},{text:'隐患复检'},{text:'结束'}],
active: 100
},
/**
* 页面的初始数据
*/
data: {
id: "",
infoData: {},
auditInfo: {},
showDel: false,
loginName: "",
imageList: [],
minImageList: [],
auditImageList: [],
auditMinImageList: [],
request: app.globalData.reqUrl,
flowNodes: [{
text: '开始'
}, {
text: '提交隐患'
}, {
text: '隐患整改'
}, {
text: '隐患复检'
}, {
text: '结束'
}],
active: 100
},
/**
* 生命周期函数--监听页面加载
*/
onLoad(options) {
let {id} = options
//获取缓存数据
wx.getStorage({
key: 'userinfo',
success:res=>{
this.setData({
id,
loginName:res.data.loginName
})
this.getInfo();
this.getAuditinfo();
}
/**
* 生命周期函数--监听页面加载
*/
onLoad(options) {
let {
id
} = options
//获取缓存数据
wx.getStorage({
key: 'userinfo',
success: res => {
this.setData({
id,
loginName: res.data.loginName
})
},
this.getInfo();
this.getAuditinfo();
}
})
},
/**
* 获取安全检查详情信息
*
*/
getInfo(){
let {id} = this.data
let that = this
wx.request({
url: app.globalData.reqUrl+'/wechat/projectProblemmodify/info',
method:"get",
data:{
id:id
},
success(res){
res = res.data
if(res.code == 200){
let state = that.data.active;
/**
* 获取安全检查详情信息
*
*/
getInfo() {
let {
id
} = this.data
let that = this
wx.request({
url: app.globalData.reqUrl + '/wechat/projectProblemmodify/info',
method: "get",
data: {
id: id
},
success(res) {
res = res.data
if (res.code == 200) {
let state = that.data.active;
if (res.data.checkState == "0") {
state = 2;
} else if (res.data.checkState == "1") {
@ -67,61 +81,63 @@ Page({
that.setData({
active: state
})
let urls = [];
let minUrls = [];
if(res.data.smarkUrl){
res.data.smarkUrl.split(',').forEach(element => {
urls.push(that.data.request+element);
minUrls.push(that.data.request+element+'.min.jpg');
});
}
that.setData({
infoData:res.data,
imageList:urls,
minImageList:minUrls
})
//判断当前能否删除
if(res.data.checkState!=4 && res.data.createUser==that.data.loginName){
that.setData({
showDel:true
})
}
}
let urls = [];
let minUrls = [];
if (res.data.smarkUrl) {
res.data.smarkUrl.split(',').forEach(element => {
urls.push(that.data.request + element);
minUrls.push(that.data.request + element + '.min.jpg');
});
}
})
},
getAuditinfo(){
let {id} = this.data
let that = this
wx.request({
url: app.globalData.reqUrl+'/wechat/projectProblemmodify/queryAuditInfo',
method:"get",
data:{
id:id
},
success(res){
res = res.data
if(res.code == 200 && res.data){
let urls = [];
let minUrls = [];
if(res.data.fileUrls){
res.data.fileUrls.split(',').forEach(element => {
urls.push(that.data.request+element);
minUrls.push(that.data.request+element+'.min.jpg');
});
}
that.setData({
auditInfo:res.data,
auditImageList:urls,
auditMinImageList:minUrls
})
that.setData({
infoData: res.data,
imageList: urls,
minImageList: minUrls
})
//判断当前能否删除
if (res.data.checkState != 4 && res.data.createUser == that.data.loginName) {
that.setData({
showDel: true
})
}
}
})
},
}
})
},
onDelete(){
getAuditinfo() {
let {
id
} = this.data
let that = this
wx.request({
url: app.globalData.reqUrl + '/wechat/projectProblemmodify/queryAuditInfo',
method: "get",
data: {
id: id
},
success(res) {
res = res.data
if (res.code == 200 && res.data) {
let urls = [];
let minUrls = [];
if (res.data.fileUrls) {
res.data.fileUrls.split(',').forEach(element => {
urls.push(that.data.request + element);
minUrls.push(that.data.request + element + '.min.jpg');
});
}
that.setData({
auditInfo: res.data,
auditImageList: urls,
auditMinImageList: minUrls
})
}
}
})
},
onDelete() {
//弹出确认
let that = this
wx.showModal({
@ -129,104 +145,106 @@ Page({
content: '是否确定删除此条数据？',
success: function (sm) {
if (sm.confirm) {
// 用户点击了确定 可以调用了
that.deleteData();
} else if (sm.cancel) {
console.log('用户点击取消');
}
// 用户点击了确定 可以调用了
that.deleteData();
} else if (sm.cancel) {
console.log('用户点击取消');
}
})
}
})
},
deleteData(){
let {id} = this.data
wx.request({
url: app.globalData.reqUrl+'/wechat/projectProblemmodify/removeSafety',
header: {
"Username": this.data.loginName,
},
data:{
id:id
},
method:"get",
success(res){
app.toast("删除成功！")
wx.redirectTo({
url: `../list/index`,
})
}
})
deleteData() {
let {
id
} = this.data
wx.request({
url: app.globalData.reqUrl + '/wechat/projectProblemmodify/removeSafety',
header: {
"Username": this.data.loginName,
},
data: {
id: id
},
method: "get",
success(res) {
app.toast("删除成功！")
wx.redirectTo({
url: `../list/index`,
})
}
})
},
//展示图片
showImg:function(e){
var that=this;
wx.previewImage({
urls: that.data.imageList,
current: that.data.imageList[e.currentTarget.dataset.index]
})
//展示图片
showImg: function (e) {
var that = this;
wx.previewImage({
urls: that.data.imageList,
current: that.data.imageList[e.currentTarget.dataset.index]
})
},
//展示图片
showAuditinfoImg:function(e){
var that=this;
showAuditinfoImg: function (e) {
var that = this;
wx.previewImage({
urls: that.data.auditImageList,
current: that.data.auditImageList[e.currentTarget.dataset.index]
urls: that.data.auditImageList,
current: that.data.auditImageList[e.currentTarget.dataset.index]
})
},
returnToPage: function () {
/*关闭当前页面，跳转到应用内的某个页面。但是不允许跳转到 tabbar 页面*/
wx.redirectTo({
url: '../list/index',
url: '../list/index',
})
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady() {
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady() {
},
},
/**
* 生命周期函数--监听页面显示
*/
onShow() {
/**
* 生命周期函数--监听页面显示
*/
onShow() {
},
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide() {
/**
* 生命周期函数--监听页面隐藏
*/
onHide() {
},
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload() {
/**
* 生命周期函数--监听页面卸载
*/
onUnload() {
},
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh() {
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh() {
},
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom() {
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom() {
},
},
/**
* 用户点击右上角分享
*/
onShareAppMessage() {
/**
* 用户点击右上角分享
*/
onShareAppMessage() {
}
}
})