提交代码
parent
3f0641164d
commit
f3c3daa5e6
|
@ -33,6 +33,7 @@ App({
|
|||
reqUrl:'https://cf.makalu.cc',
|
||||
//reqUrl:'http://127.0.0.1:8091',
|
||||
uploadUrl:"https://cf.makalu.cc/wechat",
|
||||
//uploadUrl:'http://127.0.0.1:8091/wechat',
|
||||
|
||||
//御景路数字化集成管控平台接口访问域名
|
||||
szhUrl:'https://szh.makalu.cc',
|
||||
|
@ -88,7 +89,7 @@ App({
|
|||
wx.showToast({
|
||||
title: msg,
|
||||
icon: 'none',
|
||||
duration: 2000,
|
||||
duration: 1000,
|
||||
mask: true
|
||||
});
|
||||
},
|
||||
|
|
|
@ -18,7 +18,19 @@
|
|||
"pages/Construction-Log/index",
|
||||
"pages/updatePassword/updatePassword",
|
||||
"pages/safety_manage/index",
|
||||
"pages/quality_manage/index"
|
||||
"pages/quality_manage/index",
|
||||
"pages/project_flowable/initTask/index",
|
||||
"pages/project_flowable/myFlowDefinition/index",
|
||||
"pages/project_flowable/await/index",
|
||||
"pages/project_flowable/approveTask/index",
|
||||
"pages/project_flowable/approveLeaveTask/index",
|
||||
"pages/project_flowable/finished/index",
|
||||
"pages/project_flowable/initLeaveTask/index",
|
||||
"pages/project_flowable/detailTask/index",
|
||||
"pages/project_flowable/detailLeaveTask/index",
|
||||
"pages/project_flowable/editTask/index",
|
||||
"pages/project_flowable/editLeaveTask/index",
|
||||
"pages/project_flowable/myProcessIns/index"
|
||||
],
|
||||
"subpackages": [
|
||||
{
|
||||
|
@ -136,8 +148,7 @@
|
|||
"select-group-person": "./newComponents/select-group-person/index",
|
||||
"van-dropdown-menu": "@vant/weapp/dropdown-menu/index",
|
||||
"van-dropdown-item": "@vant/weapp/dropdown-item/index",
|
||||
"curve-echarts": "pages/components/curve-echarts/index",
|
||||
"curve-echarts-copy": "pages/components/curve-echarts-copy/index"
|
||||
"curve-echarts": "pages/components/curve-echarts/index"
|
||||
},
|
||||
"window": {
|
||||
"backgroundTextStyle": "light",
|
||||
|
|
|
@ -55,7 +55,7 @@ page{
|
|||
padding: 166rpx 0 180rpx;
|
||||
}
|
||||
.max_content_scroll{
|
||||
padding: 166rpx 0 180rpx;
|
||||
padding: 166rpx 0 10rpx;
|
||||
}
|
||||
.min_content{
|
||||
padding: 166rpx 0 20rpx;
|
||||
|
@ -132,6 +132,17 @@ page{
|
|||
padding-bottom: 5rpx;
|
||||
color: #F56C6C;
|
||||
}
|
||||
.left_begin{
|
||||
text-align: center;
|
||||
padding-bottom: 5rpx;
|
||||
color: #faf8ff;
|
||||
}
|
||||
.left_manage2{
|
||||
float: left;
|
||||
width: 50%;
|
||||
margin-bottom: 35rpx;
|
||||
color: #ffffff;
|
||||
}
|
||||
|
||||
/* 底部导航 */
|
||||
.van-tabbar.van-tabbar--fixed{
|
||||
|
@ -1094,7 +1105,7 @@ swiper-item video{
|
|||
}
|
||||
|
||||
.inspect_max_scroll{
|
||||
height:125vh;
|
||||
height:75vh;
|
||||
}
|
||||
.inspect_list_scroll{
|
||||
padding: 10rpx 0;
|
||||
|
@ -1497,8 +1508,12 @@ swiper-item video{
|
|||
padding-right: 25rpx;
|
||||
}
|
||||
.problem_submit_to_delete{
|
||||
border-bottom: 1px solid #c13636;
|
||||
background-color: #c13636;
|
||||
border-bottom: 1px solid #ff6d6d;
|
||||
background-color: #ff6d6d;
|
||||
}
|
||||
.problem_submit_to_warning{
|
||||
border-bottom: 1px solid #E6A23C;
|
||||
background-color: #E6A23C;
|
||||
}
|
||||
.code_label{
|
||||
font-size: 0.6rem;
|
||||
|
@ -1541,12 +1556,43 @@ swiper-item video{
|
|||
.files{
|
||||
word-break: break-all;
|
||||
text-decoration: underline;
|
||||
padding-bottom: 20rpx;
|
||||
}
|
||||
.zxjc{
|
||||
border: 5rpx solid #3fabb7;
|
||||
border-radius: 12px;
|
||||
margin-bottom: 12rpx;
|
||||
}
|
||||
.tabNum{
|
||||
position: absolute;
|
||||
right: 10px;
|
||||
background-color: #f56c6c;
|
||||
border-radius: 10px;
|
||||
color: #fff;
|
||||
display: inline-block;
|
||||
font-size: 12px;
|
||||
height: 18px;
|
||||
line-height: 18px;
|
||||
padding: 0 6px;
|
||||
text-align: center;
|
||||
white-space: nowrap;
|
||||
top: 10rpx;
|
||||
}
|
||||
.tabNum_active{
|
||||
position: absolute;
|
||||
background-color: #f56c6c;
|
||||
border-radius: 10px;
|
||||
color: #fff;
|
||||
display: inline-block;
|
||||
font-size: 12px;
|
||||
height: 18px;
|
||||
line-height: 18px;
|
||||
padding: 0 6px;
|
||||
text-align: center;
|
||||
white-space: nowrap;
|
||||
margin-left: 110rpx;
|
||||
margin-top: 16rpx;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
|
|
@ -23,7 +23,8 @@ Page({
|
|||
pageNum:1,
|
||||
pageSize:10,
|
||||
lastDataSize:10,
|
||||
minRoleId:""
|
||||
minRoleId:"",
|
||||
list:[],
|
||||
},
|
||||
|
||||
skipAdd(){
|
||||
|
@ -109,13 +110,21 @@ Page({
|
|||
success: function (res) {
|
||||
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)
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
},
|
||||
|
@ -174,7 +183,8 @@ Page({
|
|||
pageNum:1,
|
||||
pageSize:10,
|
||||
lastDataSize:10,
|
||||
listData:[]
|
||||
listData:[],
|
||||
list:[]
|
||||
});
|
||||
this.getListData();
|
||||
},
|
||||
|
|
|
@ -23,7 +23,8 @@ Page({
|
|||
pageNum:1,
|
||||
pageSize:10,
|
||||
lastDataSize:10,
|
||||
minRoleId:""
|
||||
minRoleId:"",
|
||||
list:[]
|
||||
},
|
||||
|
||||
skipAdd(){
|
||||
|
@ -109,13 +110,21 @@ Page({
|
|||
success: function (res) {
|
||||
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)
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
},
|
||||
|
||||
|
@ -172,7 +181,8 @@ Page({
|
|||
pageNum:1,
|
||||
pageSize:10,
|
||||
lastDataSize:10,
|
||||
listData:[]
|
||||
listData:[],
|
||||
list:[]
|
||||
});
|
||||
this.getListData();
|
||||
},
|
||||
|
|
|
@ -97,7 +97,7 @@
|
|||
<view class="inspect_overview_list">
|
||||
<van-row>
|
||||
<van-col span="6"><text class="color_blue">提交用户</text></van-col>
|
||||
<van-col span="18" class="color_blue">{{infoData.createBy}}</van-col>
|
||||
<van-col span="18" class="color_blue">{{infoData.createBy?infoData.createBy:''}}</van-col>
|
||||
</van-row>
|
||||
</view>
|
||||
<view class="inspect_overview_list">
|
||||
|
|
|
@ -283,10 +283,9 @@ Page({
|
|||
this.data.trainContent = options.detail.value
|
||||
},
|
||||
|
||||
fileUpload(a,b,c){
|
||||
let file=a.detail;
|
||||
fileUpload(e){
|
||||
this.setData({
|
||||
trainFileData: file
|
||||
trainFileData:e.detail
|
||||
});
|
||||
},
|
||||
|
||||
|
|
|
@ -185,7 +185,7 @@ Page({
|
|||
let that = this;
|
||||
wx.downloadFile({
|
||||
// 示例 url,并非真实存在
|
||||
url: that.data.request+that.fileUrls[idx],
|
||||
url: app.globalData.uploadUrl+'/common/upload/'+that.fileUrls[idx],
|
||||
success: function (res) {
|
||||
const filePath = res.tempFilePath
|
||||
wx.openDocument({
|
||||
|
|
|
@ -19,6 +19,7 @@ Page({
|
|||
menuList:[],
|
||||
initData:{},
|
||||
hiddenn:true,
|
||||
db:0,
|
||||
},
|
||||
|
||||
|
||||
|
@ -64,6 +65,7 @@ Page({
|
|||
initData:{text:app.globalData.projectName,id:app.globalData.projectId}
|
||||
})
|
||||
that.selectMenuList(res.data.loginName);
|
||||
that.awaitTask(res.data.minRoleId,res.data.deptId,res.data.loginName,res.data.userId);
|
||||
}
|
||||
})
|
||||
|
||||
|
@ -192,4 +194,28 @@ Page({
|
|||
this.setData({ show: false });
|
||||
},
|
||||
|
||||
//查询当前登录人的代办任务
|
||||
awaitTask(minRoleId,deptId,loginName,userId) {
|
||||
let param = {
|
||||
//"businessKey":this.data.projectId,
|
||||
"nowRole":minRoleId,
|
||||
"nowDept":deptId,
|
||||
"nowUserName":loginName,
|
||||
"nowUser":userId
|
||||
}
|
||||
var that = this;
|
||||
wx.request({
|
||||
url: app.globalData.reqUrl + '/wechat/flowTask/myAwaitFlowTaskListCount',
|
||||
data:param,
|
||||
method: "post",
|
||||
success: function (res) {
|
||||
res = res.data;
|
||||
if(res.code=="200"){
|
||||
that.setData({
|
||||
db:res.data.length
|
||||
})
|
||||
}
|
||||
}
|
||||
})
|
||||
},
|
||||
})
|
|
@ -59,6 +59,7 @@
|
|||
<van-row class="demo clearfix">
|
||||
<van-col span="8" wx:for="{{menuList}}" wx:key="unique">
|
||||
<view class="gd_min" data-id="{{item.menu_identi}}" data-url="{{item.menu_url}}" bindtap="goMenu">
|
||||
<span class="tabNum_active" wx:if="{{item.menu_identi=='GCSQGL' && db>0}}">{{db}}</span>
|
||||
<image src="{{item.menu_img}}"></image>
|
||||
<view>{{item.menu_name}}</view>
|
||||
</view>
|
||||
|
@ -174,5 +175,6 @@
|
|||
style="width:40rpx; height:40rpx;"
|
||||
/>
|
||||
更多功能
|
||||
<span class="tabNum" wx:if="{{db>0}}">{{db}}</span>
|
||||
</van-tabbar-item>
|
||||
</van-tabbar>
|
||||
|
|
|
@ -122,7 +122,7 @@ Page({
|
|||
})
|
||||
},
|
||||
|
||||
goWDLC:function(){
|
||||
goWDSQ:function(){
|
||||
wx.redirectTo({
|
||||
url: '../myProcessIns/index',
|
||||
})
|
||||
|
|
|
@ -48,6 +48,7 @@
|
|||
</view>
|
||||
</view>
|
||||
<view class="inspect_list_info">
|
||||
<view class="inspect_list_info_data_prop color_type">项目名称:{{item.businessKeyName}}</view>
|
||||
<view class="inspect_list_info_data_prop color_blue">审批事项:{{item.procDefName}}</view>
|
||||
<view class="inspect_list_info_data_prop color_purple">接收时间:{{item.createTime}}</view>
|
||||
<view class="inspect_list_info_data_prop">申请用户:{{item.startUserName}}</view>
|
||||
|
|
|
@ -82,11 +82,16 @@ Page({
|
|||
lastDataSize:0,
|
||||
})
|
||||
}else{
|
||||
let _list = [];
|
||||
res.rows.forEach( it => {
|
||||
it.duration = that.getDurationDate(it.duration);
|
||||
_list.push(it);
|
||||
});
|
||||
that.setData({
|
||||
pageNum:that.data.pageNum+1,
|
||||
lastDataSize:res.rows.length,
|
||||
list:res.rows,
|
||||
listData:that.data.listData.concat(res.rows)
|
||||
listData:that.data.listData.concat(_list)
|
||||
})
|
||||
}
|
||||
}else{
|
||||
|
@ -96,6 +101,41 @@ Page({
|
|||
});
|
||||
},
|
||||
|
||||
getDurationDate(val){
|
||||
let day=0;
|
||||
let hours=0;
|
||||
let min = val;
|
||||
if(min>1440){
|
||||
day = parseInt(min/1440);
|
||||
min = min % 1440;
|
||||
if(min>60){
|
||||
hours = parseInt(min/60);
|
||||
min = min % 60;
|
||||
}
|
||||
}else if(min>60){
|
||||
hours = parseInt(min/60);
|
||||
min = min % 60;
|
||||
}
|
||||
if(day>0){
|
||||
if(day<10) day="0"+day;
|
||||
if(hours<10) hours="0"+hours;
|
||||
if(min<10) min="0"+min;
|
||||
return day+"天"+hours+"小时"+min+"分钟";
|
||||
}
|
||||
if(hours>0){
|
||||
if(hours<10) hours="0"+hours;
|
||||
if(min<10) min="0"+min;
|
||||
return hours+"小时"+min+"分钟";
|
||||
}
|
||||
if(min>0){
|
||||
if(min<10) min="0"+min;
|
||||
return min+"分钟";
|
||||
}
|
||||
if(min==0){
|
||||
return "1分钟";
|
||||
}
|
||||
},
|
||||
|
||||
/**
|
||||
* 生命周期函数--监听页面初次渲染完成
|
||||
*/
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
<view class="header_img" bindtap="returnToPage"><image src="/images/left.png"></image></view>
|
||||
</van-col>
|
||||
<van-col span="15">
|
||||
<view class="header_name">申请办理完成</view>
|
||||
<view class="header_name">流程办理完成</view>
|
||||
</van-col>
|
||||
</van-row>
|
||||
</view>
|
||||
|
@ -34,6 +34,7 @@
|
|||
<view class="inspect_list_info_data_prop">接收时间:{{item.createTime}}</view>
|
||||
<view class="inspect_list_info_data_prop">申请用户:{{item.startUserName}}</view>
|
||||
<view class="inspect_list_info_data_prop">申请单位:{{item.startDeptName}}</view>
|
||||
<view class="inspect_list_info_data_prop">处理耗时:{{item.duration}}</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
|
|
@ -0,0 +1,277 @@
|
|||
// pageage/safetyManagement/securityCheckGR/index.js
|
||||
const app = getApp()
|
||||
Page({
|
||||
|
||||
/**
|
||||
* 页面的初始数据
|
||||
*/
|
||||
data: {
|
||||
userId:"",
|
||||
projectId:"",
|
||||
projectData:{},
|
||||
initData: {},
|
||||
show:false,
|
||||
list:[],
|
||||
listData:[],
|
||||
pageNum:1,
|
||||
pageSize:10,
|
||||
lastDataSize:10,
|
||||
activeState:"await",
|
||||
allCount:0,
|
||||
awaitCount:0,
|
||||
finishedCount:0,
|
||||
},
|
||||
|
||||
/**
|
||||
* 标签切换
|
||||
*/
|
||||
typeJump(e){
|
||||
let index = e.currentTarget.dataset.index;
|
||||
let nav = "";
|
||||
if(index == 1){
|
||||
nav = 'all';
|
||||
}else if(index == 2){
|
||||
nav = 'await';
|
||||
}else if(index == 3){
|
||||
nav = 'finished';
|
||||
}
|
||||
|
||||
this.setData({
|
||||
activeState:nav,
|
||||
pageNum:1,
|
||||
pageSize:10,
|
||||
lastDataSize:10,
|
||||
listData:[],
|
||||
list:[]
|
||||
});
|
||||
this.getListData(this.data.userId);
|
||||
},
|
||||
|
||||
getInfo(e){
|
||||
let {deployId,procInsId,taskId,taskName,procDefKey,startDeptName,startUserName,procDefName,businessKeyName,finishTime} = e.currentTarget.dataset.set
|
||||
if(!finishTime){
|
||||
finishTime="";
|
||||
}
|
||||
if(taskName=="提交申请"){
|
||||
if(procDefKey=="flow_xmglzdl_qjspb"){
|
||||
wx.redirectTo({
|
||||
url: `../editLeaveTask/index?deployId=${deployId}&procInsId=${procInsId}&nickName=${startUserName}&deptName=${startDeptName}&procDefName=${procDefName}&taskId=${taskId}&taskName=${taskName}&projectName=${businessKeyName}&ret=myProcess`,
|
||||
})
|
||||
}else{
|
||||
wx.redirectTo({
|
||||
url: `../editTask/index?deployId=${deployId}&procInsId=${procInsId}&nickName=${startUserName}&deptName=${startDeptName}&procDefName=${procDefName}&taskId=${taskId}&taskName=${taskName}&projectName=${businessKeyName}&ret=myProcess`,
|
||||
})
|
||||
}
|
||||
}else{
|
||||
//根据不同业务跳转不同表单
|
||||
if(procDefKey=="flow_xmglzdl_qjspb"){
|
||||
wx.redirectTo({
|
||||
url: `../detailLeaveTask/index?deployId=${deployId}&procInsId=${procInsId}&nickName=${startUserName}&deptName=${startDeptName}&procDefName=${procDefName}&taskId=${taskId}&taskName=${taskName}&projectName=${businessKeyName}&finishTime=${finishTime}&ret=myProcess`,
|
||||
})
|
||||
}else{
|
||||
wx.redirectTo({
|
||||
url: `../detailTask/index?deployId=${deployId}&procInsId=${procInsId}&nickName=${startUserName}&deptName=${startDeptName}&procDefName=${procDefName}&taskId=${taskId}&taskName=${taskName}&projectName=${businessKeyName}&finishTime=${finishTime}&ret=myProcess`,
|
||||
})
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
/**
|
||||
* 生命周期函数--监听页面加载
|
||||
*/
|
||||
onLoad(options) {
|
||||
//获取缓存数据
|
||||
wx.getStorage({
|
||||
key: 'userinfo',
|
||||
success:res=>{
|
||||
this.setData({
|
||||
userId:res.data.userId,
|
||||
projectId:app.globalData.projectId,
|
||||
initData:{text:app.globalData.projectName,id:app.globalData.projectId}
|
||||
})
|
||||
this.getListData(res.data.userId);
|
||||
}
|
||||
})
|
||||
},
|
||||
|
||||
/**
|
||||
* 查询项目举牌验收数据
|
||||
*/
|
||||
getListData(userId) {
|
||||
//进入这里说明数据加载完毕
|
||||
if(this.data.lastDataSize<this.data.pageSize){
|
||||
//app.toast("已经到底了,暂无可继续加载数据!")
|
||||
return;
|
||||
}
|
||||
var that = this;
|
||||
//businessKey注解掉可以跨项目审批
|
||||
let param = {
|
||||
"activeName":this.data.activeState,
|
||||
"nowRole":"99",//这里只能查看自己的数据
|
||||
"nowUser":userId
|
||||
}
|
||||
this.queryCount(param);
|
||||
param.pageNum=that.data.pageNum;
|
||||
param.pageSize=that.data.pageSize;
|
||||
wx.request({
|
||||
url: app.globalData.reqUrl + '/wechat/flowTask/allList',
|
||||
data:param,
|
||||
method: "get",
|
||||
success: function (res) {
|
||||
res = res.data;
|
||||
if(res.code=="200"){
|
||||
//这里处理this.data.lastDataSize=this.data.pageSize
|
||||
if(that.data.list.length>0 && res.rows.length>0 && that.data.list[0].taskId==res.rows[0].taskId){
|
||||
that.setData({
|
||||
lastDataSize:0,
|
||||
})
|
||||
}else{
|
||||
let _list = [];
|
||||
res.rows.forEach( it => {
|
||||
it.duration = that.getDurationDate(it.duration);
|
||||
_list.push(it);
|
||||
});
|
||||
that.setData({
|
||||
pageNum:that.data.pageNum+1,
|
||||
lastDataSize:res.rows.length,
|
||||
list:res.rows,
|
||||
listData:that.data.listData.concat(_list)
|
||||
})
|
||||
}
|
||||
}else{
|
||||
app.toast(res.msg);
|
||||
}
|
||||
}
|
||||
});
|
||||
},
|
||||
|
||||
queryCount(param){
|
||||
let that = this;
|
||||
//查询统计数量
|
||||
wx.request({
|
||||
url: app.globalData.reqUrl + '/wechat/flowTask/queryCount',
|
||||
data: param,
|
||||
method: "get",
|
||||
success: function (res) {
|
||||
let awaits=0;
|
||||
if(res.data.data.await){
|
||||
awaits=res.data.data.await;
|
||||
}
|
||||
let finished=0;
|
||||
if(res.data.data.finished){
|
||||
finished=res.data.data.finished;
|
||||
}
|
||||
that.setData({
|
||||
allCount:awaits+finished,
|
||||
awaitCount:awaits,
|
||||
finishedCount:finished
|
||||
});
|
||||
}
|
||||
});
|
||||
},
|
||||
|
||||
/**
|
||||
* 生命周期函数--监听页面初次渲染完成
|
||||
*/
|
||||
onReady() {
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
* 生命周期函数--监听页面显示
|
||||
*/
|
||||
onShow() {
|
||||
|
||||
},
|
||||
|
||||
returnToPage: function () {
|
||||
/*关闭当前页面,跳转到应用内的某个页面。但是不允许跳转到 tabbar 页面*/
|
||||
wx.redirectTo({
|
||||
url: '../await/index',
|
||||
})
|
||||
},
|
||||
|
||||
onScrollToLower(){
|
||||
console.log("滚动条到底了,开始加载新数据");
|
||||
this.getListData(this.data.userId);
|
||||
},
|
||||
|
||||
//项目切换 返回值
|
||||
onProjectSelect(e){
|
||||
let projectId = e.detail.id;
|
||||
let projectName = e.detail.text;
|
||||
app.globalData.projectId = projectId;
|
||||
app.globalData.projectName = projectName;
|
||||
this.onLoad();
|
||||
},
|
||||
|
||||
getDurationDate(val){
|
||||
let day=0;
|
||||
let hours=0;
|
||||
let min = val;
|
||||
if(min>1440){
|
||||
day = parseInt(min/1440);
|
||||
min = min % 1440;
|
||||
if(min>60){
|
||||
hours = parseInt(min/60);
|
||||
min = min % 60;
|
||||
}
|
||||
}else if(min>60){
|
||||
hours = parseInt(min/60);
|
||||
min = min % 60;
|
||||
}
|
||||
if(day>0){
|
||||
if(day<10) day="0"+day;
|
||||
if(hours<10) hours="0"+hours;
|
||||
if(min<10) min="0"+min;
|
||||
return day+"天"+hours+"小时"+min+"分钟";
|
||||
}
|
||||
if(hours>0){
|
||||
if(hours<10) hours="0"+hours;
|
||||
if(min<10) min="0"+min;
|
||||
return hours+"小时"+min+"分钟";
|
||||
}
|
||||
if(min>0){
|
||||
if(min<10) min="0"+min;
|
||||
return min+"分钟";
|
||||
}
|
||||
if(min==0){
|
||||
return "1分钟";
|
||||
}
|
||||
},
|
||||
|
||||
/**
|
||||
* 生命周期函数--监听页面隐藏
|
||||
*/
|
||||
onHide() {
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
* 生命周期函数--监听页面卸载
|
||||
*/
|
||||
onUnload() {
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
* 页面相关事件处理函数--监听用户下拉动作
|
||||
*/
|
||||
onPullDownRefresh() {
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
* 页面上拉触底事件的处理函数
|
||||
*/
|
||||
onReachBottom() {
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
* 用户点击右上角分享
|
||||
*/
|
||||
onShareAppMessage() {
|
||||
|
||||
}
|
||||
})
|
|
@ -0,0 +1,7 @@
|
|||
{
|
||||
"usingComponents": {
|
||||
"van-overlay": "@vant/weapp/overlay/index" ,
|
||||
"van-popup": "@vant/weapp/popup/index"
|
||||
},
|
||||
"navigationStyle":"custom"
|
||||
}
|
|
@ -0,0 +1,58 @@
|
|||
<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>
|
||||
<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=='all'?'active':''}}" bindtap="typeJump" data-index="1"><text>全部({{allCount}})</text></view>
|
||||
<view class="{{activeState=='await'?'active':''}}" bindtap="typeJump" data-index="2"><text>进行中({{awaitCount}})</text></view>
|
||||
<view class="{{activeState=='finished'?'active':''}}" bindtap="typeJump" data-index="3"><text>已完成({{finishedCount}})</text></view>
|
||||
</view>
|
||||
<view class="inspect_max_scroll">
|
||||
<view class="inspect_for_scroll" 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"><text>{{item.createTime}}</text>
|
||||
<text wx:if="{{item.finishTime==null}}" class="timeline_for_state_1 color_green" style="font-weight: 800;">进行中</text>
|
||||
<text wx:if="{{item.finishTime != null && scope.row.ASSIGNEE_ != null}}" class="timeline_for_state_1">已完成</text>
|
||||
<text wx:if="{{item.finishTime != null && scope.row.ASSIGNEE_ == null}}" class="timeline_for_state_2">已终止</text>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="inspect_list_info">
|
||||
<view class="inspect_list_info_data_prop color_orange">项目名称:{{item.businessKeyName}}</view>
|
||||
<view class="inspect_list_info_data_prop color_blue">审批事项:{{item.procDefName}} {{' v'+item.procDefVersion}}</view>
|
||||
<view class="inspect_list_info_data_prop">流程类别:<text wx:if="{{item.category=='1'}}">程序及质量类</text><text wx:if="{{item.category=='2'}}">安全类</text><text wx:if="{{item.category=='3'}}">认价类</text><text wx:if="{{item.category=='4'}}">图纸类</text><text wx:if="{{item.category=='5'}}">项目管理制度类</text><text wx:if="{{item.category=='6'}}">索赔类</text><text wx:if="{{item.category=='7'}}">特殊事项确认类</text></view>
|
||||
<view class="inspect_list_info_data_prop">当前节点:<text wx:if="{{item.finishTime == null}}">{{item.taskName}}</text>
|
||||
<text wx:if="{{item.finishTime != null}}">流程结束</text>
|
||||
</view>
|
||||
<view class="inspect_list_info_data_prop">处理耗时:{{item.duration}}</view>
|
||||
<view class="inspect_list_info_data_prop" wx:if="{{item.finishTime!=null}}">办结时间:{{item.finishTime}}</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view wx:if="{{listData.length==0}}">
|
||||
<view style="padding-top: 70px;text-align: -webkit-center;">
|
||||
<image src="../../../images/nodata.png" style="width: 130px;height: 105px;"></image>
|
||||
<view style="color: #a5abbb;">暂无数据</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</scroll-view>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
@ -0,0 +1,19 @@
|
|||
/* pageage/project_checking_list/project_checking_list.wxss */
|
||||
.gd_max{
|
||||
padding:10rpx 50rpx 0;
|
||||
}
|
||||
.gd_min{
|
||||
padding: 30rpx 0;
|
||||
text-align: center;
|
||||
}
|
||||
.gd_min image{
|
||||
width: 150rpx;
|
||||
height: 150rpx;
|
||||
}
|
||||
.gd_min view{
|
||||
padding: 10rpx;
|
||||
color: #89a4eb;
|
||||
}
|
||||
.inspect_max_scroll_1 {
|
||||
height: 82vh;
|
||||
}
|
|
@ -37,26 +37,29 @@ Page({
|
|||
//举牌验收
|
||||
checkValue:0,
|
||||
checkPassRate:100,
|
||||
materialSealStatistics:[{ name: "其它", value: 0, prop: 0}]
|
||||
materialSealStatistics:[{ name: "其它", value: 0, prop: 0}],
|
||||
db:0,
|
||||
},
|
||||
|
||||
/**
|
||||
* 生命周期函数--监听页面加载
|
||||
*/
|
||||
onLoad(options) {
|
||||
let that = this;
|
||||
//获取缓存数据
|
||||
wx.getStorage({
|
||||
key: 'userinfo',
|
||||
success:res=>{
|
||||
this.setData({
|
||||
that.setData({
|
||||
loginName:res.data.loginName,
|
||||
nickName:res.data.nickName,
|
||||
projectId:app.globalData.projectId,
|
||||
projectNameArgs:app.globalData.projectName,
|
||||
initData:{text:app.globalData.projectName,id:app.globalData.projectId}
|
||||
})
|
||||
this.selectMenuList(res.data.loginName);
|
||||
this.initPage(app.globalData.projectId)
|
||||
that.selectMenuList(res.data.loginName);
|
||||
that.initPage(app.globalData.projectId);
|
||||
that.awaitTask(res.data.minRoleId,res.data.deptId,res.data.loginName,res.data.userId);
|
||||
}
|
||||
})
|
||||
},
|
||||
|
@ -433,4 +436,28 @@ Page({
|
|||
this.setData({ show: false });
|
||||
},
|
||||
|
||||
//查询当前登录人的代办任务
|
||||
awaitTask(minRoleId,deptId,loginName,userId) {
|
||||
let param = {
|
||||
//"businessKey":this.data.projectId,
|
||||
"nowRole":minRoleId,
|
||||
"nowDept":deptId,
|
||||
"nowUserName":loginName,
|
||||
"nowUser":userId
|
||||
}
|
||||
var that = this;
|
||||
wx.request({
|
||||
url: app.globalData.reqUrl + '/wechat/flowTask/myAwaitFlowTaskListCount',
|
||||
data:param,
|
||||
method: "post",
|
||||
success: function (res) {
|
||||
res = res.data;
|
||||
if(res.code=="200"){
|
||||
that.setData({
|
||||
db:res.data.length
|
||||
})
|
||||
}
|
||||
}
|
||||
})
|
||||
},
|
||||
})
|
|
@ -474,5 +474,6 @@
|
|||
style="width:40rpx; height:40rpx;"
|
||||
/>
|
||||
更多功能
|
||||
<span class="tabNum" wx:if="{{db>0}}">{{db}}</span>
|
||||
</van-tabbar-item>
|
||||
</van-tabbar>
|
||||
|
|
|
@ -36,7 +36,8 @@ Page({
|
|||
specialCheckNumber: 0,//专项检查次数
|
||||
},
|
||||
menuList:[],
|
||||
request:app.globalData.reqUrl
|
||||
request:app.globalData.reqUrl,
|
||||
db:0,
|
||||
},
|
||||
|
||||
//项目切换 返回值
|
||||
|
@ -73,6 +74,7 @@ Page({
|
|||
})
|
||||
that.selectMenuList(res.data.loginName);
|
||||
that.initPage(app.globalData.projectId);
|
||||
that.awaitTask(res.data.minRoleId,res.data.deptId,res.data.loginName,res.data.userId);
|
||||
}
|
||||
})
|
||||
},
|
||||
|
@ -445,5 +447,28 @@ Page({
|
|||
})
|
||||
},
|
||||
|
||||
|
||||
//查询当前登录人的代办任务
|
||||
awaitTask(minRoleId,deptId,loginName,userId) {
|
||||
let param = {
|
||||
//"businessKey":this.data.projectId,
|
||||
"nowRole":minRoleId,
|
||||
"nowDept":deptId,
|
||||
"nowUserName":loginName,
|
||||
"nowUser":userId
|
||||
}
|
||||
var that = this;
|
||||
wx.request({
|
||||
url: app.globalData.reqUrl + '/wechat/flowTask/myAwaitFlowTaskListCount',
|
||||
data:param,
|
||||
method: "post",
|
||||
success: function (res) {
|
||||
res = res.data;
|
||||
if(res.code=="200"){
|
||||
that.setData({
|
||||
db:res.data.length,
|
||||
})
|
||||
}
|
||||
}
|
||||
})
|
||||
},
|
||||
})
|
||||
|
|
|
@ -260,6 +260,7 @@
|
|||
style="width:40rpx; height:40rpx;"
|
||||
/>
|
||||
更多功能
|
||||
<span class="tabNum" wx:if="{{db>0}}">{{db}}</span>
|
||||
</van-tabbar-item>
|
||||
</van-tabbar>
|
||||
|
||||
|
|
|
@ -296,6 +296,7 @@ Page({
|
|||
//加载模板参数
|
||||
loadShow:false,
|
||||
initData:{},
|
||||
db:0,
|
||||
},
|
||||
|
||||
//项目切换 返回值
|
||||
|
@ -401,6 +402,7 @@ Page({
|
|||
projectNameArgs:app.globalData.projectName,
|
||||
initData:{text:app.globalData.projectName,id:app.globalData.projectId}
|
||||
})
|
||||
that.awaitTask(res.data.minRoleId,res.data.deptId,res.data.loginName,res.data.userId);
|
||||
}
|
||||
})
|
||||
//根据id获取组件
|
||||
|
@ -668,7 +670,31 @@ Page({
|
|||
wx.redirectTo({
|
||||
url: '../gongchengliebiao/gongchengliebiao'
|
||||
})
|
||||
}
|
||||
},
|
||||
|
||||
//查询当前登录人的代办任务
|
||||
awaitTask(minRoleId,deptId,loginName,userId) {
|
||||
let param = {
|
||||
//"businessKey":this.data.projectId,
|
||||
"nowRole":minRoleId,
|
||||
"nowDept":deptId,
|
||||
"nowUserName":loginName,
|
||||
"nowUser":userId
|
||||
}
|
||||
var that = this;
|
||||
wx.request({
|
||||
url: app.globalData.reqUrl + '/wechat/flowTask/myAwaitFlowTaskListCount',
|
||||
data:param,
|
||||
method: "post",
|
||||
success: function (res) {
|
||||
res = res.data;
|
||||
if(res.code=="200"){
|
||||
that.setData({
|
||||
db:res.data.length
|
||||
})
|
||||
}
|
||||
}
|
||||
})
|
||||
},
|
||||
})
|
||||
|
||||
|
|
|
@ -231,6 +231,7 @@
|
|||
style="width:40rpx; height:40rpx;"
|
||||
/>
|
||||
更多功能
|
||||
<span class="tabNum" wx:if="{{db>0}}">{{db}}</span>
|
||||
</van-tabbar-item>
|
||||
|
||||
</van-tabbar>
|
||||
|
|
Loading…
Reference in New Issue