Merge branch 'develop' into 'FOTON'
Develop See merge request LAWS/laws-system-front-FOTON!308
This commit is contained in:
王夏晖
@@ -70,7 +70,7 @@
|
||||
<el-form-item prop="wgLeaderName" label="工作组组长" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
|
||||
<el-input v-model="qbfsForm.wgLeader" style="display: none;"></el-input>
|
||||
<el-input v-model="qbfsForm.wgLeaderName" placeholder="请选择工作组组长"
|
||||
@click.native="choiceZRR"></el-input>
|
||||
@click.native="choiceLeader"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="计划标准初稿完成时间" style="width: 100%; margin-right:10px" prop="draftTime" class="add-form-item form-item-disabled">
|
||||
<el-date-picker
|
||||
@@ -306,6 +306,86 @@
|
||||
</div>
|
||||
</div>
|
||||
</el-drawer>
|
||||
<!-- 选择工作组抽屉-->
|
||||
<el-drawer
|
||||
title="选择工作组组长"
|
||||
:visible.sync="workModel"
|
||||
size="900px"
|
||||
custom-class="demo-drawer"
|
||||
>
|
||||
<div class="demo-drawer-content">
|
||||
<div style="position: absolute;bottom: 48px;top:60px;left: 0;right: 0">
|
||||
<div style="position: absolute;bottom: 55px;top: 0;right: 0;left: 0">
|
||||
<div class="left">
|
||||
<el-form :modal="workSearch" :inline="true" class="label-input-form" style="margin-left:10px">
|
||||
<el-form-item label="工作组" class="search-item">
|
||||
<el-input
|
||||
v-model="workSearch.workGroupName"
|
||||
clearable
|
||||
placeholder="根据工作组进行查找"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item class="search-item btn-box">
|
||||
<el-button
|
||||
type="primary"
|
||||
class="common-button-primary"
|
||||
size="small"
|
||||
@click="getWorkBtn">
|
||||
查询
|
||||
</el-button>
|
||||
</el-form-item>
|
||||
<el-form-item class="search-item btn-box">
|
||||
<el-button
|
||||
class="common-button-default"
|
||||
size="small"
|
||||
@click="clearSearch">清空
|
||||
</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
</div>
|
||||
<el-table
|
||||
ref="workGroup"
|
||||
:data="workData"
|
||||
tooltip-effect="dark"
|
||||
border
|
||||
style="width: 100%; flex: auto;"
|
||||
class="drag-table"
|
||||
height="100%"
|
||||
@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>
|
||||
<el-table-column
|
||||
prop="workGroup"
|
||||
label="工作组"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="workLeader"
|
||||
label="工作组组长"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</div>
|
||||
<pagination
|
||||
:page="page"
|
||||
:pageSize="pageSize"
|
||||
:total="total"
|
||||
@pageChange="pageChange"
|
||||
@pageSizeChange="pageSizeChange"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
<div class="demo-drawer-footer">
|
||||
<el-button size="mini" @click="closeDrawer">取消</el-button>
|
||||
<el-button type="primary" size="mini" @click="OkDrawer">带入</el-button>
|
||||
</div>
|
||||
</el-drawer>
|
||||
<!-- 多选择责任人-->
|
||||
<Role-tree
|
||||
:is-title="drawerTitle2"
|
||||
@@ -345,6 +425,13 @@ export default {
|
||||
props: ['message'],
|
||||
data(){
|
||||
return {
|
||||
workModel: false,
|
||||
workSearch: {
|
||||
workGroupName: "",
|
||||
},
|
||||
total: 0,
|
||||
page: 1,
|
||||
pageSize: this.$store.getters.userInfo.configContent,
|
||||
QYBZmodal: false,
|
||||
TXJGmodal: false,
|
||||
modalshowflagZRBM: false,
|
||||
@@ -353,6 +440,7 @@ export default {
|
||||
children: 'children',
|
||||
label: 'menuName'
|
||||
},
|
||||
workData: [],
|
||||
TXJGList: [],
|
||||
QYBZList: [],
|
||||
QYBZformSelect: [],
|
||||
@@ -374,6 +462,7 @@ export default {
|
||||
modalshowflag: false,
|
||||
nodeList2: [],
|
||||
nodeList: [],
|
||||
workChangeList: [],
|
||||
standSortOptions: [],
|
||||
cbcdOptions: [],
|
||||
BZList: [],
|
||||
@@ -460,6 +549,7 @@ export default {
|
||||
},
|
||||
},
|
||||
mounted(){
|
||||
this.getWorkData()
|
||||
if(!this.qbfsForm.passFlag){
|
||||
this.qbfsForm = {}
|
||||
}
|
||||
@@ -488,6 +578,58 @@ export default {
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
choiceLeader(){
|
||||
this.workModel = true
|
||||
},
|
||||
closeDrawer(){
|
||||
this.workModel = false
|
||||
},
|
||||
OkDrawer(){
|
||||
if(this.workChangeList.length > 1 ){
|
||||
this.$message.warning('您只能选择一条数据进行带入')
|
||||
}else if(this.workChangeList.length < 1 ){
|
||||
this.$message.warning('请至少选择一条数据')
|
||||
}else{
|
||||
this.$set(this.qbfsForm, 'wgLeader', this.workChangeList[0].workLeaderId)
|
||||
this.$set(this.qbfsForm, 'wgLeaderName', this.workChangeList[0].workLeader)
|
||||
if(this.qbfsForm.wgLeaderName){
|
||||
this.$refs.qbfsForm.validateField('wgLeaderName')
|
||||
}
|
||||
this.workModel = false
|
||||
}
|
||||
},
|
||||
getWorkBtn(){
|
||||
this.page = 1
|
||||
this.getWorkData()
|
||||
},
|
||||
clearSearch(){
|
||||
this.workSearch.workGroupName = ''
|
||||
this.getWorkData()
|
||||
},
|
||||
pageChange(page){
|
||||
this.page = page
|
||||
this.getWorkData()
|
||||
},
|
||||
pageSizeChange(pageSize){
|
||||
this.pageSize = pageSize
|
||||
this.getWorkData()
|
||||
},
|
||||
workChange(data) {
|
||||
this.workChangeList = data
|
||||
},
|
||||
getWorkData() {
|
||||
this.$http.get("workGroup/work-group", {
|
||||
pageSize: this.pageSize,
|
||||
page: this.page,
|
||||
workGroupName: this.workSearch.workGroupName
|
||||
}, {
|
||||
_this: this
|
||||
}, res => {
|
||||
this.workData = res.data.records;
|
||||
this.total = res.data.total;
|
||||
}, e => {
|
||||
});
|
||||
},
|
||||
assemble(ids,names){
|
||||
let list= new Array();
|
||||
let idArray=ids.split(',');
|
||||
|
||||
@@ -138,7 +138,7 @@
|
||||
<el-form-item label="工作组组长" prop="wgLeaderName" class="add-form-item form-item-disabled">
|
||||
<el-input v-model="qbfsForm.wgLeader" style="display: none;"></el-input>
|
||||
<el-input v-model="qbfsForm.wgLeaderName" placeholder="请选择工作组组长"
|
||||
@click.native="choiceZRR"></el-input>
|
||||
@click.native="choiceLeader"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="标准发布时间" prop="releaseTime" class="add-form-item form-item-disabled">
|
||||
<el-date-picker
|
||||
@@ -459,6 +459,86 @@
|
||||
</div>
|
||||
</div>
|
||||
</el-drawer>
|
||||
<!-- 选择工作组抽屉-->
|
||||
<el-drawer
|
||||
title="选择工作组组长"
|
||||
:visible.sync="workModel"
|
||||
size="900px"
|
||||
custom-class="demo-drawer"
|
||||
>
|
||||
<div class="demo-drawer-content">
|
||||
<div style="position: absolute;bottom: 48px;top:60px;left: 0;right: 0">
|
||||
<div style="position: absolute;bottom: 55px;top: 0;right: 0;left: 0">
|
||||
<div class="left">
|
||||
<el-form :modal="workSearch" :inline="true" class="label-input-form" style="margin-left:10px">
|
||||
<el-form-item label="工作组" class="search-item">
|
||||
<el-input
|
||||
v-model="workSearch.workGroupName"
|
||||
clearable
|
||||
placeholder="根据工作组进行查找"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item class="search-item btn-box">
|
||||
<el-button
|
||||
type="primary"
|
||||
class="common-button-primary"
|
||||
size="small"
|
||||
@click="getWorkBtn">
|
||||
查询
|
||||
</el-button>
|
||||
</el-form-item>
|
||||
<el-form-item class="search-item btn-box">
|
||||
<el-button
|
||||
class="common-button-default"
|
||||
size="small"
|
||||
@click="clearWorkSearch">清空
|
||||
</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
</div>
|
||||
<el-table
|
||||
ref="workGroup"
|
||||
:data="workData"
|
||||
tooltip-effect="dark"
|
||||
border
|
||||
style="width: 100%; flex: auto;"
|
||||
class="drag-table"
|
||||
height="100%"
|
||||
@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>
|
||||
<el-table-column
|
||||
prop="workGroup"
|
||||
label="工作组"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="workLeader"
|
||||
label="工作组组长"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</div>
|
||||
<pagination
|
||||
:page="pageNo"
|
||||
:pageSize="pageSizeNo"
|
||||
:total="totalNo"
|
||||
@pageChange="pageChangeNo"
|
||||
@pageSizeChange="pageSizeChangeNo"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
<div class="demo-drawer-footer">
|
||||
<el-button size="mini" @click="closeWorkDrawer">取消</el-button>
|
||||
<el-button type="primary" size="mini" @click="OkWorkDrawer">带入</el-button>
|
||||
</div>
|
||||
</el-drawer>
|
||||
<!-- 多选择责任人-->
|
||||
<Role-tree
|
||||
:is-title="drawerTitle2"
|
||||
@@ -499,6 +579,15 @@ export default {
|
||||
props: ['message'],
|
||||
data(){
|
||||
return {
|
||||
workModel: false,
|
||||
workSearch: {
|
||||
workGroupName: "",
|
||||
},
|
||||
totalNo: 0,
|
||||
pageNo: 1,
|
||||
pageSizeNo: this.$store.getters.userInfo.configContent,
|
||||
workData: [],
|
||||
workChangeList: [],
|
||||
QYBZmodal: false,
|
||||
TXJGmodal: false,
|
||||
QYBZShow: false,
|
||||
@@ -649,6 +738,58 @@ export default {
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
choiceLeader(){
|
||||
this.workModel = true
|
||||
},
|
||||
closeWorkDrawer(){
|
||||
this.workModel = false
|
||||
},
|
||||
OkWorkDrawer(){
|
||||
if(this.workChangeList.length > 1 ){
|
||||
this.$message.warning('您只能选择一条数据进行带入')
|
||||
}else if(this.workChangeList.length < 1 ){
|
||||
this.$message.warning('请至少选择一条数据')
|
||||
}else{
|
||||
this.$set(this.qbfsForm, 'wgLeader', this.workChangeList[0].workLeaderId)
|
||||
this.$set(this.qbfsForm, 'wgLeaderName', this.workChangeList[0].workLeader)
|
||||
if(this.qbfsForm.wgLeaderName){
|
||||
this.$refs.qbfsForm.validateField('wgLeaderName')
|
||||
}
|
||||
this.workModel = false
|
||||
}
|
||||
},
|
||||
getWorkBtn(){
|
||||
this.page = 1
|
||||
this.getWorkData()
|
||||
},
|
||||
clearWorkSearch(){
|
||||
this.workSearch.workGroupName = ''
|
||||
this.getWorkData()
|
||||
},
|
||||
pageChangeNo(page){
|
||||
this.pageNo = page
|
||||
this.getWorkData()
|
||||
},
|
||||
pageSizeChangeNo(pageSize){
|
||||
this.pageSizeNo = pageSize
|
||||
this.getWorkData()
|
||||
},
|
||||
workChange(data) {
|
||||
this.workChangeList = data
|
||||
},
|
||||
getWorkData() {
|
||||
this.$http.get("workGroup/work-group", {
|
||||
pageSize: this.pageSizeNo,
|
||||
page: this.pageNo,
|
||||
workGroupName: this.workSearch.workGroupName
|
||||
}, {
|
||||
_this: this
|
||||
}, res => {
|
||||
this.workData = res.data.records;
|
||||
this.total = res.data.total;
|
||||
}, e => {
|
||||
});
|
||||
},
|
||||
//体系结构单选
|
||||
handleClick(data,checked, node){
|
||||
if(checked){
|
||||
|
||||
@@ -285,18 +285,18 @@
|
||||
style="display: none;"
|
||||
v-model="addForm.unit">
|
||||
</el-input>
|
||||
<el-input
|
||||
clearable
|
||||
v-model="addForm.unitName"
|
||||
readonly>
|
||||
</el-input>
|
||||
<!-- <el-input-->
|
||||
<!-- clearable-->
|
||||
<!-- v-model="addForm.unitName"-->
|
||||
<!-- placeholder="请选择起草责任单位"-->
|
||||
<!-- readonly-->
|
||||
<!-- @click.native="choiceZRBM(addForm.unit)">-->
|
||||
<!-- readonly>-->
|
||||
<!-- </el-input>-->
|
||||
<el-input
|
||||
clearable
|
||||
v-model="addForm.unitName"
|
||||
placeholder="请选择起草责任单位"
|
||||
readonly
|
||||
@click.native="choiceZRBM(addForm.unit)">
|
||||
</el-input>
|
||||
</div>
|
||||
</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' : ''">
|
||||
@@ -318,7 +318,8 @@
|
||||
style="display: none;"
|
||||
v-model="addForm.wgLeader"
|
||||
: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 label="计划标准初稿完成时间" style="width: 100%; margin-right:10px" prop="draftTime" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
|
||||
<el-date-picker
|
||||
@@ -595,6 +596,90 @@
|
||||
</div>
|
||||
</div>
|
||||
</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>
|
||||
</template>
|
||||
@@ -608,6 +693,18 @@
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
workData: [],
|
||||
workGroupLoading: false,
|
||||
workTotal: 0,
|
||||
workGroupFlag: false,
|
||||
workGroupList: [],
|
||||
workSearch: {
|
||||
workGroupName: '',
|
||||
leaderName: '',
|
||||
page: 1,
|
||||
pageSize: this.$store.getters.userInfo.configContent,
|
||||
},
|
||||
|
||||
LXDList: [],
|
||||
CBList: [],
|
||||
BZList: [],
|
||||
@@ -727,6 +824,82 @@
|
||||
props: {},
|
||||
watch: {},
|
||||
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){
|
||||
const map = new Map();
|
||||
map.set('0','未开始')
|
||||
@@ -906,7 +1079,6 @@
|
||||
this.modalshowflag2 = true
|
||||
},
|
||||
checkedRole2 (data) {
|
||||
console.log(data);
|
||||
let idList = ''
|
||||
let nameList = ''
|
||||
let bmIdList = ''
|
||||
|
||||
Reference in New Issue
Block a user