zm/nuttyreading-master-html
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(订单模块): 1.统一订单状态和地址相关术语；2.增加心理论坛内容管理

Browse Source 
将"发货"相关术语统一改为"发出"，包括订单状态、按钮文字、提示信息等
将"收货"相关术语统一改为"收件"，包括地址信息、表单标签、提示信息等
新增心理论坛模块，包含列表和新增/修改功能

调整订单状态显示为"待发出"和"已发出"
修改地址相关字段为"收件人"和"收件地址"
添加psychologicalForum.vue和psychologicalForum-add-or-update.vue文件
This commit is contained in:
chenghuan
2026-02-27 16:54:21 +08:00
parent bc39a62001
commit 537d5993bd
15 changed files with 623 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/common/home.vue
View File

@@ -60,7 +60,7 @@ export default {
this.getWorkDataList(); this.getWorkDataList();
}, },
methods: { methods: {
// 待发货列表 // 待发出列表
getDataList() { getDataList() {
this.dataListLoading = true; this.dataListLoading = true;
this.$http({ this.$http({

114
src/views/modules/content/psychologicalForum-add-or-update.vue Normal file
View File

@@ -0,0 +1,114 @@
<template>
<el-dialog
width="1260px"
:title="!dataForm.id ? '新增' : '修改'"
:close-on-click-modal="false"
:visible.sync="visible"
@close="handlereset"
style="height: auto;"
>
<div style="margin-bottom: 60px;">
<el-form
style="height: auto;"
class="addFormBox"
:model="dataForm"
:rules="dataRule"
ref="dataForm"
label-width="80px"
>
<el-form-item label="链接地址" prop="url">
<el-input
v-model="dataForm.url"
placeholder="链接地址"
:rows="3"
></el-input>
</el-form-item>
</el-form>
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="handlereset">取消</el-button>
<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
</span>
</el-dialog>
</template>
<script>
import global from "../../common/common.vue"; //引入共用组间
export default {
data() {
return {
baseUrl: global.baseUrl,
visible: false,
dialogImageUrl: "",
dialogVisible: false,
dataForm: {
id: null,
title: '',
url: ''
},
dataRule: {
url: [
{ required: true, message: "链接地址不能为空", trigger: "blur" }
]
},
urlList: {
info: "/master/message/getMessageById",
add: "/common/wxPublicAccount/addWxPublicAccountArticle",
update: "/common/wxPublicAccount/updateWxPublicAccountArticle"
}
};
},
methods: {
init(row) {
this.dataForm = {
id: row && row.id || null,
url: row && row.url || ''
};
this.visible = true;
},
// 表单提交
dataFormSubmit() {
this.$refs["dataForm"].validate(valid => {
if (valid) {
// 这里应该是提交数据的逻辑
this.$http
.request({
url: this.dataForm.id ? this.$http.adornUrl(this.urlList.update) : this.$http.adornUrl(this.urlList.add),
method: "POST",
data: this.dataForm,
header: {
//默认 无 说明：请求头
"Content-Type": "application/json"
}
})
.then(({ data }) => {
if (data && data.code === 0) {
this.$message({
message: "操作成功",
type: "success",
duration: 1500,
onClose: () => {
this.visible = false;
this.$emit("refreshDataList");
}
});
} else {
this.$message.error(data.msg);
}
});
}
});
},
handlereset() {
this.visible = false;
}
}
};
</script>
<style lang="scss" scoped>
/deep/ .addFormBox.el-form-item {
margin-bottom: 10px !important;
}
</style>

330
src/views/modules/content/psychologicalForum.vue Normal file
View File

@@ -0,0 +1,330 @@
<template>
<div class="mod-config" style="height: calc(100vh - 180px );">
<el-form
:inline="true"
:model="dataForm"
@keyup.enter.native="getDataList()"
>
<el-form-item label="文章标题">
<el-input
v-model="query.title"
placeholder="文章标题"
clearable
></el-input>
</el-form-item>
<el-form-item>
<el-button
@click="
pageIndex = 1;
getDataList();
"
>查询</el-button
>
<el-button type="primary" @click="addOrUpdateHandle()">新增</el-button>
</el-form-item>
</el-form>
<div style="height: calc(100% - 80px );">
<el-table
:data="dataList"
border
height="90%"
v-loading="dataListLoading"
style="width: 100%;"
>
<el-table-column
prop="imgurl"
:show-overflow-tooltip="true"
header-align="center"
align="center"
label="封面图"
width="150"
>
<template slot-scope="scope">
<img :src="scope.row.imgurl" alt="封面图" height="50px" referrerpolicy="no-referrer">
</template>
</el-table-column>
<el-table-column
prop="title"
:show-overflow-tooltip="true"
header-align="center"
align="center"
label="文章标题"
></el-table-column>
<el-table-column
prop="url"
:show-overflow-tooltip="true"
header-align="center"
align="center"
label="文章链接"
>
<template slot-scope="scope">
<a :href="scope.row.url" target="_blank">{{ scope.row.url }}</a>
</template>
</el-table-column>
<el-table-column
width="200"
prop="createTime"
header-align="center"
align="center"
label="创建日期"
>
</el-table-column>
<el-table-column
fixed="right"
header-align="center"
align="center"
width="180"
label="操作"
>
<template slot-scope="scope">
<div>
<el-button
type="text"
size="small"
@click="addOrUpdateHandle(scope.row)"
>修改</el-button
>
<el-button
type="text"
size="small"
@click="deleteHandle(scope.row.id)"
>删除</el-button
>
</div>
</template>
</el-table-column>
</el-table>
<el-pagination
@size-change="sizeChangeHandle"
@current-change="currentChangeHandle"
:current-page="pageIndex"
:page-sizes="[10, 20, 50, 100]"
:page-size="pageSize"
:total="totalPage"
style="padding: 10px 0; text-align: center;"
layout="total, sizes, prev, pager, next, jumper"
>
</el-pagination>
</div>
<!-- 弹窗, 新增 / 修改 -->
<add-or-update
v-if="addOrUpdateVisible"
ref="addOrUpdate"
@refreshDataList="getDataList"
></add-or-update>
</div>
</template>
<script>
import AddOrUpdate from "./psychologicalForum-add-or-update";
export default {
data() {
return {
linkList: [{ label: "外链", value: 1 }, { label: "富文本", value: 0 }],
selectQueryApp: null,
dataForm: {
key: ""
},
query: {
title:""
},
dataList: [],
delFlag: false,
pageIndex: 1,
pageSize: 20,
totalPage: 0,
dataListLoading: false,
dataListSelections: [],
addOrUpdateVisible: false,
urlList: {
list: "/common/wxPublicAccount/getWxPublicAccountArticleList"
}
};
},
components: {
AddOrUpdate
},
activated() {
if (this.$route.query.upPageInde != null) {
this.pageIndex = this.$route.query.upPageIndex;
console.log(this.pageIndex);
}
this.getDataList();
},
methods: {
// 获取数据列表
getDataList() {
console.log("this.selectQueryApp at line 195:", this.selectQueryApp);
this.dataListLoading = true;
this.$http
.request({
url: this.$http.adornUrl(this.urlList.list),
method: "POST",
data: {
page: this.pageIndex,
limit: this.pageSize,
...this.query,
},
header: {
//默认 无 说明：请求头
"Content-Type": "application/json"
}
})
.then(({ data }) => {
if (data && data.code === 0) {
this.dataList = data.page.records;
this.totalPage = data.page.total;
} else {
this.dataList = [];
this.totalPage = 0;
}
this.dataListLoading = false;
});
},
// 每页数
sizeChangeHandle(val) {
this.pageSize = val;
this.pageIndex = 1;
this.getDataList();
},
// 当前页
currentChangeHandle(val) {
this.pageIndex = val;
this.getDataList();
},
// 多选
selectionChangeHandle(val) {
this.dataListSelections = val;
},
// 新增 / 修改
addOrUpdateHandle(row) {
this.addOrUpdateVisible = true;
this.$nextTick(() => {
this.$refs.addOrUpdate.init(row);
});
},
// 删除
deleteHandle(id) {
this.$confirm(
`确定对[id=${id}]进行[${id ? "删除" : "删除"}]操作?`,
"提示",
{
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}
).then(() => {
this.$http({
url: this.$http.adornUrl("/common/wxPublicAccount/delWxPublicAccountArticle"),
method: "post",
data: {
id: id
}
}).then(({ data }) => {
if (data && data.code === 0) {
this.$message({
message: "操作成功",
type: "success",
duration: 1500,
onClose: () => {
this.getDataList();
}
});
} else {
this.$message.error(data.msg);
}
});
});
},
// 开关变化
SwitchChange(event) {
/*点击时他会自动把你绑定的值变更，直接去请求数据就可以了*/
var parms = {
delFlag: event.delFlag,
id: event.id
};
this.$http({
url: this.$http.adornUrl("/book/book/update"),
method: "post",
data: parms
})
.then(res => {
this.$message({
message: "成功",
type: "success"
});
this.loading = false;
this.getDataList();
})
.catch(error => {
this.loading = false;
console.log(error);
});
console.log(event);
},
chapterHandle(id, row) {
if (row.novel == "") {
this.$alert("请上传电子书文件后在进行此操作", "提示", {
confirmButtonText: "好的"
});
return false;
}
this.$http({
url: this.$http.adornUrl("/book/book/getChapter"),
method: "get",
params: this.$http.adornParams({
id: id
})
}).then(res => {
this.$message({
message: "成功",
type: "success"
});
this.loading = false;
this.getDataList();
});
},
contentHandle(id) {
this.$http({
url: this.$http.adornUrl("/book/bookchaptercontent/getBookVoices"),
method: "get",
params: this.$http.adornParams({
id: id
})
}).then(res => {
this.$message({
message: "成功",
type: "success"
});
this.loading = false;
this.getDataList();
});
},
voicesHandle(id) {
//allVoices
this.$http({
// url: this.$http.adornUrl('/book/bookchaptercontent/allVoices'),
url: this.$http.adornUrl("/book/bookchaptercontent/AllVOices"),
method: "get",
params: this.$http.adornParams({
id: id
})
}).then(res => {
console.log("book/bookchaptercontent/AllVOices");
this.$message({
message: "成功",
type: "success"
});
this.loading = false;
this.getDataList();
});
}
}
};
</script>

56
src/views/modules/order/buyorder copy-订单列表样式备份02-09.vue
View File

@@ -12,13 +12,13 @@
<el-radio-group size="mini" v-model="tabChange.tabActiveName" style="margin-bottom: 10px;"> <el-radio-group size="mini" v-model="tabChange.tabActiveName" style="margin-bottom: 10px;">
<el-radio-button label="all">全部</el-radio-button> <el-radio-button label="all">全部</el-radio-button>
<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-button label="2">已发货</el-radio-button> <el-radio-button label="2">已发出</el-radio-button>
<el-radio-button label="3">已完成</el-radio-button> <el-radio-button label="3">已完成</el-radio-button>
</el-radio-group> </el-radio-group>
<div style="margin-bottom: 10px;"> <div style="margin-bottom: 10px;">
<el-radio-group size="mini" v-model="tabChange.isPrint" v-if="tabChange.tabActiveName == 2"> <el-radio-group size="mini" v-model="tabChange.isPrint" v-if="tabChange.tabActiveName == 2">
<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>
@@ -49,7 +49,7 @@
:disabled="dataListSelections.length <= 0">批量删除</el-button> :disabled="dataListSelections.length <= 0">批量删除</el-button>
<span style="" v-if="tabChange.tabActiveName == 1"> <span style="" v-if="tabChange.tabActiveName == 1">
<el-button style="margin-left: 10px;" size="mini" v-if="isAuth('book:buyorder')" type="primary" <el-button style="margin-left: 10px;" size="mini" v-if="isAuth('book:buyorder')" type="primary"
:disabled="dataListSelections.length <= 0" @click="setDeliver">批量发货</el-button> :disabled="dataListSelections.length <= 0" @click="setDeliver">批量发出</el-button>
</span> </span>
<span style="" v-if="tabChange.tabActiveName == 2 && tabChange.isPrint == 1"> <span style="" v-if="tabChange.tabActiveName == 2 && tabChange.isPrint == 1">
<el-button style="margin-left: 10px;" size="mini" v-if="isAuth('book:buyorder')" type="warning" <el-button style="margin-left: 10px;" size="mini" v-if="isAuth('book:buyorder')" type="warning"
@@ -189,7 +189,7 @@
<el-checkbox disabled @change="handleCheckedChange('111')"></el-checkbox> <el-checkbox disabled @change="handleCheckedChange('111')"></el-checkbox>
<span>订单编号:orderSn </span> <span style="margin-left: 20px;">下单时间:2021-11-30 17:22:33</span></el-col> <span>订单编号:orderSn </span> <span style="margin-left: 20px;">下单时间:2021-11-30 17:22:33</span></el-col>
<el-col :md="12" :lg="12"> <el-col :md="12" :lg="12">
<div class="tip"><icon-svg name="zhuyi"></icon-svg> 订单存在可合并发货项 <div class="tip"><icon-svg name="zhuyi"></icon-svg> 订单存在可合并发出项
<el-button type="text">查看</el-button> <el-button type="text">查看</el-button>
</div> </div>
</el-col> </el-col>
@@ -254,17 +254,17 @@
<div class="tabContent"> <div class="tabContent">
<div>用户名：张三</div> <div>用户名：张三</div>
<div>用户id:12121454545</div> <div>用户id:12121454545</div>
<div>收货地址：天津市河东区xxxxxxxxxx</div> <div>收件地址：天津市河东区xxxxxxxxxx</div>
<div class="buier_tip">买家备注：尽快发货</div> <div class="buier_tip">买家备注：尽快发出</div>
</div> </div>
</div> </div>
<div class="buier td4 xcenter borderright"> <div class="buier td4 xcenter borderright">
<div class="orderStatus">待发货</div> <div class="orderStatus">待发出</div>
<div class="time">支付时间：2023-02-09 14:16:08</div> <div class="time">支付时间：2023-02-09 14:16:08</div>
<div class="hasSplit"><span style="color:#999">该订单已被拆分发货</span> <el-button type="text" <div class="hasSplit"><span style="color:#999">该订单已被拆分发出</span> <el-button type="text"
size="mini">查看面单</el-button></div> size="mini">查看面单</el-button></div>
<div><el-button type="primary" size="mini" disabled>发货</el-button> <div><el-button type="primary" size="mini" disabled>发出</el-button>
<el-button type="danger" size="mini">拆分发货</el-button> <el-button type="danger" size="mini">拆分发出</el-button>
</div> </div>
</div> </div>
<div class="td5 flexbox" style="justify-content: center; align-items: center; width: 150px;"> <div class="td5 flexbox" style="justify-content: center; align-items: center; width: 150px;">
@@ -317,16 +317,16 @@
<div class="tabContent"> <div class="tabContent">
<div>用户名：张三</div> <div>用户名：张三</div>
<div>用户id:12121454545</div> <div>用户id:12121454545</div>
<div>收货地址：天津市河东区xxxxxxxxxx</div> <div>收件地址：天津市河东区xxxxxxxxxx</div>
<div class="buier_tip">买家备注：尽快发货</div> <div class="buier_tip">买家备注：尽快发出</div>
</div> </div>
</div> </div>
<div class="buier td4 xcenter borderright"> <div class="buier td4 xcenter borderright">
<div class="orderStatus">待付款</div> <div class="orderStatus">待付款</div>
<div><el-button type="danger" size="mini">改价</el-button></div> <div><el-button type="danger" size="mini">改价</el-button></div>
<!-- <div> <!-- <div>
<el-button type="primary" size="mini">去发货</el-button> <el-button type="primary" size="mini">去发出</el-button>
<el-button type="danger" size="mini">拆分发货</el-button> <el-button type="danger" size="mini">拆分发出</el-button>
</div> --> </div> -->
</div> </div>
<div class="td5 flexbox" style="justify-content: center; align-items: center; width: 150px;"> <div class="td5 flexbox" style="justify-content: center; align-items: center; width: 150px;">
@@ -392,13 +392,13 @@
<div class="tabContent"> <div class="tabContent">
<div>用户名：张三</div> <div>用户名：张三</div>
<div>用户id:12121454545</div> <div>用户id:12121454545</div>
<div>收货地址：天津市河东区xxxxxxxxxx</div> <div>收件地址：天津市河东区xxxxxxxxxx</div>
<div class="buier_tip">买家备注：尽快发货</div> <div class="buier_tip">买家备注：尽快发出</div>
</div> </div>
</div> </div>
<div class="buier td4 xcenter borderright"> <div class="buier td4 xcenter borderright">
<div class="orderStatus">已发货</div> <div class="orderStatus">已发出</div>
<div class="time">发货时间：2023-02-09 14:09:23</div> <div class="time">发出时间：2023-02-09 14:09:23</div>
<div> <div>
<el-button type="primary" size="mini">面单预览</el-button> <el-button type="primary" size="mini">面单预览</el-button>
</div> </div>
@@ -496,7 +496,7 @@
prop="shippingUser" prop="shippingUser"
header-align="center" header-align="center"
align="center" align="center"
label="收货人姓名"> label="收件人姓名">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="province" prop="province"
@@ -544,12 +544,12 @@
</el-table-column> </el-table-column>
<el-table-column prop="createTime" header-align="center" align="center" label="下单时间"> <el-table-column prop="createTime" header-align="center" align="center" label="下单时间">
</el-table-column> </el-table-column>
<el-table-column prop="shippingTime" header-align="center" align="center" label="发货时间"> <el-table-column prop="shippingTime" header-align="center" align="center" label="发出时间">
</el-table-column> </el-table-column>
<el-table-column prop="orderStatus" header-align="center" align="center" label="订单状态"> <el-table-column prop="orderStatus" header-align="center" align="center" label="订单状态">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="scope.row.orderStatus == 1" type="success">待发货</el-tag> <el-tag v-if="scope.row.orderStatus == 1" type="success">待发出</el-tag>
<el-tag v-if="scope.row.orderStatus == 2" type="danger">已发货</el-tag> <el-tag v-if="scope.row.orderStatus == 2" type="danger">已发出</el-tag>
<el-tag v-if="scope.row.orderStatus == 3" type="warning">已完成</el-tag> <el-tag v-if="scope.row.orderStatus == 3" type="warning">已完成</el-tag>
<el-tag v-if="scope.row.orderStatus == 4" type="info">交易失败</el-tag> <el-tag v-if="scope.row.orderStatus == 4" type="info">交易失败</el-tag>
</template> </template>
@@ -570,7 +570,7 @@
<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.orderId)">修改</el-button> <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.orderId)">修改</el-button>
<span v-if="scope.row.orderStatus"> <span v-if="scope.row.orderStatus">
<el-button type="text" size="small" @click="setDeliver(dataListSelections[0] = scope.row)" <el-button type="text" size="small" @click="setDeliver(dataListSelections[0] = scope.row)"
v-if="isAuth('book:buyorderdetail:deliver')">发货</el-button> v-if="isAuth('book:buyorderdetail:deliver')">发出</el-button>
</span> </span>
<span v-if="scope.row.isPrint == 0"> <span v-if="scope.row.isPrint == 0">
<el-button type="text" size="small" v-if="isAuth('book:buyorderdetail:deliver')" <el-button type="text" size="small" v-if="isAuth('book:buyorderdetail:deliver')"
@@ -589,7 +589,7 @@
<!-- 物流详情弹窗 --> <!-- 物流详情弹窗 -->
<deliverDetail ref="printOrderDialog" :visible="deliverDetailVisible" :deliverData="dataListSelections" <deliverDetail ref="printOrderDialog" :visible="deliverDetailVisible" :deliverData="dataListSelections"
@closeDeliverDetailDialog="closeDeliverDetailDialog"></deliverDetail> @closeDeliverDetailDialog="closeDeliverDetailDialog"></deliverDetail>
<!-- 代发货转为发货 --> <!-- 待发出转为已发出 -->
<setDeliverDialog ref="setDeliverDialog" :visible="setDeliverVisible" :selectData="dataListSelections" <setDeliverDialog ref="setDeliverDialog" :visible="setDeliverVisible" :selectData="dataListSelections"
@closeDeliverDialog='closeDeliverDialog'></setDeliverDialog> @closeDeliverDialog='closeDeliverDialog'></setDeliverDialog>
<!-- 设置备注 --> <!-- 设置备注 -->
@@ -616,8 +616,8 @@ export default {
deliverDetailVisible: false, deliverDetailVisible: false,
dataList: [], dataList: [],
tabChange: { tabChange: {
tabActiveName: '2', // tab筛选默认all全部 0：待付款 1：代发货 2：已发货 3：已完成 tabActiveName: '2', // tab筛选默认all全部 0：待付款 1：待发出 2：已发出 3：已完成
isPrint: '1', // 已发货列表筛选 0：显示订单 1：显示可打印列表, isPrint: '1', // 已发出列表筛选 0：显示订单 1：显示可打印列表,
orderName: '0' //订单名称筛选 all:全部 0:健康超市 1:电子书 2:充值订单 orderName: '0' //订单名称筛选 all:全部 0:健康超市 1:电子书 2:充值订单
}, },
editBeizhudialogVisible: false, // 修改备注按钮 editBeizhudialogVisible: false, // 修改备注按钮
@@ -823,7 +823,7 @@ export default {
this.setDeliverVisible = false this.setDeliverVisible = false
this.getDataList() this.getDataList()
}, },
// 去发货 // 去发出
setDeliver() { setDeliver() {
this.setDeliverVisible = true this.setDeliverVisible = true
}, },

12
src/views/modules/order/buyorder-add-or-update.vue
View File

@@ -10,8 +10,8 @@
<el-form-item label="下单人ID" prop="userId"> <el-form-item label="下单人ID" prop="userId">
<el-input v-model="dataForm.userId" placeholder="下单人ID"></el-input> <el-input v-model="dataForm.userId" placeholder="下单人ID"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="收货人姓名" prop="shippingUser"> <el-form-item label="收件人姓名" prop="shippingUser">
<el-input v-model="dataForm.shippingUser" placeholder="收货人姓名"></el-input> <el-input v-model="dataForm.shippingUser" placeholder="收件人姓名"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="省" prop="province"> <el-form-item label="省" prop="province">
<el-input v-model="dataForm.province" placeholder="省"></el-input> <el-input v-model="dataForm.province" placeholder="省"></el-input>
@@ -49,8 +49,8 @@
<el-form-item label="下单时间" prop="createTime"> <el-form-item label="下单时间" prop="createTime">
<el-input v-model="dataForm.createTime" placeholder="下单时间"></el-input> <el-input v-model="dataForm.createTime" placeholder="下单时间"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="发货时间" prop="shippingTime"> <el-form-item label="发出时间" prop="shippingTime">
<el-input v-model="dataForm.shippingTime" placeholder="发货时间"></el-input> <el-input v-model="dataForm.shippingTime" placeholder="发出时间"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="订单状态" prop="orderStatus"> <el-form-item label="订单状态" prop="orderStatus">
<el-input v-model="dataForm.orderStatus" placeholder="订单状态"></el-input> <el-input v-model="dataForm.orderStatus" placeholder="订单状态"></el-input>
@@ -100,7 +100,7 @@
{ required: true, message: '下单人ID不能为空', trigger: 'blur' } { required: true, message: '下单人ID不能为空', trigger: 'blur' }
], ],
shippingUser: [ shippingUser: [
{ required: true, message: '收货人姓名不能为空', trigger: 'blur' } { required: true, message: '收件人姓名不能为空', trigger: 'blur' }
], ],
province: [ province: [
{ required: true, message: '省不能为空', trigger: 'blur' } { required: true, message: '省不能为空', trigger: 'blur' }
@@ -139,7 +139,7 @@
{ required: true, message: '下单时间不能为空', trigger: 'blur' } { required: true, message: '下单时间不能为空', trigger: 'blur' }
], ],
shippingTime: [ shippingTime: [
{ required: true, message: '发货时间不能为空', trigger: 'blur' } { required: true, message: '发出时间不能为空', trigger: 'blur' }
], ],
orderStatus: [ orderStatus: [
{ required: true, message: '订单状态不能为空', trigger: 'blur' } { required: true, message: '订单状态不能为空', trigger: 'blur' }

18
src/views/modules/order/buyorder-mergeorder.vue
View File

@@ -4,7 +4,7 @@
style="display: flex; height:300px; width: 100%; align-items: center; justify-content: center;"> style="display: flex; height:300px; width: 100%; align-items: center; justify-content: center;">
<div class="empty" style="text-align: center;"> <div class="empty" style="text-align: center;">
<icon-svg style="font-size: 130px;" name="kongbai"></icon-svg> <icon-svg style="font-size: 130px;" name="kongbai"></icon-svg>
<div style="color: #999;">当前暂无可合并发货的订单哦</div> <div style="color: #999;">当前暂无可合并发出的订单哦</div>
</div> </div>
</div> </div>
<el-form v-else ref="ruleForm" :model="ruleForm" label-width="80px" :rules="rules"> <el-form v-else ref="ruleForm" :model="ruleForm" label-width="80px" :rules="rules">
@@ -13,7 +13,7 @@
<el-radio-group class="group3" v-model="radio3" size="mini" @change="radioChange"> <el-radio-group class="group3" v-model="radio3" size="mini" @change="radioChange">
<el-radio-button label="allYse">全合并</el-radio-button> <el-radio-button label="allYse">全合并</el-radio-button>
<el-radio-button label="allNo">全不合并</el-radio-button> <el-radio-button label="allNo">全不合并</el-radio-button>
<el-button type="primary" size="mini" @click="submit" :disabled="buttonDisable">批量合并发货</el-button> <el-button type="primary" size="mini" @click="submit" :disabled="buttonDisable">批量合并发出</el-button>
</el-radio-group> </el-radio-group>
</div> </div>
<ul style=""> <ul style="">
@@ -37,7 +37,7 @@
<div style="padding: 10px;" class=""> <div style="padding: 10px;" class="">
<div><span class="infoTitle">用户名：</span><span>{{ de.userName }}</span></div> <div><span class="infoTitle">用户名：</span><span>{{ de.userName }}</span></div>
<div><span class="infoTitle">电话：</span><span>{{ de.tel }}</span></div> <div><span class="infoTitle">电话：</span><span>{{ de.tel }}</span></div>
<div><span class="infoTitle">收货地址：</span><span>{{ de.address }}</span></div> <div><span class="infoTitle">收件人姓名：</span><span>{{ de.shippingUser }}</span></div>
</div> </div>
</div> </div>
</div> </div>
@@ -81,7 +81,7 @@
</div> --> </div> -->
<el-button type="warning" size="mini" plain <el-button type="warning" size="mini" plain
@click="mergeOne(de.orderList, index)">合并发货</el-button> @click="mergeOne(de.orderList, index)">合并发出</el-button>
</div> </div>
</div> </div>
</li> </li>
@@ -125,7 +125,7 @@ export default {
ruleForm: { ruleForm: {
list: [] list: []
}, },
// 批量合并发货 // 批量合并发出
multMergeIdList:[], multMergeIdList:[],
rules: { rules: {
ruleForm: [ ruleForm: [
@@ -139,7 +139,7 @@ export default {
this.getMergeOrders() this.getMergeOrders()
}, },
methods: { methods: {
// 选择批量合并发货 // 选择批量合并发出
MergeRadioListChanged(val,index) { MergeRadioListChanged(val,index) {
console.log(this.ruleForm.list,'this.ruleForm.list') console.log(this.ruleForm.list,'this.ruleForm.list')
this.ruleForm.list[index].isMerge = 'true' this.ruleForm.list[index].isMerge = 'true'
@@ -176,7 +176,7 @@ export default {
}) })
}).then(({ data }) => { }).then(({ data }) => {
if (data && data.code === 0) { if (data && data.code === 0) {
// console.log('订单发货前的检查') // console.log('订单发出前的检查')
// this.dataList = data.page.list // this.dataList = data.page.list
this.totalPage = data.page.totalCount this.totalPage = data.page.totalCount
loading.close() loading.close()
@@ -216,7 +216,7 @@ export default {
this.getMergeOrders() this.getMergeOrders()
this.merOneList = [] this.merOneList = []
}, },
// 单个合并订单发货 // 单个合并订单发出
mergeOne(list, index) { mergeOne(list, index) {
// console.log(list) // console.log(list)
this.merOneList = list.map(item => { this.merOneList = list.map(item => {
@@ -225,7 +225,7 @@ export default {
console.log(this.merOneList) console.log(this.merOneList)
// this.$refs['ruleForm'].validate((valid) => { // this.$refs['ruleForm'].validate((valid) => {
// if (valid) { // if (valid) {
this.$confirm('正在进行合并发货, 是否继续?', '提示', { this.$confirm('正在进行合并发出, 是否继续?', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'

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

@@ -10,8 +10,8 @@
<el-radio-group size="mini" v-model="tabChange.tabActiveName"> <el-radio-group size="mini" v-model="tabChange.tabActiveName">
<el-radio-button label="">全部</el-radio-button> <el-radio-button label="">全部</el-radio-button>
<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-button label="2">已发货</el-radio-button> <el-radio-button label="2">已发出</el-radio-button>
<el-radio-button label="3">已完成</el-radio-button> <el-radio-button label="3">已完成</el-radio-button>
</el-radio-group> </el-radio-group>
@@ -31,7 +31,7 @@
<div style="margin-bottom: 10px;"> <div style="margin-bottom: 10px;">
<el-radio-group size="mini" v-model="tabChange.isPrint" v-if="tabChange.tabActiveName == 2"> <el-radio-group size="mini" v-model="tabChange.isPrint" v-if="tabChange.tabActiveName == 2">
<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>
</div> </div>
@@ -89,11 +89,11 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<div class="buttonGroup"> <div class="buttonGroup">
<span style="" v-if="tabChange.tabActiveName == 1" style="display: inline-block;margin-bottom: 20px;"> <span v-if="tabChange.tabActiveName == 1" style="display: inline-block;margin-bottom: 20px;">
<el-badge :value="mergeList.length" class="item"> <el-badge :value="mergeList.length" class="item">
<router-link :to="{ path: 'buyorder-mergeorder', query: {} }"> <router-link :to="{ path: 'buyorder-mergeorder', query: {} }">
<el-button style="" size="mini" v-if="isAuth('book:buyorder')" type="primary" <el-button style="" size="mini" v-if="isAuth('book:buyorder')" type="primary"
:disabled="mergeList.length > 0 ? false : true">合并发货</el-button> :disabled="mergeList.length > 0 ? false : true">合并发出</el-button>
</router-link> </router-link>
</el-badge> </el-badge>
</span> </span>
@@ -163,7 +163,7 @@
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<div class="tip"> <div class="tip">
<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>
</div> </div>
</div> </div>
</el-col> </el-col>
@@ -235,7 +235,7 @@
</div> </div>
</div> </div>
<div class="buier td3 xcenter"> <div class="buier td3 xcenter">
<div class="tabName">收货信息： <div class="tabName">收件信息：
<div style="color: #515a6e;"><span <div style="color: #515a6e;"><span
style="color: #515a6e;">{{ fitem.shippingUser }}</span>&nbsp;&nbsp;&nbsp;<span style="color: #515a6e;">{{ fitem.shippingUser }}</span>&nbsp;&nbsp;&nbsp;<span
style="color: #515a6e;">{{ fitem.userPhone }}</span></div> style="color: #515a6e;">{{ fitem.userPhone }}</span></div>
@@ -243,7 +243,7 @@
{{ fitem.province }}-{{ fitem.city }}-{{ fitem.district }}-{{ fitem.address }} {{ fitem.province }}-{{ fitem.city }}-{{ fitem.district }}-{{ fitem.address }}
</div> </div>
<div style="margin-bottom:10px"> <div style="margin-bottom:10px">
<el-button @click="changeAddressShow(fitem)" type="primary" size="mini" plain>修改收货信息</el-button> <el-button @click="changeAddressShow(fitem)" type="primary" size="mini" plain>修改收件信息</el-button>
</div> </div>
</div> </div>
<div class="tabContent"> <div class="tabContent">
@@ -251,9 +251,9 @@
</div> </div>
<div class="buier td4 xcenter flexbox" style="align-items: center; justify-content: center;"> <div class="buier td4 xcenter flexbox" style="align-items: center; justify-content: center;">
<div> <div>
<div class="orderStatus">待发货</div> <div class="orderStatus">待发出</div>
<div><el-button style=" line-height: 6px;" type="primary" size="mini" <div><el-button style=" line-height: 6px;" type="primary" size="mini"
@click="orderDeliver(fitem)">发货</el-button> @click="orderDeliver(fitem)">发出</el-button>
</div> </div>
</div> </div>
</div> </div>
@@ -295,7 +295,7 @@
</span> </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="shippingUser" header-align="center" align="center" label="收货人信息"> <el-table-column prop="shippingUser" header-align="center" align="center" label="收件人信息">
<template slot-scope="scope"> <template slot-scope="scope">
<span <span
v-if="scope.row.shippingUser && scope.row.shippingUser != ''">{{scope.row.shippingUser}}</span> v-if="scope.row.shippingUser && scope.row.shippingUser != ''">{{scope.row.shippingUser}}</span>
@@ -395,13 +395,13 @@
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column prop="shippingTime" header-align="center" align="center" label="发货时间"> <!-- <el-table-column prop="shippingTime" header-align="center" align="center" label="发出时间">
</el-table-column> --> </el-table-column> -->
<el-table-column prop="orderStatus" header-align="center" align="center" label="订单状态" width="80"> <el-table-column prop="orderStatus" header-align="center" align="center" label="订单状态" width="80">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="scope.row.orderStatus == 0" type="success">待付款</el-tag> <el-tag v-if="scope.row.orderStatus == 0" type="success">待付款</el-tag>
<el-tag v-if="scope.row.orderStatus == 1" type="success">待发货</el-tag> <el-tag v-if="scope.row.orderStatus == 1" type="success">待发出</el-tag>
<el-tag v-if="scope.row.orderStatus == 2" type="danger">已发货</el-tag> <el-tag v-if="scope.row.orderStatus == 2" type="danger">已发出</el-tag>
<el-tag v-if="scope.row.orderStatus == 3" type="warning">已完成</el-tag> <el-tag v-if="scope.row.orderStatus == 3" type="warning">已完成</el-tag>
<el-tag v-if="scope.row.orderStatus == 4" type="info">交易失败</el-tag> <el-tag v-if="scope.row.orderStatus == 4" type="info">交易失败</el-tag>
</template> </template>
@@ -447,17 +447,17 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-dialog title="修改收货信息" :visible.sync="changeAddVisible" width="500" v-loading="addressLoad" <el-dialog title="修改收件信息" :visible.sync="changeAddVisible" width="500" v-loading="addressLoad"
:close="changeAddHandleClose"> :close="changeAddHandleClose">
<div> <div>
<el-form ref="addressFormRef" :model="addressForm" label-width="120px" :rules="addressFormRule"> <el-form ref="addressFormRef" :model="addressForm" label-width="120px" :rules="addressFormRule">
<el-form-item label="收货人:" prop="name"> <el-form-item label="收件人:" prop="name">
<el-input v-model="addressForm.name"></el-input> <el-input v-model="addressForm.name"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="收货联系电话:" prop="tel"> <el-form-item label="收件联系电话:" prop="tel">
<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> -->
<!-- 省市区--> <!-- 省市区-->
<!-- 省 --> <!-- 省 -->
@@ -516,7 +516,7 @@
<!-- 物流详情弹窗 --> <!-- 物流详情弹窗 -->
<deliverDetail ref="deliverDetail" :visible="deliverDetailVisible" :deliverOrder="oprateOrder" <deliverDetail ref="deliverDetail" :visible="deliverDetailVisible" :deliverOrder="oprateOrder"
@closeDeliverDetailDialog="closeDeliverDetailDialog"></deliverDetail> @closeDeliverDetailDialog="closeDeliverDetailDialog"></deliverDetail>
<!-- 代发货转为发货 --> <!-- 代发出转为发出 -->
<setDeliverDialog ref="setDeliverDialog" :visible="setDeliverVisible" :selectData="checkedOrders" <setDeliverDialog ref="setDeliverDialog" :visible="setDeliverVisible" :selectData="checkedOrders"
@closeDeliverDialog='closeDeliverDialog'></setDeliverDialog> @closeDeliverDialog='closeDeliverDialog'></setDeliverDialog>
<!-- 设置备注 --> <!-- 设置备注 -->
@@ -524,10 +524,10 @@
:visible="editBeizhudialogVisible" :editBeizhuform="editBeizhuform" @closeDialog='closeBeizhuDialog' :visible="editBeizhudialogVisible" :editBeizhuform="editBeizhuform" @closeDialog='closeBeizhuDialog'
@refreshDataList="getDataList"> @refreshDataList="getDataList">
</updateOrderBeiZhu> </updateOrderBeiZhu>
<!-- 单个订单发货 --> <!-- 单个订单发出 -->
<splitDeliver :orderitem="oprateOrder" :visible="splitDeliverVisible" @closeDialog='closeOrder1Dialog'> <splitDeliver :orderitem="oprateOrder" :visible="splitDeliverVisible" @closeDialog='closeOrder1Dialog'>
</splitDeliver> </splitDeliver>
<!--点合并发货时弹出 可合并订单弹窗 --> <!--点合并发出时弹出 可合并订单弹窗 -->
<mergeDliver v-if="mergeList" :visible="mergeDliverVisible" :mergeList="mergeList" <mergeDliver v-if="mergeList" :visible="mergeDliverVisible" :mergeList="mergeList"
@closeDialog='closemergeDliverDialog'> @closeDialog='closemergeDliverDialog'>
</mergeDliver> </mergeDliver>
@@ -574,7 +574,7 @@
isIndeterminate: true, isIndeterminate: true,
checkAll: false checkAll: false
}, },
multipleDisabled: false, // 待发货多选是否可用 multipleDisabled: false, // 待发出多选是否可用
//childrenChecked:[], //childrenChecked:[],
checkedOrders: [], // 新的筛选 checkedOrders: [], // 新的筛选
fullscreenLoading: false, fullscreenLoading: false,
@@ -584,8 +584,8 @@
sheetVisible: false, sheetVisible: false,
dataList: [], dataList: [],
tabChange: { tabChange: {
tabActiveName: '', // tab筛选默认all全部 0：待付款 1：待发货 2：已发货 3：已完成 tabActiveName: '', // tab筛选默认all全部 0：待付款 1：待发出 2：已发出 3：已完成
isPrint: 0, // 已发货列表筛选 0：显示订单 1：显示可打印列表, isPrint: 0, // 已发出列表筛选 0：显示订单 1：显示可打印列表,
orderName: '0', //订单名称筛选 all:全部 0:健康超市 1:电子书 2:充值订单 orderName: '0', //订单名称筛选 all:全部 0:健康超市 1:电子书 2:充值订单
sheetCode: 2, // 面单状态2 未打印，1 已打印 0全部 sheetCode: 2, // 面单状态2 未打印，1 已打印 0全部
}, },
@@ -655,17 +655,17 @@
addressFormRule: { addressFormRule: {
name: [{ name: [{
required: true, required: true,
message: '请输入收货人信息', message: '请输入收件人信息',
trigger: 'blur' trigger: 'blur'
}], }],
tel: [{ tel: [{
required: true, required: true,
message: '请输入收货联系电话信息', message: '请输入收件联系电话信息',
trigger: 'blur' trigger: 'blur'
}], }],
county: [{ county: [{
required: true, required: true,
message: '请选择收货地址', message: '请选择收件地址',
trigger: 'blur' trigger: 'blur'
}], }],
addressXX: [{ addressXX: [{
@@ -768,7 +768,7 @@
} }
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',
@@ -889,9 +889,9 @@
}) })
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
@@ -935,7 +935,7 @@
this.sheetListLoading = false this.sheetListLoading = false
}) })
}, },
// 检查待发货单选按钮是否可用 // 检查待发出单选按钮是否可用
isMultipleDisabled() { isMultipleDisabled() {
this.dataList.forEach(item => { this.dataList.forEach(item => {
if (item.isSend === '1') { if (item.isSend === '1') {
@@ -1252,14 +1252,14 @@
closeSheetDliverDialog(val) { closeSheetDliverDialog(val) {
this.sheetVisible = val this.sheetVisible = val
}, },
// 批量发货 // 批量发出
setDeliver() { setDeliver() {
this.setDeliverVisible = true this.setDeliverVisible = true
}, },
// 发货前检查是否有可合并项(废除) // 发出前检查是否有可合并项(废除)
checkDeliver() { checkDeliver() {
// 确认 // 确认
this.$confirm(`正在批量发货,共选中了${this.checkedOrders.length}条数据, 是否继续?`, '提示', { this.$confirm(`正在批量发出,共选中了${this.checkedOrders.length}条数据, 是否继续?`, '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '点错了', cancelButtonText: '点错了',
type: 'warning' type: 'warning'
@@ -1270,7 +1270,7 @@
}).catch(() => {}); }).catch(() => {});
}, },
// 单个订单发货 // 单个订单发出
orderDeliver(item) { orderDeliver(item) {
console.log(item) console.log(item)
this.oprateOrder = item this.oprateOrder = item
@@ -1307,7 +1307,7 @@
}) })
return true return true
}, },
// 关闭单个订单发货弹窗 // 关闭单个订单发出弹窗
closeOrder1Dialog(val) { closeOrder1Dialog(val) {
this.splitDeliverVisible = val this.splitDeliverVisible = val
// this.oprateOrder = {} // this.oprateOrder = {}
@@ -1320,7 +1320,7 @@
closeanyDialogDialog() { closeanyDialogDialog() {
this.anyDialogVisible = false this.anyDialogVisible = false
}, },
// 关闭合批量发货合并项弹窗 // 关闭合批量发出合并项弹窗
closemergeDliverDialog(val) { closemergeDliverDialog(val) {
console.log(val) console.log(val)
this.mergeDliverVisible = false this.mergeDliverVisible = false

84
src/views/modules/order/buyorder___.vue
View File

@@ -9,13 +9,13 @@
<el-radio-group size="mini" v-model="tabChange.tabActiveName" style="margin-bottom: 10px;"> <el-radio-group size="mini" v-model="tabChange.tabActiveName" style="margin-bottom: 10px;">
<el-radio-button label="">全部</el-radio-button> <el-radio-button label="">全部</el-radio-button>
<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-button label="2">已发货</el-radio-button> <el-radio-button label="2">已发出</el-radio-button>
<el-radio-button label="3">已完成</el-radio-button> <el-radio-button label="3">已完成</el-radio-button>
</el-radio-group> </el-radio-group>
<div style="margin-bottom: 10px;"> <div style="margin-bottom: 10px;">
<el-radio-group size="mini" v-model="tabChange.isPrint" v-if="tabChange.tabActiveName == 2"> <el-radio-group size="mini" v-model="tabChange.isPrint" v-if="tabChange.tabActiveName == 2">
<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> -->
@@ -82,17 +82,17 @@
<el-button size="mini" v-if="isAuth('book:buyorder:delete')" type="danger" @click="deleteHandle()" <el-button size="mini" v-if="isAuth('book:buyorder:delete')" type="danger" @click="deleteHandle()"
:disabled="dataListSelections.length <= 0">{{tabChange.tabActiveName}}批量删除</el-button> :disabled="dataListSelections.length <= 0">{{tabChange.tabActiveName}}批量删除</el-button>
</span> --> </span> -->
<span style="" v-if="tabChange.tabActiveName == 1" style="display: inline-block;margin-bottom: 20px;"> <span v-if="tabChange.tabActiveName == 1" style="display: inline-block;margin-bottom: 20px;">
<el-badge :value="mergeList.length" class="item"> <el-badge :value="mergeList.length" class="item">
<router-link :to="{ path: 'buyorder-mergeorder', query: {} }"> <router-link :to="{ path: 'buyorder-mergeorder', query: {} }">
<el-button style="" size="mini" v-if="isAuth('book:buyorder')" type="primary" <el-button style="" size="mini" v-if="isAuth('book:buyorder')" type="primary"
:disabled="mergeList.length > 0 ? false : true">合并发货</el-button> :disabled="mergeList.length > 0 ? false : true">合并发出</el-button>
</router-link> </router-link>
</el-badge> </el-badge>
</span> </span>
<!-- <span style="" v-if="tabChange.tabActiveName == 1"> <!-- <span style="" v-if="tabChange.tabActiveName == 1">
<el-button style="margin-left: 10px;" size="mini" v-if="isAuth('book:buyorder')" type="primary" <el-button style="margin-left: 10px;" size="mini" v-if="isAuth('book:buyorder')" type="primary"
:disabled="checkedOrders.length <= 0" @click="checkDeliver">批量发货</el-button> :disabled="checkedOrders.length <= 0" @click="checkDeliver">批量发出</el-button>
</span> --> </span> -->
<span style="" v-if="tabChange.tabActiveName == 2 && tabChange.isPrint == 1"> <span style="" v-if="tabChange.tabActiveName == 2 && tabChange.isPrint == 1">
<el-button style="margin-left: 10px;" size="mini" v-if="isAuth('book:buyorder')" type="warning" <el-button style="margin-left: 10px;" size="mini" v-if="isAuth('book:buyorder')" type="warning"
@@ -165,10 +165,10 @@
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<div class="tip"> <div class="tip">
<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> -->
@@ -239,7 +239,7 @@
</div> </div>
</div> </div>
<div class="buier td3 xcenter"> <div class="buier td3 xcenter">
<div class="tabName">收货信息： <div class="tabName">收件信息：
<div style="color: #515a6e;"><span <div style="color: #515a6e;"><span
style="color: #515a6e;">{{ fitem.consignee.consigneeName }}</span>&nbsp;&nbsp;&nbsp;<span style="color: #515a6e;">{{ fitem.consignee.consigneeName }}</span>&nbsp;&nbsp;&nbsp;<span
style="color: #515a6e;">{{ fitem.consignee.consigneeMobile }}</span></div> style="color: #515a6e;">{{ fitem.consignee.consigneeMobile }}</span></div>
@@ -247,25 +247,25 @@
{{ fitem.consignee.province }}-{{ fitem.consignee.city }}-{{ fitem.consignee.county }}-{{ fitem.consignee.address }} {{ fitem.consignee.province }}-{{ fitem.consignee.city }}-{{ fitem.consignee.county }}-{{ fitem.consignee.address }}
</div> </div>
<div style="margin-bottom:10px"> <div style="margin-bottom:10px">
<el-button @click="changeAddressShow(fitem)" type="primary" size="mini" plain>修改收货信息</el-button> <el-button @click="changeAddressShow(fitem)" type="primary" size="mini" plain>修改收件信息</el-button>
<!-- <a href="#" v-if="fitem.orderStatus <= 1"><i class="el-icon-edit"></i>修改收货信息</a> --> <!-- <a href="#" v-if="fitem.orderStatus <= 1"><i class="el-icon-edit"></i>修改收件信息</a> -->
</div> </div>
</div> </div>
<div class="tabContent"> <div class="tabContent">
<!-- <div>用户id：{{ fitem.userId }}</div> --> <!-- <div>用户id：{{ fitem.userId }}</div> -->
<!-- <div>收货地址：{{ fitem.address }}</div> --> <!-- <div>收件地址：{{ fitem.address }}</div> -->
<!-- <div class="buier_tip">买家备注：尽快发货</div> --> <!-- <div class="buier_tip">买家备注：尽快发出</div> -->
</div> </div>
</div> </div>
<div class="buier td4 xcenter flexbox" style="align-items: center; justify-content: center;"> <div class="buier td4 xcenter flexbox" style="align-items: center; justify-content: center;">
<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" <div><el-button style=" line-height: 6px;" type="primary" size="mini"
@click="orderDeliver(fitem)">发货</el-button> @click="orderDeliver(fitem)">发出</el-button>
</div> </div>
</div> </div>
</div> </div>
@@ -307,7 +307,7 @@
</el-table-column> </el-table-column>
<!-- <el-table-column prop="userName" header-align="center" align="center" label="下单人姓名"> <!-- <el-table-column prop="userName" header-align="center" align="center" label="下单人姓名">
</el-table-column> --> </el-table-column> -->
<el-table-column prop="shippingUser" header-align="center" align="center" label="收货人信息"> <el-table-column prop="shippingUser" header-align="center" align="center" label="收件人信息">
<template slot-scope="scope"> <template slot-scope="scope">
<span <span
v-if="scope.row.consignee.consigneeName && scope.row.consignee.consigneeName != ''">{{scope.row.consignee.consigneeName}}</span> v-if="scope.row.consignee.consigneeName && scope.row.consignee.consigneeName != ''">{{scope.row.consignee.consigneeName}}</span>
@@ -399,13 +399,13 @@
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column prop="shippingTime" header-align="center" align="center" label="发货时间"> <!-- <el-table-column prop="shippingTime" header-align="center" align="center" label="发出时间">
</el-table-column> --> </el-table-column> -->
<el-table-column prop="orderStatus" header-align="center" align="center" label="订单状态" width="80"> <el-table-column prop="orderStatus" header-align="center" align="center" label="订单状态" width="80">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="scope.row.orderStatus == 0" type="success">待付款</el-tag> <el-tag v-if="scope.row.orderStatus == 0" type="success">待付款</el-tag>
<el-tag v-if="scope.row.orderStatus == 1" type="success">待发货</el-tag> <el-tag v-if="scope.row.orderStatus == 1" type="success">待发出</el-tag>
<el-tag v-if="scope.row.orderStatus == 2" type="danger">已发货</el-tag> <el-tag v-if="scope.row.orderStatus == 2" type="danger">已发出</el-tag>
<el-tag v-if="scope.row.orderStatus == 3" type="warning">已完成</el-tag> <el-tag v-if="scope.row.orderStatus == 3" type="warning">已完成</el-tag>
<el-tag v-if="scope.row.orderStatus == 4" type="info">交易失败</el-tag> <el-tag v-if="scope.row.orderStatus == 4" type="info">交易失败</el-tag>
</template> </template>
@@ -451,17 +451,17 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-dialog title="修改收货信息" :visible.sync="changeAddVisible" width="500" v-loading="addressLoad" <el-dialog title="修改收件信息" :visible.sync="changeAddVisible" width="500" v-loading="addressLoad"
:close="changeAddHandleClose"> :close="changeAddHandleClose">
<div> <div>
<el-form ref="addressFormRef" :model="addressForm" label-width="120px" :rules="addressFormRule"> <el-form ref="addressFormRef" :model="addressForm" label-width="120px" :rules="addressFormRule">
<el-form-item label="收货人:" prop="name"> <el-form-item label="收件人:" prop="name">
<el-input v-model="addressForm.name"></el-input> <el-input v-model="addressForm.name"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="收货联系电话:" prop="tel"> <el-form-item label="收件联系电话:" prop="tel">
<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> -->
<!-- 省市区--> <!-- 省市区-->
<!-- 省 --> <!-- 省 -->
@@ -520,7 +520,7 @@
<!-- 物流详情弹窗 --> <!-- 物流详情弹窗 -->
<deliverDetail ref="deliverDetail" :visible="deliverDetailVisible" :deliverOrder="oprateOrder" <deliverDetail ref="deliverDetail" :visible="deliverDetailVisible" :deliverOrder="oprateOrder"
@closeDeliverDetailDialog="closeDeliverDetailDialog"></deliverDetail> @closeDeliverDetailDialog="closeDeliverDetailDialog"></deliverDetail>
<!-- 代发货转为发货 --> <!-- 代发出转为已发出 -->
<setDeliverDialog ref="setDeliverDialog" :visible="setDeliverVisible" :selectData="checkedOrders" <setDeliverDialog ref="setDeliverDialog" :visible="setDeliverVisible" :selectData="checkedOrders"
@closeDeliverDialog='closeDeliverDialog'></setDeliverDialog> @closeDeliverDialog='closeDeliverDialog'></setDeliverDialog>
<!-- 设置备注 --> <!-- 设置备注 -->
@@ -528,10 +528,10 @@
:visible="editBeizhudialogVisible" :editBeizhuform="editBeizhuform" @closeDialog='closeBeizhuDialog' :visible="editBeizhudialogVisible" :editBeizhuform="editBeizhuform" @closeDialog='closeBeizhuDialog'
@refreshDataList="getDataList"> @refreshDataList="getDataList">
</updateOrderBeiZhu> </updateOrderBeiZhu>
<!-- 单个订单发货 --> <!-- 单个订单发出 -->
<splitDeliver :orderitem="oprateOrder" :visible="splitDeliverVisible" @closeDialog='closeOrder1Dialog'> <splitDeliver :orderitem="oprateOrder" :visible="splitDeliverVisible" @closeDialog='closeOrder1Dialog'>
</splitDeliver> </splitDeliver>
<!--点合并发货时弹出 可合并订单弹窗 --> <!--点合并发出时弹出 可合并订单弹窗 -->
<mergeDliver v-if="mergeList" :visible="mergeDliverVisible" :mergeList="mergeList" <mergeDliver v-if="mergeList" :visible="mergeDliverVisible" :mergeList="mergeList"
@closeDialog='closemergeDliverDialog'> @closeDialog='closemergeDliverDialog'>
</mergeDliver> </mergeDliver>
@@ -578,7 +578,7 @@
isIndeterminate: true, isIndeterminate: true,
checkAll: false checkAll: false
}, },
multipleDisabled: false, // 待发货多选是否可用 multipleDisabled: false, // 待发出多选是否可用
//childrenChecked:[], //childrenChecked:[],
checkedOrders: [], // 新的筛选 checkedOrders: [], // 新的筛选
fullscreenLoading: false, fullscreenLoading: false,
@@ -588,8 +588,8 @@
sheetVisible: false, sheetVisible: false,
dataList: [], dataList: [],
tabChange: { tabChange: {
tabActiveName: '1', // tab筛选默认all全部 0：待付款 1：待发货 2：已发货 3：已完成 tabActiveName: '1', // tab筛选默认all全部 0：待付款 1：待发出 2：已发出 3：已完成
isPrint: 0, // 已发货列表筛选 0：显示订单 1：显示可打印列表, isPrint: 0, // 已发出列表筛选 0：显示订单 1：显示可打印列表,
orderName: '0', //订单名称筛选 all:全部 0:健康超市 1:电子书 2:充值订单 orderName: '0', //订单名称筛选 all:全部 0:健康超市 1:电子书 2:充值订单
sheetCode: 2, // 面单状态2 未打印，1 已打印 0全部 sheetCode: 2, // 面单状态2 未打印，1 已打印 0全部
}, },
@@ -659,17 +659,17 @@
addressFormRule: { addressFormRule: {
name: [{ name: [{
required: true, required: true,
message: '请输入收货人信息', message: '请输入收件人信息',
trigger: 'blur' trigger: 'blur'
}], }],
tel: [{ tel: [{
required: true, required: true,
message: '请输入收货联系电话信息', message: '请输入收件联系电话信息',
trigger: 'blur' trigger: 'blur'
}], }],
county: [{ county: [{
required: true, required: true,
message: '请选择收货地址', message: '请选择收件地址',
trigger: 'blur' trigger: 'blur'
}], }],
addressXX: [{ addressXX: [{
@@ -716,7 +716,7 @@
} }
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',
@@ -837,9 +837,9 @@
}) })
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
@@ -883,7 +883,7 @@
this.sheetListLoading = false this.sheetListLoading = false
}) })
}, },
// 检查待发货单选按钮是否可用 // 检查待发出订单是否有已选中的订单
isMultipleDisabled() { isMultipleDisabled() {
this.dataList.forEach(item => { this.dataList.forEach(item => {
if (item.isSend === '1') { if (item.isSend === '1') {
@@ -1227,14 +1227,14 @@
closeSheetDliverDialog(val) { closeSheetDliverDialog(val) {
this.sheetVisible = val this.sheetVisible = val
}, },
// 批量发货 // 批量发出
setDeliver() { setDeliver() {
this.setDeliverVisible = true this.setDeliverVisible = true
}, },
// 发货前检查是否有可合并项(废除) // 发出前检查是否有可合并项(废除)
checkDeliver() { checkDeliver() {
// 确认 // 确认
this.$confirm(`正在批量发货,共选中了${this.checkedOrders.length}条数据, 是否继续?`, '提示', { this.$confirm(`正在批量发出,共选中了${this.checkedOrders.length}条数据, 是否继续?`, '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '点错了', cancelButtonText: '点错了',
type: 'warning' type: 'warning'
@@ -1245,7 +1245,7 @@
}).catch(() => {}); }).catch(() => {});
}, },
// 单个订单发货 // 单个订单发出
orderDeliver(item) { orderDeliver(item) {
console.log(item) console.log(item)
this.oprateOrder = item this.oprateOrder = item
@@ -1282,7 +1282,7 @@
}) })
return true return true
}, },
// 关闭单个订单发货弹窗 // 关闭单个订单发出弹窗
closeOrder1Dialog(val) { closeOrder1Dialog(val) {
this.splitDeliverVisible = val this.splitDeliverVisible = val
// this.oprateOrder = {} // this.oprateOrder = {}
@@ -1295,7 +1295,7 @@
closeanyDialogDialog() { closeanyDialogDialog() {
this.anyDialogVisible = false this.anyDialogVisible = false
}, },
// 关闭合批量发货合并项弹窗 // 关闭批量发出合并项弹窗
closemergeDliverDialog(val) { closemergeDliverDialog(val) {
console.log(val) console.log(val)
this.mergeDliverVisible = false this.mergeDliverVisible = false

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

@@ -6,10 +6,10 @@
>待付款</span >待付款</span
> >
<span v-if="orderDetails.orderStatus == 1" class="item hightLight1" <span v-if="orderDetails.orderStatus == 1" class="item hightLight1"
>待发货</span >待发出</span
> >
<span v-if="orderDetails.orderStatus == 2" class="item hightLight2" <span v-if="orderDetails.orderStatus == 2" class="item hightLight2"
>已发货</span >已发出</span
> >
<span v-if="orderDetails.orderStatus == 3" class="item hightLight3" <span v-if="orderDetails.orderStatus == 3" class="item hightLight3"
>已完成</span >已完成</span
@@ -48,15 +48,15 @@
>待付款</span >待付款</span
> >
<span v-if="orderDetails.orderStatus == 1" class="hightLight" <span v-if="orderDetails.orderStatus == 1" class="hightLight"
>待发货</span >待发出</span
> >
<span v-if="orderDetails.orderStatus == 2" class="hightLight" <span v-if="orderDetails.orderStatus == 2" class="hightLight"
>已发货</span >已发出</span
> >
<span v-if="orderDetails.orderStatus == 3" class="hightLight" <span v-if="orderDetails.orderStatus == 3" class="hightLight"
>已完成</span >已完成</span
> >
<!-- <el-button v-if="orderDetails.orderStatus == 1" @click="godeliver" class="text_button" size="mini" type="text">去发货</el-button> --> <!-- <el-button v-if="orderDetails.orderStatus == 1" @click="godeliver" class="text_button" size="mini" type="text">去发出</el-button> -->
</li> </li>
<!-- <li><span class="infoTitle">商品总数：</span><span>{{orderDetails.}}</span></li> --> <!-- <li><span class="infoTitle">商品总数：</span><span>{{orderDetails.}}</span></li> -->
<!-- <li> <!-- <li>
@@ -394,19 +394,19 @@
href="#" href="#"
@click="changeAddressShow" @click="changeAddressShow"
v-if="orderDetails.orderStatus <= 1 && pageType != 'user'" v-if="orderDetails.orderStatus <= 1 && pageType != 'user'"
><i class="el-icon-edit"></i>修改收货信息</a ><i class="el-icon-edit"></i>修改收件信息</a
> >
</div> </div>
<div style="background:#f9f9f9; padding:5px; overflow:hidden; "> <div style="background:#f9f9f9; padding:5px; overflow:hidden; ">
<li> <li>
<span class="infoTitle">收货人：</span <span class="infoTitle">收件人：</span
><span>{{ orderDetails.consignee.consigneeName }}</span ><span>{{ orderDetails.consignee.consigneeName }}</span
>&nbsp;&nbsp;&nbsp;<span>{{ >&nbsp;&nbsp;&nbsp;<span>{{
orderDetails.consignee.consigneeMobile orderDetails.consignee.consigneeMobile
}}</span> }}</span>
</li> </li>
<li> <li>
<span class="infoTitle">收货地址：</span <span class="infoTitle">收件地址：</span
><span ><span
>{{ orderDetails.consignee.province }}-{{ >{{ orderDetails.consignee.province }}-{{
orderDetails.consignee.city orderDetails.consignee.city
@@ -570,7 +570,7 @@
</div> </div>
</el-dialog> </el-dialog>
<el-dialog <el-dialog
title="修改收货信息" title="修改收件信息"
:visible.sync="changeAddVisible" :visible.sync="changeAddVisible"
width="500" width="500"
:close="changeAddHandleClose" :close="changeAddHandleClose"
@@ -583,13 +583,13 @@
label-width="120px" label-width="120px"
:rules="addressFormRule" :rules="addressFormRule"
> >
<el-form-item label="收货人:" prop="name"> <el-form-item label="收件人:" prop="name">
<el-input v-model="addressForm.name"></el-input> <el-input v-model="addressForm.name"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="收货联系电话:" prop="tel"> <el-form-item label="收件联系电话:" prop="tel">
<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="收货地址:"> <el-form-item label="收件地址:">
<!-- <el-input v-model="addressForm.address"></el-input> --> <!-- <el-input v-model="addressForm.address"></el-input> -->
<!-- 省市区--> <!-- 省市区-->
<!-- 省 --> <!-- 省 -->
@@ -740,21 +740,21 @@ export default {
name: [ name: [
{ {
required: true, required: true,
message: "请输入收货人信息", message: "请输入收件人信息",
trigger: "blur" trigger: "blur"
} }
], ],
tel: [ tel: [
{ {
required: true, required: true,
message: "请输入收货联系电话信息", message: "请输入收件联系电话信息",
trigger: "blur" trigger: "blur"
} }
], ],
county: [ county: [
{ {
required: true, required: true,
message: "请选择收货地址", message: "请选择收件地址",
trigger: "blur" trigger: "blur"
} }
], ],
@@ -931,13 +931,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",
@@ -1056,7 +1056,7 @@ export default {
this.setDeliverVisible = false; this.setDeliverVisible = false;
this.getData(); this.getData();
}, },
// 去发货 // 去发出
godeliver() { godeliver() {
this.orderList[0] = this.query.orderSn; this.orderList[0] = this.query.orderSn;
this.setDeliverVisible = true; this.setDeliverVisible = true;

4
src/views/modules/order/deliver-detail.vue
View File

@@ -7,9 +7,9 @@
<div class="deliverInfo" style="width: 300px; margin: 10px auto;" v-if="activities != []"> <div class="deliverInfo" style="width: 300px; margin: 10px auto;" v-if="activities != []">
<!-- <div style="margin-bottom: 5px;"><i class="el-icon-location-outline"></i><span <!-- <div style="margin-bottom: 5px;"><i class="el-icon-location-outline"></i><span
style=" margin-left:10px;">收货地址</span>：天津市河东区天津站</div> --> style=" margin-left:10px;">收件地址</span>：天津市河东区天津站</div> -->
<div style=""><icon-svg name="ren"></icon-svg><span <div style=""><icon-svg name="ren"></icon-svg><span
style=" margin-left:10px;">收货人</span>：{{ deliverOrder.userName }}</div> style=" margin-left:10px;">收件人</span>：{{ deliverOrder.userName }}</div>
<div style="margin-bottom: 5px;"><icon-svg name="dianhua"></icon-svg><span style=" margin-left:10px;">电 话</span>：{{ deliverOrder.userPhone }}</div> <div style="margin-bottom: 5px;"><icon-svg name="dianhua"></icon-svg><span style=" margin-left:10px;">电 话</span>：{{ deliverOrder.userPhone }}</div>
</div> </div>

2
src/views/modules/order/orderdeliver-merge.vue
View File

@@ -16,7 +16,7 @@
<div style="padding: 10px;" class=""> <div style="padding: 10px;" class="">
<div><span class="infoTitle">用户名：</span><span>{{de.userName}}</span></div> <div><span class="infoTitle">用户名：</span><span>{{de.userName}}</span></div>
<div><span class="infoTitle">电话：</span><span>{{de.tel}}</span></div> <div><span class="infoTitle">电话：</span><span>{{de.tel}}</span></div>
<div><span class="infoTitle">收货地址：</span><span>{{de.address}}</span></div> <div><span class="infoTitle">收件地址：</span><span>{{de.address}}</span></div>
</div> </div>
</div> </div>
</div> </div>

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

@@ -1,5 +1,5 @@
<template> <template>
<el-dialog title="订单发货" center :visible.sync="visible" width="900px" :before-close="beforeCloseDialog"> <el-dialog title="订单发出" center :visible.sync="visible" width="900px" :before-close="beforeCloseDialog">
<el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm"> <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
<el-form-item label="物流公司" prop="deliverLcd"> <el-form-item label="物流公司" prop="deliverLcd">
<el-select size="mini" v-model="ruleForm.deliverLcd" placeholder="请选择物流公司" @change="selectChanged"> <el-select size="mini" v-model="ruleForm.deliverLcd" placeholder="请选择物流公司" @change="selectChanged">
@@ -7,10 +7,10 @@
:value="item.expressCode"></el-option> :value="item.expressCode"></el-option>
</el-select> </el-select>
<el-radio-group v-model="radio3" size="mini" style="float: right;" @change="tabChange"> <el-radio-group v-model="radio3" size="mini" style="float: right;" @change="tabChange">
<!-- 三种发货形态-general：普通发货,merge:合并发货,mix:混合发货 --> <!-- 三种发出形态-general：普通发出,merge:合并发出,mix:混合发出 -->
<el-radio-button label="general">普通发货</el-radio-button> <el-radio-button label="general">普通发出</el-radio-button>
<!-- <el-radio-button label="merge">合并发货</el-radio-button> --> <!-- <el-radio-button label="merge">合并发出</el-radio-button> -->
<el-radio-button label="mix">混合发货</el-radio-button> <el-radio-button label="mix">混合发出</el-radio-button>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-form> </el-form>
@@ -63,7 +63,7 @@
<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>
@@ -76,7 +76,7 @@
<div style="padding: 10px;" class=""> <div style="padding: 10px;" class="">
<div><span class="infoTitle">用户名：</span><span>{{item.userName}}</span></div> <div><span class="infoTitle">用户名：</span><span>{{item.userName}}</span></div>
<div><span class="infoTitle">电话：</span><span>{{item.tel}}</span></div> <div><span class="infoTitle">电话：</span><span>{{item.tel}}</span></div>
<div><span class="infoTitle">收货地址：</span><span>{{item.address}}</span></div> <div><span class="infoTitle">收件地址：</span><span>{{item.address}}</span></div>
</div> </div>
</div> </div>
</div> --> </div> -->
@@ -122,8 +122,8 @@
</ul> </ul>
</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>
@@ -141,7 +141,7 @@ export default {
}, },
data() { data() {
return { return {
// 普通发货list // 普通发出list
productsCodeList:[], productsCodeList:[],
productsIdsList:[], productsIdsList:[],
radio3: 'general', radio3: 'general',
@@ -157,7 +157,7 @@ export default {
] ]
}, },
orderIds: [], orderIds: [],
// 混合发货数组 // 混合发出数组
mixOrderList: [] mixOrderList: []
} }
}, },
@@ -237,7 +237,7 @@ export default {
}, },
// //
// getProductsCodeList // getProductsCodeList
// 普通发货 // 普通发出
submit1() { submit1() {
this.getNewProducts() this.getNewProducts()
// console.log(this.productsIdsList) // console.log(this.productsIdsList)
@@ -264,7 +264,7 @@ export default {
loading.close(); loading.close();
// console.log(data) // console.log(data)
this.beforeCloseDialog() this.beforeCloseDialog()
return this.$message.success('发货成功') return this.$message.success('发出成功')
}else{ }else{
loading.close(); loading.close();
console.log('e',data) console.log('e',data)
@@ -301,7 +301,7 @@ export default {
this.dataListLoading = false this.dataListLoading = false
}) })
}, },
//混合发货 //混合发出
submit() { submit() {
this.$refs['ruleForm'].validate((valid) => { this.$refs['ruleForm'].validate((valid) => {
if (valid) { if (valid) {
@@ -309,7 +309,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: '取消',
@@ -336,7 +336,7 @@ export default {
loading.close() loading.close()
// console.log(data) // console.log(data)
this.beforeCloseDialog() this.beforeCloseDialog()
return this.$message.success('发货成功') return this.$message.success('发出成功')
}else{ }else{
loading.close(); loading.close();
this.$message.error(data.msg) this.$message.error(data.msg)
@@ -358,12 +358,12 @@ export default {
deliverType() { deliverType() {
let type = '' let type = ''
if (this.radio3 == 'mix') { if (this.radio3 == 'mix') {
type = `[混合发货]，当前操作${this.checkedList.length}个商品打包发货` type = `[混合发出]，当前操作${this.checkedList.length}个商品打包发出`
} else if (this.radio3 == 'merge') { } else if (this.radio3 == 'merge') {
type = `[合并发货]` type = `[合并发出]`
} else { } else {
// 混合发货 // 混合发出
type = '[普通发货]' type = '[普通发出]'
} }
return type return type
} }

4
src/views/modules/order/reLearn.vue
View File

@@ -153,10 +153,10 @@ export default {
ss = '待付款' ss = '待付款'
break; break;
case '1': case '1':
ss = '待发货' ss = '待发出'
break; break;
case '2': case '2':
ss = '已发货' ss = '已发出'
break; break;
case '3': case '3':
ss = '已完成' ss = '已完成'

12
src/views/modules/order/set-deliver-dialog.vue
View File

@@ -1,13 +1,13 @@
<template> <template>
<div> <div>
<el-dialog title="发货配置" :close-on-click-modal="false" :visible.sync="visible" width='500px' <el-dialog title="发出配置" :close-on-click-modal="false" :visible.sync="visible" width='500px'
:before-close="beforeCloseDialog" append-to-body> :before-close="beforeCloseDialog" append-to-body>
<!-- <el-steps :active="stepsActive" simple style="margin-bottom: 20px;;"> <!-- <el-steps :active="stepsActive" simple style="margin-bottom: 20px;;">
<el-step title="获取电子面单" icon="el-icon-tickets"></el-step> <el-step title="获取电子面单" icon="el-icon-tickets"></el-step>
<el-step title="打印电子面单" icon="el-icon-printer"></el-step> <el-step title="打印电子面单" icon="el-icon-printer"></el-step>
</el-steps> --> </el-steps> -->
<!-- <el-alert style="margin-bottom: 15px;" v-if="selectData.length > 0" <!-- <el-alert style="margin-bottom: 15px;" v-if="selectData.length > 0"
:title="`您正在对 ${selectData.length} 条数据进行发货操作。`" :closable="false" type="success"> :title="`您正在对 ${selectData.length} 条数据进行发出操作。`" :closable="false" type="success">
</el-alert> --> </el-alert> -->
<el-form v-if="ruleForm" :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" <el-form v-if="ruleForm" :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px"
class="demo-ruleForm"> class="demo-ruleForm">
@@ -19,7 +19,7 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer" style="text-align: center;"> <div slot="footer" class="dialog-footer" style="text-align: center;">
<el-button type="primary" @click="setDevliverHandle">立即发货</el-button> <el-button type="primary" @click="setDevliverHandle">立即发出</el-button>
</div> </div>
</el-dialog> </el-dialog>
<!-- <ul class="print-ul" style="display: block;"> <!-- <ul class="print-ul" style="display: block;">
@@ -102,7 +102,7 @@ export default {
/// this.selectData = [] /// this.selectData = []
}, },
// 发货操作 // 发出操作
setDevliverHandle() { setDevliverHandle() {
this.$refs['ruleForm'].validate((valid) => { this.$refs['ruleForm'].validate((valid) => {
if (valid) { if (valid) {
@@ -127,10 +127,10 @@ export default {
if (data && data.code === 0) { if (data && data.code === 0) {
console.log(data) console.log(data)
this.beforeCloseDialog() // 关闭弹窗 this.beforeCloseDialog() // 关闭弹窗
return this.$message.success('发货成功') return this.$message.success('发出成功')
} else { } else {
this.beforeCloseDialog() // 关闭弹窗 this.beforeCloseDialog() // 关闭弹窗
return this.$message.error('发货失败') return this.$message.error('发出失败')
} }
}).catch((err) => { }).catch((err) => {

12
src/views/modules/vipList/vipDetail.vue
View File

@@ -7,10 +7,10 @@
>待付款</span >待付款</span
> >
<span v-if="orderDetails.orderStatus == 1" class="item hightLight1" <span v-if="orderDetails.orderStatus == 1" class="item hightLight1"
>待发货</span >待发出</span
> >
<span v-if="orderDetails.orderStatus == 2" class="item hightLight2" <span v-if="orderDetails.orderStatus == 2" class="item hightLight2"
>已发货</span >已发出</span
> >
<span v-if="orderDetails.orderStatus == 3" class="item hightLight3" <span v-if="orderDetails.orderStatus == 3" class="item hightLight3"
>已完成</span >已完成</span
@@ -966,13 +966,13 @@ if (this.dataForm.type == "master") {
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",
@@ -1034,7 +1034,7 @@ if (this.dataForm.type == "master") {
this.setDeliverVisible = false; this.setDeliverVisible = false;
this.getData(); this.getData();
}, },
// 去发货 // 去发出
godeliver() { godeliver() {
this.orderList[0] = this.query.orderSn; this.orderList[0] = this.query.orderSn;
this.setDeliverVisible = true; this.setDeliverVisible = true;