Merge branch 'yyw' of gitee.com:hzchunfen/erp into fix-release-1.0.0/yjc-migrate

This commit is contained in:
杨建炊 2024-08-24 16:00:09 +08:00
commit 20ae896e0c
10 changed files with 17 additions and 17 deletions

View File

@ -1 +0,0 @@
.skuBox[data-v-36631d1e]{border:1px solid #e5e5e5;border-radius:5px;padding:15px 0;margin-bottom:15px;background-color:#f3f3f3}.skuBox .tit[data-v-36631d1e]{padding-left:40px;font-weight:600;font-size:15px;margin-bottom:15px}.el-upload--picture-card[data-v-36631d1e]{width:50px;height:50px}.el-form-item[data-v-36631d1e]{margin-left:40px}.avatar-uploader .el-upload[data-v-36631d1e]{border:1px dashed #d9d9d9;border-radius:6px;cursor:pointer;position:relative;overflow:hidden}.avatar-uploader .el-upload[data-v-36631d1e]:hover{border-color:#409eff}.avatar-uploader-icon[data-v-36631d1e]{font-size:28px;color:#8c939d;width:148px;height:148px;line-height:148px;text-align:center}.avatar[data-v-36631d1e]{width:148px;height:148px;display:block}

1
public/dist/css/810.0abac56a.css vendored Normal file
View File

@ -0,0 +1 @@
.skuBox[data-v-3cee7459]{border:1px solid #e5e5e5;border-radius:5px;padding:15px 0;margin-bottom:15px;background-color:#f3f3f3}.skuBox .tit[data-v-3cee7459]{padding-left:40px;font-weight:600;font-size:15px;margin-bottom:15px}.el-upload--picture-card[data-v-3cee7459]{width:50px;height:50px}.el-form-item[data-v-3cee7459]{margin-left:40px}.avatar-uploader .el-upload[data-v-3cee7459]{border:1px dashed #d9d9d9;border-radius:6px;cursor:pointer;position:relative;overflow:hidden}.avatar-uploader .el-upload[data-v-3cee7459]:hover{border-color:#409eff}.avatar-uploader-icon[data-v-3cee7459]{font-size:28px;color:#8c939d;width:148px;height:148px;line-height:148px;text-align:center}.avatar[data-v-3cee7459]{width:148px;height:148px;display:block}

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.06b588a5.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.f773b79c.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>

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

2
public/dist/js/810.4ec1659b.js vendored Normal file

File diff suppressed because one or more lines are too long

1
public/dist/js/810.4ec1659b.js.map vendored Normal file

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -53,7 +53,7 @@
<el-input placeholder="规格名称" v-model="item.title"></el-input> <el-input placeholder="规格名称" v-model="item.title"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="商品状态:"> <el-form-item label="商品状态:">
<el-select v-model="item.reserve" placeholder="下架(默认)"> <el-select v-model="item.status" placeholder="下架(默认)">
<el-option v-for="it in options" :key="it.id" :label="it.label" :value="it.id"> <el-option v-for="it in options" :key="it.id" :label="it.label" :value="it.id">
</el-option> </el-option>
</el-select> </el-select>
@ -121,8 +121,8 @@
}, },
// //
options: [ options: [
{ id: "0", label: "下架" }, { id: 0, label: "下架" },
{ id: "1", label: "在售" } { id: 1, label: "在售" }
], ],
file: [], file: [],
disabled: false disabled: false
@ -221,13 +221,13 @@
// //
handleAdd() { handleAdd() {
let sku = { let sku = {
title: "", title: '',
external_sku_id: "", external_sku_id: '',
status: "0", status: 0,
num: "0", num: 0,
cost: "0", cost: 0,
sale_stock: 9999, sale_stock: 9999,
reserve: "0", reserve: 0
}; };
this.skus.push(sku); this.skus.push(sku);
}, },