Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
yanyizhou
@@ -3722,41 +3722,18 @@ export default {
|
||||
}, {
|
||||
_this: this
|
||||
}, res => {
|
||||
// displayLocation.map(item => {
|
||||
// if (item.value === '2URVBGR2Y4UG77KZ5YPL') {
|
||||
// item.child.forEach(items =>{
|
||||
// let accessCountry = JSON.parse(sessionStorage.getItem("accessCountry"));
|
||||
// if (accessCountry.country === undefined) {
|
||||
// accessCountry.country = '文本'
|
||||
// }
|
||||
// if(items.attrField === 'SSRQ') {
|
||||
// items.attrName = '实施日期' + '(' + accessCountry.country + ')' + ':'
|
||||
// if (accessCountry.ssrq !== undefined) {
|
||||
// item.value = accessCountry.ssrq
|
||||
// }
|
||||
// } else if (items.attrField === 'ZCCSSRQ') {
|
||||
// items.attrName = '在产车实施日期' + '(' + accessCountry.country + ')' + ':'
|
||||
// if (accessCountry.zccssrqgj !== undefined) {
|
||||
// item.value = accessCountry.zccssrqgj
|
||||
// }
|
||||
// } else if(items.attrField === 'XCXSSRQ') {
|
||||
// items.attrName = '新车型实施日期' + '(' + accessCountry.country + ')' + ':'
|
||||
// if (accessCountry.xcxssrqgj !== undefined) {
|
||||
// item.value = accessCountry.xcxssrqgj
|
||||
// }
|
||||
//
|
||||
// }
|
||||
// })
|
||||
// for (let key in res.data) {
|
||||
// item.one.push({
|
||||
// attrName: key,
|
||||
// value: res.data[key].join(','),
|
||||
// isShowImp: '0',
|
||||
// id: key
|
||||
// })
|
||||
// }
|
||||
// }
|
||||
// })
|
||||
displayLocation.map(item => {
|
||||
if (item.value === '2URVBGR2Y4UG77KZ5YPL') {
|
||||
for (let key in res.data) {
|
||||
item.one.push({
|
||||
attrName: key,
|
||||
value: res.data[key].join(','),
|
||||
isShowImp: '0',
|
||||
id: key
|
||||
})
|
||||
}
|
||||
}
|
||||
})
|
||||
this.dynamicFormField = displayLocation
|
||||
})
|
||||
sessionStorage.setItem('displayLocation', JSON.stringify(displayLocation))
|
||||
|
||||
@@ -164,10 +164,10 @@
|
||||
<el-timeline-item timestamp="审定" placement="top" :color="roleForm.directorUser ? '#66b1ff' : ''">
|
||||
<el-card>
|
||||
<el-form-item prop="directorUserName" style="margin-bottom: 0">
|
||||
<h4>技术管理中心主任</h4>
|
||||
<h4>技术委员会相关专委会主任/研究总院职能部门领导，技术管理中心主任</h4>
|
||||
<div style="margin-top: 10px;width: 300px;">
|
||||
<el-input v-model="roleForm.directorUser" style="display: none;"></el-input>
|
||||
<el-input v-model="roleForm.directorUserName" placeholder="选择技术管理中心主任" @click.native="choiceZRRS('2')"></el-input>
|
||||
<el-input v-model="roleForm.directorUserName" placeholder="选择技术委员会相关专委会主任/研究总院职能部门领导，技术管理中心主任 " @click.native="choiceZRRS('2')"></el-input>
|
||||
</div>
|
||||
</el-form-item>
|
||||
</el-card>
|
||||
@@ -175,10 +175,10 @@
|
||||
<el-timeline-item timestamp="批准人" placement="top" :color="roleForm.presidentUser ? '#66b1ff' : ''">
|
||||
<el-card>
|
||||
<el-form-item prop="presidentUserName" style="margin-bottom: 0">
|
||||
<h4>工程研究总院院长</h4>
|
||||
<h4>工程研究总院院长或标准法规主管副院长</h4>
|
||||
<div style="margin-top: 10px;width: 300px;">
|
||||
<el-input v-model="roleForm.presidentUser" style="display: none;"></el-input>
|
||||
<el-input v-model="roleForm.presidentUserName" placeholder="选择工程研究总院院长" @click.native="choiceZRR('presidentUser', '选择工程研究总院院长', roleForm.presidentUser)"></el-input>
|
||||
<el-input v-model="roleForm.presidentUserName" placeholder="选择工程研究总院院长或标准法规主管副院长" @click.native="choiceZRR('presidentUser', '选择工程研究总院院长或标准法规主管副院长', roleForm.presidentUser)"></el-input>
|
||||
</div>
|
||||
</el-form-item>
|
||||
</el-card>
|
||||
|
||||
@@ -35,6 +35,7 @@
|
||||
<el-form-item label="完成时间" prop="date" class="add-form-item form-item-disabled">
|
||||
<el-date-picker
|
||||
v-model="form.date"
|
||||
:picker-options="pickerOptions"
|
||||
type="date"
|
||||
placeholder="请选择完成时间">
|
||||
</el-date-picker>
|
||||
@@ -164,11 +165,11 @@
|
||||
<el-timeline-item timestamp="审定" placement="top" :color="roleForm.directorUser ? '#66b1ff' : ''">
|
||||
<el-card>
|
||||
<el-form-item prop="directorUserName" style="margin-bottom: 0">
|
||||
<h4>技术管理中心主任</h4>
|
||||
<h4>技术委员会相关专委会主任/研究总院职能部门领导，技术管理中心主任 </h4>
|
||||
<div style="margin-top: 10px;width: 300px;">
|
||||
<el-input v-model="roleForm.directorUser" style="display: none;"></el-input>
|
||||
<!-- <el-input v-model="roleForm.directorUserName" placeholder="选择技术管理中心主任" readonly="readonly" @click.native="choiceZRR('directorUser', '选择技术管理中心主任', roleForm.directorUser)"></el-input>-->
|
||||
<el-input v-model="roleForm.directorUserName" placeholder="选择技术管理中心主任" readonly="readonly" @click.native="choiceZRRS('2')"></el-input>
|
||||
<el-input v-model="roleForm.directorUserName" placeholder="选择技术委员会相关专委会主任/研究总院职能部门领导，技术管理中心主任 " readonly="readonly" @click.native="choiceZRRS('2')"></el-input>
|
||||
</div>
|
||||
</el-form-item>
|
||||
</el-card>
|
||||
@@ -176,10 +177,10 @@
|
||||
<el-timeline-item timestamp="批准人" placement="top" :color="roleForm.presidentUser ? '#66b1ff' : ''">
|
||||
<el-card>
|
||||
<el-form-item prop="presidentUserName" style="margin-bottom: 0">
|
||||
<h4>工程研究总院院长</h4>
|
||||
<h4>工程研究总院院长或标准法规主管副院长</h4>
|
||||
<div style="margin-top: 10px;width: 300px;">
|
||||
<el-input v-model="roleForm.presidentUser" style="display: none;"></el-input>
|
||||
<el-input v-model="roleForm.presidentUserName" placeholder="选择工程研究总院院长" readonly="readonly" @click.native="choiceZRR('presidentUser', '选择工程研究总院院长', roleForm.presidentUser)"></el-input>
|
||||
<el-input v-model="roleForm.presidentUserName" placeholder="选择工程研究总院院长或标准法规主管副院长" readonly="readonly" @click.native="choiceZRR('presidentUser', '选择工程研究总院院长或标准法规主管副院长', roleForm.presidentUser)"></el-input>
|
||||
</div>
|
||||
</el-form-item>
|
||||
</el-card>
|
||||
@@ -263,6 +264,11 @@ export default {
|
||||
name: "bzdyStep1",
|
||||
data() {
|
||||
return {
|
||||
pickerOptions: {
|
||||
disabledDate(time) {
|
||||
return time.getTime() < Date.now() - 8.64e7;//如果没有后面的-8.64e7就是不可以选择今天的
|
||||
}
|
||||
},
|
||||
drawerTitle2: '',
|
||||
type2: '',
|
||||
bpnId: '',
|
||||
@@ -397,14 +403,14 @@ export default {
|
||||
this.nodeList2 = this.roleForm.dockUserList.split(',')
|
||||
}
|
||||
} else {
|
||||
this.drawerTitle2 = '选择技术管理中心主任'
|
||||
this.drawerTitle2 = '选择技术委员会相关专委会主任/研究总院职能部门领导，技术管理中心主任'
|
||||
if ( this.roleForm.directorUser.length > 0) {
|
||||
this.nodeList2 = this.roleForm.directorUser.split(',')
|
||||
}
|
||||
}
|
||||
this.modalshowflag2 = true
|
||||
},
|
||||
choiceZRR (type, title, id) {
|
||||
choiceZRR (type, title, id) {
|
||||
this.nodeList = []
|
||||
this.nodeList.push(id)
|
||||
this.type = type
|
||||
|
||||
@@ -47,7 +47,7 @@
|
||||
<span @click="clickButtonToUpload(item)">{{ item.name }}</span>
|
||||
<el-button
|
||||
size="small"
|
||||
@click="updateFile(item)"
|
||||
@click="updateFile2(item)"
|
||||
icon="el-icon-download"
|
||||
style="height: 32px; margin-left: 5px;"
|
||||
></el-button>
|
||||
@@ -63,7 +63,7 @@
|
||||
<span @click="clickButtonToUpload(item)">{{ item.name }}</span>
|
||||
<el-button
|
||||
size="small"
|
||||
@click="updateFile(item)"
|
||||
@click="updateFile2(item)"
|
||||
icon="el-icon-download"
|
||||
style="height: 32px; margin-left: 5px;"
|
||||
></el-button>
|
||||
@@ -127,19 +127,19 @@
|
||||
</div>
|
||||
</el-form>
|
||||
</div>
|
||||
<el-collapse accordion>
|
||||
<el-collapse-item title="回执说明">
|
||||
<div style="margin: 10px 0;">
|
||||
<el-input
|
||||
type="textarea"
|
||||
:rows="3"
|
||||
resize="none"
|
||||
placeholder="请输入意见"
|
||||
v-model="commentText">
|
||||
</el-input>
|
||||
</div>
|
||||
</el-collapse-item>
|
||||
</el-collapse>
|
||||
<!-- <el-collapse accordion>-->
|
||||
<!-- <el-collapse-item title="回执说明">-->
|
||||
<!-- <div style="margin: 10px 0;">-->
|
||||
<!-- <el-input-->
|
||||
<!-- type="textarea"-->
|
||||
<!-- :rows="3"-->
|
||||
<!-- resize="none"-->
|
||||
<!-- placeholder="请输入意见"-->
|
||||
<!-- v-model="commentText">-->
|
||||
<!-- </el-input>-->
|
||||
<!-- </div>-->
|
||||
<!-- </el-collapse-item>-->
|
||||
<!-- </el-collapse>-->
|
||||
</div>
|
||||
<div class="content" v-show="active === '2'">
|
||||
<el-table
|
||||
@@ -346,6 +346,10 @@
|
||||
updateFile (item) {
|
||||
window.location.href = '/api/att/attFile/downloadFile?fileId=' + item.fileId
|
||||
},
|
||||
updateFile2 (item) {
|
||||
let id = item.id
|
||||
window.location.href = '/api/att/attFile/downloadFile?fileId=' + id
|
||||
},
|
||||
// 导入按钮 上传之前的钩子
|
||||
beginImportFile (file) {
|
||||
var filename = file.name
|
||||
@@ -385,7 +389,6 @@
|
||||
}
|
||||
},
|
||||
fileUpload () {
|
||||
|
||||
this.fileMadel = true
|
||||
},
|
||||
handleTabs(name) {
|
||||
@@ -397,7 +400,7 @@
|
||||
_formData.append('taskIds', this.taskIds)
|
||||
_formData.append('json', JSON.stringify({
|
||||
form: this.form,
|
||||
commentText: this.commentText,
|
||||
// commentText: this.commentText,
|
||||
}))
|
||||
saveTaskForPub(_formData).then(res => {
|
||||
this.saveLoading = false
|
||||
@@ -425,7 +428,7 @@
|
||||
this.json.dyhz = this.form.dyhz
|
||||
this.isSubmit = true
|
||||
var json = this.json
|
||||
json.commentText = this.commentText
|
||||
// json.commentText = this.commentText
|
||||
json.fileId = this.form.fileId
|
||||
json.fileName = this.form.fileName
|
||||
this.$http.post('lawss/activiti/completeTask', {
|
||||
|
||||
@@ -47,7 +47,7 @@
|
||||
<span @click="clickButtonToUpload(item)">{{ item.name }}</span>
|
||||
<el-button
|
||||
size="small"
|
||||
@click="updateFile(item)"
|
||||
@click="updateFile2(item)"
|
||||
icon="el-icon-download"
|
||||
style="height: 32px; margin-left: 5px;"
|
||||
></el-button>
|
||||
@@ -63,7 +63,7 @@
|
||||
<span @click="clickButtonToUpload(item)">{{ item.name }}</span>
|
||||
<el-button
|
||||
size="small"
|
||||
@click="updateFile(item)"
|
||||
@click="updateFile2(item)"
|
||||
icon="el-icon-download"
|
||||
style="height: 32px; margin-left: 5px;"
|
||||
></el-button>
|
||||
@@ -322,6 +322,10 @@
|
||||
updateFile (fileId) {
|
||||
window.location.href = '/api/att/attFile/downloadFile?fileId=' + fileId
|
||||
},
|
||||
updateFile2 (item) {
|
||||
let id = item.id
|
||||
window.location.href = '/api/att/attFile/downloadFile?fileId=' + id
|
||||
},
|
||||
handleTabs(name) {
|
||||
this.active = name
|
||||
},
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
<!-- 标准调研流程-->
|
||||
<ProcessHeader toggle>
|
||||
<template slot="proName">标准调研流程</template>
|
||||
<template slot="proNode">工程研究总院院长审批</template>
|
||||
<template slot="proNode">工程研究总院院长或标准法规主管副院长审批</template>
|
||||
</ProcessHeader>
|
||||
<div class="headerTabs">
|
||||
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
|
||||
|
||||
@@ -137,7 +137,7 @@
|
||||
<el-input
|
||||
v-model="roleForm.dockUserListName"
|
||||
placeholder="选择责任部门对接人"
|
||||
@click.native="choiceZRRS">
|
||||
@click.native="choiceZRRS('1')">
|
||||
</el-input>
|
||||
</div>
|
||||
</el-form-item>
|
||||
@@ -161,13 +161,13 @@
|
||||
<el-timeline-item timestamp="审定征求意见" placement="top" :color="roleForm.directorUser ? '#66b1ff' : ''">
|
||||
<el-card>
|
||||
<el-form-item prop="directorUser" style="margin-bottom: 0">
|
||||
<h4>技术管理中心主任</h4>
|
||||
<h4>技术委员会相关专委会主任/研究总院职能部门领导，技术管理中心主任</h4>
|
||||
<div style="margin-top: 10px;width: 300px;">
|
||||
<el-input v-model="roleForm.directorUser" style="display: none;"/>
|
||||
<el-input
|
||||
v-model="roleForm.directorUserName"
|
||||
placeholder="选择技术管理中心主任"
|
||||
@click.native="choiceZRR('directorUser', '选择技术管理中心主任', roleForm.directorUser)"
|
||||
placeholder="选择技术委员会相关专委会主任/研究总院职能部门领导，技术管理中心主任"
|
||||
@click.native="choiceZRRS('2')"
|
||||
/>
|
||||
</div>
|
||||
</el-form-item>
|
||||
@@ -176,13 +176,13 @@
|
||||
<el-timeline-item timestamp="批准征求意见" placement="top" :color="roleForm.presidentUser ? '#66b1ff' : ''">
|
||||
<el-card>
|
||||
<el-form-item prop="presidentUser" style="margin-bottom: 0">
|
||||
<h4>工程研究总院院长</h4>
|
||||
<h4>工程研究总院院长或标准法规主管副院长</h4>
|
||||
<div style="margin-top: 10px;width: 300px;">
|
||||
<el-input v-model="roleForm.presidentUser" style="display: none;"/>
|
||||
<el-input
|
||||
v-model="roleForm.presidentUserName"
|
||||
placeholder="选择工程研究总院院长"
|
||||
@click.native="choiceZRR('presidentUser', '选择工程研究总院院长', roleForm.presidentUser)"
|
||||
placeholder="选择工程研究总院院长或标准法规主管副院长"
|
||||
@click.native="choiceZRR('presidentUser', '选择工程研究总院院长或标准法规主管副院长', roleForm.presidentUser)"
|
||||
/>
|
||||
</div>
|
||||
</el-form-item>
|
||||
@@ -287,7 +287,7 @@
|
||||
</div>
|
||||
</el-drawer>
|
||||
<Role-tree
|
||||
is-title="选择责任部门对接人"
|
||||
:is-title="drawerTitle2"
|
||||
:is-visible.sync="modalshowflag2"
|
||||
@checkedRole="checkedRole2"
|
||||
:nodeList="nodeList2"
|
||||
@@ -365,6 +365,8 @@ export default {
|
||||
name: "bzzqyjStep1-1",
|
||||
data() {
|
||||
return {
|
||||
drawerTitle2: '',
|
||||
type2: '',
|
||||
activeNames: '1',
|
||||
fileUrl: 'api/att/attFile/upload',
|
||||
fileMadel: false,
|
||||
@@ -738,8 +740,13 @@ export default {
|
||||
idList += item.id
|
||||
nameList += item.name
|
||||
})
|
||||
this.roleForm.dockUserList = idList
|
||||
this.roleForm.dockUserListName = nameList
|
||||
if (this.type2 === '1') {
|
||||
this.roleForm.dockUserList = idList
|
||||
this.roleForm.dockUserName = nameList
|
||||
} else {
|
||||
this.roleForm.directorUser = idList
|
||||
this.roleForm.directorUserName = nameList
|
||||
}
|
||||
},
|
||||
checkedRole(data) {
|
||||
if (this.type === 'ministerUser') {
|
||||
@@ -753,10 +760,19 @@ export default {
|
||||
this.roleForm.presidentUserName = data[0].name
|
||||
}
|
||||
},
|
||||
choiceZRRS() {
|
||||
choiceZRRS(type) {
|
||||
this.type2 = type
|
||||
this.nodeList2 = []
|
||||
if (this.roleForm.dockUserList.length > 0) {
|
||||
this.nodeList2 = this.roleForm.dockUserList.split(',')
|
||||
if (type === '1') {
|
||||
this.drawerTitle2 = '选择责任部门对接人'
|
||||
if ( this.roleForm.dockUserList.length > 0) {
|
||||
this.nodeList2 = this.roleForm.dockUserList.split(',')
|
||||
}
|
||||
} else {
|
||||
this.drawerTitle2 = '选择技术委员会相关专委会主任/研究总院职能部门领导，技术管理中心主任'
|
||||
if (this.roleForm.directorUser.length > 0) {
|
||||
this.nodeList2 = this.roleForm.directorUser.split(',')
|
||||
}
|
||||
}
|
||||
this.modalshowflag2 = true
|
||||
},
|
||||
|
||||
@@ -138,7 +138,7 @@
|
||||
<el-input
|
||||
v-model="roleForm.dockUserListName"
|
||||
placeholder="选择责任部门对接人"
|
||||
@click.native="choiceZRRS">
|
||||
@click.native="choiceZRRS('1')">
|
||||
</el-input>
|
||||
</div>
|
||||
</el-form-item>
|
||||
@@ -162,13 +162,13 @@
|
||||
<el-timeline-item timestamp="审定征求意见" placement="top" :color="roleForm.directorUser ? '#66b1ff' : ''">
|
||||
<el-card>
|
||||
<el-form-item prop="directorUser" style="margin-bottom: 0">
|
||||
<h4>技术管理中心主任</h4>
|
||||
<h4>技术委员会相关专委会主任/研究总院职能部门领导，技术管理中心主任</h4>
|
||||
<div style="margin-top: 10px;width: 300px;">
|
||||
<el-input v-model="roleForm.directorUser" style="display: none;"/>
|
||||
<el-input
|
||||
v-model="roleForm.directorUserName"
|
||||
placeholder="选择技术管理中心主任"
|
||||
@click.native="choiceZRR('directorUser', '选择技术管理中心主任', roleForm.directorUser)"
|
||||
placeholder="选择技术委员会相关专委会主任/研究总院职能部门领导，技术管理中心主任"
|
||||
@click.native="choiceZRRS('2')"
|
||||
/>
|
||||
</div>
|
||||
</el-form-item>
|
||||
@@ -177,13 +177,13 @@
|
||||
<el-timeline-item timestamp="批准征求意见" placement="top" :color="roleForm.presidentUser ? '#66b1ff' : ''">
|
||||
<el-card>
|
||||
<el-form-item prop="presidentUser" style="margin-bottom: 0">
|
||||
<h4>工程研究总院院长</h4>
|
||||
<h4>工程研究总院院长或标准法规主管副院长</h4>
|
||||
<div style="margin-top: 10px;width: 300px;">
|
||||
<el-input v-model="roleForm.presidentUser" style="display: none;"/>
|
||||
<el-input
|
||||
v-model="roleForm.presidentUserName"
|
||||
placeholder="选择工程研究总院院长"
|
||||
@click.native="choiceZRR('presidentUser', '选择工程研究总院院长', roleForm.presidentUser)"
|
||||
placeholder="选择工程研究总院院长或标准法规主管副院长"
|
||||
@click.native="choiceZRR('presidentUser', '选择工程研究总院院长或标准法规主管副院长', roleForm.presidentUser)"
|
||||
/>
|
||||
</div>
|
||||
</el-form-item>
|
||||
@@ -289,7 +289,7 @@
|
||||
</div>
|
||||
</el-drawer>
|
||||
<Role-tree
|
||||
is-title="选择责任部门对接人"
|
||||
:is-title="drawerTitle2"
|
||||
:is-visible.sync="modalshowflag2"
|
||||
@checkedRole="checkedRole2"
|
||||
:nodeList="nodeList2"
|
||||
@@ -375,6 +375,8 @@ export default {
|
||||
name: "bzzqyjStep1",
|
||||
data() {
|
||||
return {
|
||||
drawerTitle2: '',
|
||||
type2: '',
|
||||
pickerOptions: {
|
||||
disabledDate(time) {
|
||||
return time.getTime() < Date.now() - 8.64e7;//如果没有后面的-8.64e7就是不可以选择今天的
|
||||
@@ -745,8 +747,13 @@ export default {
|
||||
idList += item.id
|
||||
nameList += item.name
|
||||
})
|
||||
this.roleForm.dockUserList = idList
|
||||
this.roleForm.dockUserListName = nameList
|
||||
if (this.type2 === '1') {
|
||||
this.roleForm.dockUserList = idList
|
||||
this.roleForm.dockUserName = nameList
|
||||
} else {
|
||||
this.roleForm.directorUser = idList
|
||||
this.roleForm.directorUserName = nameList
|
||||
}
|
||||
},
|
||||
checkedRole(data) {
|
||||
if (this.type === 'ministerUser') {
|
||||
@@ -760,10 +767,19 @@ export default {
|
||||
this.roleForm.presidentUserName = data[0].name
|
||||
}
|
||||
},
|
||||
choiceZRRS() {
|
||||
choiceZRRS(type) {
|
||||
this.type2 = type
|
||||
this.nodeList2 = []
|
||||
if (this.roleForm.dockUserList.length > 0) {
|
||||
this.nodeList2 = this.roleForm.dockUserList.split(',')
|
||||
if (type === '1') {
|
||||
this.drawerTitle2 = '选择责任部门对接人'
|
||||
if ( this.roleForm.dockUserList.length > 0) {
|
||||
this.nodeList2 = this.roleForm.dockUserList.split(',')
|
||||
}
|
||||
} else {
|
||||
this.drawerTitle2 = '选择技术委员会相关专委会主任/研究总院职能部门领导，技术管理中心主任'
|
||||
if (this.roleForm.directorUser.length > 0) {
|
||||
this.nodeList2 = this.roleForm.directorUser.split(',')
|
||||
}
|
||||
}
|
||||
this.modalshowflag2 = true
|
||||
},
|
||||
|
||||
@@ -464,7 +464,7 @@ export default {
|
||||
if (this.commentText) {
|
||||
this.isSubmit = true
|
||||
var json = this.json
|
||||
json.directorFlag = '0'
|
||||
json.directorFlag = '1'
|
||||
json.commentText = this.commentText
|
||||
this.$http.post('lawss/activiti/completeTask', {
|
||||
json: JSON.stringify(json),
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
<!-- 标准调研流程-->
|
||||
<ProcessHeader toggle>
|
||||
<template slot="proName">标准征求意见流程</template>
|
||||
<template slot="proNode">工程研究总院院长批准</template>
|
||||
<template slot="proNode">工程研究总院院长或标准法规主管副院长</template>
|
||||
</ProcessHeader>
|
||||
<div class="headerTabs">
|
||||
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
|
||||
|
||||
-1
@@ -4566,7 +4566,6 @@ export default {
|
||||
this.standNatureOptions = res.data.SARPROPERTY // 标准性质
|
||||
this.standStateOptions = res.data.TEXTSTATUSBUSS // 文本状态
|
||||
this.standSystemOptions = res.data.TXLBBUSS // 标准体系
|
||||
console.log(this.standSystemOptions);
|
||||
this.applyArcticOptions.options = res.data.ENERGYTYPES // 适用车型
|
||||
this.categoryOptions.options = res.data.NYLXCLASS // 能源类型
|
||||
this.applyAuthOptions.options = res.data.SYRZCLASS // 适用认证
|
||||
|
||||
@@ -263,40 +263,42 @@
|
||||
v-model="addForm.unit">
|
||||
</el-input>
|
||||
<el-input
|
||||
:key="addForm.unit"
|
||||
:config="addForm"
|
||||
clearable
|
||||
v-model="addForm.unitName"
|
||||
placeholder="请选择起草责任单位"
|
||||
readonly
|
||||
@click.native="choiceZRBM(addForm.unit)">
|
||||
</el-input>
|
||||
|
||||
<!-- <el-tooltip v-if="addForm.unit" class="item" effect="dark" :content="addForm.unit" placement="top-start">-->
|
||||
<!-- <el-input-->
|
||||
<!-- :disabled="DrawerType === 'see'"-->
|
||||
<!-- clearable-->
|
||||
<!-- v-model="addForm.unit"-->
|
||||
|
||||
<!-- placeholder="选择或输入起草单位">-->
|
||||
<!-- </el-input>-->
|
||||
<!-- </el-tooltip>-->
|
||||
<!-- <div v-else>-->
|
||||
<!-- <el-input-->
|
||||
<!-- :disabled="DrawerType === 'see'"-->
|
||||
<!-- clearable-->
|
||||
<!-- v-model="addForm.unit"-->
|
||||
<!-- placeholder="选择或输入起草单位">-->
|
||||
<!-- </el-input>-->
|
||||
<!-- </div>-->
|
||||
<!-- <div>-->
|
||||
<!-- <el-button-->
|
||||
<!-- :disabled="DrawerType === 'see'"-->
|
||||
<!-- size="mini"-->
|
||||
<!-- type="primary"-->
|
||||
<!-- @click="QCDWClick"-->
|
||||
<!-- class="common-button-primary">手动查找</el-button>-->
|
||||
<!-- </div>-->
|
||||
</div>
|
||||
</el-form-item>
|
||||
<el-form-item label="企业标准" style="width: 100%; margin-right:10px" class="add-form-item" prop="rqbJson" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
|
||||
<div style="display: flex;justify-content: space-between;align-items: center;">
|
||||
<el-input
|
||||
style="display: none;"
|
||||
v-model="addForm.rqbJson">
|
||||
</el-input>
|
||||
<el-input
|
||||
clearable
|
||||
v-model="addForm.rqbName"
|
||||
placeholder="请选择企业标准"
|
||||
readonly
|
||||
@click.native="choiceQYBZ(addForm.rqbJson)">
|
||||
</el-input>
|
||||
</div>
|
||||
</el-form-item>
|
||||
<el-form-item label="体系结构" style="width: 100%; margin-right:10px" class="add-form-item" prop="tsJson" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
|
||||
<div style="display: flex;justify-content: space-between;align-items: center;">
|
||||
<el-input
|
||||
style="display: none;"
|
||||
v-model="addForm.tsJson">
|
||||
</el-input>
|
||||
<el-input
|
||||
clearable
|
||||
v-model="addForm.tsJsonName"
|
||||
placeholder="请选择体系结构"
|
||||
readonly
|
||||
@click.native="choiceTXJG(addForm.tsJson)">
|
||||
</el-input>
|
||||
</div>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
@@ -361,6 +363,128 @@
|
||||
:nodeList="nodeListZRBM"
|
||||
@checkedRole="drawerCheckZRBM"
|
||||
/>
|
||||
<el-drawer
|
||||
title="选择企业标准"
|
||||
:visible.sync="QYBZmodal"
|
||||
size="900px"
|
||||
custom-class="demo-drawer"
|
||||
>
|
||||
<div class="standardForComments">
|
||||
<div class="content" style="height: 100%;">
|
||||
<!-- 顶部工具栏 -->
|
||||
<div class="search-area">
|
||||
<el-form :model="QYBZform" inline class="label-input-form">
|
||||
<el-formItem label="标准号" prop="numberName" class="search-item">
|
||||
<el-input v-model="QYBZform.standCode" clearable placeholder="根据标准号查找" :maxlength="100"/>
|
||||
</el-formItem>
|
||||
<el-formItem label="标准名称" prop="standName" class="search-item">
|
||||
<el-input v-model="QYBZform.standName" clearable placeholder="根据标准名称查找" :maxlength="100"/>
|
||||
</el-formItem>
|
||||
<el-formItem class="search-item btn-box">
|
||||
<el-button
|
||||
type="primary"
|
||||
size="mini"
|
||||
class="common-button-primary"
|
||||
|
||||
@click="QYBZget">查询
|
||||
</el-button>
|
||||
<el-button
|
||||
class="common-button-default"
|
||||
size="mini"
|
||||
@click="clearQYBZ">清空
|
||||
</el-button>
|
||||
</el-formItem>
|
||||
</el-form>
|
||||
</div>
|
||||
<div class="table-wrap" style="height: 100%;">
|
||||
<div style="position: absolute;height: calc(100% - 10px);width: 100%;">
|
||||
<el-table
|
||||
ref="selection"
|
||||
:data="QYBZList"
|
||||
tooltip-effect="dark"
|
||||
style="width: 100%;padding:0 0 20px 0;"
|
||||
height="100%"
|
||||
border
|
||||
@selection-change="handleSelectionQYBZ"
|
||||
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
|
||||
<el-table-column type="selection" width="55" align="center"/>
|
||||
<el-table-column
|
||||
label="企标编号"
|
||||
prop="standCode"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
show-overflow-tooltip
|
||||
prop="standName"
|
||||
label="中文名称"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="issueTime"
|
||||
label="发布日期"
|
||||
width="120"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
<span>{{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="putTime"
|
||||
label="实施日期"
|
||||
sortable
|
||||
width="120"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
<span>{{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="standStatusShow"
|
||||
label="文本状态"
|
||||
width="110"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
<span>{{scope.row.standStatusShow}}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</div>
|
||||
<pagination :page="QYBZform.page" :total="QYBZform.total" @pageChange="QYBZpageChange" @pageSizeChange="QYBZpageSizeChange"></pagination>
|
||||
<loading :loading="QYBZShow">数据加载中……</loading>
|
||||
</div>
|
||||
</div>
|
||||
<div class="demo-drawer-footer">
|
||||
<el-button size="mini" @click="QYBZcloseDrawer">取消</el-button>
|
||||
<el-button type="primary" size="mini" @click="QYBZenterDrawer">导入</el-button>
|
||||
</div>
|
||||
</div>
|
||||
</el-drawer>
|
||||
<el-drawer
|
||||
title="选择体系结构"
|
||||
:visible.sync="TXJGmodal"
|
||||
size="900px"
|
||||
custom-class="demo-drawer"
|
||||
>
|
||||
<div class="standardForComments">
|
||||
<div class="content" style="height: 100%;">
|
||||
<el-tree
|
||||
v-if="TXJGmodal"
|
||||
ref="TXJGTree"
|
||||
:data="standSystemOptions"
|
||||
show-checkbox
|
||||
node-key="id"
|
||||
default-expand-all
|
||||
check-strictly
|
||||
:default-checked-keys="TXJGList"
|
||||
:props="defaultProps">
|
||||
</el-tree>
|
||||
</div>
|
||||
<div class="demo-drawer-footer">
|
||||
<el-button size="mini" @click="TXJGcloseDrawer">取消</el-button>
|
||||
<el-button type="primary" size="mini" @click="TXJGenterDrawer">确定</el-button>
|
||||
</div>
|
||||
</div>
|
||||
</el-drawer>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
@@ -371,9 +495,28 @@
|
||||
components: {},
|
||||
data() {
|
||||
return {
|
||||
TXJGList: [],
|
||||
TXJGmodal: false,
|
||||
standSystemOptions: [],
|
||||
defaultProps: {
|
||||
children: 'children',
|
||||
label: 'menuName'
|
||||
},
|
||||
QYBZShow: false,
|
||||
QYBZList: [],
|
||||
modalshowflagZRBM: false,
|
||||
nodeListZRBM: [],
|
||||
|
||||
QYBZformSelect: [],
|
||||
QYBZmodal: false,
|
||||
QYBZform: {
|
||||
page: 1,
|
||||
pageSzie: this.$store.getters.userInfo.configContent,
|
||||
validFlag: '0',
|
||||
userId: this.$store.getters.userInfo.userId,
|
||||
standCode: '',
|
||||
standName: '',
|
||||
total: 0,
|
||||
},
|
||||
QCDWmodal: false,
|
||||
QCDWValue: [],
|
||||
QCDWList: [],
|
||||
@@ -390,6 +533,10 @@
|
||||
DrawerType: '',
|
||||
ids: [],
|
||||
addForm: {
|
||||
tsJson: '',
|
||||
tsJsonName: '',
|
||||
rqbJson: '',
|
||||
rqbName: '',
|
||||
unit: '', // 单位
|
||||
unitName: '',
|
||||
esName: '', // 企标名称
|
||||
@@ -450,6 +597,83 @@
|
||||
props: {},
|
||||
watch: {},
|
||||
methods: {
|
||||
TXJGcloseDrawer () {
|
||||
this.TXJGmodal = false
|
||||
},
|
||||
TXJGenterDrawer () {
|
||||
let list = this.$refs.TXJGTree.getCheckedNodes()
|
||||
let id = ''
|
||||
let name = ''
|
||||
list.map(item => {
|
||||
if (id.length > 0) {
|
||||
id += ','
|
||||
id += item.id
|
||||
name += ','
|
||||
name += item.menuName
|
||||
} else {
|
||||
id = item.id
|
||||
name = item.menuName
|
||||
}
|
||||
})
|
||||
this.addForm.tsJson = id
|
||||
this.addForm.tsJsonName = name
|
||||
this.TXJGmodal = false
|
||||
},
|
||||
choiceTXJG (id) {
|
||||
if (id) {
|
||||
this.TXJGList = id.split(',')
|
||||
} else {
|
||||
this.TXJGList = []
|
||||
}
|
||||
this.TXJGmodal = true
|
||||
},
|
||||
QYBZcloseDrawer () {
|
||||
this.clearQYBZ()
|
||||
},
|
||||
QYBZenterDrawer () {
|
||||
if (this.QYBZformSelect.length > 1) {
|
||||
this.$message.warning('请选择一条标准')
|
||||
} else if (this.QYBZformSelect.length < 1){
|
||||
this.$message.warning('请选择要带入的标准')
|
||||
} else {
|
||||
this.addForm.rqbJson = this.QYBZformSelect[0].id
|
||||
this.addForm.rqbName = this.QYBZformSelect[0].standName
|
||||
this.clearQYBZ()
|
||||
this.QYBZmodal = false
|
||||
}
|
||||
},
|
||||
handleSelectionQYBZ (val) {
|
||||
this.QYBZformSelect = val
|
||||
},
|
||||
QYBZpageChange (page) {
|
||||
this.QYBZform.page = page
|
||||
this.QYBZget()
|
||||
},
|
||||
QYBZpageSizeChange (pageSize) {
|
||||
this.QYBZform.pageSize = pageSize
|
||||
this.QYBZget()
|
||||
},
|
||||
QYBZget () {
|
||||
this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage', this.QYBZform, {
|
||||
_this: this, loading: 'QYBZShow'
|
||||
}, res => {
|
||||
this.QYBZList = res.data.list
|
||||
this.QYBZform.total = res.data.count
|
||||
}, e => {
|
||||
})
|
||||
},
|
||||
clearQYBZ () {
|
||||
this.QYBZform = {
|
||||
page: 1,
|
||||
standCode: '',
|
||||
standName: '',
|
||||
}
|
||||
},
|
||||
choiceQYBZ (id) {
|
||||
this.QYBZformSelect = []
|
||||
this.QYBZget()
|
||||
this.QYBZmodal = true
|
||||
},
|
||||
drawerCheckZRBM (data) {
|
||||
let list = ''
|
||||
let listName = ''
|
||||
@@ -718,6 +942,7 @@
|
||||
_this: this
|
||||
}, res => {
|
||||
this.QCDWList = res.data.QCDW // 起草单位
|
||||
this.standSystemOptions = res.data.TXLBBUSS // 体系结构
|
||||
}, e => {
|
||||
})
|
||||
},
|
||||
@@ -730,6 +955,36 @@
|
||||
#enterpriseStandardPlan {
|
||||
height: 100%;
|
||||
background: #fff;
|
||||
.standardForComments {
|
||||
height: calc(~'100% - 56px');
|
||||
background: #fff;
|
||||
flex-direction: column;
|
||||
.action-bar {
|
||||
margin-bottom: 5px;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
.content {
|
||||
flex: auto;
|
||||
overflow: hidden;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
|
||||
.table-wrap {
|
||||
flex: auto;
|
||||
overflow: hidden;
|
||||
position: relative;
|
||||
}
|
||||
}
|
||||
|
||||
& > .pagination {
|
||||
position: static;
|
||||
|
||||
/deep/ .pagination-slot {
|
||||
padding: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
/deep/.table-wrap {
|
||||
.el-table__fixed {
|
||||
height: calc(~'100% - 20px') !important;
|
||||
|
||||
Reference in New Issue
Block a user