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

!249 代码合并

Browse Source 
Merge pull request !249 from 杨耀威/yyw
This commit is contained in:
杨建炊 2024-11-12 06:40:43 +00:00 committed by Gitee
commit d2fded39f2
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
9 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
public/dist/css/187.ec3dfe17.css vendored
View File

@ -1 +0,0 @@
.skuBox[data-v-4de310da]{border:1px solid #e5e5e5;border-radius:5px;padding:15px 0;margin-bottom:15px;background-color:#f3f3f3}.skuBox .tit[data-v-4de310da]{padding-left:40px;font-weight:600;font-size:15px;margin-bottom:15px}.skuBox[data-v-3dbf163e]{border:1px solid #e5e5e5;border-radius:5px;padding:15px 0;margin-bottom:15px;background-color:#f3f3f3}.skuBox .tit[data-v-3dbf163e]{padding-left:40px;font-weight:600;font-size:15px;margin-bottom:15px}.table[data-v-65c73abd]{margin-top:20px;position:relative}.btn[data-v-65c73abd]{float:right}.flex[data-v-65c73abd]{display:flex;align-items:center}.goodBox .Img[data-v-65c73abd]{width:50px;height:50px;margin-right:12px;border-radius:4px}.goodBox .tit[data-v-65c73abd]{color:#000;font-size:13px}.confirmbtn[data-v-65c73abd]{width:114px;height:44px;border-radius:3px;margin-top:21px;margin-bottom:8px}.import-right[data-v-65c73abd]{margin-top:30px}.import-right a[data-v-65c73abd]{color:#409eff}[data-v-65c73abd] .btn11{padding:0;width:14px;height:14px}[data-v-65c73abd] .btn11 img{width:100%;height:100%}.page[data-v-65c73abd]{margin-top:20px}.searchBox[data-v-65c73abd]{display:flex;align-items:center;flex-wrap:wrap;white-space:nowrap}.searchBox .row[data-v-65c73abd]{font-size:14px;margin-bottom:20px;margin-right:15px;display:flex;align-items:center}.titBox[data-v-65c73abd]{display:flex;align-items:center}.red[data-v-65c73abd]{color:red}

1
public/dist/css/683.df205b2b.css vendored Normal file
View File

@ -0,0 +1 @@
.skuBox[data-v-4de310da]{border:1px solid #e5e5e5;border-radius:5px;padding:15px 0;margin-bottom:15px;background-color:#f3f3f3}.skuBox .tit[data-v-4de310da]{padding-left:40px;font-weight:600;font-size:15px;margin-bottom:15px}.skuBox[data-v-3dbf163e]{border:1px solid #e5e5e5;border-radius:5px;padding:15px 0;margin-bottom:15px;background-color:#f3f3f3}.skuBox .tit[data-v-3dbf163e]{padding-left:40px;font-weight:600;font-size:15px;margin-bottom:15px}.table[data-v-5670c00d]{margin-top:20px;position:relative}.btn[data-v-5670c00d]{float:right}.flex[data-v-5670c00d]{display:flex;align-items:center}.goodBox .Img[data-v-5670c00d]{width:50px;height:50px;margin-right:12px;border-radius:4px}.goodBox .tit[data-v-5670c00d]{color:#000;font-size:13px}.confirmbtn[data-v-5670c00d]{width:114px;height:44px;border-radius:3px;margin-top:21px;margin-bottom:8px}.import-right[data-v-5670c00d]{margin-top:30px}.import-right a[data-v-5670c00d]{color:#409eff}[data-v-5670c00d] .btn11{padding:0;width:14px;height:14px}[data-v-5670c00d] .btn11 img{width:100%;height:100%}.page[data-v-5670c00d]{margin-top:20px}.searchBox[data-v-5670c00d]{display:flex;align-items:center;flex-wrap:wrap;white-space:nowrap}.searchBox .row[data-v-5670c00d]{font-size:14px;margin-bottom:20px;margin-right:15px;display:flex;align-items:center}.titBox[data-v-5670c00d]{display:flex;align-items:center}.red[data-v-5670c00d]{color:red}

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.0bc383b0.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.eb0ff1e5.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>

1
public/dist/js/187.b31ff5e6.js.map vendored
View File

File diff suppressed because one or more lines are too long

4
public/dist/js/187.b31ff5e6.js → public/dist/js/683.0997409c.js vendored
View File

File diff suppressed because one or more lines are too long

1
public/dist/js/683.0997409c.js.map vendored Normal file
View File

File diff suppressed because one or more lines are too long

4
public/dist/js/app.0bc383b0.js → public/dist/js/app.eb0ff1e5.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/dist/js/app.0bc383b0.js.map → public/dist/js/app.eb0ff1e5.js.map vendored
View File

File diff suppressed because one or more lines are too long

6
resources/frontend/src/views/goods/goods.vue
View File

@ -476,7 +476,9 @@
type_id: null, type_id: null,
brand_id: '', brand_id: '',
sku_title: '', sku_title: '',
status: '' status: '',
neq_stock: '',
neq_sale_stock: ''
} }
this.filterTime = [] this.filterTime = []
}, },
@ -551,6 +553,8 @@
exportType: 'goods_sku', exportType: 'goods_sku',
external_sku_id: this.form.external_sku_id, external_sku_id: this.form.external_sku_id,
goods_title: this.form.goods_title, goods_title: this.form.goods_title,
neq_stock: this.form.neq_stock,
neq_sale_stock: this.form.neq_sale_stock,
type_id: this.form.type_id || '', type_id: this.form.type_id || '',
status: this.form.status, status: this.form.status,
keyword_type: 'stock', keyword_type: 'stock',