diff --git a/pages/order/newBill/newBill.js b/pages/order/newBill/newBill.js index bd6cf5c..0de4e8a 100644 --- a/pages/order/newBill/newBill.js +++ b/pages/order/newBill/newBill.js @@ -474,6 +474,9 @@ Page({ var name = e.currentTarget.dataset.name; var id = e.currentTarget.dataset.data.SaleGoods_ID; var pp = e.currentTarget.dataset.policyprice; + if(!pp) + pp=''; + 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 @@ -490,7 +493,7 @@ Page({ 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].PolicyPrice = pp; this.data.obj[this.data.idx].Goods_UnitConvertDirection = Number(Goods_UnitConvertDirection) this.setData({ showModalStatus1: false, @@ -562,7 +565,7 @@ Page({ }) return; } - if (empID == 0) { + if (employeeID == 0) { wx.showToast({ title: '请选择业务员', }) @@ -614,6 +617,8 @@ Page({ }) return; } + if (this.data.obj[i].PolicyPrice=='') + this.data.obj[i].PolicyPrice=NaN; var dmo = { SaleGoods_ID: this.data.obj[i].SaleGoods_ID, UnitNum: this.data.obj[i].goodsNum, @@ -632,7 +637,7 @@ Page({ "AccountingUnit_ID": unitID, "Department_ID": departmentID, "SaleKind_ID": saletypeID, - "Employee_ID": empID, + "Employee_ID": employeeID, "Store_ID": storeID, "TakeGoods_Type": takeGoodsTypeName, "DeliverAddress": this.data.addrs,