diff --git a/pages/apply/index.js b/pages/apply/index.js
index 3fc4662..6bb5390 100644
--- a/pages/apply/index.js
+++ b/pages/apply/index.js
@@ -7,13 +7,9 @@ Page({
*/
data: {
isIPX: app.globalData.isIPX,
-<<<<<<< Updated upstream
- show:false
-=======
show:false,
accountList:[],
bookName:''
->>>>>>> Stashed changes
},
/**
@@ -71,9 +67,6 @@ swichPaymentApply:function(e){
* 生命周期函数--监听页面显示
*/
onShow: function () {
-<<<<<<< Updated upstream
-
-=======
var that = this;
var sendData = {
pageNum:'1',
@@ -108,7 +101,6 @@ swichPaymentApply:function(e){
})
}
})
->>>>>>> Stashed changes
},
/**
diff --git a/pages/handle/liist.js b/pages/handle/liist.js
index b4e3853..b4ab90d 100644
--- a/pages/handle/liist.js
+++ b/pages/handle/liist.js
@@ -1,20 +1,204 @@
// pages/handle/liist.js
+import * as UTIL from '../../utils/util.js';
+import * as API from '../../utils/API.js';
Page({
/**
* 页面的初始数据
*/
data: {
-
+ active:"",
+ pageTitle:"",
+ // 待办列表
+ todoList:[],
+ // 已办列表
+ doneList:[],
+ // 已发起
+ yfqList:[],
+ // 已制单
+ yzdList:[],
+ //待办数量
+ todoNum:0,
+ //已办数量
+ doneNum:0,
+ //已发起数量
+ yfqNum:0,
+ //已制单数量
+ yzdNum:0,
+ index:0,
+ array:["未提交","待审核","已审核","已挂起"],
+ //字典
+ transferType:[
+ {"dictVale":1,"dictLabel":"村账户转账"},
+ {"dictVale":2,"dictLabel":"公务卡转账"},
+ {"dictVale":3,"dictLabel":"虚拟挂账"},
+ {"dictVale":4,"dictLabel":"代管账户转账"},
+ {"dictVale":5,"dictLabel":"母子转账"},
+ {"dictVale":10,"dictLabel":"现金提现"},
+ {"dictVale":11,"dictLabel":"现金使用"},
+ {"dictVale":12,"dictLabel":"汇票支出"}
+ ]
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
-
+ this.setData({active:options.active})
+ if(options.active==1||options.active==2){
+ this.setData({pageTitle:"待办/已办"})
+ }else{
+ this.setData({pageTitle:"发起/制单"})
+ }
+ //查询待办
+ this.getTaskList();
+ //查询已办
+ this.getTaskDoneList();
+ //查询已发起
+ this.getTransferList();
+ this.getTransferList1();
+ //查询已制单
+ this.getTransferList2();
+ },
+ bindPickerChange:function(e){zhibob
+ this.setData({index:e.detail.value});
+ },
+ switchTab:function(e){
+ this.setData({
+ active:e.currentTarget.dataset.gid
+ })
+},
+ dictTranslate(d,value){
+ let val = ""
+ for(var index in d){
+ if(d[index].dictVale==value){
+ return val = d[index].dictLabel
+ }
+ }
+},
+ getTaskList:function(e){
+ let data = {
+ pageNum:1,
+ pageSize:10,
+ orderByColumn:"A.ID_",
+ isAsc:"desc",
+ systemType:4,
+ method:"GET"
+ }
+ 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})
+ }
+ }, fail: (res) => {
+ console.log(res);
+ },
+ complete: (res) => {
+ console.log(res);
+ }
+ })
+ },
+ getTaskDoneList:function(e){
+ let data = {
+ pageNum:1,
+ pageSize:10,
+ orderByColumn:"A.ID_",
+ isAsc:"desc",
+ systemType:4,
+ method:"GET"
+ }
+ 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})
+ }
+ }, fail: (res) => {
+ console.log(res);
+ },
+ complete: (res) => {
+ console.log(res);
+ }
+ })
+ },
+ getTransferList:function(e){
+ let data = {
+ // pageNum:1,
+ // pageSize:10,
+ transferType:"1",
+ auditStatus:"2",
+ method:"GET",
+ capitalExpenditureType:(this.data.index+1)
+ }
+ UTIL.httpRequest(API.URL_GET_TRANSFERLIST,data, {
+ success: (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})
+ }
+ }, fail: (res) => {
+ console.log(res);
+ },
+ complete: (res) => {
+ console.log(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) => {
+ if (res.code == API.SUCCESS_CODE) {
+ console.log();
+ let a = this.data.yfqNum+res.total
+ this.setData({yfqNum:a})
+ this.setData({yfqList:res.rows})
+ }
+ }, fail: (res) => {
+ console.log(res);
+ },
+ complete: (res) => {
+ console.log(res);
+ }
+ })
+ },
+ //已制单
+ getTransferList2:function(e){
+ let data = {
+ // pageNum:1,
+ // pageSize:10,
+ transferType:"1",
+ auditStatus:"0",
+ method:"GET"
+ }
+ UTIL.httpRequest(API.URL_GET_TRANSFERLIST,data, {
+ success: (res) => {
+ if (res.code == API.SUCCESS_CODE) {
+ this.setData({yzdNum:res.total})
+ this.setData({yzdList:res.rows})
+ }
+ }, fail: (res) => {
+ console.log(res);
+ },
+ complete: (res) => {
+ console.log(res);
+ }
+ })
+ },
+ back:function(){
+ wx.navigateBack({
+ delta: 1
+ })
},
-
/**
* 生命周期函数--监听页面初次渲染完成
*/
diff --git a/pages/handle/liist.wxml b/pages/handle/liist.wxml
index 9adbb04..89d3478 100644
--- a/pages/handle/liist.wxml
+++ b/pages/handle/liist.wxml
@@ -1,164 +1,111 @@
- 支出申请
+ {{pageTitle}}
-
-
-
+
+
+
+
+
+
-
-
-
-
-
- 我的擦撒十大黑科技暗杀可接受的和
- 待审
- 2021-1-26
-
-
-
-
- 银行转账
-
- ￥-2600.00
-
-
-
-
-
- 我的擦撒十大黑科技暗杀可接受的和
- 待审
- 2021-1-26
-
-
-
-
- 银行转账
-
- ￥-2600.00
-
-
-
-
-
- 我的擦撒十大黑科技暗杀可接受的和
- 待审
- 2021-1-26
-
-
-
-
- 银行转账
-
- ￥-2600.00
-
-
-
-
-
- 我的擦撒十大黑科技暗杀可接受的和
- 待审
- 2021-1-26
-
-
-
-
- 银行转账
-
- ￥-2600.00
-
-
-
-
-
- 我的擦撒十大黑科技暗杀可接受的和
- 待审
- 2021-1-26
-
-
-
-
- 银行转账
-
- ￥-2600.00
-
-
-
-
-
- 我的擦撒十大黑科技暗杀可接受的和
- 待审
- 2021-1-26
-
-
-
-
- 银行转账
-
- ￥-2600.00
-
-
+
+
+
+
+
+
+
+
+
- 我的擦撒十大黑科技暗杀可接受的和
- 待审
- 2021-1-26
+ {{item.formData.payer}}
+
+ {{item.formData.applyDate}}
- 银行转账
+ {{item.formData.remark}}
- ￥-2600.00
+ ￥{{item.formData.expenditureAmount}}
+
+
+
+
+
- 我的擦撒十大黑科技暗杀可接受的和
- 待审
- 2021-1-26
+ {{item.formData.payer}}
+
+ {{item.formData.applyDate}}
- 银行转账
+ {{item.formData.remark}}
- ￥-2600.00
+ ￥{{item.formData.expenditureAmount}}
+
+
+
+
- 我的擦撒十大黑科技暗杀可接受的和
- 待审
- 2021-1-26
+ {{item.payer}}
+
+ {{item.applyDate}}
- 银行转账
+ {{item.remark}}
- ￥-2600.00
+ ￥{{item.expenditureAmount}}
+
+
+
+
+
- 我的擦撒十大黑科技暗杀可接受的和
- 待审
- 2021-1-26
+ {{item.payer}}
+
+ {{item.applyDate}}
- 银行转账
+ {{item.remark}}
- ￥-2600.00
+ ￥{{item.expenditureAmount}}
-
-
+
diff --git a/pages/handle/liist.wxss b/pages/handle/liist.wxss
index 75a80f1..d794c21 100644
--- a/pages/handle/liist.wxss
+++ b/pages/handle/liist.wxss
@@ -112,4 +112,44 @@
}
.workflow .workflow_list .process_pay .amount .unit{
font-size: 26rpx;
+}
+.work_plan{
+ padding: 40rpx 32.5rpx 30rpx;
+ display: flex;
+ justify-content:space-between
+}
+.work_plan .menu_item{
+ height: 60rpx;
+ width: 180rpx;
+ background-color: #fff;
+ box-shadow: 0rpx 0rpx 9rpx rgba(0,0,0,.2);
+ border-radius: 60rpx;
+ line-height: 60rpx;
+ text-align: center;
+ font-size: 32rpx;
+ position: relative;
+ margin-right: 16rpx;
+ padding:0 10rpx;
+ display: inline-block;
+}
+.work_plan .menu_item.active{
+ background-color: #5bae78;
+ color: #fff;
+}
+.remind{
+ height: 30rpx;
+ background: #e90101;
+ color: #fff;
+ font-size: 26rpx;
+ position: absolute;
+ line-height: 30rpx;
+ padding:0 10rpx;
+ border-radius: 50%;
+ top: -10rpx;
+ right: -10rpx;
+}
+.textLimit{
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
}
\ No newline at end of file
diff --git a/pages/index/index.js b/pages/index/index.js
index 78ba164..ca60a8d 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -215,21 +215,11 @@ swichPayment:function(e){
url: '/pages/apply/index?',
})
},
- //跳转个人设置
- swichSettle:function(e){
- // console.log(e.currentTarget.dataset.current);
- // let cur = e.currentTarget.dataset.current;
- // if (this.data.currentTaB == cur) {
- // return false;
- // }else{
- // wx.navigateTo({
- // url: '../inCome/index?id=' + id,
- // })
- // }
- wx.navigateTo({
- url: 'settle/index?',
- })
- },
+ toList:function(){
+ wx.navigateTo({
+ url: '/pages/handle/liist?active='+this.data.active,
+ })
+ },
/* 计算bar 高度*/
computeBarLocation() {
var that = this;
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index e490628..67a8c2a 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -87,7 +87,7 @@
- >
+ >
@@ -96,13 +96,13 @@
{{item.formData.payer}}
- 待审
+
{{item.formData.applyDate}}
- {{item.formData.transferType}}
+ {{item.formData.remark}}
￥{{item.formData.expenditureAmount}}
@@ -113,13 +113,13 @@
{{item.formData.payer}}
- 已审
+
{{item.formData.applyDate}}
- 银行转账
+ {{item.formData.remark}}
￥{{item.formData.expenditureAmount}}
@@ -130,13 +130,13 @@
{{item.payer}}
- 已发起
+
{{item.applyDate}}
- 村账户转账
+ {{item.remark}}
￥{{item.expenditureAmount}}
@@ -147,19 +147,17 @@
{{item.payer}}
- 已制单
+
{{item.applyDate}}
- 村账户转账
+ {{item.remark}}
￥{{item.expenditureAmount}}
-
-
\ No newline at end of file
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index 7d6da98..937187f 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -297,4 +297,9 @@
银行转账
￥-2600.00
- */
\ No newline at end of file
+ */
+ .textLimit{
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ }
\ No newline at end of file
diff --git a/utils/API.js b/utils/API.js
index 89f2f97..089872d 100644
--- a/utils/API.js
+++ b/utils/API.js
@@ -47,7 +47,6 @@ const URL_POST_UPLOADFILE = `${URL_PREFIX}/system/user/profile/electronicSignatu
const URL_POST_USEREDIT = `${URL_PREFIX}/system/user/edit`;
//当前账套付款账户列表
const URL_GET_ACCOUNTLIST = `${URL_PREFIX}/cashier/account/list`;
-
//查看事项审批模板列表
const URL_GET_APPROVALITEMSLIST = `${URL_PREFIX}/yinnong/approvalItems/list`;
@@ -68,16 +67,12 @@ export {
URL_POST_DECRYPTEDWXDATA,
URL_POST_USERBAND,
URL_GET_GETINFO,
-<<<<<<< Updated upstream
URL_GET_TASKLIST,
URL_GET_TASKDONELIST,
URL_GET_TRANSFERLIST,
URL_POST_UPDATEPWD,
URL_POST_UPLOADFILE,
URL_POST_USEREDIT,
- URL_GET_ACCOUNTLIST
-=======
URL_GET_ACCOUNTLIST,
URL_GET_APPROVALITEMSLIST
->>>>>>> Stashed changes
}
\ No newline at end of file