From 71b4b2250fed09298ec7dc7cc540971ee74021b9 Mon Sep 17 00:00:00 2001 From: chenxuhui Date: Sat, 1 Dec 2018 13:19:15 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=B7=BB=E5=8A=A0=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E8=BD=AC=E6=8D=A2=202=E3=80=81=E5=AD=98=E8=B4=A7=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=BC=82=E6=AD=A5=E5=8A=A0=E8=BD=BD=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/order/detail/detail.js | 70 ++++++++++++++++++++++++-------- pages/order/detail/detail.wxml | 4 +- pages/order/newBill/newBill.js | 68 +++++++++++++++++++++---------- pages/order/newBill/newBill.wxml | 4 +- 4 files changed, 102 insertions(+), 44 deletions(-) diff --git a/pages/order/detail/detail.js b/pages/order/detail/detail.js index 14a3863..0edb547 100644 --- a/pages/order/detail/detail.js +++ b/pages/order/detail/detail.js @@ -30,6 +30,7 @@ function setTime(that) { dateTimeArray1: obj1.dateTimeArray, dateTime1: obj1.dateTime }); + that.timeConversion(); } function GetBaseInfoList(that, method, params) { @@ -40,14 +41,12 @@ function GetBaseInfoList(that, method, params) { }); } -function GetGoodsInfo(dmo, detail) { - let timestamp = Date.parse(dmo.LoadTime); - let date = "/Date(" + timestamp + "+0800)/"; +function GetGoodsInfo(that,dmo, detail) { var params = [{ "Goods_ID": detail.SaleGoods_ID, "Customer_ID": dmo.Customer_ID, "AccountingUnit_ID": dmo.AccountingUnit_ID, - "Date": date + "Date": dmo.LoadTime, }] network.transfer_request(getGoodsDetail, params, function(res) { detail.Goods_SecondUnit = res.result.Goods_SecondUnit; @@ -57,12 +56,25 @@ function GetGoodsInfo(dmo, detail) { detail.Unit = res.result.Unit; detail.LeftRatio = res.result.LeftRatio; detail.RightRatio = res.result.RightRatio; + + if (res.result.RightRatio == null) { + detail.RightRatio = Number(1) + } + if (res.result.LeftRatio == null) { + detail.LeftRatio = Number(1) + } + detail.Price = res.result.Price; detail.PolicyPrice = res.result.PolicyPrice; + + that.setData({ + dmo: dmo + }); + }); } -function GetCustomerInfo(dmo) { +function GetCustomerInfo(that,dmo) { var params = [dmo.Customer_ID, ["Department_ID", "Department_Name", "Employee_ID", "Employee_Name", "TakeGoods_Type", "Address"]] network.transfer_request(getCustomerInfo, [dmo.Customer_ID], function(res) { var obj = JSON.parse(res.result); @@ -72,6 +84,9 @@ function GetCustomerInfo(dmo) { dmo.Employee_Name = obj.Employee_Name; dmo.TakeGoods_Type = obj.TakeGoods_Type; dmo.DeliverAddress = obj.Address; + that.setData({ + dmo: dmo + }); }); } @@ -95,7 +110,7 @@ Page({ that.setData({ dmo: res.result }); - setTime(that) + setTime(that); }) }, @@ -120,12 +135,27 @@ Page({ } }, - changeDateTime1(e) { - this.data.dmo.LoadTime = e.detail.value; + changeDateTime1: function(e) { this.setData({ dateTime1: e.detail.value, - dmo: this.data.dmo }); + this.timeConversion(); + }, + + // 添加一个时间转换 + timeConversion: 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 stringTime = year + "/" + month + "/" + date + " " + hour + ":" + minu + ":00" + let timestamp = Date.parse(new Date(stringTime)); + let loadTime = "/Date(" + timestamp + "+0800)/"; + this.data.dmo.LoadTime = loadTime; + this.setData({ + dmo: this.data.dmo, + }) }, getAddrs: function(e) { @@ -165,7 +195,7 @@ Page({ this.util(); }, - + select: function(e) { var value = e.detail.value; var x = this.data.which; @@ -247,6 +277,7 @@ Page({ }, itemclick: function(e) { + var flag = true; var x = this.data.which; var item = e.currentTarget.dataset.item; var dmo = this.data.dmo; @@ -254,7 +285,8 @@ Page({ case "购货客户": dmo.Customer_ID = item.ID; dmo.Customer_Name = item.Name; - GetCustomerInfo(dmo); + flag =false; + GetCustomerInfo(this,dmo); break; case "会计部门": dmo.AccountingUnit_ID = item.ID; @@ -284,12 +316,16 @@ Page({ var detail = dmo.Details[idx]; detail.SaleGoods_ID = item.ID; detail.Goods_Name = item.Name; - GetGoodsInfo(dmo, detail); + flag = false; + GetGoodsInfo(this,dmo, detail); break; } - this.setData({ - dmo: dmo - }); + if (flag){ + this.setData({ + dmo: dmo + }); + } + this.util(); }, @@ -370,8 +406,6 @@ Page({ submitForm: function() { var dmo = this.data.dmo; - let timestamp2 = Date.parse(dmo.LoadTime); - let loadTime = "/Date(" + timestamp2 + "+0800)/"; if (dmo.Customer_ID == null) { wx.showToast({ @@ -452,7 +486,7 @@ Page({ let method = update; let params = [{ "Customer_ID": dmo.Customer_ID, - "LoadTime": loadTime, + "LoadTime": dmo.LoadTime, "AccountingUnit_ID": dmo.AccountingUnit_ID, "Department_ID": dmo.Department_ID, "SaleKind_ID": dmo.SaleKind_ID, diff --git a/pages/order/detail/detail.wxml b/pages/order/detail/detail.wxml index b5bc6d6..8fcacf6 100644 --- a/pages/order/detail/detail.wxml +++ b/pages/order/detail/detail.wxml @@ -56,7 +56,7 @@ 仓库 - {{dmo.Store_Name?dmo.Store_Name:"请选择业务员"}} + {{dmo.Store_Name?dmo.Store_Name:"请选择仓库"}} @@ -86,7 +86,7 @@ 摘要 - + diff --git a/pages/order/newBill/newBill.js b/pages/order/newBill/newBill.js index fe3b684..3600156 100644 --- a/pages/order/newBill/newBill.js +++ b/pages/order/newBill/newBill.js @@ -21,18 +21,16 @@ let insert = '/MainSystem/B3MiniProgramRpc/XuRpcs/Employee/OrderRpc/Insert' // 获取完整的年月日 时分秒，以及默认显示的数组' function setTime(that) { // 精确到分的处理，将数组的秒去掉 - var obj1 =dateTimePicker.dateTimePicker(2018, 2030, that.data.dmo.LoadTime); + var obj1 = dateTimePicker.dateTimePicker(2018, 2030); var lastArray =obj1.dateTimeArray.pop(); var lastTime =obj1.dateTime.pop(); - // let timestamp = Date.parse(new Date()); - that.data.dmo.LoadTime = new Date(); - that.setData({ dateTimeArray1: obj1.dateTimeArray, dateTime1: obj1.dateTime - }); + + that.timeConversion(); } function GetBaseInfoList(that, method, params) { @@ -43,29 +41,36 @@ function GetBaseInfoList(that, method, params) { }); } -function GetGoodsInfo(dmo, detail) { - let timestamp = Date.parse(dmo.LoadTime); - let date = "/Date(" + timestamp + "+0800)/"; +function GetGoodsInfo(that,dmo, detail) { var params = [{ "Goods_ID": detail.SaleGoods_ID, "Customer_ID": dmo.Customer_ID, "AccountingUnit_ID": dmo.AccountingUnit_ID, - "Date": date + "Date": dmo.LoadTime, }] network.transfer_request(getGoodsDetail, params, function (res) { - // detail.Goods_SecondUnit = res.result.Goods_SecondUnit; + detail.Goods_SecondUnit = res.result.Goods_SecondUnit; detail.Goods_UnitConvertDirection = res.result.Goods_UnitConvertDirection; detail.Goods_MainUnitRatio = res.result.Goods_MainUnitRatio; detail.Goods_SecondUnitRatio = res.result.Goods_SecondUnitRatio; detail.Unit = res.result.Unit; detail.LeftRatio = res.result.LeftRatio; detail.RightRatio = res.result.RightRatio; + if (res.result.RightRatio == null) { + detail.RightRatio = Number(1) + } + if (res.result.LeftRatio == null) { + detail.LeftRatio = Number(1) + } detail.Price = res.result.Price; detail.PolicyPrice = res.result.PolicyPrice; + that.setData({ + dmo: dmo + }); }); } -function GetCustomerInfo(dmo) { +function GetCustomerInfo(that,dmo) { var params = [dmo.Customer_ID, ["Department_ID", "Department_Name", "Employee_ID", "Employee_Name", "TakeGoods_Type", "Address"]] network.transfer_request(getCustomerInfo, params, function (res) { var obj = JSON.parse(res.result); @@ -75,6 +80,9 @@ function GetCustomerInfo(dmo) { dmo.Employee_Name = obj.Employee_Name; dmo.TakeGoods_Type = obj.TakeGoods_Type; dmo.DeliverAddress = obj.Address; + that.setData({ + dmo: dmo + }); }); } @@ -119,13 +127,27 @@ Page({ }, changeDateTime1(e) { - this.data.dmo.LoadTime = e.detail.value; this.setData({ dateTime1: e.detail.value, - dmo: this.data.dmo }); + this.timeConversion(); }, + // 添加一个时间转换 + timeConversion: 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 stringTime = year + "/" + month + "/" + date + " " + hour + ":" + minu + ":00" + let timestamp = Date.parse(new Date(stringTime)); + let loadTime = "/Date(" + timestamp + "+0800)/"; + this.data.dmo.LoadTime = loadTime; + this.setData({ + dmo: this.data.dmo, + }) + }, getAddrs: function (e) { this.data.dmo.DeliverAddress = e.detail.value; this.setData({ @@ -212,6 +234,7 @@ Page({ }, itemclick: function (e) { + var flag = true; var x = this.data.which; var item = e.currentTarget.dataset.item; var dmo = this.data.dmo; @@ -219,7 +242,8 @@ Page({ case "购货客户": dmo.Customer_ID = item.ID; dmo.Customer_Name = item.Name; - GetCustomerInfo(dmo); + flag =false; + GetCustomerInfo(this,dmo); break; case "会计部门": dmo.AccountingUnit_ID = item.ID; @@ -249,12 +273,15 @@ Page({ var detail = dmo.Details[idx]; detail.SaleGoods_ID = item.ID; detail.Goods_Name = item.Name; - GetGoodsInfo(dmo, detail); + flag = false; + GetGoodsInfo(this,dmo, detail); break; } - this.setData({ - dmo: dmo - }); + if (flag) { + this.setData({ + dmo: dmo + }); + } this.util(); }, @@ -339,9 +366,6 @@ Page({ // 提交 submitForm: function () { var dmo = this.data.dmo; - let timestamp2 = Date.parse(dmo.LoadTime); - let loadTime = "/Date(" + timestamp2 + "+0800)/"; - if (dmo.Customer_ID == null) { wx.showToast({ title: '请选择购货客户' @@ -421,7 +445,7 @@ Page({ let method = insert; let params = [{ "Customer_ID": dmo.Customer_ID, - "LoadTime": loadTime, + "LoadTime": dmo.LoadTime, "AccountingUnit_ID": dmo.AccountingUnit_ID, "Department_ID": dmo.Department_ID, "SaleKind_ID": dmo.SaleKind_ID, diff --git a/pages/order/newBill/newBill.wxml b/pages/order/newBill/newBill.wxml index 0a5d6ce..0ba70b8 100644 --- a/pages/order/newBill/newBill.wxml +++ b/pages/order/newBill/newBill.wxml @@ -55,7 +55,7 @@ 仓库 - {{dmo.Store_Name?dmo.Store_Name:"请选择业务员"}} + {{dmo.Store_Name?dmo.Store_Name:"请选择仓库"}} @@ -85,7 +85,7 @@ 摘要 - +