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

Merge branch 'develop' into FOTON

Browse Source
This commit is contained in:
super_liu
2021-12-28 03:37:45 +08:00
parent e179416f2d fcf697514d
commit 13381fb8a3
10 changed files with 116 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/details/otherStandardDetails/index.vue
+12 -35
View File
@@ -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))
src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue
+4 -4
View File
@@ -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>
src/pages/processCenter/pages/creatProcess/bzdy/step1.vue
+12 -6
View File
@@ -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
src/pages/processCenter/pages/creatProcess/bzdy/step3.vue
+21 -18
View File
@@ -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', {
src/pages/processCenter/pages/creatProcess/bzdy/step4.vue
+6 -2
View File
@@ -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
},
src/pages/processCenter/pages/creatProcess/bzdy/step9.vue
+1 -1
View File
@@ -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>
src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue
+29 -13
View File
@@ -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
},
src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
+29 -13
View File
@@ -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
},
src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue
+1 -1
View File
@@ -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),
src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue
+1 -1
View File
@@ -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>