BUG 29733

This commit is contained in:
aixianling
2022-05-20 15:41:38 +08:00
parent 93f1523caa
commit 234b9f34d5

View File

@@ -9,60 +9,60 @@
<template #content> <template #content>
<div class="form_div"> <div class="form_div">
<el-form <el-form
ref="rules" ref="rules"
:model="forms" :model="forms"
:rules="formRules" :rules="formRules"
size="small" size="small"
label-suffix="" label-suffix=""
label-width="100px"> label-width="100px">
<el-form-item label="店铺名称" prop="shopId"> <el-form-item label="店铺名称" prop="shopId">
<el-select <el-select
v-model="forms.shopId" v-model="forms.shopId"
placeholder="请选择..." placeholder="请选择..."
clearable> clearable>
<el-option <el-option
v-for="(item, i) in shopList" v-for="(item, i) in shopList"
:key="i" :key="i"
:label="item.shopName" :label="item.shopName"
:value="item.id"> :value="item.id">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="商品类型" prop="merchandiseType"> <el-form-item label="商品类型" prop="merchandiseType">
<el-select <el-select
v-model="forms.merchandiseType" v-model="forms.merchandiseType"
placeholder="请选择..." placeholder="请选择..."
clearable> clearable>
<el-option <el-option
v-for="(item, i) in dict.getDict('integralMerchandiseType')" v-for="(item, i) in dict.getDict('integralMerchandiseType')"
:key="i" :key="i"
:label="item.dictName" :label="item.dictName"
:value="item.dictValue"> :value="item.dictValue">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="商品名称" prop="merchandiseName"> <el-form-item label="商品名称" prop="merchandiseName">
<el-input <el-input
v-model="forms.merchandiseName" v-model="forms.merchandiseName"
placeholder="请输入..." placeholder="请输入..."
maxlength="100" maxlength="100"
show-word-limit> show-word-limit>
</el-input> </el-input>
</el-form-item> </el-form-item>
<div class="above"> <div class="above">
<div class="left"> <div class="left">
<el-form-item label="单价" prop="costIntegral"> <el-form-item label="单价" prop="costIntegral">
<el-input <el-input
v-model="forms.costIntegral" v-model="forms.costIntegral"
placeholder="请输入..." placeholder="请输入..."
></el-input> ></el-input>
</el-form-item> </el-form-item>
</div> </div>
<div class="right"> <div class="right">
<el-form-item label="库存" prop="inventoryNumber"> <el-form-item label="库存" prop="inventoryNumber">
<el-input <el-input
v-model="forms.inventoryNumber" v-model="forms.inventoryNumber"
placeholder="请输入..."> placeholder="请输入...">
</el-input> </el-input>
</el-form-item> </el-form-item>
</div> </div>
@@ -76,21 +76,21 @@
<el-form-item label="商品图片" prop="fileList" ref="fileList"> <el-form-item label="商品图片" prop="fileList" ref="fileList">
<div class="upload"> <div class="upload">
<ai-uploader <ai-uploader
:instance="instance" :instance="instance"
@change="changeFile" @change="changeFile"
v-model="forms.fileList" v-model="forms.fileList"
:limit="9"> :limit="9">
</ai-uploader> </ai-uploader>
</div> </div>
</el-form-item> </el-form-item>
<el-form-item label="商品详情" prop="description"> <el-form-item label="商品详情" prop="description">
<el-input <el-input
v-model="forms.description" v-model="forms.description"
type="textarea" type="textarea"
:rows="5" :rows="5"
maxlength="100" maxlength="100"
show-word-limit show-word-limit
placeholder="请输入..."> placeholder="请输入...">
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
@@ -105,49 +105,49 @@
<ai-wrapper label-width="70px" :columnsNumber="1"> <ai-wrapper label-width="70px" :columnsNumber="1">
<ai-info-item label="店铺名称"><span>{{ forms.shopName }}</span></ai-info-item> <ai-info-item label="店铺名称"><span>{{ forms.shopName }}</span></ai-info-item>
<ai-info-item label="商品类型" <ai-info-item label="商品类型"
><span>{{ ><span>{{
dict.getLabel("integralMerchandiseType", forms.merchandiseType) dict.getLabel("integralMerchandiseType", forms.merchandiseType)
}}</span></ai-info-item }}</span></ai-info-item
> >
<ai-info-item label="商品名称" <ai-info-item label="商品名称"
><span>{{ forms.merchandiseName }}</span></ai-info-item ><span>{{ forms.merchandiseName }}</span></ai-info-item
> >
</ai-wrapper> </ai-wrapper>
<ai-wrapper label-width="70px" :columnsNumber="2"> <ai-wrapper label-width="70px" :columnsNumber="2">
<ai-info-item label="单价" <ai-info-item label="单价"
><span>{{ forms.costIntegral + "积分" }}</span></ai-info-item ><span>{{ forms.costIntegral + "积分" }}</span></ai-info-item
> >
<ai-info-item label="库存" <ai-info-item label="库存"
><span>{{ forms.inventoryNumber }}</span></ai-info-item ><span>{{ forms.inventoryNumber }}</span></ai-info-item
> >
<ai-info-item label="销量" <ai-info-item label="销量"
><span>{{ forms.saleNumber || "0" }}</span></ai-info-item ><span>{{ forms.saleNumber || "0" }}</span></ai-info-item
> >
</ai-wrapper> </ai-wrapper>
<ai-wrapper label-width="70px" :columnsNumber="1"> <ai-wrapper label-width="70px" :columnsNumber="1">
<ai-info-item label="状态" <ai-info-item label="状态"
><span ><span
:style="{ :style="{
color: dict.getColor( color: dict.getColor(
'integralMerchandiseStatus', 'integralMerchandiseStatus',
forms.status forms.status
), ),
}" }"
>{{ >{{
dict.getLabel("integralMerchandiseStatus", forms.status) dict.getLabel("integralMerchandiseStatus", forms.status)
}}</span }}</span
></ai-info-item ></ai-info-item
> >
<ai-info-item label="商品图片"> <ai-info-item label="商品图片">
<ai-uploader <ai-uploader
:disabled="true" :disabled="true"
:instance="instance" :instance="instance"
v-model="forms.fileList" v-model="forms.fileList"
:limit="9" :limit="9"
></ai-uploader> ></ai-uploader>
</ai-info-item> </ai-info-item>
<ai-info-item label="商品详情" <ai-info-item label="商品详情"
><span>{{ forms.description }}</span></ai-info-item ><span>{{ forms.description }}</span></ai-info-item
> >
</ai-wrapper> </ai-wrapper>
</div> </div>
@@ -163,7 +163,8 @@
</template> </template>
<script> <script>
import { mapState } from "vuex"; import {mapState} from "vuex";
export default { export default {
name: "addGoods", name: "addGoods",
props: { props: {
@@ -206,34 +207,23 @@ export default {
callback(new Error("请输入单价")); callback(new Error("请输入单价"));
} }
}; };
var integral2 = (rule, value, callback) => {
if (value) {
if (/^[1-9]\d*$/.test(value)) {
callback();
} else {
callback(new Error("请输入正整数"));
}
} else {
callback(new Error("请输入库存"));
}
};
return { return {
shopId: [{ required: true, message: "请选择店铺", trigger: "change" }], shopId: [{required: true, message: "请选择店铺", trigger: "change"}],
merchandiseType: [ merchandiseType: [
{ required: true, message: "请选择商品类型", trigger: "change" }, {required: true, message: "请选择商品类型", trigger: "change"},
], ],
merchandiseName: [ merchandiseName: [
{ required: true, message: "请输入商品名称", trigger: "blur" }, {required: true, message: "请输入商品名称", trigger: "blur"},
], ],
costIntegral: [ costIntegral: [
{ required: true, validator: integral, trigger: "blur" }, {required: true, validator: integral, trigger: "blur"},
], ],
inventoryNumber: [ inventoryNumber: [
{ required: true, validator: integral2, trigger: "blur" }, {required: true, pattern: /^\d*[.\d]\d?$/, message: "请输入正数,最多保留一位小数", trigger: "blur"},
], ],
status: [{ required: true, message: "请选择状态", trigger: "change" }], status: [{required: true, message: "请选择状态", trigger: "change"}],
fileList: [ fileList: [
{ required: true, message: "请上传商品图片", trigger: "change" }, {required: true, message: "请上传商品图片", trigger: "change"},
], ],
}; };
}, },
@@ -264,18 +254,18 @@ export default {
getShopList() { getShopList() {
return new Promise((reslove) => { return new Promise((reslove) => {
this.instance this.instance
.post(`/app/appvillagerintegralshop/listForOperator`, null, { .post(`/app/appvillagerintegralshop/listForOperator`, null, {
params: { params: {
size: 100000, size: 100000,
areaId: this.areaId, areaId: this.areaId,
}, },
}) })
.then((res) => { .then((res) => {
if (res.code == 0) { if (res.code == 0) {
this.shopList = res.data.records; this.shopList = res.data.records;
reslove(); reslove();
} }
}); });
}); });
}, },
changeFile() { changeFile() {
@@ -283,22 +273,22 @@ export default {
}, },
searchDetail(id) { searchDetail(id) {
this.instance this.instance
.post(`/app/appvillagerintegralmerchandise/queryDetailById`, null, { .post(`/app/appvillagerintegralmerchandise/queryDetailById`, null, {
params: { params: {
id, id,
}, },
}) })
.then((res) => { .then((res) => {
if (res.code == 0) { if (res.code == 0) {
this.forms = { ...res.data }; this.forms = {...res.data};
let i = this.shopList.findIndex( let i = this.shopList.findIndex(
(item) => item.id == this.forms.shopId (item) => item.id == this.forms.shopId
); );
if (i > -1) { if (i > -1) {
this.forms.shopName = this.shopList[i].shopName; this.forms.shopName = this.shopList[i].shopName;
}
} }
}); }
});
}, },
edit() { edit() {
this.isEdit = false; this.isEdit = false;
@@ -307,24 +297,24 @@ export default {
this.$refs[formName].validate((valid) => { this.$refs[formName].validate((valid) => {
if (valid) { if (valid) {
this.instance this.instance
.post( .post(
`/app/appvillagerintegralmerchandise/addOrUpdate`, `/app/appvillagerintegralmerchandise/addOrUpdate`,
{ {
...this.forms, ...this.forms,
areaId: this.user.info.areaId, areaId: this.user.info.areaId,
}, },
null null
) )
.then((res) => { .then((res) => {
if (res.code == 0) { if (res.code == 0) {
this.$message.success("提交成功"); this.$message.success("提交成功");
if (type == "detail") { if (type == "detail") {
this.isEdit = true; this.isEdit = true;
} else { } else {
this.$emit("goBack"); this.$emit("goBack");
}
} }
}); }
});
} else { } else {
return false; return false;
} }
@@ -337,21 +327,26 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
.add_order { .add_order {
height: 100%; height: 100%;
.form_div { .form_div {
padding: 16px 0; padding: 16px 0;
} }
.above { .above {
overflow: hidden; overflow: hidden;
width: 100%; width: 100%;
.left { .left {
width: 50%; width: 50%;
float: left; float: left;
} }
.right { .right {
width: 50%; width: 50%;
float: right; float: right;
} }
} }
.iconEdit, .iconEdit,
.Edit { .Edit {
color: #5088ff; color: #5088ff;
@@ -359,8 +354,9 @@ export default {
cursor: pointer; cursor: pointer;
padding-left: 8px; padding-left: 8px;
} }
.info { .info {
padding: 16px 0; padding: 16px 0;
} }
} }
</style> </style>