yjc/erp
1
0
Fork 0
mirror of https://gitee.com/hzchunfen/erp.git synced 2025-11-30 22:20:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

!283 yyw提交

Browse Source 
Merge pull request !283 from 杨耀威/yyw
This commit is contained in:
杨建炊 2025-03-08 03:06:10 +00:00 committed by Gitee
commit b5078ca327
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
9 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
public/dist/css/382.5c0a41ae.css → public/dist/css/906.5c0a41ae.css vendored
View File

2
public/dist/index.html vendored
View File

@ -1 +1 @@
<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon.ico"><title>erp</title><script defer="defer" src="js/chunk-vendors.04652b46.js"></script><script defer="defer" src="js/app.22d028f8.js"></script><link href="css/chunk-vendors.77489a8d.css" rel="stylesheet"><link href="css/app.7e37f273.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but erp doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon.ico"><title>erp</title><script defer="defer" src="js/chunk-vendors.04652b46.js"></script><script defer="defer" src="js/app.6d80696a.js"></script><link href="css/chunk-vendors.77489a8d.css" rel="stylesheet"><link href="css/app.7e37f273.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but erp doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>

2
public/dist/js/382.6d3d83e3.js vendored
View File

File diff suppressed because one or more lines are too long

1
public/dist/js/382.6d3d83e3.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
public/dist/js/906.8d4b79f3.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

1
public/dist/js/906.8d4b79f3.js.map vendored Normal file
View File

File diff suppressed because one or more lines are too long

4
public/dist/js/app.22d028f8.js → public/dist/js/app.6d80696a.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/dist/js/app.22d028f8.js.map → public/dist/js/app.6d80696a.js.map vendored
View File

File diff suppressed because one or more lines are too long

17
resources/frontend/src/views/plat/orderList.vue
View File

@ -19,7 +19,11 @@
</el-form-item>
<el-form-item label="订单ID:">
<el-input v-model="filter.id" placeholder="订单编号" @keyup.enter.native="handleChoose"></el-input>
<el-input v-model="filter.id" placeholder="订单ID" @keyup.enter.native="handleChoose"></el-input>
</el-form-item>
<el-form-item label="订单编号:">
<el-input v-model="filter.order_sn" placeholder="订单编号" @keyup.enter.native="handleChoose"></el-input>
</el-form-item>
<el-form-item label="订单类型:">
@ -99,7 +103,12 @@
<el-table v-loading="loading" ref="multipleTable" :data="orderList" style="width: 100%" border
@selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" :selectable="selectable" />
<el-table-column label="订单ID" prop="id" width="80" align="center" />
<el-table-column label="订单ID/订单编号" width="200">
<template slot-scope="scope">
{{ scope.row.id }}<br>
{{ scope.row.order_sn }}
</template>
</el-table-column>
<el-table-column label="店铺名称" prop="shop.name" />
<el-table-column label="跟团号" align="center">
<template slot-scope="scope">
@ -228,6 +237,7 @@ export default {
goods_sku_num: '',
external_sku_ids: '',
pno: '',
order_sn: '',
external_sku_id: ''
},
loading: false,
@ -317,7 +327,8 @@ export default {
after_sales_status: 0,
goods_sku_num: '',
external_sku_ids: '',
pno: ''
pno: '',
order_sn: ''
}
this.page = 1
this.getOrderList()