新修改的bug
This commit is contained in:
@@ -67,7 +67,7 @@
|
|||||||
<el-table
|
<el-table
|
||||||
:data="dataList"
|
:data="dataList"
|
||||||
border
|
border
|
||||||
ref="selection"
|
ref="standSelection"
|
||||||
height="65%"
|
height="65%"
|
||||||
@selection-change="selectStandChange"
|
@selection-change="selectStandChange"
|
||||||
style="width: 100%; border:1px solid #ccc"
|
style="width: 100%; border:1px solid #ccc"
|
||||||
@@ -1009,12 +1009,13 @@ export default {
|
|||||||
this.projectStand.map(item => {
|
this.projectStand.map(item => {
|
||||||
let index;
|
let index;
|
||||||
index = this.dataList.findIndex(items => {
|
index = this.dataList.findIndex(items => {
|
||||||
return items.standId === item.standId;
|
return items.id === item.id;
|
||||||
});
|
});
|
||||||
if (index > -1) {
|
if (index > -1) {
|
||||||
this.dataList.splice(index, 1);
|
this.dataList.splice(index, 1);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
this.$refs.standSelection.clearSelection()
|
||||||
}).catch(() => {
|
}).catch(() => {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -59,7 +59,7 @@
|
|||||||
<el-table
|
<el-table
|
||||||
:data="dataList"
|
:data="dataList"
|
||||||
border
|
border
|
||||||
ref="selection"
|
ref="standSelection"
|
||||||
height="65%"
|
height="65%"
|
||||||
@selection-change="selectStandChange"
|
@selection-change="selectStandChange"
|
||||||
style="width: 100%; border:1px solid #ccc"
|
style="width: 100%; border:1px solid #ccc"
|
||||||
@@ -1015,12 +1015,13 @@ export default {
|
|||||||
this.projectStand.map(item => {
|
this.projectStand.map(item => {
|
||||||
let index;
|
let index;
|
||||||
index = this.dataList.findIndex(items => {
|
index = this.dataList.findIndex(items => {
|
||||||
return items.standId === item.standId;
|
return items.id === item.id;
|
||||||
});
|
});
|
||||||
if (index > -1) {
|
if (index > -1) {
|
||||||
this.dataList.splice(index, 1);
|
this.dataList.splice(index, 1);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
this.$refs.standSelection.clearSelection()
|
||||||
}).catch(() => {
|
}).catch(() => {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -59,7 +59,7 @@
|
|||||||
<el-table
|
<el-table
|
||||||
:data="dataList"
|
:data="dataList"
|
||||||
border
|
border
|
||||||
ref="selection"
|
ref="standSelection"
|
||||||
height="65%"
|
height="65%"
|
||||||
@selection-change="selectStandChange"
|
@selection-change="selectStandChange"
|
||||||
style="width: 100%; border:1px solid #ccc"
|
style="width: 100%; border:1px solid #ccc"
|
||||||
@@ -1016,12 +1016,13 @@ export default {
|
|||||||
this.projectStand.map(item => {
|
this.projectStand.map(item => {
|
||||||
let index;
|
let index;
|
||||||
index = this.dataList.findIndex(items => {
|
index = this.dataList.findIndex(items => {
|
||||||
return items.standId === item.standId;
|
return items.id === item.id;
|
||||||
});
|
});
|
||||||
if (index > -1) {
|
if (index > -1) {
|
||||||
this.dataList.splice(index, 1);
|
this.dataList.splice(index, 1);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
this.$refs.standSelection.clearSelection()
|
||||||
}).catch(() => {
|
}).catch(() => {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -87,9 +87,9 @@
|
|||||||
ref="multipleTable"
|
ref="multipleTable"
|
||||||
:data="localProTableList"
|
:data="localProTableList"
|
||||||
tooltip-effect="dark"
|
tooltip-effect="dark"
|
||||||
style="width: 100%;height: inherit"
|
style="width: 100%"
|
||||||
border
|
border
|
||||||
:max-height="400"
|
max-height="600"
|
||||||
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '15px',
|
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '15px',
|
||||||
fontWeight: 'normal', height: '48px'}"
|
fontWeight: 'normal', height: '48px'}"
|
||||||
@selection-change="handleSelectionChange">
|
@selection-change="handleSelectionChange">
|
||||||
@@ -97,18 +97,23 @@
|
|||||||
show-overflow-tooltip
|
show-overflow-tooltip
|
||||||
prop="projectPlatfor"
|
prop="projectPlatfor"
|
||||||
align="center"
|
align="center"
|
||||||
|
fixed="left"
|
||||||
|
min-width="100"
|
||||||
label="产品平台">
|
label="产品平台">
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
prop="projectNumber"
|
prop="projectNumber"
|
||||||
align="center"
|
align="center"
|
||||||
width="90"
|
fixed="left"
|
||||||
|
min-width="150"
|
||||||
label="项目编号">
|
label="项目编号">
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
show-overflow-tooltip
|
show-overflow-tooltip
|
||||||
prop="projectName"
|
prop="projectName"
|
||||||
align="center"
|
align="center"
|
||||||
|
fixed="left"
|
||||||
|
min-width="300"
|
||||||
label="项目名称">
|
label="项目名称">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.projectName }}</a>
|
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.projectName }}</a>
|
||||||
@@ -142,7 +147,7 @@
|
|||||||
show-overflow-tooltip
|
show-overflow-tooltip
|
||||||
prop="productLine"
|
prop="productLine"
|
||||||
label="产品线"
|
label="产品线"
|
||||||
min-width="120"
|
min-width="160"
|
||||||
align="center"
|
align="center"
|
||||||
>
|
>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
@@ -184,7 +189,7 @@
|
|||||||
align="center"
|
align="center"
|
||||||
label="项目经理">
|
label="项目经理">
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="" fixed="right" width="50" :resizable="false" label="操作" align="center">
|
<el-table-column label="" fixed="right" width="50" :resizable="false" label="操作" align="center">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<div @click.stop style="display: inline-block">
|
<div @click.stop style="display: inline-block">
|
||||||
<el-dropdown trigger="click" @command="handleCommand">
|
<el-dropdown trigger="click" @command="handleCommand">
|
||||||
@@ -1638,9 +1643,14 @@ export default {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
///deep/ .el-table--scrollable-x .el-table__body-wrapper {
|
||||||
|
// overflow-x: scroll;
|
||||||
|
//}
|
||||||
|
///deep/.el-table__fixed {
|
||||||
|
// height: 48px !important;
|
||||||
|
//}
|
||||||
/deep/.el-table .el-table__body-wrapper {
|
/deep/.el-table .el-table__body-wrapper {
|
||||||
height: 86%;
|
height: 84%;
|
||||||
}
|
}
|
||||||
::v-deep .el-drawer__header {
|
::v-deep .el-drawer__header {
|
||||||
& > span:first-child {
|
& > span:first-child {
|
||||||
|
|||||||
@@ -37,10 +37,10 @@
|
|||||||
</el-row>
|
</el-row>
|
||||||
<el-row style="margin-top: 10px">
|
<el-row style="margin-top: 10px">
|
||||||
<el-col :span="5">产品线: <span class="valueColor">{{ localProEO.productLine }} </span></el-col>
|
<el-col :span="5">产品线: <span class="valueColor">{{ localProEO.productLine }} </span></el-col>
|
||||||
<el-col :span="5">项目经理: <span class="valueColor">{{ localProEO.uname }} </span></el-col>
|
<el-col :span="5" :push="1">项目经理: <span class="valueColor">{{ localProEO.uname }} </span></el-col>
|
||||||
<el-col :span="5" :push="1"> 项目计划开始时间: <span
|
<el-col :span="5" :push="2"> 项目计划开始时间: <span
|
||||||
class="valueColor">{{ $moment(localProEO.projectStartDate).format('YYYY-MM-DD') }}</span></el-col>
|
class="valueColor">{{ $moment(localProEO.projectStartDate).format('YYYY-MM-DD') }}</span></el-col>
|
||||||
<el-col :span="5" :push="2">项目计划完成时间: <span
|
<el-col :span="4" :push="3">项目计划完成时间: <span
|
||||||
class="valueColor">{{ $moment(localProEO.projectEndDate).format('YYYY-MM-DD') }} </span></el-col>
|
class="valueColor">{{ $moment(localProEO.projectEndDate).format('YYYY-MM-DD') }} </span></el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -91,6 +91,7 @@
|
|||||||
tooltip-effect="dark"
|
tooltip-effect="dark"
|
||||||
height="100%"
|
height="100%"
|
||||||
border
|
border
|
||||||
|
max-height="100%"
|
||||||
class="table"
|
class="table"
|
||||||
v-loading="myLoading.loadData"
|
v-loading="myLoading.loadData"
|
||||||
@selection-change="standSelectChange"
|
@selection-change="standSelectChange"
|
||||||
@@ -106,7 +107,7 @@
|
|||||||
<el-table-column
|
<el-table-column
|
||||||
prop="standSerialNumber"
|
prop="standSerialNumber"
|
||||||
fixed="left"
|
fixed="left"
|
||||||
width="180"
|
min-width="180"
|
||||||
label="标准号">
|
label="标准号">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSerialNumber }}</a>
|
<a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSerialNumber }}</a>
|
||||||
@@ -115,7 +116,7 @@
|
|||||||
<el-table-column
|
<el-table-column
|
||||||
prop="standName"
|
prop="standName"
|
||||||
fixed="left"
|
fixed="left"
|
||||||
width="200"
|
min-width="300"
|
||||||
show-overflow-tooltip
|
show-overflow-tooltip
|
||||||
label="标准名称">
|
label="标准名称">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
@@ -124,12 +125,12 @@
|
|||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
prop="itemsNum"
|
prop="itemsNum"
|
||||||
width="75"
|
min-width="100"
|
||||||
label="条款号">
|
label="条款号">
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
prop="itemsName"
|
prop="itemsName"
|
||||||
width="180"
|
min-width="300"
|
||||||
show-overflow-tooltip
|
show-overflow-tooltip
|
||||||
label="条款名称">
|
label="条款名称">
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
@@ -145,7 +146,7 @@
|
|||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
prop="productName"
|
prop="productName"
|
||||||
width="180"
|
min-width="300"
|
||||||
show-overflow-tooltip
|
show-overflow-tooltip
|
||||||
label="项目名称">
|
label="项目名称">
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
@@ -186,7 +187,7 @@
|
|||||||
{{ (scope.row.planCloseTime ? scope.row.planCloseTime.substring(0, 11) : "") }}
|
{{ (scope.row.planCloseTime ? scope.row.planCloseTime.substring(0, 11) : "") }}
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="操作" align="center" width="50">
|
<el-table-column label="操作" align="center" width="50">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<div @click.stop style="display: inline-block">
|
<div @click.stop style="display: inline-block">
|
||||||
<el-dropdown trigger="click" @command="handleCommand">
|
<el-dropdown trigger="click" @command="handleCommand">
|
||||||
@@ -1187,6 +1188,12 @@ export default {
|
|||||||
color: #606266 !important;
|
color: #606266 !important;
|
||||||
}
|
}
|
||||||
#rectification-dataBase {
|
#rectification-dataBase {
|
||||||
|
/deep/ .el-table__fixed {
|
||||||
|
height: 100% !important; //设置高优先,以覆盖内联样式
|
||||||
|
}
|
||||||
|
/deep/ .el-table__fixed-right {
|
||||||
|
height: 100% !important; //设置高优先,以覆盖内联样式
|
||||||
|
}
|
||||||
/deep/ .table-wrap {
|
/deep/ .table-wrap {
|
||||||
.el-table__fixed {
|
.el-table__fixed {
|
||||||
height: calc(~'100% - 20px') !important;
|
height: calc(~'100% - 20px') !important;
|
||||||
|
|||||||
Reference in New Issue
Block a user