dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

10.28

Browse Source
This commit is contained in:
cun-nan 2024-10-28 18:33:45 +08:00
parent 1d27ad0873
commit 5179ad290f
6 changed files with 791 additions and 799 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

306
fuintAdmin/src/views/convenienceStore/goodsFile.vue
View File

@ -59,21 +59,23 @@
type="primary" type="primary"
@click="batchGrounding('qy')" @click="batchGrounding('qy')"
v-hasPermi="['convenienceStore:goodsFile:up']" v-hasPermi="['convenienceStore:goodsFile:up']"
>商品上架</el-button> >商品上架
</el-button>
<el-button <el-button
type="primary" type="primary"
@click="batchGrounding('jy')" @click="batchGrounding('jy')"
v-hasPermi="['convenienceStore:goodsFile:down']" v-hasPermi="['convenienceStore:goodsFile:down']"
>商品下架</el-button> >商品下架
<el-button type="primary" >新增商品</el-button> </el-button>
<el-button type="primary" @click="handleAdd">新增商品</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div> <div>
<div style="font-size: 12px;color: red;margin: 5px 0">注：库存为0或未设置零售价和会员价的商品不可上架</div> <div style="font-size: 12px;color: red;margin: 5px 0">注：库存为0或未设置零售价和会员价的商品不可上架</div>
</div> </div>
<div style="height: 68vh;overflow: auto">
<el-table ref="tables" v-loading="loading" :data="list" <el-table ref="tables" v-loading="loading" :data="list"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
border border
@ -87,7 +89,7 @@
</el-table-column> </el-table-column>
<el-table-column label="商品名称" prop="name" align="center"/> <el-table-column label="商品名称" prop="name" align="center"/>
<el-table-column label="供应商" prop="supplierName" align="center"/> <el-table-column label="供应商" prop="supplierName" align="center"/>
<el-table-column label="条形码" prop="goodsNo" align="center" width="160"/> <el-table-column label="条形码" prop="goodsNo" align="center" width="140"/>
<el-table-column label="拼音码" prop="pinyinCode" align="center"/> <el-table-column label="拼音码" prop="pinyinCode" align="center"/>
<el-table-column label="货架号" prop="shelfNumber" align="center"/> <el-table-column label="货架号" prop="shelfNumber" align="center"/>
<el-table-column label="库存" prop="stock" align="center"/> <el-table-column label="库存" prop="stock" align="center"/>
@ -99,31 +101,35 @@
<el-table-column label="排序" prop="sort" align="center"/> <el-table-column label="排序" prop="sort" align="center"/>
<el-table-column label="状态" align="center" prop="status"> <el-table-column label="状态" align="center" prop="status">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="scope.row.status=='qy'">上架</el-tag> <div style="color: #0DC291" v-if="scope.row.status=='qy'">已上架</div>
<el-tag type="info" v-if="scope.row.status=='jy'">下架</el-tag> <div style="color: #F44522" v-if="scope.row.status=='jy'">已下架</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作人" prop="sort" align="center"/> <el-table-column label="操作人" prop="realName" align="center"/>
<el-table-column label="操作时间" align="center" width="160" prop="updateTime"> <el-table-column label="操作时间" align="center" width="154" prop="updateTime">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.updateTime) }}</span> <span>
{{ scope.row.updateTime ? parseTime(scope.row.updateTime) : parseTime(scope.row.createTime) }}
</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" width="190" fixed='right'> <el-table-column label="操作" align="center" width="130" fixed='right'>
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['convenienceStore:goodsFile:weih']" v-hasPermi="['convenienceStore:goodsFile:weih']"
>商品维护</el-button> >商品维护
</el-button>
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
v-hasPermi="['convenienceStore:goodsFile:del']" v-hasPermi="['convenienceStore:goodsFile:del']"
>删除</el-button> >删除
</el-button>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" v-if="activeName=='recovery'" align="center" width="200" fixed='right'> <el-table-column label="操作" v-if="activeName=='recovery'" align="center" width="200" fixed='right'>
@ -134,19 +140,20 @@
icon="el-icon-shopping-cart-full" icon="el-icon-shopping-cart-full"
@click="isRecoveryBin(scope.row,0)" @click="isRecoveryBin(scope.row,0)"
v-hasPermi="['convenienceStore:goodsFile:move']" v-hasPermi="['convenienceStore:goodsFile:move']"
>移出至商品档案
>移出至商品档案</el-button> </el-button>
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-delete" icon="el-icon-delete"
@click="isRecoveryBin(scope.row,1)" @click="isRecoveryBin(scope.row,1)"
v-hasPermi="['convenienceStore:goodsFile:movedel']" v-hasPermi="['convenienceStore:goodsFile:movedel']"
>移至回收站</el-button> >移至回收站
</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</div>
<pagination <pagination
v-show="total>0" v-show="total>0"
:total="total" :total="total"
@ -158,111 +165,78 @@
<!-- 添加或修改对话框 --> <!-- 添加或修改对话框 -->
<el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" append-to-body> <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="90px"> <el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-row> <div style="display: flex;justify-content: space-between">
<el-col :span="24"> <div style="width: 50%">
<el-form-item label="商品条码" prop="goodsNo">
<el-input v-model="form.goodsNo"
@keydown.enter.native="getGoods(form)"
:disabled="title == '商品维护'"
v-focus
clearable
placeholder="商品的条码信息">
<!-- <el-button slot="append" @click="getGoods(form)">查询</el-button>-->
</el-input>
<!-- <div style="text-align: right;color: grey;font-size: 12px">-->
<!-- 商品无条码？您可以<span style="color: #00afff" @click="createGoodNo">生成条码</span>-->
<!-- </div>-->
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="商品名称" prop="name"> <el-form-item label="商品名称" prop="name">
<el-input v-model="form.name" @input="pinyin" placeholder="请输入商品名称"/> <el-input v-model="form.name" @input="pinyin" placeholder="请输入商品名称"/>
</el-form-item> </el-form-item>
</el-col> <el-form-item label="品类名称" prop="cvsGoodId">
<el-col :span="12">
<el-form-item label="所属分类" prop="cvsGoodId">
<el-select <el-select
v-model="form.cvsGoodId" v-model="form.cvsGoodId"
placeholder="全部" placeholder="请选择品类名称"
clearable clearable
style="width: 300px" style="width: 100%"
> >
<el-option v-for="item in cvsGoodList" :key="item.id" :label="item.name" :value="item.id"/> <el-option v-for="item in cvsGoodList" :key="item.id" :label="item.name" :value="item.id"/>
</el-select> </el-select>
<!-- <el-cascader v-model="cvsGoodId"-->
<!-- :options="cvsGoodOptions"-->
<!-- :props="{ checkStrictly: true }"-->
<!-- clearable></el-cascader>-->
</el-form-item> </el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="进货单价" prop="buyingPrice">
<el-input disabled v-model="form.buyingPrice" maxlength="10" oninput="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')">
<template slot="append">元</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="零售价" prop="retailPrice">
<el-input v-model="form.retailPrice" maxlength="10" @input="getPrice" oninput="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')">
<template slot="append">元</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="会员价" prop="memberPrice">
<el-input v-model="form.memberPrice" maxlength="10" oninput="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')">
<template slot="append">元</template>
</el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="拼音码" prop="pinyinCode"> <el-form-item label="拼音码" prop="pinyinCode">
<el-input v-model="form.pinyinCode" disabled placeholder="输入商品名称自动回填"/> <el-input v-model="form.pinyinCode" disabled placeholder="输入商品名称自动回填"/>
</el-form-item> </el-form-item>
</el-col> <el-form-item label="商品规格" prop="goodsSpecs">
<el-col :span="8"> <el-input v-model="form.goodsSpecs" placeholder="输入商品规格，如：500ml，50g"/>
</el-form-item>
<el-form-item label="单位" prop="unit"> <el-form-item label="单位" prop="unit">
<el-input v-model="form.unit" placeholder="如：个、瓶、包"/> <el-input v-model="form.unit" placeholder="如：个、瓶、包"/>
</el-form-item> </el-form-item>
</el-col> <el-form-item label="初始库存" prop="stock" v-if="form.id">
<el-col :span="8"> <el-input v-model="form.stock" oninput="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')"
maxlength="10" :disabled="true" placeholder="0"/>
</el-form-item>
<el-form-item label="排序" prop="sort">
<el-input-number v-model="form.sort" :min="0" label="0" style="width: 100%"></el-input-number>
</el-form-item>
<el-form-item label="状态" prop="status" v-if="form.id">
<el-radio-group v-model="form.status">
<!-- <el-radio v-for="dict in dict.type.zhzt" :label="dict.value">{{ dict.label }}</el-radio>-->
<el-radio label="qy" value="qy">上架</el-radio>
<el-radio label="jy" value="jy">下架</el-radio>
</el-radio-group>
</el-form-item>
</div>
<div style="width: 50%">
<el-form-item label="商品条形码" prop="goodsNo">
<el-input v-model="form.goodsNo"
@keydown.enter.native="getGoods(form)"
:disabled="form.id"
v-focus
clearable
placeholder="请用扫描枪扫码或输入条形码或自动生成条形码">
<el-button :disabled="form.id" slot="append" @click="createGoodNo" icon="el-icon-refresh"></el-button>
</el-input>
</el-form-item>
<el-form-item label="成本价" prop="buyingPrice" v-if="form.id">
<el-input disabled v-model="form.buyingPrice" maxlength="10"
oninput="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')">
<template slot="append">元</template>
</el-input>
</el-form-item>
<el-form-item label="零售价" prop="retailPrice" v-if="form.id">
<el-input v-model="form.retailPrice" maxlength="10" @input="getPrice"
oninput="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')">
<template slot="append">元</template>
</el-input>
</el-form-item>
<el-form-item label="会员价" prop="memberPrice" v-if="form.id">
<el-input v-model="form.memberPrice" maxlength="10"
oninput="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')">
<template slot="append">元</template>
</el-input>
</el-form-item>
<el-form-item label="货架号" prop="shelfNumber"> <el-form-item label="货架号" prop="shelfNumber">
<el-input v-model="form.shelfNumber" placeholder="如：1-2-2"/> <el-input v-model="form.shelfNumber" placeholder="请输入货架号，如：1-2-2"/>
</el-form-item> </el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="是否使用积分抵扣" prop="canUsePoint" label-width="110">
<el-radio-group v-model="form.canUsePoint">
<el-radio v-for="dict in dict.type.yes_or_no" :label="dict.value">{{ dict.label }}</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="是否使用兑换券兑换" prop="canUsePoint" label-width="110">
<el-radio-group v-model="form.canUseExchange">
<el-radio label="0">是</el-radio>
<el-radio label="1">否</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="初始库存" prop="stock">
<el-input v-model="form.stock" oninput="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" maxlength="10" :disabled="true" placeholder="0"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="供应商" prop="supplierId"> <el-form-item label="供应商" prop="supplierId">
<el-select <el-select
v-model="form.supplierId" v-model="form.supplierId"
@ -270,55 +244,38 @@
placeholder="请选择供应商" placeholder="请选择供应商"
@visible-change="changeSupplier" @visible-change="changeSupplier"
clearable clearable
style="width: 94%"> style="width: 100%">
<el-option v-for="item in supplierList" :key="item.id" :label="item.name" :value="item.id"/> <el-option v-for="item in supplierList" :key="item.id" :label="item.name" :value="item.id"/>
</el-select> </el-select>
<!-- <el-autocomplete-->
<!-- popper-class="my-autocomplete"-->
<!-- style="width: 94%"-->
<!-- v-model="supplier"-->
<!-- :fetch-suggestions="querySearch"-->
<!-- placeholder="供应商名称，如果是未添加的供应商，输完名称点回车即可自动添加"-->
<!-- @change="addSupplier"-->
<!-- @select="selectSupplier">-->
<!-- <template slot-scope="{ item }">-->
<!-- <div style="display: flex;justify-content: space-between">-->
<!-- <span class="name">{{ item.name }}</span>-->
<!--&lt;!&ndash; <span class="addr">{{ item.memberPrice }}</span>&ndash;&gt;-->
<!-- </div>-->
<!-- </template>-->
<!-- </el-autocomplete>-->
</el-form-item> </el-form-item>
</el-col> <el-form-item label="商品简介" prop="description">
</el-row> <el-input v-model="form.description" placeholder="请输入商品简介" type="textarea"/>
<el-row>
<el-col :span="12">
<el-form-item label="排序" prop="sort">
<el-input-number v-model="form.sort" :min="0" label="0"></el-input-number>
</el-form-item> </el-form-item>
</el-col> </div>
<el-col :span="12"> </div>
<el-form-item label="状态" prop="status"> <!-- <el-row>-->
<el-radio-group v-model="form.status" :disabled="form.stock==0"> <!-- <el-col :span="8">-->
<!-- <el-radio v-for="dict in dict.type.zhzt" :label="dict.value">{{ dict.label }}</el-radio>--> <!-- <el-form-item label="是否使用积分抵扣" prop="canUsePoint" label-width="110">-->
<el-radio label="qy" value="qy">上架</el-radio> <!-- <el-radio-group v-model="form.canUsePoint">-->
<el-radio label="jy" value="jy">下架</el-radio> <!-- <el-radio v-for="dict in dict.type.yes_or_no" :label="dict.value">{{ dict.label }}</el-radio>-->
</el-radio-group> <!-- </el-radio-group>-->
</el-form-item> <!-- </el-form-item>-->
</el-col> <!-- </el-col>-->
</el-row> <!-- <el-col :span="8">-->
<!-- <el-form-item label="是否使用兑换券兑换" prop="canUsePoint" label-width="110">-->
<!-- <el-radio-group v-model="form.canUseExchange">-->
<!-- <el-radio label="0">是</el-radio>-->
<!-- <el-radio label="1">否</el-radio>-->
<!-- </el-radio-group>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="8">-->
<!-- </el-col>-->
<!-- </el-row>-->
</el-form> </el-form>
<!-- <el-alert--> <div class="dialog-footer" style="text-align: center">
<!-- type="error"-->
<!-- style="margin-top: 15px"-->
<!-- :closable="false">-->
<!-- <p v-for="(item,index) in stockType" :id="index">-->
<!-- {{item}}-->
<!-- </p>-->
<!-- </el-alert>-->
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">保 存</el-button>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
@ -392,8 +349,22 @@ export default {
}, },
// 表单参数 // 表单参数
form: { form: {
id:'',goodsNo:'',name:'',cvsGoodId:"",buyingPrice:'',retailPrice:"",memberPrice:'',pinyinCode:"", id: '',
unit:'',shelfNumber:'',canUsePoint:'no',canUseExchange:'1',stock:0,supplierId:'',sort:0,status:'qy' goodsNo: '',
name: '',
cvsGoodId: "",
buyingPrice: '',
retailPrice: "",
memberPrice: '',
pinyinCode: "",
unit: '',
shelfNumber: '',
canUsePoint: 'no',
canUseExchange: '1',
stock: 0,
supplierId: '',
sort: 0,
status: 'qy'
}, },
// 显示搜索条件 // 显示搜索条件
showSearch: true, showSearch: true,
@ -412,6 +383,9 @@ export default {
buyingPrice: [ buyingPrice: [
{required: true, message: "请输入商品进货单价", trigger: "blur"}, {required: true, message: "请输入商品进货单价", trigger: "blur"},
], ],
goodsSpecs: [
{required: true, message: "请输入商品规格", trigger: "blur"},
],
retailPrice: [ retailPrice: [
{required: true, message: "请输入商品零售价", trigger: "blur"}, {required: true, message: "请输入商品零售价", trigger: "blur"},
], ],
@ -443,8 +417,7 @@ export default {
this.getType(); this.getType();
this.getTree(); this.getTree();
}, },
computed:{ computed: {},
},
methods: { methods: {
// 修改供应商 // 修改供应商
changeSupplier(val) { changeSupplier(val) {
@ -621,8 +594,22 @@ export default {
reset() { reset() {
this.resetForm("form"); this.resetForm("form");
this.form = { this.form = {
id:'',goodsNo:'',name:'',cvsGoodId:"",buyingPrice:'',retailPrice:"",memberPrice:'',pinyinCode:"", id: '',
unit:'',shelfNumber:'',canUsePoint:'no',canUseExchange:'1',stock:0,supplierId:'',sort:0,status:'qy' goodsNo: '',
name: '',
cvsGoodId: "",
buyingPrice: '',
retailPrice: "",
memberPrice: '',
pinyinCode: "",
unit: '',
shelfNumber: '',
canUsePoint: 'no',
canUseExchange: '1',
stock: 0,
supplierId: '',
sort: 0,
status: 'qy'
} }
}, },
// 是否移至回收站 // 是否移至回收站
@ -645,7 +632,8 @@ export default {
}).then(() => { }).then(() => {
this.getList(); this.getList();
this.$modal.msgSuccess(prompt); this.$modal.msgSuccess(prompt);
}).catch(() => {}); }).catch(() => {
});
}, },
// 新增按钮操作 // 新增按钮操作
@ -694,13 +682,14 @@ export default {
// 删除按钮操作 // 删除按钮操作
handleDelete(row) { handleDelete(row) {
const name = row.name const name = row.name
this.$modal.confirm('确定删除"' + name + '"的商品信息？').then(function() { this.$modal.confirm('是否删除本条数据，删除后无法恢复！').then(function () {
return delLJGoods(row.id); return delLJGoods(row.id);
}).then(() => { }).then(() => {
this.queryParams.page = 1 this.queryParams.page = 1
this.getList(); this.getList();
this.$modal.msgSuccess("删除成功"); this.$modal.msgSuccess("删除成功");
}).catch(() => {}); }).catch(() => {
});
}, },
// 提交按钮 // 提交按钮
submitForm: function () { submitForm: function () {
@ -709,6 +698,10 @@ export default {
// }else { // }else {
// this.form.cvsGoodId = this.cvsGoodId[1] // this.form.cvsGoodId = this.cvsGoodId[1]
// } // }
if (this.form.status=='qy' && this.form.stock==0 || this.form.memberPrice==0 ||this.form.retailPrice==0){
this.$message.error("请确保上架的商品库存大于0且为商品设置零售价和会员价")
return;
}
this.$refs["form"].validate(valid => { this.$refs["form"].validate(valid => {
if (valid) { if (valid) {
// if (this.form.stock==0){ // if (this.form.stock==0){
@ -789,6 +782,7 @@ export default {
height: 100%; height: 100%;
background: #f6f8f9; background: #f6f8f9;
} }
.app-container .el-form--inline .el-form-item { .app-container .el-form--inline .el-form-item {
margin-right: 20px; margin-right: 20px;
} }

216
fuintAdmin/src/views/convenienceStore/pinlei.vue
View File

@ -4,7 +4,8 @@
<!-- 查询类别 --> <!-- 查询类别 -->
<el-form :inline="true" :model="queryParams"> <el-form :inline="true" :model="queryParams">
<el-form-item label="" prop="name"> <el-form-item label="" prop="name">
<el-input v-model="queryParams.name" placeholder="请输入品类名称" clearable @keyup.enter.native="handleQuery"></el-input> <el-input v-model="queryParams.name" placeholder="请输入品类名称" clearable
@keyup.enter.native="handleQuery"></el-input>
</el-form-item> </el-form-item>
<el-form-item label=""> <el-form-item label="">
<el-select v-model="queryParams.status" placeholder="请选择状态" clearable> <el-select v-model="queryParams.status" placeholder="请选择状态" clearable>
@ -22,10 +23,12 @@
type="primary" type="primary"
@click="handleAdd" @click="handleAdd"
v-hasPermi="['convenienceStore:index:add']" v-hasPermi="['convenienceStore:index:add']"
>新增品类</el-button> >新增品类
</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div style="height: 70vh;overflow: auto">
<el-table ref="tables" v-loading="loading" :data="list" row-key="id" border> <el-table ref="tables" v-loading="loading" :data="list" row-key="id" border>
<el-table-column type="expand"> <el-table-column type="expand">
<template slot-scope="props"> <template slot-scope="props">
@ -40,8 +43,8 @@
<el-table-column label="单位" prop="unit" align="center"/> <el-table-column label="单位" prop="unit" align="center"/>
<el-table-column label="状态" align="center" prop="status"> <el-table-column label="状态" align="center" prop="status">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="scope.row.status=='qy'">上架</el-tag> <div style="color: #0DC291" v-if="scope.row.status=='qy'">已上架</div>
<el-tag type="info" v-if="scope.row.status=='jy'">下架</el-tag> <div style="color: #F44522" type="info" v-if="scope.row.status=='jy'">已下架</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="创建时间" align="center" width="160" prop="createTime"/> <el-table-column label="创建时间" align="center" width="160" prop="createTime"/>
@ -54,7 +57,15 @@
<el-table-column label="排序" align="center" prop="sorted"/> <el-table-column label="排序" align="center" prop="sorted"/>
<el-table-column label="状态" align="center" prop="status"> <el-table-column label="状态" align="center" prop="status">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.zhzt" :value="scope.row.status"/> <!-- <dict-tag :options="dict.type.zhzt" :value="scope.row.status"/>-->
<el-switch
v-model="scope.row.status"
disabled
active-color="#13ce66"
inactive-color="#ff4949"
active-value="qy"
inactive-value="jy">
</el-switch>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作人" align="center" prop="createBy"> <el-table-column label="操作人" align="center" prop="createBy">
@ -74,23 +85,26 @@
type="text" type="text"
@click="addGoods(scope.row)" @click="addGoods(scope.row)"
v-hasPermi="['convenienceStore:index:addgoods']" v-hasPermi="['convenienceStore:index:addgoods']"
>添加商品信息</el-button> >添加商品信息
</el-button>
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['convenienceStore:index:upodate']" v-hasPermi="['convenienceStore:index:upodate']"
>修改品类信息</el-button> >修改品类信息
</el-button>
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
v-hasPermi="['convenienceStore:index:del']" v-hasPermi="['convenienceStore:index:del']"
>删除</el-button> >删除
</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</div>
<pagination <pagination
v-show="total>0" v-show="total>0"
:total="total" :total="total"
@ -104,7 +118,7 @@
<!-- 添加类别对话框 --> <!-- 添加类别对话框 -->
<el-dialog :title="title" :visible.sync="open" class="roll-dialog" <el-dialog :title="title" :visible.sync="open" class="roll-dialog"
:close-on-click-modal="false" append-to-body width="500px"> :close-on-click-modal="false" append-to-body width="500px">
<el-form :model="form" :inline="true" :rules="rules" ref="form" > <el-form :model="form" :rules="rules" ref="form" label-width="80px">
<!-- <el-form-item label="上级品类" >--> <!-- <el-form-item label="上级品类" >-->
<!-- <el-select v-model="form.pid" placeholder="请选择上级品类">--> <!-- <el-select v-model="form.pid" placeholder="请选择上级品类">-->
<!-- <el-option label="无上级" :value="0">无上级</el-option>--> <!-- <el-option label="无上级" :value="0">无上级</el-option>-->
@ -115,151 +129,106 @@
<!-- </el-option>--> <!-- </el-option>-->
<!-- </el-select>--> <!-- </el-select>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item label="品类名称" prop="name" style="margin-left: -8px;"> <el-form-item label="品类名称" prop="name">
<el-input v-model="form.name" style="width: 300px;"></el-input> <el-input v-model="form.name" style="width: 100%"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="排序规则"> <el-form-item label="排序规则">
<el-input-number v-model="form.sorted" @change="handleChange" :min="0" :max="10" style="width: 300px;"></el-input-number> <el-input-number v-model="form.sorted" @change="handleChange" :min="0" :max="10"
style="width: 100%"></el-input-number>
</el-form-item> </el-form-item>
<el-form-item > <el-form-item label="状态" prop="status">
<el-radio-group v-model="form.status"> <!-- <el-radio-group v-model="form.status">-->
<el-radio v-for="dict in dict.type.zhzt" :label="dict.value">{{ dict.label }}</el-radio> <!-- <el-radio v-for="dict in dict.type.zhzt" :label="dict.value">{{ dict.label }}</el-radio>-->
</el-radio-group> <!-- </el-radio-group>-->
<el-switch
v-model="form.status"
active-color="#13ce66"
inactive-color="#ff4949"
active-value="qy"
inactive-value="jy">
</el-switch>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div class="dialog-footer" style="text-align: center">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">保 存</el-button>
</div> </div>
</el-dialog> </el-dialog>
<!-- 添加或修改对话框 --> <!-- 添加或修改对话框 -->
<el-dialog :close-on-click-modal="false" :title="title" :visible.sync="openGoods" append-to-body> <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="openGoods" append-to-body>
<el-form ref="form1" :model="form1" :rules="rules1" label-width="90px"> <el-form ref="form1" :model="form1" :rules="rules1" label-width="100px">
<el-row> <div style="display: flex;justify-content: center">
<el-col :span="24"> <div style="width: 50%">
<el-form-item label="商品条码" prop="goodsNo">
<el-input v-model="form1.goodsNo"
@keydown.enter.native="getGoods(form1)"
:disabled="title == '编辑商品'"
clearable
placeholder="商品的条码信息">
<el-button slot="append" @click="getGoods(form1)">查询</el-button>
</el-input>
<div style="text-align: right;color: grey;font-size: 12px">
商品无条码？您可以<span style="color: #00afff" @click="createGoodNo">生成条码</span>
</div>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="商品名称" prop="name"> <el-form-item label="商品名称" prop="name">
<el-input v-model="form1.name" @input="pinyin" placeholder="请输入商品名称"/> <el-input v-model="form1.name" @input="pinyin" placeholder="请输入商品名称"/>
</el-form-item> </el-form-item>
</el-col> <el-form-item label="品类名称" prop="cvsGoodId">
<el-col :span="12">
<el-form-item label="所属分类" prop="cvsGoodId">
<el-select <el-select
v-model="form1.cvsGoodId" v-model="form1.cvsGoodId"
placeholder="全部" placeholder="请选择品类名称"
clearable clearable
style="width: 300px" style="width: 100%"
> >
<el-option v-for="item in goodsOptions" :key="item.id" :label="item.name" :value="item.id"/> <el-option v-for="item in goodsOptions" :key="item.id" :label="item.name" :value="item.id"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="拼音码" prop="pinyinCode"> <el-form-item label="拼音码" prop="pinyinCode">
<el-input v-model="form1.pinyinCode" placeholder="输入商品名称自动回填"/> <el-input v-model="form1.pinyinCode" placeholder="输入商品名称自动回填"/>
</el-form-item> </el-form-item>
</el-col> <el-form-item label="商品规格" prop="goodsSpecs">
<el-col :span="8"> <el-input v-model="form1.goodsSpecs" placeholder="输入商品规格，如：500ml，50g"/>
</el-form-item>
<el-form-item label="单位" prop="unit"> <el-form-item label="单位" prop="unit">
<el-input v-model="form1.unit" placeholder="如：个、瓶、包"/> <el-input v-model="form1.unit" placeholder="如：个、瓶、包"/>
</el-form-item> </el-form-item>
</el-col> <el-form-item label="排序" prop="sort">
<el-col :span="8"> <el-input-number v-model="form1.sort" :min="0" label="0" style="width: 100%"></el-input-number>
<el-form-item label="货架号" prop="shelfNumber"> </el-form-item>
<el-input v-model="form1.shelfNumber" placeholder="如：1-2-2"/> </div>
<div style="width: 50%">
<el-form-item label="商品条形码" prop="goodsNo">
<el-input v-model="form1.goodsNo"
@keydown.enter.native="getGoods(form1)"
clearable
placeholder="请用扫描枪扫码或输入条形码或自动生成条形码">
<el-button slot="append" @click="createGoodNo" icon="el-icon-refresh"></el-button>
</el-input>
<!-- <div style="text-align: right;color: grey;font-size: 12px">-->
<!-- 商品无条码？您可以<span style="color: #00afff" @click="createGoodNo">生成条码</span>-->
<!-- </div>-->
</el-form-item>
<el-form-item label="货架号" prop="shelfNumber">
<el-input v-model="form1.shelfNumber" placeholder="请输入货架号，如：1-2-2"/>
</el-form-item> </el-form-item>
</el-col>
</el-row>
<!-- <el-row>-->
<!-- <el-col :span="8">-->
<!-- <el-form-item label="是否使用积分抵扣" prop="canUsePoint" label-width="110">-->
<!-- <el-radio-group v-model="form1.canUsePoint">-->
<!-- <el-radio v-for="dict in dict.type.yes_or_no" :label="dict.value">{{ dict.label }}</el-radio>-->
<!-- </el-radio-group>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
<el-row>
<el-col :span="24">
<el-form-item label="供应商" prop="supplierId"> <el-form-item label="供应商" prop="supplierId">
<el-select <el-select
v-model="form1.supplierId" v-model="form1.supplierId"
filterable filterable
placeholder="请选择供应商" placeholder="请选择供应商"
clearable clearable
style="width: 80%"> style="width: 100%">
<el-option v-for="item in supplierList" :key="item.id" :label="item.name" :value="item.id"/> <el-option v-for="item in supplierList" :key="item.id" :label="item.name" :value="item.id"/>
</el-select> </el-select>
<el-button type="info" plain @click="handleAdd1">添加供应商</el-button> <!-- <el-button type="info" plain @click="handleAdd1">添加供应商</el-button>-->
<!-- <el-autocomplete-->
<!-- popper-class="my-autocomplete"-->
<!-- style="width: 94%"-->
<!-- v-model="supplier"-->
<!-- :fetch-suggestions="querySearch"-->
<!-- placeholder="供应商名称，如果是未添加的供应商，输完名称点回车即可自动添加"-->
<!-- @change="addSupplier"-->
<!-- @select="selectSupplier">-->
<!-- <template slot-scope="{ item }">-->
<!-- <div style="display: flex;justify-content: space-between">-->
<!-- <span class="name">{{ item.name }}</span>-->
<!-- &lt;!&ndash; <span class="addr">{{ item.memberPrice }}</span>&ndash;&gt;-->
<!-- </div>-->
<!-- </template>-->
<!-- </el-autocomplete>-->
</el-form-item> </el-form-item>
</el-col> <el-form-item label="商品简介" prop="description">
</el-row> <el-input v-model="form.description" placeholder="请输入商品简介" type="textarea"/>
<el-row>
<el-col :span="12">
<el-form-item label="排序" prop="sort">
<el-input-number v-model="form1.sort" :min="0" label="0"></el-input-number>
</el-form-item> </el-form-item>
</el-col> </div>
<el-col :span="12"> </div>
<el-form-item label="状态" prop="status">
<el-radio-group v-model="form1.status" disabled="">
<!-- <el-radio v-for="dict in dict.type.zhzt" :label="dict.value">{{ dict.label }}</el-radio>-->
<el-radio label="qy" value="qy">上架</el-radio>
<el-radio label="jy" value="jy">下架</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
</el-form> </el-form>
<el-alert <div class="dialog-footer" style="text-align: center">
type="error"
style="margin-top: 15px"
:closable="false">
<p v-for="(item,index) in stockType" :id="index">
{{item}}
</p>
</el-alert>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm1">确 定</el-button>
<el-button @click="cancel1">取 消</el-button> <el-button @click="cancel1">取 消</el-button>
<el-button type="primary" @click="submitForm1">保 存</el-button>
</div> </div>
</el-dialog> </el-dialog>
<el-dialog :close-on-click-modal="false" :title="title" width="600px" style="margin-top: 5%" :visible.sync="open2" append-to-body> <el-dialog :close-on-click-modal="false" :title="title" width="600px" style="margin-top: 5%" :visible.sync="open2"
append-to-body>
<el-form ref="form2" :model="form2" :rules="rules2" label-width="90px"> <el-form ref="form2" :model="form2" :rules="rules2" label-width="90px">
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
@ -314,6 +283,7 @@ import {addLJGoods, createGoodsNo, queryGoodsVoList, queryLJGoods, scanCode} fro
import pinyin from "js-pinyin"; import pinyin from "js-pinyin";
import {getSysConfig} from "@/api/staff/user/sysconfig"; import {getSysConfig} from "@/api/staff/user/sysconfig";
import {addSupplier, listSuppliers, updateSupplier} from "@/api/convenienceStore/supplier"; import {addSupplier, listSuppliers, updateSupplier} from "@/api/convenienceStore/supplier";
export default { export default {
name: 'pinlei', name: 'pinlei',
dicts: ['zhzt', 'yes_or_no'], dicts: ['zhzt', 'yes_or_no'],
@ -399,6 +369,9 @@ export default {
name: [ name: [
{required: true, message: '请输入品类名称', trigger: 'blur'}, {required: true, message: '请输入品类名称', trigger: 'blur'},
], ],
status: [
{required: true, message: '请选择状态', trigger: 'blur'},
],
}, },
//校验规则 //校验规则
rules1: { rules1: {
@ -748,7 +721,16 @@ export default {
// 添加商品信息 // 添加商品信息
addGoods(data) { addGoods(data) {
this.openGoods = true this.openGoods = true
this.form1 = {status:'jy', canUsePoint:'no', stock:0, sort:0, buyingPrice:0, retailPrice:0, memberPrice:0, cvsGoodId:data.id} this.form1 = {
status: 'jy',
canUsePoint: 'no',
stock: 0,
sort: 0,
buyingPrice: 0,
retailPrice: 0,
memberPrice: 0,
cvsGoodId: data.id
}
// this.form1.cvsGoodId = data.id // this.form1.cvsGoodId = data.id
this.supplier = "" this.supplier = ""
this.title = "添加商品信息" this.title = "添加商品信息"
@ -766,7 +748,7 @@ export default {
// 删除按钮操作 // 删除按钮操作
handleDelete(row) { handleDelete(row) {
const name = row.name const name = row.name
this.$modal.confirm('确定删除"' + name + '"的品类信息？').then(function() { this.$modal.confirm('是否删除本条数据，删除后无法恢复！').then(function () {
// return deleteMember(row.id); // return deleteMember(row.id);
return deleteBYId(row.id); return deleteBYId(row.id);
}).then(() => { }).then(() => {
@ -774,7 +756,8 @@ export default {
this.getList(); this.getList();
this.getFirstMenu(); this.getFirstMenu();
this.$modal.msgSuccess("删除成功"); this.$modal.msgSuccess("删除成功");
}).catch(() => {}); }).catch(() => {
});
}, },
// 多选框选中数据 // 多选框选中数据
handleSelectionChange(selection) { handleSelectionChange(selection) {
@ -798,16 +781,19 @@ export default {
align-items: center; align-items: center;
margin-bottom: 10px; margin-bottom: 10px;
} }
.pageSty { .pageSty {
display: flex; display: flex;
justify-content: center; justify-content: center;
margin-left: 250px; margin-left: 250px;
} }
.app-container { .app-container {
width: 100%; width: 100%;
height: 100%; height: 100%;
background: #f6f8f9; background: #f6f8f9;
} }
.el-form--inline .el-form-item { .el-form--inline .el-form-item {
margin-right: 44px; margin-right: 44px;
} }

19
fuintAdmin/src/views/convenienceStore/supplier.vue
View File

@ -37,11 +37,12 @@
type="primary" type="primary"
@click="handleAdd" @click="handleAdd"
v-hasPermi="['convenienceStore:supplier:add']" v-hasPermi="['convenienceStore:supplier:add']"
>新增供应商</el-button> >新增供应商
</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div style="height: 70vh;overflow: auto">
<el-table ref="tables" v-loading="loading" :data="list" border <el-table ref="tables" v-loading="loading" :data="list" border
@selection-change="handleSelectionChange" :default-sort="defaultSort" @selection-change="handleSelectionChange" :default-sort="defaultSort"
@sort-change="handleSortChange"> @sort-change="handleSortChange">
@ -80,17 +81,19 @@
type="text" type="text"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['convenienceStore:supplier:update']" v-hasPermi="['convenienceStore:supplier:update']"
>修改</el-button> >修改
</el-button>
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
v-hasPermi="['convenienceStore:supplier:del']" v-hasPermi="['convenienceStore:supplier:del']"
>删除</el-button> >删除
</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</div>
<pagination <pagination
v-show="total>0" v-show="total>0"
:total="total" :total="total"
@ -101,7 +104,8 @@
</div> </div>
<!-- 添加或修改对话框 --> <!-- 添加或修改对话框 -->
<el-dialog :close-on-click-modal="false" :title="title" width="600px" style="margin-top: 5%" :visible.sync="open" append-to-body> <el-dialog :close-on-click-modal="false" :title="title" width="600px" style="margin-top: 5%" :visible.sync="open"
append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="95px"> <el-form ref="form" :model="form" :rules="rules" label-width="95px">
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
@ -255,7 +259,8 @@ export default {
this.queryParams.page = 1 this.queryParams.page = 1
this.getList(); this.getList();
this.$modal.msgSuccess("删除成功"); this.$modal.msgSuccess("删除成功");
}).catch(() => {}); }).catch(() => {
});
}, },
// 提交按钮 // 提交按钮
submitForm: function () { submitForm: function () {

4
fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/entity/CvsGoods.java
View File

@ -50,4 +50,8 @@ public class CvsGoods extends BaseEntity implements Serializable {
@ApiModelProperty("商品状态") @ApiModelProperty("商品状态")
private String status; private String status;
//备注
@ApiModelProperty("备注")
private String remark;
} }

3
fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/mapper/xml/LJGoodsMapper.xml
View File

@ -2,9 +2,10 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.fuint.business.convenienceSore.mapper.LJGoodsMapper"> <mapper namespace="com.fuint.business.convenienceSore.mapper.LJGoodsMapper">
<sql id="selectLJGoods"> <sql id="selectLJGoods">
select mg.*,sup.name supplierName,cg.name cvsGoodName from mt_goods mg select mg.*,sup.name supplierName,cg.name cvsGoodName,ta.real_name from mt_goods mg
left join supplier sup on mg.supplier_id = sup.id left join supplier sup on mg.supplier_id = sup.id
left join cvs_goods cg on mg.cvs_good_id = cg.id left join cvs_goods cg on mg.cvs_good_id = cg.id
LEFT JOIN t_account ta on mg.create_by = ta.acct_id
</sql> </sql>
<select id="selectLJGoodsList" resultType="com.fuint.business.convenienceSore.vo.LjGoodsVo"> <select id="selectLJGoodsList" resultType="com.fuint.business.convenienceSore.vo.LjGoodsVo">

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/vo/LjGoodsVo.java
View File

@ -9,4 +9,6 @@ public class LjGoodsVo extends LJGoods {
private String cvsGoodName; private String cvsGoodName;
// 供应商名称 // 供应商名称
private String supplierName; private String supplierName;
// 创建人
private String realName;
} }