From 42636c58501d68650ef5323676eee3bdea292347 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期三, 23 八月 2023 17:08:02 +0800
Subject: [PATCH] 1.组织架构优化
---
src/views/basicSettings/organizationList.vue | 749 +++++++++++++++-----------------------------------------
1 files changed, 204 insertions(+), 545 deletions(-)
diff --git a/src/views/basicSettings/organizationList.vue b/src/views/basicSettings/organizationList.vue
index 095265b..c807f9e 100644
--- a/src/views/basicSettings/organizationList.vue
+++ b/src/views/basicSettings/organizationList.vue
@@ -1,10 +1,10 @@
<template>
<div>
<div class="body" :style="{height:mainHeight+'px'}">
-
- <div class="bodyTopButtonGroup">
+ <div class="bodyTopButtonGroup" style="justify-content: space-between">
<el-button v-waves type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
</div>
+
<div class="bodyTopFormGroup">
<el-form
ref="form"
@@ -15,164 +15,99 @@
>
<div class="elForm">
<el-form-item label="缁勭粐缂栫爜" style=" display: flex;">
- <el-input v-model="form.OrgCode" placeholder="璇疯緭鍏�" style="width: 200px" />
+ <el-input v-model="form.storg_code" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item label="缁勭粐鍚嶇О" style=" display: flex;">
- <el-input v-model="form.OrgName" placeholder="璇疯緭鍏�" style="width: 200px" />
- </el-form-item>
- <el-form-item label="缁勭粐绫诲瀷" style=" display: flex;">
- <el-select
- v-model="form.OrgType"
- :popper-append-to-body="false"
- filterable
- style="width: 200px"
- placeholder="璇烽�夋嫨"
- >
- <el-option
- v-for="item in OrgTypeArr"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- />
- </el-select>
- </el-form-item>
- <el-form-item label="鍒涘缓浜哄憳" style=" display: flex;">
- <el-input v-model="form.UserName" style="width: 200px" placeholder="璇疯緭鍏�" />
+ <el-input v-model="form.storg_name" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
</div>
<div
class="bodySearchReset"
:style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}"
>
- <el-button v-waves type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
+ <el-button v-waves type="primary" icon="el-icon-search" @click="getSTorgData">鏌ヨ</el-button>
<el-button v-waves type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
</div>
</el-form>
- <div
- class="bodyTopFormExpand"
- />
+
</div>
+
<div class="elTableDiv">
- <TableColumnSettings
- :list1="tableColumnSettingsArray"
- @tableColumnUpdate="tableColumnUpdate"
- />
<el-table
ref="tableDataRef"
- :key="tableTimeStampKey"
class="tableFixed"
:data="tableData"
- border
- :row-class-name="tableRowClassName"
- :style="{width: 100+'%',height:tableHeight+'px'}"
- highlight-current-row
:height="tableHeight+'px'"
+ border
+ row-class-name="custom-row"
+ :style="{width: 100+'%',height:tableHeight+'px',}"
+ highlight-current-row
+ row-key="torg_code"
+ default-expand-all
:header-cell-style="this.$headerCellStyle"
:cell-style="this.$cellStyle"
@sort-change="sortChange"
>
-
+ <!-- <el-table-column-->
+ <!-- prop="rowNum"-->
+ <!-- width="120"-->
+ <!-- fixed-->
+ <!-- label="搴忓彿"-->
+ <!-- />-->
<el-table-column
- v-for="item in tableColumnSettingsArray"
- v-if="item.show"
- :key="item.id"
- :sortable="item.sortable"
- :prop="item.prop"
- :min-width="item.minWidth"
- :label="item.label"
- :width="item.width"
- show-tooltip-when-overflow
- :fixed="item.fixed?(item.fixed==='left'?'left':'right'):false"
+ prop="torg_code"
+ label="缁勭粐缂栫爜"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="torg_name"
+ label="缁勭粐鍚嶇О"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="status"
+ label="鐘舵��"
+ sortable="custom"
>
<template slot-scope="{row}">
- <div v-if="row[item.prop]==='D'&&item.prop==='description'">閮ㄩ棬</div>
- <div v-else-if="row[item.prop]==='W'&&item.prop==='description'">杞﹂棿</div>
- <div v-else-if="!row[item.prop]">/</div>
- <div v-else>{{ row[item.prop] }}</div>
+ <el-tag v-if="row.status==='Y'" size="small" type="success">姝ｅ父</el-tag>
+ <el-tag v-if="row.status==='N'" size="small" type="danger">鍋滅敤</el-tag>
</template>
</el-table-column>
-
- <!-- <el-table-column-->
- <!-- prop="RowNum"-->
- <!-- width="50"-->
- <!-- label="搴忓彿"-->
- <!-- fixed-->
- <!-- />-->
- <!-- <el-table-column-->
- <!-- prop="org_code"-->
- <!-- label="缁勭粐缂栫爜"-->
- <!-- sortable="custom"-->
- <!-- show-tooltip-when-overflow-->
- <!-- min-width="110"-->
- <!-- />-->
- <!-- <el-table-column-->
- <!-- prop="org_name"-->
- <!-- label="缁勭粐鍚嶇О"-->
- <!-- sortable="custom"-->
- <!-- show-tooltip-when-overflow-->
- <!-- min-width="110"-->
- <!-- />-->
- <!-- <el-table-column-->
- <!-- prop="description"-->
- <!-- label="缁勭粐绫诲瀷"-->
- <!-- min-width="110"-->
- <!-- show-tooltip-when-overflow-->
- <!-- sortable="custom"-->
- <!-- >-->
- <!-- <template slot-scope="{row}">-->
- <!-- <!– <div v-if="row.description==='F'">宸ュ巶</div>–>-->
- <!-- <div v-if="row.description==='D'">閮ㄩ棬</div>-->
- <!-- <div v-if="row.description==='W'">杞﹂棿</div>-->
- <!-- <!– <div v-if="row.description==='K'">绉戝</div>–>-->
- <!-- <!– <div v-if="row.description==='L'">鐢熶骇绾�</div>–>-->
- <!-- </template>-->
- <!-- </el-table-column>-->
- <!-- <el-table-column-->
- <!-- prop="parentorg_name"-->
- <!-- label="涓婄骇鍗曚綅"-->
- <!-- sortable="custom"-->
- <!-- show-tooltip-when-overflow-->
- <!-- min-widt="110"-->
- <!-- >-->
- <!-- <template slot-scope="{row}">-->
- <!-- <div v-if="row.parentorg_name===null">/</div>-->
- <!-- <div v-else>{{ row.parentorg_name }}</div>-->
- <!-- </template>-->
- <!-- </el-table-column>-->
- <!-- <el-table-column-->
- <!-- prop="lm_user"-->
- <!-- label="鍒涘缓浜哄憳"-->
- <!-- width="110"-->
- <!-- show-tooltip-when-overflow-->
- <!-- sortable="custom"-->
- <!-- />-->
- <!-- <el-table-column-->
- <!-- prop="lm_date"-->
- <!-- label="鍒涘缓鏃堕棿"-->
- <!-- width="160"-->
- <!-- show-tooltip-when-overflow-->
- <!-- sortable="custom"-->
- <!-- />-->
<el-table-column
- fixed="right"
+ prop="username"
+ label="鍒涘缓浜哄憳"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="lm_date"
+ label="鍒涘缓鏃堕棿"
+ width="160"
+ sortable="custom"
+ />
+ <el-table-column
label="鎿嶄綔"
width="120"
+ fixed="right"
>
<template slot-scope="{row}">
<div class="operationClass">
<el-tooltip class="item" effect="dark" content="缂栬緫" placement="top">
<i
- :style="{color:$store.state.settings.theme}"
+ v-if="row.leve!==0"
class="el-icon-edit-outline"
+ :style="{color:$store.state.settings.theme}"
@click="edit('edit',row)"
/>
</el-tooltip>
<el-tooltip v-del-tab-index class="item" effect="dark" content="鍒犻櫎" placement="top">
- <i :style="{color:$store.state.settings.theme}" class="el-icon-delete" @click="del(row)" />
+ <i
+ v-if="row.leve!==0"
+ class="el-icon-delete"
+ :style="{color:$store.state.settings.theme}"
+ @click="del(row)"
+ />
</el-tooltip>
- <!-- <el-button type="primary" size="mini" />-->
- <!-- <el-button type="danger" size="mini">鍒犻櫎</el-button>-->
-
</div>
</template>
</el-table-column>
@@ -184,9 +119,9 @@
:page.sync="form.page"
:limit.sync="form.rows"
align="right"
- layout="total ,prev, pager, next, sizes,jumper "
+ layout="total,prev, pager, next,sizes,jumper"
popper-class="select_bottom"
- @pagination="getOrganizationSearch"
+ @pagination="getSTorgData"
/>
</div>
@@ -195,46 +130,34 @@
:title="operation==='add'?'鏂板':'缂栬緫'"
:visible.sync="dialogVisible"
width="800px"
- top="15vh"
:close-on-click-modal="false"
+ top="15vh"
@closed="handleClose"
@close="handleClose"
>
- <el-form ref="dialogForm" :rules="dialogFormRules" :model="dialogForm" label-width="80px">
- <el-form-item v-if="$store.state.settings.orgType===''" label="缁勭粐绫诲瀷" prop="OrgType">
- <el-radio-group
- v-model="dialogForm.OrgType"
- :disabled="operation==='edit'"
- >
- <el-radio
- v-for="item in OrgTypeArr"
- :key="item.value"
- :value="item.value"
- :label="item.label"
- />
- </el-radio-group>
+ <el-form ref="dialogForm" inline :rules="dialogFormRules" :model="dialogForm" label-width="80px">
+ <el-form-item label="缁勭粐缂栫爜" prop="OrganCode">
+ <el-input v-model="dialogForm.OrganCode" :disabled="operation!=='add'" style="width: 200px" />
</el-form-item>
- <el-form-item label="缁勭粐缂栫爜" prop="OrgCode">
- <el-input v-model="dialogForm.OrgCode" :disabled="operation!=='add'" style="width: 200px" />
+ <el-form-item label="缁勭粐鍚嶇О" prop="OrganName">
+ <el-input v-model="dialogForm.OrganName" style="width: 200px" />
</el-form-item>
- <el-form-item label="缁勭粐鍚嶇О" prop="OrgName">
- <el-input v-model="dialogForm.OrgName" style="width: 200px" />
- </el-form-item>
- <el-form-item v-if="dialogForm.OrgType!=='閮ㄩ棬'&&$store.state.settings.orgType===''" prop="SupUnit" label="涓婄骇鍗曚綅">
- <el-select
- v-model="dialogForm.SupUnit"
- style="width: 200px"
+ <el-form-item label="鎵�灞炵粍缁�" prop="storgcode">
+ <el-cascader
+ ref="cascader"
+ v-model="dialogForm.storgcode"
+ :options="cascaderOptions"
filterable
- :popper-append-to-body="false"
- placeholder="璇烽�夋嫨"
- >
- <el-option
- v-for="item in SupUnitArr"
- :key="item.id"
- :label="item.org_name+' / '+item.org_code"
- :value="item.id"
- />
- </el-select>
+ :props="defaultProps"
+ :show-all-levels="false"
+ @change="cascaderChange"
+ />
+ </el-form-item>
+ <el-form-item required label="缁勭粐鐘舵��">
+ <el-radio-group v-model="dialogForm.status">
+ <el-radio label="Y">姝ｅ父</el-radio>
+ <el-radio label="N">鍋滅敤</el-radio>
+ </el-radio-group>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
@@ -250,245 +173,103 @@
</div>
</span>
</el-dialog>
+
</div>
</template>
<script>
import Pagination from '@/components/Pagination'
-import { AddUpdateOrganization, DeleteOrganization, OrganizationSearch, PrentOrganization } from '@/api/basicSettings'
-import { getCookie } from '@/utils/auth'
+import {
+ AddUpdateOrganization,
+ DeleteOrganization,
+ STorgData
+} from '@/api/basicSettings'
import { validateCode } from '@/utils/global'
-import TableColumnSettings from '@/components/TableColumnSettings'
-import elDragDialog from '@/directive/el-drag-dialog' // base on element-ui
-import waves from '@/directive/waves/index.js' // 姘存尝绾规寚浠�
+import elDragDialog from '@/directive/el-drag-dialog'
+import waves from '@/directive/waves'
+import arrayToTree from 'array-to-tree'
+import { PrentOrganization } from '@/api/GeneralBasicData'
-// const SER_HZ = /^[\u4e00-\u9fa5]+$/
-// const SER_HZ = /^[a-zA-Z0-9_;,.<>() ]{0,}$/
export default {
- name: 'ZZJG',
+ name: 'Zzjg',
components: {
- Pagination, TableColumnSettings
+ Pagination
},
directives: { elDragDialog, waves },
data() {
- // const validateName = (rule, value, callback) => {
- // if (!value) {
- // return callback(new Error('璇疯緭鍏ョ紪鐮�'))
- // } else {
- // if (!this.$SER_HZ.test(value)) {
- // return callback(new Error('缂栫爜涓嶈兘鍚湁涓枃鎴栫壒娈婂瓧绗�'))
- // } else {
- // callback()
- // }
- // }
- // }
- const validateTypeCode = (rule, value, callback) => {
- if (!value) {
- return callback(new Error('璇烽�夋嫨涓婄骇'))
- } else {
- callback()
- }
- }
return {
- windowHeight: 0,
- windowWidth: 0,
mainHeight: 0,
tableHeight: 0,
- numvalue: 0,
form: {
- OrgCode: '', // 缁勭粐鏋舵瀯浠ｇ爜
- OrgName: '', // 缁勭粐鏋舵瀯鍚嶇О
- OrgType: '', // 缁勭粐绫诲瀷
- UserName: '', // 鍒涘缓浜哄憳
+ storg_code: '', // 缁勭粐鏋舵瀯缂栫爜
+ storg_name: '', // 缁勭粐鏋舵瀯鍚嶇О
prop: 'lm_date', // 鎺掑簭瀛楁
order: 'desc', // 鎺掑簭瀛楁
page: 1, // 绗嚑椤�
rows: 20 // 姣忛〉澶氬皯鏉�
},
- OrgTypeArr: [
- // { label: '宸ュ巶', value: 'F' },
- { label: '閮ㄩ棬', value: 'D' },
- { label: '杞﹂棿', value: 'W' }
- // { label: '绉戝', value: 'K' },
- // { label: '鐢熶骇绾�', value: 'L' }
- ],
- tableColumnSettingsArray: [
- { minWidth: 50, width: false, prop: 'id', label: 'id', id: 1, show: false, fixed: false, sortable: false }, // 闅愯棌鍒� show: false闅愯棌锛宼rue鏄剧ず
- { minWidth: 25, width: 50, prop: 'RowNum', label: '搴忓彿', id: 2, show: true, fixed: 'left', sortable: false }, // custom
- {
- minWidth: 110,
- width: false,
- prop: 'org_code',
- label: '缁勭粐缂栫爜',
- id: 3,
- show: true,
- fixed: false,
- sortable: true
- },
- {
- minWidth: 110,
- width: false,
- prop: 'org_name',
- label: '缁勭粐鍚嶇О',
- id: 4,
- show: true,
- fixed: false,
- sortable: true
- },
- {
- minWidth: 110,
- width: false,
- prop: 'description',
- label: '缁勭粐绫诲瀷',
- id: 5,
- show: true,
- fixed: false,
- sortable: true
- },
- {
- minWidth: 110,
- width: false,
- prop: 'parent_id',
- label: '涓婄骇id',
- id: 6,
- show: false,
- fixed: false,
- sortable: true
- },
- {
- minWidth: 110,
- width: false,
- prop: 'parentorg_code',
- label: '涓婄骇缂栫爜',
- id: 7,
- show: false,
- fixed: false,
- sortable: true
- },
- {
- minWidth: 110,
- width: false,
- prop: 'parentorg_name',
- label: '涓婄骇鍗曚綅',
- id: 8,
- show: true,
- fixed: false,
- sortable: true
- },
- {
- minWidth: 110,
- width: false,
- prop: 'lm_user',
- label: '鍒涘缓浜哄憳',
- id: 9,
- show: true,
- fixed: false,
- sortable: true
- },
- {
- minWidth: 110,
- width: false,
- prop: 'lm_date',
- label: '鍒涘缓鏃堕棿',
- id: 10,
- show: true,
- fixed: false,
- sortable: true
- }
- ],
- tableTimeStampKey: new Date().getTime(), // 琛ㄦ牸key
-
total: 10,
tableData: [],
dialogVisible: false,
dialogForm: {
- OrgType: '閮ㄩ棬',
- OrgCode: '',
- OrgName: '',
- SupUnit: ''// 涓婄骇鍗曚綅
+ OrganCode: '', // 缁勭粐缂栫爜
+ OrganName: '', // 缁勭粐鍚嶇О
+ leve: 0, // 灞傜骇缂栫爜
+ storgcode: '', // 鐖剁骇缂栫爜
+ parent_id: '', // 鍘焢id
+ torg_seq: '', // 鎺掑簭
+ status: 'Y'// 鐘舵��
},
- SupUnitArr: [],
operation: '',
dialogFormRules: {
- OrgType: [
- { required: true, message: '璇疯緭鍏ラ�夋嫨绫诲瀷', trigger: ['blur', 'change'] }
- ],
- OrgCode: [
- // { required: true, validator: validateName, trigger: ['blur', 'change'] }
+ OrganCode: [
{ required: true, validator: validateCode, trigger: ['blur', 'change'] }
],
- OrgName: [
- { required: true, message: '璇疯緭鍏ュ悕绉�', trigger: ['blur', 'change'] }
+ OrganName: [
+ { required: true, message: '璇疯緭鍏ョ粍缁囧悕绉�', trigger: ['blur', 'change'] }
],
- SupUnit: [
- { required: true, validator: validateTypeCode, trigger: ['blur', 'change'] }
+ storgcode: [
+ { required: true, message: '璇烽�夋嫨鎵�灞炵粍缁�', trigger: ['blur', 'change'] }
]
- }
+ },
+ defaultProps: {
+ checkStrictly: true,
+ expandTrigger: 'hover',
+ value: 'torg_code',
+ label: 'torg_name'
+ },
+ Options: [],
+ cascaderOptions: []
}
},
- // watch: {
- // windowHeight(val) {
- // console.log('瀹炴椂灞忓箷楂樺害锛�', val, this.windowHeight)
- // },
- // windowWidth(val) {
- // if (val < 768) {
- // this.dialogWidth = '100%'
- // } else {
- // this.dialogWidth = '75%'
- // }
- // console.log('瀹炴椂灞忓箷瀹藉害锛�', val, this.windowHeight)
- // }
- // },
created() {
- this.handleRequest()
+ this.getSTorgData()
},
mounted() {
window.addEventListener('resize', this.getHeight)
this.getHeight()
-
- // console.log('椤甸潰杩涘叆鏃剁殑瀹藉害锛�', document.body.clientWidth)
- // if (document.body.clientWidth < 768) {
- // this.dialogWidth = '100%'
- // }
- //
- // // <!--鎶妛indow.onresize浜嬩欢鎸傚湪鍒癿ounted鍑芥暟涓�-->
- // window.onresize = () => {
- // return (() => {
- // this.windowHeight = document.documentElement.clientHeight// 楂�
- // this.windowWidth = document.documentElement.clientWidth // 瀹�
- // })()
- // }
- },
- destroyed() {
-
},
methods: {
- tableColumnUpdate(val, isCopyTrue) {
- if (isCopyTrue) {
- this.tableColumnSettingsArray = val
- }
- this.tableTimeStampKey = new Date().getTime()
- this.$refs.tableDataRef.doLayout()
- },
-
- handleRequest() {
- this.getOrganizationSearch().then(res => {
- // if (res.code === '200') {
- // this.getPrentOrganization()
- // }
+ // 缁勭粐鏋舵瀯澶у垪琛ㄦ煡璇�
+ async getSTorgData() {
+ const res = await STorgData(this.form)
+ this.tableData = arrayToTree(res.data, {
+ parentProperty: 'parent_id',
+ customID: 'torg_code',
+ childrenProperty: 'children'
})
- },
- async getOrganizationSearch() {
- const res = await OrganizationSearch(this.form)
- this.tableData = res.data
this.total = res.count
-
- return { code: res.code }
},
+ // 缁勭粐鏋舵瀯绾ц仈閫夋嫨鍣�
async getPrentOrganization() {
- const { data: res } = await PrentOrganization({ orgcode: 'W' })
- this.SupUnitArr = res
+ const { data: res } = await PrentOrganization()
+ this.Options = res
+ this.cascaderOptions = arrayToTree(res, {
+ parentProperty: 'parent_id',
+ customID: 'torg_code',
+ childrenProperty: 'children'
+ })
},
// 鎺掑簭鏀瑰彉鏃�
sortChange({ column, prop, order }) {
@@ -501,95 +282,109 @@
}
this.form.order = order
this.form.prop = prop
- this.getOrganizationSearch()
- },
- // 鏌ヨ
- search() {
- this.getOrganizationSearch()
+ this.getSTorgData()
},
// 閲嶇疆
reset() {
- this.form.OrgCode = ''
- this.form.OrgName = ''
- this.form.OrgType = ''
- this.form.UserName = ''
- this.getOrganizationSearch()
+ this.form.storg_code = ''
+ this.form.storg_name = ''
+ this.getSTorgData()
},
-
// 鏂板鎸夐挳
- async add(operation) {
- console.log(this.$store.state.settings.orgType, 987)
- if (this.$store.state.settings.orgType === 'W') {
- return this.$message.info('褰撳墠鐢ㄦ埛鏃犳柊澧炴潈闄愶紒')
- }
-
- await this.getPrentOrganization()
-
+ add(operation) {
this.operation = operation
this.dialogVisible = true
-
- // const res = await getNewEncodingRules(getCookie('ruleCode'))
- // this.dialogForm.OrgCode = res.RightCode
- // this.numvalue = res.numvalue
+ this.dialogForm.OperType = 'Add'
+ this.getPrentOrganization()
},
// 淇敼鎸夐挳
- async edit(operation, row) {
- if (this.$store.state.settings.orgType === 'W') {
- return this.$message.info('褰撳墠鐢ㄦ埛鏃犱慨鏀规潈闄愶紒')
- }
- await this.getPrentOrganization()
+ async edit(operation, row) {
this.operation = operation
this.dialogVisible = true
- // if (row.description === 'F') {
- // this.dialogForm.OrgType = '宸ュ巶'
- // } else
- if (row.description === 'D') {
- this.dialogForm.OrgType = '閮ㄩ棬'
- } else if (row.description === 'W') {
- this.dialogForm.OrgType = '杞﹂棿'
- }
- // else if (row.description === 'K') {
- // this.dialogForm.OrgType = '绉戝'
- // } else if (row.description === 'L') {
- // this.dialogForm.OrgType = '鐢熶骇绾�'
- // }
+ this.dialogForm.OperType = 'Update'
+ await this.getPrentOrganization()
+ this.cascaderOptions = this.filterChildren(this.cascaderOptions, row.torg_code)
this.$nextTick(() => {
- this.dialogForm.OrgCode = row.org_code
- this.dialogForm.OrgName = row.org_name
- this.dialogForm.SupUnit = row.parent_id
+ this.dialogForm.OrganCode = row.torg_code
+ this.dialogForm.OrganName = row.torg_name
+ this.dialogForm.leve = parseFloat(row.leve)
+ this.dialogForm.torg_seq = row.torg_seq
+ this.dialogForm.status = row.status
+ this.dialogForm.storgcode = this.findParent([], row.parent_id, this.cascaderOptions).reverse()
+ this.dialogForm.parent_id = row.parent_id
})
+ },
+ filterChildren(treeData, code) {
+ treeData.forEach(item => {
+ if (code.split(',').includes(item.torg_code)) {
+ item.disabled = true
+ if (item.children && item.children.length > 0) {
+ this.filterChildren(item.children, item.children.map(it => it.torg_code).join(','))
+ }
+ } else {
+ if (item.children && item.children.length > 0) {
+ this.filterChildren(item.children, code)
+ }
+ }
+ })
+ return treeData
+ },
+ // parents:鐢ㄤ簬杩斿洖鐨勬暟缁勶紝childNode:瑕佹煡璇㈢殑鑺傜偣锛宼reeData锛歫son鏍戝舰鏁版嵁
+ findParent(parents, childNode, treeData) {
+ // console.log(parents, childNode, treeData, 2)
+ for (let i = 0; i < treeData.length; i++) {
+ // 鐖惰妭鐐规煡璇㈡潯浠�
+ if (treeData[i].torg_code === childNode) {
+ // 濡傛灉鎵惧埌缁撴灉,淇濆瓨褰撳墠鑺傜偣
+ parents.push(treeData[i].torg_code)
+ // 鐢ㄥ綋鍓嶈妭鐐瑰啀鍘诲師鏁版嵁鏌ユ壘褰撳墠鑺傜偣鐨勭埗鑺傜偣
+ this.findParent(parents, treeData[i].parent_id, this.cascaderOptions)
+ break
+ } else {
+ if (treeData[i].children instanceof Array) {
+ // 娌℃壘鍒帮紝閬嶅巻璇ヨ妭鐐圭殑瀛愯妭鐐�
+ this.findParent(parents, childNode, treeData[i].children)
+ }
+ }
+ }
+ return parents
},
// 鍒犻櫎鎸夐挳
async del(row) {
- if (this.$store.state.settings.orgType === 'W') {
- return this.$message.info('褰撳墠鐢ㄦ埛鏃犲垹闄ゆ潈闄愶紒')
- }
-
this.$confirm('鏄惁纭鍒犻櫎?', '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
type: 'warning'
}).then(() => {
- DeleteOrganization({ orgid: row.id, orgcode: row.org_code }).then(res => {
+ DeleteOrganization({ orgcode: row.torg_code }).then(res => {
if (res.code === '200') {
- this.$message.success('鍒犻櫎鎴愬姛!')
+ this.$notify.success('鍒犻櫎鎴愬姛!')
if (this.form.page > 1 && this.tableData.length === 1) {
this.form.page--
}
- this.getOrganizationSearch()
+ this.getSTorgData()
}
})
}).catch(() => {
- this.$message.info('宸插彇娑堝垹闄�')
+ this.$notify.info('宸插彇娑堝垹闄�')
})
},
// 瀵硅瘽妗嗗叧闂簨浠�
handleClose() {
- this.dialogForm.OrgType = '閮ㄩ棬'
- this.dialogForm.OrgCode = ''
- this.dialogForm.OrgName = ''
- this.dialogForm.SupUnit = ''
+ this.dialogForm.OrganCode = ''
+ this.dialogForm.OrganName = ''
+ this.dialogForm.storgcode = ''
+ this.dialogForm.parent_id = ''
+ this.dialogForm.status = 'Y'
+ this.dialogForm.leve = 0
+ this.$refs.cascader.checkedValue = ''
this.$refs.dialogForm.clearValidate()
+ },
+ cascaderChange(val) {
+ const temp = this.Options.find(i => i.torg_code === val[val.length - 1])
+ this.dialogForm.storgcode = val
+ this.dialogForm.leve = parseFloat(temp.leve) + 1
+ this.dialogForm.torg_seq = this.Options.filter(i => i.parent_id === val[val.length - 1]).length + 1
},
// 瀵硅瘽妗嗗彇娑�
dialogVisibleCancel() {
@@ -600,27 +395,15 @@
this.$refs.dialogForm.validate(valid => {
if (valid) {
this.$store.state.app.buttonIsDisabled = true
- const data = {
- OrganType: this.$store.state.settings.orgType !== '' ? 'W' : (this.dialogForm.OrgType === '閮ㄩ棬' ? 'D' : 'W'),
- OrganCode: this.dialogForm.OrgCode,
- OrganName: this.dialogForm.OrgName,
- RightCode: '',
- numvalue: '',
- // RightCode: this.operation === 'add' ? getCookie('ruleCode') : '',
- // numvalue: this.operation === 'add' ? this.numvalue : '',
- SupUnit: this.$store.state.settings.orgType !== '' ? this.SupUnitArr.find(i => i.org_code === getCookie('stu_torgcode')).id : (this.dialogForm.OrgType === '閮ㄩ棬' ? '0' : this.dialogForm.SupUnit),
- OperType: this.operation === 'add' ? 'Add' : 'Update',
- Operator: getCookie('admin')
- }
-
- AddUpdateOrganization(data).then(res => {
+ this.dialogForm.storgcode = this.dialogForm.storgcode[this.dialogForm.storgcode.length - 1]
+ AddUpdateOrganization(this.dialogForm).then(res => {
if (res.code === '200') {
+ this.$notify.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
this.dialogVisible = false
- this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
- this.getOrganizationSearch()
this.$store.state.app.buttonIsDisabled = false
+ this.getSTorgData()
} else {
- this.$message.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇敼澶辫触锛�')
+ this.$notify.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇敼澶辫触锛�')
this.$store.state.app.buttonIsDisabled = false
}
})
@@ -631,134 +414,10 @@
getHeight() {
this.$nextTick(() => {
this.mainHeight = window.innerHeight - 85
- this.tableHeight = this.mainHeight - 195
- if (window.innerHeight < 769) {
- this.tableHeight = this.tableHeight - 40
- }
- this.isIpad = window.innerHeight < 769 && window.innerWidth < 1367
+ this.tableHeight = this.mainHeight - 200
this.$refs.tableDataRef.doLayout()
})
- },
- tableRowClassName({ row, rowIndex }) {
- return 'custom-row'
}
}
}
</script>
-
-<!--鍏叡椤甸潰鏍峰紡-->
-<style lang="scss" scoped>
-$main_color: #42b983;
-.el-icon-share, .el-icon-delete, .el-icon-edit-outline {
- color: $main_color;
- cursor: pointer;
-}
-
-.el-icon-edit-outline {
- margin-right: 15px;
-}
-
-::v-deep .el-button--primary, .el-button--default, .el-button--info {
- height: 34px;
- display: flex;
- align-items: center;
- padding: 0 15px;
-}
-
-::v-deep .el-button--primary {
- //background-color: $main_color !important;
-}
-
-::v-deep .el-button--default {
- background-color: #f8f8fa;
- border: none;
-}
-
-::v-deep .el-input__inner {
- height: 34px;
- line-height: 34px;
- //color: #a7a7a7;
-}
-
-::v-deep .el-dialog__body {
- padding: 20px 100px !important;
-}
-
-::v-deep .dialogVisibleRoles .el-dialog__body {
- padding: 20px 20px !important;
-}
-
-::v-deep .importPickerClass .el-dialog__body {
- padding: 20px 20px !important;
-}
-
-::v-deep .el-dialog__footer {
- display: flex;
- justify-content: flex-end;
-}
-
-::v-deep .el-table .caret-wrapper {
- transform: scale(0.8);
-}
-
-::v-deep .cell {
- display: flex;
- align-items: center;
- justify-content: space-between;
-}
-
-::v-deep .el-table::before {
- height: 0;
-}
-
-::v-deep .el-table__body-wrapper {
- background-color: #f8f8fa;
-}
-
-::v-deep .el-table__body .el-table__row.hover-row td {
- background-color: #eaecef;
-}
-
-::v-deep .el-form--inline .el-form-item__label {
- color: #a7a7a7;
-}
-
-.body ::v-deep .el-divider {
- border: 1px solid #eee;
- width: 99%;
- margin: 10px auto;
-}
-
-.body ::v-deep .el-form-item {
- margin-bottom: 0;
-}
-
-.tableFixed {
- ::v-deep .el-table__fixed-right {
- height: 100% !important;
- }
-
- ::v-deep .el-table__fixed {
- height: 100% !important;
- }
-}
-
-//::v-deep .cell {
-// display: flex;
-// flex-wrap: nowrap;
-//}
-//
-//::v-deep .has-gutter .cell {
-// display: flex;
-// flex-wrap: nowrap;
-//}
-</style>
-<style>
-.osloading {
- font-size: 30px;
-}
-
-.el-table .custom-row {
- background: #f8f8fa;
-}
-</style>
--
Gitblit v1.9.3