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:
徐哼唧L
2023-12-07 13:20:25 +08:00
parent 7cc00acd2f
commit f64c2b05a5
9 changed files with 309 additions and 272 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,7 +18,7 @@
<el-radio-button label="0">已发货订单</el-radio-button>
<el-radio-button label="1">打印面单</el-radio-button>
</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="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)"
@@ -38,9 +38,9 @@
</el-date-picker> -->
<el-date-picker
v-model="MdDataForm.date"
type="date"
type="date"
format="yyyy 年 MM 月 dd 日"
value-format="yyyy-MM-dd"
value-format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
</div>
@@ -53,7 +53,7 @@
</el-form-item>
</el-form>
</div>
<el-form v-if="tabChange.isPrint != '1'" :inline="true" size="mini" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item>
<el-input style="width:200px" v-model="dataForm.key" placeholder="订单编号/收件人姓名/手机号" clearable></el-input>
@@ -67,7 +67,7 @@
</div>
</el-form-item>
<el-form-item>
<el-button @click="getDataList()">查询</el-button>
<el-button @click="pageIndex = 1;getDataList()">查询</el-button>
</el-form-item>
</el-form>
<div class="buttonGroup">
@@ -150,7 +150,7 @@
<span style="margin-left: 20px;">
<span class="infoTitle">下单时间：</span>{{ fitem.createTime }}</span>
<router-link :to="{ path: 'order-buyorderdetail', query: { orderSn: fitem.orderSn , ordertype: fitem.orderStatus} }" style="margin-left:20px">
<el-button type="warning" style="" size="mini" plain>订单详情</el-button>
<el-button type="warning" style="" size="mini" plain>订单详情</el-button>
</router-link>
<!-- <el-button type="danger" style="" size="mini" plain @click="deleteHandle(fitem.orderId)">删除订单</el-button> -->
</el-col>
@@ -159,9 +159,9 @@
<div v-if="fitem.isSend == 1" class="hasSplit"><span style="color:#999">该订单已被拆分发货</span>
<!-- <el-button type="text" @click="showOrderSheet(fitem.orderId)" size="mini">查看面单</el-button> -->
</div>
<!-- <icon-svg name="zhuyi"></icon-svg> 订单存在可合并发货项 -->
<!-- <icon-svg name="zhuyi"></icon-svg> 订单存在可合并发货项 -->
<!-- <router-link :to="{ path: 'order-buyorderdetail', query: { orderId: fitem.orderId , ordertype: fitem.orderStatus} }">
<el-button type="primary" style="color: #515a6e;" size="mini">订单详情</el-button>
<el-button type="primary" style="color: #515a6e;" size="mini">订单详情</el-button>
</router-link> -->
</div>
</el-col>
@@ -169,41 +169,41 @@
</div>
<div class="item_body">
<div class="flexbox" style="justify-content: space-between;">
<div class="td1 flexbox" style="width:600px; align-items: flex-start; flex-wrap: wrap;">
<div class="td1 flexbox" style="width:600px; align-items: flex-start; flex-wrap: wrap;">
<div v-show="fitem.orderType == 'order'" class="flexbox orderProducts" :class="{ nobottomBorder: fitem.goodsList.length <= 3 }"
v-for="(children, index2) in fitem.goodsList" :key="children.id" style="width: 50%;" >
v-for="(children, index2) in fitem.goodsList" :key="children.id" style="width: 50%;" >
<el-tooltip class="item" v-if="children.expressInfo && children.expressInfo.expressOrderSn != null" effect="light" :content="`快递信息：${children.expressInfo.expressCompany} ${children.expressInfo.expressOrderSn}`"
placement="right">
<span class="normal hasDeliver"></span>
</el-tooltip>
</el-tooltip>
<div class=" productItem k4545">
<img :class="children.expressInfo && children.expressInfo.expressOrderSn != null ? 'greeyImg' : 'lightImg'" :src="children.productImage" width="60px" height="60px">
<img :class="children.expressInfo && children.expressInfo.expressOrderSn != null ? 'greeyImg' : 'lightImg'" :src="children.productImage" width="60px" height="60px">
</div>
<div class="price " style="flex:1">
<div class="bookName">{{ children.productName }} &nbsp;
<i v-if="children.books && children.books.length > 0" @click.stop="seeBooks(children.books)" class="el-icon-view" style="color:#409eff; cursor: pointer;"></i></div>
<div><span>￥{{ children.productPrice }}</span> × {{ children.quantity }} </div>
</div>
</div>
<div v-show="fitem.orderType == 'point'" class="flexbox orderProducts" >
<div v-show="fitem.orderType == 'point'" class="flexbox orderProducts" >
<div class=" productItem">
<img src="../../../../static/img/oder_chong.png" width="60px" height="60px">
<img src="../../../../static/img/oder_chong.png" width="60px" height="60px">
</div>
<div class="price ">
<div class="bookName">天医币充值</div>
<div><span>￥{{ fitem.realMoney }}</span> × 1</div>
<div><span>￥{{ fitem.realMoney }}</span> × 1</div>
</div>
</div>
<div v-show="fitem.orderType == 'vip'" class="flexbox orderProducts" >
<div v-show="fitem.orderType == 'vip'" class="flexbox orderProducts" >
<div class=" productItem">
<img src="../../../../static/img/oder_vip.png" width="60px" height="60px">
<img src="../../../../static/img/oder_vip.png" width="60px" height="60px">
</div>
<div class="price ">
<div class="bookName">VIP充值</div>
<div><span>￥{{ fitem.realMoney }}</span> × 1 </div>
<div><span>￥{{ fitem.realMoney }}</span> × 1 </div>
</div>
</div>
<!-- <img v-if="fitem.orderType == 'vip'" src="../../../../static/img/oder_vip.png" width="60px" height="60px"> -->
@@ -241,7 +241,7 @@
<div>
<div class="orderStatus">待发货</div>
<!-- <div class="tabContent">
<div class="time">支付时间：2023-02-09 14:16:08</div>
<div class="time">支付时间：2023-02-09 14:16:08</div>
</div> -->
<div><el-button style=" line-height: 6px;" type="primary" size="mini" @click="orderDeliver(fitem)"
>发货</el-button>
@@ -299,7 +299,7 @@
<span v-if="scope.row.consignee.city && scope.row.consignee.city != ''">-</span><span>{{scope.row.consignee.city}}</span>
<span v-if="scope.row.consignee.county && scope.row.consignee.county != ''">-</span><span>{{scope.row.consignee.county}}</span>
<span v-if="scope.row.consignee.address && scope.row.consignee.address != ''">-</span><span>{{scope.row.consignee.address}}</span>
</template>
</template>
</el-table-column>
<!--<el-table-column
prop="province"
@@ -328,7 +328,7 @@
<el-table-column prop="paymentMethod" header-align="center" align="center" label="支付方式" width="130">
<template slot-scope="scope">
<el-tag size="mini" v-if="scope.row.paymentMethod == 1" type="success">微信</el-tag>
<el-tag size="mini" v-if="scope.row.paymentMethod == 2" type="primary">支付宝</el-tag>
<el-tag size="mini" v-if="scope.row.paymentMethod == 2" type="primary">支付宝</el-tag>
<el-tag size="mini" v-if="scope.row.paymentMethod == 3" type="warning">ios内购</el-tag>
<el-tag size="mini" v-if="scope.row.paymentMethod == 4" type="info" >天医币支付</el-tag>
</template>
@@ -336,7 +336,7 @@
<!-- 1 支付宝 2 微信 3 ios内购-->
<!-- <el-table-column prop="orderMoney" header-align="center" align="center" label="订单金额" width="80">
<template slot-scope="scope">
<span>￥{{scope.row.orderMoney}}</span>
<span>￥{{scope.row.orderMoney}}</span>
</template>
</el-table-column> -->
<!-- <el-table-column prop="districtMoney" header-align="center" align="center" label="优惠金额">
@@ -369,8 +369,8 @@
<img style="padding: 2px; border:1px solid #f1f1f1; margin-right: 5px;" :src="item.productImage" width="40px" height="40px">
</div>
<div>
<span>{{item.productName}} [ ￥{{item.productPrice}} × {{item.quantity}} ]
<i v-if="item.books && item.books.length > 0" @click.stop="seeBooks(item.books)" class="el-icon-view" style="color:#409eff; cursor: pointer;"></i></span>
<span>{{item.productName}} [ ￥{{item.productPrice}} × {{item.quantity}} ]
<i v-if="item.books && item.books.length > 0" @click.stop="seeBooks(item.books)" class="el-icon-view" style="color:#409eff; cursor: pointer;"></i></span>
</div>
</div>
</div>
@@ -399,8 +399,8 @@
v-if="isAuth('book:buyorderdetail:deliver')">物流详情</el-button>
</span> -->
<!-- 新增修改订单按钮显示与隐藏判断 v-if="scope.row.orderStatus != 3" -->
<!-- <router-link :to="{ path: 'buyorder-print', query: { orderId: scope.row.orderId } }">
<el-button type="text" size="small">打印面单</el-button>
</router-link> -->
@@ -440,7 +440,7 @@
<el-input v-model="addressForm.tel"></el-input>
</el-form-item>
<el-form-item label="收货地址:" prop="haveValue">
<!-- <el-input v-model="addressForm.address"></el-input> -->
<!-- <el-input v-model="addressForm.address"></el-input> -->
<!-- 省市区-->
<!-- 省 -->
<el-select v-model="addressForm.provinceCode" placeholder="请选择省份" style="width:200px" @change="provinceChange">
@@ -451,7 +451,7 @@
:value="item.regionCode">
</el-option>
</el-select>
<el-select v-model="addressForm.cityCode" placeholder="请选择市" @change="cityChange">
<el-select v-model="addressForm.cityCode" placeholder="请选择市" @change="cityChange">
<el-option
v-for="item in cityEntity.cityList"
:key="item.regionCode"
@@ -469,9 +469,9 @@
</el-select>
</el-form-item>
<el-form-item label="详细地址:" prop="addressXX">
<el-input type="textarea" v-model="addressForm.addressXX"></el-input>
<el-input type="textarea" v-model="addressForm.addressXX"></el-input>
</el-form-item>
</el-form>
</el-form>
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="changeAddHandleClose">取 消</el-button>
@@ -481,22 +481,22 @@
<el-dialog center
title="商品包含的书籍信息"
:visible.sync="booksShow"
width="500"
width="500"
:close="booksHandleClose">
<div>
<span>该商品共包含了 {{currBookLIst.length}} 个书籍</span>
<div>
<span>该商品共包含了 {{currBookLIst.length}} 个书籍</span>
<ul class="booksUl ">
<li class="flexbox" v-for="item in currBookLIst" :key="item.id">
<div class="img">
<img style="padding: 2px; border:1px solid #f1f1f1; margin-right: 5px;" :src="item.images" width="100px" height="100px">
</div>
<div>
<span>{{item.name}}[{{item.id}}]</span>
<span>{{item.name}}[{{item.id}}]</span>
</div>
</li>
</ul>
</div>
<span slot="footer" class="dialog-footer">
<span slot="footer" class="dialog-footer">
<el-button type="primary" @click="booksHandleClose">确 定</el-button>
</span>
</el-dialog>
@@ -645,20 +645,20 @@ export default {
changeAddVisible: false,
addressFormRule:{
name: [
{ required: true, message: '请输入收货人信息', trigger: 'blur' }
{ required: true, message: '请输入收货人信息', trigger: 'blur' }
],
tel: [
{ required: true, message: '请输入收货联系电话信息', trigger: 'blur' }
{ required: true, message: '请输入收货联系电话信息', trigger: 'blur' }
],
county: [
{ required: true, message: '请选择收货地址', trigger: 'blur' }
{ required: true, message: '请选择收货地址', trigger: 'blur' }
],
addressXX: [
{ required: true, message: '请输入详细地址信息', trigger: 'blur' }
],
{ required: true, message: '请输入详细地址信息', trigger: 'blur' }
],
haveValue:[
{ required: true, message: '请选择要修改的省市区', trigger: 'blur' }
]
{ required: true, message: '请选择要修改的省市区', trigger: 'blur' }
]
},
SheetSelectionList:[],
addressLoad:false, // 省份加载动画
@@ -687,7 +687,7 @@ export default {
this.booksShow = false
},
changeAddress(){
console.log(this.addressForm.orderSn,'this.addressForm')
console.log(this.addressForm.orderSn,'this.addressForm')
if(this.addressForm.provinceCode && this.addressForm.cityCode && this.addressForm.countyCode){
this.addressForm.haveValue = true
}
@@ -697,7 +697,7 @@ export default {
this.$http({
url: this.$http.adornUrl('/book/buyOrder/modifyConsigneeAddress'),
method: 'post',
data: this.$http.adornData({
data: this.$http.adornData({
'orderSn': this.addressForm.orderSn,
// 'province': this.addressForm.provinceName,
// 'city': this.addressForm.cityName,
@@ -708,46 +708,46 @@ export default {
"provinceCode": this.addressForm.provinceCode,
"cityCode": this.addressForm.cityCode,
"countyCode": this.addressForm.countyCode,
//'orderId': this.addressForm.orderId
//'orderId': this.addressForm.orderId
})
}).then(({ data }) => {
// console.log('修改地址返回值', data)
this.$message.success('修改地址成功！')
this.changeAddHandleClose()
this.getDataList()
}).catch( e => {
console.log(e,'e')
})
} else {
} else {
return false;
}
});
});
},
countyChange(e){
// console.log(e,'countyName')
this.countyEntity.countyList.find((val,index,arr)=>{
this.addressForm.countyName = val.countyName
countyChange(e){
// console.log(e,'countyName')
this.countyEntity.countyList.find((val,index,arr)=>{
this.addressForm.countyName = val.countyName
return val.regionCode == e
})
// 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
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){
this.addressForm.cityCode = null;
this.addressForm.countyCode = null
this.addressForm.countyCode = null
this.cityEntity = this.provinceEntity.find((val,index,arr)=>{
this.addressForm.provinceName = val.provName
return val.regionCode == e
})
// console.log('this.addressForm.provinceName',this.addressForm.provinceName)
// console.log('this.addressForm.provinceName',this.addressForm.provinceName)
},
changeAddHandleClose(){
this.changeAddVisible = false
@@ -771,14 +771,14 @@ export default {
// $refs[formName].resetFields()
// console.log('关闭了', this.addressForm)
},
changeAddressShow(val){
// console.log(val,'val')
this.addressLoad = true
changeAddressShow(val){
// console.log(val,'val')
this.addressLoad = true
this.$http({
url: this.$http.adornUrl('/api/province/getProvince'),
method: 'post',
// params: this.$http.adornParams({
// 'orderId': this.query.orderId
// params: this.$http.adornParams({
// 'orderId': this.query.orderId
// })
}).then(({ data }) => {
// console.log('获取地址三级列表', data)
@@ -797,7 +797,7 @@ export default {
this.cityEntity = this.provinceEntity.find((val,index,arr)=>{
return val.regionCode == this.addressForm.provinceCode
})
this.countyEntity = this.cityEntity.cityList.find((val,index,arr)=>{
this.countyEntity = this.cityEntity.cityList.find((val,index,arr)=>{
return val.regionCode == this.addressForm.cityCode
})
// console.log(this.provinceEntity,this.addressForm,'this.provinceEntity')
@@ -808,15 +808,15 @@ export default {
this.$message.error('初始化地址信息失败！')
this.addressLoad = false
})
this.changeAddVisible = true
// console.log('显示修改收货地址')
},
// 混合发货
// 混合发货
showAnyDialog(item) {
if (!item.printString || item.printString == '') return this.$message.error('暂无面单数据')
this.anyDialogContent = item.printString
// console.log('面单',item)
// console.log('面单',item)
this.anyDialogVisible = true
this.anyDialogTitle = '查看面单'
},
@@ -827,10 +827,10 @@ export default {
// dateString = this.MdDataForm.date.toString()
// }
this.sheetListLoading = true
this.$http({
this.$http({
url: this.$http.adornUrl('/express/getExpressPrints'),
method: 'post',
data: this.$http.adornData({
data: this.$http.adornData({
"limit": this.pageSize,
"page": this.pageIndex,
"type": this.tabChange.sheetCode, //类型，0不限1已打印2未打印
@@ -925,7 +925,7 @@ export default {
if (data && data.code === 0) {
this.dataList = data.result.data
this.totalPage = data.result.totalDataSize
if (this.tabChange.tabActiveName === '1') { // 判断可选按钮是否可用
if (this.tabChange.tabActiveName === '1') { // 判断可选按钮是否可用
this.isMultipleDisabled()
}
} else {
@@ -1016,8 +1016,8 @@ export default {
}
},
// 批量/单个打印面单
printHandle(id, row) {
// console.log(id, row)
printHandle(id, row) {
// console.log(id, row)
// 如果是传了id
if(id){
// console.log(id, '传了')
@@ -1029,7 +1029,7 @@ export default {
this.SheetSelectionList = [row]
let SheetList = this.SheetSelectionList.map(item => item.printString)
this.selectedPrintList = SheetList
// console.log(this.selectedPrintList, 'this.selectedPrintList')
// console.log(this.selectedPrintList, 'this.selectedPrintList')
//遍历数组列表
// this.PrintSheetList.map(item => {
// if(item.expressOrderSn == id){ return this.selectedPrintList = [item.printTemplate]}
@@ -1045,14 +1045,14 @@ export default {
console.log('打印报错了')
})
}else{
// console.log('批量打印')
this.printDialogVisible = true
// console.log('批量打印')
this.printDialogVisible = true
this.$confirm(`确定对选中的 ${this.SheetSelectionList.length} 个面单进行批量打印操作?`, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
// 计算出选中了多少条面单
let SheetList = this.SheetSelectionList.map(item => item.printString)
this.selectedPrintList = SheetList
@@ -1083,7 +1083,7 @@ export default {
}, 100);
},
// 弹出打印结果确认内容
confirmPrint(){
confirmPrint(){
this.$confirm('是否已完成此次打印任务？', '提示', {
confirmButtonText: '已完成打印',
cancelButtonText: '打印出错',
@@ -1095,22 +1095,22 @@ export default {
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',)
// console.log(printids,'printids打印的isd',)
this.$http({
url: this.$http.adornUrl('/express/printTemplate'),
method: 'post',
data:
data:
printids
}).then(({ data }) => {
if(data.code == 0){
if(data.code == 0){
// console.log(data,'data')
this.selectedPrintList = []
this.SheetSelectionList = []
this.getPrintSheetList()
loading.close() }
loading.close() }
}).catch(({e}) => {
this.selectedPrintList = []
this.SheetSelectionList = []
@@ -1127,7 +1127,7 @@ export default {
// message: '删除成功!'
// });
}).catch(() => {
console.log('打印出错了')
console.log('打印出错了')
});
},
closePrintDialog(val) {
@@ -1146,7 +1146,7 @@ export default {
closeSheetDliverDialog(val) {
this.sheetVisible = val
},
// 批量发货
// 批量发货
setDeliver() {
this.setDeliverVisible = true
},
@@ -1330,7 +1330,7 @@ export default {
.price {
// width: 40px;
line-height: 14px;
line-height: 14px;
span{color: #E6A23C; font-size: 14px;}
.bookName{margin-bottom: 5px;}
}
@@ -1341,7 +1341,7 @@ export default {
}
.productItem {
overflow: hidden;
overflow: hidden;
.flexbox {
align-items: center;