net/key1_beacon_back
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed 修改订单页面的订单状态查询

Browse Source
This commit is contained in:
AERWEN\26795 2023-10-15 13:16:55 +08:00
parent ac1060eca6
commit e1b484d806
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/business/GoodsManager/GoodsCategorys/index.vue
View File

@ -130,7 +130,7 @@ const total = ref(0)
// 是否加载 // 是否加载
const loading = ref(true) const loading = ref(true)
// 是否展开，默认全部折叠 // 是否展开，默认全部折叠
const isExpandAll = ref(false) const isExpandAll = ref(true)
const refreshTable = ref(true) const refreshTable = ref(true)
const data = reactive({ const data = reactive({

12
src/views/business/OrderManage/Orders/index.vue
View File

@ -174,7 +174,7 @@
<!-- <el-button type="primary" size="small" icon="edit" @click="handleUpdate(scope.row)" <!-- <el-button type="primary" size="small" icon="edit" @click="handleUpdate(scope.row)"
v-hasPermi="['business:order:addOrUpdate']">编辑</el-button> --> v-hasPermi="['business:order:addOrUpdate']">编辑</el-button> -->
<el-button type="primary" size="small" icon="view" @click="handleDetail(scope.row)">详情</el-button> <el-button type="primary" size="small" icon="view" @click="handleDetail(scope.row)">详情</el-button>
<el-button v-if="scope.row.payStatus == 1" @click="handleChangePrice(scope.row)" size="small">订单改价</el-button> <!-- <el-button v-if="scope.row.payStatus == 1" @click="handleChangePrice(scope.row)" size="small">订单改价</el-button> -->
<!-- 发货 --> <!-- 发货 -->
<el-button v-if="( <el-button v-if="(
scope.row.payStatus == 2 scope.row.payStatus == 2
@ -182,11 +182,11 @@
&& scope.row.deliveryStatus == 1 && scope.row.deliveryStatus == 1
&& scope.row.orderStatus != 2 && scope.row.orderStatus != 2
&& scope.row.orderStatus != 3 && scope.row.orderStatus != 3
)" type="primary" size="small" @click="handleDeliver(scope.row)">发 货</el-button> )" type="warning" size="small" @click="handleDeliver(scope.row)" icon="check">发 货</el-button>
<!-- 审核取消订单 --> <!-- 审核取消订单 -->
<el-button type="primary" size="small" v-if="scope.row.orderStatus == 3" <el-button type="warning" size="small" v-if="scope.row.orderStatus == 3"
@click="handleCancelOrder(scope.row)">审核取消订单</el-button> @click="handleCancelOrder(scope.row)" icon="check">审核取消订单</el-button>
<el-button type="danger" size="small" icon="delete" @click="handleDelete(scope.row)" <el-button type="danger" size="small" icon="delete" @click="handleDelete(scope.row)"
v-hasPermi="['business:order:delete']">删除</el-button> v-hasPermi="['business:order:delete']">删除</el-button>
</template> </template>
@ -312,10 +312,13 @@ function handleChangeOrderStatus() {
switch (statusName) { switch (statusName) {
case "待发货": case "待发货":
queryParams.value.deliveryStatus = 1; queryParams.value.deliveryStatus = 1;
queryParams.value.payStatus = 2;
queryParams.value.orderStatus = 1; queryParams.value.orderStatus = 1;
break; break;
case "待收货": case "待收货":
queryParams.value.deliveryStatus = 2;
queryParams.value.receiptStatus = 1; queryParams.value.receiptStatus = 1;
queryParams.value.payStatus = 2;
queryParams.value.orderStatus = 1; queryParams.value.orderStatus = 1;
break; break;
case "待付款": case "待付款":
@ -323,6 +326,7 @@ function handleChangeOrderStatus() {
queryParams.value.orderStatus = 1; queryParams.value.orderStatus = 1;
break; break;
case "已完成": case "已完成":
queryParams.value.payStatus = 2;
queryParams.value.orderStatus = 4; queryParams.value.orderStatus = 4;
break; break;
case "已取消": case "已取消":

2
src/views/business/OrderManage/Orders/orderDetail.vue
View File

@ -38,7 +38,7 @@
<!-- 订单改价 --> <!-- 订单改价 -->
<div class="btn-box"> <div class="btn-box">
<el-button v-if="detail.payStatus == 1" @click="handleChangePrice(detail)">订单改价</el-button> <!-- <el-button v-if="detail.payStatus == 1" @click="handleChangePrice(detail)">订单改价</el-button> -->
<!-- 发货 --> <!-- 发货 -->
<el-button v-if="( <el-button v-if="(