FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
zhaokaiyao@91isoft.com
2021-11-21 16:03:45 +08:00
parent 73acf4d792 f69ad65a76
commit f641592b2f
3 changed files with 105 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/roleTree/index.vue
+26 -6
View File
@@ -26,6 +26,7 @@
style="height: 100%; overflow: auto;"
class="filter-tree tree-line"
:class="treeClass"
@check-change="checkChange"
:data="treeData"
:props="defaultProps"
:default-checked-keys="nodeList"
@@ -116,15 +117,25 @@
}
},
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 () {
},
handleTreeDrawerCancel () {
this.filterText = ''
this.isVisible2 = false
},
saveUserInfo () {
if (this.nodeList.length) {
if (this.nodeList.length > 0) {
let ids = ''
this.nodeList.forEach(item => {
if (ids.length > 0) {
@@ -134,18 +145,27 @@
ids = item
}
})
let oldList = []
this.$http.get('SarInstitution/institution/getNextById', {
ids: ids
}, {
_this: this
}, 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 {
this.isVisible2 = false
this.$emit('checkedRole', this.roleList)
}
this.isVisible2 = false
this.$emit('checkedRole', this.roleList)
},
drawerCheck (data) {
if (this.checkBox) {
src/pages/localTool/standardWarning.vue
+76 -47
View File
@@ -12,51 +12,78 @@
<h5>实施预警</h5>
</div>
<div class="more">
<el-form :inline="true" :model="dynamic" class="demo-form-inline">
<el-form-item label="标准编号">
<el-input clearable size="mini"
v-model="dynamic.standCode"
placeholder="根据标准编号查找">
</el-input>
</el-form-item>
<el-form-item label="标准名称">
<el-input clearable size="mini"
v-model="dynamic.standName"
placeholder="根据标准名称查找">
</el-input>
</el-form-item>
<el-form-item label="实施日期" style="margin-right: -40px" class="choose-time-area">
<el-datePicker
clearable size="mini"
v-model="dynamic.putTime"
value-format="yyyy-MM-dd"
placeholder="根据实施日期查找">
</el-datePicker>
</el-form-item>
<el-form-item label="适用车型">
<el-input clearable size="mini"
v-model="dynamic.applyType"
placeholder="根据适用车型查找">
</el-input>
</el-form-item>
<div style="margin: 8px 0 0 0; float: right">
<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-row :gutter="24">
<el-col span="24">
<el-form :inline="true" :model="dynamic" class="demo-form-inline">
<el-form-item label="标准编号">
<el-input clearable size="mini"
v-model="dynamic.standCode"
placeholder="根据标准编号查找">
</el-input>
</el-form-item>
<el-form-item label="标准名称">
<el-input clearable size="mini"
v-model="dynamic.standName"
placeholder="根据标准名称查找">
</el-input>
</el-form-item>
<el-form-item label="实施日期" style="margin-right: 10px" class="choose-time-area">
<el-date-picker
size="mini"
clearable
v-model="dynamic.putTime"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期">
</el-date-picker>
<!-- <el-datePicker-->
<!-- clearable size="mini"-->
<!-- v-model="dynamic.putTime"-->
<!-- value-format="yyyy-MM-dd"-->
<!-- placeholder="根据实施日期查找">-->
<!-- </el-datePicker>-->
</el-form-item>
<el-form-item label="适用车型">
<el-input clearable size="mini"
v-model="dynamic.applyType"
placeholder="根据适用车型查找">
</el-input>
</el-form-item>
<div style="margin: 8px 0 0 0; float: right">
<el-button
type="primary"
size="mini"
@click="searchBtnClick"
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 class="content" style="height: 100%; padding-top: 50px; ">
<el-divider content-position="left" class="dynamic-child-title">新车型实施日期预警</el-divider>
@@ -602,7 +629,8 @@ export default {
//标准名称
standName: this.dynamic.standName,
//实施日期
putTime: this.dynamic.putTime,
putTime: this.dynamic.putTime[0],
lastTime: this.dynamic.putTime[1],
//适用车型
applyType: this.dynamic.applyType
}, {
@@ -1043,6 +1071,7 @@ export default {
}
.more {
width: 100%;
margin-top: 30px;
/deep/ .el-input__inner {
width: 155px;
@@ -1050,7 +1079,7 @@ export default {
.choose-time-area {
/deep/ .el-input__inner {
width: 170px;
width: 220px;
}
}
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+3 -3
View File
@@ -596,7 +596,7 @@
</el-select>
</el-form-item>
<el-form-item v-show="form.standInData === '0'" label="起草单位" prop="qcdw" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.qcdw" placeholder="请选择起草单位" multiple>
<el-select :popper-append-to-body="false" v-model="form.qcdw" placeholder="请选择起草单位" multiple filterable>
<el-option
v-for="item in qcdwOption"
placeholder="请选择"
@@ -2791,7 +2791,7 @@
border-radius: 6px;
box-sizing: border-box;
width: 360px;
height: 75px;
height: 90px;
text-align: center;
position: relative;
overflow: hidden;
@@ -2806,7 +2806,7 @@
white-space: inherit;
}
/deep/ .el-upload-dragger .el-icon-upload {
margin: 0;
margin: 10px 0 0 0;
}
/deep/.el-drawer__container {
.prc-content-border {