开发新功能并调整界面布局：
- 添加订单转预订单功能 - 调整出库和入库订单表格布局 - 移除打印订单按钮 - 优化店订单列表界面 - 更新相关API调用
This commit is contained in:
parent
ea4397addb
commit
65409e19ed
|
|
@ -6,6 +6,6 @@ VITE_NOW_TYPE = 'dist'
|
|||
# VITE_APP_BASE_URL='http://192.168.1.10:8546'
|
||||
# VITE_APP_BASE_URL='https://test-multi-store.lihaink.cn'
|
||||
# VITE_APP_BASE_URL='https://multi-store.lihaink.cn'
|
||||
VITE_APP_BASE_URL='http://192.168.1.7:8545'
|
||||
VITE_APP_BASE_URL='http://192.168.1.22:8545'
|
||||
# VITE_APP_BASE_URL='https://ceshi-multi-store.lihaink.cn'
|
||||
|
||||
|
|
|
|||
|
|
@ -37,3 +37,10 @@ export function apiBeforehandOrderWarehousingLists(params: any) {
|
|||
export function apiBeforehandOrderOutboundLists(params: any) {
|
||||
return request.get({ url: '/beforehand_order/beforehandorder/outbound_lists', params })
|
||||
}
|
||||
// 订单转预订单
|
||||
export function apiPurchaseOrderTransferAdvanceOrder(params: any) {
|
||||
return request.post({
|
||||
url: '/beforehand_order/beforehandorder/orderTransferAdvanceOrder',
|
||||
params
|
||||
})
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,13 +12,13 @@
|
|||
/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="商品名称" prop="store_name" show-overflow-tooltip width="120" />
|
||||
<el-table-column label="单位" prop="unit_name" width="80" show-overflow-tooltip />
|
||||
<el-table-column label="商品名称" prop="store_name" show-overflow-tooltip />
|
||||
<el-table-column label="单位" prop="unit_name" show-overflow-tooltip />
|
||||
|
||||
<!-- <el-table-column label="采购人员" prop="buyer_name" show-overflow-tooltip width="100" /> -->
|
||||
<el-table-column label="出库数量" prop="nums" show-overflow-tooltip width="100" />
|
||||
<el-table-column label="采购价" prop="purchase" show-overflow-tooltip width="100" />
|
||||
<el-table-column label="总价" prop="total_price" show-overflow-tooltip width="100" />
|
||||
<el-table-column label="出库数量" prop="nums" show-overflow-tooltip />
|
||||
<el-table-column label="采购价" prop="purchase" show-overflow-tooltip />
|
||||
<el-table-column label="总价" prop="total_price" show-overflow-tooltip />
|
||||
</el-table>
|
||||
<div class="flex mt-4 justify-end">
|
||||
<pagination v-if="pager.lists" v-model="pager" @change="getLists" />
|
||||
|
|
|
|||
|
|
@ -2,12 +2,7 @@
|
|||
<div>
|
||||
<el-table :data="pager.lists" border style="width: 100%; margin-top: 10px">
|
||||
<el-table-column prop="id" label="ID" width="60" />
|
||||
<el-table-column
|
||||
label="供应商"
|
||||
prop="supplier_name"
|
||||
show-overflow-tooltip
|
||||
width="100"
|
||||
/>
|
||||
<el-table-column label="供应商" prop="supplier_name" show-overflow-tooltip />
|
||||
<el-table-column label="商品图片" prop="image" width="120">
|
||||
<template #default="{ row }">
|
||||
<el-image
|
||||
|
|
@ -17,13 +12,13 @@
|
|||
/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="商品名称" prop="store_name" show-overflow-tooltip width="120" />
|
||||
<el-table-column label="单位" prop="unit_name" width="80" show-overflow-tooltip />
|
||||
<el-table-column label="商品名称" prop="store_name" show-overflow-tooltip />
|
||||
<el-table-column label="单位" prop="unit_name" show-overflow-tooltip />
|
||||
|
||||
<!-- <el-table-column label="采购人员" prop="buyer_name" show-overflow-tooltip width="100" /> -->
|
||||
<el-table-column label="入库数量" prop="nums" show-overflow-tooltip width="100" />
|
||||
<el-table-column label="采购价" prop="purchase" show-overflow-tooltip width="100" />
|
||||
<el-table-column label="总价" prop="total_price" show-overflow-tooltip width="100" />
|
||||
<el-table-column label="入库数量" prop="nums" show-overflow-tooltip />
|
||||
<el-table-column label="采购价" prop="purchase" show-overflow-tooltip />
|
||||
<el-table-column label="总价" prop="total_price" show-overflow-tooltip />
|
||||
</el-table>
|
||||
<div class="flex mt-4 justify-end">
|
||||
<pagination v-if="pager.lists" v-model="pager" @change="getLists" />
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
<div style="color: gray">时间</div>
|
||||
<div style="color: black">{{ formData.create_time }}</div>
|
||||
</div>
|
||||
<el-button @click="xlsx(formData.id, 1)"> 打印订单 </el-button>
|
||||
<!-- <el-button @click="xlsx(formData.id, 1)"> 打印订单 </el-button> -->
|
||||
</div>
|
||||
<el-button type="primary" @click="dialogShop = true"> 追加 </el-button>
|
||||
|
||||
|
|
@ -86,6 +86,7 @@
|
|||
</div>
|
||||
<div v-else>
|
||||
<span v-if="row.is_buyer == 1">{{ row.status_name }}</span>
|
||||
<span v-if="row.is_buyer == -1">无需采购</span>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
|
|
|||
|
|
@ -122,13 +122,17 @@
|
|||
</el-radio-group>
|
||||
<div class="mt-4">
|
||||
<el-table :data="pager.lists" @selection-change="handleSelectionChange">
|
||||
<el-table-column type="selection" width="55" />
|
||||
<el-table-column label="订单ID" prop="id" show-overflow-tooltip />
|
||||
<el-table-column label="订单号" prop="order_id" show-overflow-tooltip />
|
||||
<el-table-column label="ID" prop="id" show-overflow-tooltip width="100" />
|
||||
<el-table-column
|
||||
label="订单号"
|
||||
prop="order_id"
|
||||
show-overflow-tooltip
|
||||
width="200"
|
||||
/>
|
||||
<el-table-column
|
||||
label="商品信息"
|
||||
prop="order_id"
|
||||
min-width="150"
|
||||
width="150"
|
||||
show-overflow-tooltip
|
||||
>
|
||||
<template #default="{ row }">
|
||||
|
|
@ -149,10 +153,25 @@
|
|||
<div v-if="row.product?.length > 3" style="text-align: left">...</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="门店" prop="store_name" show-overflow-tooltip />
|
||||
<el-table-column label="用户" prop="nickname" show-overflow-tooltip />
|
||||
<el-table-column label="实际支付金额" prop="pay_price" show-overflow-tooltip />
|
||||
<el-table-column label="订单状态" prop="status_name">
|
||||
<el-table-column
|
||||
label="门店"
|
||||
prop="store_name"
|
||||
show-overflow-tooltip
|
||||
width="150"
|
||||
/>
|
||||
<el-table-column
|
||||
label="用户"
|
||||
prop="nickname"
|
||||
show-overflow-tooltip
|
||||
width="150"
|
||||
/>
|
||||
<el-table-column
|
||||
label="实际支付金额"
|
||||
prop="pay_price"
|
||||
show-overflow-tooltip
|
||||
width="150"
|
||||
/>
|
||||
<el-table-column label="订单状态" prop="status_name" width="100">
|
||||
<template #default="{ row }">
|
||||
<div v-if="row.refund_status == 2">
|
||||
<el-tag type="danger">已退款</el-tag>
|
||||
|
|
@ -179,7 +198,12 @@
|
|||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="支付方式" prop="pay_type" show-overflow-tooltip>
|
||||
<el-table-column
|
||||
label="支付方式"
|
||||
prop="pay_type"
|
||||
show-overflow-tooltip
|
||||
width="100"
|
||||
>
|
||||
<template #default="{ row }">
|
||||
<dict-value
|
||||
:options="dictData.pay_type"
|
||||
|
|
@ -187,11 +211,21 @@
|
|||
></dict-value>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="订单类型" prop="source_name" show-overflow-tooltip />
|
||||
<el-table-column
|
||||
label="订单类型"
|
||||
prop="source_name"
|
||||
show-overflow-tooltip
|
||||
width="100"
|
||||
/>
|
||||
|
||||
<el-table-column label="支付时间" prop="pay_time" show-overflow-tooltip />
|
||||
<el-table-column label="配送人员" prop="delivery_name" show-overflow-tooltip />
|
||||
<el-table-column label="操作" width="120" fixed="right">
|
||||
<el-table-column
|
||||
label="支付时间"
|
||||
prop="pay_time"
|
||||
show-overflow-tooltip
|
||||
width="200"
|
||||
/>
|
||||
<!-- <el-table-column label="配送人员" prop="delivery_name" show-overflow-tooltip /> -->
|
||||
<el-table-column label="操作" fixed="right">
|
||||
<template #default="{ row }">
|
||||
<!-- <el-button v-perms="['store_order.store_order/edit']" type="primary" link
|
||||
@click="handleEdit(row)">
|
||||
|
|
@ -204,9 +238,12 @@
|
|||
<el-button type="primary" link @click="handleDetai(row)"
|
||||
>详情</el-button
|
||||
>
|
||||
<el-button type="primary" link @click="handleDelivery(row)"
|
||||
>设置配送人员</el-button
|
||||
<el-button type="primary" link @click="TransferAdvanceOrder(row)"
|
||||
>转预定单</el-button
|
||||
>
|
||||
<!-- <el-button type="primary" link @click="handleDelivery(row)"
|
||||
>设置配送人员</el-button
|
||||
> -->
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
|
@ -236,6 +273,7 @@
|
|||
import { usePaging } from '@/hooks/usePaging'
|
||||
import { useDictData } from '@/hooks/useDictOptions'
|
||||
import { apiStoreOrderLists, apiStoreOrderDelete } from '@/api/store_order'
|
||||
import { apiPurchaseOrderTransferAdvanceOrder } from '@/api/beforehand_order'
|
||||
import { timeFormat } from '@/utils/util'
|
||||
import { apiSystemStoreLists } from '@/api/system_store'
|
||||
import feedback from '@/utils/feedback'
|
||||
|
|
@ -428,6 +466,12 @@ const remoteMethodUser = (e = '') => {
|
|||
}, 300)
|
||||
})
|
||||
}
|
||||
/**
|
||||
* 订单转预购订单
|
||||
*/
|
||||
const TransferAdvanceOrder = (data: any) => {
|
||||
apiPurchaseOrderTransferAdvanceOrder(data)
|
||||
}
|
||||
onMounted(() => {
|
||||
getLists()
|
||||
})
|
||||
|
|
|
|||
Loading…
Reference in New Issue