|
|
|
@ -145,7 +145,7 @@ |
|
|
|
|
|
|
|
</view> |
|
|
|
</view> |
|
|
|
<view class="popup-container" v-for="items in item.saleDetailQueryDTO"> |
|
|
|
<view class="popup-container" v-for="items in item.stockLogList1"> |
|
|
|
<view class="checkList"> |
|
|
|
<view style="margin-right:5%;" @tap="delShopSpec(items.name)"> |
|
|
|
<uni-icons color="red" type="minus" size="26"></uni-icons> |
|
|
|
@ -393,14 +393,14 @@ |
|
|
|
//弹窗选择规格后,点击弹窗中选好了按钮 |
|
|
|
temporaryCheck() { |
|
|
|
let data = { |
|
|
|
id: this.goodsDetail.id, |
|
|
|
productId: this.goodsDetail.id, |
|
|
|
price: this.zPrice, |
|
|
|
num: this.zNum, |
|
|
|
productName: this.goodsDetail.productName, |
|
|
|
productSn: this.goodsDetail.productSn, |
|
|
|
productPicture: this.goodsDetail.productPicture, |
|
|
|
supplierName: this.goodsDetail.supplierName, |
|
|
|
saleDetailQueryDTO:this.temporaryList, |
|
|
|
stockLogList1:this.temporaryList, |
|
|
|
wholesalePrice:this.goodsDetail.wholesalePrice, |
|
|
|
lsprice:this.goodsDetail.price |
|
|
|
} |
|
|
|
@ -439,14 +439,14 @@ |
|
|
|
var that = this; |
|
|
|
console.log(this.carList) |
|
|
|
for (let i=0;i<this.carList.length;i++) { |
|
|
|
for (let m=0;m<this.carList[i].saleDetailQueryDTO.length;m++) { |
|
|
|
if(this.carList[i].saleDetailQueryDTO[m].name == name){ |
|
|
|
for (let m=0;m<this.carList[i].stockLogList1.length;m++) { |
|
|
|
if(this.carList[i].stockLogList1[m].name == name){ |
|
|
|
uni.showModal({ |
|
|
|
title: "提示", |
|
|
|
content: "确定删除此条商品吗?", |
|
|
|
success: function(res) { |
|
|
|
that.carList[i].saleDetailQueryDTO.splice(m,1) |
|
|
|
if(that.carList[i].saleDetailQueryDTO.length == 0){ |
|
|
|
that.carList[i].stockLogList1.splice(m,1) |
|
|
|
if(that.carList[i].stockLogList1.length == 0){ |
|
|
|
that.carList.splice(i,1) |
|
|
|
} |
|
|
|
} |
|
|
|
@ -460,14 +460,15 @@ |
|
|
|
let that = this; |
|
|
|
this.$refs.form.validate().then(res => { |
|
|
|
let obj = { |
|
|
|
mobile:that.formData.consigneeMobile, |
|
|
|
username:that.formData.consigneeName, |
|
|
|
sale: { |
|
|
|
area: this.addressObj.area, |
|
|
|
city: this.addressObj.city, |
|
|
|
province: this.addressObj.province, |
|
|
|
receiveAddress: that.formData.address, |
|
|
|
totalAmount: that.zPrice, //应付金额 |
|
|
|
username:that.formData.consigneeName, |
|
|
|
mobile:that.formData.consigneeMobile |
|
|
|
totalAmount: that.zPrice ,//应付金额 |
|
|
|
shopId:this.shopId |
|
|
|
}, |
|
|
|
saleDetailList: this.carList |
|
|
|
} |
|
|
|
@ -517,8 +518,8 @@ |
|
|
|
pageSize: '10' |
|
|
|
}, false, true).then((res) => { |
|
|
|
if (res.code == 200) { |
|
|
|
|
|
|
|
this.shopList = res.result.records |
|
|
|
this.shopList = res.result.records |
|
|
|
this.shopId = res.result.records[0].shopId |
|
|
|
} else { |
|
|
|
this.tui.toast(res.message) |
|
|
|
} |
|
|
|
|