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-31 16:19:09 +08:00
parent f15ee27255
commit a74981d153
4 changed files with 91 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/router/index.js
View File

@@ -51,7 +51,7 @@ const mainRoutes = {
{ path: '/book-comments', component: _import('modules/book/bookComments'), name: 'book-comments', meta: { title: '书评管理', isTab: true } }, { path: '/book-comments', component: _import('modules/book/bookComments'), name: 'book-comments', meta: { title: '书评管理', isTab: true } },
{ path: '/clock', component: _import('modules/book/clock'), name: 'clock', meta: { title: '打卡管理', isTab: true } }, { path: '/clock', component: _import('modules/book/clock'), name: 'clock', meta: { title: '打卡管理', isTab: true } },
{ path: '/talkBook', component: _import('modules/book/talkBook'), name: 'talkBook', meta: { title: '讲书管理', isTab: true } }, { path: '/talkBook', component: _import('modules/book/talkBook'), name: 'talkBook', meta: { title: '讲书管理', isTab: true } },
{ path: '/acupointManagement', component: _import('modules/acupointManagement'), name: 'acupointManagement', meta: { title: '穴位管理', isTab: true } },
], ],
beforeEnter (to, from, next) { beforeEnter (to, from, next) {
let token = Vue.cookie.get('token') let token = Vue.cookie.get('token')

100
src/views/modules/order/buyorder.vue
View File

@@ -19,22 +19,37 @@
<el-radio-button label="1">打印面单</el-radio-button> <el-radio-button label="1">打印面单</el-radio-button>
</el-radio-group> </el-radio-group>
<!-- <el-radio v-model="tabChange.isPrint" label="" border size="mini">全部</el-radio> --> <!-- <el-radio v-model="tabChange.isPrint" label="" border size="mini">全部</el-radio> -->
<!-- <el-radio v-model="tabChange.isPrint" label="1" border size="mini">未打印</el-radio> <!-- <el-radio v-model="tabChange.isPrint" label="1" border size="mini">已打印</el-radio>
<el-radio v-model="tabChange.isPrint" label="2" border size="mini">已打印</el-radio> --> <el-radio v-model="tabChange.isPrint" label="2" border size="mini">未打印</el-radio> -->
<!-- <el-button style="margin-left: 10px;" size="mini" v-if="isAuth('book:buyorder:delete')" type="primary" @click="printHandle(dataListSelections)" <!-- <el-button style="margin-left: 10px;" size="mini" v-if="isAuth('book:buyorder:delete')" type="primary" @click="printHandle(dataListSelections)"
:disabled="dataListSelections.length <= 0" >批量打印</el-button> --> :disabled="dataListSelections.length <= 0" >批量打印</el-button> -->
</div> </div>
<!-- <div style="margin-bottom: 10px; float:left" v-if="tabChange.isPrint == '1'"> <div style="margin-bottom: 10px; float:left; margin-right: 15px" v-if="tabChange.isPrint == '1'">
<el-radio v-model="tabChange.sheetCode" label="0" border size="mini">未打印</el-radio> <el-radio v-model="tabChange.sheetCode" :label="0" border size="mini">全部</el-radio>
<el-radio v-model="tabChange.sheetCode" label="1" border size="mini">已打印</el-radio> <el-radio v-model="tabChange.sheetCode" :label="2" border size="mini">未打印</el-radio>
</div> --> <el-radio v-model="tabChange.sheetCode" :label="1" border size="mini">已打印</el-radio>
<div style="margin-bottom: 10px; float:left; "> </div>
<el-form v-if="tabChange.isPrint == '1'" :inline="true" size="mini" :model="dataForm" @keyup.enter.native="getDataList()"> <div style="margin-bottom: 10px; float:left;">
<el-form-item> <el-form v-if="tabChange.isPrint == '1'" :inline="true" size="mini" :model="MdDataForm" @keyup.enter.native="getDataList()">
<el-input style="width:200px" v-model="dataForm.key" placeholder="订单编号/运单编号" clearable></el-input> <el-form-item>
<div class="block">
<!-- <el-date-picker size="mini" value-format="timestamp" v-model="" type="datetimerange" :picker-options="timePickerOptions"
range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" align="right" @change="test">
</el-date-picker> -->
<el-date-picker
v-model="MdDataForm.date"
type="date"
format="yyyy 年 MM 月 dd 日"
value-format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
</div>
</el-form-item> </el-form-item>
<!-- <el-form-item>
<el-input style="width:200px" v-model="MdDataForm.key" placeholder="订单编号/运单编号" clearable></el-input>
</el-form-item> -->
<el-form-item> <el-form-item>
<el-button @click="getDataList()">查询</el-button> <el-button @click="getPrintSheetList()">查询</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
@@ -91,7 +106,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="isPrint" label="是否打印"> <el-table-column prop="isPrint" label="是否打印">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="scope.row.templatedPrinted == 1" type="success">是</el-tag> <el-tag v-if="scope.row.templatePrinted == 1" type="success">是</el-tag>
<el-tag v-else type="success">否</el-tag> <el-tag v-else type="success">否</el-tag>
</template> </template>
</el-table-column> </el-table-column>
@@ -108,7 +123,7 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" :current-page="pageIndex" <el-pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" :current-page="pageIndex"
:page-sizes="[40, 60, 100, 150]" :page-size="pageSize" :total="MDtotalPage" :page-sizes="[40, 60, 100, 150]" :page-size="pageSize" :total="MDtotal"
layout="total, sizes, prev, pager, next, jumper"> layout="total, sizes, prev, pager, next, jumper">
</el-pagination> </el-pagination>
</div> </div>
@@ -502,7 +517,7 @@ export default {
key: '', key: '',
time: '' time: ''
}, },
PrintSheetList: [],//可打印列表 PrintSheetList: [],//打印列表
selectedPrintList: [], // 选中的面单列表 selectedPrintList: [], // 选中的面单列表
mergeList: [], // 检查订单可合并项数组 mergeList: [], // 检查订单可合并项数组
checkboxGroup: { checkboxGroup: {
@@ -520,9 +535,9 @@ export default {
dataList: [], dataList: [],
tabChange: { tabChange: {
tabActiveName: '1', // tab筛选默认all全部 0：待付款 1：待发货 2：已发货 3：已完成 tabActiveName: '1', // tab筛选默认all全部 0：待付款 1：待发货 2：已发货 3：已完成
isPrint: '0', // 已发货列表筛选 0：显示订单 1：显示可打印列表, isPrint: 0, // 已发货列表筛选 0：显示订单 1：显示可打印列表,
orderName: '0', //订单名称筛选 all:全部 0:健康超市 1:电子书 2:充值订单 orderName: '0', //订单名称筛选 all:全部 0:健康超市 1:电子书 2:充值订单
sheetCode:0, // 面单状态0 未打印，1 已打印 sheetCode: 0, // 面单状态2 未打印，1 已打印 0全部
}, },
editBeizhudialogVisible: false, // 修改备注按钮 editBeizhudialogVisible: false, // 修改备注按钮
editBeizhuform: { editBeizhuform: {
@@ -535,7 +550,7 @@ export default {
dataListLoading: false, dataListLoading: false,
dataListSelections: [], dataListSelections: [],
addOrUpdateVisible: false, addOrUpdateVisible: false,
MDtotalPage:0, MDtotal:0,
// 时间段设置项 // 时间段设置项
timePickerOptions: { timePickerOptions: {
shortcuts: [{ shortcuts: [{
@@ -578,6 +593,9 @@ export default {
haveValue:false, haveValue:false,
orderSn:null, orderSn:null,
}, },
MdDataForm:{
date:'' // 时间
},
provinceEntity:[], // 城市列表 provinceEntity:[], // 城市列表
cityEntity:[], // 市 cityEntity:[], // 市
countyEntity:[], // 区 countyEntity:[], // 区
@@ -743,28 +761,42 @@ export default {
}, },
// 混合发货 // 混合发货
showAnyDialog(item) { showAnyDialog(item) {
this.anyDialogContent = item.printTemplate if (!item.printString || item.printString == '') return this.$message.error('暂无面单数据')
this.anyDialogContent = item.printString
console.log('面单',item) console.log('面单',item)
if (item.printTemplate == null) return this.$message.error('暂无面单数据')
this.anyDialogVisible = true this.anyDialogVisible = true
this.anyDialogTitle = '查看面单' this.anyDialogTitle = '查看面单'
}, },
// 查询可打印面单 // 查询印面单列表
getNotPrintSheetList() { getPrintSheetList() {
// let dateString = ''
// if(this.MdDataForm.date != ''){
// dateString = this.MdDataForm.date.toString()
// }
this.dataListLoading = true
this.$http({ this.$http({
url: this.$http.adornUrl('/express/getPrintTemplateList'), url: this.$http.adornUrl('/express/getExpressPrints'),
method: 'get', method: 'post',
/// data: {} data: this.$http.adornData({
"limit": this.pageSize,
"page": this.pageIndex,
"type": this.tabChange.sheetCode, //类型，0不限1已打印2未打印
"date": this.MdDataForm.date,//string类型,非必传字段2023-10-30
"expressOrderSn":"" //string类型，非必传字段
})
}).then(({ data }) => { }).then(({ data }) => {
console.log(data.result.totalDataSize,'面单列表') console.log(data.page.records,'面单列表')
if (data && data.code === 0) { if (data && data.code === 0 && data.page.records.length > 0) {
this.PrintSheetList = data.result.data this.PrintSheetList = data.page.records
this.MDtotalPage = data.result.totalDataSize this.MDtotal = data.page.total
} else { } else {
this.PrintSheetList = [] this.PrintSheetList = []
this.totalPage = 0 this.MDtotal = 0
} }
this.dataListLoading = false this.dataListLoading = false
}).catch(({e}) => {
console.log(e,'e')
this.dataListLoading = false
}) })
}, },
// 检查待发货单选按钮是否可用 // 检查待发货单选按钮是否可用
@@ -930,7 +962,7 @@ export default {
} }
} }
}, },
// 批量/打印面单 // 批量/单个打印面单
printHandle(id, row) { printHandle(id, row) {
console.log(id, row) console.log(id, row)
// 如果是传了id // 如果是传了id
@@ -942,7 +974,7 @@ export default {
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.SheetSelectionList = [row] this.SheetSelectionList = [row]
let SheetList = this.SheetSelectionList.map(item => item.printTemplate) let SheetList = this.SheetSelectionList.map(item => item.printString)
this.selectedPrintList = SheetList this.selectedPrintList = SheetList
console.log(this.selectedPrintList, 'this.selectedPrintList') console.log(this.selectedPrintList, 'this.selectedPrintList')
//遍历数组列表 //遍历数组列表
@@ -969,7 +1001,7 @@ export default {
}).then(() => { }).then(() => {
// 计算出选中了多少条面单 // 计算出选中了多少条面单
let SheetList = this.SheetSelectionList.map(item => item.printTemplate) let SheetList = this.SheetSelectionList.map(item => item.printString)
this.selectedPrintList = SheetList this.selectedPrintList = SheetList
console.log(this.selectedPrintList,'即将打印的面单数组') console.log(this.selectedPrintList,'即将打印的面单数组')
setTimeout(() => { setTimeout(() => {
@@ -1024,7 +1056,7 @@ export default {
console.log(data,'data') console.log(data,'data')
this.selectedPrintList = [] this.selectedPrintList = []
this.SheetSelectionList = [] this.SheetSelectionList = []
this.getNotPrintSheetList() this.getPrintSheetList()
loading.close() } loading.close() }
}).catch(({e}) => { }).catch(({e}) => {
this.selectedPrintList = [] this.selectedPrintList = []
@@ -1159,7 +1191,7 @@ export default {
if (this.tabChange.tabActiveName === '0' || this.tabChange.tabActiveName === '1' || this.tabChange.tabActiveName === '3') { if (this.tabChange.tabActiveName === '0' || this.tabChange.tabActiveName === '1' || this.tabChange.tabActiveName === '3') {
this.tabChange.isPrint = '0' this.tabChange.isPrint = '0'
} }
if (this.tabChange.isPrint === '1') { this.getNotPrintSheetList() } if (this.tabChange.isPrint === '1') { this.getPrintSheetList() }
}, },
deep: true deep: true

59
src/views/modules/order/buyorderdetail.vue
View File

@@ -9,6 +9,7 @@
</div> </div>
<div> <div>
<ul class="list"> <ul class="list">
<div v-if="orderDetails.userInfo">
<div class="liName">用户信息</div> <div class="liName">用户信息</div>
<li><span class="infoTitle">用户名：</span><span>{{orderDetails.userInfo.userName !== null ? orderDetails.userInfo.userName : '暂无'}}</span></li> <li><span class="infoTitle">用户名：</span><span>{{orderDetails.userInfo.userName !== null ? orderDetails.userInfo.userName : '暂无'}}</span></li>
<!-- <li><span class="infoTitle">用户ID：</span><span>{{orderDetails.userId}}</span></li> --> <!-- <li><span class="infoTitle">用户ID：</span><span>{{orderDetails.userId}}</span></li> -->
@@ -17,6 +18,7 @@
<!-- <li><span class="infoTitle">电 话：</span><span>187898544875</span></li> --> <!-- <li><span class="infoTitle">电 话：</span><span>187898544875</span></li> -->
<!-- <li><span class="infoTitle">地 址：</span><span>天津市天津市天津市天津市天津市天津市</span></li> --> <!-- <li><span class="infoTitle">地 址：</span><span>天津市天津市天津市天津市天津市天津市</span></li> -->
<li class="line"></li> <li class="line"></li>
</div>
<div class="liName">订单信息</div> <div class="liName">订单信息</div>
<li><span class="infoTitle">订单ID：</span><span>{{orderDetails.orderSn}}</span></li> <li><span class="infoTitle">订单ID：</span><span>{{orderDetails.orderSn}}</span></li>
<li><span class="infoTitle">订单状态：</span> <li><span class="infoTitle">订单状态：</span>
@@ -58,12 +60,12 @@
<!-- <el-alert title="`该订单下共有 2 条物流信息`" type="info"> <!-- <el-alert title="`该订单下共有 2 条物流信息`" type="info">
</el-alert> --> </el-alert> -->
<!-- <li class="flexbox deliverBox" style="width: 100%;" v-if="sheetList.length > 0"> <li class="flexbox deliverBox" style="width: 100%;" v-if="sheetList.length > 0">
<el-row :gutter="20" style="100%"> <el-row :gutter="20" style="100%">
<el-col :md="12" :lg="8" class="item" v-for="(item, index) in sheetList" :key="index"> <el-col :md="12" :lg="8" class="item" v-for="(item, index) in sheetList" :key="index">
<div class="deliver_heade"> <div class="deliver_heade">
<div><span class="infoTitle">物流公司：</span><span>{{item.expressCompanyName}}</span></div> <!-- <div><span class="infoTitle">物流公司：</span><span>{{item.expressCompanyName}}</span></div> -->
<div><span class="infoTitle">运单号：</span><span style="margin-right:10px">{{item.expressOrderSn}}</span> <div><span class="infoTitle">运单号：</span><span style="margin-right:10px">{{item.expressOrderSn}}</span>
<el-button type="primary" size="mini" plain @click="seeSheetDetails(item)">查看物流进度</el-button> <el-button type="primary" size="mini" plain @click="seeSheetDetails(item)">查看物流进度</el-button>
</div> </div>
@@ -72,7 +74,7 @@
</el-col> </el-col>
</el-row> </el-row>
</li> --> </li>
<li class="line" style="margin:10px 0;"></li> <li class="line" style="margin:10px 0;"></li>
<!-- 订单商品 --> <!-- 订单商品 -->
@@ -269,19 +271,19 @@ export default {
spinner: 'el-icon-loading', spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)' background: 'rgba(0, 0, 0, 0.7)'
}); });
var mobileLeng = this.orderDetails.consignee.consigneeMobile.length // var mobileLeng = this.orderDetails.consignee.consigneeMobile.length
this.$http({ this.$http({
url: this.$http.adornUrl('/book/buyOrder/queryExpress'), url: this.$http.adornUrl('/book/buyOrder/searchExpress'),
method: 'get', method: 'get',
params: this.$http.adornParams({ params: this.$http.adornParams({
'expressOrderSn': item.expressOrderSn, 'expressOrderSn': item.expressOrderSn,
'expressCompanyCode': item.expressCompanyCode, // 'expressCompanyCode': item.expressCompanyCode,
'customerName': this.orderDetails.consignee.consigneeMobile.substring(mobileLeng-4, mobileLeng) // 'customerName': this.orderDetails.consignee.consigneeMobile.substring(mobileLeng-4, mobileLeng)
}) })
}).then(({ data }) => { }).then(({ data }) => {
if(data.code == 0){ if(data.code == 0){
if(data.result.traces.length > 0){ if(data.express.traces.length > 0){
this.traces = data.result.traces this.traces = data.express.traces
this.tracesShow = true this.tracesShow = true
console.log(data,'data') console.log(data,'data')
loading.close() loading.close()
@@ -415,26 +417,6 @@ export default {
}); });
}, },
// 获取订单下的快递单
// getOrderSheetList(){
// this.$http({
// url: this.$http.adornUrl('/express/getPrintTemplateList'),
// method: 'get',
// params: this.$http.adornParams({
// 'expressOrderSn': this.query.orderSn,
// })
// /// data: {}
// }).then(({ data }) => {
// 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() { getData() {
this.dataListLoading = true this.dataListLoading = true
@@ -447,24 +429,9 @@ export default {
}) })
}).then(({ data }) => { }).then(({ data }) => {
if (data && data.code === 0) { if (data && data.code === 0) {
console.log(data.result,'data.result') // console.log(data.result,'data.result')
this.orderDetails = data.result this.orderDetails = data.result
if(this.orderDetails.goodsList.length > 0){ this.sheetList = data.result.expressOrders
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 { } else {
this.orderDetails = {} this.orderDetails = {}
return this.$message.error('商品详情获取失败，请重试') return this.$message.error('商品详情获取失败，请重试')

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

@@ -263,9 +263,10 @@ export default {
this.beforeCloseDialog() this.beforeCloseDialog()
return this.$message.success('发货成功') return this.$message.success('发货成功')
} }
}).catch(({e}) => { }).catch((e) => {
loading.close();
console.log('e',e) console.log('e',e)
this.$message.error('发货失败')
}) })
}else{ }else{
this.$message.error('请先选择物流公司') this.$message.error('请先选择物流公司')
@@ -314,7 +315,7 @@ export default {
}); });
this.$http({ this.$http({
// url: this.$http.adornUrl(`/book/buyOrder/blendSendFMS/${this.ruleForm.deliverLcd}`), // 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', method: 'post',
params: this.$http.adornParams({ params: this.$http.adornParams({
// "shipperName" : this.ruleForm.dictValue // "shipperName" : this.ruleForm.dictValue