From 331fe7d3a7889edeba4690da63391edf96a1fdd0 Mon Sep 17 00:00:00 2001 From: robin <3504557@qq.com> Date: Wed, 7 Nov 2018 23:53:30 +0800 Subject: [PATCH] add order --- app.js | 5 +- app.json | 6 +- imgs/order.png | Bin 0 -> 10706 bytes pages/main/main.js | 5 + pages/main/main.wxml | 7 +- pages/order/detail/detail.js | 740 +++++++++++++++++++ pages/order/detail/detail.json | 2 + pages/order/detail/detail.wxml | 168 +++++ pages/order/detail/detail.wxss | 235 ++++++ pages/order/newBill/newBill.js | 660 +++++++++++++++++ pages/order/newBill/newBill.json | 3 + pages/order/newBill/newBill.wxml | 169 +++++ pages/order/newBill/newBill.wxss | 235 ++++++ pages/order/order.js | 164 ++++ pages/order/order.json | 4 + pages/order/order.wxml | 20 + pages/order/order.wxss | 69 ++ pages/order/query/query.js | 212 ++++++ pages/order/query/query.json | 3 + pages/order/query/query.wxml | 57 ++ pages/order/query/query.wxss | 94 +++ pages/saleForecastList/saleForecastList.js | 12 +- pages/saleForecastList/saleForecastList.wxml | 8 +- project.config.json | 2 +- 24 files changed, 2869 insertions(+), 11 deletions(-) create mode 100755 imgs/order.png create mode 100644 pages/order/detail/detail.js create mode 100644 pages/order/detail/detail.json create mode 100644 pages/order/detail/detail.wxml create mode 100644 pages/order/detail/detail.wxss create mode 100644 pages/order/newBill/newBill.js create mode 100644 pages/order/newBill/newBill.json create mode 100644 pages/order/newBill/newBill.wxml create mode 100644 pages/order/newBill/newBill.wxss create mode 100644 pages/order/order.js create mode 100644 pages/order/order.json create mode 100644 pages/order/order.wxml create mode 100644 pages/order/order.wxss create mode 100644 pages/order/query/query.js create mode 100644 pages/order/query/query.json create mode 100644 pages/order/query/query.wxml create mode 100644 pages/order/query/query.wxss diff --git a/app.js b/app.js index 0d282d8..de45fdc 100644 --- a/app.js +++ b/app.js @@ -15,6 +15,9 @@ App({ LoginPath: "/MainSystem/MainSystem/Auth/WeixinLogin", TransferUrl:'https://miniprogram.food988.com/RequestTransfer.aspx', CustomerId:0, - SelectCustomer_ID:null + SelectCustomer_ID:null, + SelectStartDate: null, + SelectEndDate: null, + SelectBillState: null, } }) \ No newline at end of file diff --git a/app.json b/app.json index 62df136..c30b13c 100644 --- a/app.json +++ b/app.json @@ -9,7 +9,11 @@ "pages/saleForecastList/saleForecastList", "pages/saleForecastList/Detail/Detail", "pages/saleForecastList/query/query", - "pages/saleForecastList/newBill/newBill" + "pages/saleForecastList/newBill/newBill", + "pages/order/order", + "pages/order/detail/detail", + "pages/order/newBill/newBill", + "pages/order/query/query" ], "window": { "backgroundTextStyle": "light", diff --git a/imgs/order.png b/imgs/order.png new file mode 100755 index 0000000000000000000000000000000000000000..8a6079f67034ae80613db907df963d9f06e754e0 GIT binary patch literal 10706 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 literal 0 HcmV?d00001 diff --git a/pages/main/main.js b/pages/main/main.js index 64c9d27..66931c6 100644 --- a/pages/main/main.js +++ b/pages/main/main.js @@ -81,4 +81,9 @@ Page({ url: '/pages/saleForecastList/saleForecastList', }) }, + order: function(e) { + wx.navigateTo({ + url: '/pages/order/order', + }) + }, }) \ No newline at end of file diff --git a/pages/main/main.wxml b/pages/main/main.wxml index 661bc78..d22e5a5 100644 --- a/pages/main/main.wxml +++ b/pages/main/main.wxml @@ -6,5 +6,10 @@ 销售预报 - + + + + 销售订单 + + diff --git a/pages/order/detail/detail.js b/pages/order/detail/detail.js new file mode 100644 index 0000000..d26c2dc --- /dev/null +++ b/pages/order/detail/detail.js @@ -0,0 +1,740 @@ +// pages/orderinfo/orderinfo.js +var app = getApp() +var network = require("../../../utils/net.js") +var dateTimePicker = require('../../../utils/dateTimePicker.js'); +var utilll = require('../../../utils/util.js'); +var timechage = require("../../../utils/dateTimeUtil.js") +var orderID=0; + +var getAccountingUnit = "/MainSystem/B3MiniProgramRpc/Rpcs/BaseInfoRpc/GetAccountingUnit"; +var getCustomer = "/MainSystem/B3MiniProgramRpc/Rpcs/BaseInfoRpc/GetCustomer"; +var getDept = "/MainSystem/B3MiniProgramRpc/Rpcs/BaseInfoRpc/GetDepartment"; +var getGoods = "/MainSystem/B3MiniProgramRpc/Rpcs/BaseInfoRpc/GetGoodsWithUnitPrice"; +var getSaleKind = "/MainSystem/B3MiniProgramRpc/Rpcs/BaseInfoRpc/GetSaleKind" + +var load = "/MainSystem/B3MiniProgramRpc/XuRpcs/Employee/OrderRpc/Load"; +let update = '/MainSystem/B3MiniProgramRpc/XuRpcs/Employee/OrderRpc/Update'; + +function setTime(that){ + // 获取完整的年月日 时分秒，以及默认显示的数组 + var obj1 = dateTimePicker.dateTimePicker(that.data.startYear, that.data.endYear, that.data.loadTime); + // 精确到分的处理，将数组的秒去掉 + var lastArray = obj1.dateTimeArray.pop(); + var lastTime = obj1.dateTime.pop(); + + that.setData({ + dateTimeArray1: obj1.dateTimeArray, + dateTime1: obj1.dateTime + }); +} + +function GetAccountingUnit(that, inputValue) { + let method = getAccountingUnit; + let params = [{ + "InputValue": inputValue, + "PageIndex": 0, + "PageSize": 100 + }]; + network.transfer_request(method, params, function (res) { + that.setData({ + currency: res.result, + unit: res.result + }) + }) + that.setData({ + which: "会计部门" + }) +} + +function GetCustomer(that, inputValue) { + let method = getCustomer; + let params = [{ + "InputValue": inputValue, + "PageIndex": 0, + "PageSize": 100 + }]; + network.transfer_request(method, params, function (res) { + that.setData({ + currency: res.result, + customer: res.result + }) + }) + that.setData({ + which: "购货客户" + }) +} + +function GetDepartment(that, inputValue) { + let method = getDept; + let params = [{ + "InputValue": inputValue, + "PageIndex": 0, + "PageSize": 100 + }]; + network.transfer_request(method, params, function (res) { + that.setData({ + currency: res.result, + department: res.result + }) + }) + that.setData({ + which: "部门" + }) +} + +function GetSaleKind(that, v) { + let method = getSaleKind; + let params = [{ + "InputValue": v, + "PageIndex": 0, + "PageSize": 100 + }]; + network.transfer_request(method, params, function (res) { + that.setData({ + currency: res.result, + saletype: res.result + }) + }) + that.setData({ + which: "销售类型" + }) +} + +function GetGoodsWithUnitPrice(that, v, date) { + let unitID = that.data.unit[that.data.isUnit].ID; + let customerID = that.data.customer[that.data.customerIndex].ID; + let method = getGoods; + let params = [{ + "Input": v, + "PageIndex": 0, + "PageSize": 100, + "Customer_ID": customerID, + "AccountingUnit_ID": unitID, + "Date": date + }]; + network.transfer_request(method, params, function (res) { + that.setData({ + goods: res.result, + }) + }) +} + +Page({ + + /** + * 页面的初始数据 + */ + data: { + /** + * 页面配置 + */ + which: "", + winWidth: 0, + winHeight: 0, + // tab切换 + currentTab: 0, + obj: [], + goods: [], + idx: 0, + currency: [], + saletypeIndex: 0, + saletype: [{ + ID: 0, + Name: "请选择销售类型" + }], + departmentIndex: 0, + department: [{ + ID: 0, + Name: "请选择销售部门" + }], + customerIndex: 0, + customer: [{ + ID: 0, + Name: "请选择客户" + }], + isUnit: 0, + unit: [{ + ID: 0, + Name: "请选择会计单位" + }], + addrs: "", + dateTimeArray1: null, + dateTime1: null, + startYear: 2018, + endYear: 2030, + loadTime:"" + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + var that = this; + let ID = Number(options.ID); + orderID = ID; + + let method = load; + let params = [ID]; + network.transfer_request(method, params, function (res) { + let customerOld=[{ + ID: res.result.Customer_ID, + Name: res.result.Customer_Name + }] + + let unitOld=[{ + ID: res.result.AccountingUnit_ID, + Name: res.result.AccountingUnit_Name + }] + + let departmentOld=[{ + ID: res.result.Department_ID, + Name: res.result.Department_Name + }] + + let saletypeOld =[{ + ID: res.result.SaleKind_ID, + Name: res.result.SaleKind_Name + }] + + let addrrrr = res.result.DeliverAddress + let loadtimee = timechage.formatTimeTwo(res.result.LoadTime.substring(6, 19), 'Y-M-D h:m') + + let details=[]; + + for(var i =0;i + + 基本信息 + 订单详细 + + + + + + + + 购货客户 + + + {{customer[customerIndex].Name}} + + + + + 发货时间 + + + {{dateTimeArray1[0][dateTime1[0]]}}-{{dateTimeArray1[1][dateTime1[1]]}}-{{dateTimeArray1[2][dateTime1[2]]}} {{dateTimeArray1[3][dateTime1[3]]}}:{{dateTimeArray1[4][dateTime1[4]]}} + + + + + + 会计单位 + + + {{unit[isUnit].Name}} + + + + + + + 销售部门 + + + {{department[departmentIndex].Name}} + + + + + 销售类型 + + + {{saletype[saletypeIndex].Name}} + + + + + + + + + 送货地址 + + + + + + + + + + + + + + + + + + + {{item.Name}} + + + + 取消 + + + + + + + + + + + 存货名称 + + {{obj[idx].Goods_Name}} + + + + + + 报货数量 + + + + + 辅 数 量 + + + + + + + + 单 价 + + + + + 政策单价 + {{obj[idx].PolicyPrice}} + + + 删除 + + + + + + + + + + + + + + + + + + + + + + + + + {{item.Goods_Name}} + + + + 取消 + + + diff --git a/pages/order/detail/detail.wxss b/pages/order/detail/detail.wxss new file mode 100644 index 0000000..b5f2e2c --- /dev/null +++ b/pages/order/detail/detail.wxss @@ -0,0 +1,235 @@ +/* pages/orderinfo/orderinfo.wxss */ + +page { + background: rgb(240, 239, 245); +} + +.swiper-tab { + width: 100%; + text-align: center; + line-height: 80rpx; + display: flex; + flex-direction: row; + justify-content: center; + border-bottom: 0.2rpx solid rgb(223, 218, 218); +} + +.swiper-tab-list { + font-size: 30rpx; + width: 40%; + color: #777; + margin-top: 5rpx; + height: 60rpx; + line-height: 60rpx; +} + +.tab1 { + border-top: 2rpx solid #999; + border-bottom: 2rpx solid #999; + border-left: 2rpx solid #999; + border-radius: 20rpx 0rpx 0rpx 20rpx; + background: white; +} + +.tab2 { + border-top: 2rpx solid #999; + border-bottom: 2rpx solid #999; + border-right: 2rpx solid #999; + border-radius: 0rpx 20rpx 20rpx 0rpx; + background: white; +} + +.on { + background: #2788f8; + color: white; +} + +.swiper-box { + display: block; + height: 100%; + width: 100%; + overflow: hidden; +} + +.swiper-items1 { + height: 100%; + padding-top: 3%; +} + +.swiper-items2 { + height: 100%; +} + +.scroll-views { + height: 100%; +} + +.baseitem { + background: #fff; + width: 100%; + border-bottom: 0.1px solid #dbdbdb; + display: flex; + flex-direction: row; + align-items: center; + padding-top: 20rpx; + padding-bottom: 20rpx; +} + +.twogroup { + display: flex; + flex-direction: row; +} + +.baseitem_key { + color: black; + width: 20%; + margin-left: 5%; +} + +.baseitem_value { + margin-left: 5%; + width: 70%; + color: rgb(48, 48, 48); +} + +.baseitem_key2 { + color: black; + width: 20%; + font-size: 30rpx; + margin-left: 10rpx; +} + +.baseitem_value2 { + color: rgb(48, 48, 48); + font-size: 30rpx; +} + +.baseitem_key1 { + color: black; + width: 40%; + font-size: 30rpx; + margin-left: 10rpx; +} + +.baseitem_value1 { + color: rgb(48, 48, 48); + font-size: 30rpx; + margin-left: 20rpx; + width: 60%; +} + +::-webkit-scrollbar { + width: 0; + height: 0; + color: transparent; +} + +.add { + display: flex; + flex-direction: row; + align-items: center; + justify-content: center; + border-left: none; + background: #fff; + width: 100%; + margin-top: 20rpx; + border-top: 0.5px solid #e0e0e0; + border-bottom: 0.5px solid #e0e0e0; + padding-top: 20rpx; + padding-bottom: 20rpx; +} + +.ico { + height: 42rpx; + width: 42rpx; +} + +.delete { + width: 100%; + padding-top: 20rpx; + padding-bottom: 20rpx; + color: red; + display: flex; + flex-direction: row; + align-items: center; + justify-content: center; + background: #fff; + font-size: 30rpx; +} + +.itemView { + margin-top: 20rpx; +} + +.submit { + margin-left: 5%; + margin-top: 10%; + width: 90%; + margin-right: 5%; + color: #fff; + background: linear-gradient(to right, #39c4fd, #539eef); +} + +.drawer_screen { + width: 100%; + height: 100%; + position: fixed; + top: 0; + left: 0; + z-index: 1000; + background: #000; + opacity: 0.5; + overflow: hidden; +} + +.sousuo { + margin-right: 10%; + margin-left: 10%; + text-align: center; + background: #d6d8da; + height: 40px; + font-size: 28rpx; +} + +.drawer_content { + height: 500rpx; + overflow-y: scroll; /*超出父盒子高度可滚动*/ +} + +.drawer_box { + width: 650rpx; + overflow: hidden; + position: fixed; + top: 50%; + left: 0; + z-index: 1001; + background: #fafafa; + margin: -150px 50rpx 0 50rpx; + border-radius: 3px; +} + +.btn_ok { + padding: 10px; + font: 20px "microsoft yahei"; + text-align: center; + border-top: 1px solid #e8e8ea; + color: #2E8CF5; +} + +.top { + height: 20%; + justify-content: center; + align-items: center; +} + +.grid1 { + width: 100%; + border-bottom: 1px solid #c3c3c3; + padding-top: 5px; + padding-bottom: 10px; +} + +.text3 { + font-size: 18px; + color: rgb(48, 48, 48); +} diff --git a/pages/order/newBill/newBill.js b/pages/order/newBill/newBill.js new file mode 100644 index 0000000..8565e6a --- /dev/null +++ b/pages/order/newBill/newBill.js @@ -0,0 +1,660 @@ + +var app = getApp() +var network = require("../../../utils/net.js") +var dateTimePicker = require('../../../utils/dateTimePicker.js'); +var utilll = require('../../../utils/util.js'); + +function GetAccountingUnit(that, inputValue) { + let method = "/MainSystem/B3MiniProgramRpc/Rpcs/BaseInfoRpc/GetAccountingUnit"; + let params = [{ + "InputValue": inputValue, + "PageIndex": 0, + "PageSize": 100 + }]; + network.transfer_request(method, params, function(res) { + that.setData({ + currency: res.result, + unit: res.result + }) + }) + that.setData({ + which: "会计部门" + }) +} + +function GetCustomer(that, inputValue) { + let method = "/MainSystem/B3MiniProgramRpc/Rpcs/BaseInfoRpc/GetCustomer"; + let params = [{ + "InputValue": inputValue, + "PageIndex": 0, + "PageSize": 100 + }]; + network.transfer_request(method, params, function(res) { + that.setData({ + currency: res.result, + customer: res.result + }) + }) + that.setData({ + which: "购货客户" + }) +} + +function GetDepartment(that, inputValue) { + let method = "/MainSystem/B3MiniProgramRpc/Rpcs/BaseInfoRpc/GetDepartment"; + let params = [{ + "InputValue": inputValue, + "PageIndex": 0, + "PageSize": 100 + }]; + network.transfer_request(method, params, function(res) { + that.setData({ + currency: res.result, + department: res.result + }) + }) + that.setData({ + which: "部门" + }) +} + +function GetSaleKind(that, v) { + let method = "/MainSystem/B3MiniProgramRpc/Rpcs/BaseInfoRpc/GetSaleKind"; + let params = [{ + "InputValue": v, + "PageIndex": 0, + "PageSize": 100 + }]; + network.transfer_request(method, params, function(res) { + that.setData({ + currency: res.result, + saletype: res.result + }) + }) + that.setData({ + which: "销售类型" + }) +} + +function GetGoodsWithUnitPrice(that, v, date) { + let unitID = that.data.unit[that.data.isUnit].ID; + let customerID = that.data.customer[that.data.customerIndex].ID; + let method = "/MainSystem/B3MiniProgramRpc/Rpcs/BaseInfoRpc/GetGoodsWithUnitPrice"; + let params = [{ + "Input": v, + "PageIndex": 0, + "PageSize": 100, + "Customer_ID": customerID, + "AccountingUnit_ID": unitID, + "Date": date + }]; + network.transfer_request(method, params, function(res) { + that.setData({ + goods: res.result, + }) + }) +} + +Page({ + + /** + * 页面的初始数据 + */ + data: { + /** + * 页面配置 + */ + which: "", + winWidth: 0, + winHeight: 0, + // tab切换 + currentTab: 0, + obj: [], + goods: [], + idx: 0, + currency: [], + saletypeIndex: 0, + saletype: [{ + ID: 0, + Name: "请选择销售类型" + }], + departmentIndex: 0, + department: [{ + ID: 0, + Name: "请选择销售部门" + }], + customerIndex: 0, + customer: [{ + ID: 0, + Name: "请选择客户" + }], + isUnit: 0, + unit: [{ + ID: 0, + Name: "请选择会计单位" + }], + addrs: "", + dateTimeArray: null, + dateTime: null, + dateTimeArray1: null, + dateTime1: null, + startYear: 2018, + endYear: 2030 + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function(options) { + var that = this; + + // 获取完整的年月日 时分秒，以及默认显示的数组 + var obj1 = dateTimePicker.dateTimePicker(this.data.startYear, this.data.endYear); + // 精确到分的处理，将数组的秒去掉 + var lastArray = obj1.dateTimeArray.pop(); + var lastTime = obj1.dateTime.pop(); + + this.setData({ + dateTimeArray: obj1.dateTimeArray, + dateTime: obj1.dateTime, + dateTimeArray1: obj1.dateTimeArray, + dateTime1: obj1.dateTime + }); + /** + * 获取系统信息 + */ + wx.getSystemInfo({ + + success: function(res) { + that.setData({ + winWidth: res.windowWidth, + winHeight: res.windowHeight + }); + } + + }); + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady: function() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow: function() { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide: function() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload: function() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh: function() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function() { + + }, + /** + * 滑动切换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 + }) + } + }, + + getAddrs: function(e) { + this.data.addrs = e.detail.value; + }, + add: function(e) { + + let newobj = { + Goods_Name: "请选择存货" + }; + + this.data.obj.push(newobj) + + let aaa = this.data.obj; + + this.setData({ + obj: aaa, + }) + }, + deleteItem: function(e) { + let idx = e.target.dataset.idx; + let deleteobj = this.data.obj; + deleteobj.splice(idx, 1) + this.setData({ + obj: deleteobj + }) + }, + + getGoodsNum: function(e) { + //值： + //e.detail.value + //设置的id + //e.target.dataset.index + let value = e.detail.value; + let idx = e.target.dataset.idx; + + let end = value.charAt(value.length - 1) + if (end != ".") { + + this.data.obj[idx].goodsNum = Number(value); + + let Goods_MainUnitRatio = this.data.obj[idx].Goods_MainUnitRatio + let Goods_SecondUnitRatio = this.data.obj[idx].Goods_SecondUnitRatio + let Goods_UnitConvertDirection = this.data.obj[idx].Goods_UnitConvertDirection + let RightRatio = this.data.obj[idx].RightRatio + let LeftRatio = this.data.obj[idx].LeftRatio + + var numberNumber = Number(value) / RightRatio * LeftRatio; + if (Goods_UnitConvertDirection == 0 || Goods_UnitConvertDirection == 1) { + let secondNumber = numberNumber / (Goods_MainUnitRatio) * (Goods_SecondUnitRatio); + this.data.obj[idx].goodsSecondNum = Number(secondNumber) + this.setData({ + obj: this.data.obj + }) + } + } + + }, + getSecondNum: function(e) { + let value = e.detail.value; + let idx = e.target.dataset.idx; + + let end = value.charAt(value.length - 1) + if (end != ".") { + this.data.obj[idx].goodsSecondNum = Number(value); + + let Goods_MainUnitRatio = this.data.obj[idx].Goods_MainUnitRatio + let Goods_SecondUnitRatio = this.data.obj[idx].Goods_SecondUnitRatio + let Goods_UnitConvertDirection = this.data.obj[idx].Goods_UnitConvertDirection + let RightRatio = this.data.obj[idx].RightRatio + let LeftRatio = this.data.obj[idx].LeftRatio + + var numberNumber = Number(value) / LeftRatio * RightRatio; + if (Goods_UnitConvertDirection == 0 || Goods_UnitConvertDirection == 2) { + let unitnumber = numberNumber / (Goods_SecondUnitRatio) * (Goods_MainUnitRatio); + this.data.obj[idx].goodsNum = Number(unitnumber) + this.setData({ + obj: this.data.obj + }) + } + } + }, + getPrice: function(e) { + let value = e.detail.value; + let idx = e.target.dataset.idx; + this.data.obj[idx].Price = Number(value); + }, + powerDrawer: function(e) { + let that = this; + let x = e.currentTarget.dataset.x; + if (x == "会计部门") { + GetAccountingUnit(that, "") + } else if (x == "购货客户") { + GetCustomer(that, "") + } else if (x == "部门") { + GetDepartment(that, "") + } else if (x == "销售类型") { + GetSaleKind(that, "") + } + let currentStatu = e.currentTarget.dataset.statu; + // if (e.currentTarget.dataset.idx != null) { + // let idxx = e.currentTarget.dataset.idx; + // this.setData({ + // idx: idxx + // }) + // } + this.util(currentStatu) + }, + powerDrawer1: function(e) { + let that = this; + let currentStatu = e.currentTarget.dataset.statu; + + let timestamp = Date.parse(new Date()); + let date = "/Date(" + timestamp + "+0800)/"; + GetGoodsWithUnitPrice(that, "", date) + + if (e.currentTarget.dataset.idx != null) { + let idxx = e.currentTarget.dataset.idx; + this.setData({ + idx: idxx + }) + } + this.util1(currentStatu) + + }, + itemclick: function(e) { + var that = this; + var name = e.currentTarget.dataset.name; + var id = e.currentTarget.dataset.id; + var which = e.currentTarget.dataset.item; + var idx = e.currentTarget.dataset.idx; + + if (which == "会计部门") { + that.setData({ + isUnit: idx + }) + } else if (which == "购货客户") { + that.setData({ + customerIndex: idx + }) + } else if (which == "部门") { + that.setData({ + departmentIndex: idx + }) + } else if (which == "销售类型") { + that.setData({ + saletypeIndex: idx + }) + } + + this.setData({ + showModalStatus: false, + }) + }, + itemclick1: function(e) { + var that = this; + var name = e.currentTarget.dataset.name; + var id = e.currentTarget.dataset.data.SaleGoods_ID; + var pp = e.currentTarget.dataset.policyprice; + var price = e.currentTarget.dataset.data.Price; + var Goods_MainUnitRatio = e.currentTarget.dataset.data.Goods_MainUnitRatio + var Goods_SecondUnitRatio = e.currentTarget.dataset.data.Goods_SecondUnitRatio + var Goods_UnitConvertDirection = e.currentTarget.dataset.data.Goods_UnitConvertDirection + + if (e.currentTarget.dataset.data.RightRatio == null) { + this.data.obj[this.data.idx].RightRatio = Number(1) + } + if (e.currentTarget.dataset.data.LeftRatio == null) { + this.data.obj[this.data.idx].LeftRatio = Number(1) + } + this.data.obj[this.data.idx].Goods_MainUnitRatio = Number(Goods_MainUnitRatio) + this.data.obj[this.data.idx].Goods_SecondUnitRatio = Number(Goods_SecondUnitRatio) + this.data.obj[this.data.idx].SaleGoods_ID = Number(id); + this.data.obj[this.data.idx].Goods_Name = name; + this.data.obj[this.data.idx].Price = Number(price) + this.data.obj[this.data.idx].PolicyPrice = Number(pp); + this.data.obj[this.data.idx].Goods_UnitConvertDirection = Number(Goods_UnitConvertDirection) + this.setData({ + showModalStatus1: false, + obj: that.data.obj + }) + }, + select: function(e) { + var that = this; + var which = e.currentTarget.dataset.item; + var value = e.detail.value; + if (which == "会计部门") { + GetAccountingUnit(that, value) + } else if (which == "购货客户") { + GetCustomer(that, value) + } else if (which == "部门") { + GetDepartment(that, value) + } else if (which == "销售类型") { + GetSaleKind(that, value) + } + }, + select1: function(e) { + var that = this; + var value = e.detail.value; + let timestamp = Date.parse(new Date()); + let date = "/Date(" + timestamp + "+0800)/"; + GetGoodsWithUnitPrice(that, value, date) + }, + submitForm: function() { + let unitID = this.data.unit[this.data.isUnit].ID; + let customerID = this.data.customer[this.data.customerIndex].ID; + let departmentID = this.data.department[this.data.departmentIndex].ID; + let saletypeID = this.data.saletype[this.data.saletypeIndex].ID; + + let year = this.data.dateTimeArray1[0][this.data.dateTime1[0]] + let month = this.data.dateTimeArray1[1][this.data.dateTime1[1]] + let date = this.data.dateTimeArray1[2][this.data.dateTime1[2]] + let hour = this.data.dateTimeArray1[3][this.data.dateTime1[3]] + let minu = this.data.dateTimeArray1[4][this.data.dateTime1[4]] + + let stringTime = year + "/" + month + "/" + date + " " + hour + ":" + minu + ":00" + let timestamp2 = Date.parse(new Date(stringTime)); + let update = "/Date(" + timestamp2 + "+0800)/"; + + if (customerID == 0) { + wx.showToast({ + title: '请选择购货客户' + }) + return; + } + if (unitID == 0) { + wx.showToast({ + title: '请选择会计单位' + }) + return; + } + + if (departmentID == 0) { + wx.showToast({ + title: '请选择销售部门', + }) + return; + } + + if (saletypeID == 0) { + wx.showToast({ + title: '请选择销售类型', + }) + return; + } + if (this.data.addrs == "") { + wx.showToast({ + title: '请填写送货地址', + }) + return; + } + + let detailsArray = []; + + for (var i = 0; i < this.data.obj.length; i++) { + if (this.data.obj[i].Goods_Name == "请选择存货") { + wx.showToast({ + title: '存货不能为空', + }) + return; + } + if (this.data.obj[i].goodsNum == null) { + wx.showToast({ + title: '报货数量不能为空', + }) + return; + } + if (this.data.obj[i].goodsSecondNum == null) { + wx.showToast({ + title: '辅数量不能为空', + }) + return; + } + var dmo = { + SaleGoods_ID: this.data.obj[i].SaleGoods_ID, + UnitNum: this.data.obj[i].goodsNum, + SecondNumber: this.data.obj[i].goodsSecondNum, + Price: this.data.obj[i].Price, + PolicyPrice: this.data.obj[i].PolicyPrice + } + detailsArray.push(dmo) + } + + + let method = '/MainSystem/B3MiniProgramRpc/XuRpcs/Employee/OrderRpc/Insert'; + let params = [{ + "Customer_ID": customerID, + "LoadTime": update, + "AccountingUnit_ID": unitID, + "Department_ID": departmentID, + "SaleKind_ID": saletypeID, + "DeliverAddress": this.data.addrs, + "Details": detailsArray + + }]; + network.transfer_request(method, params, function(res) { + if (res.result != null) { + wx.showModal({ + title: '新建订单No.' + res.result, + content: '新建成功,是否返回首页', + success: function (res) { + if (res.cancel) { + } else { + wx.navigateBack({ + delta: 1 + }) + } + }, + fail: function (res) { } + }) + } + }) + + }, + changeDateTime1(e) { + this.setData({ + dateTime1: e.detail.value + }); + + }, + util: function(currentStatu) { + /* 动画部分 */ + // 第1步：创建动画实例 + var animation = wx.createAnimation({ + duration: 200, //动画时长 + timingFunction: "linear", //线性 + delay: 0 //0则不延迟 + }); + + // 第2步：这个动画实例赋给当前的动画实例 + this.animation = animation; + + // 第3步：执行第一组动画 + animation.opacity(0).rotateX(-100).step(); + + // 第4步：导出动画对象赋给数据对象储存 + this.setData({ + animationData: animation.export() + }) + + // 第5步：设置定时器到指定时候后，执行第二组动画 + setTimeout(function() { + // 执行第二组动画 + animation.opacity(1).rotateX(0).step(); + // 给数据对象储存的第一组动画，更替为执行完第二组动画的动画对象 + this.setData({ + animationData: animation + }) + + //关闭 + if (currentStatu == "close") { + this.setData({ + showModalStatus: false, + }); + } + }.bind(this), 200) + + // 显示 + if (currentStatu == "open") { + // 调用函数时，传入new Date()参数，返回值是日期和时间 + // var timet = utilll.formatTime(new Date()); + // 再通过setData更改Page()里面的data，动态更新页面的数据 + this.setData({ + // time: timet, + showModalStatus: true, + }); + } + }, + util1: function(currentStatu) { + /* 动画部分 */ + // 第1步：创建动画实例 + var animation = wx.createAnimation({ + duration: 200, //动画时长 + timingFunction: "linear", //线性 + delay: 0 //0则不延迟 + }); + + // 第2步：这个动画实例赋给当前的动画实例 + this.animation = animation; + + // 第3步：执行第一组动画 + animation.opacity(0).rotateX(-100).step(); + + // 第4步：导出动画对象赋给数据对象储存 + this.setData({ + animationData: animation.export() + }) + + // 第5步：设置定时器到指定时候后，执行第二组动画 + setTimeout(function() { + // 执行第二组动画 + animation.opacity(1).rotateX(0).step(); + // 给数据对象储存的第一组动画，更替为执行完第二组动画的动画对象 + this.setData({ + animationData: animation + }) + + //关闭 + if (currentStatu == "close") { + this.setData({ + showModalStatus1: false + }); + } + }.bind(this), 200) + + // 显示 + if (currentStatu == "open") { + // 调用函数时，传入new Date()参数，返回值是日期和时间 + // var timet = utilll.formatTime(new Date()); + // 再通过setData更改Page()里面的data，动态更新页面的数据 + this.setData({ + // time: timet, + showModalStatus1: true + }); + } + } +}) \ No newline at end of file diff --git a/pages/order/newBill/newBill.json b/pages/order/newBill/newBill.json new file mode 100644 index 0000000..595818d --- /dev/null +++ b/pages/order/newBill/newBill.json @@ -0,0 +1,3 @@ +{ + "navigationBarTitleText": "销售订单" +} \ No newline at end of file diff --git a/pages/order/newBill/newBill.wxml b/pages/order/newBill/newBill.wxml new file mode 100644 index 0000000..a278e2e --- /dev/null +++ b/pages/order/newBill/newBill.wxml @@ -0,0 +1,169 @@ + + + 基本信息 + 订单详细 + + + + + + + + 购货客户 + + + {{customer[customerIndex].Name}} + + + + + 发货时间 + + + {{dateTimeArray1[0][dateTime1[0]]}}-{{dateTimeArray1[1][dateTime1[1]]}}-{{dateTimeArray1[2][dateTime1[2]]}} {{dateTimeArray1[3][dateTime1[3]]}}:{{dateTimeArray1[4][dateTime1[4]]}} + + + + + + 会计单位 + + + {{unit[isUnit].Name}} + + + + + + + 销售部门 + + + {{department[departmentIndex].Name}} + + + + + 销售类型 + + + {{saletype[saletypeIndex].Name}} + + + + + + + + + 送货地址 + + + + + + + + + + + + + + + + + + + + {{item.Name}} + + + + 取消 + + + + + + + + + + + 存货名称 + + {{obj[idx].Goods_Name}} + + + + + + 报货数量 + + + + + 辅 数 量 + + + + + + + + 单 价 + + + + + 政策单价 + {{obj[idx].PolicyPrice}} + + + 删除 + + + + + + + + + + + + + + + + + + + + + + + + + {{item.Goods_Name}} + + + + 取消 + + + \ No newline at end of file diff --git a/pages/order/newBill/newBill.wxss b/pages/order/newBill/newBill.wxss new file mode 100644 index 0000000..04afcdd --- /dev/null +++ b/pages/order/newBill/newBill.wxss @@ -0,0 +1,235 @@ +/* pages/saleforecast/saleforecast.wxss */ + +page { + background: rgb(240, 239, 245); +} + +.swiper-tab { + width: 100%; + text-align: center; + line-height: 80rpx; + display: flex; + flex-direction: row; + justify-content: center; + border-bottom: 0.2rpx solid rgb(223, 218, 218); +} + +.swiper-tab-list { + font-size: 30rpx; + width: 40%; + color: #777; + margin-top: 5rpx; + height: 60rpx; + line-height: 60rpx; +} + +.tab1 { + border-top: 2rpx solid #999; + border-bottom: 2rpx solid #999; + border-left: 2rpx solid #999; + border-radius: 20rpx 0rpx 0rpx 20rpx; + background: white; +} + +.tab2 { + border-top: 2rpx solid #999; + border-bottom: 2rpx solid #999; + border-right: 2rpx solid #999; + border-radius: 0rpx 20rpx 20rpx 0rpx; + background: white; +} + +.on { + background: #2788f8; + color: white; +} + +.swiper-box { + display: block; + height: 100%; + width: 100%; + overflow: hidden; +} + +.swiper-items1 { + height: 100%; + padding-top: 3%; +} + +.swiper-items2 { + height: 100%; +} + +.scroll-views { + height: 100%; +} + +.baseitem { + background: #fff; + width: 100%; + border-bottom: 0.1px solid #dbdbdb; + display: flex; + flex-direction: row; + align-items: center; + padding-top: 20rpx; + padding-bottom: 20rpx; +} + +.twogroup { + display: flex; + flex-direction: row; +} + +.baseitem_key { + color: black; + width: 20%; + margin-left: 5%; +} + +.baseitem_value { + margin-left: 5%; + width: 70%; + color: rgb(48, 48, 48); +} + +.baseitem_key2 { + color: black; + width: 20%; + font-size: 30rpx; + margin-left: 10rpx; +} + +.baseitem_value2 { + color: rgb(48, 48, 48); + font-size: 30rpx; +} + +.baseitem_key1 { + color: black; + width: 40%; + font-size: 30rpx; + margin-left: 10rpx; +} + +.baseitem_value1 { + color: rgb(48, 48, 48); + font-size: 30rpx; + margin-left: 20rpx; + width: 60%; +} + +::-webkit-scrollbar { + width: 0; + height: 0; + color: transparent; +} + +.add { + display: flex; + flex-direction: row; + align-items: center; + justify-content: center; + border-left: none; + background: #fff; + width: 100%; + margin-top: 20rpx; + border-top: 0.5px solid #e0e0e0; + border-bottom: 0.5px solid #e0e0e0; + padding-top: 20rpx; + padding-bottom: 20rpx; +} + +.ico { + height: 42rpx; + width: 42rpx; +} + +.delete { + width: 100%; + padding-top: 20rpx; + padding-bottom: 20rpx; + color: red; + display: flex; + flex-direction: row; + align-items: center; + justify-content: center; + background: #fff; + font-size: 30rpx; +} + +.itemView { + margin-top: 20rpx; +} + +.submit { + margin-left: 5%; + margin-top: 10%; + width: 90%; + margin-right: 5%; + color: #fff; + background: linear-gradient(to right, #39c4fd, #539eef); +} + +.drawer_screen { + width: 100%; + height: 100%; + position: fixed; + top: 0; + left: 0; + z-index: 1000; + background: #000; + opacity: 0.5; + overflow: hidden; +} + +.sousuo { + margin-right: 10%; + margin-left: 10%; + text-align: center; + background: #d6d8da; + height: 40px; + font-size: 28rpx; +} + +.drawer_content { + height: 500rpx; + overflow-y: scroll; /*超出父盒子高度可滚动*/ +} + +.drawer_box { + width: 650rpx; + overflow: hidden; + position: fixed; + top: 50%; + left: 0; + z-index: 1001; + background: #fafafa; + margin: -150px 50rpx 0 50rpx; + border-radius: 3px; +} + +.btn_ok { + padding: 10px; + font: 20px "microsoft yahei"; + text-align: center; + border-top: 1px solid #e8e8ea; + color: #2E8CF5; +} + +.top { + height: 20%; + justify-content: center; + align-items: center; +} + +.grid1 { + width: 100%; + border-bottom: 1px solid #c3c3c3; + padding-top: 5px; + padding-bottom: 10px; +} + +.text3 { + font-size: 18px; + color: rgb(48, 48, 48); +} diff --git a/pages/order/order.js b/pages/order/order.js new file mode 100644 index 0000000..9ec4968 --- /dev/null +++ b/pages/order/order.js @@ -0,0 +1,164 @@ +// pages/order/order.js +var app = getApp(); +var network = require("../../utils/net.js") +var timechage = require("../../utils/dateTimeUtil.js") +var PageIndex = 0 +var PageSize = 10 +var getListPath = '/MainSystem/B3MiniProgramRpc/XuRpcs/Employee/OrderRpc/GetList' + +function getList(that, PageIndex, PageSize) { + let method = getListPath + let params = [{ + "BillState": app.globalData.SelectBillState, + "StartLoadTime": app.globalData.SelectStartDate, + "EndLoadTime": app.globalData.SelectEndDate, + "Customer_ID": app.globalData.SelectCustomer_ID, + "PageIndex": PageIndex, + "PageSize": PageSize + }]; + + network.transfer_request(method, params, function(res) { + that.setData({ + arry: res.result + }) + setColor(that) + }) +} + +function setColor(that) { + let array = []; + for (var i = 0; i < that.data.arry.length; i++) { + var color = ""; + if (that.data.arry[i].BillState == "未审核") { + color = "rgb(231,20,20)" + } else if (that.data.arry[i].BillState == "已审核") { + color = "rgb(136,136,136)" + } + var dmo = { + Customer_Name: that.data.arry[i].Customer_Name, + LoadTime: timechage.formatTimeTwo(that.data.arry[i].LoadTime.substring(6, 19), 'Y/M/D h:m'), + BillState: that.data.arry[i].BillState, + ID: that.data.arry[i].ID, + DepartmentWorkFlow_Detail_Name: that.data.arry[i].DepartmentWorkFlow_Detail_Name, + color: color, + Money: that.data.arry[i].Money, + Number: that.data.arry[i].Number + }; + array.push(dmo); + } + that.setData({ + array: array + }) +} + +Page({ + + /** + * 页面的初始数据 + */ + data: { + array: [], + arry: [] + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function(options) { + + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady: function() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow: function() { + var that = this; + PageIndex = 0 + PageSize = 10 + getList(that, PageIndex, PageSize) + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide: function() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload: function() { + PageIndex = 0 + PageSize = 10 + this.setData({ + array: [], + arry: [] + }) + app.globalData.SelectCustomer_ID = null + app.globalData.SelectStartDate = null + app.globalData.SelectEndDate = null + app.globalData.SelectBillState = 0 + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh: function() { + console.log('00000-----------') + var that = this; + PageIndex = 0; + PageSize = 10; + getList(that, PageIndex, PageSize) + wx.stopPullDownRefresh() //停止下拉刷新 + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function() { + console.log('baseUrl-----------') + var that = this; + PageIndex = PageIndex + 1; + PageSize = 10; + let method = getListPath; + let params = [{ + "BillState": app.globalData.SelectBillState, + "StartLoadTime": app.globalData.SelectStartDate, + "EndLoadTime": app.globalData.SelectEndDate, + "Customer_ID": app.globalData.SelectCustomer_ID, + "PageIndex": PageIndex, + "PageSize": PageSize + }]; + + network.transfer_request(method, params, function(res) { + let addarry = that.data.arry.concat(res.result) + that.setData({ + arry: addarry + }) + setColor(that) + }) + }, + itemclick: function(e) { + wx.navigateTo({ + url: 'detail/detail?ID=' + e.currentTarget.dataset.data.ID, + }) + }, + createNew: function(e) { + wx.navigateTo({ + url: 'newBill/newBill', + }) + }, + chose: function(e) { + wx.navigateTo({ + url: 'query/query', + }) + } +}) \ No newline at end of file diff --git a/pages/order/order.json b/pages/order/order.json new file mode 100644 index 0000000..5bdde25 --- /dev/null +++ b/pages/order/order.json @@ -0,0 +1,4 @@ +{ + "navigationBarTitleText": "订单列表", + "enablePullDownRefresh": true +} \ No newline at end of file diff --git a/pages/order/order.wxml b/pages/order/order.wxml new file mode 100644 index 0000000..17dae6d --- /dev/null +++ b/pages/order/order.wxml @@ -0,0 +1,20 @@ + + + + + + {{item.Customer_Name}} + {{item.BillState}} + + + No.{{item.ID}} + 发货时间：{{item.LoadTime}} + + + + + + + + + \ No newline at end of file diff --git a/pages/order/order.wxss b/pages/order/order.wxss new file mode 100644 index 0000000..89f5a2b --- /dev/null +++ b/pages/order/order.wxss @@ -0,0 +1,69 @@ +/* pages/order/order.wxss */ +page{ + background: rgb(240, 239, 245) +} +.custmer_list{ + margin-bottom: 10%; +} + +.custmer_list_view{ + display: flex; + flex-direction: column; + padding-left: 5%; + padding-top: 16rpx; + background: white; +} + + +.phone_h{ + display: flex; + flex-direction: row; + justify-content: space-between; + padding-top: 12rpx; + padding-right: 5%; + padding-bottom: 10rpx; +} + +.text_name{ + font-size: 32rpx; + color: rgb(48, 48, 48); +} + +.text_state{ + font-size: 28rpx; +} +.text_id{ + font-size: 28rpx; + color: rgb(136, 136, 136); +} + +.text_time{ + font-size: 28rpx; + color: rgb(136, 136, 136); +} + +.view_line_main{ + background: white +} +.view_line{ + width: 92%; + height: 2rpx; + margin-left: 4%; + margin-right: 4%; + background: rgb(219, 219, 219); +} + +.chose{ + width: 100%; + position: fixed; + bottom: 0rpx; +} + + +.xinjian{ + width: 160rpx; + height: 160rpx; + position: fixed; + bottom: 60rpx; + right: 20rpx; +} diff --git a/pages/order/query/query.js b/pages/order/query/query.js new file mode 100644 index 0000000..3482f7a --- /dev/null +++ b/pages/order/query/query.js @@ -0,0 +1,212 @@ +// pages/orderSearch/orderSearch.js +var network = require("../../../utils/net.js") +var timechage = require("../../../utils/dateTimeUtil.js") +var app = getApp() + +function GetCustomer(that, inputValue) { + let method = "/MainSystem/B3MiniProgramRpc/Rpcs/BaseInfoRpc/GetCustomer"; + let params = [{ + "InputValue": inputValue, + "PageIndex": 0, + "PageSize": 100 + }]; + network.transfer_request(method, params, function (res) { + that.setData({ + currency: res.result, + customer: res.result + }) + }) + that.setData({ + which: "购货客户" + }) +} + +Page({ + + /** + * 页面的初始数据 + */ + data: { + customerIndex: 0, + customer: [{ + ID: 0, + Name: "请选择购货客户" + }], + currency: [], + Sdate: timechage.formatTimeTwo(Date.parse(new Date()), 'Y-M-D'), + Edate: timechage.formatTimeTwo(Date.parse(new Date()), 'Y-M-D'), + billIndex:0, + billState:[ + { + ID:0, + Name:"未审核" + }, + { + ID: 20, + Name: "已审核" + } + ] + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady: function () { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow: function () { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide: function () { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload: function () { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh: function () { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function () { + + }, + choseBillState:function(e){ + this.setData({ + billIndex: e.detail.value + }) + }, + bindSDateChange: function (e) { + this.setData({ + Sdate: e.detail.value + }) + }, + bindEDateChange: function (e) { + this.setData({ + Edate: e.detail.value + }) + }, + submitForm: function (e) { + let customerID = this.data.customer[this.data.customerIndex].ID; + let sDate = timechage.formatymdERTDate(this.data.Sdate); + let eDate = timechage.formatymdERTDate(this.data.Edate); + if (customerID == 0) { + app.globalData.SelectCustomer_ID = null; + } else { + app.globalData.SelectCustomer_ID = customerID; + } + app.globalData.SelectStartDate = sDate; + app.globalData.SelectEndDate = eDate; + + app.globalData.SelectBillState = this.data.billState[this.data.billIndex].ID + + wx.navigateBack({ + delta: 1 + }) + }, + powerDrawer: function (e) { + let that = this; + let x = e.currentTarget.dataset.x; + if (x == "购货客户") { + GetCustomer(that, "") + } + let currentStatu = e.currentTarget.dataset.statu; + this.util(currentStatu) + }, + itemclick: function (e) { + var that = this; + var name = e.currentTarget.dataset.name; + var id = e.currentTarget.dataset.id; + var which = e.currentTarget.dataset.item; + var idx = e.currentTarget.dataset.idx; + + if (which == "购货客户") { + that.setData({ + customerIndex: idx + }) + } + + this.setData({ + showModalStatus: false, + }) + }, + select: function (e) { + var that = this; + var which = e.currentTarget.dataset.item; + var value = e.detail.value; + if (which == "购货客户") { + GetCustomer(that, value) + } + }, + util: function (currentStatu) { + /* 动画部分 */ + // 第1步：创建动画实例 + var animation = wx.createAnimation({ + duration: 200, //动画时长 + timingFunction: "linear", //线性 + delay: 0 //0则不延迟 + }); + + // 第2步：这个动画实例赋给当前的动画实例 + this.animation = animation; + + // 第3步：执行第一组动画 + animation.opacity(0).rotateX(-100).step(); + + // 第4步：导出动画对象赋给数据对象储存 + this.setData({ + animationData: animation.export() + }) + + // 第5步：设置定时器到指定时候后，执行第二组动画 + setTimeout(function () { + // 执行第二组动画 + animation.opacity(1).rotateX(0).step(); + // 给数据对象储存的第一组动画，更替为执行完第二组动画的动画对象 + this.setData({ + animationData: animation + }) + + //关闭 + if (currentStatu == "close") { + this.setData({ + showModalStatus: false, + }); + } + }.bind(this), 200) + + // 显示 + if (currentStatu == "open") { + // 调用函数时，传入new Date()参数，返回值是日期和时间 + // 再通过setData更改Page()里面的data，动态更新页面的数据 + this.setData({ + showModalStatus: true, + }); + } + } +}) \ No newline at end of file diff --git a/pages/order/query/query.json b/pages/order/query/query.json new file mode 100644 index 0000000..a3d1541 --- /dev/null +++ b/pages/order/query/query.json @@ -0,0 +1,3 @@ +{ + "navigationBarTitleText": "订单筛选" +} \ No newline at end of file diff --git a/pages/order/query/query.wxml b/pages/order/query/query.wxml new file mode 100644 index 0000000..394dcf9 --- /dev/null +++ b/pages/order/query/query.wxml @@ -0,0 +1,57 @@ + + + 购货客户 + {{customer[customerIndex].Name}} + + + + + 开始日期 + + + {{Sdate}} + + + + + + + 结束日期 + + + {{Edate}} + + + + + + 单据状态 + + + {{billState[billIndex].Name}} + + + + + + + + + + + + + + + + + + + + + {{item.Name}} + + + + 取消 + \ No newline at end of file diff --git a/pages/order/query/query.wxss b/pages/order/query/query.wxss new file mode 100644 index 0000000..797205a --- /dev/null +++ b/pages/order/query/query.wxss @@ -0,0 +1,94 @@ +/* pages/orderSearch/orderSearch.wxss */ +page { + background: rgb(240, 239, 245); +} + +.twoitem{ + display: flex; + flex-direction: row; + justify-content: space-between; + padding-right: 5%; + padding-left: 5%; + background: #fff; + border-bottom: 1rpx solid #dbdbdb; + padding-top: 20rpx; + padding-bottom: 20rpx; +} + +.item_value{ + width: 70%; + text-align: right +} + +.submit { + margin-top: 50rpx; + margin-bottom: 30rpx; +} + + +.drawer_screen { + width: 100%; + height: 100%; + position: fixed; + top: 0; + left: 0; + z-index: 1000; + background: #000; + opacity: 0.5; + overflow: hidden; +} + +.drawer_box { + width: 650rpx; + overflow: hidden; + position: fixed; + top: 50%; + left: 0; + z-index: 1001; + background: #fafafa; + margin: -150px 50rpx 0 50rpx; + border-radius: 3px; +} + + +.top { + height: 20%; + justify-content: center; + align-items: center; +} + +.sousuo { + margin-right: 10%; + margin-left: 10%; + text-align: center; + background: #d6d8da; + height: 40px; + font-size: 28rpx; +} + +.drawer_content { + height: 500rpx; + overflow-y: scroll; /*超出父盒子高度可滚动*/ +} + + +.btn_ok { + padding: 10px; + font: 20px "microsoft yahei"; + text-align: center; + border-top: 1px solid #e8e8ea; + color: #2E8CF5; +} + + +.grid1 { + width: 100%; + border-bottom: 1px solid #c3c3c3; + padding-top: 5px; + padding-bottom: 10px; +} + +.text3 { + font-size: 18px; + color: rgb(48, 48, 48); +} \ No newline at end of file diff --git a/pages/saleForecastList/saleForecastList.js b/pages/saleForecastList/saleForecastList.js index b9dcc2b..926d687 100644 --- a/pages/saleForecastList/saleForecastList.js +++ b/pages/saleForecastList/saleForecastList.js @@ -173,17 +173,22 @@ Page({ getUnCheckOrderList(that, UnCheckPageIndex, UnCheckPageSize); getCheckedOrderList(that, CheckedPageIndex, CheckedPageSize); }, + /** * 生命周期函数--监听页面卸载 */ - onUnload: function () { - + onUnload: function () { + + app.globalData.SelectCustomer_ID = null + app.globalData.SelectStartDate = null + app.globalData.SelectEndDate = null + app.globalData.SelectBillState = 0 }, //未审核订单滑动到底部加载 unCheckedScrollLower: function (event) { var that = this; UnCheckPageIndex = UnCheckPageIndex + 1; - getUnCheckOrderList(that, UnCheckPageIndex, UnCheckPageSize); + getUnCheckOrderList(that, UnCheckPageIndex, UnCheckPageSize); }, //已审核订单滑动到底部加载 @@ -204,5 +209,6 @@ Page({ CheckedPageIndex = CheckedPageIndex + 1; getCheckedOrderList(that, CheckedPageIndex, CheckedPageSize); } + }, }) \ No newline at end of file diff --git a/pages/saleForecastList/saleForecastList.wxml b/pages/saleForecastList/saleForecastList.wxml index 7715556..c92bc35 100644 --- a/pages/saleForecastList/saleForecastList.wxml +++ b/pages/saleForecastList/saleForecastList.wxml @@ -6,16 +6,16 @@ - - + +