Merge branch 'develop' into 'test'

Develop

See merge request !100
This commit is contained in:
王夏晖
2021-08-26 05:40:44 +00:00
6 changed files with 463 additions and 371 deletions
@@ -1,337 +1,376 @@
<template> <template>
<div class="bzdyStep2"> <div class="bzdyStep2">
<!-- 标准调研流程--> <!-- 标准调研流程-->
<ProcessHeader toggle> <ProcessHeader toggle>
<template slot="proName">标准征求意见流程</template> <template slot="proName">标准征求意见流程</template>
<template slot="proNode">对接人选择责任人</template> <template slot="proNode">对接人选择责任人</template>
</ProcessHeader> </ProcessHeader>
<div class="headerTabs"> <div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div> <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
<div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">审批历史</div> <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">审批历史</div>
</div>
<div class="content" v-show="active === '1'">
<div style="flex: auto; overflow: auto;">
<el-form
ref="bzzqyjForm"
:model="form"
:rules="formRules"
class="label-input-form"
label-width="210px"
>
<ProcessTitle>
<template slot="title">基础信息</template>
</ProcessTitle>
<div class="prc-content-border">
<el-row :gutter="24">
<el-col :span="24">
<el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.cid"
placeholder="请输入标准编号"
clearable
></el-input>
</el-form-item>
<el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.cname"
placeholder="请输入标准名称"
clearable
></el-input>
</el-form-item>
<el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
<el-date-picker
disabled
v-model="form.endTime"
type="date"
placeholder="请选择结束日期">
</el-date-picker>
</el-form-item>
<el-form-item label="责任人" prop="responUserList" class="add-form-item form-item-disabled">
<el-input
v-model="form.responUserList"
style="display: none;"
clearable
></el-input>
<el-input v-model="form.responUserListName" placeholder="请选择责任人" @click.native="choiceZRR"></el-input>
</el-form-item>
</el-col>
</el-row>
</div>
</el-form>
</div>
<el-collapse accordion>
<el-collapse-item title="意见填写">
<div style="margin: 10px 0;">
<el-input
type="textarea"
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
</el-input>
</div>
</el-collapse-item>
</el-collapse>
</div>
<div class="content" v-show="active === '2'">
<el-table
height="100%"
ref="selection"
:data="histortData"
tooltip-effect="dark"
style="width: 100%"
border
row-key="id"
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
<el-table-column
prop="name"
label="任务步骤"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="createTime"
label="创建时间"
sortable="custom"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column>
<el-table-column
prop="endTime"
label="完成时间"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column>
<el-table-column
prop="comment"
label="审批意见"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.commentText }}</span>
</template>
</el-table-column>
<el-table-column
prop="completeFlag"
label="状态"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.endTime ? '已完成' : '未完成'}}</span>
</template>
</el-table-column>
</el-table>
</div>
<ProcessFooter
show-submit
:submitLoading="isSubmit"
:saveLoading="saveLoading"
@save="handleSave"
@submit="handleSubmit"
>
</ProcessFooter>
<Role-tree
is-title="选择责任部门对接人"
:is-visible.sync="modalshowflag"
@checkedRole="checkedRole2"
:nodeList="nodeList"
></Role-tree>
</div> </div>
<div class="content" v-show="active === '1'">
<div style="flex: auto; overflow: auto;">
<el-form
ref="bzzqyjForm"
:model="form"
:rules="formRules"
class="label-input-form"
label-width="210px"
>
<ProcessTitle>
<template slot="title">基础信息</template>
</ProcessTitle>
<div class="prc-content-border">
<el-row :gutter="24">
<el-col :span="24">
<el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.cid"
placeholder="请输入标准编号"
clearable
></el-input>
</el-form-item>
<el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.cname"
placeholder="请输入标准名称"
clearable
></el-input>
</el-form-item>
<el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
<el-date-picker
disabled
v-model="form.endTime"
type="date"
placeholder="请选择结束日期">
</el-date-picker>
</el-form-item>
<el-form-item label="责任人" prop="responUserList" class="add-form-item form-item-disabled">
<el-input
v-model="form.responUserList"
style="display: none;"
clearable
></el-input>
<el-input v-model="form.responUserListName" placeholder="请选择责任人" @click.native="choiceZRR"></el-input>
</el-form-item>
</el-col>
</el-row>
</div>
</el-form>
</div>
<el-collapse accordion>
<el-collapse-item title="意见填写">
<div style="margin: 10px 0;">
<el-input
type="textarea"
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
</el-input>
</div>
</el-collapse-item>
</el-collapse>
</div>
<div class="content" v-show="active === '2'">
<el-table
height="100%"
ref="selection"
:data="histortData"
tooltip-effect="dark"
style="width: 100%"
border
row-key="id"
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
<el-table-column
prop="name"
label="任务步骤"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="createTime"
label="创建时间"
sortable="custom"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
prop="endTime"
label="完成时间"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
prop="comment"
label="审批意见"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.commentText }}</span>
</template>
</el-table-column>
<el-table-column
prop="completeFlag"
label="状态"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.endTime ? "已完成" : "未完成" }}</span>
</template>
</el-table-column>
</el-table>
</div>
<ProcessFooter
show-submit
show-save
:submitLoading="isSubmit"
:saveLoading="saveLoading"
@save="handleSave"
@submit="handleSubmit"
>
</ProcessFooter>
<Role-tree
is-title="选择责任部门对接人"
:is-visible.sync="modalshowflag"
@checkedRole="checkedRole2"
:nodeList="nodeList"
></Role-tree>
</div>
</template> </template>
<script> <script>
import ProcessHeader from '../../components/ProcessHeader' import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from '../../components/ProcessFooter' import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from '../../components/ProcessTitle' import ProcessTitle from "../../components/ProcessTitle";
import {inboundLiaisonDetail,processCreateStand} from 'api/process' import { inboundLiaisonDetail, processCreateStand, saveTaskForPub } from "api/process";
export default { export default {
name: "bzzqyjStep2", name: "bzzqyjStep2",
data() { data() {
return { return {
histortData: [], histortData: [],
commentText: '', commentText: "",
taskIds: this.$route.query.taskIds, taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId, pId: this.$route.query.prcId,
nodeList: [], nodeList: [],
type: '', type: "",
modalshowflag: false, // drawer开关 modalshowflag: false, // drawer开关
drawerTitle: '', //drawer标题 drawerTitle: "", //drawer标题
textarea: '', // 意见 textarea: "", // 意见
ListModel: false, // 新增编辑抽屉开关 ListModel: false, // 新增编辑抽屉开关
active: '1', // 默认显示 active: "1", // 默认显示
isSubmit: false, isSubmit: false,
saveLoading: false, saveLoading: false,
form: { form: {
cid: '', // 编号 cid: "", // 编号
endTime: '', // 结束日期 endTime: "", // 结束日期
cname: '', // 名称 cname: "", // 名称
responUserList: '', responUserList: "",
responUserListName: '' responUserListName: ""
}, },
formRules: { formRules: {
responUserList: [ responUserList: [
{ required: true, message: '请选择责任人', trigger: 'change' }, { required: true, message: "请选择责任人", trigger: "change" }
] ]
}, },
json: {} json: {}
} };
}, },
components: { components: {
ProcessHeader, ProcessHeader,
ProcessFooter, ProcessFooter,
ProcessTitle ProcessTitle
}, },
methods: { methods: {
getHistoryData () { getHistoryData() {
this.$http.get('lawss/activiti/get_list_by_instance', { this.$http.get("lawss/activiti/get_list_by_instance", {
prcNum: this.$route.query.prcNum, prcNum: this.$route.query.prcNum
}, {}, res => { }, {}, res => {
this.histortData = res this.histortData = res;
}, e => {}) }, e => {
}, });
checkedRole2 (data) { },
var idList = '' checkedRole2(data) {
var nameList = '' var idList = "";
data.forEach( item => { var nameList = "";
if (nameList.length > 0) { data.forEach(item => {
nameList += ',' if (nameList.length > 0) {
idList += ',' nameList += ",";
} idList += ",";
idList += item.id
nameList += item.name
})
this.form.responUserList = idList
this.form.responUserListName = nameList
},
choiceZRR () {
this.nodeList = []
if (this.form.responUserList.length > 0) {
this.nodeList = this.form.responUserList.split(',')
}
this.modalshowflag = true
},
handleTabs(name) {
this.active = name
},
handleSave() {},
handleSubmit() {
this.$refs['bzzqyjForm'].validate((valid) => {
if (valid) {
this.isSubmit = true
var json = this.json
json.commentText = this.commentText
json.responUserList = this.form.responUserList
json.responUserListName = this.form.responUserListName
json.introduce = false
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
taskId: this.taskIds,
userId: this.$store.getters.userInfo.userId
}, {}, res => {
if (res.success) {
this.$message.success('提交成功')
this.$router.push('/processCenter')
}
this.isSubmit = false
})
} else {
return this.$message.warning('请完善基础信息')
}
})
},
getData() {
return new Promise((resolve, reject) => {
inboundLiaisonDetail({
taskIds: this.taskIds,
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
this.form.cid = data.cid
this.form.endTime = data.endTime
this.form.cname = data.cname
this.json = data
}).catch(e => {
})
})
},
},
mounted () {
this.getHistoryData()
this.getData()
} }
idList += item.id;
nameList += item.name;
});
this.form.responUserList = idList;
this.form.responUserListName = nameList;
},
choiceZRR() {
this.nodeList = [];
if (this.form.responUserList.length > 0) {
this.nodeList = this.form.responUserList.split(",");
}
this.modalshowflag = true;
},
handleTabs(name) {
this.active = name;
},
//保存事件
handleSave() {
this.saveLoading = true;
let _formData = new FormData();
_formData.append("id", this.bpnId || "");
_formData.append("prcType", "3");
_formData.append("taskIds", this.taskIds);
_formData.append("json", JSON.stringify({
form: this.form,
commentText: this.commentText
}));
saveTaskForPub(_formData).then(res => {
this.saveLoading = false;
this.$message.success("保存成功");
this.bpnId = res.result;
}).catch(e => {
this.saveLoading = false;
});
},
handleSubmit() {
this.$refs["bzzqyjForm"].validate((valid) => {
if (valid) {
this.isSubmit = true;
var json = this.json;
json.commentText = this.commentText;
json.responUserList = this.form.responUserList;
json.responUserListName = this.form.responUserListName;
json.introduce = false;
this.$http.post("lawss/activiti/completeTask", {
json: JSON.stringify(json),
taskId: this.taskIds,
userId: this.$store.getters.userInfo.userId
}, {}, res => {
if (res.success) {
this.$message.success("提交成功");
this.$router.push("/processCenter");
}
this.isSubmit = false;
});
} else {
return this.$message.warning("请完善基础信息");
}
});
},
getData() {
return new Promise((resolve, reject) => {
inboundLiaisonDetail({
taskIds: this.taskIds,
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg);
if (data.form === undefined) {
this.form.cid = data.cid;
this.form.endTime = data.endTime;
this.form.cname = data.cname;
this.json = data;
} else {
this.form = data.form
this.form.cid = data.form.cid;
this.form.endTime = data.form.endTime;
this.form.cname = data.form.cname;
this.json = data.form;
}
}).catch(e => {
});
});
} }
},
mounted() {
this.getHistoryData();
this.getData();
}
};
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
@import '~@/assets/styles/style'; @import '~@/assets/styles/style';
.bzdyStep2 {
/deep/.el-drawer__container { .bzdyStep2 {
.prc-content-border { /deep/ .el-drawer__container {
border: none; .prc-content-border {
padding: 0 20px 0; border: none;
} padding: 0 20px 0;
}
.fileClass {
cursor: pointer;
}
.fileClass:hover{
color: #0c91e5;
}
position: relative;
height: 100%;
.headerTabs {
height: 52px;
display: flex;
align-items: center;
position: absolute;
top: 0;
right: 10px;
.headerTabsItem {
border: 1px solid #c1c1c1;
padding: 0 5px;
height: 30px;
line-height: 30px;
cursor: pointer;
}
.active {
border: 1px solid #E6A23C;
color: #fff;
background: #E6A23C;
}
}
.content {
display: flex;
flex-direction: column;
justify-content: space-between;
height: calc(~'100% - 103px');
overflow: auto;
.tableTitle {
margin-bottom: 10px;
height: 30px;
line-height: 30px;
position: relative;
font-size: 13px;
font-weight: bold;
.tableButton {
position: absolute;
right: 0;
top: 0;
}
}
}
} }
}
.fileClass {
cursor: pointer;
}
.fileClass:hover {
color: #0c91e5;
}
position: relative;
height: 100%;
.headerTabs {
height: 52px;
display: flex;
align-items: center;
position: absolute;
top: 0;
right: 10px;
.headerTabsItem {
border: 1px solid #c1c1c1;
padding: 0 5px;
height: 30px;
line-height: 30px;
cursor: pointer;
}
.active {
border: 1px solid #E6A23C;
color: #fff;
background: #E6A23C;
}
}
.content {
display: flex;
flex-direction: column;
justify-content: space-between;
height: calc(~'100% - 103px');
overflow: auto;
.tableTitle {
margin-bottom: 10px;
height: 30px;
line-height: 30px;
position: relative;
font-size: 13px;
font-weight: bold;
.tableButton {
position: absolute;
right: 0;
top: 0;
}
}
}
}
</style> </style>
@@ -208,6 +208,7 @@
</div> </div>
<ProcessFooter <ProcessFooter
show-submit show-submit
show-save
:submitLoading="isSubmit" :submitLoading="isSubmit"
:saveLoading="saveLoading" :saveLoading="saveLoading"
@save="handleSave" @save="handleSave"
@@ -325,20 +326,22 @@
this.active = name this.active = name
}, },
handleSave() { handleSave() {
this.saveLoading = true this.saveLoading = true;
let _formData = new FormData() let _formData = new FormData();
_formData.append('taskIds', this.taskIds) _formData.append("id", this.bpnId || "");
_formData.append('json', JSON.stringify({ _formData.append("prcType", "3");
form: this.form, _formData.append("taskIds", this.taskIds);
data: this.data, _formData.append("json", JSON.stringify({
commentText: this.commentText, form: this.json,
})) commentText: this.commentText
saveTaskForPub(_formData).then(res => { }));
this.saveLoading = false saveTaskForPub(_formData).then(res => {
this.$message.success('保存成功') this.saveLoading = false;
}).catch(e => { this.$message.success("保存成功");
this.saveLoading = false this.bpnId = res.result;
}) }).catch(e => {
this.saveLoading = false;
});
}, },
handleSubmit() { handleSubmit() {
if (this.data.length < 1) { if (this.data.length < 1) {
@@ -452,24 +452,24 @@ export default {
}, },
//保存事件 //保存事件
handleSave() { // handleSave() {
this.saveLoading = true; // this.saveLoading = true;
let _formData = new FormData(); // let _formData = new FormData();
_formData.append("id", this.bpnId || ""); // _formData.append("id", this.bpnId || "");
_formData.append("prcType", "5"); // _formData.append("prcType", "5");
_formData.append('taskIds', this.taskIds) // _formData.append('taskIds', this.taskIds)
_formData.append("json", JSON.stringify({ // _formData.append("json", JSON.stringify({
form: this.listForm, // form: this.listForm,
commentText: this.commentText // commentText: this.commentText
})); // }));
saveTaskForPub(_formData).then(res => { // saveTaskForPub(_formData).then(res => {
this.saveLoading = false; // this.saveLoading = false;
this.$message.success("保存成功"); // this.$message.success("保存成功");
this.bpnId = res.result; // this.bpnId = res.result;
}).catch(e => { // }).catch(e => {
this.saveLoading = false; // this.saveLoading = false;
}); // });
}, // },
//提交事件 //提交事件
handleSubmit() { handleSubmit() {
this.listForm.breakdownList.forEach(item => { this.listForm.breakdownList.forEach(item => {
@@ -2,7 +2,7 @@
<div class="xmpg2-step12"> <div class="xmpg2-step12">
<ProcessHeader toggle> <ProcessHeader toggle>
<template slot="proName">项目合规评估流程-项目</template> <template slot="proName">项目合规评估流程-项目</template>
<template slot="proNode">责任人审核</template> <template slot="proNode">标准法规部长审核</template>
</ProcessHeader> </ProcessHeader>
<div class="headerTabs"> <div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div> <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
@@ -42,16 +42,18 @@
<process-title> <process-title>
<template slot="title">填写信息</template> <template slot="title">填写信息</template>
</process-title> </process-title>
<div class="tableTitle"> <!-- <div class="tableTitle">-->
<div class="tableButton"> <!-- <div class="tableButton">-->
<el-button plain class="common-button-primary" size="mini" @click="choiceZRRS('', 2, '')">批量分发责任人 <!-- <el-button plain class="common-button-primary" size="mini" @click="choiceZRRS('', 2, '')">批量分发责任人-->
</el-button> <!-- </el-button>-->
</div> <!-- </div>-->
</div> <!-- </div>-->
<el-table <el-table
:data="dataList" :data="dataList"
style="width: 100%" style="width: 100%"
row-key="standId" row-key="standId"
v-if="refreshTable"
height="70%" height="70%"
border border
ref="myTable" ref="myTable"
@@ -95,10 +97,20 @@
> >
</el-table-column> </el-table-column>
<el-table-column label="责任人" prop="workPeople" align="center"> <el-table-column label="责任人" prop="workPeople" align="center">
<template slot-scope="scope" v-if="scope.row.workPeople"> <template slot-scope="scope" >
<el-input v-model="scope.row.workPeopleId" style="display: none;" /> <div v-if="selectList.length<=1">
<el-input v-model="scope.row.workPeople" placeholder="请选择分发责任人" <el-input v-if="scope.row.workPeople" v-model="scope.row.workPeopleId" style="display: none;" readonly/>
@click.native="choiceZRRS(scope.row, 1, scope.$index)" /> <el-input v-if="scope.row.workPeople" v-model="scope.row.workPeople" placeholder="请选择分发责任人"
@click.native="choiceZRRS(scope.row, 1, scope.$index)" readonly/>
</div>
<div v-else>
<el-input v-if="scope.row.workPeople" v-model="scope.row.workPeopleId" style="display: none;" readonly/>
<el-input v-if="scope.row.workPeople" v-model="scope.row.workPeople" placeholder="请选择分发责任人"
@click.native="choiceZRRS('', 2, '')" readonly/>
</div>
<el-button style="width: 98%" :loading="buttonLoading" v-if="!scope.row.workPeople" size="small" type="primary" @click="choiceZRRS(scope.row, 3, '')">{{ "批量分发该标准下的责任人" }}</el-button>
</template> </template>
<!-- <template slot-scope="scope">--> <!-- <template slot-scope="scope">-->
<!-- <div :class="{'fileClass': !scope.row.workPeople}">--> <!-- <div :class="{'fileClass': !scope.row.workPeople}">-->
@@ -226,6 +238,13 @@ export default {
}, },
data() { data() {
return { return {
workPeopleList:[],
//防止按钮点击过快的按钮loading
buttonLoading: false,
//刷新表格
refreshTable: true,
//展开表格
// tableExpand: false,
hasChildren: true, hasChildren: true,
active: "1", active: "1",
loading: false, loading: false,
@@ -323,7 +342,6 @@ export default {
taskIds: this.taskIds, taskIds: this.taskIds,
pId: this.pId pId: this.pId
}).then(res => { }).then(res => {
console.log(res.mesg);
if (res) { if (res) {
const processForm = JSON.parse(res.mesg); const processForm = JSON.parse(res.mesg);
this.getFormFieldList(processForm); this.getFormFieldList(processForm);
@@ -357,7 +375,6 @@ export default {
workPeople: "请选择责任人" workPeople: "请选择责任人"
}; };
children.push(aa); children.push(aa);
console.log(children);
} }
); );
this.dataList.forEach(key => { this.dataList.forEach(key => {
@@ -402,7 +419,6 @@ export default {
this.isSubmit = true; this.isSubmit = true;
this.listForm.commentText = this.commentText; this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm); const json = JSON.stringify(this.listForm);
console.log(json);
this.$http.post("lawss/activiti/completeTask", { this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds, taskIds: this.taskIds,
userId: this.userId, userId: this.userId,
@@ -440,6 +456,24 @@ export default {
this.$message.warning("请选择要分发的数据"); this.$message.warning("请选择要分发的数据");
} }
} }
//批量分发某标准下的责任人
else if (type === 3){
//弹出选人框
// if (this.tableExpand === false){
this.modalshowflag = true;
this.drawerTitle = "批量选择责任人";
// }
//展开表格
this.workPeopleList = row
// console.log('279',row.children)
this.refreshTable = false
// this.tableExpand = !this.tableExpand
this.$nextTick(() => {
this.refreshTable = true
});
}
}, },
//标准表格选择框改变 //标准表格选择框改变
selectStandChange(data) { selectStandChange(data) {
@@ -494,6 +528,22 @@ export default {
}); });
}); });
this.dataList = JSON.parse(JSON.stringify(this.dataList)); this.dataList = JSON.parse(JSON.stringify(this.dataList));
}else if (this.type === 3){
// console.log("529",this.workPeopleList)
for (let i=0;i<this.workPeopleList.children.length;i++){
this.workPeopleList.children[i].workPeople = data[0].name
this.workPeopleList.children[i].workPeopleId = data[0].id
// console.log(row.children[i].id)
// console.log(row.children[i].workPeople)
}
// items.children.map(childrenItem => {
//
// childrenItem.workPeople = data[0].name;
// childrenItem.workPeopleId = data[0].id;
// })
} }
this.modalshowflag = false; this.modalshowflag = false;
}, },
@@ -116,7 +116,7 @@
width="200"> width="200">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="selectIndex === 'laws'">{{ getLawsState(scope.row.statecode) }}</span> <span v-if="selectIndex === 'laws'">{{ getLawsState(scope.row.statecode) }}</span>
<div v-else>{{ scope.row.standstateshow }}</div> <div v-else>{{ selectIndex === 'stand' ? scope.row.textStatusName : (selectIndex === 'laws' ? scope.row.textStatusLawsName : scope.row.textStatusBussName) }}</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column