diff --git a/pages/specialOrderApplication/creatNewSpecialOrder/creatNewSpecialOrder.js b/pages/specialOrderApplication/creatNewSpecialOrder/creatNewSpecialOrder.js index cd7f1ef..24d9784 100644 --- a/pages/specialOrderApplication/creatNewSpecialOrder/creatNewSpecialOrder.js +++ b/pages/specialOrderApplication/creatNewSpecialOrder/creatNewSpecialOrder.js @@ -3,21 +3,19 @@ var network = require("../../../utils/net.js"); const app = getApp(); var dateTimePicker = require('../../../utils/dateTimePicker.js'); +var timechage = require("../../../utils/dateTimeUtil.js") + Page({ - /** - * 页面的初始数据 - */ data: { currentTab: 0, winHeight: app.globalData.winHeight, - winWidth: 0, - detaileList: [1, 1, 3, 4, 5, 6, 7, 7, 4, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 4, 7, 7, 7], + + starTime: timechage.formatTimeTwo(Date.parse(new Date()), 'Y-M-D'), + endTime: timechage.formatTimeTwo(Date.parse(new Date()), 'Y-M-D'), dateTimeArray: null, dateTime: null, - dateTimeArray1: null, - dateTime1: null, startYear: 2018, endYear: 2030, // 用户数组 @@ -26,9 +24,24 @@ Page({ goodsNameArr:[], }, - changeDateTime1(e) { + // 存货特价开始时间 + bindStartTimeChange: function (e) { this.setData({ - dateTime1: e.detail.value + starTime: e.detail.value, + }) + }, + + // 存货特价结束时间 + bindEndTimeChange: function (e) { + this.setData({ + endTime: e.detail.value, + }) + }, + + // 基本信息日期 + changeDateTime(e) { + this.setData({ + dateTime: e.detail.value }); }, @@ -74,17 +87,34 @@ Page({ * 存货明细保存按钮 点击新建单据 内部做逻辑判断 存储值是否都已经加载 */ creatNewSpecialOrder:function (){ - 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 year = this.data.dateTimeArray[0][this.data.dateTime[0]] + let month = this.data.dateTimeArray[1][this.data.dateTime[1]] + let date = this.data.dateTimeArray[2][this.data.dateTime[2]] + let hour = this.data.dateTimeArray[3][this.data.dateTime[3]] + let minu = this.data.dateTimeArray[4][this.data.dateTime[4]] let stringTime = year + "/" + month + "/" + date + " " + hour + ":" + minu + ":00" let timestamp2 = Date.parse(new Date(stringTime)); + // 基本信息时间转换 let update = "/Date(" + timestamp2 + "+0800)/"; + + //应该是从存货数组中获取对应的时间 + + // 存货明细起止时间转换 + let guaranteeDate = timechage.formatymdERTDate(this.data.starTime); + let payDate = timechage.formatymdERTDate(this.data.endTime); + }, + // 删除客户明细 + deleteCustomerItem: function () { + + }, + + // 删除存货明细 + deleteGoodsItem:function(){ + + }, /** * 生命周期函数--监听页面加载 */ @@ -98,8 +128,6 @@ Page({ this.setData({ dateTimeArray: obj1.dateTimeArray, dateTime: obj1.dateTime, - dateTimeArray1: obj1.dateTimeArray, - dateTime1: obj1.dateTime }); }, @@ -122,39 +150,36 @@ Page({ 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 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); + // 原单价 + var infoprice = goodsArr[i].Price; + if (infoprice == null){ + infoprice ="请输入原单价"; } + // 特价 + var policyPrice ="请输入特价价格"; + // 开始时间 + var infoStartTime ="请选择开始时间"; + // 结束时间 + var infoEndTime = "请选择结束时间"; + // 申请数量 + var infoNum = "请输入申请数量"; 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, + SaleGoods_ID: Number(id), + Price: infoprice, + applicationPrice: policyPrice, + applicationStartTime: infoStartTime, + applicationEndTime: infoEndTime, + applicationNum: infoNum, } backGoodsArr.push(goodsNameObj) + console.log(backGoodsArr); + } this.setData({ diff --git a/pages/specialOrderApplication/creatNewSpecialOrder/creatNewSpecialOrder.wxml b/pages/specialOrderApplication/creatNewSpecialOrder/creatNewSpecialOrder.wxml index fbf74d5..11bcb7e 100644 --- a/pages/specialOrderApplication/creatNewSpecialOrder/creatNewSpecialOrder.wxml +++ b/pages/specialOrderApplication/creatNewSpecialOrder/creatNewSpecialOrder.wxml @@ -19,9 +19,9 @@ 日期 - + - {{dateTimeArray1[0][dateTime1[0]]}}-{{dateTimeArray1[1][dateTime1[1]]}}-{{dateTimeArray1[2][dateTime1[2]]}} {{dateTimeArray1[3][dateTime1[3]]}}:{{dateTimeArray1[4][dateTime1[4]]}} + {{dateTimeArray[0][dateTime[0]]}}-{{dateTimeArray[1][dateTime[1]]}}-{{dateTimeArray[2][dateTime[2]]}} {{dateTimeArray[3][dateTime[3]]}}:{{dateTimeArray[4][dateTime[4]]}} - + - -