Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
yanyizhou
@@ -26,6 +26,7 @@
|
|||||||
style="height: 100%; overflow: auto;"
|
style="height: 100%; overflow: auto;"
|
||||||
class="filter-tree tree-line"
|
class="filter-tree tree-line"
|
||||||
:class="treeClass"
|
:class="treeClass"
|
||||||
|
@check-change="checkChange"
|
||||||
:data="treeData"
|
:data="treeData"
|
||||||
:props="defaultProps"
|
:props="defaultProps"
|
||||||
:default-checked-keys="nodeList"
|
:default-checked-keys="nodeList"
|
||||||
@@ -116,15 +117,25 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
checkChange (row, type, c) {
|
||||||
|
if (!type) {
|
||||||
|
if (this.nodeList.length > 0) {
|
||||||
|
for (let a = 0; a < this.nodeList.length; a ++) {
|
||||||
|
if (row.id === this.nodeList[a]) {
|
||||||
|
this.nodeList.splice(a, 1)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
treeClass () {
|
treeClass () {
|
||||||
|
|
||||||
},
|
},
|
||||||
handleTreeDrawerCancel () {
|
handleTreeDrawerCancel () {
|
||||||
this.filterText = ''
|
this.filterText = ''
|
||||||
this.isVisible2 = false
|
this.isVisible2 = false
|
||||||
},
|
},
|
||||||
saveUserInfo () {
|
saveUserInfo () {
|
||||||
if (this.nodeList.length) {
|
if (this.nodeList.length > 0) {
|
||||||
let ids = ''
|
let ids = ''
|
||||||
this.nodeList.forEach(item => {
|
this.nodeList.forEach(item => {
|
||||||
if (ids.length > 0) {
|
if (ids.length > 0) {
|
||||||
@@ -134,18 +145,27 @@
|
|||||||
ids = item
|
ids = item
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
let oldList = []
|
|
||||||
this.$http.get('SarInstitution/institution/getNextById', {
|
this.$http.get('SarInstitution/institution/getNextById', {
|
||||||
ids: ids
|
ids: ids
|
||||||
}, {
|
}, {
|
||||||
_this: this
|
_this: this
|
||||||
}, res => {
|
}, res => {
|
||||||
oldList = res
|
let oldList2 = res.concat(this.roleList)
|
||||||
|
let result = []
|
||||||
|
let obj = {}
|
||||||
|
for(let i = 0; i < oldList2.length; i++){
|
||||||
|
if(!obj[oldList2[i].id]){
|
||||||
|
result.push(oldList2[i]);
|
||||||
|
obj[oldList2[i].id] = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
this.isVisible2 = false
|
||||||
|
this.$emit('checkedRole', result)
|
||||||
})
|
})
|
||||||
} else {
|
} else {
|
||||||
|
this.isVisible2 = false
|
||||||
|
this.$emit('checkedRole', this.roleList)
|
||||||
}
|
}
|
||||||
this.isVisible2 = false
|
|
||||||
this.$emit('checkedRole', this.roleList)
|
|
||||||
},
|
},
|
||||||
drawerCheck (data) {
|
drawerCheck (data) {
|
||||||
if (this.checkBox) {
|
if (this.checkBox) {
|
||||||
|
|||||||
@@ -3024,7 +3024,13 @@
|
|||||||
this.$refs['relatedTermsSelect'].handleSubmit(() => {
|
this.$refs['relatedTermsSelect'].handleSubmit(() => {
|
||||||
this.selectSarStandItems()
|
this.selectSarStandItems()
|
||||||
this.btnLoading = false
|
this.btnLoading = false
|
||||||
|
this.$message({
|
||||||
|
message: '关联成功',
|
||||||
|
type: 'success'
|
||||||
|
});
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
||||||
},
|
},
|
||||||
closeRelatedTermsDrawer() {
|
closeRelatedTermsDrawer() {
|
||||||
this.$refs['relatedTermsDrawer'].closeDrawer()
|
this.$refs['relatedTermsDrawer'].closeDrawer()
|
||||||
|
|||||||
@@ -12,51 +12,78 @@
|
|||||||
<h5>实施预警</h5>
|
<h5>实施预警</h5>
|
||||||
</div>
|
</div>
|
||||||
<div class="more">
|
<div class="more">
|
||||||
<el-form :inline="true" :model="dynamic" class="demo-form-inline">
|
<el-row :gutter="24">
|
||||||
<el-form-item label="标准编号">
|
<el-col span="24">
|
||||||
<el-input clearable size="mini"
|
<el-form :inline="true" :model="dynamic" class="demo-form-inline">
|
||||||
v-model="dynamic.standCode"
|
<el-form-item label="标准编号">
|
||||||
placeholder="根据标准编号查找">
|
<el-input clearable size="mini"
|
||||||
</el-input>
|
v-model="dynamic.standCode"
|
||||||
</el-form-item>
|
placeholder="根据标准编号查找">
|
||||||
<el-form-item label="标准名称">
|
</el-input>
|
||||||
<el-input clearable size="mini"
|
</el-form-item>
|
||||||
v-model="dynamic.standName"
|
<el-form-item label="标准名称">
|
||||||
placeholder="根据标准名称查找">
|
<el-input clearable size="mini"
|
||||||
</el-input>
|
v-model="dynamic.standName"
|
||||||
</el-form-item>
|
placeholder="根据标准名称查找">
|
||||||
<el-form-item label="实施日期" style="margin-right: -40px" class="choose-time-area">
|
</el-input>
|
||||||
<el-datePicker
|
</el-form-item>
|
||||||
clearable size="mini"
|
<el-form-item label="实施日期" style="margin-right: 10px" class="choose-time-area">
|
||||||
v-model="dynamic.putTime"
|
<el-date-picker
|
||||||
value-format="yyyy-MM-dd"
|
size="mini"
|
||||||
placeholder="根据实施日期查找">
|
clearable
|
||||||
</el-datePicker>
|
v-model="dynamic.putTime"
|
||||||
</el-form-item>
|
value-format="yyyy-MM-dd"
|
||||||
<el-form-item label="适用车型">
|
type="daterange"
|
||||||
<el-input clearable size="mini"
|
range-separator="-"
|
||||||
v-model="dynamic.applyType"
|
start-placeholder="开始日期"
|
||||||
placeholder="根据适用车型查找">
|
end-placeholder="结束日期">
|
||||||
</el-input>
|
</el-date-picker>
|
||||||
</el-form-item>
|
<!-- <el-datePicker-->
|
||||||
<div style="margin: 8px 0 0 0; float: right">
|
<!-- clearable size="mini"-->
|
||||||
<el-button
|
<!-- v-model="dynamic.putTime"-->
|
||||||
type="primary"
|
<!-- value-format="yyyy-MM-dd"-->
|
||||||
size="mini"
|
<!-- placeholder="根据实施日期查找">-->
|
||||||
v-btn-permission="'5dca375c3d8d57c45e4815acf3611b34'"
|
<!-- </el-datePicker>-->
|
||||||
@click="searchBtnClick"
|
</el-form-item>
|
||||||
class="common-button-primary">
|
<el-form-item label="适用车型">
|
||||||
查询
|
<el-input clearable size="mini"
|
||||||
</el-button>
|
v-model="dynamic.applyType"
|
||||||
<el-button
|
placeholder="根据适用车型查找">
|
||||||
size="mini"
|
</el-input>
|
||||||
@click="clearBtnClick"
|
</el-form-item>
|
||||||
v-btn-permission="'8258ee44344e92365e7e5bd90f3c8d21'"
|
<div style="margin: 8px 0 0 0; float: right">
|
||||||
class="common-button-primary">
|
<el-button
|
||||||
清空
|
type="primary"
|
||||||
</el-button>
|
size="mini"
|
||||||
</div>
|
@click="searchBtnClick"
|
||||||
</el-form>
|
class="common-button-primary">
|
||||||
|
查询
|
||||||
|
</el-button>
|
||||||
|
<el-button
|
||||||
|
size="mini"
|
||||||
|
@click="clearBtnClick"
|
||||||
|
class="common-button-primary">
|
||||||
|
清空
|
||||||
|
</el-button>
|
||||||
|
<!-- <el-button-->
|
||||||
|
<!-- type="primary"-->
|
||||||
|
<!-- size="mini"-->
|
||||||
|
<!-- v-btn-permission="'5dca375c3d8d57c45e4815acf3611b34'"-->
|
||||||
|
<!-- @click="searchBtnClick"-->
|
||||||
|
<!-- class="common-button-primary">-->
|
||||||
|
<!-- 查询-->
|
||||||
|
<!-- </el-button>-->
|
||||||
|
<!-- <el-button-->
|
||||||
|
<!-- size="mini"-->
|
||||||
|
<!-- @click="clearBtnClick"-->
|
||||||
|
<!-- v-btn-permission="'8258ee44344e92365e7e5bd90f3c8d21'"-->
|
||||||
|
<!-- class="common-button-primary">-->
|
||||||
|
<!-- 清空-->
|
||||||
|
<!-- </el-button>-->
|
||||||
|
</div>
|
||||||
|
</el-form>
|
||||||
|
</el-col>
|
||||||
|
</el-row>
|
||||||
</div>
|
</div>
|
||||||
<div class="content" style="height: 100%; padding-top: 50px; ">
|
<div class="content" style="height: 100%; padding-top: 50px; ">
|
||||||
<el-divider content-position="left" class="dynamic-child-title">新车型实施日期预警</el-divider>
|
<el-divider content-position="left" class="dynamic-child-title">新车型实施日期预警</el-divider>
|
||||||
@@ -602,7 +629,8 @@ export default {
|
|||||||
//标准名称
|
//标准名称
|
||||||
standName: this.dynamic.standName,
|
standName: this.dynamic.standName,
|
||||||
//实施日期
|
//实施日期
|
||||||
putTime: this.dynamic.putTime,
|
putTime: this.dynamic.putTime[0],
|
||||||
|
lastTime: this.dynamic.putTime[1],
|
||||||
//适用车型
|
//适用车型
|
||||||
applyType: this.dynamic.applyType
|
applyType: this.dynamic.applyType
|
||||||
}, {
|
}, {
|
||||||
@@ -1043,6 +1071,7 @@ export default {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.more {
|
.more {
|
||||||
|
width: 100%;
|
||||||
margin-top: 30px;
|
margin-top: 30px;
|
||||||
/deep/ .el-input__inner {
|
/deep/ .el-input__inner {
|
||||||
width: 155px;
|
width: 155px;
|
||||||
@@ -1050,7 +1079,7 @@ export default {
|
|||||||
|
|
||||||
.choose-time-area {
|
.choose-time-area {
|
||||||
/deep/ .el-input__inner {
|
/deep/ .el-input__inner {
|
||||||
width: 170px;
|
width: 220px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user