+
+
批量发货
-->
-
+ :disabled="SheetSelectionList.length <= 0" @click="printHandle(null,null,'piliang')">批量打印
+
+
订单详情
@@ -150,14 +154,14 @@
-
-
+
- 是
+ 是
否
@@ -102,17 +102,21 @@
- 打印面单
+ 打印面单
+
+
- + style="page-break-after:always; position: relative; min-height:600px">
-
-
+
- ![]()
+ ![]()
@@ -189,7 +193,7 @@
-
+ {{scope.row.consignee.province}} + -{{scope.row.consignee.city}} + -{{scope.row.consignee.county}} + -{{scope.row.consignee.address}} + -
+
@@ -56,10 +59,19 @@
合计：￥{{ fitem.orderMoney }}
+ 合计：￥{{ fitem.orderPrice }}
@@ -201,10 +205,10 @@
收货信息：
-
@@ -268,7 +272,16 @@
prop="shippingUser"
header-align="center"
align="center"
- label="收货人姓名">
+ label="收货人信息">
+
+ {{scope.row.consignee.consigneeName}}
+ 暂无
+ -{{scope.row.consignee.consigneeMobile}}{{ fitem.shippingUser }} {{ fitem.userPhone }}
- {{ fitem.province }}-{{ fitem.city }}-{{ fitem.district }}-{{ fitem.address }}
+ {{ fitem.consignee.consigneeName }} {{ fitem.consignee.consigneeMobile }}
+ {{ fitem.consignee.province }}-{{ fitem.consignee.city }}-{{ fitem.consignee.county }}-{{ fitem.consignee.address }}
- 修改收货信息
+ 修改收货信息
+ {{scope.row.consignee.province}} + -{{scope.row.consignee.city}} + -{{scope.row.consignee.county}} + -{{scope.row.consignee.address}} + -
- 实收：￥{{scope.row.realMoney}}
+ 实收：￥{{scope.row.orderPrice}}
优惠券：-
运费：+{{scope.row.shippingMoney}}
@@ -343,20 +356,20 @@
-->
-
+
订单详情
-
+
-
+
+
更多
@@ -390,11 +403,11 @@
-
+
-
+
-
+
-
+
确 定
-
@@ -442,11 +455,11 @@
-
+
{
if (valid) {
console.log('修改收货地址')
+ this.$http({
+ url: this.$http.adornUrl('/book/buyOrder/modifyConsigneeAddress'),
+ method: 'post',
+ data: this.$http.adornData({
+ 'orderSn': this.addressForm.orderSn,
+ // 'province': this.addressForm.provinceName,
+ // 'city': this.addressForm.cityName,
+ // 'county': this.addressForm.countyName,
+ 'address': this.addressForm.addressXX,
+ 'consigneeName': this.addressForm.name,
+ 'consigneeMobile': this.addressForm.tel,
+ "provinceCode": this.addressForm.provinceCode,
+ "cityCode": this.addressForm.cityCode,
+ "countyCode": this.addressForm.countyCode,
+ //'orderId': this.addressForm.orderId
+ })
+ }).then(({ data }) => {
+ console.log('修改地址返回值', data)
+ this.$message.success('修改地址成功！')
+ this.changeAddHandleClose()
+ this.getDataList()
+
+ }).catch( e => {
+ console.log(e,'e')
+ })
} else {
return false;
}
- });
-
+ });
},
- cityChange(e){
- // console.log('修改了市',e)
- this.addressForm.county = null
- this.countyEntity = this.cityEntity.cityList.find((val,index,arr)=>{
+ countyChange(e){
+ console.log(e,'countyName')
+ this.countyEntity.countyList.find((val,index,arr)=>{
+ this.addressForm.countyName = val.countyName
return val.regionCode == e
})
- // console.log('对应的city数组',this.countyEntity)
+ console.log('this.addressForm.countyName', this.addressForm)
+ },
+ cityChange(e){
+ this.addressForm.countyCode = null
+ this.countyEntity = this.cityEntity.cityList.find((val,index,arr)=>{
+ this.addressForm.cityName = val.cityName
+ return val.regionCode == e
+ })
+ console.log(' this.addressForm.cityName', this.addressForm.cityName)
},
provinceChange(e){
- // console.log('修改了省份',e)
- this.addressForm.city = null;
- this.addressForm.county = null
+ this.addressForm.cityCode = null;
+ this.addressForm.countyCode = null
this.cityEntity = this.provinceEntity.find((val,index,arr)=>{
+ this.addressForm.provinceName = val.provName
return val.regionCode == e
})
- // console.log('对应的city数组',this.cityEntity)
+ console.log('this.addressForm.provinceName',this.addressForm.provinceName)
},
changeAddHandleClose(){
this.changeAddVisible = false
- this.addressForm.province = null
- this.addressForm.city = null;
- this.addressForm.county = null
+ this.addressForm.provinceCode = null
+ this.addressForm.cityCode = null;
+ this.addressForm.countyCode = null
+ this.addressForm.provinceName = null
+ this.addressForm.cityName = null;
+ this.addressForm.countyName = null
+ this.addressForm.orderSn = null
this.provinceEntity = []
this.cityEntity = []
this.countyEntity = []
@@ -635,7 +698,8 @@ export default {
// $refs[formName].resetFields()
console.log('关闭了', this.addressForm)
},
- changeAddressShow(){
+ changeAddressShow(val){
+ console.log(val,'val')
this.$http({
url: this.$http.adornUrl('/api/province/getProvince'),
method: 'post',
@@ -645,31 +709,51 @@ export default {
}).then(({ data }) => {
console.log('获取地址三级列表', data)
if(data.code == 0){
+ this.addressForm.orderSn = val.orderSn
this.provinceEntity = data.provinceEntity
+ this.addressForm.addressXX = val.consignee.address
+ this.addressForm.provinceCode = val.consignee.provinceCode
+ this.addressForm.cityCode = val.consignee.cityCode
+ this.addressForm.countyCode = val.consignee.countyCode
+ this.addressForm.provinceName = val.consignee.provinceCode
+ this.addressForm.cityName = val.consignee.city
+ this.addressForm.countyName = val.consignee.county
+ this.addressForm.name = val.consignee.consigneeName
+ this.addressForm.tel = val.consignee.consigneeMobile
+ this.cityEntity = this.provinceEntity.find((val,index,arr)=>{
+ return val.regionCode == this.addressForm.provinceCode
+ })
+ this.countyEntity = this.cityEntity.cityList.find((val,index,arr)=>{
+ return val.regionCode == this.addressForm.cityCode
+ })
+ console.log(this.provinceEntity,addressForm,'this.provinceEntity')
}
}).catch( e => {
console.log(e,'e')
})
+
this.changeAddVisible = true
console.log('显示修改收货地址')
},
// 混合发货
showAnyDialog(item) {
- this.anyDialogContent = item.fmsHtml
+ this.anyDialogContent = item.printTemplate
console.log('面单',item)
- if (item.fmsHtml == null) return this.$message.error('暂无面单数据')
+ if (item.printTemplate == null) return this.$message.error('暂无面单数据')
this.anyDialogVisible = true
this.anyDialogTitle = '查看面单'
},
// 查询可打印面单
getNotPrintSheetList() {
- this.$http({
- url: this.$http.adornUrl('/book/buyOrderdetail/querySheetPage'),
- method: 'post',
+ this.$http({
+ url: this.$http.adornUrl('/express/getPrintTemplateList'),
+ method: 'get',
/// data: {}
}).then(({ data }) => {
+ console.log(data.result.totalDataSize,'面单列表')
if (data && data.code === 0) {
- this.PrintSheetList = data.page.list
+ this.PrintSheetList = data.result.data
+ this.MDtotalPage = data.result.totalDataSize
} else {
this.PrintSheetList = []
this.totalPage = 0
@@ -703,7 +787,7 @@ export default {
this.oprateOrder = val
this.editBeizhudialogVisible = true
this.$nextTick(() => {
- this.$refs.updateOrderBeiZhu.init(val.orderId)
+ this.$refs.updateOrderBeiZhu.init(val.orderSn, val.orderId)
})
},
@@ -724,22 +808,32 @@ export default {
getDataList() {
this.dataListLoading = true
this.$http({
- url: this.$http.adornUrl('/book/buyOrder/list'),
- method: 'get',
- params: this.$http.adornParams({
- 'page': this.pageIndex,
- 'limit': this.pageSize,
- 'key': this.dataForm.key,
- 'startTime': this.dataForm.time[0],
- 'endTime': this.dataForm.time[1],
- 'orderStatus': this.tabChange.tabActiveName, // 订单状态参数
- 'isPrint': this.tabChange.isPrint,
- 'orderorderType': this.tabChange.orderName,
+ // url: this.$http.adornUrl('/book/buyOrder/list'),
+ url: this.$http.adornUrl('/book/buyOrder/orderList'),
+ method: 'post',
+ // params: this.$http.adornParams({
+ // 'page': this.pageIndex,
+ // 'limit': this.pageSize,
+ // 'key': this.dataForm.key,
+ // 'startTime': this.dataForm.time[0],
+ // 'endTime': this.dataForm.time[1],
+ // 'orderStatus': this.tabChange.tabActiveName, // 订单状态参数
+ // 'isPrint': this.tabChange.isPrint,
+ // 'orderorderType': this.tabChange.orderName,
+ // }),
+ data:this.$http.adornData({
+ "searchKeyWord": this.dataForm.key,
+ "startTime": this.dataForm.time[0],
+ "endTime": this.dataForm.time[1],
+ "orderStatus": this.tabChange.tabActiveName,
+ "pageIndex": this.pageIndex,
+ "pageSize": this.pageSize,
})
}).then(({ data }) => {
+ console.log(data,'列表数据')
if (data && data.code === 0) {
- this.dataList = data.page.list
- this.totalPage = data.page.totalCount
+ this.dataList = data.result.data
+ this.totalPage = data.result.totalDataSize
if (this.tabChange.tabActiveName === '1') { // 判断可选按钮是否可用
this.isMultipleDisabled()
}
@@ -769,6 +863,11 @@ export default {
selectionChangeHandle(val) {
this.dataListSelections = val
},
+ // 面单批量选择
+ SheetSelectionChangeHandle(val){
+ this.SheetSelectionList = val
+ console.log(this.SheetSelectionList,'选中的打印列表')
+ },
// 新增 / 修改
addOrUpdateHandle(id) {
this.addOrUpdateVisible = true
@@ -826,43 +925,52 @@ export default {
}
},
// 批量/打印面单
- printHandle(id) {
+ printHandle(id, row) {
+ console.log(id, row)
// 如果是传了id
- if(isFinite(id)){
- console.log(id, '传了')
- this.$confirm(`确定对选中的 1 条面单进行批量打印操作?`, '提示', {
+ if(id){
+ // console.log(id, '传了')
+ this.$confirm(`确定进行打印操作?`, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
+ this.SheetSelectionList = [row]
+ let SheetList = this.SheetSelectionList.map(item => item.printTemplate)
+ this.selectedPrintList = SheetList
+ console.log(this.selectedPrintList, 'this.selectedPrintList')
//遍历数组列表
- this.PrintSheetList.map(item => {
- if(item.orderId == id){ return this.selectedPrintList = [item.fmsHtml]}
+ // this.PrintSheetList.map(item => {
+ // if(item.expressOrderSn == id){ return this.selectedPrintList = [item.printTemplate]}
+ // console.log(this.selectedPrintList,'this.selectedPrintList待打印列表')
setTimeout(() => {
this.handlePrintSheet()
}, 1000);
setTimeout(() => {
- this.selectedPrintList = []
+ this.confirmPrint()
}, 1000);
- })
- }).catch(()=>{})
+ // })
+ }).catch((e)=>{
+ console.log('打印报错了')
+ })
}else{
- // console.log(ids)
- //this.printDialogVisible = true
- this.$confirm(`确定对选中的${this.dataListSelections.length}条面单进行批量打印操作?`, '提示', {
+ console.log('批量打印')
+ this.printDialogVisible = true
+ this.$confirm(`确定对选中的 ${this.SheetSelectionList.length} 个面单进行批量打印操作?`, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
// 计算出选中了多少条面单
- let SheetList = this.dataListSelections.map(item => item.fmsHtml)
+ let SheetList = this.SheetSelectionList.map(item => item.printTemplate)
this.selectedPrintList = SheetList
+ console.log(this.selectedPrintList,'即将打印的面单数组')
setTimeout(() => {
this.handlePrintSheet()
}, 1000);
setTimeout(() => {
- this.selectedPrintList = []
+ this.confirmPrint()
}, 1000);
}).catch(() => { })
}
@@ -883,6 +991,54 @@ export default {
newWin.close(); //关闭窗口
}, 100);
},
+ // 弹出打印结果确认内容
+ confirmPrint(){
+ this.$confirm('是否已完成此次打印任务？', '提示', {
+ confirmButtonText: '已完成打印',
+ cancelButtonText: '打印出错',
+ type: 'warning'
+ }).then(() => {
+ // 开始请求批量打印接口（改变打印状态）
+ let loading = this.$loading({
+ lock: true,
+ text: '正在更新面单数据',
+ spinner: 'el-icon-loading',
+ background: 'rgba(0, 0, 0, 0.7)'
+ });
+ var printids = this.SheetSelectionList.map( item => item.id)
+ console.log(printids,'printids打印的isd',)
+ this.$http({
+ url: this.$http.adornUrl('/express/printTemplate'),
+ method: 'post',
+ data:
+ printids
+
+ }).then(({ data }) => {
+ if(data.code == 0){
+ console.log(data,'data')
+ this.selectedPrintList = []
+ this.SheetSelectionList = []
+ this.getNotPrintSheetList()
+ loading.close() }
+ }).catch(({e}) => {
+ this.selectedPrintList = []
+ this.SheetSelectionList = []
+ console.log(e,'e')
+ loading.close()
+ })
+
+ // setTimeout(() => {
+ // this.selectedPrintList = []
+ // this.SheetSelectionList = []
+ // }, 1000);
+ // this.$message({
+ // type: 'success',
+ // message: '删除成功!'
+ // });
+ }).catch(() => {
+ console.log('打印出错了')
+ });
+ },
closePrintDialog(val) {
this.printDialogVisible = val
},
diff --git a/src/views/modules/order/buyorderdetail.vue b/src/views/modules/order/buyorderdetail.vue
index 93b3e79..892e04a 100644
--- a/src/views/modules/order/buyorderdetail.vue
+++ b/src/views/modules/order/buyorderdetail.vue
@@ -10,10 +10,10 @@
- 用户名：{{orderDetails.userName ? orderDetails.userName : '暂无'}} -
- 用户ID：{{orderDetails.userId}} -
- 联系电话：{{orderDetails.userPhone}} -
- 用户名：{{orderDetails.userInfo.userName !== null ? orderDetails.userInfo.userName : '暂无'}} + +
- 联系电话：{{orderDetails.userInfo.userPhone}} + @@ -24,13 +24,13 @@ 待发货 已发货 已完成 -
- 订单金额：￥{{orderDetails.orderMoney}} -
- 交付邮费：￥{{orderDetails.shippingMoney}} +
- 订单金额：￥{{orderDetails.orderPrice}} +
- 交付邮费：￥{{orderDetails.shippingPrice}} -
- 实际支付金额：￥{{orderDetails.realMoney}} +
- 实际支付金额：￥{{orderDetails.realPrice}}
- 创建时间：{{orderDetails.createTime}}
- 支付时间：{{orderDetails.paymentDate}}
- 支付方式：
@@ -46,41 +46,30 @@
优惠信息-
- 优惠金额：0
-- 会员商品优惠：0
-- 积分抵扣：0
+ +- 积分抵扣：{{orderDetails.districtPrice}}
物流信息 修改收货信息- - 收货人：{{orderDetails.shippingUser}} {{orderDetails.userPhone}} -
- 收货地址：{{orderDetails.province}}-{{orderDetails.city}}-{{orderDetails.district}}-{{orderDetails.address}} +
- 收货人：{{orderDetails.consignee.consigneeName}} {{orderDetails.consignee.consigneeMobile}} +
- 收货地址：{{orderDetails.consignee.province}}-{{orderDetails.consignee.city}}-{{orderDetails.consignee.county}}-{{orderDetails.consignee.address}} -
- +
-
- - - -+ +物流公司：{{item.ShipperName}}-运单号：{{item.LogisticCode}}--+--- -- {{ activity.AcceptStation }} - --暂无物流信息--+ - + @@ -88,14 +77,14 @@+-物流公司：{{item.expressCompanyName}}+运单号：{{item.expressOrderSn}} ++查看物流进度 +商品信息--@@ -112,6 +101,24 @@+
{{ scope.row.productName}}+ ++运单信息：{{currentSheet.expressCompanyName}} - {{currentSheet.expressOrderSn}}++++ ++ {{ activity.acceptStation }} + +-暂无物流信息-++- @@ -180,7 +187,11 @@ export default { dataForm: { key: '' }, - reverse: false, + traces:[], // 物流轨迹 + tracesShow:false, + currentSheet:{}, + + reverse: true, activities: [ ], deliverData: [], // 物流信息 @@ -189,15 +200,18 @@ export default { dataListSelections: [], // addOrUpdateVisible: false, query: { - orderId: 0, + orderSn: 0, ordertype:null }, changeAddVisible: false, orderDetails:{}, addressForm:{ - province:null, - city:null, - county:null, + provinceCode:null, //省份串码 + provinceName:null, + cityCode:null, //市区串码 + cityName:null, + countyCode:null, //省份串码 + countyName:null, name:'', tel:'', addressXX:'' @@ -224,44 +238,103 @@ export default { addressXX: [ { required: true, message: '请输入详细地址信息', trigger: 'blur' } ], - } + }, + sheetList:[], // 面单列表 } }, components: { AddOrUpdate }, activated() { - this.query.orderId = this.$route.query.orderId; + this.query.orderSn = this.$route.query.orderSn; this.query.ordertype = this.$route.query.ordertype; - console.log(this.$route.query.orderId) + console.log(this.$route.query.orderSn) this.getData() + // this.getOrderSheetList() }, - methods: { - cityChange(e){ - // console.log('修改了市',e) - this.addressForm.county = null - this.countyEntity = this.cityEntity.cityList.find((val,index,arr)=>{ + methods: { + drawerHandleClose(){ + console.log('关闭') + this.traces = [] + this.tracesShow = false + this.currentSheet = {} + }, + // 获取某一快递的物流进度 + seeSheetDetails(item){ + console.log('正在查询快递进度',item) + this.currentSheet = item + let loading = this.$loading({ + lock: true, + text: '正在获取物流信息...', + spinner: 'el-icon-loading', + background: 'rgba(0, 0, 0, 0.7)' + }); + var mobileLeng = this.orderDetails.consignee.consigneeMobile.length + this.$http({ + url: this.$http.adornUrl('/book/buyOrder/queryExpress'), + method: 'get', + params: this.$http.adornParams({ + 'expressOrderSn': item.expressOrderSn, + 'expressCompanyCode': item.expressCompanyCode, + 'customerName': this.orderDetails.consignee.consigneeMobile.substring(mobileLeng-4, mobileLeng) + }) + }).then(({ data }) => { + if(data.code == 0){ + if(data.result.traces.length > 0){ + this.traces = data.result.traces + this.tracesShow = true + console.log(data,'data') + loading.close() + }else{ + this.$message('暂无物流信息哦~'); + loading.close() + } + } + + }).catch(({e}) => { + console.log(e,'e') + loading.close() + }) + }, + countyChange(e){ + console.log(e,'countyName') + this.countyEntity.countyList.find((val,index,arr)=>{ + this.addressForm.countyName = val.countyName return val.regionCode == e }) - // console.log('对应的city数组',this.countyEntity) + console.log('this.addressForm.countyName', this.addressForm) + }, + cityChange(e){ + // console.log('修改了市',e) + this.addressForm.countyCode = null + this.countyEntity = this.cityEntity.cityList.find((val,index,arr)=>{ + this.addressForm.cityName = val.cityName + return val.regionCode == e + }) + console.log(' this.addressForm.cityName', this.addressForm.cityName) }, provinceChange(e){ // console.log('修改了省份',e) - this.addressForm.city = null; - this.addressForm.county = null + this.addressForm.cityCode = null; + this.addressForm.countyCode = null this.cityEntity = this.provinceEntity.find((val,index,arr)=>{ + this.addressForm.provinceName = val.provName return val.regionCode == e }) - // console.log('对应的city数组',this.cityEntity) + console.log('this.addressForm.provinceName',this.addressForm.provinceName) }, changeAddHandleClose(){ this.changeAddVisible = false - this.addressForm.province = null - this.addressForm.city = null; - this.addressForm.county = null + this.addressForm.provinceCode = null + this.addressForm.cityCode = null; + this.addressForm.countyCode = null + this.addressForm.provinceName = null + this.addressForm.cityName = null; + this.addressForm.countyName = null this.provinceEntity = [] this.cityEntity = [] this.countyEntity = [] + this.$refs['addressFormRef'].clearValidate() this.$nextTick(() => { this.addressForm.name = '' this.addressForm.tel = '' @@ -282,74 +355,116 @@ export default { console.log('获取地址三级列表', data) if(data.code == 0){ this.provinceEntity = data.provinceEntity + this.addressForm.addressXX = this.orderDetails.consignee.address + this.addressForm.provinceCode = this.orderDetails.consignee.provinceCode + this.addressForm.cityCode = this.orderDetails.consignee.cityCode + this.addressForm.countyCode = this.orderDetails.consignee.countyCode + this.addressForm.provinceName = this.orderDetails.consignee.provinceCode + this.addressForm.cityName = this.orderDetails.consignee.cityCode + this.addressForm.countyName = this.orderDetails.consignee.countyCode + this.addressForm.name = this.orderDetails.consignee.consigneeName + this.addressForm.tel = this.orderDetails.consignee.consigneeMobile + console.log(this.provinceEntity,'this.provinceEntity') + this.cityEntity = this.provinceEntity.find((val,index,arr)=>{ + return val.regionCode == this.addressForm.provinceCode + }) + this.countyEntity = this.cityEntity.cityList.find((val,index,arr)=>{ + return val.regionCode == this.addressForm.cityCode + }) } }).catch( e => { console.log(e,'e') - }) - // this.changeAddVisible = true + }) + this.changeAddVisible = true console.log('显示修改收货地址') }, // 修改收货信息 changeAddress(){ this.$refs['addressFormRef'].validate((valid) => { - if (valid) { + if (valid) { console.log('修改收货地址') + this.$http({ + url: this.$http.adornUrl('/book/buyOrder/modifyConsigneeAddress'), + method: 'post', + data: this.$http.adornData({ + 'orderSn': this.query.orderSn, + // 'province': this.addressForm.provinceName, + // 'city': this.addressForm.cityName, + // 'county': this.addressForm.countyName, + 'address': this.addressForm.addressXX, + 'consigneeName': this.addressForm.name, + 'consigneeMobile': this.addressForm.tel, + "provinceCode": this.addressForm.provinceCode, + "cityCode": this.addressForm.cityCode, + "countyCode": this.addressForm.countyCode, + //'orderId': this.addressForm.orderId + + }) + }).then(({ data }) => { + console.log('修改地址返回值', data) + this.$message.success('修改地址成功！') + this.changeAddHandleClose() + this.getData() + + }).catch( e => { + console.log(e,'e') + }) } else { return false; } }); }, - // 获取地址数据三级联动 - // 获取 物流 - getdeliverDetails(){ - let loading = this.$loading({ - lock: true, - text: '正在获取物流信息...', - spinner: 'el-icon-loading', - background: 'rgba(0, 0, 0, 0.7)' - }); - this.$http({ - url: this.$http.adornUrl('/book/buyOrder/queryFMS'), - method: 'post', - params: this.$http.adornParams({ - 'orderId': this.query.orderId + + // 获取订单下的快递单 + getOrderSheetList(){ + this.$http({ + url: this.$http.adornUrl('/express/getPrintTemplateList'), + method: 'get', + params: this.$http.adornParams({ + 'expressOrderSn': this.query.orderSn, }) + /// data: {} }).then(({ data }) => { - if(data && data.code === 0){ - if(data.rntStr != []){ - this.activities = data.rntStr - // console.log(this.activities) - }else{ - this.activities = [] - } - loading.close() - }else{ - loading.close() - return this.$message.error('物流获取失败，请重试') - - } - }).catch(({e}) => { - loading.close() - console.log(e,'e') + console.log(data.result,'面单列表') + if (data && data.code === 0) { + this.sheetList = data.result.data + // this.MDtotalPage = data.result.totalDataSize + } else { + // this.PrintSheetList = [] + // this.totalPage = 0 + } }) - - }, + }, // 获取数据列表 getData() { this.dataListLoading = true this.$http({ // url: this.$http.adornUrl(`/book/buyOrder/appGetOrderInfo/${this.query.ordertype}`), - url: this.$http.adornUrl(`/book/buyOrder/getOrderDetail/`), + url: this.$http.adornUrl(`/book/buyOrder/orderDetail`), method: 'get', params: this.$http.adornParams({ - 'orderId': this.query.orderId, + 'orderSn': this.query.orderSn, }) }).then(({ data }) => { if (data && data.code === 0) { - this.orderDetails = data.detail - if(this.query.ordertype != 0){ // 不是待付款订单时 - this.getdeliverDetails() - } + console.log(data.result,'data.result') + this.orderDetails = data.result + if(this.orderDetails.goodsList.length > 0){ + console.log('存在商品数据', this.orderDetails.goodsList.length) + var ids = [] + ids.push(this.orderDetails.goodsList[0].expressInfo.expressOrderSn) + this.sheetList.push(this.orderDetails.goodsList[0].expressInfo) + for (let index = 0; index < this.orderDetails.goodsList.length; index++) { + if (!ids.includes(this.orderDetails.goodsList[index].expressInfo.expressOrderSn)) { + ids.push(this.orderDetails.goodsList[index].expressInfo.expressOrderSn) + this.sheetList.push(this.orderDetails.goodsList[index].expressInfo)} + console.log(this.orderDetails.goodsList[index].expressInfo.expressOrderSn,'expressOrderSn') + } + console.log(ids,this.sheetList,'this.sheetList') + } + // if(this.query.ordertype != 0){ // 不是待付款订单时 + // this.getdeliverDetails() + // } } else { this.orderDetails = {} return this.$message.error('商品详情获取失败，请重试') @@ -363,7 +478,7 @@ export default { }, // 去发货 godeliver() { - this.orderList[0] = this.query.orderId + this.orderList[0] = this.query.orderSn this.setDeliverVisible = true } }, @@ -457,10 +572,11 @@ ul.list { content: "\e740"; } -.el-timeline-item:first-child { +.el-timeline-item:first-child { .el-timeline-item__node { background-color: rgb(11, 189, 135); } + color: rgb(11, 189, 135) !important; } .el-timeline-item { diff --git a/src/views/modules/order/deliver-detail.vue b/src/views/modules/order/deliver-detail.vue index 379b280..6e97e8e 100644 --- a/src/views/modules/order/deliver-detail.vue +++ b/src/views/modules/order/deliver-detail.vue @@ -97,7 +97,7 @@ export default { return this.$message.error('获取失败，请重新尝试') } }).catch(() => { - + return this.$message.error('获取失败，请重新尝试') }) }, beforeCloseDialog() { diff --git a/src/views/modules/order/orderbeizhu-add-or-update.vue b/src/views/modules/order/orderbeizhu-add-or-update.vue index dd41b4c..3c82e85 100644 --- a/src/views/modules/order/orderbeizhu-add-or-update.vue +++ b/src/views/modules/order/orderbeizhu-add-or-update.vue @@ -22,7 +22,11 @@ export default { orderId:{ type: Number, value: null - }, + }, + orderSn:{ + type: String, + value: '' + }, }, data() { return { @@ -36,19 +40,22 @@ export default { beforeCloseDialog() { this.$emit('closeDialog', false) }, - init (id) { + init (sn,id) { this.orderId = id || 0 + this.orderSn = sn || 0 this.visible = true this.$nextTick(() => { - if (this.orderId) { + if (this.orderSn) { this.$http({ - url: this.$http.adornUrl(`/book/buyOrder/info/${this.orderId}`), + url: this.$http.adornUrl('/book/buyOrder/orderDetail'), method: 'get', - params: this.$http.adornParams() + params: this.$http.adornParams({ + 'orderSn': this.orderSn, + }) }).then(({data}) => { if (data && data.code === 0) { - console.log(data.buyOrder) - this.dataForm.remark = data.buyOrder.remark + console.log(data.result) + this.dataForm.remark = data.result.remark // console.log(this.dataForm.remark) } }) diff --git a/src/views/modules/order/orderdeliver-split.vue b/src/views/modules/order/orderdeliver-split.vue index 824b6e6..522a7ad 100644 --- a/src/views/modules/order/orderdeliver-split.vue +++ b/src/views/modules/order/orderdeliver-split.vue @@ -30,10 +30,11 @@+ + - -+ + + + + +--
-+{{ products.productName }}-+
+{{ products.productName }}+快递信息：{{products.expressInfo.expressCompany}}-{{products.expressInfo.expressOrderSn}}+-@@ -41,7 +42,9 @@× {{ products.quantity }}
用户信息
-
+
-
+
+
+ 用户名：{{mixOrderList[0].consignee.consigneeName}}
+ 电话：{{mixOrderList[0].consignee.consigneeMobile}}
+ 收货地址：{{mixOrderList[0].consignee.province}}-{{mixOrderList[0].consignee.city}}-{{mixOrderList[0].consignee.county}}-{{mixOrderList[0].consignee.address}}
+
+
+
+
-
+
- 订单编号：{{item2.orderSn}}
+ 订单编号：{{item.orderSn}}
@@ -83,17 +95,17 @@
-
-
+
@@ -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;
-
![]()
+![]()
-
+
-
- {{item3.productName}}
+
+
{{item2.productName}}
+ 快递信息：{{item2.expressInfo.expressCompany}}-{{item2.expressInfo.expressOrderSn}}
× {{item3.quantity}}
+ × {{item2.quantity}}