取消首次缴纳保证金编辑显示

This commit is contained in:
weipengfei 2023-10-09 11:32:01 +08:00
parent 9a87d21a2c
commit bbf7610502

View File

@ -3,12 +3,24 @@
<div>
<el-card class="box-card">
<div slot="header" class="clearfix">
<el-button size="small" type="primary" @click="onAdd">添加店铺类型
<el-button size="small" type="primary" @click="onAdd"
>添加店铺类型
</el-button>
</div>
<el-table v-loading="listLoading" :data="tableData.data" style="width: 100%" size="small" highlight-current-row class="switchTable">
<el-table
v-loading="listLoading"
:data="tableData.data"
style="width: 100%"
size="small"
highlight-current-row
class="switchTable"
>
<el-table-column prop="mer_type_id" label="ID" min-width="60" />
<el-table-column prop="type_name" label="店铺类型名称" min-width="200" />
<el-table-column
prop="type_name"
label="店铺类型名称"
min-width="200"
/>
<el-table-column prop="type_name" label="店铺保证金" min-width="200">
<template slot-scope="scope">
<span class="spBlock">{{
@ -16,50 +28,113 @@
}}</span>
</template>
</el-table-column>
<el-table-column prop="type_name" label="首次缴纳保证金" min-width="200">
<el-table-column
prop="type_name"
label="首次缴纳保证金"
min-width="200"
>
<template slot-scope="scope">
<span class="spBlock">{{
scope.row.first_margin ? scope.row.first_margin + "元" : "无"
}}</span>
</template>
</el-table-column>
<el-table-column prop="type_info" label="店铺类型要求" min-width="300" />
<el-table-column prop="create_time" label="创建时间" min-width="150" />
<el-table-column prop="update_time" label="最新修改时间" min-width="150" />
<el-table-column label="操作" min-width="280" fixed="right" align="center">
<el-table-column
prop="type_info"
label="店铺类型要求"
min-width="300"
/>
<el-table-column
prop="create_time"
label="创建时间"
min-width="150"
/>
<el-table-column
prop="update_time"
label="最新修改时间"
min-width="150"
/>
<el-table-column
label="操作"
min-width="280"
fixed="right"
align="center"
>
<template slot-scope="scope">
<el-button type="text" size="small" @click="handleDetail(scope.row)">详情
<el-button
type="text"
size="small"
@click="handleDetail(scope.row)"
>详情
</el-button>
<el-button type="text" size="small" @click="onEdit(scope.row)">编辑
<el-button type="text" size="small" @click="onEdit(scope.row)"
>编辑
</el-button>
<el-button type="text" size="small" @click="handleDelete(scope.row.mer_type_id, scope.$index)">删除
<el-button
type="text"
size="small"
@click="handleDelete(scope.row.mer_type_id, scope.$index)"
>删除
</el-button>
<el-button type="text" size="small" @click="handleMark(scope.row.mer_type_id)">备注
<el-button
type="text"
size="small"
@click="handleMark(scope.row.mer_type_id)"
>备注
</el-button>
</template>
</el-table-column>
</el-table>
<div class="block">
<el-pagination :page-sizes="[20, 40, 60, 80]" :page-size="tableFrom.limit" :current-page="tableFrom.page" layout="total, sizes, prev, pager, next, jumper" :total="tableData.total" @size-change="handleSizeChange" @current-change="pageChange" />
<el-pagination
:page-sizes="[20, 40, 60, 80]"
:page-size="tableFrom.limit"
:current-page="tableFrom.page"
layout="total, sizes, prev, pager, next, jumper"
:total="tableData.total"
@size-change="handleSizeChange"
@current-change="pageChange"
/>
</div>
</el-card>
</div>
<el-dialog :title="isEdit ? '编辑店铺类型' : '添加店铺类型'" :visible.sync="dialogVisible" width="600px" :before-close="handleClose" :append-to-body="append">
<el-form ref="formValidate" class="formValidate mt20" :rules="ruleValidate" :model="formValidate" label-width="120px" @submit.native.prevent>
<el-dialog
:title="isEdit ? '编辑店铺类型' : '添加店铺类型'"
:visible.sync="dialogVisible"
width="600px"
:before-close="handleClose"
:append-to-body="append"
>
<el-form
ref="formValidate"
class="formValidate mt20"
:rules="ruleValidate"
:model="formValidate"
label-width="120px"
@submit.native.prevent
>
<el-form-item label="店铺类型名称:" prop="type_name">
<el-input v-model="formValidate.type_name" maxlength="5" placeholder="请输入店铺类型名称" />
<el-input
v-model="formValidate.type_name"
maxlength="5"
placeholder="请输入店铺类型名称"
/>
</el-form-item>
<el-form-item label="商家申请类型:" prop="is_allow_apply">
<el-select v-model="formValidate.is_allow_apply" placeholder="请选择商家申请类型">
<el-select
v-model="formValidate.is_allow_apply"
placeholder="请选择商家申请类型"
>
<el-option label="是" value="1"></el-option>
<el-option label="否" value="0"></el-option>
</el-select>
</el-form-item>
<el-form-item label="搜索商家:" prop="is_search_display">
<el-select v-model="formValidate.is_search_display" placeholder="请选择搜索商家是否展示">
<el-select
v-model="formValidate.is_search_display"
placeholder="请选择搜索商家是否展示"
>
<el-option label="是" value="1"></el-option>
<el-option label="否" value="0"></el-option>
</el-select>
@ -68,8 +143,10 @@
<el-input type="text" v-model="formValidate.type_code" />
</el-form-item>
<el-form-item label="同步云商商品:" prop="is_sync_prod">
<el-select v-model="formValidate.is_sync_prod" placeholder="请选择商家申请类型">
<el-select
v-model="formValidate.is_sync_prod"
placeholder="请选择商家申请类型"
>
<el-option label="是" value="1"></el-option>
<el-option label="否" value="0"></el-option>
</el-select>
@ -85,28 +162,51 @@
单位
</div>
</el-form-item>
<el-form-item label="首次缴纳保证金:">
<div class="input_inline">
<el-input v-model="formValidate.first_margin" @change="fimargin" placeholder="请输入单位" />
<!-- <el-form-item label="首次缴纳保证金:">
<div class="input_inline">
<el-input
v-model="formValidate.first_margin"
@change="fimargin"
placeholder="请输入单位"
/>
单位
</div>
</el-form-item>
</el-form-item> -->
<el-form-item label="店铺权限:" prop="auth">
<el-tree ref="tree" :data="permissions" show-checkbox node-key="value" ::default-checked-keys="formValidate.auth || []" @hook:mounted="$refs.tree.setCheckedKeys(formValidate.auth || [])" @check="
<el-tree
ref="tree"
:data="permissions"
show-checkbox
node-key="value"
::default-checked-keys="formValidate.auth || []"
@hook:mounted="$refs.tree.setCheckedKeys(formValidate.auth || [])"
@check="
[
(formValidate.auth = $refs.tree.getCheckedKeys()),
$refs.formValidate.validateField('auth'),
]
"></el-tree>
"
></el-tree>
</el-form-item>
<el-form-item label="其它说明:">
<el-input type="textarea" v-model="formValidate.description" />
</el-form-item>
<el-form-item style="margin-top: 30px">
<el-button v-if="!isEdit" type="primary" class="submission" size="small" @click="handleSubmit('formValidate')">提交
<el-button
v-if="!isEdit"
type="primary"
class="submission"
size="small"
@click="handleSubmit('formValidate')"
>提交
</el-button>
<el-button v-else type="primary" class="submission" size="small" @click="handleUpdate('formValidate')">提交
<el-button
v-else
type="primary"
class="submission"
size="small"
@click="handleUpdate('formValidate')"
>提交
</el-button>
</el-form-item>
</el-form>
@ -114,8 +214,20 @@
<!-- 详情 -->
<el-dialog title="店铺详情" :visible.sync="dialogDetailVisible" width="600px" :before-close="handleDetailClose" :append-to-body="append">
<el-form ref="formDetailValidate" class="formValidate mt20" :model="formDetailValidate" label-width="160px" @submit.native.prevent>
<el-dialog
title="店铺详情"
:visible.sync="dialogDetailVisible"
width="600px"
:before-close="handleDetailClose"
:append-to-body="append"
>
<el-form
ref="formDetailValidate"
class="formValidate mt20"
:model="formDetailValidate"
label-width="160px"
@submit.native.prevent
>
<el-form-item label="店铺类型名称:" prop="type_name">
<span>
{{
@ -130,61 +242,68 @@
formDetailValidate.type_info
? formDetailValidate.type_info
: "暂无数据"
}}</el-form-item>
}}</el-form-item
>
<el-form-item label="店铺保证金:">
{{
formDetailValidate.margin ? formDetailValidate.margin : "暂无数据"
}}</el-form-item>
<el-form-item label="首次缴纳保证金:">
}}</el-form-item
>
<el-form-item label="首次缴纳保证金:">
{{
formDetailValidate.first_margin ? formDetailValidate.first_margin : "暂无数据"
}}</el-form-item>
formDetailValidate.first_margin
? formDetailValidate.first_margin
: "暂无数据"
}}</el-form-item
>
<el-form-item label="店铺权限:">
<el-tree ref="treeDetail" :data="formDetailValidate.options" :props="{ label: 'title' }"></el-tree>
<el-tree
ref="treeDetail"
:data="formDetailValidate.options"
:props="{ label: 'title' }"
></el-tree>
</el-form-item>
<el-form-item label="最新修改时间:">{{
<el-form-item label="最新修改时间:"
>{{
formDetailValidate.update_time
? formDetailValidate.update_time
: "暂无数据"
}}
</el-form-item>
<el-form-item label=" 类型code">{{
<el-form-item label=" 类型code"
>{{
formDetailValidate.type_code
? formDetailValidate.type_code
: "暂无数据"
}}
</el-form-item>
<el-form-item label=" 商家申请类型:">{{
formDetailValidate.is_allow_apply==1?'是':'否'
}}
<el-form-item label=" 商家申请类型:"
>{{ formDetailValidate.is_allow_apply == 1 ? "是" : "否" }}
</el-form-item>
<el-form-item label="搜索商家是否展示:">{{
formDetailValidate.is_search_display==1?'是':'否'
}}
<el-form-item label="搜索商家是否展示:"
>{{ formDetailValidate.is_search_display == 1 ? "是" : "否" }}
</el-form-item>
<el-form-item label="是否同步云商商品:">{{
formDetailValidate.is_sync_prod==1?'是':'否'
}}
<el-form-item label="是否同步云商商品:"
>{{ formDetailValidate.is_sync_prod == 1 ? "是" : "否" }}
</el-form-item>
<el-form-item label="其它说明:">
{{
formDetailValidate.description
? formDetailValidate.description
: "暂无数据"
}}</el-form-item>
}}</el-form-item
>
<el-form-item label="创建时间:">
{{
formDetailValidate.create_time
? formDetailValidate.create_time
: "暂无数据"
}}</el-form-item>
}}</el-form-item
>
<el-form-item label="最新修改时间:">{{
<el-form-item label="最新修改时间:"
>{{
formDetailValidate.update_time
? formDetailValidate.update_time
: "暂无数据"
@ -222,7 +341,7 @@ import Cookies from "js-cookie";
export default {
name: "MerchantList",
data() {
data () {
return {
//
dialogDetailVisible: false,
@ -253,7 +372,7 @@ export default {
is_search_display: "",
type_code: "",
is_sync_prod: "",
first_margin:0
first_margin: 0
},
ruleValidate: {
type_name: [
@ -284,12 +403,12 @@ export default {
},
};
},
mounted() {
mounted () {
this.getList("");
},
methods: {
//
getList(num) {
getList (num) {
this.listLoading = true;
this.tableFrom.page = num ? num : this.tableFrom.page;
storeTypeLstApi(this.tableFrom)
@ -304,19 +423,19 @@ export default {
this.$message.error(res.message);
});
},
pageChange(page) {
pageChange (page) {
this.tableFrom.page = page;
this.getList("");
},
handleSizeChange(val) {
handleSizeChange (val) {
this.tableFrom.limit = val;
this.getList(1);
},
handleClose() {
handleClose () {
this.dialogVisible = false;
},
//
onAdd() {
onAdd () {
this.dialogVisible = true;
this.isEdit = false;
// this.jurisdiction();
@ -332,21 +451,21 @@ export default {
},
//
fimargin(e){
console.log(e,this.formValidate.margin,e>this.formValidate.margin)
if(this.formValidate.is_margin == 1){
if(Number(e)>Number(this.formValidate.margin)){
fimargin (e) {
console.log(e, this.formValidate.margin, e > this.formValidate.margin)
if (this.formValidate.is_margin == 1) {
if (Number(e) > Number(this.formValidate.margin)) {
this.$message({
message: '警告,首次缴纳保证金不能超过店铺保证金',
type: 'warning'
message: '警告,首次缴纳保证金不能超过店铺保证金',
type: 'warning'
});
}
}
}
},
//
jurisdiction() {
jurisdiction () {
storeJurisdictionApi().then((res) => {
function loadData(lst) {
function loadData (lst) {
lst.forEach((v) => {
v.value = v.id;
v.label = v.title;
@ -366,7 +485,7 @@ export default {
this.permissions = loadData(res.data);
});
},
handleSubmit(name) {
handleSubmit (name) {
this.$refs[name].validate((valid) => {
if (valid) {
storeTypeCreateApi(this.formValidate)
@ -384,7 +503,7 @@ export default {
});
},
//
onEdit(row) {
onEdit (row) {
this.isEdit = true;
this.dialogVisible = true;
this.typeId = row.mer_type_id;
@ -405,23 +524,23 @@ export default {
// this.jurisdiction();
},
//
handleDetailClose() {
handleDetailClose () {
this.dialogDetailVisible = false;
this.getList();
},
//
handleDetail(row) {
handleDetail (row) {
this.dialogDetailVisible = true;
this.detailTypeId = row.mer_type_id;
this.getDetail();
},
getDetail() {
getDetail () {
merchantTypeMarkApi(this.detailTypeId).then((res) => {
this.formDetailValidate = res.data;
});
},
handleUpdate(name) {
handleUpdate (name) {
this.$refs[name].validate((valid) => {
if (valid) {
storeTypeUpdateApi(this.typeId, this.formValidate)
@ -439,7 +558,7 @@ export default {
});
},
//
handleDelete(id) {
handleDelete (id) {
this.$modalSure("确定删除该店铺类型吗").then(() => {
storeTypeDeleteApi(id)
.then(({ message }) => {
@ -452,7 +571,7 @@ export default {
});
},
//
handleMark(id) {
handleMark (id) {
// console.log(id,'9999999');
this.$modalForm(merchantTypeMarkForm(id)).then(() => this.getList());
},