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

!206 合并

Browse Source 
Merge pull request !206 from 赵世界/bugfix/2023-08-25
This commit is contained in:
赵世界 2023-09-08 07:45:24 +00:00 committed by Gitee
commit 8361a470af
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
12 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/Filters/BusinessOrderFilter.php
View File

@ -4,6 +4,7 @@ namespace App\Filters;
use App\Models\BusinessOrderItem; use App\Models\BusinessOrderItem;
use Carbon\Carbon; use Carbon\Carbon;
use Illuminate\Database\Eloquent\Builder;
class BusinessOrderFilter extends Filters class BusinessOrderFilter extends Filters
{ {
@ -22,6 +23,14 @@ class BusinessOrderFilter extends Filters
return $this->builder->where('supply_participate_no', trim($value)); return $this->builder->where('supply_participate_no', trim($value));
} }
protected function pno($value)
{
return $this->builder->where(function (Builder $builder) use ($value) {
$builder->where('participate_no', $value)
->orWhere('supply_participate_no', $value);
});
}
protected function shopId($value) protected function shopId($value)
{ {
return $this->builder->where('shop_id', $value); return $this->builder->where('shop_id', $value);

2
app/Http/Controllers/Shop/ShipController.php
View File

@ -18,7 +18,7 @@ class ShipController extends Controller
$shops = Shop::query() $shops = Shop::query()
->select(['id', 'name', 'plat_id']) ->select(['id', 'name', 'plat_id'])
->with('ship') ->with('ship')
->where('plat_id', 1) // ->where('plat_id', 1)
->get(); ->get();
$time = date('Y-m-d H:i:s'); $time = date('Y-m-d H:i:s');
foreach ($shops as $shop) { foreach ($shops as $shop) {

1
app/Models/BusinessOrder.php
View File

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

2
public/dist/css/713.67b23896.css → public/dist/css/959.8678125f.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-6626bfcd]{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-2a09710c]{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.17b8ae77.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.d9f9ae68.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>

1
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/713.c871bdb4.js → public/dist/js/959.2a3a868b.js vendored
View File

File diff suppressed because one or more lines are too long

1
public/dist/js/959.2a3a868b.js.map vendored Normal file
View File

File diff suppressed because one or more lines are too long

2
public/dist/js/app.17b8ae77.js vendored
View File

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

2
public/dist/js/app.17b8ae77.js.map → public/dist/js/app.d9f9ae68.js.map vendored
View File

File diff suppressed because one or more lines are too long

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

@ -74,6 +74,11 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="跟团号:">
<el-input v-model="form.pno" placeholder="跟团号">
</el-input>
</el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" @click="handleChoose">筛选</el-button> <el-button type="primary" @click="handleChoose">筛选</el-button>
<el-button plain @click="handleReChoose">重置筛选</el-button> <el-button plain @click="handleReChoose">重置筛选</el-button>
@ -157,6 +162,7 @@ export default {
external_sku_ids: [], external_sku_ids: [],
confirm_at: [], confirm_at: [],
ids: [], ids: [],
pno: '',
}, },
dialogVisible: false, dialogVisible: false,
loading: true, loading: true,
@ -284,6 +290,7 @@ export default {
external_sku_ids: [], external_sku_ids: [],
confirm_at: this.confirmAt, confirm_at: this.confirmAt,
ids: [], ids: [],
pno: ''
}; };
this.getPlatOrderList(); this.getPlatOrderList();
}, },