zm/nuttyreading-master-html
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

阶段性提交

Browse Source
This commit is contained in:
@fawn-nine
2023-10-26 13:13:41 +08:00
parent a5b5d2a24b
commit 16d7333f46
6 changed files with 539 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
src/views/modules/order/orderdeliver-split.vue
View File

@@ -30,10 +30,11 @@
<div class="flexbox orderProducts" v-for="products in productsCodeList" :key="products.productId">
<div class="flexbox productItem" style="">
<!-- <el-checkbox :label="products.allOrderId"></el-checkbox> -->
<img :src="products.productUrl" width="30px" height="30px">
<div class="flexbox" style="align-items: center;">
<div class="bookName">{{ products.productName }}</div>
</div>
<img :src="products.productImage" width="30px" height="30px" :class="products.expressInfo && products.expressInfo.expressOrderSn != null ? 'gray' : ''" >
<div class="" style="align-items: center;">
<div class="bookName" style="margin-left:0">{{ products.productName }}</div>
<div style="width:100%; color:#17B3A3; font-size:12px" v-if="products.expressInfo && products.expressInfo.expressOrderSn != null">快递信息：{{products.expressInfo.expressCompany}}-{{products.expressInfo.expressOrderSn}}</div>
</div>
</div>
<div class="flexbox">
<div class="price xcenter">
@@ -41,7 +42,9 @@
<div>× {{ products.quantity }}</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
@@ -56,10 +59,19 @@
</div>
</div>
<div v-else>
<div style="">
<div style="padding-bottom: 10px;" class="">
<div><span class="infoTitle">用户名：</span><span>{{mixOrderList[0].consignee.consigneeName}}</span>
<span class="infoTitle">电话：</span><span>{{mixOrderList[0].consignee.consigneeMobile}}</span>
<span class="infoTitle">收货地址：</span><span>{{mixOrderList[0].consignee.province}}-{{mixOrderList[0].consignee.city}}-{{mixOrderList[0].consignee.county}}-{{mixOrderList[0].consignee.address}}</span>
</div>
<div></div>
</div>
</div>
<el-checkbox-group v-model="checkedList" @change="handleCheckedCitiesChange">
<li class="flexbox mergeList" style="border:1px solid #ddf6f3" v-for="(item, index) in mixOrderList" :key="index">
<div class="buierInfo flexbox">
<!-- <div class="buierInfo flexbox">
<div style="display: flex;width:180px; align-items: center;">
<div style="padding: 10px;" class="">
<div><span class="infoTitle">用户名：</span><span>{{item.userName}}</span></div>
@@ -67,15 +79,15 @@
<div><span class="infoTitle">收货地址：</span><span>{{item.address}}</span></div>
</div>
</div>
</div>
</div> -->
<div class="productInfo" style="width:100%;">
<div class="item" v-for="(item2, index) in item.orderList" :key="index">
<div class="item" >
<div class="item_head no_right_border">
<el-row>
<el-col :span="24"
style="display: flex; justify-content: space-between;">
<span><span class="infoTitle">订单编号：</span>{{item2.orderSn}} </span>
<span><span class="infoTitle">订单编号：</span>{{item.orderSn}} </span>
<!-- <el-button style="margin: 0; padding: 0;" type="text">移除</el-button> -->
</el-col>
</el-row>
@@ -83,17 +95,17 @@
<div class="item_body no_right_border no_bottom_border">
<div class="flexbox" style="justify-content: space-between;">
<div class="td1" style="width:100%; ">
<div class="flexbox orderProducts" style="width:50%; float: left;" v-for="(item3, index) in item2.products" :key="index">
<div class="flexbox orderProducts" style="width:50%; float: left;" v-for="(item2, index) in item.goodsList" :key="index">
<div class="flexbox productItem" style="width:100%;">
<el-checkbox :label="item3.allOrderId" :disabled="item3.orderStatus == '1'"><br></el-checkbox>
<img :src="item3.productUrl" width="30px" style="margin-left: -15px;"
<el-checkbox :label="item2.buyOrderProductId" :disabled="item2.expressInfo && item2.expressInfo.expressOrderSn ? true : false"><br></el-checkbox>
<img :src="item2.productImage" width="30px" style="margin-left: -15px;"
height="30px">
<div class="flexbox" style="align-items: center;">
<div class="bookName">{{item3.productName}}</div>
<div class="" style="align-items: center;">
<div class="bookName">{{item2.productName}}</div>
<div style="width:100%; color:#17B3A3; font-size:12px" v-if="item2.expressInfo && item2.expressInfo.expressOrderSn">快递信息：{{item2.expressInfo.expressCompany}}-{{item2.expressInfo.expressOrderSn}}</div>
</div>
</div>
<div class="num xcenter"><span>× {{item3.quantity}}</span></div>
<div class="num xcenter"><span>× {{item2.quantity}}</span></div>
</div>
</div>
@@ -188,14 +200,19 @@ export default {
},
// 获取可合并订单
getMixDeliverOrderList() {
this.orderIds[0] = this.orderitem.orderId
// this.orderIds[0] = this.orderitem.orderId
this.$http({
url: this.$http.adornUrl(`/book/buyOrder/checkMerge`),
// url: this.$http.adornUrl(`/book/buyOrder/checkMerge`),
url: this.$http.adornUrl(`/book/buyOrder/decomposeShipment`),
method: 'post',
data: this.orderIds
data: this.$http.adornData({
'orderId': this.orderitem.orderId,
'pageIndex':1,
'pageSize':20
})
}).then(({ data }) => {
this.mixOrderList = data.list
console.log(data,'data')
this.mixOrderList = data.result.data
})
},
@@ -212,14 +229,13 @@ export default {
this.productsCodeList.splice(index, 1)
console.log(index)
}
this.productsIdsList = this.productsCodeList.map( item => item.id)
this.productsIdsList = this.productsCodeList.map( item => item.buyOrderProductId)
})
},
//
// getProductsCodeList
// 普通发货
submit1() {
submit1() {
this.getNewProducts()
console.log(this.productsIdsList)
this.$refs['ruleForm'].validate((valid) => {
@@ -232,7 +248,7 @@ export default {
});
this.$http({
// url: this.$http.adornUrl(`/book/buyOrder/blendSendFMS/${this.ruleForm.deliverLcd}`),
url: this.$http.adornUrl(`/book/buyOrder/delivery/`),
url: this.$http.adornUrl(`/book/buyOrder/delivery`),
method: 'post',
params: this.$http.adornParams({
// "shipperName" : this.ruleForm.dictValue
@@ -310,8 +326,9 @@ export default {
if(data && data.code === 0){
// console.log(data)
loading.close()
this.beforeCloseDialog()
return this.$message.success('发货成功')
this.beforeCloseDialog()
}
}).catch(({e}) => {
loading.close();
@@ -350,7 +367,7 @@ export default {
orderitem: {
handler(val, oldVal) {
console.log('变化',val)
this.productsCodeList = val.products
this.productsCodeList = val.goodsList
this.getNewProducts()
console.log('productsIdsList',this.productsIdsList)
this.getMixDeliverOrderList()
@@ -602,6 +619,14 @@ export default {
border-bottom: none;
}
.gray{
-webkit-filter: grayscale(100%);
-moz-filter: grayscale(100%);
-ms-filter: grayscale(100%);
-o-filter: grayscale(100%);
filter: grayscale(100%);
filter: gray;
}
.hasSplit {
background-color: #fffae8;
border: 1px solid #ffedd6;