From ef12ac072dd092c031e1745c54825d283323fd9a Mon Sep 17 00:00:00 2001 From: chenxuhui Date: Wed, 5 Dec 2018 16:25:24 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E8=AE=A2=E5=8D=95=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=AD=98=E8=B4=A7=E9=80=89=E5=8F=96=E6=96=B9?= =?UTF-8?q?=E5=BC=8F=E5=8F=98=E6=9B=B4=202=E3=80=81=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E9=95=BF=E7=99=BD=E8=89=B2=E6=8C=89=E9=92=AE=E8=83=8C=E6=99=AF?= =?UTF-8?q?=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- imgs/longWhiteBtn.png | Bin 0 -> 8182 bytes imgs/whiteBtn.png | Bin 0 -> 7104 bytes pages/order/detail/detail.js | 81 +++++++++++++++++++++++++++++-- pages/order/detail/detail.wxml | 29 ++++++++++- pages/order/detail/detail.wxss | 56 +++++++++++++++++++++ pages/order/newBill/newBill.wxml | 8 +-- pages/order/newBill/newBill.wxss | 11 ++--- 7 files changed, 166 insertions(+), 19 deletions(-) create mode 100644 imgs/longWhiteBtn.png create mode 100644 imgs/whiteBtn.png diff --git a/imgs/longWhiteBtn.png b/imgs/longWhiteBtn.png new file mode 100644 index 0000000000000000000000000000000000000000..c88764d321832d32fdfde79b8baffc65317af678 GIT binary patch literal 8182 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 literal 0 HcmV?d00001 diff --git a/pages/order/detail/detail.js b/pages/order/detail/detail.js index 4896b80..99cdd3a 100644 --- a/pages/order/detail/detail.js +++ b/pages/order/detail/detail.js @@ -99,7 +99,8 @@ Page({ rowIdx: -1, dmo: {}, dateTimeArray1: null, - dateTime1: null + dateTime1: null, + backPage:'', }, onLoad: function(options) { @@ -114,6 +115,26 @@ Page({ }) }, + onShow: function () { + var that = this; + if (this.data.backPage == "goodsNameChoosePage") { + var goodsArr = app.globalData.goodsNameArray; + app.globalData.goodsNameArray = []; + if (goodsArr.length > 0) { + // 在此添加货品价格的请求 + for (var i = 0; i < goodsArr.length; i++) { + let newobj = {}; + this.data.dmo.Details.push(newobj); + var itemIndex = this.data.dmo.Details.length - 1; + var detail = this.data.dmo.Details[itemIndex]; + detail.SaleGoods_ID = goodsArr[i].SaleGoods_ID; + detail.Goods_Name = goodsArr[i].Goods_Name; + GetGoodsInfo(this, this.data.dmo, detail); + } + } + } + }, + /** * 滑动切换tab */ @@ -409,13 +430,63 @@ Page({ }, add: function(e) { - let newobj = {}; - this.data.dmo.Details.push(newobj); - this.setData({ - dmo: this.data.dmo + // let newobj = {}; + // this.data.dmo.Details.push(newobj); + // this.setData({ + // dmo: this.data.dmo + // }) + var dmo = this.data.dmo; + if (dmo.Customer_ID == null) { + wx.showToast({ + title: '请选择购货客户' + }) + return; + } + if (dmo.AccountingUnit_ID == null) { + wx.showToast({ + title: '请选择会计单位' + }) + return; + } + wx.navigateTo({ + url: '../../goodaNameChooseTemplate/goodaNameChooseTemplate?unitID=' + dmo.AccountingUnit_ID + '&customerID' + dmo.Customer_ID, + }) + }, + + // 存货明细页面更多按钮 + moreBtnClick: function (e) { + var that = this; + var itemList = [ + "审核", + "撤销" + ]; + wx.showActionSheet({ + itemList: itemList, + itemColor: "#2689f8", + success: function (res) { + // res.cancel 用户是不是点击了取消按钮 + // res.tapIndex 数组元素的序号,从0开始 + that.moreBtnClickedDetailInfo(itemList[res.tapIndex]); + } }) }, + // 更多 -> 撤销 -> 审核 + moreBtnClickedDetailInfo: function (item) { + if (item == "审核") { + wx.showModal({ + title: "提示", + content: "++++" + item + "++++", + }) + } else { + wx.showModal({ + title: "提示", + content: "++++" + item + "++++", + }) + } + }, + + // 保存 submitForm: function() { var dmo = this.data.dmo; diff --git a/pages/order/detail/detail.wxml b/pages/order/detail/detail.wxml index 73e398d..f9f74cd 100644 --- a/pages/order/detail/detail.wxml +++ b/pages/order/detail/detail.wxml @@ -138,11 +138,36 @@ 删除 - + + + + + + 添加存货 + + + + + + + + + 更多 + + + + + + + 保存 + + + - + diff --git a/pages/order/detail/detail.wxss b/pages/order/detail/detail.wxss index cecf8a0..c37015d 100644 --- a/pages/order/detail/detail.wxss +++ b/pages/order/detail/detail.wxss @@ -228,3 +228,59 @@ page { font-size: 18px; color: rgb(48, 48, 48); } + +.imageView { + height: 80px; + width: 100%; + margin-top: 20rpx; + position: relative; + align-items: center; + justify-content: center; + box-sizing: content-box; +} + +.imageViewNoMargin{ + height: 80px; + width: 100%; + margin-top: -10rpx; + position: relative; + align-items: center; + justify-content: center; + box-sizing: content-box; +} + +.currentImage { + width: 100%; + height: 100%; +} + +.bottomGroupView{ + margin-top: -10rpx; + width: 100%; + height: 80px; + display: flex; + flex-direction: row; +} + +.btnTextView { + position: absolute; + width: 100%; + top:0; + line-height: 65px; + text-align: center; +} + +.btnText { + color: white; + font-size: 20px; +} + +.goodsNameImageToTopFar{ + height: calc(100% - 180px); + background:#EAF1F8; +} + +.blueAddText{ + color: #2689f8; + font-size: 20px; +} diff --git a/pages/order/newBill/newBill.wxml b/pages/order/newBill/newBill.wxml index 24cb68f..b0c070e 100644 --- a/pages/order/newBill/newBill.wxml +++ b/pages/order/newBill/newBill.wxml @@ -148,16 +148,14 @@ - + - 添加存货 + 添加存货 - - @@ -165,7 +163,6 @@ - @@ -173,7 +170,6 @@ - diff --git a/pages/order/newBill/newBill.wxss b/pages/order/newBill/newBill.wxss index 5d651b3..66b7f3e 100644 --- a/pages/order/newBill/newBill.wxss +++ b/pages/order/newBill/newBill.wxss @@ -112,8 +112,6 @@ page { } .add { - display: flex; - flex-direction: row; align-items: center; justify-content: center; border-left: none; @@ -149,10 +147,6 @@ page { background-color: #fff; } -.main-body { - background-color: #fff; -} - .submit { margin-left: 5%; margin-top: 10%; @@ -278,4 +272,9 @@ page { .goodsNameImageToTopFar{ height: calc(100% - 180px); background:#EAF1F8; +} + +.blueAddText{ + color: #2689f8; + font-size: 20px; } \ No newline at end of file