|
|
|
@ -8,13 +8,13 @@ |
|
|
|
<view class="list-val"> |
|
|
|
<input type="text" placeholder="请选择客户" disabled |
|
|
|
style="border-bottom: 1px solid #fff;text-align: center;" :value="khName.name" |
|
|
|
@tap="goPopleList('khName')"> |
|
|
|
@tap.stop="goPopleList('khName')"> |
|
|
|
<uni-icons type="right" size="16" style="margin-left: 80rpx;line-height: 80rpx;"></uni-icons> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
<view class="content-list"> |
|
|
|
<view class="list-name">销售员</view> |
|
|
|
<uni-data-select class="uni-data-select" :localdata="categoryList" v-model="value" |
|
|
|
<uni-data-select class="uni-data-select" :localdata="categoryList" v-model="valuexsy" |
|
|
|
placeholder="请选择销售员" @change="categoryChange"></uni-data-select> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
@ -39,7 +39,7 @@ |
|
|
|
<label class="uni-list-cell uni-list-cell-pd" v-for="(item, index) in priceItems" |
|
|
|
:key="item.value"> |
|
|
|
<view> |
|
|
|
<radio :value="item.value" @tap="priceChange(item.value)" :checked="index === priceCurrent" /> |
|
|
|
<radio :value="item.value" @tap.stop="priceChange(item.value)" :checked="index === priceCurrent" /> |
|
|
|
</view> |
|
|
|
<view style="width: 100rpx;">{{item.name}}</view> |
|
|
|
</label> |
|
|
|
@ -77,7 +77,7 @@ |
|
|
|
<view v-if="value[1].supplierName !=undefined">供应商：{{value[1].supplierName}}</view> |
|
|
|
</view> |
|
|
|
<view style="position: absolute;top: 110rpx;right: 40rpx;color: blue;text-decoration: underline;" |
|
|
|
@tap="clickPrice(value[0])"> |
|
|
|
@tap.stop="clickPrice(value[0])"> |
|
|
|
选择售价 |
|
|
|
</view> |
|
|
|
<view style="position: absolute;top: 30rpx;right: 30rpx;" @tap.stop="delShop(value[0])"> |
|
|
|
@ -104,7 +104,7 @@ |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
<view class="shop-collapse" v-for="(values,keys) in Array.from(value[1].stockLogList)" :key='keys'> |
|
|
|
<view style="margin-right:5%;" @tap="delShopSpec(value[0],values[0])"> |
|
|
|
<view style="margin-right:5%;" @tap.stop="delShopSpec(value[0],values[0])"> |
|
|
|
<uni-icons color="red" type="minus" size="26"></uni-icons> |
|
|
|
</view> |
|
|
|
<text>{{values[0] | sliceMsg}}</text> |
|
|
|
@ -180,7 +180,7 @@ |
|
|
|
<view class="list-val"> |
|
|
|
<input type="text" placeholder="请选择" disabled :value="wlName.companyName" |
|
|
|
style="border-bottom: 1px solid #fff;text-align: center;padding-right: 54rpx;" |
|
|
|
@tap="goPopleList(radioType == '0'? 'wlName' :'kdName')"> |
|
|
|
@tap.stop="goPopleList(radioType == '0'? 'wlName' :'kdName')"> |
|
|
|
<uni-icons type="right" size="16" |
|
|
|
style="margin-left: 80rpx;line-height: 80rpx;"></uni-icons> |
|
|
|
</view> |
|
|
|
@ -190,7 +190,7 @@ |
|
|
|
<view class="list-val"> |
|
|
|
<input type="text" placeholder="请选择" disabled |
|
|
|
style="border-bottom: 1px solid #fff;text-align: center;" |
|
|
|
@tap="goPopleList('fcName')"> |
|
|
|
@tap.stop="goPopleList('fcName')"> |
|
|
|
<uni-icons type="right" size="16" |
|
|
|
style="margin-left: 80rpx;line-height: 80rpx;"></uni-icons> |
|
|
|
</view> |
|
|
|
@ -201,11 +201,6 @@ |
|
|
|
<uni-data-checkbox v-model="value" :localdata="sex" |
|
|
|
@change="checkBoxChange"></uni-data-checkbox> |
|
|
|
</view> |
|
|
|
<!-- <view class="content-list" style="width: 100%;"> |
|
|
|
<view class="list-name" style="padding-left: 0;">配送方式</view> |
|
|
|
<uni-data-select class="uni-data-select" :localdata="sex" v-model="value" |
|
|
|
placeholder="请选择配送方式" :clear="false" @change="checkBoxChange"></uni-data-select> |
|
|
|
</view> --> |
|
|
|
</view> |
|
|
|
<view class="content-list" v-if="radioType1 != '1' && radioType !=''"> |
|
|
|
<view class="list-name" style="width:150rpx;padding-left:0;">{{radioType == '1'? '快递员' :'拉包工'}}</view> |
|
|
|
@ -213,7 +208,7 @@ |
|
|
|
<input type="text" placeholder="可指定人员" disabled |
|
|
|
:value="radioType == '1'? kdyName.workerName : lbgName.workerName" |
|
|
|
style="border-bottom: 1px solid #fff;text-align: center;" |
|
|
|
@tap="goPopleList(radioType == '1'? 'kdyName' :'lbgName')"> |
|
|
|
@tap.stop="goPopleList(radioType == '1'? 'kdyName' :'lbgName')"> |
|
|
|
<uni-icons type="right" size="16" |
|
|
|
style="margin-left: 80rpx;line-height: 80rpx;"></uni-icons> |
|
|
|
</view> |
|
|
|
@ -234,8 +229,8 @@ |
|
|
|
<text style="color: #ffa200;">￥{{shouldPay}}</text> |
|
|
|
</view> |
|
|
|
<view class="bottom-right"> |
|
|
|
<button class="bottom-btn" @tap="clearAll">清空全部</button> |
|
|
|
<button class="bottom-btn" @tap="goSell">开单</button> |
|
|
|
<button class="bottom-btn" @tap.stop="clearAll">清空商品</button> |
|
|
|
<button class="bottom-btn" @tap.stop="goSell">开单</button> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
<!-- 弹出输入框 --> |
|
|
|
@ -244,15 +239,15 @@ |
|
|
|
<view class="popup-pay-title"> |
|
|
|
<text>选择商品价格</text> |
|
|
|
</view> |
|
|
|
<view class="popup-pay-container" @tap="checkPay(lsprice)"> |
|
|
|
<view class="popup-pay-container" @tap.stop="checkPay(lsprice)"> |
|
|
|
<text style="display: inline-block">零售价：￥{{lsprice}}</text> |
|
|
|
</view> |
|
|
|
<view class="popup-pay-container" @tap="checkPay(wholesalePrice)"> |
|
|
|
<view class="popup-pay-container" @tap.stop="checkPay(wholesalePrice)"> |
|
|
|
<text style="display: inline-block">批发价：￥{{wholesalePrice}}</text> |
|
|
|
</view> |
|
|
|
<view class="popup-pay-container" style="background: #fff;display: flex;"> |
|
|
|
<input type="number" style="height: 100rpx;line-height: 100rpx;color:#000;" placeholder="请输入价格" @blur="changePay"> |
|
|
|
<view style="flex: 1;color: #fff;background: #088FEB;border-radius: 10px;" @tap="checkPay(customPrice)">确定</view> |
|
|
|
<view style="flex: 1;color: #fff;background: #088FEB;border-radius: 10px;" @tap.stop="checkPay(customPrice)">确定</view> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
</uni-popup> |
|
|
|
@ -276,7 +271,7 @@ |
|
|
|
<view class="shop-title-name">{{items.name}}</view> |
|
|
|
</view> |
|
|
|
<view class="shop-attrs"> |
|
|
|
<uni-data-checkbox v-model="value" :localdata="range"></uni-data-checkbox> |
|
|
|
<uni-data-checkbox :localdata="range"></uni-data-checkbox> |
|
|
|
<text v-for="(itemTag, index1) in items.value" :key="index1" |
|
|
|
@tap.stop="attrNameChange(index,index1) " |
|
|
|
:class="itemTag.isChecked ? 'checkedText' : '' "> {{itemTag.value}}</text> |
|
|
|
@ -296,7 +291,7 @@ |
|
|
|
<text>￥{{zPrice}}</text> |
|
|
|
</view> |
|
|
|
<view class="shop-popup-bottom-right"> |
|
|
|
<view class="bottom-btn" @tap="temporaryCheck">选好了</view> |
|
|
|
<view class="bottom-btn" @tap.stop="temporaryCheck">选好了</view> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
@ -326,6 +321,7 @@ |
|
|
|
zPrice:0, |
|
|
|
priceOk:'', //已收金额 |
|
|
|
value: 0, |
|
|
|
valuexsy:'', |
|
|
|
sex: [{ |
|
|
|
text: '平台配送', |
|
|
|
value: 0 |
|
|
|
@ -392,7 +388,7 @@ |
|
|
|
remark:'', |
|
|
|
pbAddress:'', |
|
|
|
carList1:[], |
|
|
|
radioType1:'', |
|
|
|
radioType1:0, |
|
|
|
saleId:'' |
|
|
|
} |
|
|
|
}, |
|
|
|
@ -898,9 +894,53 @@ |
|
|
|
}, |
|
|
|
//点击底部开单按钮 |
|
|
|
goSell() { |
|
|
|
console.log(this.khName) |
|
|
|
console.log(this.lbgName) |
|
|
|
console.log(this.wlName) |
|
|
|
// console.log(this.khName) |
|
|
|
// console.log(this.lbgName) |
|
|
|
// console.log(this.wlName) |
|
|
|
if(this.khName == ''){ |
|
|
|
this.tui.toast('请选择客户！') |
|
|
|
return |
|
|
|
} |
|
|
|
if(this.xsyId ==''){ |
|
|
|
this.tui.toast('请选择销售员！') |
|
|
|
return |
|
|
|
} |
|
|
|
if(this.relPrice == (0 || '')){ |
|
|
|
this.tui.toast('请输入实收金额！') |
|
|
|
return |
|
|
|
}else if(this.priceOk==(0 || '')){ |
|
|
|
this.tui.toast('请输入已收金额！') |
|
|
|
return |
|
|
|
} |
|
|
|
if(this.carList.size == 0){ |
|
|
|
this.tui.toast('请添加商品！') |
|
|
|
return |
|
|
|
} |
|
|
|
if(this.radioType != ''){ |
|
|
|
if(this.radioType == 0 || this.radioType == 1 || this.radioType== 4){ |
|
|
|
if(this.wlName == ''){ |
|
|
|
this.tui.toast('请选择配送公司！') |
|
|
|
return |
|
|
|
}else if(this.radioType1 == 0){ |
|
|
|
if(this.lbgName == ''){ |
|
|
|
this.tui.toast('请选择配送人员！') |
|
|
|
return |
|
|
|
} |
|
|
|
} |
|
|
|
}else if(this.radioType== 3){ |
|
|
|
console.log(this.radioType1) |
|
|
|
if(this.radioType1 == 0){ |
|
|
|
if(this.lbgName == ''){ |
|
|
|
this.tui.toast('请选择配送人员！') |
|
|
|
return |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
}else{ |
|
|
|
this.tui.toast('请选择发货方式！') |
|
|
|
return |
|
|
|
} |
|
|
|
let obj = { |
|
|
|
orderByWorker: this.lbgName.workerId, |
|
|
|
saleId:this.saleId, |
|
|
|
@ -1054,7 +1094,7 @@ |
|
|
|
let that = this; |
|
|
|
uni.showModal({ |
|
|
|
title: "提示", |
|
|
|
content: "确定清空全部数据吗？", |
|
|
|
content: "确定清空全部已选商品吗？", |
|
|
|
success: function(res) { |
|
|
|
that.carList.clear() |
|
|
|
that.remark = '' |
|
|
|
|
wangfukang
3 years ago