|
|
|
|
@ -30,7 +30,7 @@
|
|
|
|
|
<span style="color: red;font-weight: bold;padding-right: 4px;">*</span>计划类型：
|
|
|
|
|
</div>
|
|
|
|
|
<div class="xy-table-item-content">
|
|
|
|
|
<el-select v-model="form.type" filterable clearable placeholder="请选择计划类型" style="width: 400px;">
|
|
|
|
|
<el-select @change="changeType" v-model="form.type" filterable multiple clearable placeholder="请选择计划类型" style="width: 400px;">
|
|
|
|
|
<el-option v-for="item in planTypeList" :key="item.id" :label="item.value" :value="item.id">
|
|
|
|
|
</el-option>
|
|
|
|
|
</el-select>
|
|
|
|
|
@ -38,18 +38,22 @@
|
|
|
|
|
</div>
|
|
|
|
|
</template>
|
|
|
|
|
<template v-slot:start_date>
|
|
|
|
|
<div class="xy-table-item">
|
|
|
|
|
<!-- <div class="xy-table-item">
|
|
|
|
|
<div class="xy-table-item-label" style="font-weight: bold">
|
|
|
|
|
<span style="color: red;font-weight: bold;padding-right: 4px;">*</span>开始日期：
|
|
|
|
|
<span style="color: red;font-weight: bold;padding-right: 4px;">*</span>月份：
|
|
|
|
|
</div>
|
|
|
|
|
<div class="xy-table-item-content">
|
|
|
|
|
<el-date-picker style="width: 400px;" v-model="form.start_date" value-format="yyyy-MM-dd" type="date"
|
|
|
|
|
placeholder="选择开始日期">
|
|
|
|
|
</el-date-picker>
|
|
|
|
|
<el-checkbox :indeterminate="isIndeterminateMonth" v-model="checkAllMonth" @change="handleCheckAllChangeMonth">全选
|
|
|
|
|
</el-checkbox>
|
|
|
|
|
<div style="margin: 15px 0;"></div>
|
|
|
|
|
<el-checkbox-group v-model="form.start_date" @change="handleCheckedDeptChangeMonth">
|
|
|
|
|
<el-checkbox @change="handleCheckedDeptSingleChangeMonth" v-for="mon in monthsArr" :label="mon"
|
|
|
|
|
:key="mon">{{mon}}</el-checkbox>
|
|
|
|
|
</el-checkbox-group>
|
|
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
|
</div> -->
|
|
|
|
|
</template>
|
|
|
|
|
<template v-slot:status>
|
|
|
|
|
<!-- <template v-slot:status>
|
|
|
|
|
<div class="xy-table-item">
|
|
|
|
|
<div class="xy-table-item-label" style="font-weight: bold">
|
|
|
|
|
<span style="color: red;font-weight: bold;padding-right: 4px;">*</span>计划状态：
|
|
|
|
|
@ -61,8 +65,9 @@
|
|
|
|
|
</el-select>
|
|
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
|
</template>
|
|
|
|
|
<template v-slot:end_date>
|
|
|
|
|
</template> -->
|
|
|
|
|
|
|
|
|
|
<!-- <template v-slot:end_date>
|
|
|
|
|
<div class="xy-table-item">
|
|
|
|
|
<div class="xy-table-item-label" style="font-weight: bold">
|
|
|
|
|
<span style="color: red;font-weight: bold;padding-right: 4px;">*</span>结束日期：
|
|
|
|
|
@ -73,7 +78,7 @@
|
|
|
|
|
</el-date-picker>
|
|
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
|
</template>
|
|
|
|
|
</template> -->
|
|
|
|
|
<!-- <template v-slot:count>
|
|
|
|
|
<div class="xy-table-item">
|
|
|
|
|
<div class="xy-table-item-label">
|
|
|
|
|
@ -112,6 +117,22 @@
|
|
|
|
|
</div>
|
|
|
|
|
</template> -->
|
|
|
|
|
<template v-slot:lefts>
|
|
|
|
|
<div>
|
|
|
|
|
<div class="xy-table-item" style="align-items: start;">
|
|
|
|
|
<div class="xy-table-item-label" style="font-weight: bold">
|
|
|
|
|
<span style="color: red;font-weight: bold;padding-right: 4px;">*</span>月份：
|
|
|
|
|
</div>
|
|
|
|
|
<div class="xy-table-item-content">
|
|
|
|
|
<el-checkbox :indeterminate="isIndeterminateMonth" v-model="checkAllMonth" @change="handleCheckAllChangeMonth">全选
|
|
|
|
|
</el-checkbox>
|
|
|
|
|
<div style="margin: 15px 0;"></div>
|
|
|
|
|
<el-checkbox-group v-model="form.start_date" @change="handleCheckedDeptChangeMonth">
|
|
|
|
|
<el-checkbox @change="handleCheckedDeptSingleChangeMonth" v-for="mon in monthsArr" :label="mon"
|
|
|
|
|
:key="mon">{{mon}}</el-checkbox>
|
|
|
|
|
</el-checkbox-group>
|
|
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
|
<div>
|
|
|
|
|
<div class="xy-table-item">
|
|
|
|
|
<div class="xy-table-item-label">
|
|
|
|
|
@ -223,22 +244,19 @@
|
|
|
|
|
<span style="color: red;font-weight: 600;padding-right: 4px;"></span>
|
|
|
|
|
</div>
|
|
|
|
|
<div class="xy-table-item-content" style='min-width:100px'>
|
|
|
|
|
<Button type='primary' @click="mission_plan_groups_list.push({name:'',type:1,link_id:[]})">新增组别</Button>
|
|
|
|
|
<Button type='primary' @click="mission_plan_groups_list.push({name:'',type:1,link_id:[],link_id_dep:[]})">新增组别</Button>
|
|
|
|
|
<div v-for="(item,index) in mission_plan_groups_list" style='margin:10px;margin-left:0'>
|
|
|
|
|
<div>
|
|
|
|
|
<Button style="margin-right:10px" @click="mission_plan_groups_list.splice(index,1)">删除</Button>
|
|
|
|
|
组别：{{item.name=mission_plan_groups_name[index]}}
|
|
|
|
|
<el-radio-group v-model="item.type" @change='item.link_id=[]' style="margin:10px;margin-right:20px">
|
|
|
|
|
<div>
|
|
|
|
|
<Button style="margin-right:10px" @click="mission_plan_groups_list.splice(index,1)">删除</Button>
|
|
|
|
|
组别：{{item.name=mission_plan_groups_name[index]}}
|
|
|
|
|
</div>
|
|
|
|
|
<!-- <el-radio-group v-model="item.type" @change='item.link_id=[]' style="margin:10px;margin-right:20px">
|
|
|
|
|
<el-radio :label="1">人员</el-radio>
|
|
|
|
|
<el-radio :label="2">部门</el-radio>
|
|
|
|
|
</el-radio-group>
|
|
|
|
|
<!-- <el-select v-if='item.type==1' v-model="item.link_id" clearable filterable multiple placeholder="请选择人员">
|
|
|
|
|
<el-option v-for="item in userdata" :key="item.id" :label="item.name" :value="item.id">
|
|
|
|
|
</el-option>
|
|
|
|
|
</el-select> -->
|
|
|
|
|
<el-select-tree v-if='item.type==1' :datas='userdata' :valueArr='item.valueArr' :valueMultiple="item.valueMultiple" @getValue="(e)=>{return getSelectedgroupValue(e,item)}"></el-select-tree>
|
|
|
|
|
|
|
|
|
|
<el-select v-if='item.type==2' v-model="item.link_id" clearable filterable multiple placeholder="请选择部门">
|
|
|
|
|
</el-radio-group> -->
|
|
|
|
|
<el-select-tree style="width:48%;min-width:48%;margin-right:2%" :datas='userdata' :valueArr='item.valueArr' :valueMultiple="item.valueMultiple" @getValue="(e)=>{return getSelectedgroupValue(e,item)}"></el-select-tree>
|
|
|
|
|
<el-select style="width:48%" v-model="item.link_id_dep" collapse-tags clearable filterable multiple placeholder="请选择部门">
|
|
|
|
|
<el-option v-for="item in deptOptions" :key="item.id" :label="item.name" :value="item.id">
|
|
|
|
|
</el-option>
|
|
|
|
|
</el-select>
|
|
|
|
|
@ -251,10 +269,36 @@
|
|
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
</template>
|
|
|
|
|
<!-- <template v-slot:months_list>
|
|
|
|
|
<div class="xy-table-item">
|
|
|
|
|
<div class="xy-table-item-label" style="font-weight: bold">
|
|
|
|
|
<span style="color: red;font-weight: bold;padding-right: 4px;">*</span>计划内容：
|
|
|
|
|
</div>
|
|
|
|
|
|
|
|
|
|
<div class="xy-table-item-content" style="width:82%">
|
|
|
|
|
<div>
|
|
|
|
|
<el-button style="margin-bottom: 5px;" type='primary' size='small' @click="form.months_list.push({month:'',list:[{content:''}]})">新增</el-button>
|
|
|
|
|
</div>
|
|
|
|
|
<div>
|
|
|
|
|
<xy-table
|
|
|
|
|
height="400px"
|
|
|
|
|
:list="form.months_list"
|
|
|
|
|
stripe
|
|
|
|
|
:isPage="false"
|
|
|
|
|
:table-item="table">
|
|
|
|
|
<template v-slot:btns>
|
|
|
|
|
<el-table-column align='center' label="操作" width="100" header-align="center">
|
|
|
|
|
<template slot-scope="scope">
|
|
|
|
|
<el-button type='primary' size='small' @click="form.months_list.splice(scope.$index,1)">删除</el-button>
|
|
|
|
|
</template>
|
|
|
|
|
</el-table-column>
|
|
|
|
|
</template>
|
|
|
|
|
</xy-table>
|
|
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
|
</template> -->
|
|
|
|
|
<template v-slot:footerContent>
|
|
|
|
|
<Button type="primary"
|
|
|
|
|
style='margin-left:5px;margin-bottom:5px;' @click="clickSubmit">确认</Button>
|
|
|
|
|
@ -310,6 +354,8 @@ import elSelectTree from '@/components/selectTree'
|
|
|
|
|
deptOptions: [],
|
|
|
|
|
checkAll: false,
|
|
|
|
|
isIndeterminate: true,
|
|
|
|
|
checkAllMonth: false,
|
|
|
|
|
isIndeterminateMonth: true,
|
|
|
|
|
userdata: [],
|
|
|
|
|
userdatabefore:[],
|
|
|
|
|
valueMultiple:[],
|
|
|
|
|
@ -336,19 +382,63 @@ import elSelectTree from '@/components/selectTree'
|
|
|
|
|
name: '',
|
|
|
|
|
year:'',
|
|
|
|
|
type: '',
|
|
|
|
|
start_date: '',
|
|
|
|
|
status:1,
|
|
|
|
|
end_date: '',
|
|
|
|
|
start_date: [],
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// end_date: '',
|
|
|
|
|
// count:'',
|
|
|
|
|
lefts:'',
|
|
|
|
|
name7: 2,
|
|
|
|
|
name7: 2,
|
|
|
|
|
// months_list:[],
|
|
|
|
|
file_ids: '',
|
|
|
|
|
content: '',
|
|
|
|
|
accept_admin_ids: [],
|
|
|
|
|
accept_department_ids: [],
|
|
|
|
|
mission_plan_groups: [],
|
|
|
|
|
|
|
|
|
|
status:1,
|
|
|
|
|
},
|
|
|
|
|
monthsArr:['一月','二月','三月','四月','五月','六月','七月','八月','九月','十月','十一月','十二月'],
|
|
|
|
|
table:[{
|
|
|
|
|
label: "月份",
|
|
|
|
|
prop: 'month',
|
|
|
|
|
width: 220,
|
|
|
|
|
align:'center',
|
|
|
|
|
customFn:(row)=>{
|
|
|
|
|
return(<div><el-select style={{"width":'120px'}} v-model={row.month}>
|
|
|
|
|
{
|
|
|
|
|
this.monthsArr.map(item=>{
|
|
|
|
|
return(<el-option key={item} value={item} label={item}>
|
|
|
|
|
</el-option>)
|
|
|
|
|
})
|
|
|
|
|
}</el-select>
|
|
|
|
|
<el-button style={{"margin-left":'5px',"height":'40px'}} type='primary' size='small' on={
|
|
|
|
|
{
|
|
|
|
|
["click"]:(e)=> row.list.push({'content':''}),
|
|
|
|
|
}
|
|
|
|
|
}>新增内容 </el-button></div>
|
|
|
|
|
)
|
|
|
|
|
}
|
|
|
|
|
},{
|
|
|
|
|
label: "内容",
|
|
|
|
|
prop: 'list',
|
|
|
|
|
align:'left',
|
|
|
|
|
customFn:(row)=>{
|
|
|
|
|
return(<div>
|
|
|
|
|
{
|
|
|
|
|
row.list.map((item,index)=>{
|
|
|
|
|
return(<div style={{'margin':'5px'}}>{index+1}、<el-input style={{'width':'85%'}} v-model={item.content}>{item.content}</el-input>
|
|
|
|
|
<el-button style={{"margin-left":'5px',"height":'40px'}} type='primary' size='small' on={
|
|
|
|
|
{
|
|
|
|
|
["click"]:(e)=> row.list.splice(index,1),
|
|
|
|
|
}
|
|
|
|
|
} >删除</el-button>
|
|
|
|
|
</div>)
|
|
|
|
|
})
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
</div>)
|
|
|
|
|
}
|
|
|
|
|
}],
|
|
|
|
|
mission_plan_groups_list: [{
|
|
|
|
|
name: '',
|
|
|
|
|
type: 1,
|
|
|
|
|
@ -373,10 +463,10 @@ import elSelectTree from '@/components/selectTree'
|
|
|
|
|
required: true,
|
|
|
|
|
message: '请选择开始时间'
|
|
|
|
|
}],
|
|
|
|
|
end_date: [{
|
|
|
|
|
required: true,
|
|
|
|
|
message: '请选择结束时间'
|
|
|
|
|
}],
|
|
|
|
|
// end_date: [{
|
|
|
|
|
// required: true,
|
|
|
|
|
// message: '请选择结束时间'
|
|
|
|
|
// }],
|
|
|
|
|
type: [{
|
|
|
|
|
required: true,
|
|
|
|
|
message: '请选择任务类型'
|
|
|
|
|
@ -394,6 +484,14 @@ import elSelectTree from '@/components/selectTree'
|
|
|
|
|
async getPlanList(){
|
|
|
|
|
const res = await getparameteritem('planType')
|
|
|
|
|
this.planTypeList = res.detail
|
|
|
|
|
},
|
|
|
|
|
changeType(e){
|
|
|
|
|
console.log("e",e)
|
|
|
|
|
if(e){
|
|
|
|
|
this.form.type = e
|
|
|
|
|
}else{
|
|
|
|
|
this.form.type=[]
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
changeName7(e) {
|
|
|
|
|
if (e) {
|
|
|
|
|
@ -436,7 +534,9 @@ import elSelectTree from '@/components/selectTree'
|
|
|
|
|
},
|
|
|
|
|
getSelectedValue (value) {
|
|
|
|
|
console.log('选中的结果值', value)
|
|
|
|
|
|
|
|
|
|
if(value.length>0){
|
|
|
|
|
this.form.accept_admin_ids = []
|
|
|
|
|
value.map(item=>{
|
|
|
|
|
this.form.accept_admin_ids.push(item.id)
|
|
|
|
|
})
|
|
|
|
|
@ -447,6 +547,7 @@ import elSelectTree from '@/components/selectTree'
|
|
|
|
|
getSelectedgroupValue (value,item) {
|
|
|
|
|
console.log('选中的结果值', value,item)
|
|
|
|
|
if(value.length>0){
|
|
|
|
|
item.link_id = []
|
|
|
|
|
value.map(item1=>{
|
|
|
|
|
item.link_id.push(item1.id)
|
|
|
|
|
})
|
|
|
|
|
@ -520,7 +621,44 @@ import elSelectTree from '@/components/selectTree'
|
|
|
|
|
this.checkAll = checkedCount === this.deptOptions.length;
|
|
|
|
|
this.isIndeterminate = checkedCount > 0 && checkedCount < this.deptOptions.length;
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
handleCheckAllChangeMonth(val) {
|
|
|
|
|
let options = [];
|
|
|
|
|
for (var m of this.monthsArr) {
|
|
|
|
|
options.push(m);
|
|
|
|
|
}
|
|
|
|
|
this.form.start_date = val ? options : [];
|
|
|
|
|
this.isIndeterminateMonth = false;
|
|
|
|
|
},
|
|
|
|
|
handleCheckedDeptSingleChangeMonth(v) {
|
|
|
|
|
//如果出现取消的操作 就要执行删除
|
|
|
|
|
console.log(v);
|
|
|
|
|
var that = this;
|
|
|
|
|
if (this.form.start_date)
|
|
|
|
|
that.delDeptItemMonth();
|
|
|
|
|
|
|
|
|
|
},
|
|
|
|
|
//删除操作
|
|
|
|
|
delDeptItemMonth() {
|
|
|
|
|
for (var m of this.monthsArr) {
|
|
|
|
|
if (this.form.start_date.indexOf(m) == -1) {
|
|
|
|
|
var d = this.form.start_date.filter(function(t) {
|
|
|
|
|
return t == m;
|
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
if (d.length != 0) {
|
|
|
|
|
delDep(d[0].id).then(response => {}).catch(error => {
|
|
|
|
|
console.log(error)
|
|
|
|
|
})
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
handleCheckedDeptChangeMonth(value) {
|
|
|
|
|
let checkedCount = value.length;
|
|
|
|
|
this.checkAllMonth = checkedCount === this.monthsArr.length;
|
|
|
|
|
this.isIndeterminateMonth = checkedCount > 0 && checkedCount < this.monthsArr.length;
|
|
|
|
|
},
|
|
|
|
|
async getDetail() {
|
|
|
|
|
const res = await get(this.id)
|
|
|
|
|
this.form = {
|
|
|
|
|
@ -528,18 +666,22 @@ import elSelectTree from '@/components/selectTree'
|
|
|
|
|
name: res?.name,
|
|
|
|
|
year:res.year?res.year:new Date().getFullYear(),
|
|
|
|
|
type: res?.type,
|
|
|
|
|
start_date: res?.start_date,
|
|
|
|
|
status:res.status?res.status:1,
|
|
|
|
|
end_date: res?.end_date,
|
|
|
|
|
start_date: res.start_date?res.start_date:[],
|
|
|
|
|
|
|
|
|
|
// end_date: res?.end_date,
|
|
|
|
|
|
|
|
|
|
lefts:'',
|
|
|
|
|
name7: res.accept_department_ids.length > 0 ? 2 : (res.accept_admin_ids.length > 0 ? 1 : (res
|
|
|
|
|
.groups.length > 0 ? 3 : 2)),
|
|
|
|
|
name7: res.accept_department.length > 0 ? 2 : (res.accept_admin.length > 0 ? 1 : (res
|
|
|
|
|
.groups.length > 0 ? 3 : 2)),
|
|
|
|
|
// months_list:[],
|
|
|
|
|
file_ids: res?.file_ids,
|
|
|
|
|
content: res?.content,
|
|
|
|
|
accept_admin_ids: res?.accept_admin_ids,
|
|
|
|
|
accept_department_ids: res?.accept_department_ids,
|
|
|
|
|
accept_department_ids: res?.accept_department_ids,
|
|
|
|
|
status:res.status?res.status:1,
|
|
|
|
|
}
|
|
|
|
|
this.valueMultiple=[]
|
|
|
|
|
this.valueArr=[]
|
|
|
|
|
this.userdatabefore.map(item=>{
|
|
|
|
|
res.accept_admin_ids.map(item1=>{
|
|
|
|
|
if(item.id==item1){
|
|
|
|
|
@ -551,25 +693,40 @@ import elSelectTree from '@/components/selectTree'
|
|
|
|
|
console.log("this.valueMultiple",this.valueMultiple)
|
|
|
|
|
this.$forceUpdate()
|
|
|
|
|
this.mission_plan_groups_list = []
|
|
|
|
|
for (var g of res.groups) {
|
|
|
|
|
if(g.type==1){
|
|
|
|
|
this.mission_plan_groups_list.push({
|
|
|
|
|
name: g.name,
|
|
|
|
|
type: g.type,
|
|
|
|
|
link_id: g.link_id,
|
|
|
|
|
valueArr:g.link_id,
|
|
|
|
|
valueMultiple:g.details
|
|
|
|
|
})
|
|
|
|
|
}else{
|
|
|
|
|
this.mission_plan_groups_list.push({
|
|
|
|
|
name: g.name,
|
|
|
|
|
type: g.type,
|
|
|
|
|
link_id: g.link_id
|
|
|
|
|
})
|
|
|
|
|
}
|
|
|
|
|
let group_list = this.contactGroup(res.groups)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
for (var g of group_list) {
|
|
|
|
|
let admin_arr = {}
|
|
|
|
|
admin_arr = {
|
|
|
|
|
name: g.name,
|
|
|
|
|
type: 1,
|
|
|
|
|
link_id: [],
|
|
|
|
|
link_id_dep:[],
|
|
|
|
|
valueArr:[],
|
|
|
|
|
valueMultiple:[]
|
|
|
|
|
}
|
|
|
|
|
if(g.admin_details.length>0){
|
|
|
|
|
for(var a of g.admin_details){
|
|
|
|
|
admin_arr.link_id.push(a.id)
|
|
|
|
|
admin_arr.valueArr.push(a.id)
|
|
|
|
|
admin_arr.valueMultiple.push(a)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if(g.dep_details.length>0){
|
|
|
|
|
for(var d of g.dep_details){
|
|
|
|
|
admin_arr.link_id_dep.push(d.id)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
this.mission_plan_groups_list.push(admin_arr)
|
|
|
|
|
// else{
|
|
|
|
|
// this.mission_plan_groups_list.push({
|
|
|
|
|
// name: g.name,
|
|
|
|
|
// type: g.type,
|
|
|
|
|
// link_id: g.link_id
|
|
|
|
|
// })
|
|
|
|
|
// }
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
for (var f of res.files) {
|
|
|
|
|
this.pictureList.push({
|
|
|
|
|
id: f.id,
|
|
|
|
|
@ -595,8 +752,7 @@ import elSelectTree from '@/components/selectTree'
|
|
|
|
|
} else {
|
|
|
|
|
this.form.file_ids = []
|
|
|
|
|
}
|
|
|
|
|
console.log("this.mission_plan_groups_list",this.mission_plan_groups_list)
|
|
|
|
|
// return
|
|
|
|
|
|
|
|
|
|
if (this.form.name7 == 3) {
|
|
|
|
|
if (this.mission_plan_groups_list.length == 0) {
|
|
|
|
|
Message({
|
|
|
|
|
@ -605,16 +761,30 @@ import elSelectTree from '@/components/selectTree'
|
|
|
|
|
})
|
|
|
|
|
return
|
|
|
|
|
}
|
|
|
|
|
for (let k of this.mission_plan_groups_list) {
|
|
|
|
|
if (k.link_id.length == 0) {
|
|
|
|
|
let arr = []
|
|
|
|
|
for (var k of this.mission_plan_groups_list) {
|
|
|
|
|
if (k.link_id.length == 0&&k.link_id_dep.length == 0) {
|
|
|
|
|
Message({
|
|
|
|
|
type: 'warning',
|
|
|
|
|
message: `请选择小组成员`
|
|
|
|
|
message: `请选择${k.name}成员`
|
|
|
|
|
})
|
|
|
|
|
return
|
|
|
|
|
}else{
|
|
|
|
|
if(k.link_id_dep.length > 0 ){
|
|
|
|
|
arr.push({
|
|
|
|
|
name:k.name,
|
|
|
|
|
type:2,
|
|
|
|
|
link_id:k.link_id_dep
|
|
|
|
|
})
|
|
|
|
|
}else{
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
arr.push(k)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
this.form.mission_plan_groups = this.mission_plan_groups_list
|
|
|
|
|
console.log("this.mission_plan_groups_list",arr,this.mission_plan_groups_list)
|
|
|
|
|
// return
|
|
|
|
|
this.form.mission_plan_groups = arr
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
// this.$refs.dialog.submit()
|
|
|
|
|
@ -666,7 +836,45 @@ import elSelectTree from '@/components/selectTree'
|
|
|
|
|
reject(error)
|
|
|
|
|
})
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
contactGroup(arr) {
|
|
|
|
|
let tempArr = [],
|
|
|
|
|
newArr = []
|
|
|
|
|
for (let i = 0; i < arr.length; i++) {
|
|
|
|
|
if (tempArr.indexOf(arr[i].name) === -1) {
|
|
|
|
|
if(arr[i].type===1){
|
|
|
|
|
newArr.push({
|
|
|
|
|
type: arr[i].type,
|
|
|
|
|
name: arr[i]['name'],
|
|
|
|
|
admin_details: arr[i].details,
|
|
|
|
|
dep_details: []
|
|
|
|
|
})
|
|
|
|
|
}else{
|
|
|
|
|
newArr.push({
|
|
|
|
|
type: arr[i].type,
|
|
|
|
|
name: arr[i]['name'],
|
|
|
|
|
admin_details:[],
|
|
|
|
|
dep_details: arr[i].details
|
|
|
|
|
})
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
tempArr.push(arr[i].name);
|
|
|
|
|
} else {
|
|
|
|
|
for (let j = 0; j < newArr.length; j++) {
|
|
|
|
|
if (newArr[j].name == arr[i].name) {
|
|
|
|
|
if(arr[i].type===1){
|
|
|
|
|
newArr[j].admin_details.push(...arr[i].details)
|
|
|
|
|
}else{
|
|
|
|
|
newArr[j].dep_details.push(
|
|
|
|
|
...arr[i].details
|
|
|
|
|
)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return newArr
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
watch: {
|
|
|
|
|
isShow(newVal) {
|
|
|
|
|
@ -706,7 +914,8 @@ import elSelectTree from '@/components/selectTree'
|
|
|
|
|
::v-deep .content,
|
|
|
|
|
::v-deep .end_type,
|
|
|
|
|
::v-deep .file_ids,
|
|
|
|
|
::v-deep .is_need_answer{
|
|
|
|
|
::v-deep .is_need_answer,
|
|
|
|
|
::v-deep .months_list{
|
|
|
|
|
flex-basis: 100%;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@ -714,7 +923,7 @@ import elSelectTree from '@/components/selectTree'
|
|
|
|
|
display: none;
|
|
|
|
|
}
|
|
|
|
|
::v-deep .el-form>div{
|
|
|
|
|
align-items: flex-start!important;
|
|
|
|
|
align-items: flex-start!important;
|
|
|
|
|
}
|
|
|
|
|
.xy-table-item{
|
|
|
|
|
padding-right:0
|
|
|
|
|
|
