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

Merge branch 'dev_data' of http://121.42.41.42:7070/r/esua-epdc-admin into dev_data

master
李鹏飞 6 years ago
parent
a7ae7860f5 74b8b5891e
commit
7f3ddece2a
5 changed files with 70 additions and 34 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. 36
      src/views/modules/organize/deptofficer-add-or-update.vue
  2. 36
      src/views/modules/organize/deptofficer-add.vue
  3. 22
      src/views/modules/organize/metaSysDeptManagement-add-or-update.vue
  4. 1
      src/views/modules/organize/metasysdept.vue
  5. 9
      src/views/modules/organize/metasysdeptManagement.vue

36
src/views/modules/organize/deptofficer-add-or-update.vue
View File

@ -1,31 +1,34 @@
<template>
<el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
<el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false" customClass="customWidth">
<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="name">
<el-input v-model="dataForm.name" placeholder="姓名" maxlength="10"></el-input>
<el-input v-model="dataForm.name" placeholder="姓名" maxlength="10" style="width:75%"></el-input>
</el-form-item>
<el-form-item label="性别" prop="sex">
<el-select v-model="dataForm.sex" placeholder="性别">
<el-select v-model="dataForm.sex" placeholder="性别" style="width:75%">
<el-option v-for="item in sexFlagArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="职位" prop="position">
<el-input v-model="dataForm.position" placeholder="职位" maxlength="10"></el-input>
<el-input v-model="dataForm.position" placeholder="职位" maxlength="10" style="width:75%"></el-input>
</el-form-item>
<el-form-item label="联系方式" prop="mobile">
<el-input v-model="dataForm.mobile" placeholder="联系方式"></el-input>
<el-input v-model="dataForm.mobile" placeholder="联系方式" style="width:75%"></el-input>
</el-form-item>
<el-form-item label="排序" prop="sort">
<el-input-number v-model="dataForm.sort" controls-position="right" :min="1" label="显示顺序" max=2000000000></el-input-number>
<el-input-number v-model="dataForm.sort" controls-position="right" :min="1" label="显示顺序" max=2000000000 style="width:75%"></el-input-number>
</el-form-item>
<el-form-item label="主显标识" prop="masterFlag">
<el-input v-model="dataForm.masterFlag" placeholder="主显标识" maxlength="10" disabled></el-input>
<el-form-item label="主显标识" prop="masterFlag">
<el-select v-model="dataForm.masterFlag" placeholder="主显标识" disabled style="width:75%">
<el-option v-for="item in masterFlagArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
</el-option>
</el-select>
</el-form-item>
</el-form>
<template slot="footer">
<el-button @click="visible = false">{{ $t('cancel') }}</el-button>
<el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
<el-button type="primary" @click="dataFormSubmitHandle()" :disabled="isAble">{{ $t('confirm') }}</el-button>
</template>
</el-dialog>
</template>
@ -55,7 +58,12 @@ export default {
sexFlagArr: [
{ dictValue: '1', dictName: '男' },
{ dictValue: '0', dictName: '女' }
]
],
masterFlagArr: [
{ dictValue: '1', dictName: '是' },
{ dictValue: '0', dictName: '否' }
],
isAble: false
}
},
computed: {
@ -129,8 +137,10 @@ export default {
if (!valid) {
return false
}
this.isAble = true
this.$http[!this.dataForm.id ? 'post' : 'put']('/cloudAnalysis/deptofficer/', this.dataForm).then(({ data: res }) => {
if (res.code !== 0) {
this.isAble = false
return this.$message.error(res.msg)
}
this.$message({
@ -138,6 +148,7 @@ export default {
type: 'success',
duration: 500,
onClose: () => {
this.isAble = false
this.visible = false
this.$emit('refreshDataList')
}
@ -148,3 +159,8 @@ export default {
}
}
</script>
<style lang="scss">
.customWidth {
width:30%
}
</style>

36
src/views/modules/organize/deptofficer-add.vue
View File

@ -1,31 +1,34 @@
<template>
<el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
<el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false" customClass="customWidth">
<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="name">
<el-input v-model="dataForm.name" placeholder="姓名" maxlength="10"></el-input>
<el-input v-model="dataForm.name" placeholder="姓名" maxlength="10" style="width:75%"></el-input>
</el-form-item>
<el-form-item label="性别" prop="sex">
<el-select v-model="dataForm.sex" placeholder="性别">
<el-select v-model="dataForm.sex" placeholder="性别" style="width:75%">
<el-option v-for="item in sexFlagArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="职位" prop="position">
<el-input v-model="dataForm.position" placeholder="职位" maxlength="10"></el-input>
<el-input v-model="dataForm.position" placeholder="职位" maxlength="10" style="width:75%"></el-input>
</el-form-item>
<el-form-item label="联系方式" prop="mobile">
<el-input v-model="dataForm.mobile" placeholder="联系方式"></el-input>
<el-input v-model="dataForm.mobile" placeholder="联系方式" style="width:75%"></el-input>
</el-form-item>
<el-form-item label="排序" prop="sort">
<el-input-number v-model="dataForm.sort" controls-position="right" :min="1" label="显示顺序" max=2000000000></el-input-number>
<el-input-number v-model="dataForm.sort" controls-position="right" :min="1" label="显示顺序" max=2000000000 style="width:75%"></el-input-number>
</el-form-item>
<el-form-item label="主显标识" prop="masterFlag">
<el-input v-model="dataForm.masterFlag" placeholder="主显标识" maxlength="10" disabled></el-input>
<el-form-item label="主显标识" prop="masterFlag">
<el-select v-model="dataForm.masterFlag" placeholder="主显标识" disabled style="width:75%">
<el-option v-for="item in masterFlagArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
</el-option>
</el-select>
</el-form-item>
</el-form>
<template slot="footer">
<el-button @click="visible = false">{{ $t('cancel') }}</el-button>
<el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
<el-button type="primary" @click="dataFormSubmitHandle()" :disabled="isAble">{{ $t('confirm') }}</el-button>
</template>
</el-dialog>
</template>
@ -55,7 +58,12 @@ export default {
sexFlagArr: [
{ dictValue: '1', dictName: '男' },
{ dictValue: '0', dictName: '女' }
]
],
masterFlagArr: [
{ dictValue: '1', dictName: '是' },
{ dictValue: '0', dictName: '否' }
],
isAble: false
}
},
computed: {
@ -132,8 +140,10 @@ export default {
if (!valid) {
return false
}
this.isAble = true
this.$http[!this.dataForm.id ? 'post' : 'put']('/cloudAnalysis/deptofficer/', this.dataForm).then(({ data: res }) => {
if (res.code !== 0) {
this.isAble = false
return this.$message.error(res.msg)
}
this.$message({
@ -141,6 +151,7 @@ export default {
type: 'success',
duration: 500,
onClose: () => {
this.isAble = false
this.visible = false
this.$emit('refreshDataList')
}
@ -151,3 +162,8 @@ export default {
}
}
</script>
<style lang="scss">
.customWidth {
width:30%
}
</style>

22
src/views/modules/organize/metaSysDeptManagement-add-or-update.vue
View File

@ -2,7 +2,8 @@
<el-dialog :visible.sync="visible"
:title="!dataForm.id ? $t('add') : $t('update')"
:close-on-click-modal="false"
:close-on-press-escape="false">
:close-on-press-escape="false"
customClass="customWidth">
<el-form :model="dataForm"
:rules="dataRule"
ref="dataForm"
@ -11,12 +12,12 @@
<el-form-item prop="name"
:label="$t('dept.name')">
<el-input v-model="dataForm.name"
:placeholder="$t('dept.name')"></el-input>
:placeholder="$t('dept.name')" style="width: 75%"></el-input>
</el-form-item>
<el-form-item prop="partyCode"
:label="$t('dept.partyCode')">
<el-input v-model="dataForm.partyCode"
:placeholder="$t('dept.partyCode')" :disabled="true"></el-input>
:placeholder="$t('dept.partyCode')" :disabled="true" style="width: 75%"></el-input>
</el-form-item>
<el-form-item prop="parentName"
:label="$t('dept.parentName')"
@ -38,7 +39,7 @@
<el-input v-model="dataForm.parentName"
v-popover:deptListPopover
:readonly="true"
:placeholder="$t('dept.parentName')" :disabled="true">
:placeholder="$t('dept.parentName')" :disabled="true" style="width: 75%">
<i v-if="$store.state.user.superAdmin === 1 && dataForm.pid !== '0'"
slot="suffix"
@click.stop="deptListTreeSetDefaultHandle()"
@ -50,7 +51,7 @@
prop="typeKey">
<el-select v-model="dataForm.typeKey"
@change="changeOrgType"
placeholder="机构类型" :disabled="true">
placeholder="机构类型" :disabled="true" style="width: 75%">
<el-option v-for="item in secondOrgDictList"
:key="item.dictValue"
:label="item.dictName"
@ -63,13 +64,13 @@
<el-input-number v-model="dataForm.sort"
controls-position="right"
:min="0"
:label="$t('dept.sort')"></el-input-number>
:label="$t('dept.sort')" style="width: 75%"></el-input-number>
</el-form-item>
</el-form>
<template slot="footer">
<el-button @click="visible = false">{{ $t('cancel') }}</el-button>
<el-button type="primary"
@click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
@click="dataFormSubmitHandle()" :disabled="isAble">{{ $t('confirm') }}</el-button>
</template>
</el-dialog>
</template>
@ -82,6 +83,7 @@ export default {
visible: false,
deptList: [],
deptListVisible: false,
isAble: false,
dataForm: {
id: '',
name: '',
@ -179,15 +181,18 @@ export default {
if (!valid) {
return false
}
this.isAble = true
this.$http[!this.dataForm.id ? 'post' : 'put']('/cloudAnalysis/metaSysdeptManager', this.dataForm).then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
this.isAble = false
this.$message({
message: this.$t('prompt.success'),
type: 'success',
duration: 500,
onClose: () => {
this.isAble = false
this.visible = false
this.$emit('refreshDataList')
}
@ -208,4 +213,7 @@ export default {
}
}
}
.customWidth {
width:30%;
}
</style>

1
src/views/modules/organize/metasysdept.vue
View File

@ -22,6 +22,7 @@
</el-form>
<el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
<el-table-column prop="name" label="名称" header-align="center"></el-table-column>
<el-table-column prop="parentName" label="上级部门" header-align="center"></el-table-column>
<el-table-column prop="sort" label="排序" header-align="center" align="center" width="80"></el-table-column>
<el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
<template slot-scope="scope">

9
src/views/modules/organize/metasysdeptManagement.vue
View File

@ -13,20 +13,15 @@
<el-form-item>
<el-button @click="getDataList()">{{ $t('query') }}</el-button>
</el-form-item>
<el-form-item>
<el-button v-if="$hasPermission('sys:metasysdept:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
</el-form-item>
<el-form-item>
<el-button v-if="$hasPermission('sys:metasysdept:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
</el-form-item>
</el-form>
<el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
<el-table-column prop="name" label="名称" header-align="center"></el-table-column>
<el-table-column prop="parentName" label="上级部门" header-align="center"></el-table-column>
<el-table-column prop="sort" label="排序" header-align="center" align="center" width="80"></el-table-column>
<el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
<template slot-scope="scope">
<el-button v-if="$hasPermission('sys:metasysdeptManagement:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
<el-button v-if="$hasPermission('sys:metasysdeptManagement:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
<el-button type="text" size="small" @click="lookHandle(scope.row.id,scope.row.pid)" :disabled="scope.row.typeKey == 'grid_party'">查看</el-button>
</template>
</el-table-column>

Write Preview
Loading…
Cancel
Save