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

18
src/views/modules/acupoint/acupointDetail.vue
View File

@@ -146,7 +146,7 @@ export default {
}, },
methods: { methods: {
handleChange1(e){ handleChange1(e){
console.log(e,'e') // console.log(e,'e')
}, },
getCatTreeList() { getCatTreeList() {
this.loading = true; this.loading = true;
@@ -155,10 +155,10 @@ export default {
method: "post" method: "post"
}) })
.then(({ data }) => { .then(({ data }) => {
console.log(data, "树形结构"); // console.log(data, "树形结构");
if (data.code == 0 && data.categorys.length > 0) { if (data.code == 0 && data.categorys.length > 0) {
this.treeList = data.categorys; this.treeList = data.categorys;
console.log("执行后的结果", this.cateList); // console.log("执行后的结果", this.cateList);
// //
} else { } else {
this.treeList = []; this.treeList = [];
@@ -181,7 +181,7 @@ export default {
}) })
.then(({ data }) => { .then(({ data }) => {
if (data.code == 0) { if (data.code == 0) {
console.log("内容详情", data); // console.log("内容详情", data);
this.form.alias = data.point.alias; this.form.alias = data.point.alias;
this.form.anatomy = data.point.anatomy; this.form.anatomy = data.point.anatomy;
this.form.compatibility = data.point.compatibility; this.form.compatibility = data.point.compatibility;
@@ -200,20 +200,20 @@ export default {
url: element url: element
}); });
}); });
console.log("图片列表格式", this.fileList); // console.log("图片列表格式", this.fileList);
} }
} else { } else {
} }
}) })
.catch(({ e }) => { .catch(({ e }) => {
console.log(e, "e"); // console.log(e, "e");
}); });
} else { } else {
} }
}, },
handleRemoveNovel(file) { handleRemoveNovel(file) {
console.log(file, this.fileList); // console.log(file, this.fileList);
if (this.form.imageList.length > 0) { if (this.form.imageList.length > 0) {
this.form.imageList.forEach((element, index) => { this.form.imageList.forEach((element, index) => {
{ {
@@ -222,12 +222,12 @@ export default {
} }
} }
}); });
console.log("删除后", this.form.imageList); // console.log("删除后", this.form.imageList);
} }
// this.dataForm.images = []; // this.dataForm.images = [];
}, },
handleSuccess(file, fileList) { handleSuccess(file, fileList) {
console.log(file, fileList); // console.log(file, fileList);
// this.fileList.push(); // this.fileList.push();
this.form.imageList.push(file.url); this.form.imageList.push(file.url);
// console.log(this.fileList, 66); // console.log(this.fileList, 66);

14
src/views/modules/acupoint/acupointList.vue
View File

@@ -246,7 +246,7 @@ export default {
}) })
.then(({ data }) => { .then(({ data }) => {
if (data.code == 0) { if (data.code == 0) {
console.log("内容详情", data); // console.log("内容详情", data);
this.form.alias = data.point.alias; this.form.alias = data.point.alias;
this.form.anatomy = data.point.anatomy; this.form.anatomy = data.point.anatomy;
this.form.compatibility = data.point.compatibility; this.form.compatibility = data.point.compatibility;
@@ -276,7 +276,7 @@ export default {
} }
}, },
handleRemoveNovel(file) { handleRemoveNovel(file) {
console.log(file, this.fileList); // console.log(file, this.fileList);
if (this.form.imageList.length > 0) { if (this.form.imageList.length > 0) {
this.form.imageList.forEach((element, index) => { this.form.imageList.forEach((element, index) => {
{ {
@@ -285,12 +285,12 @@ export default {
} }
} }
}); });
console.log("删除后", this.form.imageList); // console.log("删除后", this.form.imageList);
} }
// this.dataForm.images = []; // this.dataForm.images = [];
}, },
handleSuccess(file, fileList) { handleSuccess(file, fileList) {
console.log(file, fileList); // console.log(file, fileList);
// this.fileList.push(); // this.fileList.push();
this.form.imageList.push(file.url); this.form.imageList.push(file.url);
// console.log(this.fileList, 66); // console.log(this.fileList, 66);
@@ -300,19 +300,19 @@ export default {
this.$message.warning(`当前限制选择 3 个文件`); this.$message.warning(`当前限制选择 3 个文件`);
}, },
handleClose() { handleClose() {
console.log("关闭了"); // console.log("关闭了");
this.$nextTick(() => { this.$nextTick(() => {
this.$refs["form"].resetFields(); this.$refs["form"].resetFields();
// this.$refs["form"].clearValidate() // this.$refs["form"].clearValidate()
this.form.id = null this.form.id = null
}); });
console.log("form", this.form); // console.log("form", this.form);
this.fileList = []; this.fileList = [];
this.dialogVisible = false; this.dialogVisible = false;
}, },
handleChange1(e) { handleChange1(e) {
this.cateId = e[e.length - 1]; this.cateId = e[e.length - 1];
console.log("e", e, this.cateId); // console.log("e", e, this.cateId);
this.getDataList(); this.getDataList();
}, },
getCatTreeList() { getCatTreeList() {

53
src/views/modules/acupoint/acupointManagement.vue
View File

@@ -129,7 +129,7 @@ export default {
this.getCatTreeList(); this.getCatTreeList();
}, },
activated() { activated() {
console.log("激活了"); // console.log("激活了");
}, },
methods: { methods: {
edit(data){ edit(data){
@@ -154,14 +154,14 @@ export default {
this.cateForm.pid = data.id this.cateForm.pid = data.id
// this.cateForm.showStatus = data.showStatus // this.cateForm.showStatus = data.showStatus
// this.cateForm.catLevel = data.catLevel*1 + 1 // this.cateForm.catLevel = data.catLevel*1 + 1
console.log('cateForm', this.cateForm.pid, data) // console.log('cateForm', this.cateForm.pid, data)
}, },
handleNodeClick(data) { handleNodeClick(data) {
// console.log(data); // console.log(data);
}, },
// 点击查看更多，获取翻页内容 // 点击查看更多，获取翻页内容
getMoreContent(row, index) { getMoreContent(row, index) {
console.log("加载更多", index, row); // console.log("加载更多", index, row);
if (row.content.current + 1 <= row.content.pages) { if (row.content.current + 1 <= row.content.pages) {
this.getContentList(row.id, row.content.current + 1, index); this.getContentList(row.id, row.content.current + 1, index);
} else { } else {
@@ -170,7 +170,7 @@ export default {
}, },
// 获取二级分类下的内容 // 获取二级分类下的内容
getContentList(cateId, pageIndex, index) { getContentList(cateId, pageIndex, index) {
console.log("收到的参数", cateId, pageIndex, index); // console.log("收到的参数", cateId, pageIndex, index);
this.$http({ this.$http({
url: this.$http.adornUrl("/book/point/getPointList"), url: this.$http.adornUrl("/book/point/getPointList"),
method: "post", method: "post",
@@ -183,7 +183,7 @@ export default {
.then(({ data }) => { .then(({ data }) => {
if (data.code == 0) { if (data.code == 0) {
this.contentChange = false; this.contentChange = false;
console.log("date二级内容", data.page); // console.log("date二级内容", data.page);
// 查找分类,并将新数据添加上 // 查找分类,并将新数据添加上
this.cateList.forEach(element => { this.cateList.forEach(element => {
element.children.forEach(element1 => { element.children.forEach(element1 => {
@@ -196,7 +196,7 @@ export default {
} }
}); });
}); });
console.log("追加后的数据", this.cateList); // console.log("追加后的数据", this.cateList);
} }
}) })
.catch(({ e }) => { .catch(({ e }) => {
@@ -279,7 +279,7 @@ export default {
}) })
}) })
.then(({ data }) => { .then(({ data }) => {
console.log(data, "提交"); // console.log(data, "提交");
if (data.code == 0) { if (data.code == 0) {
this.$message.success("操作成功"); this.$message.success("操作成功");
this.getCatTreeList(); this.getCatTreeList();
@@ -293,7 +293,7 @@ export default {
}); });
}, },
addCateClose() { addCateClose() {
console.log("关闭了"); // console.log("关闭了");
this.addCateVisible = false; this.addCateVisible = false;
this.cateForm = { this.cateForm = {
sort: 0, sort: 0,
@@ -313,41 +313,10 @@ export default {
method: "post" method: "post"
}) })
.then(({ data }) => { .then(({ data }) => {
console.log(data, "树形结构"); // console.log(data, "树形结构");
if (data.code == 0 && data.categorys.length > 0) { if (data.code == 0 && data.categorys.length > 0) {
this.treeList[0].children = data.categorys; this.treeList[0].children = data.categorys;
this.cateList = data.categorys; this.cateList = data.categorys;
// this.cateList.forEach(element => {
// if (element.children && element.children.length > 0) {
// element.children.forEach(element1 => {
// let content = {};
// // content = this.getContentList(element1.id)
// this.$http({
// url: this.$http.adornUrl("/book/point/getPointList"),
// method: "post",
// data: this.$http.adornData({
// limit: 10,
// page: 1,
// pointCategoryId: element1.id //此项为非必选
// })
// })
// .then(({ data }) => {
// if (data.code == 0) {
// // console.log("date二级内容", data.page);
// element1.content = data.page;
// } else {
// element1.content = {};
// }
// })
// .catch(({ e }) => {
// console.log(e, "e");
// });
// // element1.content = content;
// });
// }
// });
// console.log("执行后的结果", this.cateList);
//
} else { } else {
this.treeList[0].children = []; this.treeList[0].children = [];
this.cateList = []; this.cateList = [];
@@ -367,7 +336,7 @@ export default {
}); });
}, },
deleteContent(item, index, row) { deleteContent(item, index, row) {
console.log("删除内容"); // console.log("删除内容");
this.$confirm("确定要删除该内容?", "提示", { this.$confirm("确定要删除该内容?", "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
@@ -393,7 +362,7 @@ export default {
} }
}); });
}); });
console.log("删除后", this.cateList); // console.log("删除后", this.cateList);
// this.getCatTreeList() // this.getCatTreeList()
} }
}); });

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

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

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

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

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

10
src/views/modules/shop/chooseBook.vue
View File

@@ -93,8 +93,8 @@ export default {
this.$nextTick(()=> { this.$nextTick(()=> {
//this.toggleSelection() // 获取到已选中的数据 //this.toggleSelection() // 获取到已选中的数据
this.oldSelected = data.bookIds this.oldSelected = data.bookIds
console.log('以前选中的部分') // console.log('以前选中的部分')
console.log(this.oldSelected,'oldSelected') // console.log(this.oldSelected,'oldSelected')
}) })
} }
@@ -138,7 +138,7 @@ export default {
if (item2.id == item1.id) { if (item2.id == item1.id) {
this.selectedBooks.push(item1) this.selectedBooks.push(item1)
this.$refs.multipleTablebb.toggleRowSelection(item1, true) this.$refs.multipleTablebb.toggleRowSelection(item1, true)
console.log(item1,'item1') // console.log(item1,'item1')
} }
}) })
@@ -161,7 +161,7 @@ export default {
this.handleClose() this.handleClose()
}, },
handleSelectionChange(e) { handleSelectionChange(e) {
console.log(e) // console.log(e)
this.selectedBooks = e this.selectedBooks = e
}, },
handleClose() { // 关闭组件 handleClose() { // 关闭组件
@@ -184,7 +184,7 @@ export default {
watch: { watch: {
bookIds: { bookIds: {
handler(val, oldVal) { handler(val, oldVal) {
console.log(val, 'cal') // console.log(val, 'cal')
// if (val.length > 0) { // if (val.length > 0) {
// this.selectedBooks = val // this.selectedBooks = val
// val.forEach(item => { // val.forEach(item => {

22
src/views/modules/shop/shopproduct-add-or-update.vue
View File

@@ -340,7 +340,7 @@
}, },
handleCheckedCitiesChange(value) { handleCheckedCitiesChange(value) {
console.log(value, 'value') // console.log(value, 'value')
}, },
// 获取商品标签 // 获取商品标签
getTags() { getTags() {
@@ -361,7 +361,7 @@
showChooseBook() { showChooseBook() {
// 显示图书列表 // 显示图书列表
this.$emit("showchooseBookf", { 'bookIds': this.dataForm.Books }); this.$emit("showchooseBookf", { 'bookIds': this.dataForm.Books });
console.log('发送指令') // console.log('发送指令')
this.$bus.$emit("showchooseBook", { 'bookIds': this.dataForm.Books }); this.$bus.$emit("showchooseBook", { 'bookIds': this.dataForm.Books });
}, },
init(id) { init(id) {
@@ -380,7 +380,7 @@
}) => { }) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.dataForm.tags = data.labels this.dataForm.tags = data.labels
console.log('收到的值', this.dataForm.tags) // console.log('收到的值', this.dataForm.tags)
this.dataForm.productName = data.shopProduct.productName this.dataForm.productName = data.shopProduct.productName
this.dataForm.price = data.shopProduct.price this.dataForm.price = data.shopProduct.price
this.dataForm.goodsType = data.shopProduct.goodsType this.dataForm.goodsType = data.shopProduct.goodsType
@@ -425,15 +425,15 @@
if (data.shopProduct.productImageList == null || data.shopProduct.productImageList[0] == '' || if (data.shopProduct.productImageList == null || data.shopProduct.productImageList[0] == '' ||
data.shopProduct.productImageList == "") { data.shopProduct.productImageList == "") {
this.swiperfileList = [] this.swiperfileList = []
console.log('走这') // console.log('走这')
}else { }else {
// 有轮播图 // 有轮播图
console.log(data.shopProduct.productImageList) // console.log(data.shopProduct.productImageList)
let arr = [] let arr = []
let arr1 = [] let arr1 = []
arr = data.shopProduct.productImageList.split(','); arr = data.shopProduct.productImageList.split(',');
console.log(arr, '处理后得轮播图数组') // console.log(arr, '处理后得轮播图数组')
arr.forEach((item, index) => { arr.forEach((item, index) => {
arr1.push({ arr1.push({
name: index, name: index,
@@ -455,7 +455,7 @@
}).then(({ }).then(({
data data
}) => { }) => {
console.log(data.dataList) // console.log(data.dataList)
this.goodsTypeList = data.dataList this.goodsTypeList = data.dataList
}) })
}, },
@@ -478,7 +478,7 @@
// console.log(this.dataForm.productImageList) // console.log(this.dataForm.productImageList)
if (valid) { if (valid) {
if (!this.dataForm.hDprice || this.dataForm.hDprice == 0) { if (!this.dataForm.hDprice || this.dataForm.hDprice == 0) {
console.log('没有值') // console.log('没有值')
this.dataForm.hDprice = 0 this.dataForm.hDprice = 0
} }
@@ -541,7 +541,7 @@
}, },
getBookIds() { getBookIds() {
// 图书ids // 图书ids
console.log(this.dataForm.Books,'Books') // console.log(this.dataForm.Books,'Books')
this.bookidsd = this.dataForm.Books.map(item => { this.bookidsd = this.dataForm.Books.map(item => {
return item.id return item.id
}) })
@@ -568,7 +568,7 @@
name: file.name, name: file.name,
url: res.url url: res.url
}) })
console.log(this.swiperfileList) // console.log(this.swiperfileList)
this.$message.success("上传成功"); this.$message.success("上传成功");
} else { } else {
this.$message.error("上传失败"); this.$message.error("上传失败");
@@ -618,7 +618,7 @@
}, },
// 失去焦点事件 // 失去焦点事件
onEditorBlur(quill) { onEditorBlur(quill) {
console.log('editor blur!', quill) // console.log('editor blur!', quill)
}, },
// 获得焦点事件 // 获得焦点事件
onEditorFocus(quill) { onEditorFocus(quill) {

4
src/views/modules/shop/shopproduct.vue
View File

@@ -106,7 +106,7 @@
showchooseBookf(e) { showchooseBookf(e) {
// 显示图书列表 // 显示图书列表
this.chooseBookVisible = true this.chooseBookVisible = true
console.log(this.bookIds,'this.bookIds') // console.log(this.bookIds,'this.bookIds')
// this.$nextTick(() => { // this.$nextTick(() => {
// this.$refs.chooseBook.getBookList() // this.$refs.chooseBook.getBookList()
// this.bookIds = e.bookIds // this.bookIds = e.bookIds
@@ -193,7 +193,7 @@
publishStatus: event.publishStatus, publishStatus: event.publishStatus,
productId: event.productId productId: event.productId
} }
console.log(parms) // console.log(parms)
this.$http({ this.$http({
url: this.$http.adornUrl('/book/shopproduct/update'), url: this.$http.adornUrl('/book/shopproduct/update'),
method: 'post', method: 'post',