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

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

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

View File

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