|
|
|
@ -59,20 +59,23 @@ |
|
|
|
<view class="tui-price-flex tui-size32" v-if="editNoPrice"> |
|
|
|
<view class="tui-flex-shrink">还款金额</view> |
|
|
|
<view class="tui-goods-price"> |
|
|
|
<view class="tui-price-large"><uni-easyinput v-model="newEarn" trim="all" @change="getNoPay" /></view> |
|
|
|
<view class="tui-price-large"><uni-easyinput v-model="newEarn" trim="all" @change="getNoPay" /> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
<view class="tui-price-flex tui-size32" v-if="isReturn"> |
|
|
|
<view class="tui-flex-shrink">平台取货</view> |
|
|
|
<view class="tui-goods-price"> |
|
|
|
<uni-data-checkbox v-model="radio1" :localdata="sex" @change="checkBoxChange"></uni-data-checkbox> |
|
|
|
<uni-data-checkbox v-model="radio1" :localdata="sex" |
|
|
|
@change="checkBoxChange"></uni-data-checkbox> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
<!-- && orderByWorkerCandidates.length > 0 --> |
|
|
|
<view class="tui-price-flex tui-size32" v-if="isReturn && radio1 == 0"> |
|
|
|
<view class="tui-flex-shrink">配送人员</view> |
|
|
|
<view class="tui-goods-price"> |
|
|
|
<uni-combox :candidates="orderByWorkerCandidates" placeholder="请选择配送人员" v-model="orderByWorker"></uni-combox> |
|
|
|
<uni-combox :candidates="orderByWorkerCandidates" placeholder="请选择配送人员" |
|
|
|
v-model="orderByWorker"></uni-combox> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
@ -83,7 +86,8 @@ |
|
|
|
</view> |
|
|
|
<view class="tui-order-content"> |
|
|
|
<u-collapse :value="[shopList[0].saleId]"> |
|
|
|
<u-collapse-item v-for="(item,index) in shopList" :key="index" :title="item.productName" :name="item.saleId"> |
|
|
|
<u-collapse-item v-for="(item,index) in shopList" :key="index" :title="item.productName" |
|
|
|
:name="item.saleId"> |
|
|
|
<view class="u-collapse-content" v-for="(val, index2) in item.saleDetailQueryDTO" :key="index2"> |
|
|
|
<!-- <u-icon name="checkmark-circle" color="#5fd9ee" size="20" v-if="isReturn"></u-icon> |
|
|
|
<u-icon name="checkmark-circle" color="#999" size="20" v-if="isReturn"></u-icon> --> |
|
|
|
@ -106,8 +110,11 @@ |
|
|
|
<view class="tui-item-content">{{ sales.id }}</view> |
|
|
|
</view> |
|
|
|
<view class="tui-order-flex"> |
|
|
|
<view class="tui-item-title">物流单号:</view> |
|
|
|
<view class="tui-item-content">{{ order.kdOrderId }}</view> |
|
|
|
<view class="tui-item-title">物流单:</view> |
|
|
|
<!-- <view class="tui-item-content">{{ order.kdOrderId }}</view> --> |
|
|
|
<image show-menu-by-longpress |
|
|
|
src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/f02827ca8a7b4decadca812cb2f83110.jpg" |
|
|
|
@tap="showImage"></image> |
|
|
|
</view> |
|
|
|
<view class="tui-order-flex"> |
|
|
|
<view class="tui-item-title">创建时间:</view> |
|
|
|
@ -135,10 +142,12 @@ |
|
|
|
<u-button type="error" :plain="true" shape="circle" @click="cancelOrder">取消订单</u-button> |
|
|
|
</view> |
|
|
|
<view class="tui-btn-mr" v-if="sales.status == 5"> |
|
|
|
<u-button type="error" :plain="true" shape="circle" @click="returnGoods" >{{ !isReturn ? '退货' : '确认退货'}}</u-button> |
|
|
|
<u-button type="error" :plain="true" shape="circle" |
|
|
|
@click="returnGoods">{{ !isReturn ? '退货' : '确认退货'}}</u-button> |
|
|
|
</view> |
|
|
|
<view class="tui-btn-mr"> |
|
|
|
<u-button type="error" :plain="true" shape="circle" @click="editnoEarn" v-if="!editNoPrice">汇款</u-button> |
|
|
|
<u-button type="error" :plain="true" shape="circle" @click="editnoEarn" |
|
|
|
v-if="!editNoPrice">汇款</u-button> |
|
|
|
<u-button type="error" :plain="true" shape="circle" @click="sureNpPay" v-else>确认</u-button> |
|
|
|
</view> |
|
|
|
|
|
|
|
@ -251,7 +260,8 @@ |
|
|
|
strCmd += blesdk.addCPCLText('50', '250', '24', '0', 0, this.order.phone) |
|
|
|
strCmd += blesdk.addCPCLSETMAG(2, 2) |
|
|
|
blesdk.addCPCLSETBOLD('bold') |
|
|
|
strCmd += blesdk.addCPCLText('50', '330','24', '0',0,this.order.province+'/'+this.order.city+'/'+this.order.area) |
|
|
|
strCmd += blesdk.addCPCLText('50', '330', '24', '0', 0, this.order.province + '/' + this.order.city + '/' + |
|
|
|
this.order.area) |
|
|
|
strCmd += blesdk.addCPCLSETMAG(1, 1) |
|
|
|
strCmd += blesdk.addCPCLText('50', '410', '24', '0', 0, this.order.address) |
|
|
|
strCmd += blesdk.addCPCLSETMAG(2, 2) |
|
|
|
@ -277,13 +287,19 @@ |
|
|
|
strCmd += blesdk.addCPCLPrint(); |
|
|
|
this.bufferData = strCmd; |
|
|
|
}, |
|
|
|
//点击图片放大 |
|
|
|
showImage() { |
|
|
|
uni.previewImage({ |
|
|
|
urls: ["https://jewel-shop.oss-cn-beijing.aliyuncs.com/f02827ca8a7b4decadca812cb2f83110.jpg"], |
|
|
|
current: "https://jewel-shop.oss-cn-beijing.aliyuncs.com/f02827ca8a7b4decadca812cb2f83110.jpg" |
|
|
|
}) |
|
|
|
}, |
|
|
|
sureNpPay() { |
|
|
|
this.sales.alreadyEarn = (this.sales.alreadyEarn * 1) + (this.newEarn * 1); |
|
|
|
this.tui |
|
|
|
.request( |
|
|
|
'/app/sale/edit', |
|
|
|
'post', |
|
|
|
{ |
|
|
|
'post', { |
|
|
|
sale: this.sales, |
|
|
|
customer: this.order, |
|
|
|
saleDetailDTOList: this.list |
|
|
|
@ -325,8 +341,10 @@ |
|
|
|
if (res.code == 200 && res.result != null && res.result != undefined) { |
|
|
|
this.inventoryList = res.result |
|
|
|
this.inventoryList.forEach(item => { |
|
|
|
this.tui.request("/app/return/get/" + item.id, "GET", null, false, false).then((res) => { |
|
|
|
if (res.code == 200 && res.result != null && res.result != undefined) { |
|
|
|
this.tui.request("/app/return/get/" + item.id, "GET", null, false, false).then( |
|
|
|
(res) => { |
|
|
|
if (res.code == 200 && res.result != null && res.result != |
|
|
|
undefined) { |
|
|
|
this.shopList.push(...res.result.saleDetailDTOList); |
|
|
|
console.log(this.shopList); |
|
|
|
} |
|
|
|
@ -381,7 +399,8 @@ |
|
|
|
if (this.orderByWorker) { |
|
|
|
console.log(this.orderByWorker); |
|
|
|
for (let key in this.orderByWorkerList) { |
|
|
|
console.log(this.orderByWorker,this.orderByWorkerList[key].workerName, this.orderByWorker == this.orderByWorkerList[key].workerName); |
|
|
|
console.log(this.orderByWorker, this.orderByWorkerList[key].workerName, this.orderByWorker == this |
|
|
|
.orderByWorkerList[key].workerName); |
|
|
|
if (this.orderByWorker == this.orderByWorkerList[key].workerName) { |
|
|
|
worderId = this.orderByWorkerList[key].workerId |
|
|
|
} |
|
|
|
|