diff --git a/app.json b/app.json index 7c639d8..89042b9 100644 --- a/app.json +++ b/app.json @@ -20,7 +20,9 @@ "pages/Bookkeeping/Bookkeeping", "pages/payee/list/list", "pages/drawee/drawee", - "pages/drawee/add/add" + "pages/drawee/add/add", + "pages/Bookkeeping/update/update", + "pages/bank/bank" ], "window": { "backgroundTextStyle": "light", diff --git a/env/env.js b/env/env.js index 4669cb9..f0648cd 100644 --- a/env/env.js +++ b/env/env.js @@ -1,18 +1,29 @@ +// module.exports = { +// DEV: { +// URL_PREFIX: 'http://192.168.31.178/api', +// }, +// PRE: { +// URL_PREFIX: 'http://192.168.31.178:8080/api', +// }, +// PROD: { +// URL_PREFIX: 'http://192.168.31.178:8080/api', +// }, +// IMGURL: { +// URL_PREFIX: 'http://192.168.31.178:8080', +// } +// } + module.exports = { - DEV: { - // 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', - }, - PROD: { - // 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/api', - } - } \ No newline at end of file + DEV: { + URL_PREFIX: 'https://dazu.nongshen.net/api', + }, + PRE: { + URL_PREFIX: 'https://dazu.nongshen.net/api', + }, + PROD: { + URL_PREFIX: 'https://dazu.nongshen.net/api', + }, + IMGURL: { + URL_PREFIX: 'https://dazu.nongshen.net/api', + } +} \ No newline at end of file diff --git a/image/icon/dress.png b/image/icon/dress.png new file mode 100644 index 0000000..3865e74 Binary files /dev/null and b/image/icon/dress.png differ diff --git a/pages/Bookkeeping/Bookkeeping.js b/pages/Bookkeeping/Bookkeeping.js index c222cc1..2cadd7c 100644 --- a/pages/Bookkeeping/Bookkeeping.js +++ b/pages/Bookkeeping/Bookkeeping.js @@ -259,6 +259,31 @@ Page({ } }) }, + goUpdate(event){ + wx.navigateTo({ + url: '/pages/Bookkeeping/update/update?id='+event.currentTarget.dataset.id, + }) + }, + delete(e){ + console.log(e); + var that = this; + UTIL.httpRequest(API.URL_GET_FLOWREMOVE + e.currentTarget.dataset.id, {method:'GET'},{ + success: (res) => { + if (res.code == API.SUCCESS_CODE) { + that.data.flowListSR.splice(e.currentTarget.dataset.index, 1); + wx.showToast({ + title: '删除成功！', + icon: 'success', + duration: 2000 + }) + that.setData({ + flowListSR : that.data.flowListSR, + flowListSRNum:that.data.flowListSRNum-1 + }) + } + } + }) + }, /** * 生命周期函数--监听页面隐藏 */ diff --git a/pages/Bookkeeping/Bookkeeping.json b/pages/Bookkeeping/Bookkeeping.json index 531bfa5..7494ed4 100644 --- a/pages/Bookkeeping/Bookkeeping.json +++ b/pages/Bookkeeping/Bookkeeping.json @@ -6,6 +6,7 @@ "van-checkbox-group": "@vant/weapp/checkbox-group/index", "van-empty": "@vant/weapp/empty/index", "van-popup": "@vant/weapp/popup/index", - "van-picker": "@vant/weapp/picker/index" + "van-picker": "@vant/weapp/picker/index", + "van-swipe-cell": "@vant/weapp/swipe-cell/index" } } \ No newline at end of file diff --git a/pages/Bookkeeping/Bookkeeping.wxml b/pages/Bookkeeping/Bookkeeping.wxml index d093c4f..f861a97 100644 --- a/pages/Bookkeeping/Bookkeeping.wxml +++ b/pages/Bookkeeping/Bookkeeping.wxml @@ -24,28 +24,35 @@ - - - - {{item.accountSummary}} - - - {{item.incomeTypeText}} - - - - 附件{{item.enclosureCount}} - {{item.incomeDate}} - - - - - {{item.checkedStatusText}} - - ￥{{item.jieAmount}} + + + + + {{item.accountSummary}} + + + {{item.incomeTypeText}} + + + + 附件{{item.enclosureCount}} + {{item.accountDate}} + + + + + {{item.checkedStatusText}} + + ￥{{item.jieAmount}} + + + + + + - - + + diff --git a/pages/Bookkeeping/Bookkeeping.wxss b/pages/Bookkeeping/Bookkeeping.wxss index ea57f12..7f2abd3 100644 --- a/pages/Bookkeeping/Bookkeeping.wxss +++ b/pages/Bookkeeping/Bookkeeping.wxss @@ -38,8 +38,13 @@ text{display: block;} font-size: 36rpx; color: #31936c; } -.workflow{ - padding: 10rpx 32.5rpx; +.deleteBox{ + width: 65px; + text-align: center; + height: 100%; + background: #F6F6F6; + align-items: center; + display: flex; } .workflow .workflow_list{ height: 150rpx; @@ -69,17 +74,20 @@ text{display: block;} text-overflow: ellipsis; white-space: nowrap; } -.li{ - display: flex; - justify-content: space-between; +.van-swipe-cell { width: 94%; - margin: 0 auto; background: #fff; - padding: 14px; border-radius: 10px; box-shadow: 2px 5px 5px #ddd; + margin: 0 auto; margin-bottom: 15px; } +.li{ + display: flex; + justify-content: space-between; + width: 100%; + padding: 14px; +} .li view text{ margin-top: 15px; } @@ -98,11 +106,25 @@ text{display: block;} align-items: center; justify-content: center; padding: 3px 8px; - background-color: rgba(233, 0, 0,0.1); border-radius: 5px; - color: #444444; font-size: 14px; } +.no{ + background-color:#fbe3e3; + color: #e90000; +} +.white{ + background-color:#feeadc; + color: #fc9a55; +} +.yes{ + background-color:#ddeee3; + color: #5cae77; +} +.other{ + background-color:#f0f1f6; + color: #878787; +} .li .tit{ font-size: 18px; color: #444444; diff --git a/pages/apply/index.js b/pages/apply/index.js index c5f5288..55abb37 100644 --- a/pages/apply/index.js +++ b/pages/apply/index.js @@ -149,7 +149,7 @@ swichPaymentApply:function(e){ if(res.rows[i].bankAccountNumber==null){continue;} res.rows[i].bankAccountNumber = res.rows[i].bankAccountNumber.replace(/(\d{4})(?=\d)/g, "$1 "); res.rows[i].balance = parseFloat(res.rows[i].balance).toFixed(2); - res.rows[i].bankTypeText = UTIL.getTransform(res.rows[i].bankType,that.data.bankTypeOptions);; + res.rows[i].bankTypeText = UTIL.getTransform(res.rows[i].bankType,that.data.bankTypeOptions); } console.log(res.rows) that.setData({ diff --git a/pages/bank/bank.js b/pages/bank/bank.js new file mode 100644 index 0000000..cf2c588 --- /dev/null +++ b/pages/bank/bank.js @@ -0,0 +1,69 @@ +// pages/bank/bank.js +import * as UTIL from '../../utils/util.js'; +import * as API from '../../utils/API.js'; +const app = getApp(); +Page({ + + /** + * 页面的初始数据 + */ + data: { + isIPX: app.globalData.isIPX, + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + } +}) \ No newline at end of file diff --git a/pages/bank/bank.json b/pages/bank/bank.json new file mode 100644 index 0000000..5cf59cc --- /dev/null +++ b/pages/bank/bank.json @@ -0,0 +1,12 @@ +{ + "usingComponents": { + "van-checkbox": "@vant/weapp/checkbox/index", + "van-checkbox-group": "@vant/weapp/checkbox-group/index", + "van-cell": "@vant/weapp/cell/index", + "van-cell-group": "@vant/weapp/cell-group/index", + "van-search": "@vant/weapp/search/index", + "van-radio": "@vant/weapp/radio/index", + "van-radio-group": "@vant/weapp/radio-group/index", + "van-swipe-cell": "@vant/weapp/swipe-cell/index" + } +} \ No newline at end of file diff --git a/pages/bank/bank.wxml b/pages/bank/bank.wxml new file mode 100644 index 0000000..763522e --- /dev/null +++ b/pages/bank/bank.wxml @@ -0,0 +1,60 @@ + + + + 开户行 + + + + + 新增 + + + + + + + 威海农商行临港区支行 + + + 农商行（山东省） + + + 山东威海 + + 联行号：2570****** + + + + + + + + + + + + + 威海农商行临港区支行 + + + 中国建设银行 + + + 山东威海 + + 联行号：2570****** + + + + + + + + \ No newline at end of file diff --git a/pages/bank/bank.wxss b/pages/bank/bank.wxss new file mode 100644 index 0000000..8123b01 --- /dev/null +++ b/pages/bank/bank.wxss @@ -0,0 +1,245 @@ +/* pages/bank/bank.wxss */ +.van-search__content { + border: 1px solid #5CAE77!important; + background: #fff!important; +} +van-search { + flex: 0.8; +} +.search_box{ + display: flex; +} +.add_btn{ + flex: 0.2; + padding: var(--search-padding,10px 12px); + padding-left: 0; +} +.add_btn text{ + background-color: #62AD66; + display: block; + height: 100%; + text-align: center; + line-height: 36px; + color: #fff; + border-radius: 36px; + box-shadow: 0px 5px 5px #ddd; +} +text{display: block;} +.work_plan{ + padding: 40rpx 32.5rpx 30rpx; + display: flex; +} + +.work_plan .menu_item{ + background-color: #fff; + box-shadow: 2px 5px 5px #ddd; + border-radius: 60rpx; + text-align: center; + position: relative; + margin-right: 20px; + padding: 8px 10px; +} +.work_plan .menu_item.active{ + background-color: #2C8E68; + color: #fff; +} +.work_plan .menu_item .remind{ + height: 30rpx; + background: #e90101; + color: #fff; + font-size: 26rpx; + position: absolute; + line-height: 30rpx; + padding:0 10rpx; + border-radius: 25px; + top: -10rpx; + right: -10rpx; +} + +.work_plan .more{ + flex: 1; + text-align: center; + line-height: 60rpx; + font-size: 36rpx; + color: #31936c; +} +.deleteBox{ + width: 65px; + text-align: center; + height: 100%; + background: #F6F6F6; + align-items: center; + display: flex; +} +.workflow .workflow_list{ + height: 150rpx; + background-color: #fff; + border-radius: 24rpx; + box-shadow:0rpx 0rpx 10rpx rgba(0,0,0,.1); + margin-bottom: 20rpx; + padding:15rpx 25rpx 10rpx 35rpx; +} +.workflow .workflow_list .process_intro{ + display: flex; + height: 62rpx; + align-items: center; +} + +.workflow .process_intro .name{ + 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; +} +.van-swipe-cell { + width: 94%; + background: #fff; + border-radius: 10px; + box-shadow: 2px 5px 5px #ddd; + margin: 0 auto; + margin-bottom: 15px; +} +.li{ + width: 100%; + padding: 14px; +} +.tit_box{ + display: flex; +} +.detail_box{ + margin-top: 10px; + display: flex; + justify-content: space-between; +} +.li view text{ + /* margin-top: 15px; */ +} +.li .detail_box view{ + display: flex; + align-items: center; +} +.li .detail_box view text{ + color: #666666; + font-size: 12px; +} + +.li view text:nth-child(1){ + margin-top: 0px; +} +.li .fksr{ + display: flex; + align-items: center; + margin-top: 15px; + color: #2C8E68; + font-size: 16px; +} +.li .wtj{ + display: flex; + align-items: center; + justify-content: center; + padding: 3px 8px; + border-radius: 5px; + font-size: 14px; +} +.no{ + background-color:#fbe3e3; + color: #e90000; +} +.white{ + background-color:#feeadc; + color: #fc9a55; +} +.yes{ + background-color:#ddeee3; + color: #5cae77; +} +.other{ + background-color:#f0f1f6; + color: #878787; +} +.li .tit{ + font-size: 18px; + color: #444444; + line-height: 25px; + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 1; + word-break: break-all; + overflow: hidden; +} +.li .fj_name{ + font-size: 14px; + color: #B3DB62; + line-height: 25px; +} +.li .time{ + font-size: 14px; + color: #9B9CAA; +} +.li .money{ + font-size: 18px; + color: #5CAE77; +} +.van-checkbox__label { + display: flex; + justify-content: space-between; + width: 100%; +} + +.van-checkbox__icon-wrap { + border-radius: 5px; +} +.van-checkbox__icon { + border-radius: 5px; + border: 2px solid #2C8E68!important; + background-color: rgba(44, 142, 104, 0.2); +} +.bottom{ + width: 100%; + margin: 0 auto; + text-align: center; + padding: 15px 0; + display: flex; + position: fixed; + bottom: 0%; + background: #fff; + box-shadow: 0 0 5px #ddd; +} + +.bottom view { + width: 47%; + margin: 0 auto; + border-radius: 30px; + display: inline-block; +} + +.bottom .btn2{ + border: 1px solid transparent; + padding: 10px 0px; + background-image: linear-gradient(to right, #2C8E68, #5CAE77); + color: #fff; +} + +.downView{ + display: flex; + justify-content: center; + align-items: center; + padding: 0 20px; + border: 1px solid #5CAE77; + border-radius: 50px; + background: #fff; + margin-left: auto; +} +.downView image{ + width: 10px; + height: 8px; + margin-left: 10px; +} \ No newline at end of file diff --git a/pages/drawee/drawee.js b/pages/drawee/drawee.js index 321bdd8..f6a4678 100644 --- a/pages/drawee/drawee.js +++ b/pages/drawee/drawee.js @@ -115,6 +115,13 @@ swichPaymentApply:function(e){ method:'GET', accountType:101 } + UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'bank_type', {method:'GET'}, { + success: (res) => { + this.setData({ + bankTypeOptions:res.data + }); + } + }) UTIL.httpRequest(API.URL_GET_GETINFO, {method:'GET'}, { success: (res) => { if (res.code == API.SUCCESS_CODE) { @@ -133,14 +140,16 @@ swichPaymentApply:function(e){ }) UTIL.httpRequest(API.URL_GET_ACCOUNTLIST, sendData,{ success: (res) => { - for (let i = 0; i < res.rows.length; i++) { - if(res.rows[i].bankAccountNumber==null){continue;} - res.rows[i].bankAccountNumber = res.rows[i].bankAccountNumber.replace(/(\d{4})(?=\d)/g, "$1 ") - } - console.log(res.rows) - that.setData({ - accountList:res.rows - }) + for (let i = 0; i < res.rows.length; i++) { + if(res.rows[i].bankAccountNumber==null){continue;} + res.rows[i].bankAccountNumber = res.rows[i].bankAccountNumber.replace(/(\d{4})(?=\d)/g, "$1 "); + res.rows[i].balance = parseFloat(res.rows[i].balance).toFixed(2); + res.rows[i].bankTypeText = UTIL.getTransform(res.rows[i].bankType,that.data.bankTypeOptions); + } + console.log(res.rows) + that.setData({ + accountList:res.rows + }) } }) diff --git a/pages/drawee/drawee.wxml b/pages/drawee/drawee.wxml index 30e2ca9..9cd077f 100644 --- a/pages/drawee/drawee.wxml +++ b/pages/drawee/drawee.wxml @@ -15,10 +15,11 @@ {{item.bankUseType == 1 ?'基本户':'一般户'}} - - + + + - + {{item.accountName}} @@ -36,7 +37,6 @@ 添加银行账户 - @@ -95,7 +95,7 @@ var indexOf = function(name,value){ - return name.indexOf(value)>0; + return name.indexOf(value); } module.exports.indexOf = indexOf; \ No newline at end of file diff --git a/pages/inCome/inCome.js b/pages/inCome/inCome.js index 34e5e8a..78a9764 100644 --- a/pages/inCome/inCome.js +++ b/pages/inCome/inCome.js @@ -32,7 +32,7 @@ Page({ qtPics:[], //其他图片列表数据 //收入时间弹窗显隐 srShow:false, - minDate: new Date(2021, 6, 1).getTime(), + minDate: new Date(2008, 5, 1).getTime(), maxDate: new Date(2023, 0, 31).getTime(), crzhShow:false, accountListOptions:[], //存入账户类型选项 @@ -82,7 +82,8 @@ Page({ this.setData({ payerText:obj.name, showHt:false, - 'formData.contractionId':obj.code, + 'formData.contractionId':obj.id, + contractionIdID:obj.code }) }, selectContraction(){ @@ -106,7 +107,9 @@ Page({ * 生命周期函数--监听页面加载 */ onShow: function (options) { - + this.setData({ + ["formData.accountDate"]:this.getNewDate(new Date()) + }) }, /** * 生命周期函数--监听页面初次渲染完成 diff --git a/pages/inCome/inCome.json b/pages/inCome/inCome.json index ba95bcb..ad9ff40 100644 --- a/pages/inCome/inCome.json +++ b/pages/inCome/inCome.json @@ -1,14 +1,24 @@ { + "navigationStyle": "custom", "usingComponents": { + "van-row": "@vant/weapp/row/index", + "van-col": "@vant/weapp/col/index", "van-cell": "@vant/weapp/cell/index", "van-cell-group": "@vant/weapp/cell-group/index", + "van-tag": "@vant/weapp/tag/index", "van-icon": "@vant/weapp/icon/index", + "van-steps": "@vant/weapp/steps/index", + "van-button": "@vant/weapp/button/index", + "van-radio": "@vant/weapp/radio/index", + "van-radio-group": "@vant/weapp/radio-group/index", "van-field": "@vant/weapp/field/index", "van-popup": "@vant/weapp/popup/index", "van-picker": "@vant/weapp/picker/index", - "van-calendar": "@vant/weapp/calendar/index" - + "van-calendar": "@vant/weapp/calendar/index", + "van-dialog": "@vant/weapp/dialog/index", + "van-collapse": "@vant/weapp/collapse/index", + "van-collapse-item": "@vant/weapp/collapse-item/index" } } \ No newline at end of file diff --git a/pages/inCome/inCome.wxml b/pages/inCome/inCome.wxml index 76e7f37..c0a8b30 100644 --- a/pages/inCome/inCome.wxml +++ b/pages/inCome/inCome.wxml @@ -9,16 +9,8 @@ 收入单位 {{bookName}} - - 基础信息 - +基础信息 - - - 收入时间 @@ -59,16 +51,30 @@ - 收入类型 - + 收入类型 + + 请选择收入类型 + {{incomeTypeText}} + + + + + + 单据编码 备注说明 @@ -95,17 +101,72 @@ 合同编码 - 请选择合同编码 - {{formData.contractionId}} + 请选择合同编码 + {{contractionIdID}} - - 附件 - - - + + + + + + 附件可拍照 + + + 总数 {{form.transfers[index].fileNum?form.transfers[index].fileNum:0}}张 + + + + + + 收\n据 + + + + + + + + + + + + + + 发\n票 + + + + + + + + + + + + + + + 其\n他 + + + + + + + + + + + + + + - + + + + 暂存 + 提交 + + + \ No newline at end of file diff --git a/pages/index/index.wxml b/pages/index/index.wxml index ef5e818..f20a7fe 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -72,15 +72,15 @@ - + 收款人 - + 付款人 - + 开户行 diff --git a/pages/payee/list/list.js b/pages/payee/list/list.js index 8b24f01..eb3210b 100644 --- a/pages/payee/list/list.js +++ b/pages/payee/list/list.js @@ -11,7 +11,10 @@ Page({ isIPX: app.globalData.isIPX, list: {}, result: "", - bankTypeOptions:[] + bankTypeOptions:[], + pageNum:1, + scrollHeight:'', + searchName:'' }, /** @@ -22,13 +25,14 @@ Page({ // 可优化：数据请求放到 onload中 新增后在子页面修改父页面数据 var that = this; that.setData({ - index:options.index + index:options.index, + scrollHeight:wx.getSystemInfoSync().windowHeight }) var that = this; // 获取收款账号列表 let prames = { pageNum:1, - pageSize:999, + pageSize:10, orderByColumn:'id', isAsc:'desc', status:'0', @@ -48,12 +52,8 @@ Page({ var payeeType = that.data.payeeType; var list = []; array.map(res=>{ - res.payeeAccountText = res.payeeAccount.replace(/^(.{6})(?:\d+)(.{4})$/,"\$1****\$2"); - console.log(that.data.bankTypeOptions); res.bankTypeText = (that.data.bankTypeOptions.filter(function (e) { return e.dictValue == res.bankType; }))[0].dictLabel; - - console.log(res); list.push(res) }) that.setData({ @@ -69,10 +69,13 @@ Page({ }, goSearch(e){ var that = this; + that.setData({ + searchName:e.detail, + }) // 获取收款账号列表 let prames = { pageNum:1, - pageSize:999, + pageSize:10, orderByColumn:'id', isAsc:'asc', // isPeers:that.data.isPeers,//是否同行 @@ -82,7 +85,7 @@ Page({ status:'0', name:e.detail, method:'GET' - } + } console.log(prames); UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'bank_type', {method:'GET'}, { success: (res) => { @@ -107,6 +110,46 @@ Page({ } }) }, + paging(){ + console.log('aaa') + var that = this; + that.setData({ + pageNum:that.data.pageNum+1, + }) + // 获取收款账号列表 + let prames = { + pageNum:that.data.pageNum, + pageSize:10, + orderByColumn:'id', + isAsc:'desc', + status:'0', + method:'GET', + name:that.data.searchName, + } + UTIL.httpRequest(API.URL_GET_SELECTLIST , prames, { + success: (res) => { + let array = res.rows ; + var payeeType = that.data.payeeType; + var list = that.data.list; + var pagecount = res.total/10 + if(that.data.pageNum>pagecount){ + return; + } + array.map(res=>{ + + res.payeeAccountText = res.payeeAccount.replace(/^(.{6})(?:\d+)(.{4})$/,"\$1****\$2"); + console.log(that.data.bankTypeOptions); + res.bankTypeText = (that.data.bankTypeOptions.filter(function (e) { return e.dictValue == res.bankType; }))[0].dictLabel; + + console.log(res); + list.push(res) + }) + that.setData({ + list:list, + }) + } + }) + }, /** * 生命周期函数--监听页面初次渲染完成 */ @@ -121,7 +164,6 @@ Page({ }, onChange(event) { - console.log(event); this.setData({ result: event.detail, }); @@ -146,7 +188,6 @@ Page({ } let array = that.data.list.filter(function (e) { return e.id == that.data.result; }); array[0].incomeAmount = that.data.money; - console.log(array); let pages = getCurrentPages(); let currentPage = null; //当前页面 let prevPage = null; //上一个页面 diff --git a/pages/payee/list/list.wxml b/pages/payee/list/list.wxml index e9ef879..8ff344f 100644 --- a/pages/payee/list/list.wxml +++ b/pages/payee/list/list.wxml @@ -1,43 +1,45 @@ - 支出申请 - - - - 新增 + 收款人 + + + + 新增 + + + + + + + + + + + + {{item.payee}} + + + {{item.payeeAccountText}}    {{item.bankTypeText}} + + + + - - - - - - - - - - - {{item.payee}} - - - {{item.payeeAccountText}}    {{item.bankTypeText}} - - - - + diff --git a/project.private.config.json b/project.private.config.json index f3a7daf..91bd171 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -101,6 +101,20 @@ "query": "", "launchMode": "default", "scene": null + }, + { + "name": "付款人列表", + "pathName": "pages/drawee/drawee", + "query": "", + "launchMode": "default", + "scene": null + }, + { + "name": "开户行", + "pathName": "pages/bank/bank", + "query": "", + "launchMode": "default", + "scene": null } ] } diff --git a/utils/API.js b/utils/API.js index 2f35aff..494882e 100644 --- a/utils/API.js +++ b/utils/API.js @@ -67,7 +67,7 @@ const URL_GET_GETPROJECTLIST = `${URL_PREFIX}/yinnong/project/list`; const URL_GET_CONTRACTIONLIST = `${URL_PREFIX}/contraction/info/list`; //查询收款账号列表 -const URL_GET_SELECTLIST = `${URL_PREFIX}/yinnong/payee/selectlist`; +const URL_GET_SELECTLIST = `${URL_PREFIX}/yinnong/payee/list`; //查询收款账号列表2 const URL_GET_PAYEESELECTLIST = `${URL_PREFIX}/yinnong/payee/list`; @@ -197,7 +197,20 @@ const URL_GET_GETCASHDETAILADD = `${URL_PREFIX}/yinnong/cashdetail/add`; //汇票、现金支出申请 const URL_GET_GETCASHLISTCASGBYID = `${URL_PREFIX}/yinnong/cashdetail/listCashdetailByCashId/`; +//增加收入流水 +const URL_POST_GERFLOWADD = `${URL_PREFIX}/cashier/flow/add`; +//修改收入流水 +const URL_POST_GERFLOWEDIT = `${URL_PREFIX}/cashier/flow/edit`; + +//根据id获取 银行收支流水 +const URL_GET_FLOWGET = `${URL_PREFIX}/cashier/flow/get/`; + +//根据id获取关联合同 +const URL_GET_INFOGET = `${URL_PREFIX}/contraction/info/get/`; + +//根据id删除 银行收支流水 +const URL_GET_FLOWREMOVE = `${URL_PREFIX}/cashier/flow/remove/`; /****************接口地址end****************/ @@ -277,5 +290,10 @@ export { URL_GET_GETCASHSAVE, URL_GET_GETCASHDETAILADD, URL_GET_GETCASHLISTCASGBYID, - URL_GET_GETCASHDETAILEDIT + URL_GET_GETCASHDETAILEDIT, + URL_POST_GERFLOWADD, + URL_GET_FLOWGET, + URL_GET_INFOGET, + URL_POST_GERFLOWEDIT, + URL_GET_FLOWREMOVE } \ No newline at end of file