cf_cloud/erp
3
0
Fork 0
Code Pull Requests Packages Projects Releases Wiki Activity

!187 合并

Browse Source 
Merge pull request !187 from 赵世界/develop
This commit is contained in:
赵世界 2023-08-15 10:02:28 +00:00 committed by Gitee
commit 98f4fcd98b
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
11 changed files with 24 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Filters/BusinessOrderFilter.php
View File

@ -7,6 +7,11 @@ use Carbon\Carbon;
class BusinessOrderFilter extends Filters class BusinessOrderFilter extends Filters
{ {
protected function ids($value)
{
return $this->builder->whereIn('id', $value);
}
protected function participateNo($value) protected function participateNo($value)
{ {
return $this->builder->where('participate_no', trim($value)); return $this->builder->where('participate_no', trim($value));

1
app/Models/BusinessOrder.php
View File

@ -21,6 +21,7 @@ class BusinessOrder extends Model
'confirm_at_end', 'confirm_at_end',
'goods_sku_num', 'goods_sku_num',
'print_status', 'print_status',
'ids',
]; ];
protected $fillable = [ protected $fillable = [

2
public/dist/css/778.902f3aab.css → public/dist/css/713.67b23896.css vendored
View File

@ -1 +1 @@
#nprogress{pointer-events:none}#nprogress .bar{background:#29d;position:fixed;z-index:1031;top:0;left:0;width:100%;height:2px}#nprogress .peg{display:block;position:absolute;right:0;width:100px;height:100%;box-shadow:0 0 10px #29d,0 0 5px #29d;opacity:1;transform:rotate(3deg) translateY(-4px)}#nprogress .spinner{display:block;position:fixed;z-index:1031;top:15px;right:15px}#nprogress .spinner-icon{width:18px;height:18px;box-sizing:border-box;border:2px solid transparent;border-top-color:#29d;border-left-color:#29d;border-radius:50%;animation:nprogress-spinner .4s linear infinite}.nprogress-custom-parent{overflow:hidden;position:relative}.nprogress-custom-parent #nprogress .bar,.nprogress-custom-parent #nprogress .spinner{position:absolute}@keyframes nprogress-spinner{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}.block[data-v-17628ebd]{margin-top:20px} #nprogress{pointer-events:none}#nprogress .bar{background:#29d;position:fixed;z-index:1031;top:0;left:0;width:100%;height:2px}#nprogress .peg{display:block;position:absolute;right:0;width:100px;height:100%;box-shadow:0 0 10px #29d,0 0 5px #29d;opacity:1;transform:rotate(3deg) translateY(-4px)}#nprogress .spinner{display:block;position:fixed;z-index:1031;top:15px;right:15px}#nprogress .spinner-icon{width:18px;height:18px;box-sizing:border-box;border:2px solid transparent;border-top-color:#29d;border-left-color:#29d;border-radius:50%;animation:nprogress-spinner .4s linear infinite}.nprogress-custom-parent{overflow:hidden;position:relative}.nprogress-custom-parent #nprogress .bar,.nprogress-custom-parent #nprogress .spinner{position:absolute}@keyframes nprogress-spinner{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}.block[data-v-6626bfcd]{margin-top:20px}

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.9dd0c7db.js"></script><script defer="defer" src="js/app.0134aa7c.js"></script><link href="css/chunk-vendors.4e2d36cb.css" rel="stylesheet"><link href="css/app.487f8f5a.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.9dd0c7db.js"></script><script defer="defer" src="js/app.d75564d8.js"></script><link href="css/chunk-vendors.4e2d36cb.css" rel="stylesheet"><link href="css/app.487f8f5a.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>

4
public/dist/js/713.c871bdb4.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

2
public/dist/js/778.c1377dd3.js.map → public/dist/js/713.c871bdb4.js.map vendored
View File

File diff suppressed because one or more lines are too long

4
public/dist/js/778.c1377dd3.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/dist/js/app.0134aa7c.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/dist/js/app.d75564d8.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

2
public/dist/js/app.0134aa7c.js.map → public/dist/js/app.d75564d8.js.map vendored
View File

File diff suppressed because one or more lines are too long

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

@ -9,14 +9,6 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<!-- <el-form-item label="活动名称:">
<el-select v-model="form.activity_no" placeholder="活动名称">
<el-option v-for="item in groupActivity" :key="item.activity_no" :label="item.activity_title"
:value="item.activity_no">
</el-option>
</el-select>
</el-form-item> -->
<el-form-item label="发货状态:"> <el-form-item label="发货状态:">
<el-select v-model="form.shipping_status" placeholder="发货状态"> <el-select v-model="form.shipping_status" placeholder="发货状态">
<el-option value="" label="全部"></el-option> <el-option value="" label="全部"></el-option>
@ -50,13 +42,6 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<!-- <el-form-item label="帮卖团跟团号:">
<el-input v-model="form.participate_no" placeholder="帮卖团跟团号"></el-input>
</el-form-item>
<el-form-item label="自卖团跟团号:">
<el-input v-model="form.supply_participate_no" placeholder="自卖团跟团号"></el-input>
</el-form-item> -->
<el-form-item label="商品数量:"> <el-form-item label="商品数量:">
<el-select v-model="form.goods_sku_num" placeholder="商品数量"> <el-select v-model="form.goods_sku_num" placeholder="商品数量">
<el-option value="" label="全部"></el-option> <el-option value="" label="全部"></el-option>
@ -171,6 +156,7 @@ export default {
print_status: "0", print_status: "0",
external_sku_ids: [], external_sku_ids: [],
confirm_at: [], confirm_at: [],
ids: [],
}, },
dialogVisible: false, dialogVisible: false,
loading: true, loading: true,
@ -297,6 +283,7 @@ export default {
print_status: 0, print_status: 0,
external_sku_ids: [], external_sku_ids: [],
confirm_at: this.confirmAt, confirm_at: this.confirmAt,
ids: [],
}; };
this.getPlatOrderList(); this.getPlatOrderList();
}, },
@ -338,8 +325,12 @@ export default {
this.doPrint(); this.doPrint();
}) })
}, },
handleSelectionChange() { handleSelectionChange(val) {
let ids = [];
val.forEach((item) => {
ids.push(item.id);
})
this.form.ids = ids;
}, },
initWebSocket() { initWebSocket() {
//初始化weosocket //初始化weosocket