Merge branch 'develop' into 'FOTON'

Develop

See merge request LAWS/laws-system-front-FOTON!248
This commit is contained in:
王夏晖
2021-12-24 10:28:56 +08:00
51 changed files with 242 additions and 1155 deletions
@@ -9,10 +9,14 @@
</div>
<ul>
<li v-for="item in toDoTaskList" :key="item.id" class="time-title">
<div style="height: 30px">
<span @click="dealWith(item)" v-if="item.prcName.length<25" style="line-height: 30px; font-size: 13px;">{{ item.prcName }}</span>
<span @click="dealWith(item)" v-else style="line-height: 30px; font-size: 13px;">{{ item.prcName.substring(0,25)+'...' }}</span>
</div>
<div style="height: 30px">
<span @click="dealWith(item)" v-if="item.prcName.length<24"
style="line-height: 30px; font-size: 13px;">{{ item.prcName }}</span>
<el-tooltip class="item" effect="dark" :content="item.prcName" placement="left" v-else>
<span @click="dealWith(item)"
style="line-height: 30px; font-size: 13px;">{{ item.prcName.substring(0, 24) + '...' }}</span>
</el-tooltip>
</div>
</li>
</ul>
</div>
@@ -520,7 +520,6 @@ export default {
localStorage.setItem('objs', JSON.stringify(item))
this.fileListData = item
this.reData = item.files
console.log(item)
this.editMeetForm = item
this.editMeetForm.contents = []
if (this.editMeetForm.content !== '') {
@@ -2,9 +2,9 @@
<template>
<div class="prc-header-wrap">
<div class="process-header">
<span class="process-title">
<slot name="proName"></slot>
<a>(<slot name="proNode"></slot>)</a>
<span class="process-title van-ellipsis" :title="proName + '(' + proNode + ')'">
<span>{{ proName }}</span>
<span class="smallText">( {{ proNode }})</span>
</span>
</div>
<el-divider></el-divider>
@@ -27,7 +27,9 @@
return {
activeName: '',
opacityStyle: {},
headerFixed: false
headerFixed: false,
proName: '',
proNode: '',
}
},
methods: {
@@ -53,6 +55,8 @@
},
watch: {},
mounted () {
this.proName = this.$slots.proName[0].text
this.proNode = this.$slots.proNode[0].text
}
}
</script>
@@ -65,15 +69,17 @@
.process-header {
position: relative;
padding-top: 10px;
width: 100%;
}
.process-title {
width: 100%;
margin-left: 10px;
font-size: 18px;
font-weight: bold;
display: inline-block;
height: 30px;
line-height: 30px;
a {
.smallText {
font-size: 14px;
margin-left: 5px;
cursor: default;
@@ -361,10 +361,8 @@
this.form.title = data.title || data.form.title
this.form.date = data.date || data.form.date
this.json = data || data.form
// this.form.model = data.model || data.form.model
// this.form.modelName = data.modelName || data.form.modelName
this.form.responUserList = data.form.responUserList
this.form.responUserListName = data.form.responUserListName
this.form.responUserList = data.form? data.form.responUserList : ''
this.form.responUserListName = data.form? data.form.responUserListName : ''
}).catch(e => {
})
})
@@ -63,6 +63,7 @@
<el-col :span="8">
<el-form-item class="add-form-item" label="会员角色:" prop="comityRole">
<el-select
clearable
v-model="rh_pageData.comityRole"
placeholder="请选择会员角色">
<el-option
@@ -76,6 +77,7 @@
<el-col :span="8">
<el-form-item class="add-form-item" label="协会状态:" prop="comityState">
<el-select
clearable
v-model="rh_pageData.comityState"
placeholder="选择协会状态">
<el-option
@@ -89,6 +91,7 @@
<el-col :span="8">
<el-form-item class="add-form-item" label="入会性质:" prop="comityKind">
<el-select
clearable
v-model="rh_pageData.comityKind"
placeholder="请选择入会性质">
<el-option
@@ -34,6 +34,7 @@
<el-col :span="8">
<el-form-item class="add-form-item" label="协会名称:">
<el-select
clearable
@change="comityChange"
v-model="ch_pageData.associaName"
placeholder="请选择标委会">
@@ -48,6 +49,7 @@
<el-col :span="8" v-if="ch_pageData.associaName !== ''">
<el-form-item class="add-form-item">
<el-select
clearable
@change="comityChangeOne"
v-model="ch_pageData.associaNameOne"
placeholder="请选择分标委">
@@ -62,6 +64,7 @@
<el-col :span="8" v-if="ch_pageData.associaName !== '' && ch_pageData.associaNameOne !== ''">
<el-form-item class="add-form-item">
<el-select
clearable
v-model="ch_pageData.associaNameTwo"
placeholder="请选择工作组">
<el-option
@@ -404,9 +404,9 @@ export default {
cname: [
{required: true, message: '请输入标准名称', trigger: 'change'},
],
// fjListId: [
// {required: true, message: '请选择附件', trigger: 'change'},
// ]
fjListId: [
{required: true, message: '请选择附件', trigger: 'change'},
]
},
// 标准征求意见数据可库
standCommonlySearch: {
@@ -412,9 +412,9 @@ export default {
endTime: [
{required: true, message: '请输入标准结束日期', trigger: 'change'},
],
// fjListId: [
// {required: true, message: '请选择附件', trigger: 'change'},
// ]
fjListId: [
{required: true, message: '请选择附件', trigger: 'change'},
]
},
// 标准征求意见数据可库
standCommonlySearch: {
@@ -307,10 +307,8 @@
this.form.title = data.title || data.form.title
this.form.date = data.date || data.form.date
this.json = data || data.form
// this.form.model = data.model || data.form.model
// this.form.modelName = data.modelName || data.form.modelName
this.form.responUserList = data.form.responUserList
this.form.responUserListName = data.form.responUserListName
this.form.responUserList = data.form? data.form.responUserList : ''
this.form.responUserListName = data.form? data.form.responUserListName : ''
}).catch(e => {
})
})
@@ -514,33 +514,33 @@ export default {
/deep/.prc-content-border .el-form-item__content {
width: 270px;
}
.headerTabs {
height: 52px;
display: flex;
align-items: center;
position: absolute;
top: 52px;
right: 10px;
.headerTabsItem {
border: 1px solid #c1c1c1;
padding: 0 5px;
height: 30px;
line-height: 30px;
cursor: pointer;
}
.active {
border: 1px solid #E6A23C;
color: #fff;
background: #E6A23C;
}
}
//.headerTabs {
// height: 52px;
// display: flex;
// align-items: center;
// position: absolute;
// top: 52px;
// right: 10px;
// .headerTabsItem {
// border: 1px solid #c1c1c1;
// padding: 0 5px;
// height: 30px;
// line-height: 30px;
// cursor: pointer;
// }
// .active {
// border: 1px solid #E6A23C;
// color: #fff;
// background: #E6A23C;
// }
//}
.content {
border-top: 1px solid #DCDFE6;
display: flex;
flex-direction: column;
justify-content: space-between;
margin-top: 52px;
height: calc(~'100% - 155px');
//height: calc(~'100% - 155px');
overflow: auto;
.tableTitle {
margin-bottom: 10px;
@@ -428,33 +428,33 @@ export default {
/deep/.prc-content-border .el-form-item__content {
width: 270px;
}
.headerTabs {
height: 52px;
display: flex;
align-items: center;
position: absolute;
top: 75px;
right: 10px;
.headerTabsItem {
border: 1px solid #c1c1c1;
padding: 0 5px;
height: 30px;
line-height: 30px;
cursor: pointer;
}
.active {
border: 1px solid #E6A23C;
color: #fff;
background: #E6A23C;
}
}
//.headerTabs {
// height: 52px;
// display: flex;
// align-items: center;
// position: absolute;
// top: 75px;
// right: 10px;
// .headerTabsItem {
// border: 1px solid #c1c1c1;
// padding: 0 5px;
// height: 30px;
// line-height: 30px;
// cursor: pointer;
// }
// .active {
// border: 1px solid #E6A23C;
// color: #fff;
// background: #E6A23C;
// }
//}
.content {
border-top: 1px solid #DCDFE6;
display: flex;
flex-direction: column;
justify-content: space-between;
margin-top: 52px;
height: calc(~'100% - 180px');
//height: calc(~'100% - 180px');
overflow: auto;
.tableTitle {
margin-bottom: 10px;
@@ -428,33 +428,33 @@ export default {
/deep/.prc-content-border .el-form-item__content {
width: 270px;
}
.headerTabs {
height: 52px;
display: flex;
align-items: center;
position: absolute;
top: 75px;
right: 10px;
.headerTabsItem {
border: 1px solid #c1c1c1;
padding: 0 5px;
height: 30px;
line-height: 30px;
cursor: pointer;
}
.active {
border: 1px solid #E6A23C;
color: #fff;
background: #E6A23C;
}
}
//.headerTabs {
// height: 52px;
// display: flex;
// align-items: center;
// position: absolute;
// top: 75px;
// right: 10px;
// .headerTabsItem {
// border: 1px solid #c1c1c1;
// padding: 0 5px;
// height: 30px;
// line-height: 30px;
// cursor: pointer;
// }
// .active {
// border: 1px solid #E6A23C;
// color: #fff;
// background: #E6A23C;
// }
//}
.content {
border-top: 1px solid #DCDFE6;
display: flex;
flex-direction: column;
justify-content: space-between;
margin-top: 52px;
height: calc(~'100% - 180px');
//height: calc(~'100% - 180px');
overflow: auto;
.tableTitle {
margin-bottom: 10px;
@@ -428,33 +428,33 @@ export default {
/deep/.prc-content-border .el-form-item__content {
width: 270px;
}
.headerTabs {
height: 52px;
display: flex;
align-items: center;
position: absolute;
top: 75px;
right: 10px;
.headerTabsItem {
border: 1px solid #c1c1c1;
padding: 0 5px;
height: 30px;
line-height: 30px;
cursor: pointer;
}
.active {
border: 1px solid #E6A23C;
color: #fff;
background: #E6A23C;
}
}
//.headerTabs {
// height: 52px;
// display: flex;
// align-items: center;
// position: absolute;
// top: 75px;
// right: 10px;
// .headerTabsItem {
// border: 1px solid #c1c1c1;
// padding: 0 5px;
// height: 30px;
// line-height: 30px;
// cursor: pointer;
// }
// .active {
// border: 1px solid #E6A23C;
// color: #fff;
// background: #E6A23C;
// }
//}
.content {
border-top: 1px solid #DCDFE6;
display: flex;
flex-direction: column;
justify-content: space-between;
margin-top: 52px;
height: calc(~'100% - 180px');
//height: calc(~'100% - 180px');
overflow: auto;
.tableTitle {
margin-bottom: 10px;
@@ -588,33 +588,33 @@ export default {
/deep/.prc-content-border .el-form-item__content {
width: 270px;
}
.headerTabs {
height: 52px;
display: flex;
align-items: center;
position: absolute;
top: 52px;
right: 10px;
.headerTabsItem {
border: 1px solid #c1c1c1;
padding: 0 5px;
height: 30px;
line-height: 30px;
cursor: pointer;
}
.active {
border: 1px solid #E6A23C;
color: #fff;
background: #E6A23C;
}
}
//.headerTabs {
// height: 52px;
// display: flex;
// align-items: center;
// position: absolute;
// top: 52px;
// right: 10px;
// .headerTabsItem {
// border: 1px solid #c1c1c1;
// padding: 0 5px;
// height: 30px;
// line-height: 30px;
// cursor: pointer;
// }
// .active {
// border: 1px solid #E6A23C;
// color: #fff;
// background: #E6A23C;
// }
//}
.content {
border-top: 1px solid #DCDFE6;
display: flex;
flex-direction: column;
justify-content: space-between;
margin-top: 52px;
height: calc(~'100% - 155px');
//height: calc(~'100% - 155px');
overflow: auto;
.tableTitle {
margin-bottom: 10px;
@@ -570,33 +570,33 @@ export default {
/deep/.prc-content-border .el-form-item__content {
width: 270px;
}
.headerTabs {
height: 52px;
display: flex;
align-items: center;
position: absolute;
top: 52px;
right: 10px;
.headerTabsItem {
border: 1px solid #c1c1c1;
padding: 0 5px;
height: 30px;
line-height: 30px;
cursor: pointer;
}
.active {
border: 1px solid #E6A23C;
color: #fff;
background: #E6A23C;
}
}
//.headerTabs {
// height: 52px;
// display: flex;
// align-items: center;
// position: absolute;
// top: 52px;
// right: 10px;
// .headerTabsItem {
// border: 1px solid #c1c1c1;
// padding: 0 5px;
// height: 30px;
// line-height: 30px;
// cursor: pointer;
// }
// .active {
// border: 1px solid #E6A23C;
// color: #fff;
// background: #E6A23C;
// }
//}
.content {
border-top: 1px solid #DCDFE6;
display: flex;
flex-direction: column;
justify-content: space-between;
margin-top: 52px;
height: calc(~'100% - 155px');
//height: calc(~'100% - 155px');
overflow: auto;
.tableTitle {
margin-bottom: 10px;
@@ -436,33 +436,33 @@ export default {
/deep/.prc-content-border .el-form-item__content {
width: 270px;
}
.headerTabs {
height: 52px;
display: flex;
align-items: center;
position: absolute;
top: 52px;
right: 10px;
.headerTabsItem {
border: 1px solid #c1c1c1;
padding: 0 5px;
height: 30px;
line-height: 30px;
cursor: pointer;
}
.active {
border: 1px solid #E6A23C;
color: #fff;
background: #E6A23C;
}
}
//.headerTabs {
// height: 52px;
// display: flex;
// align-items: center;
// position: absolute;
// top: 52px;
// right: 10px;
// .headerTabsItem {
// border: 1px solid #c1c1c1;
// padding: 0 5px;
// height: 30px;
// line-height: 30px;
// cursor: pointer;
// }
// .active {
// border: 1px solid #E6A23C;
// color: #fff;
// background: #E6A23C;
// }
//}
.content {
border-top: 1px solid #DCDFE6;
display: flex;
flex-direction: column;
justify-content: space-between;
margin-top: 52px;
height: calc(~'100% - 180px');
//height: calc(~'100% - 180px');
overflow: auto;
.tableTitle {
margin-bottom: 10px;
@@ -376,33 +376,33 @@ export default {
/deep/.prc-content-border .el-form-item__content {
width: 270px;
}
.headerTabs {
height: 52px;
display: flex;
align-items: center;
position: absolute;
top: 52px;
right: 10px;
.headerTabsItem {
border: 1px solid #c1c1c1;
padding: 0 5px;
height: 30px;
line-height: 30px;
cursor: pointer;
}
.active {
border: 1px solid #E6A23C;
color: #fff;
background: #E6A23C;
}
}
//.headerTabs {
// height: 52px;
// display: flex;
// align-items: center;
// position: absolute;
// top: 52px;
// right: 10px;
// .headerTabsItem {
// border: 1px solid #c1c1c1;
// padding: 0 5px;
// height: 30px;
// line-height: 30px;
// cursor: pointer;
// }
// .active {
// border: 1px solid #E6A23C;
// color: #fff;
// background: #E6A23C;
// }
//}
.content {
border-top: 1px solid #DCDFE6;
display: flex;
flex-direction: column;
justify-content: space-between;
margin-top: 52px;
height: calc(~'100% - 155px');
//height: calc(~'100% - 155px');
overflow: auto;
.tableTitle {
margin-bottom: 10px;
@@ -532,33 +532,13 @@ export default {
/deep/.prc-content-border .el-form-item__content {
width: 270px;
}
.headerTabs {
height: 52px;
display: flex;
align-items: center;
position: absolute;
top: 52px;
right: 10px;
.headerTabsItem {
border: 1px solid #c1c1c1;
padding: 0 5px;
height: 30px;
line-height: 30px;
cursor: pointer;
}
.active {
border: 1px solid #E6A23C;
color: #fff;
background: #E6A23C;
}
}
.content {
border-top: 1px solid #DCDFE6;
display: flex;
flex-direction: column;
justify-content: space-between;
margin-top: 52px;
height: calc(~'100% - 155px');
//height: calc(~'100% - 155px');
overflow: auto;
.tableTitle {
margin-bottom: 10px;
@@ -532,33 +532,13 @@ export default {
/deep/.prc-content-border .el-form-item__content {
width: 270px;
}
.headerTabs {
height: 52px;
display: flex;
align-items: center;
position: absolute;
top: 52px;
right: 10px;
.headerTabsItem {
border: 1px solid #c1c1c1;
padding: 0 5px;
height: 30px;
line-height: 30px;
cursor: pointer;
}
.active {
border: 1px solid #E6A23C;
color: #fff;
background: #E6A23C;
}
}
.content {
border-top: 1px solid #DCDFE6;
display: flex;
flex-direction: column;
justify-content: space-between;
margin-top: 52px;
height: calc(~'100% - 155px');
//height: calc(~'100% - 155px');
overflow: auto;
.tableTitle {
margin-bottom: 10px;
@@ -532,33 +532,13 @@ export default {
/deep/.prc-content-border .el-form-item__content {
width: 270px;
}
.headerTabs {
height: 52px;
display: flex;
align-items: center;
position: absolute;
top: 52px;
right: 10px;
.headerTabsItem {
border: 1px solid #c1c1c1;
padding: 0 5px;
height: 30px;
line-height: 30px;
cursor: pointer;
}
.active {
border: 1px solid #E6A23C;
color: #fff;
background: #E6A23C;
}
}
.content {
border-top: 1px solid #DCDFE6;
display: flex;
flex-direction: column;
justify-content: space-between;
margin-top: 52px;
height: calc(~'100% - 155px');
//height: calc(~'100% - 155px');
overflow: auto;
.tableTitle {
margin-bottom: 10px;
@@ -386,33 +386,13 @@ export default {
/deep/.prc-content-border .el-form-item__content {
width: 270px;
}
.headerTabs {
height: 52px;
display: flex;
align-items: center;
position: absolute;
top: 52px;
right: 10px;
.headerTabsItem {
border: 1px solid #c1c1c1;
padding: 0 5px;
height: 30px;
line-height: 30px;
cursor: pointer;
}
.active {
border: 1px solid #E6A23C;
color: #fff;
background: #E6A23C;
}
}
.content {
border-top: 1px solid #DCDFE6;
display: flex;
flex-direction: column;
justify-content: space-between;
margin-top: 52px;
height: calc(~'100% - 155px');
//height: calc(~'100% - 155px');
overflow: auto;
.tableTitle {
margin-bottom: 10px;
@@ -379,33 +379,13 @@ export default {
/deep/.prc-content-border .el-form-item__content {
width: 270px;
}
.headerTabs {
height: 52px;
display: flex;
align-items: center;
position: absolute;
top: 52px;
right: 10px;
.headerTabsItem {
border: 1px solid #c1c1c1;
padding: 0 5px;
height: 30px;
line-height: 30px;
cursor: pointer;
}
.active {
border: 1px solid #E6A23C;
color: #fff;
background: #E6A23C;
}
}
.content {
border-top: 1px solid #DCDFE6;
display: flex;
flex-direction: column;
justify-content: space-between;
margin-top: 52px;
height: calc(~'100% - 155px');
//height: calc(~'100% - 155px');
overflow: auto;
.tableTitle {
margin-bottom: 10px;
@@ -379,33 +379,13 @@ export default {
/deep/.prc-content-border .el-form-item__content {
width: 270px;
}
.headerTabs {
height: 52px;
display: flex;
align-items: center;
position: absolute;
top: 52px;
right: 10px;
.headerTabsItem {
border: 1px solid #c1c1c1;
padding: 0 5px;
height: 30px;
line-height: 30px;
cursor: pointer;
}
.active {
border: 1px solid #E6A23C;
color: #fff;
background: #E6A23C;
}
}
.content {
border-top: 1px solid #DCDFE6;
display: flex;
flex-direction: column;
justify-content: space-between;
margin-top: 52px;
height: calc(~'100% - 155px');
//height: calc(~'100% - 155px');
overflow: auto;
.tableTitle {
margin-bottom: 10px;
@@ -379,33 +379,13 @@ export default {
/deep/.prc-content-border .el-form-item__content {
width: 270px;
}
.headerTabs {
height: 52px;
display: flex;
align-items: center;
position: absolute;
top: 52px;
right: 10px;
.headerTabsItem {
border: 1px solid #c1c1c1;
padding: 0 5px;
height: 30px;
line-height: 30px;
cursor: pointer;
}
.active {
border: 1px solid #E6A23C;
color: #fff;
background: #E6A23C;
}
}
.content {
border-top: 1px solid #DCDFE6;
display: flex;
flex-direction: column;
justify-content: space-between;
margin-top: 52px;
height: calc(~'100% - 155px');
//height: calc(~'100% - 155px');
overflow: auto;
.tableTitle {
margin-bottom: 10px;
@@ -429,33 +429,13 @@ export default {
/deep/.prc-content-border .el-form-item__content {
width: 270px;
}
.headerTabs {
height: 52px;
display: flex;
align-items: center;
position: absolute;
top: 52px;
right: 10px;
.headerTabsItem {
border: 1px solid #c1c1c1;
padding: 0 5px;
height: 30px;
line-height: 30px;
cursor: pointer;
}
.active {
border: 1px solid #E6A23C;
color: #fff;
background: #E6A23C;
}
}
.content {
border-top: 1px solid #DCDFE6;
display: flex;
flex-direction: column;
justify-content: space-between;
margin-top: 52px;
height: calc(~'100% - 155px');
//height: calc(~'100% - 155px');
overflow: auto;
.tableTitle {
margin-bottom: 10px;
@@ -429,33 +429,13 @@ export default {
/deep/.prc-content-border .el-form-item__content {
width: 270px;
}
.headerTabs {
height: 52px;
display: flex;
align-items: center;
position: absolute;
top: 52px;
right: 10px;
.headerTabsItem {
border: 1px solid #c1c1c1;
padding: 0 5px;
height: 30px;
line-height: 30px;
cursor: pointer;
}
.active {
border: 1px solid #E6A23C;
color: #fff;
background: #E6A23C;
}
}
.content {
border-top: 1px solid #DCDFE6;
display: flex;
flex-direction: column;
justify-content: space-between;
margin-top: 52px;
height: calc(~'100% - 155px');
//height: calc(~'100% - 155px');
overflow: auto;
.tableTitle {
margin-bottom: 10px;
@@ -429,33 +429,13 @@ export default {
/deep/.prc-content-border .el-form-item__content {
width: 270px;
}
.headerTabs {
height: 52px;
display: flex;
align-items: center;
position: absolute;
top: 75px;
right: 10px;
.headerTabsItem {
border: 1px solid #c1c1c1;
padding: 0 5px;
height: 30px;
line-height: 30px;
cursor: pointer;
}
.active {
border: 1px solid #E6A23C;
color: #fff;
background: #E6A23C;
}
}
.content {
border-top: 1px solid #DCDFE6;
display: flex;
flex-direction: column;
justify-content: space-between;
margin-top: 52px;
height: calc(~'100% - 155px');
//height: calc(~'100% - 155px');
overflow: auto;
.tableTitle {
margin-bottom: 10px;
@@ -502,33 +502,13 @@ export default {
/deep/.prc-content-border .el-form-item__content {
width: 270px;
}
.headerTabs {
height: 52px;
display: flex;
align-items: center;
position: absolute;
top: 52px;
right: 10px;
.headerTabsItem {
border: 1px solid #c1c1c1;
padding: 0 5px;
height: 30px;
line-height: 30px;
cursor: pointer;
}
.active {
border: 1px solid #E6A23C;
color: #fff;
background: #E6A23C;
}
}
.content {
border-top: 1px solid #DCDFE6;
display: flex;
flex-direction: column;
justify-content: space-between;
margin-top: 52px;
height: calc(~'100% - 155px');
//height: calc(~'100% - 155px');
overflow: auto;
.tableTitle {
margin-bottom: 10px;
@@ -606,33 +606,13 @@ export default {
/deep/.prc-content-border .el-form-item__content {
width: 270px;
}
.headerTabs {
height: 52px;
display: flex;
align-items: center;
position: absolute;
top: 52px;
right: 10px;
.headerTabsItem {
border: 1px solid #c1c1c1;
padding: 0 5px;
height: 30px;
line-height: 30px;
cursor: pointer;
}
.active {
border: 1px solid #E6A23C;
color: #fff;
background: #E6A23C;
}
}
.content {
border-top: 1px solid #DCDFE6;
display: flex;
flex-direction: column;
justify-content: space-between;
margin-top: 52px;
height: calc(~'100% - 155px');
//height: calc(~'100% - 155px');
overflow: auto;
.tableTitle {
margin-bottom: 10px;
@@ -593,33 +593,13 @@ export default {
/deep/.prc-content-border .el-form-item__content {
width: 270px;
}
.headerTabs {
height: 52px;
display: flex;
align-items: center;
position: absolute;
top: 52px;
right: 10px;
.headerTabsItem {
border: 1px solid #c1c1c1;
padding: 0 5px;
height: 30px;
line-height: 30px;
cursor: pointer;
}
.active {
border: 1px solid #E6A23C;
color: #fff;
background: #E6A23C;
}
}
.content {
border-top: 1px solid #DCDFE6;
display: flex;
flex-direction: column;
justify-content: space-between;
margin-top: 52px;
height: calc(~'100% - 155px');
//height: calc(~'100% - 155px');
overflow: auto;
.tableTitle {
margin-bottom: 10px;
@@ -589,33 +589,13 @@ export default {
/deep/.prc-content-border .el-form-item__content {
width: 270px;
}
.headerTabs {
height: 52px;
display: flex;
align-items: center;
position: absolute;
top: 52px;
right: 10px;
.headerTabsItem {
border: 1px solid #c1c1c1;
padding: 0 5px;
height: 30px;
line-height: 30px;
cursor: pointer;
}
.active {
border: 1px solid #E6A23C;
color: #fff;
background: #E6A23C;
}
}
.content {
border-top: 1px solid #DCDFE6;
display: flex;
flex-direction: column;
justify-content: space-between;
margin-top: 52px;
height: calc(~'100% - 155px');
//height: calc(~'100% - 155px');
overflow: auto;
.tableTitle {
margin-bottom: 10px;
@@ -524,33 +524,13 @@ export default {
/deep/.prc-content-border .el-form-item__content {
width: 270px;
}
.headerTabs {
height: 52px;
display: flex;
align-items: center;
position: absolute;
top: 52px;
right: 10px;
.headerTabsItem {
border: 1px solid #c1c1c1;
padding: 0 5px;
height: 30px;
line-height: 30px;
cursor: pointer;
}
.active {
border: 1px solid #E6A23C;
color: #fff;
background: #E6A23C;
}
}
.content {
border-top: 1px solid #DCDFE6;
display: flex;
flex-direction: column;
justify-content: space-between;
margin-top: 52px;
height: calc(~'100% - 155px');
//height: calc(~'100% - 155px');
overflow: auto;
.tableTitle {
margin-bottom: 10px;
@@ -499,33 +499,13 @@ export default {
/deep/.prc-content-border .el-form-item__content {
width: 270px;
}
.headerTabs {
height: 52px;
display: flex;
align-items: center;
position: absolute;
top: 52px;
right: 10px;
.headerTabsItem {
border: 1px solid #c1c1c1;
padding: 0 5px;
height: 30px;
line-height: 30px;
cursor: pointer;
}
.active {
border: 1px solid #E6A23C;
color: #fff;
background: #E6A23C;
}
}
.content {
border-top: 1px solid #DCDFE6;
display: flex;
flex-direction: column;
justify-content: space-between;
margin-top: 52px;
height: calc(~'100% - 155px');
//height: calc(~'100% - 155px');
overflow: auto;
.tableTitle {
margin-bottom: 10px;
@@ -524,33 +524,13 @@ export default {
/deep/.prc-content-border .el-form-item__content {
width: 270px;
}
.headerTabs {
height: 52px;
display: flex;
align-items: center;
position: absolute;
top: 52px;
right: 10px;
.headerTabsItem {
border: 1px solid #c1c1c1;
padding: 0 5px;
height: 30px;
line-height: 30px;
cursor: pointer;
}
.active {
border: 1px solid #E6A23C;
color: #fff;
background: #E6A23C;
}
}
.content {
border-top: 1px solid #DCDFE6;
display: flex;
flex-direction: column;
justify-content: space-between;
margin-top: 52px;
height: calc(~'100% - 155px');
//height: calc(~'100% - 155px');
overflow: auto;
.tableTitle {
margin-bottom: 10px;
@@ -426,33 +426,13 @@ export default {
/deep/.prc-content-border .el-form-item__content {
width: 270px;
}
.headerTabs {
height: 52px;
display: flex;
align-items: center;
position: absolute;
top: 52px;
right: 10px;
.headerTabsItem {
border: 1px solid #c1c1c1;
padding: 0 5px;
height: 30px;
line-height: 30px;
cursor: pointer;
}
.active {
border: 1px solid #E6A23C;
color: #fff;
background: #E6A23C;
}
}
.content {
border-top: 1px solid #DCDFE6;
display: flex;
flex-direction: column;
justify-content: space-between;
margin-top: 52px;
height: calc(~'100% - 155px');
//height: calc(~'100% - 155px');
overflow: auto;
.tableTitle {
margin-bottom: 10px;
@@ -523,33 +523,13 @@ export default {
/deep/.prc-content-border .el-form-item__content {
width: 270px;
}
.headerTabs {
height: 52px;
display: flex;
align-items: center;
position: absolute;
top: 52px;
right: 10px;
.headerTabsItem {
border: 1px solid #c1c1c1;
padding: 0 5px;
height: 30px;
line-height: 30px;
cursor: pointer;
}
.active {
border: 1px solid #E6A23C;
color: #fff;
background: #E6A23C;
}
}
.content {
border-top: 1px solid #DCDFE6;
display: flex;
flex-direction: column;
justify-content: space-between;
margin-top: 52px;
height: calc(~'100% - 155px');
//height: calc(~'100% - 155px');
overflow: auto;
.tableTitle {
margin-bottom: 10px;
@@ -524,33 +524,13 @@ export default {
/deep/.prc-content-border .el-form-item__content {
width: 270px;
}
.headerTabs {
height: 52px;
display: flex;
align-items: center;
position: absolute;
top: 52px;
right: 10px;
.headerTabsItem {
border: 1px solid #c1c1c1;
padding: 0 5px;
height: 30px;
line-height: 30px;
cursor: pointer;
}
.active {
border: 1px solid #E6A23C;
color: #fff;
background: #E6A23C;
}
}
.content {
border-top: 1px solid #DCDFE6;
display: flex;
flex-direction: column;
justify-content: space-between;
margin-top: 52px;
height: calc(~'100% - 155px');
//height: calc(~'100% - 155px');
overflow: auto;
.tableTitle {
margin-bottom: 10px;
@@ -523,33 +523,13 @@ export default {
/deep/.prc-content-border .el-form-item__content {
width: 270px;
}
.headerTabs {
height: 52px;
display: flex;
align-items: center;
position: absolute;
top: 52px;
right: 10px;
.headerTabsItem {
border: 1px solid #c1c1c1;
padding: 0 5px;
height: 30px;
line-height: 30px;
cursor: pointer;
}
.active {
border: 1px solid #E6A23C;
color: #fff;
background: #E6A23C;
}
}
.content {
border-top: 1px solid #DCDFE6;
display: flex;
flex-direction: column;
justify-content: space-between;
margin-top: 52px;
height: calc(~'100% - 155px');
//height: calc(~'100% - 155px');
overflow: auto;
.tableTitle {
margin-bottom: 10px;
@@ -642,33 +642,13 @@ export default {
/deep/.prc-content-border .el-form-item__content {
width: 270px;
}
.headerTabs {
height: 52px;
display: flex;
align-items: center;
position: absolute;
top: 52px;
right: 10px;
.headerTabsItem {
border: 1px solid #c1c1c1;
padding: 0 5px;
height: 30px;
line-height: 30px;
cursor: pointer;
}
.active {
border: 1px solid #E6A23C;
color: #fff;
background: #E6A23C;
}
}
.content {
border-top: 1px solid #DCDFE6;
display: flex;
flex-direction: column;
justify-content: space-between;
margin-top: 52px;
height: calc(~'100% - 155px');
//height: calc(~'100% - 155px');
overflow: auto;
.tableTitle {
margin-bottom: 10px;
@@ -351,33 +351,13 @@ export default {
/deep/.prc-content-border .el-form-item__content {
width: 270px;
}
.headerTabs {
height: 52px;
display: flex;
align-items: center;
position: absolute;
top: 52px;
right: 10px;
.headerTabsItem {
border: 1px solid #c1c1c1;
padding: 0 5px;
height: 30px;
line-height: 30px;
cursor: pointer;
}
.active {
border: 1px solid #E6A23C;
color: #fff;
background: #E6A23C;
}
}
.content {
border-top: 1px solid #DCDFE6;
display: flex;
flex-direction: column;
justify-content: space-between;
margin-top: 52px;
height: calc(~'100% - 155px');
//height: calc(~'100% - 155px');
overflow: auto;
.tableTitle {
margin-bottom: 10px;
@@ -523,33 +523,13 @@ export default {
/deep/.prc-content-border .el-form-item__content {
width: 270px;
}
.headerTabs {
height: 52px;
display: flex;
align-items: center;
position: absolute;
top: 52px;
right: 10px;
.headerTabsItem {
border: 1px solid #c1c1c1;
padding: 0 5px;
height: 30px;
line-height: 30px;
cursor: pointer;
}
.active {
border: 1px solid #E6A23C;
color: #fff;
background: #E6A23C;
}
}
.content {
border-top: 1px solid #DCDFE6;
display: flex;
flex-direction: column;
justify-content: space-between;
margin-top: 52px;
height: calc(~'100% - 155px');
//height: calc(~'100% - 155px');
overflow: auto;
.tableTitle {
margin-bottom: 10px;
@@ -388,33 +388,13 @@ export default {
/deep/.prc-content-border .el-form-item__content {
width: 270px;
}
.headerTabs {
height: 52px;
display: flex;
align-items: center;
position: absolute;
top: 52px;
right: 10px;
.headerTabsItem {
border: 1px solid #c1c1c1;
padding: 0 5px;
height: 30px;
line-height: 30px;
cursor: pointer;
}
.active {
border: 1px solid #E6A23C;
color: #fff;
background: #E6A23C;
}
}
.content {
border-top: 1px solid #DCDFE6;
display: flex;
flex-direction: column;
justify-content: space-between;
margin-top: 52px;
height: calc(~'100% - 155px');
//height: calc(~'100% - 155px');
overflow: auto;
.tableTitle {
margin-bottom: 10px;
@@ -389,33 +389,13 @@ export default {
/deep/.prc-content-border .el-form-item__content {
width: 270px;
}
.headerTabs {
height: 52px;
display: flex;
align-items: center;
position: absolute;
top: 52px;
right: 10px;
.headerTabsItem {
border: 1px solid #c1c1c1;
padding: 0 5px;
height: 30px;
line-height: 30px;
cursor: pointer;
}
.active {
border: 1px solid #E6A23C;
color: #fff;
background: #E6A23C;
}
}
.content {
border-top: 1px solid #DCDFE6;
display: flex;
flex-direction: column;
justify-content: space-between;
margin-top: 52px;
height: calc(~'100% - 155px');
//height: calc(~'100% - 155px');
overflow: auto;
.tableTitle {
margin-bottom: 10px;
@@ -388,33 +388,13 @@ export default {
/deep/.prc-content-border .el-form-item__content {
width: 270px;
}
.headerTabs {
height: 52px;
display: flex;
align-items: center;
position: absolute;
top: 52px;
right: 10px;
.headerTabsItem {
border: 1px solid #c1c1c1;
padding: 0 5px;
height: 30px;
line-height: 30px;
cursor: pointer;
}
.active {
border: 1px solid #E6A23C;
color: #fff;
background: #E6A23C;
}
}
.content {
border-top: 1px solid #DCDFE6;
display: flex;
flex-direction: column;
justify-content: space-between;
margin-top: 52px;
height: calc(~'100% - 155px');
//height: calc(~'100% - 155px');
overflow: auto;
.tableTitle {
margin-bottom: 10px;
@@ -388,33 +388,13 @@ export default {
/deep/.prc-content-border .el-form-item__content {
width: 270px;
}
.headerTabs {
height: 52px;
display: flex;
align-items: center;
position: absolute;
top: 52px;
right: 10px;
.headerTabsItem {
border: 1px solid #c1c1c1;
padding: 0 5px;
height: 30px;
line-height: 30px;
cursor: pointer;
}
.active {
border: 1px solid #E6A23C;
color: #fff;
background: #E6A23C;
}
}
.content {
border-top: 1px solid #DCDFE6;
display: flex;
flex-direction: column;
justify-content: space-between;
margin-top: 52px;
height: calc(~'100% - 155px');
//height: calc(~'100% - 155px');
overflow: auto;
.tableTitle {
margin-bottom: 10px;
@@ -492,7 +492,7 @@ export default {
case '2':
if (row.taskInfo === '责任对接人选择责任人') {
this.$router.push({
name: 'phoneBzdyStep2',
name: 'bzdyStep2',
query: {
taskIds: row.taskIds,
prcId: row.prcId,
@@ -1267,7 +1267,6 @@ export default {
},
//
editTghisRow(row) {
console.log(row);
//
localStorage.setItem("obj", JSON.stringify(row));
@@ -1300,14 +1299,13 @@ export default {
},
//
saveInfo() {
console.log(this.editRowData);
if (this.editRowData.ssrq !== '') {
if (this.editRowData.ssrq !== '' && this.editRowData.ssrq !== null) {
this.editRowData.ssrq = this.editRowData.ssrq.join(',')
}
if (this.editRowData.xcxssrqgj !== ''){
if (this.editRowData.xcxssrqgj !== '' && this.editRowData.xcxssrqgj !== null){
this.editRowData.xcxssrqgj = this.editRowData.xcxssrqgj.join(',')
}
if (this.editRowData.zccssrqgj !== ''){
if (this.editRowData.zccssrqgj !== '' && this.editRowData.zccssrqgj !== null){
this.editRowData.zccssrqgj = this.editRowData.zccssrqgj.join(',')
}
this.drawerEdit = false
@@ -2127,8 +2125,6 @@ export default {
this.$http.get('sys/dictype/getDicTypeListCode', '', {
_this: this
}, res => {
console.log('能源类型',res.data.NYLXCLASS);
console.log('适用车型',res.data.ENERGYTYPES);
this.allSelectOptions = res.data || {}
this.regionOptions = res.data.REGION // list
this.applyArcticOptions = res.data.NYLXCLASS //
@@ -331,34 +331,6 @@
align="center"
label="适用产品线">
</el-table-column>
<!-- <el-table-column
show-overflow-tooltip
prop="cycvppsbm"
width="210px"
align="center"
label="乘用车VPPS编码">
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="cycvppscn"
width="210px"
align="center"
label="乘用车VPPS中文名称">
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="kccvppsbm"
align="center"
width="210px"
label="卡车VPPS编码">
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="kccvppscn"
align="center"
width="210px"
label="卡车VPPS中文名称">
</el-table-column>-->
<el-table-column width="160" align="center" fixed="right" label="操作">
<template slot-scope="scope">
<el-button
@@ -373,12 +345,6 @@
size="small" @click="moveDown(scope.$index, scope.row)"
v-if="!disabledFlag"
>下移</el-button>
<!-- <el-button-->
<!-- size="small"-->
<!-- @click="editTghisRow(scope.row)"-->
<!-- class="common-button-default"-->
<!-- type="warning"-->
<!-- >编辑</el-button>-->
</template>
</el-table-column>
</el-table>
@@ -415,91 +381,6 @@
</div>
</el-upload>
</el-dialog>
<!--编辑-->
<el-drawer
title="编辑清单条目"
:visible.sync="drawerEdit"
:wrapperClosable="false"
:before-close='cancelInfo'
size="800px"
>
<el-form :modal="editRowData" label-position="left" ref="editRowData" label-width="150px" style="margin: 20px">
<el-form-item label="标准号">
<el-input v-model.trim="editRowData.standNumber" :disabled="true"/>
</el-form-item>
<el-form-item label="标准名称" prop="standName">
<el-input v-model.trim="editRowData.standName" :disabled="true"/>
</el-form-item>
<el-form-item label="英文名称" prop="standEnName">
<el-input v-model.trim="editRowData.standEnName" :disabled="true"/>
</el-form-item>
<el-form-item label="适用车型" prop="typeApplicable">
<el-input v-model.trim="editRowData.typeApplicable" :disabled="true"/>
</el-form-item>
<el-form-item label="能源类型" prop="nylx">
<el-input v-model.trim="editRowData.nylx" :disabled="true"/>
</el-form-item>
<el-form-item label="标准实施日期" prop="ssrq">
<el-date-picker
v-model.trim="editRowData.ssrq"
type="dates"
value-format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
<el-form-item label="在产车实施日期" prop="zccssrq">
<el-date-picker
v-model.trim="editRowData.zccssrq"
type="dates"
value-format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
<el-form-item label="新车型实施日期" prop="xcxssrq">
<el-date-picker
v-model.trim="editRowData.xcxssrq"
type="dates"
value-format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
<el-form-item label="责任部门" prop="zrbm">
<el-input v-model.trim="editRowData.zrbm" :disabled="true"/>
</el-form-item>
<el-form-item label="适用产品线" prop="sycpx">
<el-input v-model.trim="editRowData.sycpx" :disabled="true"/>
</el-form-item>
<!-- <el-form-item label="乘用车VPPS编码" prop="cycvppsbm">
<el-input v-model.trim="editRowData.cycvppsbm" :disabled="true"/>
</el-form-item>
<el-form-item label="乘用车VPPS中文名称" prop="cycvppscn">
<el-input v-model.trim="editRowData.cycvppscn" :disabled="true"/>
</el-form-item>
<el-form-item label="卡车VPPS编码" prop="kccvppsbm">
<el-input v-model.trim="editRowData.kccvppsbm" :disabled="true"/>
</el-form-item>
<el-form-item label="卡车VPPS中文名称" prop="kccvppscn">
<el-input v-model.trim="editRowData.kccvppscn" :disabled="true"/>
</el-form-item>-->
</el-form>
<div class="demo-drawer-footer">
<el-button
type="primary"
class="common-button-primary"
size="mini"
icon="el-icon-check"
@click="saveInfo"
>提交</el-button
>
<el-button
size="mini"
icon="el-icon-close"
class="common-button-default"
@click="cancelInfo"
>取消</el-button
>
</div>
</el-drawer>
</div>
</template>
<script>
@@ -555,26 +436,6 @@ export default {
zrbmMap: {},
sycpxMap: {},
selectSearch : [],
//
drawerEdit: false,
//
editRowData: {
id: '',
standName: '',
standSortShow:'',
standEnName: '',
typeApplicable: '',
nylx: '',
ssrq: '',
zccssrq: '',
xcxssrq: '',
zrbm: '',
sycpx: '',
cycvppsbm: '',
cycvppscn: '',
kccvppsbm: '',
kccvppscn: ''
},
//
sarAccessEO: {
id: '',
@@ -1217,45 +1078,6 @@ export default {
this.$set(this.sarAccessInfoList, index, i)
}
},
//
editTghisRow(row) {
//
localStorage.setItem('obj', JSON.stringify(row))
this.rowList = row
this.editRowData = this.rowList
if (this.editRowData.ssrq !== null) {
this.editRowData.ssrq = this.editRowData.ssrq.split(',')
}
if (this.editRowData.zccssrq !== null) {
this.editRowData.zccssrq = this.editRowData.zccssrq.split(',')
}
if (this.editRowData.xcxssrq !== null) {
this.editRowData.xcxssrq = this.editRowData.xcxssrq.split(',')
}
this.drawerEdit = true
},
//
cancelInfo() {
let Item = JSON.parse(localStorage.getItem('obj'))
this.editRowData.ssrq = Item.ssrq
this.editRowData.xcxssrq = Item.xcxssrq
this.editRowData.zccssrq = Item.zccssrq
this.drawerEdit = false
},
//
saveInfo() {
if (this.editRowData.ssrq !== null) {
this.editRowData.ssrq = this.editRowData.ssrq.join(',')
}
if (this.editRowData.xcxssrq !== null){
this.editRowData.xcxssrq = this.editRowData.xcxssrq.join(',')
}
if (this.editRowData.zccssrq !== null){
this.editRowData.zccssrq = this.editRowData.zccssrq.join(',')
}
this.drawerEdit = false
},
//
importmodalFlags () {
this.importmodalFlag = true
@@ -405,13 +405,6 @@
v-if="!disabledFlag"
>下移
</el-button>
<!-- <el-button-->
<!-- size="small"-->
<!-- @click="editTghisRow(scope.row)"-->
<!-- class="common-button-default"-->
<!-- type="warning"-->
<!-- >编辑-->
<!-- </el-button>-->
</template>
</el-table-column>
</el-table>
@@ -453,92 +446,6 @@
</div>
</el-upload>
</el-dialog>
<el-drawer
title="编辑清单条目"
:visible.sync="drawerEdit"
:before-close='cancelInfo'
:wrapperClosable="false"
size="800px"
>
<el-form :modal="editRowData" label-position="left" ref="editRowData" label-width="150px" style="margin: 20px">
<el-form-item label="标准号">
<el-input v-model.trim="editRowData.standNumber" :disabled="true"/>
</el-form-item>
<el-form-item label="标准名称" prop="standName">
<el-input v-model.trim="editRowData.standName" :disabled="true"/>
</el-form-item>
<el-form-item label="英文名称" prop="standEnName">
<el-input v-model.trim="editRowData.standEnName" :disabled="true"/>
</el-form-item>
<el-form-item label="适用车型" prop="typeApplicable">
<el-input v-model.trim="editRowData.typeApplicable" :disabled="true"/>
</el-form-item>
<el-form-item label="能源类型" prop="nylx">
<el-input v-model.trim="editRowData.nylx" :disabled="true"/>
</el-form-item>
<el-form-item label="标准实施日期" prop="ssrq">
<el-date-picker
v-model.trim="editRowData.ssrq"
type="dates"
value-format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
<el-form-item label="在产车实施日期" prop="zccssrq">
<el-date-picker
v-model.trim="editRowData.zccssrq"
type="dates"
value-format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
<el-form-item label="新车型实施日期" prop="xcxssrq">
<el-date-picker
v-model.trim="editRowData.xcxssrq"
type="dates"
value-format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
<el-form-item label="责任部门" prop="zrbm">
<el-input v-model.trim="editRowData.zrbm" :disabled="true"/>
</el-form-item>
<el-form-item label="适用产品线" prop="sycpx">
<el-input v-model.trim="editRowData.sycpx" :disabled="true"/>
</el-form-item>
<!-- <el-form-item label="乘用车VPPS编码" prop="cycvppsbm">
<el-input v-model.trim="editRowData.cycvppsbm" :disabled="true"/>
</el-form-item>
<el-form-item label="乘用车VPPS中文名称" prop="cycvppscn">
<el-input v-model.trim="editRowData.cycvppscn" :disabled="true"/>
</el-form-item>
<el-form-item label="卡车VPPS编码" prop="kccvppsbm">
<el-input v-model.trim="editRowData.kccvppsbm" :disabled="true"/>
</el-form-item>
<el-form-item label="卡车VPPS中文名称" prop="kccvppscn">
<el-input v-model.trim="editRowData.kccvppscn" :disabled="true"/>
</el-form-item>-->
</el-form>
<div class="demo-drawer-footer">
<el-button
type="primary"
class="common-button-primary"
size="mini"
icon="el-icon-check"
@click="saveInfo"
>提交
</el-button
>
<el-button
size="mini"
icon="el-icon-close"
class="common-button-default"
@click="cancelInfo"
>取消
</el-button
>
</div>
</el-drawer>
</div>
</template>
<script>
@@ -609,27 +516,6 @@ export default {
},
fileInfoList: [], //
uploadFileListPath: 'api/att/attFile/upload', //
//
drawerEdit: false,
//
editRowData: {
id: '',
standName: '',
standSortShow: '',
standEnName: '',
typeApplicable: '',
syrz: '',
nylx: '',
ssrq: '',
zccssrq: '',
xcxssrq: '',
zrbm: '',
sycpx: '',
cycvppsbm: '',
cycvppscn: '',
kccvppsbm: '',
kccvppscn: ''
},
//
sarAccessEORules: {
type: [
@@ -1188,44 +1074,6 @@ export default {
this.$set(this.sarAccessInfoList, index, i)
}
},
//
editTghisRow(row) {
//
localStorage.setItem('obj', JSON.stringify(row))
this.rowList = row
this.editRowData = this.rowList
if (this.editRowData.ssrq !== null) {
this.editRowData.ssrq = this.editRowData.ssrq.split(',')
}
if (this.editRowData.zccssrq !== null) {
this.editRowData.zccssrq = this.editRowData.zccssrq.split(',')
}
if (this.editRowData.xcxssrq !== null) {
this.editRowData.xcxssrq = this.editRowData.xcxssrq.split(',')
}
this.drawerEdit = true
},
//
cancelInfo() {
let Item = JSON.parse(localStorage.getItem('obj'))
this.editRowData.ssrq = Item.ssrq
this.editRowData.xcxssrq = Item.xcxssrq
this.editRowData.zccssrq = Item.zccssrq
this.drawerEdit = false
},
//
saveInfo() {
if (this.editRowData.ssrq !== null) {
this.editRowData.ssrq = this.editRowData.ssrq.join(',')
}
if (this.editRowData.xcxssrq !== null){
this.editRowData.xcxssrq = this.editRowData.xcxssrq.join(',')
}
if (this.editRowData.zccssrq !== null){
this.editRowData.zccssrq = this.editRowData.zccssrq.join(',')
}
this.drawerEdit = false
},
//
importmodalFlags() {
this.importmodalFlag = true
@@ -29,7 +29,7 @@
<div class="file-box" v-if="fileList.length > 0">
<p v-for="item in fileList"
:key="item.id">
<a @click="openFileInPdf(item.id, item.name)" target="_blank">{{ item.name }}</a>
<a @click="openFileInPdf(item.id, item.name)" target="_blank" style="color: #409eff">{{ item.name }}</a>
<i
title="下载"
@click="downloadFile(item.id)"
@@ -257,12 +257,14 @@ export default {
.transition-box-label {
display: inline-block;
font-weight: bolder;
width: 200px;
vertical-align: top;
}
.transition-box-span {
display: inline-block;
color: #7e8083;
width: calc(~'100% - 100px');
}
@@ -11,7 +11,7 @@
<div class="left">
<el-form :modal="historySearch" :inline="true" class="label-input-form" >
<el-form-item label="标准号/标准名称" class="search-item">
<el-input v-model="historySearch.standId"
<el-input v-model="historySearch.standSerialNumber"
placeholder="请输入"
clearable
@keyup.enter="getTableBtn"
@@ -25,39 +25,9 @@
:maxlength="100"></el-input>
</el-form-item>
<el-form-item label="责任部门" class="search-item">
<el-select v-model="historySearch.responsibleUnit" placeholder="根据责任部门查找" clearable>
<el-option v-for="opt in zrbmOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">
{{ opt.label}}</el-option>
</el-select>
<el-input v-model="historySearch.responsibleUnit" placeholder="根据责任部门查找" clearable>
</el-input>
</el-form-item>
<!-- <el-form-item label="责任部门" class="search-item">-->
<!-- <el-input v-model="historySearch.responseUnitShow" v-show="false" />-->
<!-- <el-popover-->
<!-- placement="bottom"-->
<!-- popper-class="user-dept-popper"-->
<!-- trigger="click"-->
<!-- :value="false"-->
<!-- >-->
<!-- <el-input-->
<!-- slot="reference"-->
<!-- v-model="historySearch.responseUnitShow"-->
<!-- placeholder="根据责任部门查找"-->
<!-- readonly-->
<!-- clearable-->
<!-- id="searchResp"-->
<!-- />-->
<!-- <div class="api">-->
<!-- <laws-tree-->
<!-- :zNodes="zNodesSItem"-->
<!-- treeDivId="zNodesSItemSearch"-->
<!-- deptSelect-->
<!-- showRMenu-->
<!-- @treeDblClick="(treeId, treeNode) => treeClickSearch(treeId, treeNode)"-->
<!-- class="ztree" style="width: 200px;height: 400px;overflow: auto">-->
<!-- </laws-tree>-->
<!-- </div>-->
<!-- </el-popover>-->
<!-- </el-form-item>-->
<el-form-item class="search-item btn-box">
<el-button
type="primary"
@@ -144,7 +114,7 @@
label="责任部门">
</el-table-column>
<el-table-column
prop="dutyEngineer"
prop="dutyEngineerName"
width="150"
align="center"
label="责任工程师">
@@ -666,8 +636,6 @@ export default {
_this: this
}, res => {
this.allSelectOptions = res.data || {}
this.zrbmOptions = res.data.ZRBMCLASS //
this.zrbmOptions = res.data.ZRBMCLASS //
this.getGzzOption()
this.setMap(this.standStateOptions)
}, e => {