From 1e7d5173ecb92bb3359a94bf70aebed0ea35d93b Mon Sep 17 00:00:00 2001 From: chenxuhui Date: Fri, 30 Nov 2018 11:37:20 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=AC=A0=E6=AC=BE=E5=8D=95=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E9=A1=B5UI=E5=8F=8A=E9=80=BB=E8=BE=91=202=E3=80=81?= =?UTF-8?q?=E6=AC=A0=E6=AC=BE=E5=8D=95=E6=8C=89=E8=B5=B7=E6=AD=A2=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E6=9F=A5=E8=AF=A2=203=E3=80=81=E6=AC=A0=E6=AC=BE?= =?UTF-8?q?=E5=8D=95=E8=AF=A6=E6=83=85=204=E3=80=81=E6=9C=AA=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E6=AC=A0=E6=AC=BE=E5=8D=95=E5=AE=A1=E6=A0=B8=E7=9A=84?= =?UTF-8?q?=E9=80=BB=E8=BE=91=205=E3=80=81=E6=97=B6=E9=97=B4=E8=BD=AC?= =?UTF-8?q?=E6=8D=A2=E5=B7=A5=E5=85=B7=E7=B1=BB=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.js | 2 + app.json | 5 +- .../debitNoteDetail/debitNoteDetail.js | 64 +++++++ .../debitNoteDetail/debitNoteDetail.json | 3 + .../debitNoteDetail/debitNoteDetail.wxml | 65 +++++++ .../debitNoteDetail/debitNoteDetail.wxss | 83 +++++++++ pages/debitNoteList/debitNoteList.js | 176 ++++++++++++++++++ pages/debitNoteList/debitNoteList.json | 5 + pages/debitNoteList/debitNoteList.wxml | 55 ++++++ pages/debitNoteList/debitNoteList.wxss | 107 +++++++++++ .../debitNoteQuery/debitNoteQuery.js | 41 ++++ .../debitNoteQuery/debitNoteQuery.json | 3 + .../debitNoteQuery/debitNoteQuery.wxml | 31 +++ .../debitNoteQuery/debitNoteQuery.wxss | 121 ++++++++++++ pages/homePage/homePage.js | 2 +- pages/login/login.js | 29 +-- utils/dateTimeUtil.js | 16 +- utils/net.js | 4 +- 18 files changed, 791 insertions(+), 21 deletions(-) create mode 100644 pages/debitNoteList/debitNoteDetail/debitNoteDetail.js create mode 100644 pages/debitNoteList/debitNoteDetail/debitNoteDetail.json create mode 100644 pages/debitNoteList/debitNoteDetail/debitNoteDetail.wxml create mode 100644 pages/debitNoteList/debitNoteDetail/debitNoteDetail.wxss create mode 100644 pages/debitNoteList/debitNoteList.js create mode 100644 pages/debitNoteList/debitNoteList.json create mode 100644 pages/debitNoteList/debitNoteList.wxml create mode 100644 pages/debitNoteList/debitNoteList.wxss create mode 100644 pages/debitNoteList/debitNoteQuery/debitNoteQuery.js create mode 100644 pages/debitNoteList/debitNoteQuery/debitNoteQuery.json create mode 100644 pages/debitNoteList/debitNoteQuery/debitNoteQuery.wxml create mode 100644 pages/debitNoteList/debitNoteQuery/debitNoteQuery.wxss diff --git a/app.js b/app.js index b571a2b..1999865 100644 --- a/app.js +++ b/app.js @@ -8,7 +8,9 @@ App({ OpenId: "", AppName: "WeChat", AppId: "wx0b897783b2588147", + // 自己的服务器 BaseUrl: "https://miniprogram.food988.com/Rest.aspx", + // 转发到客户服务器 TranferBaseUrl:"https://miniprogram.food988.com/RequestTransfer.aspx", CustomerId:"", // 原测试路径 diff --git a/app.json b/app.json index dfe4946..f7e9ba8 100644 --- a/app.json +++ b/app.json @@ -14,7 +14,10 @@ "pages/my/my", "pages/fenxiang/fenxiang", "pages/saleOutStore/saleOutStore", - "pages/saleOutStore/outStoreDetail/outStoreDetail" + "pages/saleOutStore/outStoreDetail/outStoreDetail", + "pages/debitNoteList/debitNoteList", + "pages/debitNoteList/debitNoteDetail/debitNoteDetail", + "pages/debitNoteList/debitNoteQuery/debitNoteQuery" ], "window": { "backgroundTextStyle": "light", diff --git a/pages/debitNoteList/debitNoteDetail/debitNoteDetail.js b/pages/debitNoteList/debitNoteDetail/debitNoteDetail.js new file mode 100644 index 0000000..e001e36 --- /dev/null +++ b/pages/debitNoteList/debitNoteDetail/debitNoteDetail.js @@ -0,0 +1,64 @@ +// pages/debitNoteList/debitNoteDetail/debitNoteDetail.js + +const app = getApp(); +var network = require("../../../utils/net.js"); +var timechage = require("../../../utils/dateTimeUtil.js"); +var getDebitNoteDetail = '/MainSystem/B3MiniProgramRpc/XuRpcs/Customer/DebitNoteRpc/GetDebitNoteDetail' +var confirmDebitNote = "/MainSystem/B3MiniProgramRpc/XuRpcs/Customer/DebitNoteRpc/ConfirmDebitNote" + +Page({ + data: { + // ConfirmTime:'', + // Customer_Name: '', + // Remark: '', + // ID: '', + // AccountingUnit_Name: '', + // Date: '', + // Employee_Name: '', + // Money: '', + item:{}, + ConfirmTime: '', + Date: '', + orderState:false, + }, + + onLoad: function(options) { + var that =this; + let orderID = Number(options.ID); + if (options.State == "未审核"){ + that.setData({ + orderState:true, + }); + }; + + let method = getDebitNoteDetail; + let params = ["1"]; + network.requestLoading(method, params, function (res) { + var backDate = timechage.formatTimeTwo(res.result.Date.substring(6, 19), 'Y/M/D'); + var backConfirmTime = timechage.formatTimeTwo(res.result.ConfirmTime.substring(6, 19), 'Y/M/D'); + that.setData({ + item: res.result, + Date: backDate, + ConfirmTime: backConfirmTime, + }) + }) + }, + + // 新增按钮点击 + confirmDebitNoteBtnClicked: function(event) { + var orderID = event.currentTarget.dataset.orderid; + let method = confirmDebitNote; + let params = [orderID]; + network.requestLoading(method, params, function (res) { + wx.showToast({ + title: '操作成功', + success: function (res){ + wx:wx.navigateBack({ + delta: 1, + }); + } + }); + }); +}, + +}) \ No newline at end of file diff --git a/pages/debitNoteList/debitNoteDetail/debitNoteDetail.json b/pages/debitNoteList/debitNoteDetail/debitNoteDetail.json new file mode 100644 index 0000000..98d8b4a --- /dev/null +++ b/pages/debitNoteList/debitNoteDetail/debitNoteDetail.json @@ -0,0 +1,3 @@ +{ + "navigationBarTitleText": "欠款单详情" +} \ No newline at end of file diff --git a/pages/debitNoteList/debitNoteDetail/debitNoteDetail.wxml b/pages/debitNoteList/debitNoteDetail/debitNoteDetail.wxml new file mode 100644 index 0000000..6e5feb0 --- /dev/null +++ b/pages/debitNoteList/debitNoteDetail/debitNoteDetail.wxml @@ -0,0 +1,65 @@ + + + + 单号 + {{item.ID}} + + + + + + 客户 + {{item.Customer_Name}} + + + + + + 会计单位 + {{item.AccountingUnit_Name}} + + + + + + 确认日期 + {{ConfirmTime}} + + + + + + 日期 + {{Date}} + + + + + + 业务员 + {{item.Employee_Name}} + + + + + + 金额 + {{item.Money}} + + + + + + 摘要 + {{item.Remark}} + + + + + + + + + 确定 + + \ No newline at end of file diff --git a/pages/debitNoteList/debitNoteDetail/debitNoteDetail.wxss b/pages/debitNoteList/debitNoteDetail/debitNoteDetail.wxss new file mode 100644 index 0000000..3b055f6 --- /dev/null +++ b/pages/debitNoteList/debitNoteDetail/debitNoteDetail.wxss @@ -0,0 +1,83 @@ +/* pages/debitNoteList/debitNoteDetail/debitNoteDetail.wxss */ + +page { + background: #eaf1f8; +} + +.container { + height: 100%; + background: #fff; + margin-top: 10rpx; +} + +.baseitem { + height: 100rpx; + line-height: 100rpx; + display: flex; + flex-direction: row; + align-items: center; + padding-left: 20rpx; + padding-right: 20rpx; + font-size: 30rpx; + background: #fff; +} + +.baseitem_key { + color: #666; + width: 40%; +} + +.baseitem_value { + color: rgb(48, 48, 48); + margin-left: 20rpx; + width: 60%; + text-align: right; +} + +.lineView { + height: 1rpx; + background-color: #dbdbdb; + margin-left: 20rpx; +} + +/* .imageView { + height: 100%; + width: 50%; + position: relative; + align-items: center; + justify-content: center; + box-sizing: content-box; +} */ + +.imageView { + width: 100%; + height: 40px; + position: fixed; + bottom: 0rpx; + line-height: 40px; + text-align: center; + background-color: #f98b29; +} + +.currentImage { + width: 100%; + height: 100%; +} + +.btnTextView { + position: absolute; + width: 100%; + top: 0; + line-height: 65px; + text-align: center; +} + +.btnText { + color: white; + font-size: 34rpx; +} + +.whiteText { + color: black; + font-size: 34rpx; +} diff --git a/pages/debitNoteList/debitNoteList.js b/pages/debitNoteList/debitNoteList.js new file mode 100644 index 0000000..0c342ce --- /dev/null +++ b/pages/debitNoteList/debitNoteList.js @@ -0,0 +1,176 @@ +const app = getApp(); +var network = require("../../utils/net.js"); +var timechage = require("../../utils/dateTimeUtil.js"); +var UnCheckPageIndex = 0 +var UnCheckPageSize = 10 +var CheckedPageIndex = 0 +var CheckedPageSize = 10 +var getList = '/MainSystem/B3MiniProgramRpc/XuRpcs/Customer/DebitNoteRpc/GetDebitNoteList' + +// 未审核订单列表 +function getUnCheckOrderList(that, UnCheckPageIndex, UnCheckPageSize, successaction) { + let getArr = []; + let method = getList; + let params = [{ + // Confirmed bool false + // StartDate datetime null + // EndDate datetime null + // PageIndex int 0 + // PageSize int 0 + "Confirmed": false, + "StartDate": that.data.startDate, + "EndDate": that.data.endDate, + "PageIndex": UnCheckPageIndex, + "PageSize": UnCheckPageSize, + }]; + + network.requestLoading(method, params, function (res) { + successaction(); + var array = res.result; + if (array.length <= 0) { + wx.showToast({ + title: '无数据更新', + }) + UnCheckPageIndex = UnCheckPageIndex - 1; + return; + } + for (var i = 0; i < array.length; i++) { + var dmo = { + + orderState: "未审核", + ID: array[i].ID, + Money: array[i].Money, + Date: timechage.formatTimeTwo(array[i].Date.substring(6, 19), 'Y/M/D'), + Employee_Name: array[i].Employee_Name, + } + getArr.push(dmo); + } + let arrLast = that.data.unCheckDataArr.concat(getArr); + that.setData({ + unCheckDataArr: arrLast, + }) + }) +} + +// 已审核订单列表 +function getCheckedOrderList(that, CheckedPageIndex, CheckedPageSize) { + let getArr = []; + let method = getList; + let params = [{ + "Confirmed": true, + "StartDate": that.data.startDate, + "EndDate": that.data.endDate, + "PageIndex": UnCheckPageIndex, + "PageSize": UnCheckPageSize, + }]; + // let params = [true, CheckedPageIndex, CheckedPageSize]; + network.requestLoading(method, params, function (res) { + var array = res.result; + if (array.length <= 0) { + wx.showToast({ + title: '无数据更新', + }) + CheckedPageIndex = CheckedPageIndex - 1; + return; + } + for (var i = 0; i < array.length; i++) { + var dmo = { + //添加单据状态的传递，在详情页面判断此值，进行是否允许提交的操作 + orderState: "已审核", + ID: array[i].ID, + Money: array[i].Money, + Date: timechage.formatTimeTwo(array[i].Date.substring(6, 19), 'Y/M/D'), + Employee_Name: array[i].Employee_Name, + + } + getArr.push(dmo); + } + let arrLast = that.data.checkedDataArr.concat(getArr); + that.setData({ + checkedDataArr: arrLast, + }) + }) +} + +Page({ + data: { + checkedDataArr: [], + unCheckDataArr: [], + currentTab: 0, + winHeight: app.globalData.winHeight, + startDate: null, + endDate:null, + }, + + /** + * 滑动切换tab + */ + bindChange: function (e) { + var that = this; + that.setData({ + currentTab: e.detail.current + }); + + }, + /** + * 点击tab切换 + */ + swichNav: function (e) { + var that = this; + if (this.data.currentTab === e.target.dataset.current) { + return false; + } else { + that.setData({ + currentTab: e.target.dataset.current + }) + } + }, + //点击进入详情页面 + transToOrderDetail: function (event) { + var ID = event.currentTarget.dataset.detailitemid; + var State = event.currentTarget.dataset.detailitemstate; + wx.navigateTo({ + url: 'debitNoteDetail/debitNoteDetail?ID=' + ID + '&State=' + State, + }) + }, + + //点击进入筛选页面 + chose: function (e) { + wx.navigateTo({ + url: 'debitNoteQuery/debitNoteQuery', + }) + }, + + onShow: function (options) { + this.setData({ + checkedDataArr: [], + unCheckDataArr: [], + }) + var that = this; + UnCheckPageIndex = 0; + CheckedPageIndex = 0; + getUnCheckOrderList(that, UnCheckPageIndex, UnCheckPageSize, function (res) { + getCheckedOrderList(that, CheckedPageIndex, CheckedPageSize); + + }); + }, + + + //未审核订单滑动到底部加载 + unCheckedScrollLower: function (event) { + var that = this; + UnCheckPageIndex = UnCheckPageIndex + 1; + getUnCheckOrderList(that, UnCheckPageIndex, UnCheckPageSize, function (res) { + + }); + }, + + //已审核订单滑动到底部加载 + CheckedScrollLower: function (event) { + var that = this; + CheckedPageIndex = CheckedPageIndex + 1; + getCheckedOrderList(that, CheckedPageIndex, CheckedPageSize); + }, + +}) + \ No newline at end of file diff --git a/pages/debitNoteList/debitNoteList.json b/pages/debitNoteList/debitNoteList.json new file mode 100644 index 0000000..ddc8dea --- /dev/null +++ b/pages/debitNoteList/debitNoteList.json @@ -0,0 +1,5 @@ +{ + "navigationBarBackgroundColor": "white", + "navigationBarTextStyle": "black", + "navigationBarTitleText": "欠款单列表" +} \ No newline at end of file diff --git a/pages/debitNoteList/debitNoteList.wxml b/pages/debitNoteList/debitNoteList.wxml new file mode 100644 index 0000000..28d4ca0 --- /dev/null +++ b/pages/debitNoteList/debitNoteList.wxml @@ -0,0 +1,55 @@ + + + 未审核 + 已审核 + + + + + + + + +