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