elink-star
/
esua-epdc-admin-js
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

一键服务和解码锦水模块调整

feature/syp_points
liuchuang 5 years ago
parent
34442ce1b5
commit
2c7eedbcb4
5 changed files with 66 additions and 32 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 29
      src/views/modules/custom/module-add-or-update.vue
  2. 34
      src/views/modules/custom/module.vue
  3. 3
      src/views/modules/news/banner-add-or-update.vue
  4. 16
      src/views/modules/news/notice-add-or-update.vue
  5. 16
      src/views/modules/news/notice.vue

29
src/views/modules/custom/module-add-or-update.vue
View File

@ -1,8 +1,8 @@
<template>
<el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
<el-form-item label="模块名称" prop="moduleCode">
<el-select v-model="dataForm.moduleCode" placeholder="请选择模块" filterable collapse-tags @change="changeHandle($event)" :disabled="disabledModuleName">
<el-form-item label="模块分类" prop="moduleCategory">
<el-select v-model="dataForm.moduleCategory" placeholder="请选择模块分类" filterable collapse-tags >
<el-option
v-for="item in optionModuleName"
:key="item.dictValue"
@ -11,6 +11,12 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="模块名称" prop="name">
<el-input v-model="dataForm.name" placeholder="模块名称" maxlength="50" show-word-limit></el-input>
</el-form-item>
<el-form-item label="模块编码" prop="moduleCode">
<el-input v-model="dataForm.moduleCode" placeholder="模块编码" maxlength="50" show-word-limit></el-input>
</el-form-item>
<el-row>
<el-form-item label="模块图片"
v-loading="loading" prop="imgUrl">
@ -64,6 +70,7 @@ export default {
dataForm: {
id: '',
moduleCode: '',
moduleCategory: '',
name: '',
imgUrl: '',
sort: '',
@ -87,13 +94,18 @@ export default {
optionModuleName: [],
// 图片
loading: false,
uploadUrl: '',
disabledModuleName: false
uploadUrl: ''
}
},
computed: {
dataRule () {
return {
name: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
moduleCategory: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
moduleCode: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
@ -117,23 +129,14 @@ export default {
methods: {
init () {
this.visible = true
this.disabledModuleName = false
this.dataForm.imgUrl = ''
this.$nextTick(() => {
this.$refs['dataForm'].resetFields()
if (this.dataForm.id) {
this.disabledModuleName = true
this.getInfo()
}
})
},
changeHandle (value) {
let obj = {}
obj = this.optionModuleName.find((item) => {
return item.dictValue === value
})
this.dataForm.name = obj.dictName
},
// 获取信息
getInfo () {
this.$http.get(`/custom/module/${this.dataForm.id}`).then(({ data: res }) => {

34
src/views/modules/custom/module.vue
View File

@ -19,9 +19,10 @@
</el-form-item>
</el-form>
<el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
<el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
<el-table-column prop="moduleCode" label="模块编码" header-align="center" align="center"></el-table-column>
<el-table-column type="selection" header-align="center" align="center" width="40"></el-table-column>
<el-table-column prop="name" label="模块名称" header-align="center" align="center"></el-table-column>
<el-table-column prop="moduleCode" label="模块编码" header-align="center" align="center" width="170"></el-table-column>
<el-table-column prop="moduleCategory" label="模块分类" header-align="center" align="center" :formatter="moduleTypeFormat"></el-table-column>
<el-table-column align="center" label="模块图片" :show-overflow-tooltip="true" prop="imgUrl">
<template slot-scope="scope">
<el-popover placement="right"
@ -38,10 +39,10 @@
</el-popover>
</template>
</el-table-column>
<el-table-column prop="sort" label="排序" header-align="center" align="center"></el-table-column>
<el-table-column prop="enableFlag" label="启用标识" :formatter="showFlagFormatter" header-align="center" align="center"></el-table-column>
<el-table-column prop="enableFlag" label="启用标识" :formatter="showFlagFormatter" header-align="center" align="center" width="80"></el-table-column>
<el-table-column prop="sort" label="排序" header-align="center" align="center" width="60"></el-table-column>
<el-table-column prop="remark" label="备注" header-align="center" align="center"></el-table-column>
<el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
<el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="130">
<template slot-scope="scope">
<el-button v-if="$hasPermission('custom:module:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
<el-button v-if="$hasPermission('custom:module:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
@ -79,15 +80,36 @@ export default {
},
dataForm: {
id: ''
}
},
optionModuleName: []
}
},
created () {
this.getListSimpleByDictType()
this.getNoticeCategory()
},
methods: {
showFlagFormatter: function (row, column) {
if (row.enableFlag === '0') {
return '否'
}
return '是'
},
// 获取模块名称[参数：moduleType]
getListSimpleByDictType () {
this.$http.get(`/custom/module/listSimple/moduleType`).then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
this.optionModuleName = res.data
}).catch(() => {})
},
moduleTypeFormat (row, column) {
for (var property in this.optionModuleName) {
if (row.moduleCategory === this.optionModuleName[property].dictValue) {
return this.optionModuleName[property].dictName
}
}
}
},
components: {

3
src/views/modules/news/banner-add-or-update.vue
View File

@ -147,9 +147,6 @@ export default {
computed: {
dataRule () {
return {
url: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
title: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],

16
src/views/modules/news/notice-add-or-update.vue
View File

@ -38,9 +38,9 @@
<el-select v-model="dataForm.noticeCategory" placeholder="请选择模块">
<el-option
v-for="item in optionNoticeCategoryCode"
:key="item.dictValue"
:label="item.dictName"
:value="item.dictValue">
:key="item.moduleCode"
:label="item.name"
:value="item.moduleCode">
</el-option>
</el-select>
</el-form-item>
@ -51,6 +51,13 @@
show-word-limit
placeholder="通知标题"></el-input>
</el-form-item>
<el-form-item label="联系电话"
prop="mobile">
<el-input v-model="dataForm.mobile"
maxlength="20"
show-word-limit
placeholder="联系电话"></el-input>
</el-form-item>
<el-form-item prop="noticeContent"
label="通知内容">
<el-row style="height: 550px;">
@ -96,6 +103,7 @@ export default {
gridId: null,
grid: null,
noticeTitle: '',
mobile: '',
noticeContent: '',
allDeptIdsShow: []
},
@ -332,7 +340,7 @@ export default {
this.loading = false
},
getListSimpleByDictType () {
this.$http.get(`/news/notice/listSimple/notice_category`).then(({ data: res }) => {
this.$http.get(`/custom/module/noticeCategory`).then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}

16
src/views/modules/news/notice.vue
View File

@ -14,9 +14,9 @@
<el-select v-model="dataForm.noticeCategory" placeholder="请选择模块" clearable>
<el-option
v-for="item in optionNoticeCategoryCode"
:key="item.dictValue"
:label="item.dictName"
:value="item.dictValue">
:key="item.moduleCode"
:label="item.name"
:value="item.moduleCode">
</el-option>
</el-select>
</el-form-item>
@ -52,6 +52,10 @@
header-align="center"
align="center"
:formatter="noticeCategoryFormat"></el-table-column>
<el-table-column prop="mobile"
label="联系电话"
header-align="center"
align="center"></el-table-column>
<el-table-column prop="readingAmount"
label="阅读量"
header-align="center"
@ -172,7 +176,7 @@ export default {
}
},
getListSimpleByDictType () {
this.$http.get(`/news/notice/listSimple/notice_category`).then(({ data: res }) => {
this.$http.get(`/custom/module/noticeCategory`).then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
@ -181,8 +185,8 @@ export default {
},
noticeCategoryFormat (row, column) {
for (var property in this.optionNoticeCategoryCode) {
if (row.noticeCategory === this.optionNoticeCategoryCode[property].dictValue) {
return this.optionNoticeCategoryCode[property].dictName
if (row.noticeCategory === this.optionNoticeCategoryCode[property].moduleCode) {
return this.optionNoticeCategoryCode[property].name
}
}
}

Write Preview
Loading…
Cancel
Save