commit
This commit is contained in:
zhutianqi
@@ -285,18 +285,18 @@
|
|||||||
style="display: none;"
|
style="display: none;"
|
||||||
v-model="addForm.unit">
|
v-model="addForm.unit">
|
||||||
</el-input>
|
</el-input>
|
||||||
<el-input
|
|
||||||
clearable
|
|
||||||
v-model="addForm.unitName"
|
|
||||||
readonly>
|
|
||||||
</el-input>
|
|
||||||
<!-- <el-input-->
|
<!-- <el-input-->
|
||||||
<!-- clearable-->
|
<!-- clearable-->
|
||||||
<!-- v-model="addForm.unitName"-->
|
<!-- v-model="addForm.unitName"-->
|
||||||
<!-- placeholder="请选择起草责任单位"-->
|
<!-- readonly>-->
|
||||||
<!-- readonly-->
|
|
||||||
<!-- @click.native="choiceZRBM(addForm.unit)">-->
|
|
||||||
<!-- </el-input>-->
|
<!-- </el-input>-->
|
||||||
|
<el-input
|
||||||
|
clearable
|
||||||
|
v-model="addForm.unitName"
|
||||||
|
placeholder="请选择起草责任单位"
|
||||||
|
readonly
|
||||||
|
@click.native="choiceZRBM(addForm.unit)">
|
||||||
|
</el-input>
|
||||||
</div>
|
</div>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item prop="drafter" label="起草人" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
|
<el-form-item prop="drafter" label="起草人" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
|
||||||
@@ -318,7 +318,8 @@
|
|||||||
style="display: none;"
|
style="display: none;"
|
||||||
v-model="addForm.wgLeader"
|
v-model="addForm.wgLeader"
|
||||||
:maxlength="500"/>
|
:maxlength="500"/>
|
||||||
<el-input :disabled="DrawerType === 'see'" v-model="addForm.wgLeaderName" placeholder="请选择工作组组长" readonly="readonly" @click.native="choiceZRR('wgLeader', '选择工作组组长', addForm.wgLeader)"></el-input>
|
<el-input :disabled="DrawerType === 'see'" v-model="addForm.wgLeaderName" placeholder="请选择工作组组长" readonly="readonly" @click.native="workGroup(addForm.wgLeader)"></el-input>
|
||||||
|
<!-- <el-input :disabled="DrawerType === 'see'" v-model="addForm.wgLeaderName" placeholder="请选择工作组组长" readonly="readonly" @click.native="choiceZRR('wgLeader', '选择工作组组长', addForm.wgLeader)"></el-input>-->
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="计划标准初稿完成时间" style="width: 100%; margin-right:10px" prop="draftTime" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
|
<el-form-item label="计划标准初稿完成时间" style="width: 100%; margin-right:10px" prop="draftTime" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
|
||||||
<el-date-picker
|
<el-date-picker
|
||||||
@@ -595,6 +596,90 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</el-drawer>
|
</el-drawer>
|
||||||
|
<el-dialog
|
||||||
|
:visible.sync="workGroupFlag"
|
||||||
|
width="1000px"
|
||||||
|
title="选择工作组组长"
|
||||||
|
destroy-on-close
|
||||||
|
:close-on-click-modal="false"
|
||||||
|
@closed="workGroupClose">
|
||||||
|
<div>
|
||||||
|
<div class="search-area">
|
||||||
|
<el-form :model="workSearch" inline class="label-input-form">
|
||||||
|
<el-form-item label="工作组" class="search-item">
|
||||||
|
<el-input
|
||||||
|
v-model="workSearch.workGroupName"
|
||||||
|
clearable
|
||||||
|
placeholder="根据工作组进行查找"
|
||||||
|
/>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="工作组组长" class="search-item">
|
||||||
|
<el-input
|
||||||
|
v-model="workSearch.leaderName"
|
||||||
|
clearable
|
||||||
|
placeholder="根据工作组组长进行查找"
|
||||||
|
/>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="" class="search-item btn-box">
|
||||||
|
<el-button class="common-button-primary" type="primary" size="mini" @click="searchPostName"
|
||||||
|
v-btn-permission="">查询
|
||||||
|
</el-button>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="" class="search-item btn-box">
|
||||||
|
<el-button class="common-button-default" @click="resetSelect" size="mini"
|
||||||
|
v-btn-permission="">清空
|
||||||
|
</el-button>
|
||||||
|
</el-form-item>
|
||||||
|
</el-form>
|
||||||
|
</div>
|
||||||
|
<div style="height: 500px;">
|
||||||
|
<el-table
|
||||||
|
ref="workGroup"
|
||||||
|
:data="workData"
|
||||||
|
tooltip-effect="dark"
|
||||||
|
border
|
||||||
|
style="width: 100%; flex: auto;"
|
||||||
|
class="drag-table"
|
||||||
|
height="443px"
|
||||||
|
@selection-change="workChange"
|
||||||
|
:header-cell-style="{background: '#E8E8E8', color: '#333333', fontSize: '16px',
|
||||||
|
fontWeight: 'bold', height: '48px'}">
|
||||||
|
<el-table-column
|
||||||
|
type="selection"
|
||||||
|
width="55"
|
||||||
|
align="center"
|
||||||
|
/>
|
||||||
|
<el-table-column
|
||||||
|
align="center"
|
||||||
|
prop="workGroup"
|
||||||
|
min-width="300"
|
||||||
|
label="工作组">
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column
|
||||||
|
align="center"
|
||||||
|
label="工作组组长"
|
||||||
|
min-width="400px">
|
||||||
|
<template slot-scope="scope">
|
||||||
|
<span v-if="scope.row.workLeaderGroup.length > 1" v-for="item in scope.row.workLeaderGroup"
|
||||||
|
:key="item.id">{{ item.name + "," }}</span>
|
||||||
|
<span v-else v-for="item in scope.row.workLeaderGroup" :key="item.id">{{ item.name }}</span>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
</el-table>
|
||||||
|
<pagination style="bottom: 57px;" :page="workSearch.page" :total="workTotal" :pageSize="workSearch.pageSize" @pageChange="workpageChange"
|
||||||
|
@pageSizeChange="workpageSizeChange"></pagination>
|
||||||
|
</div>
|
||||||
|
<loading :loading="workGroupLoading">加载中...</loading>
|
||||||
|
</div>
|
||||||
|
<div slot="footer" class="demo-drawer-footer">
|
||||||
|
<el-button size="mini" type="primary" class="common-button-default" icon="el-icon-check"
|
||||||
|
@click="workGroupOk">确认
|
||||||
|
</el-button>
|
||||||
|
<el-button size="mini" class="common-button-default" icon="el-icon-check"
|
||||||
|
@click="workGroupClose">取消
|
||||||
|
</el-button>
|
||||||
|
</div>
|
||||||
|
</el-dialog>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
@@ -608,6 +693,18 @@
|
|||||||
},
|
},
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
|
workData: [],
|
||||||
|
workGroupLoading: false,
|
||||||
|
workTotal: 0,
|
||||||
|
workGroupFlag: false,
|
||||||
|
workGroupList: [],
|
||||||
|
workSearch: {
|
||||||
|
workGroupName: '',
|
||||||
|
leaderName: '',
|
||||||
|
page: 1,
|
||||||
|
pageSize: this.$store.getters.userInfo.configContent,
|
||||||
|
},
|
||||||
|
|
||||||
LXDList: [],
|
LXDList: [],
|
||||||
CBList: [],
|
CBList: [],
|
||||||
BZList: [],
|
BZList: [],
|
||||||
@@ -727,6 +824,82 @@
|
|||||||
props: {},
|
props: {},
|
||||||
watch: {},
|
watch: {},
|
||||||
methods: {
|
methods: {
|
||||||
|
workChange (data) {
|
||||||
|
this.workGroupList = data
|
||||||
|
},
|
||||||
|
workpageChange (page) {
|
||||||
|
this.workSearch.page = page;
|
||||||
|
this.getWorkData()
|
||||||
|
},
|
||||||
|
workpageSizeChange (pageSize) {
|
||||||
|
this.workSearch.pageSize = pageSize;
|
||||||
|
this.getWorkData()
|
||||||
|
},
|
||||||
|
searchPostName () {
|
||||||
|
this.workSearch.page = 1;
|
||||||
|
this.getWorkData();
|
||||||
|
},
|
||||||
|
resetSelect () {
|
||||||
|
this.workSearch = {
|
||||||
|
leaderName: '',
|
||||||
|
workGroupName: '',
|
||||||
|
page: 1,
|
||||||
|
pageSize: this.$store.getters.userInfo.configContent
|
||||||
|
};
|
||||||
|
this.getWorkData();
|
||||||
|
},
|
||||||
|
getWorkData () {
|
||||||
|
this.workGroupLoading = true
|
||||||
|
this.$http.get("workGroup/work-group", {
|
||||||
|
...this.workSearch
|
||||||
|
}, {
|
||||||
|
_this: this
|
||||||
|
}, res => {
|
||||||
|
this.workGroupLoading = false
|
||||||
|
res.data.records.map(item => {
|
||||||
|
item.workLeaderGroup = [];
|
||||||
|
item.workPeopleGroup = [];
|
||||||
|
var workLeaderArray = item.workLeader.split(",");
|
||||||
|
var workPeopleArray = item.workPeople.split(",");
|
||||||
|
var workLeaderIdArray = item.workLeaderId.split(",");
|
||||||
|
var workPeopleIdArray = item.workPeopleId.split(",");
|
||||||
|
for (var i = 0; i < workLeaderArray.length; i++) {
|
||||||
|
item.workLeaderGroup.push({ name: workLeaderArray[i], id: workLeaderIdArray[i] });
|
||||||
|
}
|
||||||
|
for (var j = 0; j < workPeopleArray.length; j++) {
|
||||||
|
item.workPeopleGroup.push({ name: workPeopleArray[j], id: workPeopleIdArray[j] });
|
||||||
|
}
|
||||||
|
});
|
||||||
|
this.workData = res.data.records;
|
||||||
|
this.workTotal = res.data.total;
|
||||||
|
}, e => {
|
||||||
|
});
|
||||||
|
},
|
||||||
|
workGroupOk () {
|
||||||
|
if (this.workGroupList.length > 1) {
|
||||||
|
this.$message.warning('仅能选择一个工作组')
|
||||||
|
} else if (this.workGroupList.length === 1) {
|
||||||
|
this.addForm.wgLeader = this.workGroupList[0].workLeaderId
|
||||||
|
this.addForm.wgLeaderName = this.workGroupList[0].workLeader
|
||||||
|
this.workGroupFlag = false
|
||||||
|
} else {
|
||||||
|
this.$message.warning('请选择一个工作组')
|
||||||
|
}
|
||||||
|
},
|
||||||
|
workGroupClose () {
|
||||||
|
this.workGroupList = []
|
||||||
|
this.workSearch = {
|
||||||
|
leaderName: '',
|
||||||
|
workGroupName: '',
|
||||||
|
page: 1,
|
||||||
|
pageSize: this.$store.getters.userInfo.configContent
|
||||||
|
}
|
||||||
|
this.workGroupFlag = false
|
||||||
|
},
|
||||||
|
workGroup (id) {
|
||||||
|
this.workGroupFlag = true
|
||||||
|
this.getWorkData()
|
||||||
|
},
|
||||||
getMap1(item){
|
getMap1(item){
|
||||||
const map = new Map();
|
const map = new Map();
|
||||||
map.set('0','未开始')
|
map.set('0','未开始')
|
||||||
@@ -906,7 +1079,6 @@
|
|||||||
this.modalshowflag2 = true
|
this.modalshowflag2 = true
|
||||||
},
|
},
|
||||||
checkedRole2 (data) {
|
checkedRole2 (data) {
|
||||||
console.log(data);
|
|
||||||
let idList = ''
|
let idList = ''
|
||||||
let nameList = ''
|
let nameList = ''
|
||||||
let bmIdList = ''
|
let bmIdList = ''
|
||||||
|
|||||||
Reference in New Issue
Block a user