From 9ca14d8c895e7301b127ccd61b39ee821fef8981 Mon Sep 17 00:00:00 2001
From: yz_08 <yz_0812@outlook.com>
Date: 星期二, 02 二月 2021 15:12:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/febs/system/dept/Index.vue | 196 ++++++++++++++++--------------------------------
1 files changed, 65 insertions(+), 131 deletions(-)
diff --git a/src/views/febs/system/dept/Index.vue b/src/views/febs/system/dept/Index.vue
index a347d11..46dd15d 100644
--- a/src/views/febs/system/dept/Index.vue
+++ b/src/views/febs/system/dept/Index.vue
@@ -22,110 +22,78 @@
</el-dropdown-menu>
</el-dropdown>
</div>
- <el-tree
- ref="deptTree"
- :data="deptTree"
- :check-strictly="true"
- show-checkbox
- accordion
+ <el-tree
+ ref="deptTree"
+ :data="deptTree"
+ :check-strictly="true"
+ show-checkbox
+ accordion
node-key="id"
- highlight-current
- :filter-node-method="filterNode"
- @node-click="nodeClick"
+ highlight-current
+ :filter-node-method="filterNode"
+ @node-click="nodeClick"
/>
</div>
</el-col>
<el-col :xs="24" :sm="12">
- <el-tabs v-model="activeName">
- <el-tab-pane label="部门信息" name="first">
- <el-card class="box-card">
- <div slot="header" class="clearfix">
- <span>{{ dept.deptId === '' ? this.$t('common.add') : this.$t('common.edit') }}</span>
- </div>
- <div>
- <el-form ref="form" :model="dept" :rules="rules" label-position="right" label-width="100px">
- <el-form-item :label="$t('table.dept.parentId')" prop="parentId">
- <treeselect
- v-model="dept.parentId"
- :multiple="false"
- :options="deptTree"
- :clear-value-text="$t('common.clear')"
- placeholder=" "
- style="width:100%"
- />
- </el-form-item>
- <el-form-item :label="$t('table.dept.deptName')" prop="deptName">
- <el-input v-model="dept.deptName" />
- </el-form-item>
- <el-form-item :label="$t('table.dept.orderNum')" prop="orderNum">
- <el-input-number v-model="dept.orderNum" :min="0" :max="100" @change="handleNumChange" />
- </el-form-item>
- <el-form-item label="部门性质">
- <el-select v-model="bmxz" placeholder="请选择">
- <el-option label="分公司" value="1" />
- <el-option label="部门" value="2" />
- <el-option label="驻点" value="3" />
- </el-select>
- </el-form-item>
- <el-form-item label="部门负责人">
- <el-input />
- </el-form-item>
- <el-form-item label="联系电话">
- <el-input />
- </el-form-item>
- <el-form-item label="部门智能">
- <el-select v-model="bmzn" placeholder="请选择">
- <el-option label="保安" value="1" />
- <el-option label="后勤" value="2" />
- <el-option label="管理" value="3" />
- </el-select>
- </el-form-item>
- <el-form-item label="部门职责">
- <el-input type="textarea" :rows="4" />
- </el-form-item>
- </el-form>
- </div>
- </el-card>
- <el-card class="box-card" style="margin-top: -2rem;">
- <el-row>
- <el-col :span="24" style="text-align: right">
- <el-button type="primary" plain :loading="buttonLoading" @click="submit">{{ dept.deptId === '' ? this.$t('common.add') : this.$t('common.edit') }}</el-button>
- </el-col>
- </el-row>
- </el-card>
- </el-tab-pane>
- <el-tab-pane label="岗位信息" name="second">
- <el-button type="danger" @click="showXzgw">添加岗位</el-button>
- <el-button type="primary">删除岗位</el-button>
- <el-table :data="jobData" style="width: 100%">
- <el-table-column prop="prop0" label="" width="180" />
- <el-table-column prop="prop1" label="序号" width="180" />
- <el-table-column prop="prop2" label="岗位名称" width="180" />
- <el-table-column prop="prop3" label="在岗人数" width="180" />
- </el-table>
- </el-tab-pane>
- </el-tabs>
+ <el-card class="box-card">
+ <div slot="header" class="clearfix">
+ <span>{{ dept.deptId === '' ? this.$t('common.add') : this.$t('common.edit') }}</span>
+ </div>
+ <div>
+ <el-form ref="form" :model="dept" :rules="rules" label-position="right" label-width="100px">
+ <el-form-item :label="$t('table.dept.parentId')" prop="parentId">
+ <treeselect
+ v-model="dept.parentId"
+ :multiple="false"
+ :options="deptTree"
+ :clear-value-text="$t('common.clear')"
+ placeholder=" "
+ style="width:100%"
+ />
+ </el-form-item>
+ <el-form-item :label="$t('table.dept.deptName')" prop="deptName">
+ <el-input v-model="dept.deptName" />
+ </el-form-item>
+ <el-form-item :label="$t('table.dept.orderNum')" prop="orderNum">
+ <el-input-number v-model="dept.orderNum" :min="0" :max="100" @change="handleNumChange" />
+ </el-form-item>
+ <el-form-item label="部门性质">
+ <el-select v-model="bmxz" placeholder="请选择">
+ <el-option label="分公司" value="1" />
+ <el-option label="部门" value="2" />
+ <el-option label="驻点" value="3" />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="部门负责人">
+ <el-input />
+ </el-form-item>
+ <el-form-item label="联系电话">
+ <el-input />
+ </el-form-item>
+ <el-form-item label="部门智能">
+ <el-select v-model="bmzn" placeholder="请选择">
+ <el-option label="保安" value="1" />
+ <el-option label="后勤" value="2" />
+ <el-option label="管理" value="3" />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="部门职责">
+ <el-input type="textarea" :rows="4" />
+ </el-form-item>
+ </el-form>
+ </div>
+ </el-card>
+ <el-card class="box-card" style="margin-top: -2rem;">
+ <el-row>
+ <el-col :span="24" style="text-align: right">
+ <el-button type="primary" plain :loading="buttonLoading" @click="submit">{{ dept.deptId === '' ? this.$t('common.add') : this.$t('common.edit') }}</el-button>
+ </el-col>
+ </el-row>
+ </el-card>
</el-col>
</el-row>
- <el-dialog title="新增岗位" :visible.sync="dialogShowXzgw" width="50%">
- <el-form :model="baseicInformationForm" label-position="right" label-width="120px">
- <el-row>
- <el-col span="24">
- <el-form-item label="岗位名称">
- <el-input v-model="name" />
- </el-form-item>
- <el-form-item label="岗位描述">
- <el-input v-model="name" type="textarea" :rows="4" />
- </el-form-item>
- </el-col>
- </el-row>
- </el-form>
- <div slot="footer" class="dialog-footer">
- <el-button @click="dialogIsShow()">取 消</el-button>
- <el-button type="primary" @click="dialogIsShow()">确 定</el-button>
- </div>
- </el-dialog>
</div>
</template>
<script>
@@ -145,37 +113,6 @@
buttonLoading: false,
deptTree: [],
dept: this.initDept(),
- jobData: [{
- 'prop0': '',
- 'prop1': '1',
- 'prop2': '市场部总监',
- 'prop3': '1'
- }, {
- 'prop0': '',
- 'prop1': '2',
- 'prop2': '市场部经理',
- 'prop3': '2'
- }, {
- 'prop0': '',
- 'prop1': '3',
- 'prop2': '高级客户经理',
- 'prop3': '5'
- }, {
- 'prop0': '',
- 'prop1': '4',
- 'prop2': '客户经理',
- 'prop3': '10'
- }, {
- 'prop0': '',
- 'prop1': '5',
- 'prop2': '销售内勤',
- 'prop3': '1'
- }, {
- 'prop0': '',
- 'prop1': '6',
- 'prop2': '销售助理',
- 'prop3': '1'
- }],
rules: {
deptName: [{
required: true,
@@ -307,9 +244,6 @@
this.$refs.form.clearValidate()
this.$refs.form.resetFields()
this.dept = this.initDept()
- },
- showXzgw() {
- this.dialogShowXzgw = true
}
}
}
@@ -341,4 +275,4 @@
.vue-treeselect__menu {
max-height: 165px !important;
}
-</style>
+</style>
--
Gitblit v1.8.0