yibo 7 years ago
parent
commit
515eb4de8a
4 changed files with 41 additions and 31 deletions
  1. +2
    -2
      pages/guarantee/newbill/newbill.js
  2. +18
    -13
      pages/order/detail/detail.js
  3. +20
    -15
      pages/order/newBill/newBill.js
  4. +1
    -1
      pages/outStore/outStoreDetail/outStoreDetail.wxml

+ 2
- 2
pages/guarantee/newbill/newbill.js View File

@ -261,8 +261,8 @@ Page({
let detailsArray = []; let detailsArray = [];
for (var i = 0; i < this.data.array.length; i++) { for (var i = 0; i < this.data.array.length; i++) {
var dmo = { var dmo = {
BillID: this.data.array[i].ID,
DmoTypeID: this.data.array[i].BillTypeID
BillID: this.data.array[i].BillID,
DmoTypeID: this.data.array[i].DmoTypeID
} }
detailsArray.push(dmo) detailsArray.push(dmo)
} }


+ 18
- 13
pages/order/detail/detail.js View File

@ -329,10 +329,14 @@ Page({
this.util(); this.util();
}, },
getGoodsNum: function(e) {
getGoodsNum: function (e) {
var v = e.detail.value;
let end = v.charAt(v.length - 1)
if (end == ".")
return;
let idx = e.target.dataset.idx; let idx = e.target.dataset.idx;
var detail = this.data.dmo.Details[idx]; var detail = this.data.dmo.Details[idx];
let value = Number(e.detail.value);
let value = Number(v);
if (isNaN(value)) { if (isNaN(value)) {
wx.showModal({ wx.showModal({
title: '提示', title: '提示',
@ -351,10 +355,14 @@ Page({
}) })
}, },
getSecondNum: function(e) {
getSecondNum: function (e) {
var v = e.detail.value;
let end = v.charAt(v.length - 1)
if (end == ".")
return;
let idx = e.target.dataset.idx; let idx = e.target.dataset.idx;
var detail = this.data.dmo.Details[idx]; var detail = this.data.dmo.Details[idx];
let value = Number(e.detail.value);
let value = Number(v);
if (isNaN(value)) { if (isNaN(value)) {
wx.showModal({ wx.showModal({
title: '提示', title: '提示',
@ -373,9 +381,13 @@ Page({
}) })
}, },
getPrice: function(e) {
getPrice: function (e) {
var v = e.detail.value;
let end = v.charAt(v.length - 1)
if (end == ".")
return;
let idx = e.target.dataset.idx; let idx = e.target.dataset.idx;
let value = Number(e.detail.value);
let value = Number(v);
if (isNaN(value)) { if (isNaN(value)) {
wx.showToast({ wx.showToast({
title: '提示', title: '提示',
@ -455,13 +467,6 @@ Page({
return; return;
} }
if (dmo.DeliverAddress == "") {
wx.showToast({
title: '请填写送货地址',
})
return;
}
for (var i = 0; i < dmo.Details.length; i++) { for (var i = 0; i < dmo.Details.length; i++) {
if (dmo.Details[i].SaleGoods_ID == null) { if (dmo.Details[i].SaleGoods_ID == null) {
wx.showToast({ wx.showToast({


+ 20
- 15
pages/order/newBill/newBill.js View File

@ -191,7 +191,7 @@ Page({
// 遮罩存货输入框 // 遮罩存货输入框
select: function(e) { select: function(e) {
var value = e.detail.value; var value = e.detail.value;
var x = this.data.whicwhichh;
var x = this.data.which;
this.showDialog(x, value); this.showDialog(x, value);
}, },
@ -288,10 +288,14 @@ Page({
this.util(); this.util();
}, },
getGoodsNum: function(e) {
getGoodsNum: function (e) {
var v = e.detail.value;
let end = v.charAt(v.length - 1)
if (end == ".")
return;
let idx = e.target.dataset.idx; let idx = e.target.dataset.idx;
var detail = this.data.dmo.Details[idx]; var detail = this.data.dmo.Details[idx];
let value = Number(e.detail.value);
let value = Number(v);
if (isNaN(value)) { if (isNaN(value)) {
wx.showModal({ wx.showModal({
title: '提示', title: '提示',
@ -310,10 +314,14 @@ Page({
}) })
}, },
getSecondNum: function(e) {
getSecondNum: function (e) {
var v = e.detail.value;
let end = v.charAt(v.length - 1)
if (end == ".")
return;
let idx = e.target.dataset.idx; let idx = e.target.dataset.idx;
var detail = this.data.dmo.Details[idx]; var detail = this.data.dmo.Details[idx];
let value = Number(e.detail.value);
let value = Number(v);
if (isNaN(value)) { if (isNaN(value)) {
wx.showModal({ wx.showModal({
title: '提示', title: '提示',
@ -333,9 +341,13 @@ Page({
}, },
// //
getPrice: function(e) {
getPrice: function (e) {
var v = e.detail.value;
let end = v.charAt(v.length - 1)
if (end == ".")
return;
let idx = e.target.dataset.idx; let idx = e.target.dataset.idx;
let value = Number(e.detail.value);
let value = Number(v);
if (isNaN(value)) { if (isNaN(value)) {
wx.showToast({ wx.showToast({
title: '提示', title: '提示',
@ -416,14 +428,7 @@ Page({
}) })
return; return;
} }
if (dmo.DeliverAddress == "") {
wx.showToast({
title: '请填写送货地址',
})
return;
}
for (var i = 0; i < dmo.Details.length; i++) { for (var i = 0; i < dmo.Details.length; i++) {
if (dmo.Details[i].SaleGoods_ID == null) { if (dmo.Details[i].SaleGoods_ID == null) {
wx.showToast({ wx.showToast({


+ 1
- 1
pages/outStore/outStoreDetail/outStoreDetail.wxml View File

@ -14,7 +14,7 @@
<view class='listContainer'> <view class='listContainer'>
<scroll-view scroll-x="false" scroll-y="true" class='scrollView'> <scroll-view scroll-x="false" scroll-y="true" class='scrollView'>
<block wx:for="{{dataArr}}" wx:for-item="item">
<block wx:for="{{dataArr}}" wx:for-item="item" wx:key="{{item}}">
<template is="outStoreDetailTemplate" data="{{item}}" /> <template is="outStoreDetailTemplate" data="{{item}}" />
</block> </block>
</scroll-view> </scroll-view>


Loading…
Cancel
Save