Commit d21fffb8 by 无尘

feat: 新增项目

parent a6e2d9b1
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* @Author: 无尘 * @Author: 无尘
* @Date: 2018-10-10 14:44:45 * @Date: 2018-10-10 14:44:45
* @LastEditors: 无尘 * @LastEditors: 无尘
* @LastEditTime: 2020-12-03 15:36:11 * @LastEditTime: 2020-12-04 14:08:59
--> -->
<template> <template>
<div class="review-wrap"> <div class="review-wrap">
...@@ -70,13 +70,7 @@ export default { ...@@ -70,13 +70,7 @@ export default {
that.activeTab = item.tabId; that.activeTab = item.tabId;
switch (item.tabId) { switch (item.tabId) {
case '1': case '1':
that.changeRoute(`unreview`); that.changeRoute(`index`);
break;
case '2':
that.changeRoute(`reviewed`);
break;
case '3':
that.changeRoute(`reviewSet`);
break; break;
} }
}, },
......
...@@ -4,31 +4,31 @@ ...@@ -4,31 +4,31 @@
* @Author: 无尘 * @Author: 无尘
* @Date: 2018-10-10 14:44:45 * @Date: 2018-10-10 14:44:45
* @LastEditors: 无尘 * @LastEditors: 无尘
* @LastEditTime: 2020-12-03 16:19:31 * @LastEditTime: 2020-12-04 14:07:13
--> -->
<template> <template>
<div class="unreview-wrap common-set-wrap"> <div class="unreview-wrap common-set-wrap">
<div class="right-content"> <div class="right-content">
<div class="right-box" style="min-height: calc(100vh - 126px)"> <div class="right-box" style="min-height: calc(100vh - 126px)">
<div class="text-right m-b-20"><el-button @click="handleAdd('')" type="primary">新增</el-button></div> <div class="text-right m-b-20"><el-button @click="handleAdd('')" type="primary">新增限流</el-button></div>
<div class="reviewed-body-content"> <div class="reviewed-body-content">
<el-table ref="multipleTable" v-loading="loading" :data="tableData" tooltip-effect="dark" style="width: 100%" @selection-change="handleSelectionChange"> <el-table ref="multipleTable" v-loading="loading" :data="tableData" tooltip-effect="dark" style="width: 100%" @selection-change="handleSelectionChange">
<el-table-column label="审核事项"> <el-table-column label="限流名称">
<template slot-scope="scope"> <template slot-scope="scope" show-overflow-tooltip>
<span v-if="scope.row.auditType == 1">门店信息变更</span> {{ scope.row.rateName || '--' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="提交人" show-overflow-tooltip> <el-table-column label="Code" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.name || '--' }} {{ scope.row.rateCode || '--' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="提交时间" show-overflow-tooltip> <!-- <el-table-column label="提交时间" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<div class="line-h-18">{{ scope.row.createTime | timeStampToYmd }}</div> <div class="line-h-18">{{ scope.row.createTime | timeStampToYmd }}</div>
<div class="line-h-18">{{ scope.row.createTime | timeStampToHms }}</div> <div class="line-h-18">{{ scope.row.createTime | timeStampToHms }}</div>
</template> </template>
</el-table-column> </el-table-column> -->
<el-table-column label="操作" width="150"> <el-table-column label="操作" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" @click="toNext(scope.row)">查看详情</el-button> <el-button type="text" @click="toNext(scope.row)">查看详情</el-button>
...@@ -44,17 +44,17 @@ ...@@ -44,17 +44,17 @@
</div> </div>
</div> </div>
<!-- 编辑 --> <!-- 编辑 -->
<el-dialog :title="!!ruleForm.id ? '编辑模块' : '新建模块'" :visible.sync="showAdd" width="600px" :before-close="handleClose"> <el-dialog :title="!!ruleForm.rateId ? '编辑限流' : '新建限流'" :visible.sync="showAdd" width="600px" :before-close="handleClose">
<div class=""> <div class="">
<el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm"> <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
<el-form-item label="文本标题" prop="materialTitle"> <el-form-item label="限流名称" prop="rateName">
<!-- <el-input v-model="ruleForm.name" placeholder="请输入模块"></el-input> --> <el-input v-model="ruleForm.rateName" placeholder="请输入限流"></el-input>
<el-select v-model="ruleForm.id" placeholder="请选择"> <!-- <el-select v-model="ruleForm.id" placeholder="请选择">
<el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"> </el-option> <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"> </el-option>
</el-select> </el-select> -->
</el-form-item> </el-form-item>
<el-form-item label="code" prop="materialContent"> <el-form-item label="Code" prop="rateCode">
<el-input v-model="ruleForm.code" placeholder="请输入code"></el-input> <el-input v-model="ruleForm.rateCode" placeholder="请输入code"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
...@@ -96,9 +96,13 @@ export default { ...@@ -96,9 +96,13 @@ export default {
total: 0, total: 0,
showAdd: false, showAdd: false,
ruleForm: { ruleForm: {
id: '', rateId: '',
name: '', rateName: '',
code: '' rateCode: ''
},
rules: {
rateName: [{ required: true, message: '请输入限流名称', trigger: 'blur' }],
rateCode: [{ required: true, message: '请输入限流code', trigger: 'blur' }]
} }
}; };
}, },
...@@ -108,7 +112,7 @@ export default { ...@@ -108,7 +112,7 @@ export default {
*/ */
toNext(row) { toNext(row) {
const that = this; const that = this;
that.$router.push(`/second?id=${row.id}`); that.$router.push(`/second?rateId=${row.rateId}`);
}, },
/** /**
* 弹窗操作 * 弹窗操作
...@@ -134,13 +138,12 @@ export default { ...@@ -134,13 +138,12 @@ export default {
postSave() { postSave() {
const that = this; const that = this;
const data = { const data = {
categoryId: that.categoryId, rateId: that.ruleForm.rateId,
materialType: 1, rateName: that.ruleForm.rateName,
materialId: that.ruleForm.materialId, rateCode: that.ruleForm.rateCode,
materialTitle: that.ruleForm.materialTitle, moudleId: that.$route.query.moudleId
materialContent: that.ruleForm.materialContent
}; };
postRequest(that.ruleForm.materialId ? '/haoban-manage3-web/material-edit' : '/haoban-manage3-web/material-add', data) postRequest('/redislimiter/save-rate', data)
.then(res => { .then(res => {
let resData = res.data; let resData = res.data;
if (resData.errorCode == 1) { if (resData.errorCode == 1) {
...@@ -171,9 +174,9 @@ export default { ...@@ -171,9 +174,9 @@ export default {
closeText() { closeText() {
const that = this; const that = this;
that.ruleForm = { that.ruleForm = {
id: '', rateId: '',
name: '', rateName: '',
code: '' rateCode: ''
}; };
that.showAdd = false; that.showAdd = false;
}, },
...@@ -221,10 +224,9 @@ export default { ...@@ -221,10 +224,9 @@ export default {
postApprove(item) { postApprove(item) {
const that = this; const that = this;
let para = { let para = {
auditId: item.id, rateId: item.rateId
auditName: that.auditName
}; };
postRequest('/haoban-manage3-web/audit/audit', para) postRequest('/redislimiter/save-rate', para)
.then(res => { .then(res => {
let resData = res.data; let resData = res.data;
if (resData.errorCode == 1) { if (resData.errorCode == 1) {
...@@ -252,16 +254,11 @@ export default { ...@@ -252,16 +254,11 @@ export default {
} }
that.loading = true; that.loading = true;
let para = { let para = {
wxEnterpriseId: that.wxEnterpriseId, moudleId: that.$route.query.moudleId,
auditType: that.filterValue,
auditStatus: '0',
auditFlag: '0',
search: that.searchValue, // 搜索字段
pageNum: that.currentPage, // 当前页 pageNum: that.currentPage, // 当前页
pageSize: that.pageSize, // 一页显示个数 pageSize: that.pageSize // 一页显示个数
enterpriseId: that.filterBrand // 20190918新增品牌
}; };
getRequest('/haoban-manage3-web/audit/find-page', para) getRequest('/redislimiter/list-rate', para)
.then(res => { .then(res => {
let resData = res.data; let resData = res.data;
that.loading = false; that.loading = false;
......
...@@ -4,31 +4,31 @@ ...@@ -4,31 +4,31 @@
* @Author: 无尘 * @Author: 无尘
* @Date: 2018-10-10 14:44:45 * @Date: 2018-10-10 14:44:45
* @LastEditors: 无尘 * @LastEditors: 无尘
* @LastEditTime: 2020-12-03 16:23:02 * @LastEditTime: 2020-12-04 14:42:22
--> -->
<template> <template>
<div class="unreview-wrap common-set-wrap"> <div class="unreview-wrap common-set-wrap">
<div class="right-content"> <div class="right-content">
<div class="right-box" style="min-height: calc(100vh - 126px)"> <div class="right-box" style="min-height: calc(100vh - 126px)">
<div class="text-right m-b-20"><el-button @click="handleAdd('')" type="primary">新增</el-button></div> <div class="text-right m-b-20"><el-button @click="handleAdd('')" type="primary">新增企业关系</el-button></div>
<div class="reviewed-body-content"> <div class="reviewed-body-content">
<el-table ref="multipleTable" v-loading="loading" :data="tableData" tooltip-effect="dark" style="width: 100%" @selection-change="handleSelectionChange"> <el-table ref="multipleTable" v-loading="loading" :data="tableData" tooltip-effect="dark" style="width: 100%" @selection-change="handleSelectionChange">
<el-table-column label="审核事项"> <el-table-column label="企业名称">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.auditType == 1">门店信息变更</span> {{ scope.row.enterpriseName || '--' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="提交人" show-overflow-tooltip> <el-table-column label="count" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.name || '--' }} {{ scope.row.count || '--' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="提交时间" show-overflow-tooltip> <!-- <el-table-column label="提交时间" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<div class="line-h-18">{{ scope.row.createTime | timeStampToYmd }}</div> <div class="line-h-18">{{ scope.row.createTime | timeStampToYmd }}</div>
<div class="line-h-18">{{ scope.row.createTime | timeStampToHms }}</div> <div class="line-h-18">{{ scope.row.createTime | timeStampToHms }}</div>
</template> </template>
</el-table-column> </el-table-column> -->
<el-table-column label="操作" width="150"> <el-table-column label="操作" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<!-- <el-button type="text" @click="toNext(scope.row)">查看详情</el-button> --> <!-- <el-button type="text" @click="toNext(scope.row)">查看详情</el-button> -->
...@@ -44,14 +44,17 @@ ...@@ -44,14 +44,17 @@
</div> </div>
</div> </div>
<!-- 编辑 --> <!-- 编辑 -->
<el-dialog :title="!!ruleForm.id ? '编辑模块' : '新建模块'" :visible.sync="showAdd" width="600px" :before-close="handleClose"> <el-dialog :title="!!ruleForm.rateEnterpriseId ? '编辑企业关系' : '新建企业关系'" :visible.sync="showAdd" width="600px" :before-close="handleClose">
<div class=""> <div class="">
<el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm"> <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
<el-form-item label="文本标题" prop="materialTitle"> <el-form-item label="选择企业" prop="eids">
<el-input v-model="ruleForm.name" placeholder="请输入模块"></el-input> <!-- <el-input v-model="ruleForm.name" placeholder="请输入企业关系"></el-input> -->
<el-select :disabled="ruleForm.rateEnterpriseId ? true : false" v-model="ruleForm.eids" placeholder="请选择">
<el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"> </el-option>
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="code" prop="materialContent"> <el-form-item label="count" prop="count">
<el-input v-model="ruleForm.code" placeholder="请输入code"></el-input> <el-input-number v-model="ruleForm.count" placeholder="请输入" controls-position="right" :min="1" :max="90000000"></el-input-number>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
...@@ -80,7 +83,7 @@ export default { ...@@ -80,7 +83,7 @@ export default {
loading: false, loading: false,
tableData: [], tableData: [],
multipleSelection: [], options: [],
// 分页参数 // 分页参数
currentPage: 1, currentPage: 1,
...@@ -88,21 +91,18 @@ export default { ...@@ -88,21 +91,18 @@ export default {
total: 0, total: 0,
showAdd: false, showAdd: false,
ruleForm: { ruleForm: {
id: '', rateEnterpriseId: '',
name: '', eids: '',
code: '' count: ''
},
rules: {
eids: [{ required: true, message: '请选择企业', trigger: 'blur' }],
count: [{ required: true, message: '请输入', trigger: 'blur' }]
} }
}; };
}, },
methods: { methods: {
/** /**
* 跳转详情
*/
toNext(row) {
const that = this;
that.$router.push(`/second?id=${row.id}`);
},
/**
* 弹窗操作 * 弹窗操作
*/ */
toCancel() { toCancel() {
...@@ -126,13 +126,12 @@ export default { ...@@ -126,13 +126,12 @@ export default {
postSave() { postSave() {
const that = this; const that = this;
const data = { const data = {
categoryId: that.categoryId, rateId: that.$route.query.rateId,
materialType: 1, rateEnterpriseId: that.ruleForm.rateEnterpriseId,
materialId: that.ruleForm.materialId, eids: that.ruleForm.eids,
materialTitle: that.ruleForm.materialTitle, count: that.ruleForm.count
materialContent: that.ruleForm.materialContent
}; };
postRequest(that.ruleForm.materialId ? '/haoban-manage3-web/material-edit' : '/haoban-manage3-web/material-add', data) postRequest('/redislimiter/save-rate-enterprise', data)
.then(res => { .then(res => {
let resData = res.data; let resData = res.data;
if (resData.errorCode == 1) { if (resData.errorCode == 1) {
...@@ -163,9 +162,9 @@ export default { ...@@ -163,9 +162,9 @@ export default {
closeText() { closeText() {
const that = this; const that = this;
that.ruleForm = { that.ruleForm = {
id: '', rateEnterpriseId: '',
name: '', eids: '',
code: '' count: ''
}; };
that.showAdd = false; that.showAdd = false;
}, },
...@@ -213,8 +212,7 @@ export default { ...@@ -213,8 +212,7 @@ export default {
postApprove(item) { postApprove(item) {
const that = this; const that = this;
let para = { let para = {
auditId: item.id, rateEnterpriseId: item.rateEnterpriseId
auditName: that.auditName
}; };
postRequest('/haoban-manage3-web/audit/audit', para) postRequest('/haoban-manage3-web/audit/audit', para)
.then(res => { .then(res => {
...@@ -244,16 +242,11 @@ export default { ...@@ -244,16 +242,11 @@ export default {
} }
that.loading = true; that.loading = true;
let para = { let para = {
wxEnterpriseId: that.wxEnterpriseId, rateId: that.$route.query.rateId,
auditType: that.filterValue,
auditStatus: '0',
auditFlag: '0',
search: that.searchValue, // 搜索字段
pageNum: that.currentPage, // 当前页 pageNum: that.currentPage, // 当前页
pageSize: that.pageSize, // 一页显示个数 pageSize: that.pageSize // 一页显示个数
enterpriseId: that.filterBrand // 20190918新增品牌
}; };
getRequest('/haoban-manage3-web/audit/find-page', para) getRequest('/redislimiter/list-rate-enterprise', para)
.then(res => { .then(res => {
let resData = res.data; let resData = res.data;
that.loading = false; that.loading = false;
......
...@@ -4,31 +4,31 @@ ...@@ -4,31 +4,31 @@
* @Author: 无尘 * @Author: 无尘
* @Date: 2018-10-10 14:44:45 * @Date: 2018-10-10 14:44:45
* @LastEditors: 无尘 * @LastEditors: 无尘
* @LastEditTime: 2020-12-03 16:15:25 * @LastEditTime: 2020-12-04 14:40:09
--> -->
<template> <template>
<div class="unreview-wrap common-set-wrap"> <div class="unreview-wrap common-set-wrap">
<div class="right-content"> <div class="right-content">
<div class="right-box" style="min-height: calc(100vh - 126px)"> <div class="right-box" style="min-height: calc(100vh - 126px)">
<div class="text-right m-b-20"><el-button @click="handleAdd('')" type="primary">新增</el-button></div> <div class="text-right m-b-20"><el-button @click="handleAdd('')" type="primary">新增模块</el-button></div>
<div class="reviewed-body-content"> <div class="reviewed-body-content">
<el-table ref="multipleTable" v-loading="loading" :data="tableData" tooltip-effect="dark" style="width: 100%" @selection-change="handleSelectionChange"> <el-table ref="multipleTable" v-loading="loading" :data="tableData" tooltip-effect="dark" style="width: 100%" @selection-change="handleSelectionChange">
<el-table-column label="审核事项"> <el-table-column label="模块名称" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.auditType == 1">门店信息变更</span> {{ scope.row.moudleName || '--' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="提交人" show-overflow-tooltip> <el-table-column label="Code" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.name || '--' }} {{ scope.row.moudleCode || '--' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="提交时间" show-overflow-tooltip> <!-- <el-table-column label="提交时间" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<div class="line-h-18">{{ scope.row.createTime | timeStampToYmd }}</div> <div class="line-h-18">{{ scope.row.createTime | timeStampToYmd }}</div>
<div class="line-h-18">{{ scope.row.createTime | timeStampToHms }}</div> <div class="line-h-18">{{ scope.row.createTime | timeStampToHms }}</div>
</template> </template>
</el-table-column> </el-table-column> -->
<el-table-column label="操作" width="150"> <el-table-column label="操作" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" @click="toNext(scope.row)">查看详情</el-button> <el-button type="text" @click="toNext(scope.row)">查看详情</el-button>
...@@ -44,14 +44,14 @@ ...@@ -44,14 +44,14 @@
</div> </div>
</div> </div>
<!-- 编辑 --> <!-- 编辑 -->
<el-dialog :title="!!ruleForm.id ? '编辑模块' : '新建模块'" :visible.sync="showAdd" width="600px" :before-close="handleClose"> <el-dialog :title="!!ruleForm.moudleId ? '编辑模块' : '新建模块'" :visible.sync="showAdd" width="600px" :before-close="handleClose">
<div class=""> <div class="">
<el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm"> <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
<el-form-item label="文本标题" prop="materialTitle"> <el-form-item label="模块名称" prop="moudleName">
<el-input v-model="ruleForm.name" placeholder="请输入模块"></el-input> <el-input v-model="ruleForm.moudleName" placeholder="请输入模块名称"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="code" prop="materialContent"> <el-form-item label="Code" prop="moudleCode">
<el-input v-model="ruleForm.code" placeholder="请输入code"></el-input> <el-input v-model="ruleForm.moudleCode" placeholder="请输入code"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
...@@ -88,9 +88,13 @@ export default { ...@@ -88,9 +88,13 @@ export default {
total: 0, total: 0,
showAdd: false, showAdd: false,
ruleForm: { ruleForm: {
id: '', moudleId: '',
name: '', moudleName: '',
code: '' moudleCode: ''
},
rules: {
moudleName: [{ required: true, message: '请输入模块名称', trigger: 'blur' }],
moudleCode: [{ required: true, message: '请输入code', trigger: 'blur' }]
} }
}; };
}, },
...@@ -100,7 +104,7 @@ export default { ...@@ -100,7 +104,7 @@ export default {
*/ */
toNext(row) { toNext(row) {
const that = this; const that = this;
that.$router.push(`/second?id=${row.id}`); that.$router.push(`/second?moudleId=${row.moudleId}`);
}, },
/** /**
* 弹窗操作 * 弹窗操作
...@@ -126,13 +130,11 @@ export default { ...@@ -126,13 +130,11 @@ export default {
postSave() { postSave() {
const that = this; const that = this;
const data = { const data = {
categoryId: that.categoryId, moudleId: that.ruleForm.moudleId,
materialType: 1, moudleName: that.ruleForm.moudleName,
materialId: that.ruleForm.materialId, moudleCode: that.ruleForm.moudleCode
materialTitle: that.ruleForm.materialTitle,
materialContent: that.ruleForm.materialContent
}; };
postRequest(that.ruleForm.materialId ? '/haoban-manage3-web/material-edit' : '/haoban-manage3-web/material-add', data) postRequest('/redislimiter/save-module', data)
.then(res => { .then(res => {
let resData = res.data; let resData = res.data;
if (resData.errorCode == 1) { if (resData.errorCode == 1) {
...@@ -213,10 +215,9 @@ export default { ...@@ -213,10 +215,9 @@ export default {
postApprove(item) { postApprove(item) {
const that = this; const that = this;
let para = { let para = {
auditId: item.id, moudleId: item.moudleId
auditName: that.auditName
}; };
postRequest('/haoban-manage3-web/audit/audit', para) postRequest('/redislimiter/del-module', para)
.then(res => { .then(res => {
let resData = res.data; let resData = res.data;
if (resData.errorCode == 1) { if (resData.errorCode == 1) {
...@@ -244,16 +245,10 @@ export default { ...@@ -244,16 +245,10 @@ export default {
} }
that.loading = true; that.loading = true;
let para = { let para = {
wxEnterpriseId: that.wxEnterpriseId,
auditType: that.filterValue,
auditStatus: '0',
auditFlag: '0',
search: that.searchValue, // 搜索字段
pageNum: that.currentPage, // 当前页 pageNum: that.currentPage, // 当前页
pageSize: that.pageSize, // 一页显示个数 pageSize: that.pageSize // 一页显示个数
enterpriseId: that.filterBrand // 20190918新增品牌
}; };
getRequest('/haoban-manage3-web/audit/find-page', para) getRequest('/redislimiter/list-module', para)
.then(res => { .then(res => {
let resData = res.data; let resData = res.data;
that.loading = false; that.loading = false;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment