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

!248 代码合并

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

1
public/dist/css/187.ec3dfe17.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-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/282.feb6bf21.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-3e0ef0c7]{margin-top:20px;position:relative}.btn[data-v-3e0ef0c7]{float:right}.flex[data-v-3e0ef0c7]{display:flex;align-items:center}.goodBox .Img[data-v-3e0ef0c7]{width:50px;height:50px;margin-right:12px;border-radius:4px}.goodBox .tit[data-v-3e0ef0c7]{color:#000;font-size:13px}.confirmbtn[data-v-3e0ef0c7]{width:114px;height:44px;border-radius:3px;margin-top:21px;margin-bottom:8px}.import-right[data-v-3e0ef0c7]{margin-top:30px}.import-right a[data-v-3e0ef0c7]{color:#409eff}[data-v-3e0ef0c7] .btn11{padding:0;width:14px;height:14px}[data-v-3e0ef0c7] .btn11 img{width:100%;height:100%}.page[data-v-3e0ef0c7]{margin-top:20px}.searchBox[data-v-3e0ef0c7]{display:flex;align-items:center;flex-wrap:wrap;white-space:nowrap}.searchBox .row[data-v-3e0ef0c7]{font-size:14px;margin-bottom:20px;margin-right:15px;display:flex;align-items:center}.titBox[data-v-3e0ef0c7]{display:flex;align-items:center}.red[data-v-3e0ef0c7]{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.a4f4a4ff.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.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>

2
public/dist/js/187.b31ff5e6.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

2
public/dist/js/282.98d58958.js vendored
View File

File diff suppressed because one or more lines are too long

1
public/dist/js/282.98d58958.js.map vendored
View File

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

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

@ -46,6 +46,14 @@
@change="handleChoose()"> @change="handleChoose()">
</el-date-picker> </el-date-picker>
</div> </div>
<div class="row">
<span>剩余库存≠：</span>
<el-input v-model="form.neq_stock" @keyup.enter.native="handleChoose" placeholder="剩余库存" clearable></el-input>
</div>
<div class="row">
<span>在售库存≠：</span>
<el-input v-model="form.neq_sale_stock" @keyup.enter.native="handleChoose" placeholder="在售库存" clearable></el-input>
</div>
<div class="row"> <div class="row">
<el-button type="primary" @click="handleChoose()" icon="el-icon-search">筛选</el-button> <el-button type="primary" @click="handleChoose()" icon="el-icon-search">筛选</el-button>
<el-button plain @click="handleReChoose" icon="el-icon-refresh">重置筛选</el-button> <el-button plain @click="handleReChoose" icon="el-icon-refresh">重置筛选</el-button>
@ -59,6 +67,7 @@
<div> <div>
<span>全部商品(共{{ total }}条)</span> <span>全部商品(共{{ total }}条)</span>
<div class="btn"> <div class="btn">
<el-button @click="resetOrderCount" icon="el-icon-refresh">订单重置</el-button>
<el-button type="primary" @click="petchEditStock" icon="el-icon-edit" :disabled="!chooseList.length">批量更新在售库存</el-button> <el-button type="primary" @click="petchEditStock" icon="el-icon-edit" :disabled="!chooseList.length">批量更新在售库存</el-button>
<el-button type="primary" v-if="is_admin" @click="addNewgoods" icon="el-icon-plus">新增商品</el-button> <el-button type="primary" v-if="is_admin" @click="addNewgoods" icon="el-icon-plus">新增商品</el-button>
<el-button type="primary" plain v-if="is_admin" @click="handleImport" icon="el-icon-upload2">在售库存导入</el-button> <el-button type="primary" plain v-if="is_admin" @click="handleImport" icon="el-icon-upload2">在售库存导入</el-button>
@ -290,8 +299,8 @@
<script> <script>
import axios from 'axios' import axios from 'axios'
import { goods_types, Brand_goods_types } from '@/api/rankingData.js' import { goods_types } from '@/api/rankingData.js'
import { goods, update, singleUpdate, getStockNum, updateSaleStock, goodsSkuExport } from '@/api/goods' import { goods, update, singleUpdate, getStockNum, updateSaleStock } from '@/api/goods'
import { orderRest } from "@/api/shop" import { orderRest } from "@/api/shop"
import Treeselect from '@riophae/vue-treeselect' import Treeselect from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css' import '@riophae/vue-treeselect/dist/vue-treeselect.css'
@ -333,6 +342,8 @@
], ],
form: { form: {
external_sku_id: '', external_sku_id: '',
neq_stock: '',
neq_sale_stock: '',
goods_title: '', // 商品名称 goods_title: '', // 商品名称
type_id: null, // 商品种类id type_id: null, // 商品种类id
brand_id: '', // 商品品牌id brand_id: '', // 商品品牌id
@ -490,13 +501,14 @@
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
orderRest().then((res) => { orderRest().then((res) => {
console.log(res)
this.$message({ this.$message({
type: 'success', type: 'success',
message: res.data.message message: res.data.message
}) })
this.getList() this.getList()
}) })
}).catch(() => {
}) })
}, },
// 点击上新 // 点击上新