zhangzl
/
nsgk_wechat
1
0
Fork 0
Código Incidencias 0 Pull Requests 0 Lanzamientos 0 Wiki Actividad
Explorar el Código

4.4修改

master
yujk hace 3 años
padre
ce39d10569
commit
e49bd03784
Se han modificado 8 ficheros con 312 adiciones y 161 borrados
Dividir vista
Opciones de diferencias
Mostrar estadísticas Descargar archivo de parche Descargar archivo de diferencias
  1. +0
    -8
      pages/apply/index.js
  2. +187
    -3
      pages/handle/liist.js
  3. +65
    -118
      pages/handle/liist.wxml
  4. +40
    -0
      pages/handle/liist.wxss
  5. +5
    -15
      pages/index/index.js
  6. +9
    -11
      pages/index/index.wxml
  7. +6
    -1
      pages/index/index.wxss
  8. +0
    -5
      utils/API.js

+ 0
- 8
pages/apply/index.js Ver fichero

@@ -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
},

/**


+ 187
- 3
pages/handle/liist.js Ver fichero

@@ -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
})
},

/**
* 生命周期函数--监听页面初次渲染完成
*/


+ 65
- 118
pages/handle/liist.wxml Ver fichero

@@ -1,164 +1,111 @@
<!--pages/handle/liist.wxml-->
<view class="ns" style="height:{{isIPX?'88px':'64px'}};">
<image src="../../image/apply/back.png" style="top:{{isIPX?'54px':'30px'}};" mode="widthFix" bindtap="back"></image>
<text style="top:{{isIPX?'54px':'30px'}};">支出申请</text>
<text style="top:{{isIPX?'54px':'30px'}};">{{pageTitle}}</text>
</view>
<view class="work_plan">
<view class="menu_item active">待办</view>
<view class="menu_item">已办</view>
<view class="work_plan" wx-if="{{active==1||active==2}}" style="margin-top:{{isIPX?'100px':'75px'}};">
<view>
<view class="menu_item {{active==1?'active':''}}" bindtap="switchTab" data-gid='{{1}}'>待办<text class="remind">{{todoNum}}</text></view>
<view class="menu_item {{active==2?'active':''}}" bindtap="switchTab" data-gid='{{2}}'>已办<text class="remind">{{doneNum}}</text></view>
</view>
<!-- <view style="border:1px solid #ddd;background: #fff;border-radius: 30rpx;line-height: 60rpx;padding: 0 25rpx;">
<picker bindchange="bindPickerChange" value="{{index}}" range="{{array}}">
<view class="picker">
{{array[index]}}
<image src="../../image/icon/triangle.png" style="height:25rpx;width:25rpx;margin-right: 10rpx;"></image>
</view>
</picker>
</view> -->
</view>
<scroll-view scroll-y="true" style="height: {{wrokScrollHeight}}px;">
<view class="workflow">
<!--1-->
<view class="workflow_list">
<view class="process_intro">
<view class="name">我的擦撒十大黑科技暗杀可接受的和</view>
<view class="state">待审</view>
<view class="time">2021-1-26</view>
</view>
<view class="process_pay">
<view class="describe">
<image class="amount_icon" src="../../image/index/process_icon.png" mode="aspectFit"></image>
<text>银行转账</text>
</view>
<view class="amount"><text class="unit">￥</text>-2600.00</view>
</view>
</view>
<!--1-->
<view class="workflow_list">
<view class="process_intro">
<view class="name">我的擦撒十大黑科技暗杀可接受的和</view>
<view class="state">待审</view>
<view class="time">2021-1-26</view>
</view>
<view class="process_pay">
<view class="describe">
<image class="amount_icon" src="../../image/index/process_icon.png" mode="aspectFit"></image>
<text>银行转账</text>
</view>
<view class="amount"><text class="unit">￥</text>-2600.00</view>
</view>
</view>
<!--1-->
<view class="workflow_list">
<view class="process_intro">
<view class="name">我的擦撒十大黑科技暗杀可接受的和</view>
<view class="state">待审</view>
<view class="time">2021-1-26</view>
</view>
<view class="process_pay">
<view class="describe">
<image class="amount_icon" src="../../image/index/process_icon.png" mode="aspectFit"></image>
<text>银行转账</text>
</view>
<view class="amount"><text class="unit">￥</text>-2600.00</view>
</view>
</view>
<!--1-->
<view class="workflow_list">
<view class="process_intro">
<view class="name">我的擦撒十大黑科技暗杀可接受的和</view>
<view class="state">待审</view>
<view class="time">2021-1-26</view>
</view>
<view class="process_pay">
<view class="describe">
<image class="amount_icon" src="../../image/index/process_icon.png" mode="aspectFit"></image>
<text>银行转账</text>
</view>
<view class="amount"><text class="unit">￥</text>-2600.00</view>
</view>
</view>
<!--1-->
<view class="workflow_list">
<view class="process_intro">
<view class="name">我的擦撒十大黑科技暗杀可接受的和</view>
<view class="state">待审</view>
<view class="time">2021-1-26</view>
</view>
<view class="process_pay">
<view class="describe">
<image class="amount_icon" src="../../image/index/process_icon.png" mode="aspectFit"></image>
<text>银行转账</text>
</view>
<view class="amount"><text class="unit">￥</text>-2600.00</view>
</view>
</view>
<!--1-->
<view class="workflow_list">
<view class="process_intro">
<view class="name">我的擦撒十大黑科技暗杀可接受的和</view>
<view class="state">待审</view>
<view class="time">2021-1-26</view>
</view>
<view class="process_pay">
<view class="describe">
<image class="amount_icon" src="../../image/index/process_icon.png" mode="aspectFit"></image>
<text>银行转账</text>
</view>
<view class="amount"><text class="unit">￥</text>-2600.00</view>
</view>
</view>
<view class="work_plan" wx-if="{{active==3||active==4}}" style="margin-top:{{isIPX?'100px':'75px'}};">
<view>
<view class="menu_item {{active==3?'active':''}}" bindtap="switchTab" data-gid='{{3}}'>发起<text class="remind">{{yfqNum}}</text></view>
<view class="menu_item {{active==4?'active':''}}" bindtap="switchTab" data-gid='{{4}}'>制单<text class="remind">{{yzdNum}}</text></view>
</view>
<!-- <view style="border:1px solid #ddd;background: #fff;border-radius: 30rpx;line-height: 60rpx;padding: 0 25rpx;">
<picker bindchange="bindPickerChange" value="{{index}}" range="{{array}}">
<view class="picker">
{{array[index]}}
<image src="../../image/icon/triangle.png" style="height:25rpx;width:25rpx;margin-right: 10rpx;"></image>
</view>
</picker>
</view> -->
</view>
<scroll-view scroll-y="true" wx-if="{{active==1}}" style="height: {{wrokScrollHeight}}px;">
<view class="workflow" wx:if="{{active=='1'}}" wx:for-item="item" wx:for="{{todoList}}" wx:key="id">
<!--1-->
<view class="workflow_list">
<view class="process_intro">
<view class="name">我的擦撒十大黑科技暗杀可接受的和</view>
<view class="state">待审</view>
<view class="time">2021-1-26</view>
<view class="name">{{item.formData.payer}}</view>
<!-- <view class="state">待审</view> -->
<view class="time">{{item.formData.applyDate}}</view>
</view>
<view class="process_pay">
<view class="describe">
<image class="amount_icon" src="../../image/index/process_icon.png" mode="aspectFit"></image>
<text>银行转账</text>
<text class="textLimit">{{item.formData.remark}}</text>
</view>
<view class="amount"><text class="unit">￥</text>-2600.00</view>
<view class="amount"><text class="unit">￥</text>{{item.formData.expenditureAmount}}</view>
</view>
</view>
</view>
</scroll-view>
<scroll-view scroll-y="true" wx-if="{{active==2}}" style="height: {{wrokScrollHeight}}px;">
<view class="workflow" wx:if="{{active=='2'}}" wx:for-item="item" wx:for="{{doneList}}" wx:key="id">
<!--1-->
<view class="workflow_list">
<view class="process_intro">
<view class="name">我的擦撒十大黑科技暗杀可接受的和</view>
<view class="state">待审</view>
<view class="time">2021-1-26</view>
<view class="name">{{item.formData.payer}}</view>
<!-- <view class="state">已审</view> -->
<view class="time">{{item.formData.applyDate}}</view>
</view>
<view class="process_pay">
<view class="describe">
<image class="amount_icon" src="../../image/index/process_icon.png" mode="aspectFit"></image>
<text>银行转账</text>
<text class="textLimit">{{item.formData.remark}}</text>
</view>
<view class="amount"><text class="unit">￥</text>-2600.00</view>
<view class="amount"><text class="unit">￥</text>{{item.formData.expenditureAmount}}</view>
</view>
</view>
</view>
</scroll-view>
<scroll-view scroll-y="true" wx-if="{{active==3}}" style="height: {{wrokScrollHeight}}px;">
<view class="workflow" wx:if="{{active=='3'}}" wx:for-item="item" wx:for="{{yfqList}}" wx:key="id">
<!--1-->
<view class="workflow_list">
<view class="process_intro">
<view class="name">我的擦撒十大黑科技暗杀可接受的和</view>
<view class="state">待审</view>
<view class="time">2021-1-26</view>
<view class="name">{{item.payer}}</view>
<!-- <view class="state">已发起</view> -->
<view class="time">{{item.applyDate}}</view>
</view>
<view class="process_pay">
<view class="describe">
<image class="amount_icon" src="../../image/index/process_icon.png" mode="aspectFit"></image>
<text>银行转账</text>
<text class="textLimit">{{item.remark}}</text>
</view>
<view class="amount"><text class="unit">￥</text>-2600.00</view>
<view class="amount"><text class="unit">￥</text>{{item.expenditureAmount}}</view>
</view>
</view>
</view>
</scroll-view>
<scroll-view scroll-y="true" wx-if="{{active==4}}" style="height: {{wrokScrollHeight}}px;">
<view class="workflow" wx:if="{{active=='4'}}" wx:for-item="item" wx:for="{{yzdList}}" wx:key="id">
<!--1-->
<view class="workflow_list">
<view class="process_intro">
<view class="name">我的擦撒十大黑科技暗杀可接受的和</view>
<view class="state">待审</view>
<view class="time">2021-1-26</view>
<view class="name">{{item.payer}}</view>
<!-- <view class="state">已制单</view> -->
<view class="time">{{item.applyDate}}</view>
</view>
<view class="process_pay">
<view class="describe">
<image class="amount_icon" src="../../image/index/process_icon.png" mode="aspectFit"></image>
<text>银行转账</text>
<text class="textLimit">{{item.remark}}</text>
</view>
<view class="amount"><text class="unit">￥</text>-2600.00</view>
<view class="amount"><text class="unit">￥</text>{{item.expenditureAmount}}</view>
</view>
</view>
</view>
</scroll-view>
</scroll-view>

+ 40
- 0
pages/handle/liist.wxss Ver fichero

@@ -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;
}

+ 5
- 15
pages/index/index.js Ver fichero

@@ -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;


+ 9
- 11
pages/index/index.wxml Ver fichero

@@ -87,7 +87,7 @@
<view class="menu_item {{active==2?'active':''}}" bindtap="switchTab" data-gid='{{2}}'>已办<text class="remind">{{doneNum}}</text></view>
<view class="menu_item {{active==3?'active':''}}" bindtap="switchTab" data-gid='{{3}}'>已发起<text class="remind">{{yfqNum}}</text></view>
<view class="menu_item {{active==4?'active':''}}" bindtap="switchTab" data-gid='{{4}}'>已制单<text class="remind">{{yzdNum}}</text></view>
<view class="more">></view>
<view class="more" bindtap="toList">></view>
</view>

<scroll-view scroll-y="true" style="height: {{wrokScrollHeight}}px;" >
@@ -96,13 +96,13 @@
<view class="workflow_list">
<view class="process_intro">
<view class="name">{{item.formData.payer}}</view>
<view class="state">待审</view>
<!-- <view class="state">待审</view> -->
<view class="time">{{item.formData.applyDate}}</view>
</view>
<view class="process_pay">
<view class="describe">
<image class="amount_icon" src="../../image/index/process_icon.png" mode="aspectFit"></image>
<text>{{item.formData.transferType}}</text>
<text class="textLimit">{{item.formData.remark}}</text>
</view>
<view class="amount"><text class="unit">￥</text>{{item.formData.expenditureAmount}}</view>
</view>
@@ -113,13 +113,13 @@
<view class="workflow_list">
<view class="process_intro">
<view class="name">{{item.formData.payer}}</view>
<view class="state">已审</view>
<!-- <view class="state">已审</view> -->
<view class="time">{{item.formData.applyDate}}</view>
</view>
<view class="process_pay">
<view class="describe">
<image class="amount_icon" src="../../image/index/process_icon.png" mode="aspectFit"></image>
<text>银行转账</text>
<text class="textLimit">{{item.formData.remark}}</text>
</view>
<view class="amount"><text class="unit">￥</text>{{item.formData.expenditureAmount}}</view>
</view>
@@ -130,13 +130,13 @@
<view class="workflow_list">
<view class="process_intro">
<view class="name">{{item.payer}}</view>
<view class="state">已发起</view>
<!-- <view class="state">已发起</view> -->
<view class="time">{{item.applyDate}}</view>
</view>
<view class="process_pay">
<view class="describe">
<image class="amount_icon" src="../../image/index/process_icon.png" mode="aspectFit"></image>
<text>村账户转账</text>
<text class="textLimit">{{item.remark}}</text>
</view>
<view class="amount"><text class="unit">￥</text>{{item.expenditureAmount}}</view>
</view>
@@ -147,19 +147,17 @@
<view class="workflow_list">
<view class="process_intro">
<view class="name">{{item.payer}}</view>
<view class="state">已制单</view>
<!-- <view class="state">已制单</view> -->
<view class="time">{{item.applyDate}}</view>
</view>
<view class="process_pay">
<view class="describe">
<image class="amount_icon" src="../../image/index/process_icon.png" mode="aspectFit"></image>
<text>村账户转账</text>
<text class="textLimit">{{item.remark}}</text>
</view>
<view class="amount"><text class="unit">￥</text>{{item.expenditureAmount}}</view>
</view>
</view>
</view>
</scroll-view>


</view>

+ 6
- 1
pages/index/index.wxss Ver fichero

@@ -297,4 +297,9 @@
<view class="describe">银行转账</view>
<view class="amount">￥-2600.00</view>
</view>
</view> */
</view> */
.textLimit{
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}

+ 0
- 5
utils/API.js Ver fichero

@@ -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
}

Escribir Vista previa
Cargando…
Cancelar
Guardar