diff --git a/env/env.js b/env/env.js
index 67cd1c7..45a8b43 100644
--- a/env/env.js
+++ b/env/env.js
@@ -1,18 +1,18 @@
module.exports = {
DEV: {
- URL_PREFIX: 'http://192.168.31.178/api',
- // URL_PREFIX: 'https://dazu.nongshen.net/api',
+ // URL_PREFIX: 'http://192.168.31.178/api',
+ URL_PREFIX: 'https://dazu.nongshen.net/api',
},
PRE: {
- URL_PREFIX: 'http://192.168.31.178:8080/api',
- // URL_PREFIX: 'https://dazu.nongshen.net/api',
+ // URL_PREFIX: 'http://192.168.31.178:8080/api',
+ URL_PREFIX: 'https://dazu.nongshen.net/api',
},
PROD: {
- URL_PREFIX: 'http://192.168.31.178:8080/api',
- // URL_PREFIX: 'https://dazu.nongshen.net/api',
+ // URL_PREFIX: 'http://192.168.31.178:8080/api',
+ URL_PREFIX: 'https://dazu.nongshen.net/api',
},
IMGURL: {
- URL_PREFIX: 'http://192.168.31.178:8080',
- // URL_PREFIX: 'https://dazu.nongshen.net',
+ // URL_PREFIX: 'http://192.168.31.178:8080',
+ URL_PREFIX: 'https://dazu.nongshen.net',
}
}
\ No newline at end of file
diff --git a/miniprogram_npm/@vant/weapp/empty/index.wxss b/miniprogram_npm/@vant/weapp/empty/index.wxss
index 0fb74fe..56607a5 100644
--- a/miniprogram_npm/@vant/weapp/empty/index.wxss
+++ b/miniprogram_npm/@vant/weapp/empty/index.wxss
@@ -1 +1 @@
-@import '../common/index.wxss';.van-empty{align-items:center;box-sizing:border-box;display:flex;flex-direction:column;justify-content:center;padding:32px 0}.van-empty__image{height:160px;width:160px}.van-empty__image:empty{display:none}.van-empty__image__img{height:100%;width:100%}.van-empty__image:not(:empty)+.van-empty__image{display:none}.van-empty__description{color:#969799;font-size:14px;line-height:20px;margin-top:16px;padding:0 60px}.van-empty__description:empty,.van-empty__description:not(:empty)+.van-empty__description{display:none}.van-empty__bottom{margin-top:24px}
\ No newline at end of file
+@import '../common/index.wxss';.van-empty{align-items:center;box-sizing:border-box;display:flex;flex-direction:column;justify-content:center;padding:32px 0}.van-empty__image{height:100px;width:100px}.van-empty__image:empty{display:none}.van-empty__image__img{height:100%;width:100%}.van-empty__image:not(:empty)+.van-empty__image{display:none}.van-empty__description{color:#969799;font-size:14px;line-height:20px;margin-top:16px;padding:0 60px}.van-empty__description:empty,.van-empty__description:not(:empty)+.van-empty__description{display:none}.van-empty__bottom{margin-top:24px}
\ No newline at end of file
diff --git a/pages/apply/index.js b/pages/apply/index.js
index 520c6d5..fc860c0 100644
--- a/pages/apply/index.js
+++ b/pages/apply/index.js
@@ -77,7 +77,8 @@ swichPaymentApply:function(e){
accountName:'',
bankAccountNumber:'',
status:'N',
- method:'GET'
+ method:'GET',
+ accountType:102
}
UTIL.httpRequest(API.URL_GET_GETINFO, {method:'GET'}, {
success: (res) => {
diff --git a/pages/apply/paymentTemplate/add/add.js b/pages/apply/paymentTemplate/add/add.js
index 0a857b7..cb1c535 100644
--- a/pages/apply/paymentTemplate/add/add.js
+++ b/pages/apply/paymentTemplate/add/add.js
@@ -761,9 +761,42 @@ Page({
url: '/pages/apply/approval/approval?id='+res.data.approvalItemTemplate.id+'&deptId='+res.data.approvalItemTemplate.deptId,
})
}
- if(e.currentTarget.dataset.type != 0){
- UTIL.showToastNoneIcon('操作成功！');
- that.back();
+ // if(e.currentTarget.dataset.type != 0){
+ // wx.showToast({
+ // title: '保存成功',
+ // icon: 'success',
+ // duration: 2000,
+ // complete(){
+ // setTimeout(function(){
+ // that.back();
+ // },2000)
+ // }
+ // })
+ // }
+ if(e.currentTarget.dataset.type == 3){
+ UTIL.httpRequest(API.URL_GET_TOREVIEWSUBMIT+res.data.approvalItemTemplate.id , {method:'POST'}, {
+ success: (res2) => {
+ if (res2.code == API.SUCCESS_CODE) {
+ wx.showToast({
+ title: '操作成功',
+ icon: 'success',
+ duration: 2000,
+ complete(){
+ setTimeout(function(){
+ that.back();
+ },2000)
+ }
+ })
+ }else{
+ wx.showToast({
+ title: '操作失败',
+ icon: 'success',
+ duration: 2000
+ })
+ }
+ }
+ })
+
}
}
}
@@ -932,6 +965,10 @@ Page({
that.back()
}
},
+ goSubmitUp(e){
+ var that = this ;
+
+ },
/**
* 生命周期函数--监听页面隐藏
*/
diff --git a/pages/handle/expenditureAudit/expenditureAudit.js b/pages/handle/expenditureAudit/expenditureAudit.js
index 83de29e..cde34cb 100644
--- a/pages/handle/expenditureAudit/expenditureAudit.js
+++ b/pages/handle/expenditureAudit/expenditureAudit.js
@@ -15,7 +15,9 @@ Page({
data: {
isIPX: app.globalData.isIPX,
active:0,
- spsxOptions:[]
+ spsxOptions:[],
+ nickName:app.globalData.user,
+ comment:''
},
/**
@@ -25,7 +27,8 @@ Page({
var that = this;
console.log(options);
that.setData({
- taskId:options.taskId
+ taskId:options.taskId,
+ pageType:options.type
})
UTIL.httpRequest(API.URL_GET_GETINFO, {method:'GET'}, {
success: (res) => {
@@ -35,6 +38,7 @@ Page({
["form.approvalItemTemplate.submitDate"]:UTIL.js_date_time(new Date()),
["form.approvalItemTemplate.submitter"]:res.user.nickName,
["form.approvalItemTemplate.telephone"]:res.user.phonenumber,
+ nickName:res.user.nickName
})
}
@@ -244,11 +248,12 @@ Page({
},
goDis(){
var that = this ;
+ console.log()
let data = {
taskId:that.data.taskId,
instanceId:that.data.instanceId,
variables:JSON.stringify({
- comment:'驳回',
+ comment:that.data.comment == '' ? '驳回':that.data.comment,
pass:false,
}),
method:'POST'
@@ -256,9 +261,25 @@ Page({
UTIL.httpRequest(API.URL_GET_PROCESSCOMPLETE , data, {
success: (res) => {
console.log(res);
- // that.setData({
- // spsxOptions:res.data.processSchedule.spsx
- // })
+ if (res.code == API.SUCCESS_CODE) {
+ wx.showToast({
+ title: '审批成功',
+ icon: 'success',
+ duration: 2000,
+ complete(){
+ setTimeout(function(){
+ that.back();
+ },2000)
+ }
+ })
+ }else{
+ wx.showToast({
+ title: '操作失败',
+ icon: 'error',
+ duration: 2000
+ })
+ }
+
}
})
},
@@ -268,19 +289,42 @@ Page({
taskId:that.data.taskId,
instanceId:that.data.instanceId,
variables:JSON.stringify({
- "comment":'同意',
+ "comment":that.data.comment == '' ? '同意':that.data.comment,
"pass":true,
- })
+ }),
+ method:'POST'
};
UTIL.httpRequest(API.URL_GET_PROCESSCOMPLETE ,data, {
success: (res) => {
console.log(res);
- // that.setData({
- // spsxOptions:res.data.processSchedule.spsx
- // })
+ if (res.code == API.SUCCESS_CODE) {
+ wx.showToast({
+ title: '审批成功',
+ icon: 'success',
+ duration: 2000,
+ complete(){
+ setTimeout(function(){
+ that.back();
+ },2000)
+ }
+ })
+ }else{
+ wx.showToast({
+ title: '操作失败',
+ icon: 'error',
+ duration: 2000
+ })
+ }
}
})
},
+ commentInput(e){
+ console.log(e);
+ var that = this;
+ that.setData({
+ comment:e.detail.value
+ })
+ },
/**
* 生命周期函数--监听页面初次渲染完成
*/
diff --git a/pages/handle/expenditureAudit/expenditureAudit.wxml b/pages/handle/expenditureAudit/expenditureAudit.wxml
index 8261f29..f237677 100644
--- a/pages/handle/expenditureAudit/expenditureAudit.wxml
+++ b/pages/handle/expenditureAudit/expenditureAudit.wxml
@@ -6,7 +6,7 @@
审批事项
-
+
提交单位：{{form.approvalItemTemplate.submitCompany}}
提交日期：{{form.approvalItemTemplate.submitDate}}
提 交 人：{{form.approvalItemTemplate.submitter}}
@@ -166,7 +166,7 @@
审批流程
- {{index+1}}
+ {{index+1}}
@@ -183,25 +183,43 @@
-
-
- {{ item.comment }}
- {{ item.comment }}
- {{ item.comment }}
+
+
+
+ {{item.assigneeName}}
+ {{item.deptLabel}}
+
+ 同意
+ 审核中
+ 驳回
-
-
- {{ item.durationInMillis }}
+
+
+
+
+
+
+
+ {{ item.comment }}
- {{ item.time.substr(0,10) }}
+ {{ sub.times(item.time) }}
+
-
+
+
+
+ var times = function(time){
+ console.log(time)
+ return time.substring(0,10);
+ }
+ module.exports.times = times;
+
\ No newline at end of file
diff --git a/pages/handle/expenditureAudit/expenditureAudit.wxss b/pages/handle/expenditureAudit/expenditureAudit.wxss
index 35d03a4..d049cb1 100644
--- a/pages/handle/expenditureAudit/expenditureAudit.wxss
+++ b/pages/handle/expenditureAudit/expenditureAudit.wxss
@@ -203,7 +203,7 @@ text{display: block;}
.steps-box .van-col{
position: relative;
- height: 70px;
+ height: 90px;
}
.steps-box .van-col--21{
padding: 12PX 0;
@@ -223,7 +223,7 @@ text{display: block;}
border-radius: 5PX;
}
.steps-box .index{
- background: #1D6FE9;
+ background: #C9C9C9;
color: #ffffff;
text-align: center;
width: 20PX;
@@ -235,6 +235,10 @@ text{display: block;}
top: 50%;
transform: translate(0,-50%);
}
+ .steps-box .active{
+ background: #2C8E68;
+ }
+
.steps-box .indexCenter{
top: 0!important;
}
@@ -337,4 +341,16 @@ text{display: block;}
.img_box{
position: relative;
width: 100%;
+ }
+ .cellTit{
+ display: flex;
+ justify-content: space-between;
+ }
+ .cellTit text{
+ width: 50%;
+ display: -webkit-box;
+ -webkit-box-orient: vertical;
+ -webkit-line-clamp: 1;
+ word-break: break-all;
+ overflow: hidden;
}
\ No newline at end of file
diff --git a/pages/handle/liist.js b/pages/handle/liist.js
index 9844319..82a22ea 100644
--- a/pages/handle/liist.js
+++ b/pages/handle/liist.js
@@ -8,6 +8,7 @@ Page({
* 页面的初始数据
*/
data: {
+ isIPX: app.globalData.isIPX,
active:"",
pageTitle:"",
// 待办列表
@@ -100,19 +101,25 @@ Page({
orderByColumn:"A.ID_",
isAsc:"desc",
systemType:4,
- method:"GET"
+ method:"GET",
+ taskName:'相关人员审批'
}
UTIL.httpRequest(API.URL_GET_TASKLIST,data, {
success: (res) => {
if (res.code == API.SUCCESS_CODE) {
this.setData({todoNum:res.total})
- this.setData({todoList:res.rows})
+ if(res.rows!=null&&res.rows!=""){
+ for(let i = 0;i {
console.log(res);
},
complete: (res) => {
- console.log(res);
}
})
},
@@ -123,19 +130,25 @@ Page({
orderByColumn:"A.ID_",
isAsc:"desc",
systemType:4,
- method:"GET"
+ method:"GET",
+ taskName:'相关人员审批'
}
UTIL.httpRequest(API.URL_GET_TASKDONELIST,data, {
success: (res) => {
if (res.code == API.SUCCESS_CODE) {
this.setData({doneNum:res.total})
- this.setData({doneList:res.rows})
+ if(res.rows!=null&&res.rows!=""){
+ for(var index in res.rows){
+ let d = this.dictTranslate(this.data.transferType,res.rows[index].formData.transferType)
+ res.rows[index].formData.transferType = d
+ }
+ this.setData({doneList:res.rows})
+ }
}
}, fail: (res) => {
console.log(res);
},
complete: (res) => {
- console.log(res);
}
})
},
@@ -146,21 +159,43 @@ Page({
transferType:"1",
status:"5",
method:"GET",
- capitalExpenditureType:(this.data.index+1)
+ applyUserName:this.data.userInfoObj.nickName
}
UTIL.httpRequest(API.URL_GET_TRANSFERLIST,data, {
success: (res) => {
+ console.log(res);
if (res.code == API.SUCCESS_CODE) {
- console.log(res);
let a = this.data.yfqNum+res.total
this.setData({yfqNum:a})
- this.setData({yfqList:res.rows})
+ let b = this.data.yfqList
+ this.setData({yfqList:res.rows.concat(b)})
}
}, fail: (res) => {
- console.log(res);
},
complete: (res) => {
+ }
+ })
+ },
+ getTransferList1:function(e){
+ let data = {
+ // pageNum:1,
+ // pageSize:10,
+ transferType:"1",
+ auditStatus:"3",
+ method:"GET"
+ }
+ UTIL.httpRequest(API.URL_GET_TRANSFERLIST,data, {
+ success: (res) => {
console.log(res);
+ if (res.code == API.SUCCESS_CODE) {
+ let a = this.data.yfqNum+res.total
+ this.setData({yfqNum:a})
+ let b = this.data.yfqList
+ this.setData({yfqList:res.rows.concat(b)})
+ }
+ }, fail: (res) => {
+ },
+ complete: (res) => {
}
})
},
@@ -223,6 +258,16 @@ Page({
url: '/pages/apply/paymentTemplate/add/add?id='+e.currentTarget.dataset.id,
})
},
+ gosee:function(e){
+ wx.navigateTo({
+ url: '/pages/handle/expenditureAudit/expenditureAudit?id='+e.currentTarget.dataset.id+'&taskId='+e.currentTarget.dataset.taskid+'&type='+e.currentTarget.dataset.type,
+ })
+ },
+ goUpdate(e){
+ wx.navigateTo({
+ url: '/pages/apply/paymentTemplate/add/add?id='+e.currentTarget.dataset.id,
+ })
+ },
/**
* 生命周期函数--监听页面初次渲染完成
*/
diff --git a/pages/handle/liist.json b/pages/handle/liist.json
index 8835af0..30f557b 100644
--- a/pages/handle/liist.json
+++ b/pages/handle/liist.json
@@ -1,3 +1,5 @@
{
- "usingComponents": {}
+ "usingComponents": {
+ "van-empty": "@vant/weapp/empty/index"
+ }
}
\ No newline at end of file
diff --git a/pages/handle/liist.wxml b/pages/handle/liist.wxml
index bb92f15..ff7c16d 100644
--- a/pages/handle/liist.wxml
+++ b/pages/handle/liist.wxml
@@ -32,63 +32,67 @@
-->
-
+
- {{item.formData.payer}}
+ {{item.formData.approvalItems}}
- {{item.formData.applyDate}}
+ {{item.formData.applyTime}}
- {{item.formData.remark}}
+ {{item.formData.activityBusinessType=='35'?'现金转账':'银行转账'}}
- ￥{{item.formData.expenditureAmount}}
+ ￥{{item.formData.totalAmount}}
+
-
-
+
- {{item.formData.payer}}
+ {{item.formData.approvalItems}}
- {{item.formData.applyDate}}
+ {{item.formData.applyTime}}
- {{item.formData.remark}}
+ {{item.formData.activityBusinessType=='35'?'现金转账':'银行转账'}}
- ￥{{item.formData.expenditureAmount}}
+ ￥{{item.formData.totalAmount}}
+
-
+
- {{item.payer}}
-
- {{item.applyDate}}
+
+ {{item.submitter}}
+ {{item.status == '1'?'审核中':item.status == '2'?'已拒绝':item.status == '3'?'已通过':''}}
+
+
+ {{item.submitDate}}
- {{item.remark}}
+ {{item.approvalItems}}
- ￥{{item.expenditureAmount}}
+ ￥{{item.totalAmount}}
+
-
@@ -106,6 +110,7 @@
￥{{item.totalAmount}}
-
+
+
diff --git a/pages/handle/liist.wxss b/pages/handle/liist.wxss
index d794c21..cdf3341 100644
--- a/pages/handle/liist.wxss
+++ b/pages/handle/liist.wxss
@@ -59,13 +59,46 @@
}
.workflow .process_intro .name{
- width: 324rpx;
+ width: 390rpx;
font-size: 34rpx;
margin-right: 30rpx;
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+}
+.workflow .process_intro .name .name_tit{
+ width: 290rpx;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
+.agree{
+ background-color: rgba(92, 174, 119, 0.1);
+ color:#5CAE77 ;
+ text-align: center;
+ float: right;
+ padding: 2px 5px;
+ border-radius: 5px;
+ font-size: 12px;
+}
+.in{
+ background-color: rgba(245, 163, 39, 0.1);
+ color:#F5A327 ;
+ text-align: center;
+ float: right;
+ padding: 2px 5px;
+ border-radius: 5px;
+ font-size: 12px;
+}
+.disagree{
+ background-color: rgba(233, 0, 0, 0.1);
+ color:#E90000 ;
+ text-align: center;
+ float: right;
+ padding: 2px 5px;
+ border-radius: 5px;
+ font-size: 12px;
+}
.workflow .process_intro .state{
width: 93rpx;
height: 42rpx;
diff --git a/pages/index/index.js b/pages/index/index.js
index 96ec31a..658e255 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -59,7 +59,6 @@ Page({
this.getTaskList();
//查询已办
this.getTaskDoneList();
-
//查询dept
this.getTreeDept();
},
@@ -295,8 +294,11 @@ Page({
success: (res) => {
if (res.code == API.SUCCESS_CODE) {
this.setData({provinces:res.data})
- this.setData({citys:res.data[0].children})
- this.setData({areas:res.data[0].children[this.data.value[1]].children})
+ if(res.data[0].children){
+ this.setData({citys:res.data[0].children})
+ if(res.data[0].children[this.data.value[1]].children){this.setData({areas:res.data[0].children[this.data.value[1]].children})}
+ }
+
}
}
})
@@ -473,7 +475,7 @@ Page({
},
gosee:function(e){
wx.navigateTo({
- url: '/pages/handle/expenditureAudit/expenditureAudit?id='+e.currentTarget.dataset.id+'&taskId='+e.currentTarget.dataset.taskid,
+ url: '/pages/handle/expenditureAudit/expenditureAudit?id='+e.currentTarget.dataset.id+'&taskId='+e.currentTarget.dataset.taskid+'&type='+e.currentTarget.dataset.type,
})
},
goUpdate(e){
diff --git a/pages/index/index.json b/pages/index/index.json
index 072cd74..35c4329 100644
--- a/pages/index/index.json
+++ b/pages/index/index.json
@@ -1,7 +1,8 @@
{
"usingComponents": {
"icon-loading":"/component/iconLoading/iconLoading",
- "pop-up": "/component/pop-up/index"
+ "pop-up": "/component/pop-up/index",
+ "van-empty": "@vant/weapp/empty/index"
},
"navigationStyle": "custom"
}
\ No newline at end of file
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 591d2c5..95bc8ab 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -100,7 +100,7 @@
-
+
@@ -117,7 +117,7 @@
-
+
@@ -134,9 +134,9 @@
-
+
-
+
{{item.submitter}}
@@ -171,6 +171,14 @@
+
+
+
+
+
+
+
+
diff --git a/project.private.config.json b/project.private.config.json
index c9b84ca..07b0f87 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -79,5 +79,5 @@
},
"description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
"projectname": "WXMB",
- "libVersion": "2.23.3"
+ "libVersion": "2.23.4"
}
\ No newline at end of file
diff --git a/utils/API.js b/utils/API.js
index 34b7dc6..31ca06a 100644
--- a/utils/API.js
+++ b/utils/API.js
@@ -131,6 +131,11 @@ const URL_GET_GETPROCESS = `${URL_PREFIX}/yinnong/approvalItems/getProcessSchedu
//审批流办理
const URL_GET_PROCESSCOMPLETE = `${URL_PREFIX}/activiti/process/mobileComplete`;
+//复核
+const URL_GET_TOREVIEWSUBMIT = `${URL_PREFIX}/yinnong/approvalItems/toReviewSubmit/`;
+
+
+
/****************接口地址end****************/
export {
@@ -187,5 +192,6 @@ export {
URL_GET_APPROVALITEMS,
URL_GET_REMOVEAPPROVAL,
URL_GET_GETPROCESS,
- URL_GET_PROCESSCOMPLETE
+ URL_GET_PROCESSCOMPLETE,
+ URL_GET_TOREVIEWSUBMIT
}
\ No newline at end of file