Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
@@ -563,7 +563,7 @@
|
||||
class="common-button-primary"
|
||||
size="small"
|
||||
v-btn-permission="'072efe80c5459dd47fedd2d14f59ff7f'"
|
||||
@click="getStandData">
|
||||
@click="getStandDataBtn">
|
||||
查询
|
||||
</el-button>
|
||||
</el-form-item>
|
||||
@@ -998,6 +998,10 @@ export default {
|
||||
};
|
||||
this.getStandData();
|
||||
},
|
||||
getStandDataBtn(){
|
||||
this.pageNo =1;
|
||||
this.getStandData();
|
||||
},
|
||||
//查询项目下的标准
|
||||
getStandData() {
|
||||
this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", {
|
||||
|
||||
@@ -305,7 +305,7 @@
|
||||
:header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
|
||||
fontWeight: 'bold', height: '48px'}"
|
||||
@selection-change="selectListChange"
|
||||
ref="selection"
|
||||
ref="listSelection"
|
||||
>
|
||||
<el-table-column
|
||||
type="selection"
|
||||
@@ -535,8 +535,8 @@ export default {
|
||||
selectListChange(data) {
|
||||
// 单选
|
||||
if (data.length > 1) {
|
||||
this.$refs.selection.clearSelection()
|
||||
this.$refs.selection.toggleRowSelection(data.pop())
|
||||
this.$refs.listSelection.clearSelection()
|
||||
this.$refs.listSelection.toggleRowSelection(data.pop())
|
||||
}
|
||||
this.multipleSelection = data
|
||||
|
||||
|
||||
@@ -179,7 +179,7 @@
|
||||
:header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
|
||||
fontWeight: 'bold', height: '48px'}"
|
||||
@selection-change="selectProjectChange"
|
||||
ref="selection"
|
||||
ref="projectSelection"
|
||||
>
|
||||
<el-table-column
|
||||
type="selection"
|
||||
@@ -282,7 +282,7 @@
|
||||
:header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
|
||||
fontWeight: 'bold', height: '48px'}"
|
||||
@selection-change="selectListChange"
|
||||
ref="selection"
|
||||
ref="listSelection"
|
||||
>
|
||||
<el-table-column
|
||||
type="selection"
|
||||
@@ -594,8 +594,8 @@ export default {
|
||||
selectListChange(data) {
|
||||
// 单选
|
||||
if (data.length > 1) {
|
||||
this.$refs.selection.clearSelection()
|
||||
this.$refs.selection.toggleRowSelection(data.pop())
|
||||
this.$refs.listSelection.clearSelection()
|
||||
this.$refs.listSelection.toggleRowSelection(data.pop())
|
||||
}
|
||||
this.multipleSelection = data
|
||||
|
||||
@@ -605,8 +605,8 @@ export default {
|
||||
selectProjectChange(data) {
|
||||
// 单选
|
||||
if (data.length > 1) {
|
||||
this.$refs.selection.clearSelection()
|
||||
this.$refs.selection.toggleRowSelection(data.pop())
|
||||
this.$refs.projectSelection.clearSelection()
|
||||
this.$refs.projectSelection.toggleRowSelection(data.pop())
|
||||
}
|
||||
this.multipleSelection = data
|
||||
|
||||
|
||||
@@ -178,7 +178,7 @@
|
||||
:header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
|
||||
fontWeight: 'bold', height: '48px'}"
|
||||
@selection-change="selectProjectChange"
|
||||
ref="selection"
|
||||
ref="projectSelection"
|
||||
>
|
||||
<el-table-column
|
||||
type="selection"
|
||||
@@ -281,7 +281,7 @@
|
||||
:header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
|
||||
fontWeight: 'bold', height: '48px'}"
|
||||
@selection-change="selectListChange"
|
||||
ref="selection"
|
||||
ref="listSelection"
|
||||
>
|
||||
<el-table-column
|
||||
type="selection"
|
||||
@@ -593,8 +593,8 @@ export default {
|
||||
selectListChange(data) {
|
||||
// 单选
|
||||
if (data.length > 1) {
|
||||
this.$refs.selection.clearSelection()
|
||||
this.$refs.selection.toggleRowSelection(data.pop())
|
||||
this.$refs.listSelection.clearSelection()
|
||||
this.$refs.listSelection.toggleRowSelection(data.pop())
|
||||
}
|
||||
this.multipleSelection = data
|
||||
|
||||
@@ -604,8 +604,8 @@ export default {
|
||||
selectProjectChange(data) {
|
||||
// 单选
|
||||
if (data.length > 1) {
|
||||
this.$refs.selection.clearSelection()
|
||||
this.$refs.selection.toggleRowSelection(data.pop())
|
||||
this.$refs.projectSelection.clearSelection()
|
||||
this.$refs.projectSelection.toggleRowSelection(data.pop())
|
||||
}
|
||||
this.multipleSelection = data
|
||||
|
||||
|
||||
Reference in New Issue
Block a user