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

24
src/views/modules/book/book.vue
View File

@@ -11,15 +11,15 @@
<el-input v-model="query.authorName" placeholder="作者姓名" clearable></el-input> <el-input v-model="query.authorName" placeholder="作者姓名" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button @click="getDataList()">查询</el-button> <el-button @click="pageIndex = 1;getDataList()">查询</el-button>
<el-button v-if="isAuth('book:book:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button> <el-button v-if="isAuth('book:book:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
<!-- <el-button v-if="isAuth('book:book:delete')" type="danger" @click="deleteHandle()" <!-- <el-button v-if="isAuth('book:book:delete')" type="danger" @click="deleteHandle()"
:disabled="dataListSelections.length <= 0">批量删除</el-button> --> :disabled="dataListSelections.length <= 0">批量删除</el-button> -->
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table :data="dataList" border v-loading="dataListLoading" <el-table :data="dataList" border v-loading="dataListLoading"
style="width: 100%;"> style="width: 100%;">
<el-table-column min-width="155px <el-table-column min-width="155px
" prop="state" header-align="center" align="center" label="状态"> " prop="state" header-align="center" align="center" label="状态">
<template slot-scope="scope"> <template slot-scope="scope">
@@ -66,7 +66,7 @@
</el-table-column> --> </el-table-column> -->
<el-table-column prop="chapterStatus" header-align="center" align="center" label="章节拆分"> <el-table-column prop="chapterStatus" header-align="center" align="center" label="章节拆分">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.chapterStatus == '成功'" style="color:blue">{{scope.row.chapterStatus}}</span> <span v-if="scope.row.chapterStatus == '成功'" style="color:blue">{{scope.row.chapterStatus}}</span>
<span v-if="scope.row.chapterStatus == '失败'" style="color: red">{{scope.row.chapterStatus}}</span> <span v-if="scope.row.chapterStatus == '失败'" style="color: red">{{scope.row.chapterStatus}}</span>
<span v-if="scope.row.chapterStatus == '处理中'">{{scope.row.chapterStatus}}</span> <span v-if="scope.row.chapterStatus == '处理中'">{{scope.row.chapterStatus}}</span>
<span v-if="scope.row.chapterStatus == '未处理'">{{scope.row.chapterStatus}}</span> <span v-if="scope.row.chapterStatus == '未处理'">{{scope.row.chapterStatus}}</span>
@@ -74,7 +74,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="contentStatus" header-align="center" align="center" label="单句拆分"> <el-table-column prop="contentStatus" header-align="center" align="center" label="单句拆分">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.contentStatus == '成功'" style="color:blue">{{scope.row.contentStatus}}</span> <span v-if="scope.row.contentStatus == '成功'" style="color:blue">{{scope.row.contentStatus}}</span>
<span v-if="scope.row.contentStatus == '失败'" style="color: red">{{scope.row.contentStatus}}</span> <span v-if="scope.row.contentStatus == '失败'" style="color: red">{{scope.row.contentStatus}}</span>
<span v-if="scope.row.contentStatus == '处理中'">{{scope.row.contentStatus}}</span> <span v-if="scope.row.contentStatus == '处理中'">{{scope.row.contentStatus}}</span>
<span v-if="scope.row.contentStatus == '未处理'">{{scope.row.contentStatus}}</span> <span v-if="scope.row.contentStatus == '未处理'">{{scope.row.contentStatus}}</span>
@@ -82,7 +82,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="voicesStatus" header-align="center" align="center" label="音频处理"> <el-table-column prop="voicesStatus" header-align="center" align="center" label="音频处理">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.voicesStatus == '成功'" style="color:blue">{{scope.row.voicesStatus}}</span> <span v-if="scope.row.voicesStatus == '成功'" style="color:blue">{{scope.row.voicesStatus}}</span>
<span v-if="scope.row.voicesStatus == '失败'" style="color: red">{{scope.row.voicesStatus}}</span> <span v-if="scope.row.voicesStatus == '失败'" style="color: red">{{scope.row.voicesStatus}}</span>
<span v-if="scope.row.voicesStatus == '处理中'">{{scope.row.voicesStatus}}</span> <span v-if="scope.row.voicesStatus == '处理中'">{{scope.row.voicesStatus}}</span>
<span v-if="scope.row.voicesStatus == '未处理'">{{scope.row.voicesStatus}}</span> <span v-if="scope.row.voicesStatus == '未处理'">{{scope.row.voicesStatus}}</span>
@@ -137,12 +137,12 @@
<router-link :to="{path: 'book-bookchapter' , query:{ id : scope.row.id , pageIndex} }"> <router-link :to="{path: 'book-bookchapter' , query:{ id : scope.row.id , pageIndex} }">
<el-button type="text" size="small">章节管理</el-button> <el-button type="text" size="small">章节管理</el-button>
</router-link> </router-link>
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item> <el-dropdown-item>
<router-link :to="{path: 'talkBook' , query:{ id : scope.row.id , pageIndex} }"> <router-link :to="{path: 'talkBook' , query:{ id : scope.row.id , pageIndex} }">
<el-button type="text" size="small">讲书管理</el-button> <el-button type="text" size="small">讲书管理</el-button>
</router-link> </router-link>
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item> <el-dropdown-item>
<router-link :to="{path: 'yian' , query:{ id : scope.row.id , pageIndex} }"> <router-link :to="{path: 'yian' , query:{ id : scope.row.id , pageIndex} }">
<el-button type="text" size="small">医案管理</el-button> <el-button type="text" size="small">医案管理</el-button>
@@ -303,13 +303,13 @@ export default {
}) })
console.log(event) console.log(event)
}, },
chapterHandle(id, row) { chapterHandle(id, row) {
if (row.novel == '') { if (row.novel == '') {
this.$alert('请上传电子书文件后在进行此操作', '提示', { this.$alert('请上传电子书文件后在进行此操作', '提示', {
confirmButtonText: '好的', confirmButtonText: '好的',
}); });
return false return false
} }
this.$http({ this.$http({
url: this.$http.adornUrl('/book/book/getChapter'), url: this.$http.adornUrl('/book/book/getChapter'),
method: 'get', method: 'get',

266
src/views/modules/book/yian-add-or-update.vue
View File

@@ -11,7 +11,7 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> --> </el-form-item> -->
<!-- 关联的图书ids --> <!-- 关联的图书ids -->
<el-form-item label="标题" prop="title"> <el-form-item label="标题" prop="title">
<el-input v-model="dataForm.title" placeholder="请输入标题"></el-input> <el-input v-model="dataForm.title" placeholder="请输入标题"></el-input>
</el-form-item> </el-form-item>
@@ -28,14 +28,15 @@
</el-dialog> </el-dialog>
</el-form-item> --> </el-form-item> -->
<!-- <el-form-item label="简介/描述" prop="bookdesc"> <!-- <el-form-item label="简介/描述" prop="bookdesc">
<el-input type="textarea" rows="4" v-model="dataForm.bookdesc"></el-input> <el-input type="textarea" rows="4" v-model="dataForm.bookdesc"></el-input>
</el-form-item> --> </el-form-item> -->
<el-form-item label="医案内容" prop="contents"> <el-form-item label="医案内容" prop="contents">
<el-upload class="avatar-uploader" :action="baseUrl + '/oss/fileoss'" accept=".jpeg,.jpg,.gif,.png" :show-file-list="false" :on-success="contentUploadSuccess" > <el-upload class="avatar-uploader" :action="baseUrl + '/oss/fileoss'" accept=".jpeg,.jpg,.gif,.png"
:show-file-list="false" :on-success="contentUploadSuccess">
</el-upload> </el-upload>
<quill-editor v-model="dataForm.contents" ref="myQuillEditor" :options="editorOption" <quill-editor v-model="dataForm.contents" ref="myQuillEditor" :options="editorOption"
@blur="onEditorBlur($event)" @focus="onEditorFocus($event)" @blur="onEditorBlur($event)" @focus="onEditorFocus($event)" @ready="onEditorReady($event)"
@ready="onEditorReady($event)" class="shangpin_editor"> class="shangpin_editor">
</quill-editor> </quill-editor>
</el-form-item> </el-form-item>
<el-form-item label="排序" prop="sort"> <el-form-item label="排序" prop="sort">
@@ -46,45 +47,77 @@
<el-button @click="handlereset">取消</el-button> <el-button @click="handlereset">取消</el-button>
<el-button type="primary" @click="dataFormSubmit()">确定</el-button> <el-button type="primary" @click="dataFormSubmit()">确定</el-button>
</span> </span>
</el-dialog> </el-dialog>
</template> </template>
<script> <script>
import {quillEditor} from 'vue-quill-editor' import {
quillEditor
} from 'vue-quill-editor'
import global from '../../common/common.vue' //引入共用组间 import global from '../../common/common.vue' //引入共用组间
import 'quill/dist/quill.core.css' import 'quill/dist/quill.core.css'
import 'quill/dist/quill.snow.css' import 'quill/dist/quill.snow.css'
import 'quill/dist/quill.bubble.css' import 'quill/dist/quill.bubble.css'
import ImageResize from 'quill-image-resize-module' // 调整大小组件。 import ImageResize from 'quill-image-resize-module' // 调整大小组件。
// import { ImageDrop } from 'quill-image-drop-module'; // 拖动加载图片组件。 // import { ImageDrop } from 'quill-image-drop-module'; // 拖动加载图片组件。
Quill.register('modules/imageResize', ImageResize ); Quill.register('modules/imageResize', ImageResize);
// Quill.register('modules/imageDrop', ImageDrop); // Quill.register('modules/imageDrop', ImageDrop);
const toolbarOptions = [ const toolbarOptions = [
['bold', 'italic', 'underline', 'strike'], // 加粗，斜体，下划线，删除线 ['bold', 'italic', 'underline', 'strike'], // 加粗，斜体，下划线，删除线
['blockquote', 'code-block'], //引用，代码块 ['blockquote', 'code-block'], //引用，代码块
[{ 'header': 1 }, { 'header': 2 }], // 几级标题 [{
[{ 'list': 'ordered' }, { 'list': 'bullet' }], // 有序列表，无序列表 'header': 1
[{ 'script': 'sub' }, { 'script': 'super' }], // 下角标，上角标 }, {
[{ 'indent': '-1' }, { 'indent': '+1' }], // 缩进 'header': 2
[{ 'direction': 'rtl' }], // 文字输入方向 }], // 几级标题
[{ 'size': ['small', false, 'large', 'huge'] }], // 字体大小 [{
[{ 'header': [1, 2, 3, 4, 5, 6, false] }],// 标题 'list': 'ordered'
[{ 'color': [] }, { 'background': [] }], // 颜色选择 }, {
[{ 'font': ['SimSun', 'SimHei', 'Microsoft-YaHei', 'KaiTi', 'FangSong', 'Arial'] }],// 字体 'list': 'bullet'
[{ 'align': [] }], // 居中 }], // 有序列表，无序列表
['clean'], // 清除样式, [{
['link', 'image'], // 上传图片、上传视频 'script': 'sub'
] }, {
'script': 'super'
}], // 下角标，上角标
[{
'indent': '-1'
}, {
'indent': '+1'
}], // 缩进
[{
'direction': 'rtl'
}], // 文字输入方向
[{
'size': ['small', false, 'large', 'huge']
}], // 字体大小
[{
'header': [1, 2, 3, 4, 5, 6, false]
}], // 标题
[{
'color': []
}, {
'background': []
}], // 颜色选择
[{
'font': ['SimSun', 'SimHei', 'Microsoft-YaHei', 'KaiTi', 'FangSong', 'Arial']
}], // 字体
[{
'align': []
}], // 居中
['clean'], // 清除样式,
['link', 'image'], // 上传图片、上传视频
]
export default { export default {
components: { components: {
quillEditor quillEditor
}, },
data() { data() {
return { return {
baseUrl: global.baseUrl, baseUrl: global.baseUrl,
visible: false, visible: false,
categorys: [], categorys: [],
fileList: [], // 封面图 fileList: [], // 封面图
@@ -96,32 +129,32 @@ import 'quill/dist/quill.bubble.css'
children: "children", children: "children",
checkStrictly: true checkStrictly: true
}, },
dataForm: { dataForm: {
bookId: 0, bookId: 0,
limitCountImg: 1, // 图片数量 limitCountImg: 1, // 图片数量
// productImageList: '', // 轮播图 // productImageList: '', // 轮播图
showBtnDealImg: true, showBtnDealImg: true,
noneBtnImg: false, noneBtnImg: false,
title: '', title: '',
productImages: '', productImages: '',
bookdesc:'', bookdesc: '',
yianid:null, yianid: null,
sort: null, sort: null,
}, },
dataRule: { dataRule: {
title: [{ title: [{
required: true, required: true,
message: '书评标题不能为空', message: '书评标题不能为空',
trigger: 'blur' trigger: 'blur'
}], }],
// productImages: [{ // productImages: [{
// required: true, // required: true,
// message: '商品图不能为空', // message: '商品图不能为空',
// trigger: 'blur' // trigger: 'blur'
// }], // }],
}, },
// 富文本编辑器配置 // 富文本编辑器配置
editorOption: { editorOption: {
@@ -131,10 +164,19 @@ import 'quill/dist/quill.bubble.css'
maxStack: 50, maxStack: 50,
userOnly: false userOnly: false
}, },
imageResize: {
displayStyles: {
backgroundColor: 'black',
border: 'none',
color: 'white'
},
modules: ['Resize', 'DisplaySize']
// modules: ['Resize', 'DisplaySize', 'Toolbar']
},
toolbar: { toolbar: {
container: toolbarOptions, container: toolbarOptions,
handlers: { handlers: {
image: function (value) { image: function(value) {
if (value) { if (value) {
// 调用element的图片上传组件 // 调用element的图片上传组件
document.querySelector('.avatar-uploader input').click() document.querySelector('.avatar-uploader input').click()
@@ -144,14 +186,6 @@ import 'quill/dist/quill.bubble.css'
} }
} }
}, },
imageResize: {
displayStyles: {
backgroundColor: 'black',
border: 'none',
color: 'white'
},
modules: [ 'Resize', 'DisplaySize', 'Toolbar' ]
}
}, },
// modules: { // modules: {
// toolbar: [ // toolbar: [
@@ -204,54 +238,54 @@ import 'quill/dist/quill.bubble.css'
} }
}, },
created() { created() {
},
methods: {
init(id, bookId) {
id ? '' : id=0
this.dataForm.yianid = id || null
this.dataForm.bookId = bookId || 0
this.visible = true
this.$nextTick(() => {
this.$refs['dataForm'].resetFields()
if (this.dataForm.bookId) {
this.$http({
url: this.$http.adornUrl('/book/bookMedicalRecords/getById?medicalRecordsId='+ id),
method: 'post',
// params: this.$http.adornParams()
}).then(({
data
}) => {
// console.log(data,666)
if (data && data.code === 0 && data.entity != null) {
this.dataForm.bookId = data.entity.bookId
this.dataForm.title = data.entity.title
this.dataForm.contents = data.entity.content
this.dataForm.medicalRecordsId = data.entity.medicalRecordsId
this.dataForm.sort = data.entity.sort
}
})
}
})
},
dealImgChange(file, fileList) {
this.dataForm.noneBtnImg = fileList.length >= this.dataForm.limitCountImg;
}, },
methods: {
init(id, bookId) {
id ? '' : id = 0
this.dataForm.yianid = id || null
this.dataForm.bookId = bookId || 0
this.visible = true
this.$nextTick(() => {
this.$refs['dataForm'].resetFields()
if (this.dataForm.bookId) {
this.$http({
url: this.$http.adornUrl('/book/bookMedicalRecords/getById?medicalRecordsId=' + id),
method: 'post',
// params: this.$http.adornParams()
}).then(({
data
}) => {
// console.log(data,666)
if (data && data.code === 0 && data.entity != null) {
this.dataForm.bookId = data.entity.bookId
this.dataForm.title = data.entity.title
this.dataForm.contents = data.entity.content
this.dataForm.medicalRecordsId = data.entity.medicalRecordsId
this.dataForm.sort = data.entity.sort
}
})
}
})
},
dealImgChange(file, fileList) {
this.dataForm.noneBtnImg = fileList.length >= this.dataForm.limitCountImg;
},
// 表单提交 // 表单提交
dataFormSubmit() { dataFormSubmit() {
// console.log('userid', this.$store.state.user.id) // console.log('userid', this.$store.state.user.id)
this.$refs['dataForm'].validate((valid) => { this.$refs['dataForm'].validate((valid) => {
if (valid) { if (valid) {
this.$http({ this.$http({
url: this.$http.adornUrl(`/book/bookMedicalRecords/saveOrUpdate`), url: this.$http.adornUrl(`/book/bookMedicalRecords/saveOrUpdate`),
method: 'post', method: 'post',
data: this.$http.adornData({ data: this.$http.adornData({
'bookId': this.dataForm.bookId || undefined, 'bookId': this.dataForm.bookId || undefined,
'title': this.dataForm.title, 'title': this.dataForm.title,
// 'image': this.dataForm.productImages, // 'image': this.dataForm.productImages,
'content': this.dataForm.contents, 'content': this.dataForm.contents,
// 'userid': this.$store.state.user.id, // 'userid': this.$store.state.user.id,
// 'bookdesc': this.dataForm.bookdesc, // 'bookdesc': this.dataForm.bookdesc,
'medicalRecordsId': this.dataForm.yianid, 'medicalRecordsId': this.dataForm.yianid,
@@ -282,8 +316,8 @@ import 'quill/dist/quill.bubble.css'
}, },
changeTime(e) { changeTime(e) {
console.log(e) console.log(e)
}, },
handlePictureCardPreview(file) { handlePictureCardPreview(file) {
this.dataForm.productImages = file.url; this.dataForm.productImages = file.url;
this.dialogVisible = true; this.dialogVisible = true;
@@ -296,7 +330,7 @@ import 'quill/dist/quill.bubble.css'
url: res.url url: res.url
}) })
this.dataForm.productImages = res.url this.dataForm.productImages = res.url
console.log(this.swiperfileList,this.dataForm.productImages) console.log(this.swiperfileList, this.dataForm.productImages)
this.$message.success("上传成功"); this.$message.success("上传成功");
} else { } else {
this.$message.error("上传失败"); this.$message.error("上传失败");
@@ -310,24 +344,24 @@ import 'quill/dist/quill.bubble.css'
} else { } else {
return arr.toString() return arr.toString()
} }
}, },
contentUploadSuccess(res, file) { contentUploadSuccess(res, file) {
// console.log(res) // console.log(res)
let quill = this.$refs.myQuillEditor.quill let quill = this.$refs.myQuillEditor.quill
// 如果上传成功 // 如果上传成功
if (res) { if (res) {
// 获取光标所在位置 // 获取光标所在位置
let length = quill.getSelection().index; let length = quill.getSelection().index;
// 插入图片，res为服务器返回的图片链接地址 // 插入图片，res为服务器返回的图片链接地址
quill.insertEmbed(length, 'image', res.url) quill.insertEmbed(length, 'image', res.url)
// 调整光标到最后 // 调整光标到最后
quill.setSelection(length + 1) quill.setSelection(length + 1)
} else { } else {
// 提示信息，需引入Message // 提示信息，需引入Message
this.$message.error('图片插入失败！') this.$message.error('图片插入失败！')
} }
}, },
handlePicSuccess(res, file) { handlePicSuccess(res, file) {
// console.log(res,'res') // console.log(res,'res')
if (res.msg == "success") { if (res.msg == "success") {
@@ -337,13 +371,13 @@ import 'quill/dist/quill.bubble.css'
url: res.url url: res.url
}) })
this.dataForm.productImages = res.url this.dataForm.productImages = res.url
console.log(this.dataForm.productImages,'productImages') console.log(this.dataForm.productImages, 'productImages')
this.$message.success("上传成功"); this.$message.success("上传成功");
} else { } else {
this.$message.error("上传失败"); this.$message.error("上传失败");
} }
}, },
handleRemove(file, fileList) { handleRemove(file, fileList) {
this.dataForm.productImages = ''; this.dataForm.productImages = '';
this.fileList = fileList this.fileList = fileList
@@ -359,7 +393,7 @@ import 'quill/dist/quill.bubble.css'
}, },
// 失去焦点事件 // 失去焦点事件
onEditorBlur(quill) { onEditorBlur(quill) {
console.log('editor blur!', quill) console.log('editor blur!', quill)
}, },
// 获得焦点事件 // 获得焦点事件
onEditorFocus(quill) { onEditorFocus(quill) {
@@ -367,16 +401,16 @@ import 'quill/dist/quill.bubble.css'
}, },
// 准备富文本编辑器 // 准备富文本编辑器
onEditorReady(quill) { onEditorReady(quill) {
// console.log('editor ready!', quill) // console.log('editor ready!', quill)
}, },
},
mounted() {
// this.$bus.$on("haveBookIds", (data) => {
// // console.log('haveBookIds', data)
// data.bookIds.length > 0 ? this.dataForm.Books = data.bookIds : this.dataForm.Books = []
// });
}, },
mounted() {
// this.$bus.$on("haveBookIds", (data) => {
// // console.log('haveBookIds', data)
// data.bookIds.length > 0 ? this.dataForm.Books = data.bookIds : this.dataForm.Books = []
// });
},
watch: { watch: {
visible: { visible: {
@@ -404,7 +438,7 @@ import 'quill/dist/quill.bubble.css'
// } // }
.el-uploadfeng { .el-uploadfeng {
.el-upload-list__item { .el-upload-list__item {
width: 120px; width: 120px;
height: 120px; height: 120px;
} }

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

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

@@ -34,7 +34,7 @@
<div class="" style="align-items: center;"> <div class="" style="align-items: center;">
<div class="bookName" style="margin-left:0">{{ products.productName }}</div> <div class="bookName" style="margin-left:0">{{ products.productName }}</div>
<div style="width:100%; color:#17B3A3; font-size:12px" v-if="products.expressInfo && products.expressInfo.expressOrderSn != null">快递信息：{{products.expressInfo.expressCompany}}-{{products.expressInfo.expressOrderSn}}</div> <div style="width:100%; color:#17B3A3; font-size:12px" v-if="products.expressInfo && products.expressInfo.expressOrderSn != null">快递信息：{{products.expressInfo.expressCompany}}-{{products.expressInfo.expressOrderSn}}</div>
</div> </div>
</div> </div>
<div class="flexbox"> <div class="flexbox">
<div class="price xcenter"> <div class="price xcenter">
@@ -42,9 +42,9 @@
<div>× {{ products.quantity }}</div> <div>× {{ products.quantity }}</div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
@@ -61,16 +61,16 @@
<div v-else> <div v-else>
<div style=""> <div style="">
<div style="padding-bottom: 10px;" class=""> <div style="padding-bottom: 10px;" class="">
<div><span class="infoTitle">用户名：</span><span>{{mixOrderList[0].consignee.consigneeName}}</span> <div><span class="infoTitle">用户名：</span><span>{{mixOrderList[0].consignee.consigneeName}}</span>
<span class="infoTitle">电话：</span><span>{{mixOrderList[0].consignee.consigneeMobile}}</span> <span class="infoTitle">电话：</span><span>{{mixOrderList[0].consignee.consigneeMobile}}</span>
<span class="infoTitle">收货地址：</span><span>{{mixOrderList[0].consignee.province}}-{{mixOrderList[0].consignee.city}}-{{mixOrderList[0].consignee.county}}-{{mixOrderList[0].consignee.address}}</span> <span class="infoTitle">收货地址：</span><span>{{mixOrderList[0].consignee.province}}-{{mixOrderList[0].consignee.city}}-{{mixOrderList[0].consignee.county}}-{{mixOrderList[0].consignee.address}}</span>
</div> </div>
<div></div> <div></div>
</div> </div>
</div> </div>
<el-checkbox-group v-model="checkedList" @change="handleCheckedCitiesChange"> <el-checkbox-group v-model="checkedList" @change="handleCheckedCitiesChange">
<li class="flexbox mergeList" style="border:1px solid #ddf6f3" v-for="(item, index) in mixOrderList" :key="index"> <li class="flexbox mergeList" style="border:1px solid #ddf6f3" v-for="(item, index) in mixOrderList" :key="index">
<!-- <div class="buierInfo flexbox"> <!-- <div class="buierInfo flexbox">
<div style="display: flex;width:180px; align-items: center;"> <div style="display: flex;width:180px; align-items: center;">
<div style="padding: 10px;" class=""> <div style="padding: 10px;" class="">
@@ -91,23 +91,23 @@
<!-- <el-button style="margin: 0; padding: 0;" type="text">移除</el-button> --> <!-- <el-button style="margin: 0; padding: 0;" type="text">移除</el-button> -->
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
<div class="item_body no_right_border no_bottom_border"> <div class="item_body no_right_border no_bottom_border">
<div class="flexbox" style="justify-content: space-between;"> <div class="flexbox" style="justify-content: space-between;">
<div class="td1" style="width:100%; "> <div class="td1" style="width:100%; ">
<div class="flexbox orderProducts" style="width:50%; float: left;" v-for="(item2, index) in item.goodsList" :key="index"> <div class="flexbox orderProducts" style="width:50%; float: left;" v-for="(item2, index) in item.goodsList" :key="index">
<div class="flexbox productItem" style="width:100%;"> <div class="flexbox productItem" style="width:100%;">
<el-checkbox :label="item2.buyOrderProductId" :disabled="item2.expressInfo && item2.expressInfo.expressOrderSn ? true : false"><br></el-checkbox> <el-checkbox :label="item2.buyOrderProductId" :disabled="item2.expressInfo && item2.expressInfo.expressOrderSn ? true : false"><br></el-checkbox>
<img :src="item2.productImage" width="30px" style="margin-left: -15px;" <img :src="item2.productImage" width="30px" style="margin-left: -15px;"
height="30px"> height="30px">
<div class="" style="align-items: center;"> <div class="" style="align-items: center;">
<div class="bookName">{{item2.productName}}</div> <div class="bookName">{{item2.productName}}</div>
<div style="width:100%; color:#17B3A3; font-size:12px" v-if="item2.expressInfo && item2.expressInfo.expressOrderSn">快递信息：{{item2.expressInfo.expressCompany}}-{{item2.expressInfo.expressOrderSn}}</div> <div style="width:100%; color:#17B3A3; font-size:12px" v-if="item2.expressInfo && item2.expressInfo.expressOrderSn">快递信息：{{item2.expressInfo.expressCompany}}-{{item2.expressInfo.expressOrderSn}}</div>
</div> </div>
</div> </div>
<div class="num xcenter"><span>× {{item2.quantity}}</span></div> <div class="num xcenter"><span>× {{item2.quantity}}</span></div>
</div> </div>
</div> </div>
</div> </div>
@@ -123,7 +123,7 @@
</div> </div>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button v-if="radio3 === 'mix' && mixOrderList.length != 0" type="primary" @click="submit">发 货</el-button> <el-button v-if="radio3 === 'mix' && mixOrderList.length != 0" type="primary" @click="submit">发 货</el-button>
<el-button v-if="radio3 == 'general'" type="primary" @click="submit1">发 货</el-button> <el-button v-if="radio3 == 'general'" type="primary" @click="submit1">发 货</el-button>
</span> </span>
</el-dialog> </el-dialog>
</template> </template>
@@ -146,9 +146,9 @@ export default {
productsIdsList:[], productsIdsList:[],
radio3: 'general', radio3: 'general',
checkedList: [], checkedList: [],
ruleForm: { ruleForm: {
deliverLcd: '', deliverLcd: 'SF',
dictValue:'' dictValue:'顺丰快递'
}, },
expressList: [], expressList: [],
rules: { rules: {
@@ -165,11 +165,13 @@ export default {
// this.visible = false // this.visible = false
this.getExpressList() this.getExpressList()
}, },
methods: { methods: {
tabChange(e){ tabChange(e){
// console.log('变化了') // console.log('变化了')
this.$refs['ruleForm'].clearValidate() this.$refs['ruleForm'].clearValidate()
}, this.ruleForm.deliverLcd="SF"
this.ruleForm.dictValue="顺丰快递"
},
// 获取快递公司列表 // 获取快递公司列表
getExpressList() { getExpressList() {
this.$http({ this.$http({
@@ -179,6 +181,7 @@ export default {
}).then(({ data }) => { }).then(({ data }) => {
// console.log(data, '快递列表') // console.log(data, '快递列表')
this.expressList = data.result this.expressList = data.result
}).catch(({ e }) => { }).catch(({ e }) => {
console.log(e,'e') console.log(e,'e')
}) })
@@ -204,7 +207,7 @@ export default {
this.$http({ this.$http({
// url: this.$http.adornUrl(`/book/buyOrder/checkMerge`), // url: this.$http.adornUrl(`/book/buyOrder/checkMerge`),
url: this.$http.adornUrl(`/book/buyOrder/decomposeShipment`), url: this.$http.adornUrl(`/book/buyOrder/decomposeShipment`),
method: 'post', method: 'post',
data: this.$http.adornData({ data: this.$http.adornData({
'orderId': this.orderitem.orderId, 'orderId': this.orderitem.orderId,
'pageIndex':1, 'pageIndex':1,
@@ -215,7 +218,7 @@ export default {
this.mixOrderList = data.result.data this.mixOrderList = data.result.data
}) })
}, },
// 关闭前 // 关闭前
beforeCloseDialog() { beforeCloseDialog() {
this.$emit('closeDialog', false) this.$emit('closeDialog', false)
@@ -224,7 +227,7 @@ export default {
this.checkedList = [] this.checkedList = []
}, },
getNewProducts(){ getNewProducts(){
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)
@@ -232,10 +235,10 @@ export default {
this.productsIdsList = this.productsCodeList.map( item => item.buyOrderProductId) this.productsIdsList = this.productsCodeList.map( item => item.buyOrderProductId)
}) })
}, },
// //
// getProductsCodeList // getProductsCodeList
// 普通发货 // 普通发货
submit1() { submit1() {
this.getNewProducts() this.getNewProducts()
// console.log(this.productsIdsList) // console.log(this.productsIdsList)
this.$refs['ruleForm'].validate((valid) => { this.$refs['ruleForm'].validate((valid) => {
@@ -245,23 +248,23 @@ export default {
text: '请稍后', text: '请稍后',
spinner: 'el-icon-loading', spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)' background: 'rgba(0, 0, 0, 0.7)'
}); });
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
'expressCompanyCode': this.ruleForm.deliverLcd 'expressCompanyCode': this.ruleForm.deliverLcd
}), }),
data: this.productsIdsList // 是个数组 data: this.productsIdsList // 是个数组
// 传orderid // 传orderid
}).then(({ data }) => { }).then(({ data }) => {
if (data && data.code === 0) { if (data && data.code === 0) {
loading.close(); loading.close();
// console.log(data) // console.log(data)
this.beforeCloseDialog() this.beforeCloseDialog()
return this.$message.success('发货成功') return this.$message.success('发货成功')
} }
}).catch((e) => { }).catch((e) => {
loading.close(); loading.close();
@@ -270,7 +273,7 @@ export default {
}) })
}else{ }else{
this.$message.error('请先选择物流公司') this.$message.error('请先选择物流公司')
}}) }})
}, },
// 获取数据列表 // 获取数据列表
@@ -279,22 +282,22 @@ export default {
this.$http({ this.$http({
url: this.$http.adornUrl('/book/buyOrder/appGetOrderInfo'), url: this.$http.adornUrl('/book/buyOrder/appGetOrderInfo'),
method: 'get', method: 'get',
params: this.$http.adornParams({ params: this.$http.adornParams({
'orderId': this.orderId, 'orderId': this.orderId,
}) })
}).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
} }
this.dataListLoading = false this.dataListLoading = false
}) })
}, },
//混合发货 //混合发货
submit() { submit() {
this.$refs['ruleForm'].validate((valid) => { this.$refs['ruleForm'].validate((valid) => {
if (valid) { if (valid) {
// console.log(this.allOrder) // console.log(this.allOrder)
@@ -317,19 +320,19 @@ export default {
// 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
'expressCompanyCode': this.ruleForm.deliverLcd 'expressCompanyCode': this.ruleForm.deliverLcd
}), }),
data: this.checkedList, data: this.checkedList,
// 传orderid // 传orderid
}).then(({ data }) => { }).then(({ data }) => {
if(data && data.code === 0){ if(data && data.code === 0){
// console.log(data) // console.log(data)
loading.close() loading.close()
this.beforeCloseDialog() this.beforeCloseDialog()
return this.$message.success('发货成功') return this.$message.success('发货成功')
} }
}).catch(({e}) => { }).catch(({e}) => {
loading.close(); loading.close();
@@ -366,11 +369,11 @@ 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
@@ -456,7 +459,7 @@ export default {
.item_body { .item_body {
border: 1px solid #ddf6f3; border: 1px solid #ddf6f3;
// border-bottom: none; // border-bottom: none;
// border-right: none; // border-right: none;
border-top: none; border-top: none;
@@ -536,14 +539,14 @@ export default {
img { img {
margin-right: 10px; margin-right: 10px;
padding: 2px; padding: 2px;
border: 1px solid #f1f1f1; border: 1px solid #f1f1f1;
} }
.bookName { .bookName {
//margin-right: 10px; //margin-right: 10px;
font-size: 12px; font-size: 12px;
line-height: 16px; line-height: 16px;
margin-left: -6px; margin-left: -6px;
letter-spacing: 0; letter-spacing: 0;
@@ -654,4 +657,4 @@ export default {
.fengbi { .fengbi {
margin-left: 0 !important; margin-left: 0 !important;
} }
</style> </style>

2
src/views/modules/order/paypaymentorder.vue
View File

@@ -5,7 +5,7 @@
<el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input> <el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button @click="getDataList()">查询</el-button> <el-button @click="pageIndex = 1;getDataList()">查询</el-button>
<el-button v-if="isAuth('book:paypaymentorder:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button> <el-button v-if="isAuth('book:paypaymentorder:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
<el-button v-if="isAuth('book:paypaymentorder:delete')" type="danger" @click="deleteHandle()" :disabled="dataListSelections.length <= 0">批量删除</el-button> <el-button v-if="isAuth('book:paypaymentorder:delete')" type="danger" @click="deleteHandle()" :disabled="dataListSelections.length <= 0">批量删除</el-button>
</el-form-item> </el-form-item>

2
src/views/modules/order/transactiondetails.vue
View File

@@ -5,7 +5,7 @@
<el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input> <el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button @click="getDataList()">查询</el-button> <el-button @click="pageIndex = 1;getDataList()">查询</el-button>
<el-button v-if="isAuth('book:transactiondetails:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button> <el-button v-if="isAuth('book:transactiondetails:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
<el-button v-if="isAuth('book:transactiondetails:delete')" type="danger" @click="deleteHandle()" :disabled="dataListSelections.length <= 0">批量删除</el-button> <el-button v-if="isAuth('book:transactiondetails:delete')" type="danger" @click="deleteHandle()" :disabled="dataListSelections.length <= 0">批量删除</el-button>
</el-form-item> </el-form-item>

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

@@ -5,7 +5,7 @@
<el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input> <el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button @click="getDataList()">查询</el-button> <el-button @click="pageIndex = 1;getDataList()">查询</el-button>
<el-button v-if="isAuth('book:shopproduct:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button> <el-button v-if="isAuth('book:shopproduct:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
<el-button v-if="isAuth('book:shopproduct:delete')" type="danger" @click="deleteHandle()" :disabled="dataListSelections.length <= 0">批量删除</el-button> <el-button v-if="isAuth('book:shopproduct:delete')" type="danger" @click="deleteHandle()" :disabled="dataListSelections.length <= 0">批量删除</el-button>
</el-form-item> </el-form-item>

2
src/views/modules/user/user.vue
View File

@@ -6,7 +6,7 @@
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button @click="getDataList()">查询</el-button> <el-button @click="pageIndex = 1;getDataList()">查询</el-button>
<el-button v-if="isAuth('book:user:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button> <el-button v-if="isAuth('book:user:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
<el-button v-if="isAuth('book:user:delete')" type="danger" @click="deleteHandle()" <el-button v-if="isAuth('book:user:delete')" type="danger" @click="deleteHandle()"
:disabled="dataListSelections.length <= 0">批量删除</el-button> :disabled="dataListSelections.length <= 0">批量删除</el-button>

4
static/config/index.js
View File

@@ -7,9 +7,9 @@
// api接口请求地址 // api接口请求地址
// window.SITE_CONFIG['baseUrl'] = 'http://192.168.110.100:9200/pb'; // window.SITE_CONFIG['baseUrl'] = 'http://192.168.110.100:9200/pb';
// window.SITE_CONFIG['baseUrl'] = 'http://59.110.212.44:9200/pb'; // window.SITE_CONFIG['baseUrl'] = 'http://59.110.212.44:9200/pb';
// window.SITE_CONFIG['baseUrl'] = 'https://testapi.nuttyreading.com'; // 线上测试环境 window.SITE_CONFIG['baseUrl'] = 'https://testapi.nuttyreading.com'; // 线上测试环境
// window.SITE_CONFIG['baseUrl'] = 'https://api.nuttyreading.com'; // 线上正式环境 // window.SITE_CONFIG['baseUrl'] = 'https://api.nuttyreading.com'; // 线上正式环境
window.SITE_CONFIG['baseUrl'] = 'http://192.168.110.110:9200/pb'; // window.SITE_CONFIG['baseUrl'] = 'http://192.168.110.110:9200/pb';
// window.SITE_CONFIG['baseUrl'] = 'http://59.110.212.44:9200/pb'; // window.SITE_CONFIG['baseUrl'] = 'http://59.110.212.44:9200/pb';
// cdn地址 = 域名 + 版本号 // cdn地址 = 域名 + 版本号