Skip to content

J
jilinzhongdianrenqun-web
Commit 99f5450d by yubin
Options

Merge remote-tracking branch 'origin/master'

parents a36c960f e12ed00a
正在显示 包含 149 行增加 和 19 行删除
src/view/key-person/key_dm_conf/index.vue
......@@ -11,7 +11,7 @@
</TabPane>
<!-- 部门管理 -->
<TabPane label="部门管理" name="org">
<!-- <TabPane label="部门管理" name="org">
<div class="search-div">
<Row type="flex" :gutter="16">
<Col span="12">
......@@ -44,7 +44,7 @@
@on-change="pageChange('org', $event)"
@on-page-size-change="sizeChange('org', $event)"
/>
</TabPane>
</TabPane> -->
<!-- 假种管理 -->
<TabPane label="假种管理" name="leaveType">
<div class="search-div">
......@@ -370,17 +370,11 @@
</Modal>
<!-- 部门管理弹窗 -->
<Modal v-model="modals.org.visible" :title="modals.org.isEdit ? '修改部门' : '新增部门'" width="600" :mask-closable="false">
<!-- <Modal v-model="modals.org.visible" :title="modals.org.isEdit ? '修改部门' : '新增部门'" width="600" :mask-closable="false">
<Form :label-width="120" :model="modals.org.form" :rules="modals.org.rules" ref="orgForm">
<!-- <FormItem label="部门编码" prop="org_code">
<Input v-model="modals.org.form.org_code" placeholder="请输入部门编码" />
</FormItem> -->
<FormItem label="部门名称" prop="org_name">
<Input v-model="modals.org.form.org_name" placeholder="请输入部门名称" />
</FormItem>
<!-- <FormItem label="所属机构编码" prop="source_org">
<Input v-model="modals.org.form.source_org" placeholder="请输入所属机构编码" />
</FormItem> -->
<FormItem label="部门描述" prop="remark">
<Input type="textarea" :rows="3" v-model="modals.org.form.remark" placeholder="请输入部门描述" />
</FormItem>
......@@ -392,7 +386,7 @@
<Button @click="modals.org.visible = false">取消</Button>
<Button type="primary" :loading="modals.org.saving" @click="handleSave('org')">保存</Button>
</div>
</Modal>
</Modal> -->
<!-- 人员划分弹窗 -->
<Modal v-model="userAssignModal.visible" title="人员划分" width="800" :mask-closable="false">
......
src/view/key-person/key_dm_user/userMultiSelector.vue
......@@ -2,13 +2,25 @@
<Modal v-model="visible" title="选择人员" width="900" :mask-closable="false">
<div class="search-div">
<Row type="flex" :gutter="16" align="middle">
<Col :span="12">
<Col :span="18">
<span>姓名：</span>
<Input v-model="filters.name" placeholder="请输入姓名" style="width: 200px" />
<Input v-model="filters.name" placeholder="请输入姓名" style="width: 160px" class="mr10" />
<span v-if="curGrad === '3'">选择区：</span>
<Select v-if="curGrad === '3'" v-model="filters.areaId" clearable style="width: 130px" @on-change="changeArea" class="mr10" >
<Option v-for="(item, index) in areaList" :key="index" :value="item.parent_id" >{{ item.name }}</Option>
</Select>
<span v-if="curGrad === '3' || curGrad === '4'">选择街道：</span>
<Select v-if="curGrad === '3' || curGrad === '4'" v-model="filters.streetId" clearable style="width: 130px" @on-change="changeStreet" class="mr10">
<Option v-for="(item, index) in streetList" :key="index" :value="item.parent_id" >{{ item.name }}</Option>
</Select>
<span v-if="curGrad === '3' || curGrad === '4' || curGrad === '5'">选择社区：</span>
<Select v-if="curGrad === '3' || curGrad === '4' || curGrad === '5'" style="width: 130px" v-model="filters.communityId" clearable>
<Option v-for="(item, index) in communityList" :key="index" :value="item.parent_id">{{ item.name }}</Option>
</Select>
</Col>
<Col :span="12" class="text-right">
<Col :span="6" class="text-right">
<Button type="primary" class="mr10" @click="handleSearch">搜索</Button>
<Button @click="handleReset">重置</Button>
<Button type="primary" @click="handleReset">重置</Button>
</Col>
</Row>
</div>
......@@ -32,6 +44,7 @@
<script>
import { getUserMultiSelectorList } from '@/api/key-dm-user'
import { selectCityList } from '@/api/contradiction.js'
export default {
name: 'user-multi-selector',
......@@ -44,7 +57,7 @@ export default {
data () {
return {
visibleInternal: false,
filters: { name: '' },
filters: { name: '', cityId: '', areaId: '', streetId: '', communityId: '' },
rows: [],
loading: false,
pager: { pageNo: 1, pageSize: 10, totalRecord: 0 },
......@@ -58,7 +71,16 @@ export default {
// { title: '邮箱', key: 'email', align: 'center', minWidth: 150 },
{ title: '电话', key: 'phone', align: 'center', minWidth: 120 },
{ title: '手机', key: 'mobile', align: 'center', minWidth: 120 }
]
],
otherUserInfo: {},
showArea: false,
showStreet: false,
showCommnity: false,
areaList: [],
streetList: [],
communityList: [],
curGrad: '',
curPids: ''
}
},
computed: {
......@@ -73,14 +95,81 @@ export default {
this.pager.pageNo = 1
this.selectedRows = []
this.filters.name = ''
this.filters.cityId = ''
this.filters.areaId = ''
this.filters.streetId = ''
this.filters.communityId = ''
this.getOtherUserInfo()
this.fetchList()
}
}
},
methods: {
getOtherUserInfo () {
this.otherUserInfo = this.$store.state.user.otherUserInfo || {}
this.curGrad = ''
if (this.otherUserInfo.area_id && this.otherUserInfo.area_id.startsWith('2201') && this.round === '1') { // 长春
this.curGrad = this.otherUserInfo.company_grade
if (this.otherUserInfo.company_grade === '3') { // 市
this.curPids = this.otherUserInfo.parent_ids
this.filters.cityId = this.otherUserInfo.area_id
this.changeCity()
} else if (this.otherUserInfo.company_grade === '4') { // 区
this.curPids = this.otherUserInfo.parent_ids
let pids = this.curPids.split(',')
this.filters.cityId = pids[2]
this.filters.areaId = this.otherUserInfo.area_id
this.changeArea()
} else if (this.otherUserInfo.company_grade === '5') { // 街道
this.curPids = this.otherUserInfo.parent_ids
let pids = this.curPids.split(',')
this.filters.cityId = pids[2]
this.filters.areaId = pids[3]
this.filters.streetId = this.otherUserInfo.area_id
this.changeStreet()
}
}
},
fetchList () {
this.loading = true
const payload = Object.assign({}, { pageNo: this.pager.pageNo, pageSize: this.pager.pageSize, round: this.round }, this.filters)
let _this = this
let curId = ''
let pids = ''
let pobj = { pageNo: this.pager.pageNo, pageSize: this.pager.pageSize, round: this.round, curId: '', curPids: '' }
if (this.filters.communityId && this.filters.communityId !== '') {
curId = this.filters.communityId
if (_this.curGrad === '3') {
pids = this.curPids + ',' + this.filters.cityId + ',' + this.filters.areaId + ',' + this.filters.streetId + ',' + this.filters.communityId
} else if (_this.curGrad === '4') {
pids = this.curPids + ',' + this.filters.areaId + ',' + this.filters.streetId + ',' + this.filters.communityId
} else if (_this.curGrad === '5') {
pids = this.curPids + ',' + this.filters.streetId + ',' + this.filters.communityId
}
} else if (this.filters.streetId && this.filters.streetId !== '') {
curId = this.filters.streetId
if (_this.curGrad === '3') {
pids = this.curPids + ',' + this.filters.cityId + ',' + this.filters.areaId + ',' + this.filters.streetId
} else if (_this.curGrad === '4') {
pids = this.curPids + ',' + this.filters.areaId + ',' + this.filters.streetId
} else if (_this.curGrad === '5') {
pids = this.curPids + ',' + this.filters.streetId
}
} else if (this.filters.areaId && this.filters.areaId !== '') {
curId = this.filters.areaId
if (_this.curGrad === '3') {
pids = this.curPids + ',' + this.filters.cityId + ',' + this.filters.areaId
} else if (_this.curGrad === '4') {
pids = this.curPids + ',' + this.filters.areaId
} else if (_this.curGrad === '5') {
tpids = this.curPids
}
}
if (this.round === '1') {
pobj.curId = curId
pobj.curPids = pids
}
let payload = Object.assign(pobj, this.filters)
getUserMultiSelectorList(payload).then(ret => {
if (ret.data && ret.data.errcode === 0) {
const data = ret.data.data || {}
......@@ -96,7 +185,14 @@ export default {
this.fetchList()
},
handleReset () {
this.filters = { name: '' }
this.filters.name = ''
this.filters.communityId = ''
if (this.curGrad === '3') {
this.filters.areaId = ''
this.filters.streetId = ''
} else if (this.curGrad === '4') {
this.filters.streetId = ''
}
this.pager.pageNo = 1
this.fetchList()
},
......@@ -126,6 +222,46 @@ export default {
this.$emit('on-ok', this.selectedRows)
this.$emit('input', false)
this.confirming = false
},
changeCity (areaId) {
if (!this.filters.cityId) {
this.areaList = []
this.streetList = []
this.communityList = []
this.filters.areaId = ''
this.filters.streetId = ''
this.filters.communityId = ''
return
}
selectCityList({ parent_id: this.params.cityId }).then((res) => {
this.areaList = res.data.data
})
// 清空下面的数组
this.streetList = []
this.communityList = []
},
changeArea () {
if (!this.filters.areaId) {
this.streetList = []
this.communityList = []
this.filters.streetId = ''
this.filters.communityId = ''
return
}
selectCityList({ parent_id: this.filters.areaId }).then((res) => {
this.streetList = res.data.data
})
this.communityList = []
},
changeStreet () {
if (!this.filters.streetId) {
this.communityList = []
this.filters.communityId = ''
return
}
selectCityList({ parent_id: this.filters.streetId }).then((res) => {
this.communityList = res.data.data
})
}
}
}
......
src/view/key-person/key_dm_user/userSelector.vue
......@@ -8,7 +8,7 @@
</Col>
<Col :span="12" class="text-right">
<Button type="primary" class="mr10" @click="handleSearch">搜索</Button>
<Button @click="handleReset">重置</Button>
<Button type="primary" @click="handleReset">重置</Button>
</Col>
</Row>
</div>
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论