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:
lwh 2023-09-22 22:08:43 +08:00
parent e31d2fe762
commit 7c7cbf6d75
2 changed files with 123 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/views/business/GoodsManager/Goodss/index.vue
View File

@ -103,8 +103,13 @@
</template>
</el-table-column>
<el-table-column prop="goodsName" label="商品名称" width="450" align="center" :show-overflow-tooltip="true" />
<el-table-column prop="goodsPriceLowest" label="价格" align="center" />
<el-table-column prop="goodsSalesActual" label="销量" align="center" >
<el-table-column prop="goodsPriceLowest" label="价格" align="center">
<template #default="scope">
￥{{ scope.row.goodsPriceLowest }}
</template>
</el-table-column>
<el-table-column prop="goodsSalesActual" label="销量" align="center">
<template #default="scope">
{{ scope.row.goodsSalesInitial + scope.row.goodsSalesActual }}
</template>

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

@ -16,10 +16,10 @@
<el-input v-model="queryParams.orderNumber" placeholder="请输入订单号" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="收货人姓名" prop="name">
<el-input v-model="queryParams.name" placeholder="请输入收货人姓名" clearable @keyup.enter="handleQuery" />
<el-input v-model="queryParams.customerNickNme" placeholder="请输入收货人姓名" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="收货人手机号" prop="phone">
<el-input v-model="queryParams.phone" placeholder="请输入收货人手机号" clearable @keyup.enter="handleQuery" />
<el-input v-model="queryParams.customerPhome" placeholder="请输入收货人手机号" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="物流单号" prop="logisticsTrackingNumber">
<el-input v-model="queryParams.logisticsTrackingNumber" placeholder="请输入物流单号" clearable
@ -31,15 +31,24 @@
:value="item.dictValue"></el-option>
</el-select>
</el-form-item>
<el-form-item label="配送方式" prop="deliveryType">
<el-form-item label="订单状态" prop="orderStatusName">
<el-radio-group v-model="queryParams.orderStatusName" @change="handleChangeOrderStatus()">
<el-radio-button label="待发货" />
<el-radio-button label="待收货" />
<el-radio-button label="待付款" />
<el-radio-button label="已完成" />
<el-radio-button label="已取消" />
</el-radio-group>
</el-form-item>
<!-- <el-form-item label="配送方式" prop="deliveryType">
<el-select v-model="queryParams.deliveryType" placeholder="请选择配送方式" clearable @change="handleQuery">
<el-option v-for="item in delivery_type " :key="item.dictValue" :label="item.dictLabel"
:value="item.dictValue"></el-option>
</el-select>
</el-form-item>
</el-form-item> -->
<el-form-item label="下单时间">
<el-date-picker v-model="dateRange" style="width: 240px" type="daterange" range-separator="-"
start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
start-placeholder="开始日期" end-placeholder="结束日期" :default-time="defaultTime2" @change="handleQuery"></el-date-picker>
</el-form-item>
<el-form-item>
@ -165,6 +174,19 @@
<!-- <el-button type="primary" size="small" icon="edit" @click="handleUpdate(scope.row)"
v-hasPermi="['business:order:addOrUpdate']">编辑</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 == 2
&& scope.row.deliveryType == 1
&& scope.row.deliveryStatus == 1
&& scope.row.orderStatus != 2
&& scope.row.orderStatus != 3
)" type="primary" size="small" @click="handleDeliver(scope.row)">发 货</el-button>
<!-- 审核取消订单 -->
<el-button type="primary" size="small" v-if="scope.row.orderStatus == 3"
@click="handleCancelOrder(scope.row)">审核取消订单</el-button>
<el-button type="danger" size="small" icon="delete" @click="handleDelete(scope.row)"
v-hasPermi="['business:order:delete']">删除</el-button>
</template>
@ -181,6 +203,15 @@
<EditDialog v-model="EditDialogVisible" :data="EditDialogRow" :done="() => resetQuery()"></EditDialog>
<!-- 详情 -->
<DetailDialog v-model="DetailDialogVisible" :data="DetailDialogRow" :done="() => resetQuery()"></DetailDialog>
<!-- 发货 -->
<DeliverDialog v-model="DeliverDialogVisible" :data="DeliverDialogRow" :done="() => resetQuery()"></DeliverDialog>
<!-- 订单改价 -->
<ChangePriceDialog v-model="ChangePriceDialogVisible" :data="ChangePriceDialogRow" :done="() => resetQuery()">
</ChangePriceDialog>
<!-- 审核取消订单 -->
<CancelOrderDialog v-model="CancelOrderDialogVisible" :data="CancelOrderDialogRow" :done="() => resetQuery()">
</CancelOrderDialog>
</template>
<script setup name="order">
import { ElMessageBox } from 'element-plus'
@ -189,6 +220,9 @@ import { exportOrder, orderList, delOrder } from '@/api/business/OrderManage/Ord
import AddDialog from "./components/AddDialog.vue";
import EditDialog from "./components/EditDialog.vue";
import DetailDialog from "./components/DetailDialog.vue";
import DeliverDialog from "./components/DeliverDialog.vue";
import ChangePriceDialog from "./components/ChangePriceDialog.vue";
import CancelOrderDialog from "./components/CancelOrderDialog.vue";
import useClipboard from 'vue-clipboard3'
const AddDialogVisible = ref(false);
@ -197,6 +231,13 @@ const EditDialogRow = ref({});
const DetailDialogVisible = ref(false);
const DetailDialogRow = ref({});
const DeliverDialogVisible = ref(false);
const DeliverDialogRow = ref({});
const ChangePriceDialogVisible = ref(false);
const ChangePriceDialogRow = ref({});
const CancelOrderDialogVisible = ref(false);
const CancelOrderDialogRow = ref({});
const { proxy } = getCurrentInstance()
// 选中categoryId数组数组
@ -229,7 +270,10 @@ const { queryParams } = toRefs(data)
// 业务参数
const dateRange = ref([])
const defaultTime2 = [
new Date(2000, 1, 1, 0, 0, 0),
new Date(2000, 2, 1, 23, 59, 59),
] // '12:00:00', '08:00:00'
// 业务方法
const copyText = async (val) => {
@ -242,6 +286,67 @@ const copyText = async (val) => {
}
}
// 订单改价
function handleChangePrice(row) {
ChangePriceDialogVisible.value = true
ChangePriceDialogRow.value = row
}
// 发货
function handleDeliver(row) {
DeliverDialogVisible.value = true
DeliverDialogRow.value = row
}
// 审核修改订单
function handleCancelOrder(row) {
CancelOrderDialogVisible.value = true
CancelOrderDialogRow.value = row
}
// 处理订单状态搜索
function handleChangeOrderStatus() {
resetStatusQuery()
let statusName = queryParams.value.orderStatusName;
switch (statusName) {
case "待发货":
queryParams.value.deliveryStatus = 1;
queryParams.value.orderStatus = 1;
break;
case "待收货":
queryParams.value.receiptStatus = 1;
queryParams.value.orderStatus = 1;
break;
case "待付款":
queryParams.value.payStatus = 1;
queryParams.value.orderStatus = 1;
break;
case "已完成":
queryParams.value.orderStatus = 4;
break;
case "已取消":
queryParams.value.orderStatus = 2;
break;
default:
break;
}
if(statusName){
handleQuery()
}
}
function resetStatusQuery(){
queryParams.value.deliveryStatus = null;
queryParams.value.receiptStatus = null;
queryParams.value.payStatus = null;
queryParams.value.orderStatus = null;
}
// 字典获取
const pay_type = ref([]);
async function getpay_type() {
@ -298,7 +403,7 @@ getorder_status()
// 查询数据
function getList() {
loading.value = true
console.log(dateRange?.value[1])
orderList(proxy.addDateRange(queryParams.value, dateRange.value)).then((res) => {
if (res.code == 200) {
loading.value = false;
@ -318,6 +423,7 @@ function handleSelectionChange(selection) {
/** 重置查询操作 */
function resetQuery() {
resetStatusQuery()
dateRange.value = []
proxy.resetForm('queryForm')
handleQuery()
@ -422,15 +528,15 @@ handleQuery()
margin-bottom: 2px;
}
.price-box{
.price-box {
width: 60px;
}
.order-num-box{
.order-num-box {
display: flex;
position: relative;
.copy{
.copy {
position: absolute;
right: 0%;
}