From 16a04a0514afda719fbcfef7d4940d1a3d042116 Mon Sep 17 00:00:00 2001 From: chenxuhui Date: Tue, 27 Nov 2018 16:20:50 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E7=89=B9=E4=BB=B7=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=EF=BC=8C=E5=AD=98=E8=B4=A7=E5=92=8C=E5=AE=A2=E6=88=B7=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E8=BF=94=E5=9B=9E=E6=95=B0=E6=8D=AE=E5=80=BC=E7=9A=84?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E5=88=A4=E6=96=AD=202=E3=80=81=E7=89=B9?= =?UTF-8?q?=E4=BB=B7=E7=94=B3=E8=AF=B7=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E5=88=9B=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.json | 3 +- .../customerChooseTemplate.js | 13 +- .../goodaNameChooseTemplate.js | 9 ++ pages/saleForecastList/newBill/newBill.js | 104 ++++++++------- .../creatNewSpecialOrder.js | 123 +++++++++--------- .../creatNewSpecialOrder.wxml | 10 +- .../specialOrderApplyDetail.js | 66 ++++++++++ .../specialOrderApplyDetail.json | 1 + .../specialOrderApplyDetail.wxml | 2 + .../specialOrderApplyDetail.wxss | 1 + 10 files changed, 217 insertions(+), 115 deletions(-) create mode 100644 pages/specialOrderApplication/specialOrderApplyDetail/specialOrderApplyDetail.js create mode 100644 pages/specialOrderApplication/specialOrderApplyDetail/specialOrderApplyDetail.json create mode 100644 pages/specialOrderApplication/specialOrderApplyDetail/specialOrderApplyDetail.wxml create mode 100644 pages/specialOrderApplication/specialOrderApplyDetail/specialOrderApplyDetail.wxss diff --git a/app.json b/app.json index b97cc37..fc7cef6 100644 --- a/app.json +++ b/app.json @@ -22,7 +22,8 @@ "pages/specialOrderApplication/specialOrderApplication", "pages/specialOrderApplication/creatNewSpecialOrder/creatNewSpecialOrder", "pages/outStore/outStore", - "pages/outStore/outStoreDetail/outStoreDetail" + "pages/outStore/outStoreDetail/outStoreDetail", + "pages/specialOrderApplication/specialOrderApplyDetail/specialOrderApplyDetail" ], "window": { "backgroundTextStyle": "light", diff --git a/pages/customerChooseTemplate/customerChooseTemplate.js b/pages/customerChooseTemplate/customerChooseTemplate.js index 9ecf4ff..6ea6e62 100644 --- a/pages/customerChooseTemplate/customerChooseTemplate.js +++ b/pages/customerChooseTemplate/customerChooseTemplate.js @@ -1,5 +1,5 @@ // pages/customerChooseTemplate/customerChooseTemplate.js -// pages/goodaNameChooseTemplate/goodaNameChooseTemplate.js + var app = getApp() var network = require("../../utils/net.js") var dateTimePicker = require('../../utils/dateTimePicker.js'); @@ -56,6 +56,7 @@ Page({ // 点击添加存货明细按钮 存数据进入global addCustomerName: function () { + let choseCheck = [] // 对比原有数组和选中的数组 存在，将数组包含的其他值也取出加载 for (var i = 0; i < this.data.customerArray.length; i++) { @@ -66,9 +67,17 @@ Page({ } } app.globalData.customerArray = choseCheck; + var pages = getCurrentPages(); + var currPage = pages[pages.length - 1]; //当前页面 + var prevPage = pages[pages.length - 2]; //上一个页面 + //直接调用上一个页面对象的setData()方法，把数据存到上一个页面中去 + prevPage.setData({ + backPage: "customerChoosePage", + }); wx.navigateBack({ - delta: 1, + delta: 1 }) + }, /** diff --git a/pages/goodaNameChooseTemplate/goodaNameChooseTemplate.js b/pages/goodaNameChooseTemplate/goodaNameChooseTemplate.js index 9263328..05bc8ea 100644 --- a/pages/goodaNameChooseTemplate/goodaNameChooseTemplate.js +++ b/pages/goodaNameChooseTemplate/goodaNameChooseTemplate.js @@ -163,6 +163,15 @@ Page({ } } app.globalData.goodsNameArray = choseCheck; + + var pages = getCurrentPages(); + var currPage = pages[pages.length - 1]; //当前页面 + var prevPage = pages[pages.length - 2]; //上一个页面 + //直接调用上一个页面对象的setData()方法，把数据存到上一个页面中去 + prevPage.setData({ + backPage: "goodsNameChoosePage", + }); + wx.navigateBack({ delta: 1, }) diff --git a/pages/saleForecastList/newBill/newBill.js b/pages/saleForecastList/newBill/newBill.js index 3f7092d..05a6276 100644 --- a/pages/saleForecastList/newBill/newBill.js +++ b/pages/saleForecastList/newBill/newBill.js @@ -88,6 +88,10 @@ Page({ data: { which: "", winHeight: app.globalData.winHeight, + + // 从哪个页面返回当前页面 + backPage: "", + // tab切换 currentTab: 0, // 存货数组 @@ -151,58 +155,62 @@ Page({ onShow: function() { var that = this; - // 返回的用户只能是一条，所以index只能为0 - var customerArr = app.globalData.customerArray; - if (customerArr.length > 0) { - this.setData({ - customer: customerArr, - customerIndex: 0, - }) + if (that.data.backPage == "customerChoosePage") { + // 返回的用户只能是一条，所以index只能为0 + var customerArr = app.globalData.customerArray; + if (customerArr.length > 0) { + that.setData({ + customer: customerArr, + customerIndex: 0, + }) + } } - // 获取存货 加载完成后计算价格政策 - var goodsArr = app.globalData.goodsNameArray; - if (goodsArr.length > 0) { - let backGoodsArr = []; - for (var i = 0; i < goodsArr.length; i++) { - - var name = goodsArr[i].Goods_Name; - var id = goodsArr[i].SaleGoods_ID; - var pp = goodsArr[i].PolicyPrice; - var price = goodsArr[i].Price; - var mainUnitRatio = goodsArr[i].Goods_MainUnitRatio; - var secondUnitRatio = goodsArr[i].Goods_SecondUnitRatio; - var unitConvertDirection = goodsArr[i].Goods_UnitConvertDirection; - var rightRatio = goodsArr[i].RightRatio; - var leftRatio = goodsArr[i].LeftRatio; - - if (pp == null){ - pp =Number(0); - } - if (rightRatio == null) { - rightRatio = Number(1); - } - if (leftRatio == null) { - leftRatio = Number(1); + if (that.data.backPage == "goodsNameChoosePage") { + // 获取存货 加载完成后计算价格政策 + var goodsArr = app.globalData.goodsNameArray; + if (goodsArr.length > 0) { + let backGoodsArr = []; + for (var i = 0; i < goodsArr.length; i++) { + + var name = goodsArr[i].Goods_Name; + var id = goodsArr[i].SaleGoods_ID; + var pp = goodsArr[i].PolicyPrice; + var price = goodsArr[i].Price; + var mainUnitRatio = goodsArr[i].Goods_MainUnitRatio; + var secondUnitRatio = goodsArr[i].Goods_SecondUnitRatio; + var unitConvertDirection = goodsArr[i].Goods_UnitConvertDirection; + var rightRatio = goodsArr[i].RightRatio; + var leftRatio = goodsArr[i].LeftRatio; + + if (pp == null) { + pp = Number(0); + } + if (rightRatio == null) { + rightRatio = Number(1); + } + if (leftRatio == null) { + leftRatio = Number(1); + } + + let goodsNameObj = { + Goods_MainUnitRatio: Number(mainUnitRatio), + Goods_SecondUnitRatio: Number(secondUnitRatio), + SaleGoods_ID: Number(id), + Goods_Name: name, + Price: Number(price), + PolicyPrice: Number(pp), + Goods_UnitConvertDirection: Number(unitConvertDirection), + RightRatio: rightRatio, + LeftRatio: leftRatio, + } + backGoodsArr.push(goodsNameObj) } - let goodsNameObj = { - Goods_MainUnitRatio: Number(mainUnitRatio), - Goods_SecondUnitRatio: Number(secondUnitRatio), - SaleGoods_ID: Number(id), - Goods_Name: name, - Price: Number(price), - PolicyPrice: Number(pp), - Goods_UnitConvertDirection: Number(unitConvertDirection), - RightRatio: rightRatio, - LeftRatio: leftRatio, - } - backGoodsArr.push(goodsNameObj) + that.setData({ + obj: backGoodsArr, + }) } - - this.setData({ - obj: backGoodsArr, - }) } }, @@ -234,7 +242,7 @@ Page({ /** * 生命周期函数--监听页面卸载 */ - onUnload: function () { + onUnload: function() { app.globalData.goodsNameArray = []; app.globalData.customerArray = []; }, diff --git a/pages/specialOrderApplication/creatNewSpecialOrder/creatNewSpecialOrder.js b/pages/specialOrderApplication/creatNewSpecialOrder/creatNewSpecialOrder.js index 3c982a5..3a193ff 100644 --- a/pages/specialOrderApplication/creatNewSpecialOrder/creatNewSpecialOrder.js +++ b/pages/specialOrderApplication/creatNewSpecialOrder/creatNewSpecialOrder.js @@ -68,8 +68,8 @@ Page({ currentTab: 0, winHeight: app.globalData.winHeight, - starTime: timechage.formatTimeTwo(Date.parse(new Date()), 'Y-M-D'), - endTime: timechage.formatTimeTwo(Date.parse(new Date()), 'Y-M-D'), + // 从哪个页面返回当前页面 + backPage: "", dateTimeArray: null, dateTime: null, @@ -107,26 +107,28 @@ Page({ this.data.addrs = e.detail.value; }, - // 存货特价开始时间 - bindStartTimeChange: function (e) { - var itemIndex = e.currentTarget.dataset.index; - var array = this.data.goodsNameArr; - array[itemIndex]["applicationStartTime"]= e.detail.value, - this.setData({ - goodsNameArr: array, - }) - }, - - // 存货特价结束时间 - bindEndTimeChange: function (e) { + // 获取输入框值进行保存 + getInputValue:function (e){ + var style = e.currentTarget.dataset.datastyle var itemIndex = e.currentTarget.dataset.index; var array = this.data.goodsNameArr; - array[itemIndex]["applicationEndTime"] = e.detail.value, + array[itemIndex][style] = e.detail.value, this.setData({ goodsNameArr: array, }) }, + // 获取存货时间变化进行保存 + bindTimeChange: function (e) { + var style = e.currentTarget.dataset.datastyle + var itemIndex = e.currentTarget.dataset.index; + var array = this.data.goodsNameArr; + array[itemIndex][style]= e.detail.value, + this.setData({ + goodsNameArr: array, + }) + }, + // 基本信息日期 changeDateTime(e) { this.setData({ @@ -308,57 +310,60 @@ Page({ onShow: function () { var that = this; - // 返回的用户只能是一条，所以index只能为0 - var currentCustomerArr = app.globalData.customerArray; - if (currentCustomerArr.length > 0) { - this.setData({ - customerArr: currentCustomerArr, - }) - } + if (this.data.backPage == "customerChoosePage"){ + // 返回的用户只能是一条，所以index只能为0 + var currentCustomerArr = app.globalData.customerArray; + if (currentCustomerArr.length > 0) { + this.setData({ + customerArr: currentCustomerArr, + }) + } + } + + if (this.data.backPage == "goodsNameChoosePage") { + // 获取存货 加载完成后计算价格政策 + var goodsArr = app.globalData.goodsNameArray; + if (goodsArr.length > 0) { + let backGoodsArr = []; + for (var i = 0; i < goodsArr.length; i++) { + // 存货名称 + var name = goodsArr[i].Goods_Name; + // 存货ID + var id = goodsArr[i].SaleGoods_ID; + // 原单价 + var infoprice = goodsArr[i].Price; + if (infoprice == null) { + infoprice = ""; + } + // 特价 + var policyPrice = ""; + // 开始时间 + var infoStartTime = timechage.formatTimeTwo(Date.parse(new Date()), 'Y-M-D'); + // 结束时间 + var infoEndTime = timechage.formatTimeTwo(Date.parse(new Date()), 'Y-M-D'); + // 申请数量 + var infoNum = ""; + + let goodsNameObj = { + Goods_Name: name, + SaleGoods_ID: Number(id), + Price: infoprice, + applicationPrice: policyPrice, + applicationStartTime: infoStartTime, + applicationEndTime: infoEndTime, + applicationNum: infoNum, + } + backGoodsArr.push(goodsNameObj) - // 获取存货 加载完成后计算价格政策 - var goodsArr = app.globalData.goodsNameArray; - if (goodsArr.length > 0) { - let backGoodsArr = []; - for (var i = 0; i < goodsArr.length; i++) { - // 存货名称 - var name = goodsArr[i].Goods_Name; - // 存货ID - var id = goodsArr[i].SaleGoods_ID; - // 原单价 - var infoprice = goodsArr[i].Price; - if (infoprice == null){ - infoprice =""; - } - // 特价 - var policyPrice =""; - // 开始时间 - var infoStartTime = timechage.formatTimeTwo(Date.parse(new Date()), 'Y-M-D'); - // 结束时间 - var infoEndTime = timechage.formatTimeTwo(Date.parse(new Date()), 'Y-M-D'); - // 申请数量 - var infoNum = ""; - - let goodsNameObj = { - Goods_Name: name, - SaleGoods_ID: Number(id), - Price: infoprice, - applicationPrice: policyPrice, - applicationStartTime: infoStartTime, - applicationEndTime: infoEndTime, - applicationNum: infoNum, } - backGoodsArr.push(goodsNameObj) - console.log(backGoodsArr); + this.setData({ + goodsNameArr: backGoodsArr, + }) } - this.setData({ - goodsNameArr: backGoodsArr, - }) } - }, /** diff --git a/pages/specialOrderApplication/creatNewSpecialOrder/creatNewSpecialOrder.wxml b/pages/specialOrderApplication/creatNewSpecialOrder/creatNewSpecialOrder.wxml index 42f00e0..3ce52bc 100644 --- a/pages/specialOrderApplication/creatNewSpecialOrder/creatNewSpecialOrder.wxml +++ b/pages/specialOrderApplication/creatNewSpecialOrder/creatNewSpecialOrder.wxml @@ -168,7 +168,7 @@ 原单价 - + @@ -177,7 +177,7 @@ 特价 - + @@ -185,7 +185,7 @@ 开始时间 - + {{item.applicationStartTime}} @@ -195,7 +195,7 @@ 结束时间 - + {{item.applicationEndTime}} @@ -206,7 +206,7 @@ 申请数量 - + diff --git a/pages/specialOrderApplication/specialOrderApplyDetail/specialOrderApplyDetail.js b/pages/specialOrderApplication/specialOrderApplyDetail/specialOrderApplyDetail.js new file mode 100644 index 0000000..da8dcd0 --- /dev/null +++ b/pages/specialOrderApplication/specialOrderApplyDetail/specialOrderApplyDetail.js @@ -0,0 +1,66 @@ +// pages/specialOrderApplication/specialOrderApplyDetail/specialOrderApplyDetail.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady: function () { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow: function () { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide: function () { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload: function () { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh: function () { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function () { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage: function () { + + } +}) \ No newline at end of file diff --git a/pages/specialOrderApplication/specialOrderApplyDetail/specialOrderApplyDetail.json b/pages/specialOrderApplication/specialOrderApplyDetail/specialOrderApplyDetail.json new file mode 100644 index 0000000..9e26dfe --- /dev/null +++ b/pages/specialOrderApplication/specialOrderApplyDetail/specialOrderApplyDetail.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/pages/specialOrderApplication/specialOrderApplyDetail/specialOrderApplyDetail.wxml b/pages/specialOrderApplication/specialOrderApplyDetail/specialOrderApplyDetail.wxml new file mode 100644 index 0000000..31247c5 --- /dev/null +++ b/pages/specialOrderApplication/specialOrderApplyDetail/specialOrderApplyDetail.wxml @@ -0,0 +1,2 @@ + +pages/specialOrderApplication/specialOrderApplyDetail/specialOrderApplyDetail.wxml diff --git a/pages/specialOrderApplication/specialOrderApplyDetail/specialOrderApplyDetail.wxss b/pages/specialOrderApplication/specialOrderApplyDetail/specialOrderApplyDetail.wxss new file mode 100644 index 0000000..cd1c2a1 --- /dev/null +++ b/pages/specialOrderApplication/specialOrderApplyDetail/specialOrderApplyDetail.wxss @@ -0,0 +1 @@ +/* pages/specialOrderApplication/specialOrderApplyDetail/specialOrderApplyDetail.wxss */ \ No newline at end of file