Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
@@ -80,11 +80,13 @@
|
||||
|
||||
<style lang="less" scoped>
|
||||
.link {
|
||||
margin-right: 10px;
|
||||
display: flex;
|
||||
border-radius: 3px;
|
||||
height: 100%;
|
||||
align-items: center;
|
||||
justify-content: space-around;
|
||||
box-shadow: 1px 1px 10px rgba(0,0,0,0.1);
|
||||
.borderRight {
|
||||
padding-right: 30px;
|
||||
margin-right: 30px;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<!-- 右侧导航 -->
|
||||
<template>
|
||||
<div class="nav-menu">
|
||||
<div class="lattice">
|
||||
<div class="lattice" style=" box-shadow:1px 1px 10px rgba(0,0,0,0.1);" >
|
||||
<div class="title"><i class="el-icon-s-promotion"></i> 快捷入口</div>
|
||||
<div class="menu-wrap">
|
||||
<enter-card v-for="(item, index) in list"
|
||||
@@ -67,8 +67,10 @@
|
||||
<style lang="less" scoped>
|
||||
.nav-menu {
|
||||
.lattice {
|
||||
margin-right: 10px;
|
||||
background: #fff;
|
||||
margin-bottom: 10px;
|
||||
border-radius: 3px;
|
||||
.title {
|
||||
margin-bottom: 10px;
|
||||
padding-left: 10px;
|
||||
@@ -77,6 +79,7 @@
|
||||
background: #fff;
|
||||
font-size: 16px;
|
||||
font-weight: bold;
|
||||
border-radius: 10px;
|
||||
}
|
||||
.menu-wrap {
|
||||
height: 240px;
|
||||
|
||||
@@ -22,8 +22,8 @@
|
||||
placeholder="请输入关键词"
|
||||
clearable
|
||||
></el-input>
|
||||
<el-button type="primary" @click="search">搜索</el-button>
|
||||
<el-button style="margin-left: 5px;" type="primary" @click="seniorSearch">高级搜索</el-button>
|
||||
<el-button style="box-shadow:1px 1px 10px rgba(0,0,0,0.2);margin-left: 5px;" type="primary" @click="search">一般检索</el-button>
|
||||
<el-button style="box-shadow:1px 1px 10px rgba(0,0,0,0.2);margin-left: 5px;" type="primary" @click="seniorSearch">高级检索</el-button>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
@@ -91,7 +91,7 @@ export default {
|
||||
}
|
||||
</script>
|
||||
|
||||
<style lang="less" scoped>
|
||||
<style lang="less" scoped>
|
||||
.search-group {
|
||||
display: flex;
|
||||
width: 100%;
|
||||
@@ -105,10 +105,11 @@ export default {
|
||||
width: 18vm;
|
||||
height: 40px;
|
||||
color: #333333;
|
||||
font-size: 16px;
|
||||
font-size: 13px;
|
||||
border: 0;
|
||||
border-radius: 3px;
|
||||
background-color: #FFFFFF;
|
||||
box-shadow:1px -2px 10px rgba(0,0,0,0.1);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -118,11 +119,12 @@ export default {
|
||||
::v-deep {
|
||||
.el-input__inner {
|
||||
height: 40px;
|
||||
font-size: 16px;
|
||||
font-size: 14px;
|
||||
color: #333333;
|
||||
border: 0;
|
||||
border-radius: 3px;
|
||||
background: #FFFFFF;
|
||||
box-shadow:1px -2px 10px rgba(0,0,0,0.1);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -132,6 +134,7 @@ export default {
|
||||
border: 0;
|
||||
border-radius: 3px;
|
||||
background-color: #5ea9f6;
|
||||
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -1274,10 +1274,12 @@ export default {
|
||||
|
||||
<style lang="less" scoped>
|
||||
.to-do-list {
|
||||
margin-right: 10px;
|
||||
border-radius: 3px;
|
||||
height: calc(~'100% - 310px');
|
||||
overflow: hidden;
|
||||
background: #FFFFFF;
|
||||
box-shadow: 1px 1px 10px rgba(0,0,0,0.1);
|
||||
.task {
|
||||
display: inline-block;
|
||||
margin: 15px;
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
<div class="home_main">
|
||||
<div class="left_wrapper">
|
||||
<search-group></search-group>
|
||||
<div class="main-tabs" style="border-radius: 3px;">
|
||||
<div class="main-tabs" style="box-shadow:1px 1px 10px rgba(0,0,0,0.1);border-radius: 3px;" >
|
||||
<div class="main-left-wrap" >
|
||||
<!-- <el-button type="text" style="font-size: 14px" class="more" @click="MORE">MORE</el-button>-->
|
||||
<el-tabs
|
||||
@@ -142,7 +142,7 @@ export default {
|
||||
}
|
||||
::v-deep {
|
||||
.el-tabs__item {
|
||||
font-size: 16px;
|
||||
font-size: 14px;
|
||||
font-weight: 600;
|
||||
/*color: #333333;*/
|
||||
}
|
||||
|
||||
@@ -43,11 +43,12 @@
|
||||
<template slot="title">填写信息</template>
|
||||
</process-title>
|
||||
<el-table
|
||||
:data="dataList"
|
||||
style="width: 100%; border: 1px solid #cccccc"
|
||||
:data="dataList.slice((currentPage - 1) * pageSize, currentPage * pageSize ) "
|
||||
style="width: 100%; border: 1px solid #cccccc;height: 400px"
|
||||
row-key="standId"
|
||||
height="70%"
|
||||
border
|
||||
highlight-current-row
|
||||
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
|
||||
fontWeight: 'bold'}"
|
||||
>
|
||||
@@ -190,6 +191,14 @@
|
||||
label="责任人">
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<el-pagination
|
||||
layout="total,sizes, prev, pager, next"
|
||||
background
|
||||
:page-sizes="[20, 40, 60]"
|
||||
:total="total"
|
||||
@current-change="handleCurrentChange"
|
||||
>
|
||||
</el-pagination>
|
||||
</div>
|
||||
<div>
|
||||
<el-collapse accordion>
|
||||
@@ -292,6 +301,9 @@ export default {
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
total: 0,
|
||||
currentPage: 1,
|
||||
pageSize: 20,
|
||||
active: "1",
|
||||
loading: false,
|
||||
// 当前流程类型(1待办/2已办)
|
||||
@@ -392,11 +404,36 @@ export default {
|
||||
this.listForm.prcName = this.prcName;
|
||||
this.listForm["id"] = item.id;
|
||||
this.listForm.dataList = item.dataList;
|
||||
this.dataList = item.dataList;
|
||||
this.dataList.distributePerson = item.dataList[0].distributePerson;
|
||||
this.listForm.breakdownList = item.breakdownList;
|
||||
let dataChildren = []
|
||||
let dataListChildren = []
|
||||
this.listForm.dataList.forEach(item => {
|
||||
item.children.forEach(items=> {
|
||||
if(items.key === item.standId){
|
||||
this.$set(items, "standName", item.standName);
|
||||
this.$set(items, "standEnName", item.standEnName);
|
||||
this.$set(items, "standYear", item.standYear);
|
||||
this.$set(items, "standSort", item.standSort);
|
||||
this.$set(items, "standNumber", item.standNumber);
|
||||
}
|
||||
})
|
||||
})
|
||||
this.listForm.dataList.forEach(item => {
|
||||
dataChildren.push(item.children)
|
||||
})
|
||||
dataChildren.forEach((item,index) => {
|
||||
dataListChildren = dataListChildren.concat(item)
|
||||
})
|
||||
this.dataList = dataListChildren
|
||||
this.total = this.dataList.length;
|
||||
// this.dataList = item.dataList;
|
||||
// this.dataList.distributePerson = item.dataList[0].distributePerson;
|
||||
// this.listForm.breakdownList = item.breakdownList;
|
||||
});
|
||||
},
|
||||
// 分页
|
||||
handleCurrentChange(currentPage) {
|
||||
this.currentPage = currentPage;
|
||||
},
|
||||
//驳回事件
|
||||
beforeBack() {
|
||||
if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
|
||||
|
||||
@@ -43,11 +43,12 @@
|
||||
<template slot="title">填写信息</template>
|
||||
</process-title>
|
||||
<el-table
|
||||
:data="dataList"
|
||||
style="width: 100%; border: 1px solid #cccccc"
|
||||
:data="dataList.slice((currentPage - 1) * pageSize, currentPage * pageSize ) "
|
||||
style="width: 100%; border: 1px solid #cccccc;height: 400px"
|
||||
row-key="standId"
|
||||
height="70%"
|
||||
border
|
||||
highlight-current-row
|
||||
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
|
||||
fontWeight: 'bold'}"
|
||||
>
|
||||
@@ -195,6 +196,14 @@
|
||||
label="责任人">
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<el-pagination
|
||||
layout="total,sizes, prev, pager, next"
|
||||
background
|
||||
:page-sizes="[20, 40, 60]"
|
||||
:total="total"
|
||||
@current-change="handleCurrentChange"
|
||||
>
|
||||
</el-pagination>
|
||||
</div>
|
||||
<div>
|
||||
<el-collapse accordion>
|
||||
@@ -318,6 +327,9 @@ export default {
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
total: 0,
|
||||
currentPage: 1,
|
||||
pageSize: 20,
|
||||
nodeList:[],
|
||||
drawerTitle:'',
|
||||
isTransfer: false,
|
||||
@@ -462,9 +474,30 @@ export default {
|
||||
this.listForm.prcName = this.prcName;
|
||||
this.listForm["id"] = item.id;
|
||||
this.listForm.dataList = item.dataList;
|
||||
this.dataList = item.dataList;
|
||||
this.dataList.distributePerson = item.dataList[0].distributePerson;
|
||||
this.listForm.breakdownList = item.breakdownList;
|
||||
let dataChildren = []
|
||||
let dataListChildren = []
|
||||
this.listForm.dataList.forEach(item => {
|
||||
item.children.forEach(items=> {
|
||||
if(items.key === item.standId){
|
||||
this.$set(items, "standName", item.standName);
|
||||
this.$set(items, "standEnName", item.standEnName);
|
||||
this.$set(items, "standYear", item.standYear);
|
||||
this.$set(items, "standSort", item.standSort);
|
||||
this.$set(items, "standNumber", item.standNumber);
|
||||
}
|
||||
})
|
||||
})
|
||||
this.listForm.dataList.forEach(item => {
|
||||
dataChildren.push(item.children)
|
||||
})
|
||||
dataChildren.forEach((item,index) => {
|
||||
dataListChildren = dataListChildren.concat(item)
|
||||
})
|
||||
this.dataList = dataListChildren
|
||||
this.total = this.dataList.length;
|
||||
// this.dataList = item.dataList;
|
||||
// this.dataList.distributePerson = item.dataList[0].distributePerson;
|
||||
// this.listForm.breakdownList = item.breakdownList;
|
||||
});
|
||||
},
|
||||
//驳回事件
|
||||
@@ -511,7 +544,11 @@ export default {
|
||||
this.isSubmit = false;
|
||||
}, e => {
|
||||
});
|
||||
}
|
||||
},
|
||||
// 分页
|
||||
handleCurrentChange(currentPage) {
|
||||
this.currentPage = currentPage;
|
||||
},
|
||||
},
|
||||
computed: {
|
||||
listNoDataText() {
|
||||
|
||||
@@ -43,11 +43,12 @@
|
||||
<template slot="title">填写信息</template>
|
||||
</process-title>
|
||||
<el-table
|
||||
:data="dataList"
|
||||
style="width: 100%; border: 1px solid #cccccc"
|
||||
:data="dataList.slice((currentPage - 1) * pageSize, currentPage * pageSize ) "
|
||||
style="width: 100%; border: 1px solid #cccccc;height: 400px"
|
||||
row-key="standId"
|
||||
height="70%"
|
||||
border
|
||||
highlight-current-row
|
||||
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
|
||||
fontWeight: 'bold'}"
|
||||
>
|
||||
@@ -195,6 +196,14 @@
|
||||
label="责任人">
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<el-pagination
|
||||
layout="total,sizes, prev, pager, next"
|
||||
background
|
||||
:page-sizes="[20, 40, 60]"
|
||||
:total="total"
|
||||
@current-change="handleCurrentChange"
|
||||
>
|
||||
</el-pagination>
|
||||
</div>
|
||||
<div>
|
||||
<el-collapse accordion>
|
||||
@@ -316,6 +325,9 @@ export default {
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
total: 0,
|
||||
currentPage: 1,
|
||||
pageSize: 20,
|
||||
nodeList:[],
|
||||
drawerTitle:'',
|
||||
isTransfer: false,
|
||||
@@ -455,15 +467,37 @@ export default {
|
||||
},
|
||||
//动态表单读取
|
||||
getFormFieldList(item) {
|
||||
console.log(item);
|
||||
this.$nextTick(() => {
|
||||
this.listForm = JSON.parse(JSON.stringify(item));
|
||||
this.listForm.prcNum = this.prcNum;
|
||||
this.listForm.prcName = this.prcName;
|
||||
this.listForm["id"] = item.id;
|
||||
this.listForm.dataList = item.dataList;
|
||||
this.dataList = item.dataList;
|
||||
this.dataList.distributePerson = item.dataList[0].distributePerson;
|
||||
this.listForm.breakdownList = item.breakdownList;
|
||||
let dataChildren = []
|
||||
let dataListChildren = []
|
||||
this.listForm.dataList.forEach(item => {
|
||||
item.children.forEach(items=> {
|
||||
if(items.key === item.standId){
|
||||
this.$set(items, "standName", item.standName);
|
||||
this.$set(items, "standEnName", item.standEnName);
|
||||
this.$set(items, "standYear", item.standYear);
|
||||
this.$set(items, "standSort", item.standSort);
|
||||
this.$set(items, "standNumber", item.standNumber);
|
||||
}
|
||||
})
|
||||
})
|
||||
this.listForm.dataList.forEach(item => {
|
||||
dataChildren.push(item.children)
|
||||
})
|
||||
dataChildren.forEach((item,index) => {
|
||||
dataListChildren = dataListChildren.concat(item)
|
||||
})
|
||||
this.dataList = dataListChildren
|
||||
this.total = this.dataList.length;
|
||||
// this.dataList = item.dataList;
|
||||
// this.dataList.distributePerson = item.dataList[0].distributePerson;
|
||||
// this.listForm.breakdownList = item.breakdownList;
|
||||
});
|
||||
},
|
||||
//提交事件
|
||||
@@ -486,7 +520,11 @@ export default {
|
||||
this.isSubmit = false;
|
||||
}, e => {
|
||||
});
|
||||
}
|
||||
},
|
||||
// 分页
|
||||
handleCurrentChange(currentPage) {
|
||||
this.currentPage = currentPage;
|
||||
},
|
||||
},
|
||||
|
||||
computed: {
|
||||
|
||||
@@ -43,11 +43,12 @@
|
||||
<template slot="title">填写信息</template>
|
||||
</process-title>
|
||||
<el-table
|
||||
:data="dataList"
|
||||
style="width: 100%; border: 1px solid #cccccc"
|
||||
:data="dataList.slice((currentPage - 1) * pageSize, currentPage * pageSize ) "
|
||||
style="width: 100%; border: 1px solid #cccccc;height: 400px"
|
||||
row-key="standId"
|
||||
height="70%"
|
||||
border
|
||||
highlight-current-row
|
||||
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
|
||||
fontWeight: 'bold'}"
|
||||
>
|
||||
@@ -195,6 +196,14 @@
|
||||
label="责任人">
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<el-pagination
|
||||
layout="total,sizes, prev, pager, next"
|
||||
background
|
||||
:page-sizes="[20, 40, 60]"
|
||||
:total="total"
|
||||
@current-change="handleCurrentChange"
|
||||
>
|
||||
</el-pagination>
|
||||
</div>
|
||||
<div>
|
||||
<el-collapse accordion>
|
||||
@@ -318,6 +327,9 @@ export default {
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
total: 0,
|
||||
currentPage: 1,
|
||||
pageSize: 20,
|
||||
nodeList:[],
|
||||
drawerTitle:'',
|
||||
isTransfer: false,
|
||||
@@ -462,9 +474,30 @@ export default {
|
||||
this.listForm.prcName = this.prcName;
|
||||
this.listForm["id"] = item.id;
|
||||
this.listForm.dataList = item.dataList;
|
||||
this.dataList = item.dataList;
|
||||
this.dataList.distributePerson = item.dataList[0].distributePerson;
|
||||
this.listForm.breakdownList = item.breakdownList;
|
||||
let dataChildren = []
|
||||
let dataListChildren = []
|
||||
this.listForm.dataList.forEach(item => {
|
||||
item.children.forEach(items=> {
|
||||
if(items.key === item.standId){
|
||||
this.$set(items, "standName", item.standName);
|
||||
this.$set(items, "standEnName", item.standEnName);
|
||||
this.$set(items, "standYear", item.standYear);
|
||||
this.$set(items, "standSort", item.standSort);
|
||||
this.$set(items, "standNumber", item.standNumber);
|
||||
}
|
||||
})
|
||||
})
|
||||
this.listForm.dataList.forEach(item => {
|
||||
dataChildren.push(item.children)
|
||||
})
|
||||
dataChildren.forEach((item,index) => {
|
||||
dataListChildren = dataListChildren.concat(item)
|
||||
})
|
||||
this.dataList = dataListChildren
|
||||
this.total = this.dataList.length;
|
||||
// this.dataList = item.dataList;
|
||||
// this.dataList.distributePerson = item.dataList[0].distributePerson;
|
||||
// this.listForm.breakdownList = item.breakdownList;
|
||||
});
|
||||
},
|
||||
//驳回事件
|
||||
@@ -510,7 +543,11 @@ export default {
|
||||
this.isSubmit = false;
|
||||
}, e => {
|
||||
});
|
||||
}
|
||||
},
|
||||
// 分页
|
||||
handleCurrentChange(currentPage) {
|
||||
this.currentPage = currentPage;
|
||||
},
|
||||
},
|
||||
computed: {
|
||||
listNoDataText() {
|
||||
|
||||
@@ -706,8 +706,6 @@ export default {
|
||||
//批量编辑确定按钮事件
|
||||
saveBatchEditForm() {
|
||||
this.selectList = JSON.parse(localStorage.getItem("selectList"));
|
||||
console.log("datalist", this.dataList);
|
||||
console.log("select", this.selectList);
|
||||
this.dataList.forEach(item => {
|
||||
this.selectList.forEach(items => {
|
||||
if (item.id === items) {
|
||||
@@ -873,27 +871,59 @@ export default {
|
||||
},
|
||||
//动态表单读取
|
||||
getFormFieldList(item) {
|
||||
console.log(item);
|
||||
this.$nextTick(() => {
|
||||
this.listForm = JSON.parse(JSON.stringify(item));
|
||||
if (item.form === undefined) {
|
||||
let dataChildren = []
|
||||
let dataListChildren = []
|
||||
this.listForm.prcNum = this.prcNum;
|
||||
this.listForm.prcName = this.prcName;
|
||||
this.listForm["id"] = item.id;
|
||||
// this.listForm.dataList = item.dataList;
|
||||
this.dataList = this.listForm.dataList[0].children;
|
||||
this.dataList.map(item => {
|
||||
this.$set(item, "standName", this.listForm.dataList[0].standName);
|
||||
this.$set(item, "standEnName", this.listForm.dataList[0].standEnName);
|
||||
this.$set(item, "standYear", this.listForm.dataList[0].standYear);
|
||||
this.$set(item, "standSort", this.listForm.dataList[0].standSort);
|
||||
this.$set(item, "standNumber", this.listForm.dataList[0].standNumber);
|
||||
});
|
||||
this.total = this.listForm.dataList[0].children.length;
|
||||
this.listForm.dataList = item.dataList;
|
||||
this.listForm.dataList.forEach(item => {
|
||||
item.children.forEach(items=> {
|
||||
if(items.key === item.standId){
|
||||
this.$set(items, "standName", item.standName);
|
||||
this.$set(items, "standEnName", item.standEnName);
|
||||
this.$set(items, "standYear", item.standYear);
|
||||
this.$set(items, "standSort", item.standSort);
|
||||
this.$set(items, "standNumber", item.standNumber);
|
||||
}
|
||||
})
|
||||
})
|
||||
this.listForm.dataList.forEach(item => {
|
||||
dataChildren.push(item.children)
|
||||
})
|
||||
dataChildren.forEach((item,index) => {
|
||||
dataListChildren = dataListChildren.concat(item)
|
||||
})
|
||||
this.dataList = dataListChildren
|
||||
this.total = this.dataList.length;
|
||||
} else {
|
||||
this.listForm = item.form;
|
||||
this.dataList = item.form.dataList[0].children;
|
||||
this.total = item.form.dataList[0].children.length;
|
||||
let dataChildren = []
|
||||
let dataListChildren = []
|
||||
this.listForm.dataList.forEach(item => {
|
||||
item.children.forEach(items=> {
|
||||
if(items.key === item.standId){
|
||||
this.$set(items, "standName", item.standName);
|
||||
this.$set(items, "standEnName", item.standEnName);
|
||||
this.$set(items, "standYear", item.standYear);
|
||||
this.$set(items, "standSort", item.standSort);
|
||||
this.$set(items, "standNumber", item.standNumber);
|
||||
}
|
||||
})
|
||||
})
|
||||
this.listForm.dataList.forEach(item => {
|
||||
dataChildren.push(item.children)
|
||||
})
|
||||
dataChildren.forEach((item,index) => {
|
||||
dataListChildren = dataListChildren.concat(item)
|
||||
})
|
||||
this.dataList = dataListChildren
|
||||
this.total = this.dataList.length;
|
||||
// this.dataList = item.form.dataList[0].children;
|
||||
// this.total = item.form.dataList[0].children.length;
|
||||
}
|
||||
|
||||
});
|
||||
|
||||
@@ -43,11 +43,12 @@
|
||||
<template slot="title">填写信息</template>
|
||||
</process-title>
|
||||
<el-table
|
||||
:data="dataList"
|
||||
style="width: 100%; border: 1px solid #cccccc"
|
||||
:data="dataList.slice((currentPage - 1) * pageSize, currentPage * pageSize ) "
|
||||
style="width: 100%; border: 1px solid #cccccc;height: 400px"
|
||||
row-key="standId"
|
||||
height="70%"
|
||||
border
|
||||
highlight-current-row
|
||||
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
|
||||
fontWeight: 'bold'}"
|
||||
>
|
||||
@@ -195,6 +196,14 @@
|
||||
label="责任人">
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<el-pagination
|
||||
layout="total,sizes, prev, pager, next"
|
||||
background
|
||||
:page-sizes="[20, 40, 60]"
|
||||
:total="total"
|
||||
@current-change="handleCurrentChange"
|
||||
>
|
||||
</el-pagination>
|
||||
</div>
|
||||
<div>
|
||||
<el-collapse accordion>
|
||||
@@ -318,6 +327,9 @@ export default {
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
total: 0,
|
||||
currentPage: 1,
|
||||
pageSize: 20,
|
||||
nodeList:[],
|
||||
drawerTitle:'',
|
||||
isTransfer: false,
|
||||
@@ -389,7 +401,6 @@ export default {
|
||||
},
|
||||
// 点击查看
|
||||
handlePreview(item) {
|
||||
console.log(item);
|
||||
let routeUrl = this.$router.resolve({
|
||||
name: "OtherStandardDetails",
|
||||
params: {
|
||||
@@ -447,7 +458,6 @@ export default {
|
||||
taskIds: this.taskIds,
|
||||
pId: this.pId
|
||||
}).then(res => {
|
||||
console.log(res.mesg);
|
||||
if (res) {
|
||||
const processForm = JSON.parse(res.mesg);
|
||||
this.getFormFieldList(processForm);
|
||||
@@ -464,9 +474,30 @@ export default {
|
||||
this.listForm.prcName = this.prcName;
|
||||
this.listForm["id"] = item.id;
|
||||
this.listForm.dataList = item.dataList;
|
||||
this.dataList = item.dataList;
|
||||
this.dataList.distributePerson = item.dataList[0].distributePerson;
|
||||
this.listForm.breakdownList = item.breakdownList;
|
||||
let dataChildren = []
|
||||
let dataListChildren = []
|
||||
this.listForm.dataList.forEach(item => {
|
||||
item.children.forEach(items=> {
|
||||
if(items.key === item.standId){
|
||||
this.$set(items, "standName", item.standName);
|
||||
this.$set(items, "standEnName", item.standEnName);
|
||||
this.$set(items, "standYear", item.standYear);
|
||||
this.$set(items, "standSort", item.standSort);
|
||||
this.$set(items, "standNumber", item.standNumber);
|
||||
}
|
||||
})
|
||||
})
|
||||
this.listForm.dataList.forEach(item => {
|
||||
dataChildren.push(item.children)
|
||||
})
|
||||
dataChildren.forEach((item,index) => {
|
||||
dataListChildren = dataListChildren.concat(item)
|
||||
})
|
||||
this.dataList = dataListChildren
|
||||
this.total = this.dataList.length;
|
||||
// this.dataList = item.dataList;
|
||||
// this.dataList.distributePerson = item.dataList[0].distributePerson;
|
||||
// this.listForm.breakdownList = item.breakdownList;
|
||||
});
|
||||
},
|
||||
//驳回事件
|
||||
@@ -511,7 +542,11 @@ export default {
|
||||
}
|
||||
this.isSubmit = false;
|
||||
});
|
||||
}
|
||||
},
|
||||
// 分页
|
||||
handleCurrentChange(currentPage) {
|
||||
this.currentPage = currentPage;
|
||||
},
|
||||
},
|
||||
computed: {
|
||||
listNoDataText() {
|
||||
|
||||
@@ -43,11 +43,12 @@
|
||||
<template slot="title">填写信息</template>
|
||||
</process-title>
|
||||
<el-table
|
||||
:data="dataList"
|
||||
style="width: 100%; border: 1px solid #cccccc"
|
||||
row-key="standId"
|
||||
height="70%"
|
||||
border
|
||||
:data="dataList.slice((currentPage - 1) * pageSize, currentPage * pageSize ) "
|
||||
style="width: 100%; border: 1px solid #cccccc;height: 400px"
|
||||
row-key="standId"
|
||||
height="70%"
|
||||
border
|
||||
highlight-current-row
|
||||
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
|
||||
fontWeight: 'bold'}"
|
||||
>
|
||||
@@ -193,6 +194,14 @@
|
||||
label="责任人">
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<el-pagination
|
||||
layout="total,sizes, prev, pager, next"
|
||||
background
|
||||
:page-sizes="[20, 40, 60]"
|
||||
:total="total"
|
||||
@current-change="handleCurrentChange"
|
||||
>
|
||||
</el-pagination>
|
||||
</div>
|
||||
<div>
|
||||
<el-collapse accordion>
|
||||
@@ -316,6 +325,9 @@ export default {
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
total: 0,
|
||||
currentPage: 1,
|
||||
pageSize: 20,
|
||||
nodeList:[],
|
||||
drawerTitle:'',
|
||||
isTransfer: false,
|
||||
@@ -460,9 +472,30 @@ export default {
|
||||
this.listForm.prcName = this.prcName;
|
||||
this.listForm["id"] = item.id;
|
||||
this.listForm.dataList = item.dataList;
|
||||
this.dataList = item.dataList;
|
||||
this.dataList.distributePerson = item.dataList[0].distributePerson;
|
||||
this.listForm.breakdownList = item.breakdownList;
|
||||
let dataChildren = []
|
||||
let dataListChildren = []
|
||||
this.listForm.dataList.forEach(item => {
|
||||
item.children.forEach(items=> {
|
||||
if(items.key === item.standId){
|
||||
this.$set(items, "standName", item.standName);
|
||||
this.$set(items, "standEnName", item.standEnName);
|
||||
this.$set(items, "standYear", item.standYear);
|
||||
this.$set(items, "standSort", item.standSort);
|
||||
this.$set(items, "standNumber", item.standNumber);
|
||||
}
|
||||
})
|
||||
})
|
||||
this.listForm.dataList.forEach(item => {
|
||||
dataChildren.push(item.children)
|
||||
})
|
||||
dataChildren.forEach((item,index) => {
|
||||
dataListChildren = dataListChildren.concat(item)
|
||||
})
|
||||
this.dataList = dataListChildren
|
||||
this.total = this.dataList.length;
|
||||
// this.dataList = item.dataList;
|
||||
// this.dataList.distributePerson = item.dataList[0].distributePerson;
|
||||
// this.listForm.breakdownList = item.breakdownList;
|
||||
});
|
||||
},
|
||||
//驳回事件
|
||||
@@ -509,6 +542,10 @@ export default {
|
||||
}, e => {
|
||||
});
|
||||
},
|
||||
// 分页
|
||||
handleCurrentChange(currentPage) {
|
||||
this.currentPage = currentPage;
|
||||
},
|
||||
},
|
||||
computed: {
|
||||
listNoDataText() {
|
||||
|
||||
@@ -43,11 +43,12 @@
|
||||
<template slot="title">填写信息</template>
|
||||
</process-title>
|
||||
<el-table
|
||||
:data="dataList"
|
||||
style="width: 100%; border: 1px solid #cccccc"
|
||||
:data="dataList.slice((currentPage - 1) * pageSize, currentPage * pageSize ) "
|
||||
style="width: 100%; border: 1px solid #cccccc;height: 400px"
|
||||
row-key="standId"
|
||||
height="70%"
|
||||
border
|
||||
highlight-current-row
|
||||
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
|
||||
fontWeight: 'bold'}"
|
||||
>
|
||||
@@ -195,6 +196,14 @@
|
||||
label="责任人">
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<el-pagination
|
||||
layout="total,sizes, prev, pager, next"
|
||||
background
|
||||
:page-sizes="[20, 40, 60]"
|
||||
:total="total"
|
||||
@current-change="handleCurrentChange"
|
||||
>
|
||||
</el-pagination>
|
||||
</div>
|
||||
<div>
|
||||
<el-collapse accordion>
|
||||
@@ -318,6 +327,9 @@ export default {
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
total: 0,
|
||||
currentPage: 1,
|
||||
pageSize: 20,
|
||||
nodeList:[],
|
||||
drawerTitle:'',
|
||||
isTransfer: false,
|
||||
@@ -462,9 +474,30 @@ export default {
|
||||
this.listForm.prcName = this.prcName;
|
||||
this.listForm["id"] = item.id;
|
||||
this.listForm.dataList = item.dataList;
|
||||
this.dataList = item.dataList;
|
||||
this.dataList.distributePerson = item.dataList[0].distributePerson;
|
||||
this.listForm.breakdownList = item.breakdownList;
|
||||
let dataChildren = []
|
||||
let dataListChildren = []
|
||||
this.listForm.dataList.forEach(item => {
|
||||
item.children.forEach(items=> {
|
||||
if(items.key === item.standId){
|
||||
this.$set(items, "standName", item.standName);
|
||||
this.$set(items, "standEnName", item.standEnName);
|
||||
this.$set(items, "standYear", item.standYear);
|
||||
this.$set(items, "standSort", item.standSort);
|
||||
this.$set(items, "standNumber", item.standNumber);
|
||||
}
|
||||
})
|
||||
})
|
||||
this.listForm.dataList.forEach(item => {
|
||||
dataChildren.push(item.children)
|
||||
})
|
||||
dataChildren.forEach((item,index) => {
|
||||
dataListChildren = dataListChildren.concat(item)
|
||||
})
|
||||
this.dataList = dataListChildren
|
||||
this.total = this.dataList.length;
|
||||
// this.dataList = item.dataList;
|
||||
// this.dataList.distributePerson = item.dataList[0].distributePerson;
|
||||
// this.listForm.breakdownList = item.breakdownList;
|
||||
});
|
||||
},
|
||||
//驳回事件
|
||||
@@ -510,7 +543,11 @@ export default {
|
||||
this.isSubmit = false;
|
||||
}, e => {
|
||||
});
|
||||
}
|
||||
},
|
||||
// 分页
|
||||
handleCurrentChange(currentPage) {
|
||||
this.currentPage = currentPage;
|
||||
},
|
||||
},
|
||||
computed: {
|
||||
listNoDataText() {
|
||||
|
||||
Reference in New Issue
Block a user