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-11-07 17:17:46 +08:00
parent dd66af1a20
commit 4c00a03fc9
9 changed files with 97 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -97,7 +97,7 @@
<!-- 更新样式 -->
<!--面单列表 -->
<div class="order_list_ui paper_list_ui" v-if="tabChange.tabActiveName == 2 && tabChange.isPrint == 1">
<el-table border v-loading="dataListLoading" :data="PrintSheetList" stripe @selection-change="SheetSelectionChangeHandle"
<el-table border v-loading="sheetListLoading" :data="PrintSheetList" stripe @selection-change="SheetSelectionChangeHandle"
style="width: 100%">
<el-table-column type="selection" width="55">
</el-table-column>
@@ -556,6 +556,7 @@ export default {
time: ''
},
PrintSheetList: [],//打印列表
sheetListLoading:false,
selectedPrintList: [], // 选中的面单列表
mergeList: [], // 检查订单可合并项数组
checkboxGroup: {
@@ -688,7 +689,7 @@ export default {
}
this.$refs['addressFormRef'].validate((valid) => {
if (valid) {
console.log('修改收货地址')
// console.log('修改收货地址')
this.$http({
url: this.$http.adornUrl('/book/buyOrder/modifyConsigneeAddress'),
method: 'post',
@@ -706,7 +707,7 @@ export default {
//'orderId': this.addressForm.orderId
})
}).then(({ data }) => {
console.log('修改地址返回值', data)
// console.log('修改地址返回值', data)
this.$message.success('修改地址成功！')
this.changeAddHandleClose()
this.getDataList()
@@ -720,12 +721,12 @@ export default {
});
},
countyChange(e){
console.log(e,'countyName')
// 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)
// console.log('this.addressForm.countyName', this.addressForm)
},
cityChange(e){
this.addressForm.countyCode = null
@@ -733,7 +734,7 @@ export default {
this.addressForm.cityName = val.cityName
return val.regionCode == e
})
console.log(' this.addressForm.cityName', this.addressForm.cityName)
// console.log(' this.addressForm.cityName', this.addressForm.cityName)
},
provinceChange(e){
this.addressForm.cityCode = null;
@@ -742,7 +743,7 @@ export default {
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
@@ -764,10 +765,10 @@ export default {
// this.$refs['addressFormRef'].resetFields();
})
// $refs[formName].resetFields()
console.log('关闭了', this.addressForm)
// console.log('关闭了', this.addressForm)
},
changeAddressShow(val){
console.log(val,'val')
// console.log(val,'val')
this.addressLoad = true
this.$http({
url: this.$http.adornUrl('/api/province/getProvince'),
@@ -776,7 +777,7 @@ export default {
// 'orderId': this.query.orderId
// })
}).then(({ data }) => {
console.log('获取地址三级列表', data)
// console.log('获取地址三级列表', data)
if(data.code == 0){
this.addressForm.orderSn = val.orderSn
this.provinceEntity = data.provinceEntity
@@ -795,7 +796,7 @@ export default {
this.countyEntity = this.cityEntity.cityList.find((val,index,arr)=>{
return val.regionCode == this.addressForm.cityCode
})
console.log(this.provinceEntity,this.addressForm,'this.provinceEntity')
// console.log(this.provinceEntity,this.addressForm,'this.provinceEntity')
}
this.addressLoad = false
}).catch((err) => {
@@ -805,13 +806,13 @@ export default {
})
this.changeAddVisible = true
console.log('显示修改收货地址')
// 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 = '查看面单'
},
@@ -821,7 +822,7 @@ export default {
// if(this.MdDataForm.date != ''){
// dateString = this.MdDataForm.date.toString()
// }
this.dataListLoading = true
this.sheetListLoading = true
this.$http({
url: this.$http.adornUrl('/express/getExpressPrints'),
method: 'post',
@@ -833,7 +834,7 @@ export default {
"expressOrderSn":"" //string类型，非必传字段
})
}).then(({ data }) => {
console.log(data.page.records,'面单列表')
// console.log(data.page.records,'面单列表')
if (data && data.code === 0 && data.page.records.length > 0) {
this.PrintSheetList = data.page.records
this.MDtotal = data.page.total
@@ -841,10 +842,10 @@ export default {
this.PrintSheetList = []
this.MDtotal = 0
}
this.dataListLoading = false
this.sheetListLoading = false
}).catch(({e}) => {
console.log(e,'e')
this.dataListLoading = false
this.sheetListLoading = false
})
},
// 检查待发货单选按钮是否可用
@@ -916,7 +917,7 @@ export default {
"pageSize": this.pageSize,
})
}).then(({ data }) => {
console.log(data,'列表数据')
// console.log(data,'列表数据')
if (data && data.code === 0) {
this.dataList = data.result.data
this.totalPage = data.result.totalDataSize
@@ -952,7 +953,7 @@ export default {
// 面单批量选择
SheetSelectionChangeHandle(val){
this.SheetSelectionList = val
console.log(this.SheetSelectionList,'选中的打印列表')
// console.log(this.SheetSelectionList,'选中的打印列表')
},
// 新增 / 修改
addOrUpdateHandle(id) {
@@ -1012,7 +1013,7 @@ export default {
},
// 批量/单个打印面单
printHandle(id, row) {
console.log(id, row)
// console.log(id, row)
// 如果是传了id
if(id){
// console.log(id, '传了')
@@ -1024,7 +1025,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]}
@@ -1040,7 +1041,7 @@ export default {
console.log('打印报错了')
})
}else{
console.log('批量打印')
// console.log('批量打印')
this.printDialogVisible = true
this.$confirm(`确定对选中的 ${this.SheetSelectionList.length} 个面单进行批量打印操作?`, '提示', {
confirmButtonText: '确定',
@@ -1051,7 +1052,7 @@ export default {
// 计算出选中了多少条面单
let SheetList = this.SheetSelectionList.map(item => item.printString)
this.selectedPrintList = SheetList
console.log(this.selectedPrintList,'即将打印的面单数组')
// console.log(this.selectedPrintList,'即将打印的面单数组')
setTimeout(() => {
this.handlePrintSheet()
}, 1000);
@@ -1092,7 +1093,7 @@ export default {
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',
@@ -1101,7 +1102,7 @@ export default {
}).then(({ data }) => {
if(data.code == 0){
console.log(data,'data')
// console.log(data,'data')
this.selectedPrintList = []
this.SheetSelectionList = []
this.getPrintSheetList()
@@ -1497,7 +1498,7 @@ export default {
}
}
.buttonGroup {
.buttonGroup { height: 32px;
.el-checkbox {
margin-right: 10px;
}

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

@@ -299,7 +299,7 @@ export default {
activated() {
this.query.orderSn = this.$route.query.orderSn;
this.query.ordertype = this.$route.query.ordertype;
console.log(this.$route.query.orderSn)
// console.log(this.$route.query.orderSn)
this.getData()
// this.getOrderSheetList()
},
@@ -319,14 +319,14 @@ export default {
this.booksShow = false
},
drawerHandleClose(){
console.log('关闭')
// console.log('关闭')
this.traces = []
this.tracesShow = false
this.currentSheet = {}
},
// 获取某一快递的物流进度
seeSheetDetails(item){
console.log('正在查询快递进度',item)
// console.log('正在查询快递进度',item)
this.currentSheet = item
let loading = this.$loading({
lock: true,
@@ -348,7 +348,7 @@ export default {
if(data.express.traces.length > 0){
this.traces = data.express.traces
this.tracesShow = true
console.log(data,'data')
// console.log(data,'data')
loading.close()
}else{
this.$message('暂无物流信息哦~');
@@ -362,12 +362,12 @@ export default {
})
},
countyChange(e){
console.log(e,'countyName')
// 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)
// console.log('this.addressForm.countyName', this.addressForm)
},
cityChange(e){
// console.log('修改了市',e)
@@ -376,7 +376,7 @@ export default {
this.addressForm.cityName = val.cityName
return val.regionCode == e
})
console.log(' this.addressForm.cityName', this.addressForm.cityName)
// console.log(' this.addressForm.cityName', this.addressForm.cityName)
},
provinceChange(e){
// console.log('修改了省份',e)
@@ -386,7 +386,7 @@ export default {
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
@@ -407,7 +407,7 @@ export default {
// this.$refs['addressFormRef'].resetFields();
})
// $refs[formName].resetFields()
console.log('关闭了', this.addressForm)
// console.log('关闭了', this.addressForm)
},
changeAddressShow(){
this.$http({
@@ -417,7 +417,7 @@ export default {
// 'orderId': this.query.orderId
// })
}).then(({ data }) => {
console.log('获取地址三级列表', data)
// console.log('获取地址三级列表', data)
if(data.code == 0){
this.provinceEntity = data.provinceEntity
this.addressForm.addressXX = this.orderDetails.consignee.address
@@ -429,7 +429,7 @@ export default {
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')
// console.log(this.provinceEntity,'this.provinceEntity')
this.cityEntity = this.provinceEntity.find((val,index,arr)=>{
return val.regionCode == this.addressForm.provinceCode
})
@@ -441,13 +441,13 @@ export default {
console.log(e,'e')
})
this.changeAddVisible = true
console.log('显示修改收货地址')
// console.log('显示修改收货地址')
},
// 修改收货信息
changeAddress(){
this.$refs['addressFormRef'].validate((valid) => {
if (valid) {
console.log('修改收货地址')
// console.log('修改收货地址')
this.$http({
url: this.$http.adornUrl('/book/buyOrder/modifyConsigneeAddress'),
method: 'post',
@@ -466,7 +466,7 @@ export default {
})
}).then(({ data }) => {
console.log('修改地址返回值', data)
// console.log('修改地址返回值', data)
this.$message.success('修改地址成功！')
this.changeAddHandleClose()
this.getData()

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

@@ -167,7 +167,7 @@ export default {
},
methods: {
tabChange(e){
console.log('变化了')
// console.log('变化了')
this.$refs['ruleForm'].clearValidate()
},
// 获取快递公司列表
@@ -184,7 +184,7 @@ export default {
})
},
selectChanged(val){
console.log(this.ruleForm)
// console.log(this.ruleForm)
if(this.expressList && this.expressList.length > 0){
this.expressList.forEach(element => {
if(element.expressCode == val){
@@ -196,7 +196,7 @@ export default {
//this.ruleForm.deliverLcd = val.dictType
},
handleCheckedCitiesChange(val) {
console.log(val)
// console.log(val)
},
// 获取可合并订单
getMixDeliverOrderList() {
@@ -211,7 +211,7 @@ export default {
'pageSize':20
})
}).then(({ data }) => {
console.log(data,'data')
// console.log(data,'data')
this.mixOrderList = data.result.data
})
},
@@ -227,7 +227,7 @@ export default {
this.productsCodeList.forEach((item, index) => {
if(item.orderStatus == '1'){
this.productsCodeList.splice(index, 1)
console.log(index)
// console.log(index)
}
this.productsIdsList = this.productsCodeList.map( item => item.buyOrderProductId)
})
@@ -237,7 +237,7 @@ export default {
// 普通发货
submit1() {
this.getNewProducts()
console.log(this.productsIdsList)
// console.log(this.productsIdsList)
this.$refs['ruleForm'].validate((valid) => {
if (valid) {
const loading = this.$loading({
@@ -285,7 +285,7 @@ export default {
}).then(({ data }) => {
if (data && data.code === 0) {
this.productsCodeList = data.buyOrder
console.log(888)
// console.log(888)
} else {
// this.dataList = []
// this.totalPage = 0
@@ -301,7 +301,7 @@ export default {
if (this.checkedList.length == 0 && this.radio3 == 'mix') {
return this.$message.error('请至少选择一条商品')
}
console.log('执行更新发货操作')
// console.log('执行更新发货操作')
this.$confirm(`正在执行${this.deliverType} , 是否继续?`, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
@@ -367,10 +367,10 @@ export default {
watch: {
orderitem: {
handler(val, oldVal) {
console.log('变化',val)
// console.log('变化',val)
this.productsCodeList = val.goodsList
this.getNewProducts()
console.log('productsIdsList',this.productsIdsList)
// console.log('productsIdsList',this.productsIdsList)
this.getMixDeliverOrderList()
// this.getData()
// this.visible = true