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:
yanyizhou
2021-12-28 09:57:54 +08:00
parent 3e8dc64dde fcf697514d
commit 7a91cfa9b8
12 changed files with 400 additions and 124 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 _this: this
}, res => { }, res => {
// displayLocation.map(item => { displayLocation.map(item => {
// if (item.value === '2URVBGR2Y4UG77KZ5YPL') { if (item.value === '2URVBGR2Y4UG77KZ5YPL') {
// item.child.forEach(items =>{ for (let key in res.data) {
// let accessCountry = JSON.parse(sessionStorage.getItem("accessCountry")); item.one.push({
// if (accessCountry.country === undefined) { attrName: key,
// accessCountry.country = '文本' value: res.data[key].join(','),
// } isShowImp: '0',
// if(items.attrField === 'SSRQ') { id: key
// 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
// })
// }
// }
// })
this.dynamicFormField = displayLocation this.dynamicFormField = displayLocation
}) })
sessionStorage.setItem('displayLocation', JSON.stringify(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-timeline-item timestamp="审定" placement="top" :color="roleForm.directorUser ? '#66b1ff' : ''">
<el-card> <el-card>
<el-form-item prop="directorUserName" style="margin-bottom: 0"> <el-form-item prop="directorUserName" style="margin-bottom: 0">
<h4>技术管理中心主任</h4> <h4>技术委员会相关专委会主任/研究总院职能部门领导，技术管理中心主任</h4>
<div style="margin-top: 10px;width: 300px;"> <div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.directorUser" style="display: none;"></el-input> <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> </div>
</el-form-item> </el-form-item>
</el-card> </el-card>
@@ -175,10 +175,10 @@
<el-timeline-item timestamp="批准人" placement="top" :color="roleForm.presidentUser ? '#66b1ff' : ''"> <el-timeline-item timestamp="批准人" placement="top" :color="roleForm.presidentUser ? '#66b1ff' : ''">
<el-card> <el-card>
<el-form-item prop="presidentUserName" style="margin-bottom: 0"> <el-form-item prop="presidentUserName" style="margin-bottom: 0">
<h4>工程研究总院院长</h4> <h4>工程研究总院院长或标准法规主管副院长</h4>
<div style="margin-top: 10px;width: 300px;"> <div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.presidentUser" style="display: none;"></el-input> <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> </div>
</el-form-item> </el-form-item>
</el-card> </el-card>
src/pages/processCenter/pages/creatProcess/bzdy/step1.vue
+11 -5
View File
@@ -35,6 +35,7 @@
<el-form-item label="完成时间" prop="date" class="add-form-item form-item-disabled"> <el-form-item label="完成时间" prop="date" class="add-form-item form-item-disabled">
<el-date-picker <el-date-picker
v-model="form.date" v-model="form.date"
:picker-options="pickerOptions"
type="date" type="date"
placeholder="请选择完成时间"> placeholder="请选择完成时间">
</el-date-picker> </el-date-picker>
@@ -164,11 +165,11 @@
<el-timeline-item timestamp="审定" placement="top" :color="roleForm.directorUser ? '#66b1ff' : ''"> <el-timeline-item timestamp="审定" placement="top" :color="roleForm.directorUser ? '#66b1ff' : ''">
<el-card> <el-card>
<el-form-item prop="directorUserName" style="margin-bottom: 0"> <el-form-item prop="directorUserName" style="margin-bottom: 0">
<h4>技术管理中心主任</h4> <h4>技术委员会相关专委会主任/研究总院职能部门领导，技术管理中心主任 </h4>
<div style="margin-top: 10px;width: 300px;"> <div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.directorUser" style="display: none;"></el-input> <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="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> </div>
</el-form-item> </el-form-item>
</el-card> </el-card>
@@ -176,10 +177,10 @@
<el-timeline-item timestamp="批准人" placement="top" :color="roleForm.presidentUser ? '#66b1ff' : ''"> <el-timeline-item timestamp="批准人" placement="top" :color="roleForm.presidentUser ? '#66b1ff' : ''">
<el-card> <el-card>
<el-form-item prop="presidentUserName" style="margin-bottom: 0"> <el-form-item prop="presidentUserName" style="margin-bottom: 0">
<h4>工程研究总院院长</h4> <h4>工程研究总院院长或标准法规主管副院长</h4>
<div style="margin-top: 10px;width: 300px;"> <div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.presidentUser" style="display: none;"></el-input> <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> </div>
</el-form-item> </el-form-item>
</el-card> </el-card>
@@ -263,6 +264,11 @@ export default {
name: "bzdyStep1", name: "bzdyStep1",
data() { data() {
return { return {
pickerOptions: {
disabledDate(time) {
return time.getTime() < Date.now() - 8.64e7;//如果没有后面的-8.64e7就是不可以选择今天的
}
},
drawerTitle2: '', drawerTitle2: '',
type2: '', type2: '',
bpnId: '', bpnId: '',
@@ -397,7 +403,7 @@ export default {
this.nodeList2 = this.roleForm.dockUserList.split(',') this.nodeList2 = this.roleForm.dockUserList.split(',')
} }
} else { } else {
this.drawerTitle2 = '选择技术管理中心主任' this.drawerTitle2 = '选择技术委员会相关专委会主任/研究总院职能部门领导，技术管理中心主任'
if ( this.roleForm.directorUser.length > 0) { if ( this.roleForm.directorUser.length > 0) {
this.nodeList2 = this.roleForm.directorUser.split(',') this.nodeList2 = this.roleForm.directorUser.split(',')
} }
src/pages/processCenter/pages/creatProcess/bzdy/step3.vue
+21 -18
View File
@@ -47,7 +47,7 @@
<span @click="clickButtonToUpload(item)">{{ item.name }}</span> <span @click="clickButtonToUpload(item)">{{ item.name }}</span>
<el-button <el-button
size="small" size="small"
@click="updateFile(item)" @click="updateFile2(item)"
icon="el-icon-download" icon="el-icon-download"
style="height: 32px; margin-left: 5px;" style="height: 32px; margin-left: 5px;"
></el-button> ></el-button>
@@ -63,7 +63,7 @@
<span @click="clickButtonToUpload(item)">{{ item.name }}</span> <span @click="clickButtonToUpload(item)">{{ item.name }}</span>
<el-button <el-button
size="small" size="small"
@click="updateFile(item)" @click="updateFile2(item)"
icon="el-icon-download" icon="el-icon-download"
style="height: 32px; margin-left: 5px;" style="height: 32px; margin-left: 5px;"
></el-button> ></el-button>
@@ -127,19 +127,19 @@
</div> </div>
</el-form> </el-form>
</div> </div>
<el-collapse accordion> <!-- <el-collapse accordion>-->
<el-collapse-item title="回执说明"> <!-- <el-collapse-item title="回执说明">-->
<div style="margin: 10px 0;"> <!-- <div style="margin: 10px 0;">-->
<el-input <!-- <el-input-->
type="textarea" <!-- type="textarea"-->
:rows="3" <!-- :rows="3"-->
resize="none" <!-- resize="none"-->
placeholder="请输入意见" <!-- placeholder="请输入意见"-->
v-model="commentText"> <!-- v-model="commentText">-->
</el-input> <!-- </el-input>-->
</div> <!-- </div>-->
</el-collapse-item> <!-- </el-collapse-item>-->
</el-collapse> <!-- </el-collapse>-->
</div> </div>
<div class="content" v-show="active === '2'"> <div class="content" v-show="active === '2'">
<el-table <el-table
@@ -346,6 +346,10 @@
updateFile (item) { updateFile (item) {
window.location.href = '/api/att/attFile/downloadFile?fileId=' + item.fileId 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) { beginImportFile (file) {
var filename = file.name var filename = file.name
@@ -385,7 +389,6 @@
} }
}, },
fileUpload () { fileUpload () {
this.fileMadel = true this.fileMadel = true
}, },
handleTabs(name) { handleTabs(name) {
@@ -397,7 +400,7 @@
_formData.append('taskIds', this.taskIds) _formData.append('taskIds', this.taskIds)
_formData.append('json', JSON.stringify({ _formData.append('json', JSON.stringify({
form: this.form, form: this.form,
commentText: this.commentText, // commentText: this.commentText,
})) }))
saveTaskForPub(_formData).then(res => { saveTaskForPub(_formData).then(res => {
this.saveLoading = false this.saveLoading = false
@@ -425,7 +428,7 @@
this.json.dyhz = this.form.dyhz this.json.dyhz = this.form.dyhz
this.isSubmit = true this.isSubmit = true
var json = this.json var json = this.json
json.commentText = this.commentText // json.commentText = this.commentText
json.fileId = this.form.fileId json.fileId = this.form.fileId
json.fileName = this.form.fileName json.fileName = this.form.fileName
this.$http.post('lawss/activiti/completeTask', { 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> <span @click="clickButtonToUpload(item)">{{ item.name }}</span>
<el-button <el-button
size="small" size="small"
@click="updateFile(item)" @click="updateFile2(item)"
icon="el-icon-download" icon="el-icon-download"
style="height: 32px; margin-left: 5px;" style="height: 32px; margin-left: 5px;"
></el-button> ></el-button>
@@ -63,7 +63,7 @@
<span @click="clickButtonToUpload(item)">{{ item.name }}</span> <span @click="clickButtonToUpload(item)">{{ item.name }}</span>
<el-button <el-button
size="small" size="small"
@click="updateFile(item)" @click="updateFile2(item)"
icon="el-icon-download" icon="el-icon-download"
style="height: 32px; margin-left: 5px;" style="height: 32px; margin-left: 5px;"
></el-button> ></el-button>
@@ -322,6 +322,10 @@
updateFile (fileId) { updateFile (fileId) {
window.location.href = '/api/att/attFile/downloadFile?fileId=' + 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) { handleTabs(name) {
this.active = name this.active = name
}, },
src/pages/processCenter/pages/creatProcess/bzdy/step9.vue
+1 -1
View File
@@ -3,7 +3,7 @@
<!-- 标准调研流程--> <!-- 标准调研流程-->
<ProcessHeader toggle> <ProcessHeader toggle>
<template slot="proName">标准调研流程</template> <template slot="proName">标准调研流程</template>
<template slot="proNode">工程研究总院院长审批</template> <template slot="proNode">工程研究总院院长或标准法规主管副院长审批</template>
</ProcessHeader> </ProcessHeader>
<div class="headerTabs"> <div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div> <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue
+27 -11
View File
@@ -137,7 +137,7 @@
<el-input <el-input
v-model="roleForm.dockUserListName" v-model="roleForm.dockUserListName"
placeholder="选择责任部门对接人" placeholder="选择责任部门对接人"
@click.native="choiceZRRS"> @click.native="choiceZRRS('1')">
</el-input> </el-input>
</div> </div>
</el-form-item> </el-form-item>
@@ -161,13 +161,13 @@
<el-timeline-item timestamp="审定征求意见" placement="top" :color="roleForm.directorUser ? '#66b1ff' : ''"> <el-timeline-item timestamp="审定征求意见" placement="top" :color="roleForm.directorUser ? '#66b1ff' : ''">
<el-card> <el-card>
<el-form-item prop="directorUser" style="margin-bottom: 0"> <el-form-item prop="directorUser" style="margin-bottom: 0">
<h4>技术管理中心主任</h4> <h4>技术委员会相关专委会主任/研究总院职能部门领导，技术管理中心主任</h4>
<div style="margin-top: 10px;width: 300px;"> <div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.directorUser" style="display: none;"/> <el-input v-model="roleForm.directorUser" style="display: none;"/>
<el-input <el-input
v-model="roleForm.directorUserName" v-model="roleForm.directorUserName"
placeholder="选择技术管理中心主任" placeholder="选择技术委员会相关专委会主任/研究总院职能部门领导，技术管理中心主任"
@click.native="choiceZRR('directorUser', '选择技术管理中心主任', roleForm.directorUser)" @click.native="choiceZRRS('2')"
/> />
</div> </div>
</el-form-item> </el-form-item>
@@ -176,13 +176,13 @@
<el-timeline-item timestamp="批准征求意见" placement="top" :color="roleForm.presidentUser ? '#66b1ff' : ''"> <el-timeline-item timestamp="批准征求意见" placement="top" :color="roleForm.presidentUser ? '#66b1ff' : ''">
<el-card> <el-card>
<el-form-item prop="presidentUser" style="margin-bottom: 0"> <el-form-item prop="presidentUser" style="margin-bottom: 0">
<h4>工程研究总院院长</h4> <h4>工程研究总院院长或标准法规主管副院长</h4>
<div style="margin-top: 10px;width: 300px;"> <div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.presidentUser" style="display: none;"/> <el-input v-model="roleForm.presidentUser" style="display: none;"/>
<el-input <el-input
v-model="roleForm.presidentUserName" v-model="roleForm.presidentUserName"
placeholder="选择工程研究总院院长" placeholder="选择工程研究总院院长或标准法规主管副院长"
@click.native="choiceZRR('presidentUser', '选择工程研究总院院长', roleForm.presidentUser)" @click.native="choiceZRR('presidentUser', '选择工程研究总院院长或标准法规主管副院长', roleForm.presidentUser)"
/> />
</div> </div>
</el-form-item> </el-form-item>
@@ -287,7 +287,7 @@
</div> </div>
</el-drawer> </el-drawer>
<Role-tree <Role-tree
is-title="选择责任部门对接人" :is-title="drawerTitle2"
:is-visible.sync="modalshowflag2" :is-visible.sync="modalshowflag2"
@checkedRole="checkedRole2" @checkedRole="checkedRole2"
:nodeList="nodeList2" :nodeList="nodeList2"
@@ -365,6 +365,8 @@ export default {
name: "bzzqyjStep1-1", name: "bzzqyjStep1-1",
data() { data() {
return { return {
drawerTitle2: '',
type2: '',
activeNames: '1', activeNames: '1',
fileUrl: 'api/att/attFile/upload', fileUrl: 'api/att/attFile/upload',
fileMadel: false, fileMadel: false,
@@ -738,8 +740,13 @@ export default {
idList += item.id idList += item.id
nameList += item.name nameList += item.name
}) })
if (this.type2 === '1') {
this.roleForm.dockUserList = idList this.roleForm.dockUserList = idList
this.roleForm.dockUserListName = nameList this.roleForm.dockUserName = nameList
} else {
this.roleForm.directorUser = idList
this.roleForm.directorUserName = nameList
}
}, },
checkedRole(data) { checkedRole(data) {
if (this.type === 'ministerUser') { if (this.type === 'ministerUser') {
@@ -753,11 +760,20 @@ export default {
this.roleForm.presidentUserName = data[0].name this.roleForm.presidentUserName = data[0].name
} }
}, },
choiceZRRS() { choiceZRRS(type) {
this.type2 = type
this.nodeList2 = [] this.nodeList2 = []
if (this.roleForm.dockUserList.length > 0) { if (type === '1') {
this.drawerTitle2 = '选择责任部门对接人'
if ( this.roleForm.dockUserList.length > 0) {
this.nodeList2 = this.roleForm.dockUserList.split(',') this.nodeList2 = this.roleForm.dockUserList.split(',')
} }
} else {
this.drawerTitle2 = '选择技术委员会相关专委会主任/研究总院职能部门领导，技术管理中心主任'
if (this.roleForm.directorUser.length > 0) {
this.nodeList2 = this.roleForm.directorUser.split(',')
}
}
this.modalshowflag2 = true this.modalshowflag2 = true
}, },
choiceZRR(type, title, id) { choiceZRR(type, title, id) {
src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
+27 -11
View File
@@ -138,7 +138,7 @@
<el-input <el-input
v-model="roleForm.dockUserListName" v-model="roleForm.dockUserListName"
placeholder="选择责任部门对接人" placeholder="选择责任部门对接人"
@click.native="choiceZRRS"> @click.native="choiceZRRS('1')">
</el-input> </el-input>
</div> </div>
</el-form-item> </el-form-item>
@@ -162,13 +162,13 @@
<el-timeline-item timestamp="审定征求意见" placement="top" :color="roleForm.directorUser ? '#66b1ff' : ''"> <el-timeline-item timestamp="审定征求意见" placement="top" :color="roleForm.directorUser ? '#66b1ff' : ''">
<el-card> <el-card>
<el-form-item prop="directorUser" style="margin-bottom: 0"> <el-form-item prop="directorUser" style="margin-bottom: 0">
<h4>技术管理中心主任</h4> <h4>技术委员会相关专委会主任/研究总院职能部门领导，技术管理中心主任</h4>
<div style="margin-top: 10px;width: 300px;"> <div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.directorUser" style="display: none;"/> <el-input v-model="roleForm.directorUser" style="display: none;"/>
<el-input <el-input
v-model="roleForm.directorUserName" v-model="roleForm.directorUserName"
placeholder="选择技术管理中心主任" placeholder="选择技术委员会相关专委会主任/研究总院职能部门领导，技术管理中心主任"
@click.native="choiceZRR('directorUser', '选择技术管理中心主任', roleForm.directorUser)" @click.native="choiceZRRS('2')"
/> />
</div> </div>
</el-form-item> </el-form-item>
@@ -177,13 +177,13 @@
<el-timeline-item timestamp="批准征求意见" placement="top" :color="roleForm.presidentUser ? '#66b1ff' : ''"> <el-timeline-item timestamp="批准征求意见" placement="top" :color="roleForm.presidentUser ? '#66b1ff' : ''">
<el-card> <el-card>
<el-form-item prop="presidentUser" style="margin-bottom: 0"> <el-form-item prop="presidentUser" style="margin-bottom: 0">
<h4>工程研究总院院长</h4> <h4>工程研究总院院长或标准法规主管副院长</h4>
<div style="margin-top: 10px;width: 300px;"> <div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.presidentUser" style="display: none;"/> <el-input v-model="roleForm.presidentUser" style="display: none;"/>
<el-input <el-input
v-model="roleForm.presidentUserName" v-model="roleForm.presidentUserName"
placeholder="选择工程研究总院院长" placeholder="选择工程研究总院院长或标准法规主管副院长"
@click.native="choiceZRR('presidentUser', '选择工程研究总院院长', roleForm.presidentUser)" @click.native="choiceZRR('presidentUser', '选择工程研究总院院长或标准法规主管副院长', roleForm.presidentUser)"
/> />
</div> </div>
</el-form-item> </el-form-item>
@@ -289,7 +289,7 @@
</div> </div>
</el-drawer> </el-drawer>
<Role-tree <Role-tree
is-title="选择责任部门对接人" :is-title="drawerTitle2"
:is-visible.sync="modalshowflag2" :is-visible.sync="modalshowflag2"
@checkedRole="checkedRole2" @checkedRole="checkedRole2"
:nodeList="nodeList2" :nodeList="nodeList2"
@@ -375,6 +375,8 @@ export default {
name: "bzzqyjStep1", name: "bzzqyjStep1",
data() { data() {
return { return {
drawerTitle2: '',
type2: '',
pickerOptions: { pickerOptions: {
disabledDate(time) { disabledDate(time) {
return time.getTime() < Date.now() - 8.64e7;//如果没有后面的-8.64e7就是不可以选择今天的 return time.getTime() < Date.now() - 8.64e7;//如果没有后面的-8.64e7就是不可以选择今天的
@@ -745,8 +747,13 @@ export default {
idList += item.id idList += item.id
nameList += item.name nameList += item.name
}) })
if (this.type2 === '1') {
this.roleForm.dockUserList = idList this.roleForm.dockUserList = idList
this.roleForm.dockUserListName = nameList this.roleForm.dockUserName = nameList
} else {
this.roleForm.directorUser = idList
this.roleForm.directorUserName = nameList
}
}, },
checkedRole(data) { checkedRole(data) {
if (this.type === 'ministerUser') { if (this.type === 'ministerUser') {
@@ -760,11 +767,20 @@ export default {
this.roleForm.presidentUserName = data[0].name this.roleForm.presidentUserName = data[0].name
} }
}, },
choiceZRRS() { choiceZRRS(type) {
this.type2 = type
this.nodeList2 = [] this.nodeList2 = []
if (this.roleForm.dockUserList.length > 0) { if (type === '1') {
this.drawerTitle2 = '选择责任部门对接人'
if ( this.roleForm.dockUserList.length > 0) {
this.nodeList2 = this.roleForm.dockUserList.split(',') this.nodeList2 = this.roleForm.dockUserList.split(',')
} }
} else {
this.drawerTitle2 = '选择技术委员会相关专委会主任/研究总院职能部门领导，技术管理中心主任'
if (this.roleForm.directorUser.length > 0) {
this.nodeList2 = this.roleForm.directorUser.split(',')
}
}
this.modalshowflag2 = true this.modalshowflag2 = true
}, },
choiceZRR(type, title, id) { choiceZRR(type, title, id) {
src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue
+1 -1
View File
@@ -464,7 +464,7 @@ export default {
if (this.commentText) { if (this.commentText) {
this.isSubmit = true this.isSubmit = true
var json = this.json var json = this.json
json.directorFlag = '0' json.directorFlag = '1'
json.commentText = this.commentText json.commentText = this.commentText
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json), json: JSON.stringify(json),
src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue
+1 -1
View File
@@ -3,7 +3,7 @@
<!-- 标准调研流程--> <!-- 标准调研流程-->
<ProcessHeader toggle> <ProcessHeader toggle>
<template slot="proName">标准征求意见流程</template> <template slot="proName">标准征求意见流程</template>
<template slot="proNode">工程研究总院院长批准</template> <template slot="proNode">工程研究总院院长或标准法规主管副院长</template>
</ProcessHeader> </ProcessHeader>
<div class="headerTabs"> <div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div> <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
-1
View File
@@ -4566,7 +4566,6 @@ export default {
this.standNatureOptions = res.data.SARPROPERTY // 标准性质 this.standNatureOptions = res.data.SARPROPERTY // 标准性质
this.standStateOptions = res.data.TEXTSTATUSBUSS // 文本状态 this.standStateOptions = res.data.TEXTSTATUSBUSS // 文本状态
this.standSystemOptions = res.data.TXLBBUSS // 标准体系 this.standSystemOptions = res.data.TXLBBUSS // 标准体系
console.log(this.standSystemOptions);
this.applyArcticOptions.options = res.data.ENERGYTYPES // 适用车型 this.applyArcticOptions.options = res.data.ENERGYTYPES // 适用车型
this.categoryOptions.options = res.data.NYLXCLASS // 能源类型 this.categoryOptions.options = res.data.NYLXCLASS // 能源类型
this.applyAuthOptions.options = res.data.SYRZCLASS // 适用认证 this.applyAuthOptions.options = res.data.SYRZCLASS // 适用认证
src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
+284 -29
View File
@@ -263,40 +263,42 @@
v-model="addForm.unit"> v-model="addForm.unit">
</el-input> </el-input>
<el-input <el-input
:key="addForm.unit"
:config="addForm"
clearable clearable
v-model="addForm.unitName" v-model="addForm.unitName"
placeholder="请选择起草责任单位" placeholder="请选择起草责任单位"
readonly readonly
@click.native="choiceZRBM(addForm.unit)"> @click.native="choiceZRBM(addForm.unit)">
</el-input> </el-input>
</div>
<!-- <el-tooltip v-if="addForm.unit" class="item" effect="dark" :content="addForm.unit" placement="top-start">--> </el-form-item>
<!-- <el-input--> <el-form-item label="企业标准" style="width: 100%; margin-right:10px" class="add-form-item" prop="rqbJson" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<!-- :disabled="DrawerType === 'see'"--> <div style="display: flex;justify-content: space-between;align-items: center;">
<!-- clearable--> <el-input
<!-- v-model="addForm.unit"--> style="display: none;"
v-model="addForm.rqbJson">
<!-- placeholder="选择或输入起草单位">--> </el-input>
<!-- </el-input>--> <el-input
<!-- </el-tooltip>--> clearable
<!-- <div v-else>--> v-model="addForm.rqbName"
<!-- <el-input--> placeholder="请选择企业标准"
<!-- :disabled="DrawerType === 'see'"--> readonly
<!-- clearable--> @click.native="choiceQYBZ(addForm.rqbJson)">
<!-- v-model="addForm.unit"--> </el-input>
<!-- placeholder="选择或输入起草单位">--> </div>
<!-- </el-input>--> </el-form-item>
<!-- </div>--> <el-form-item label="体系结构" style="width: 100%; margin-right:10px" class="add-form-item" prop="tsJson" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<!-- <div>--> <div style="display: flex;justify-content: space-between;align-items: center;">
<!-- <el-button--> <el-input
<!-- :disabled="DrawerType === 'see'"--> style="display: none;"
<!-- size="mini"--> v-model="addForm.tsJson">
<!-- type="primary"--> </el-input>
<!-- @click="QCDWClick"--> <el-input
<!-- class="common-button-primary">手动查找</el-button>--> clearable
<!-- </div>--> v-model="addForm.tsJsonName"
placeholder="请选择体系结构"
readonly
@click.native="choiceTXJG(addForm.tsJson)">
</el-input>
</div> </div>
</el-form-item> </el-form-item>
</el-form> </el-form>
@@ -361,6 +363,128 @@
:nodeList="nodeListZRBM" :nodeList="nodeListZRBM"
@checkedRole="drawerCheckZRBM" @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>
</div> </div>
</template> </template>
@@ -371,9 +495,28 @@
components: {}, components: {},
data() { data() {
return { return {
TXJGList: [],
TXJGmodal: false,
standSystemOptions: [],
defaultProps: {
children: 'children',
label: 'menuName'
},
QYBZShow: false,
QYBZList: [],
modalshowflagZRBM: false, modalshowflagZRBM: false,
nodeListZRBM: [], 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, QCDWmodal: false,
QCDWValue: [], QCDWValue: [],
QCDWList: [], QCDWList: [],
@@ -390,6 +533,10 @@
DrawerType: '', DrawerType: '',
ids: [], ids: [],
addForm: { addForm: {
tsJson: '',
tsJsonName: '',
rqbJson: '',
rqbName: '',
unit: '', // 单位 unit: '', // 单位
unitName: '', unitName: '',
esName: '', // 企标名称 esName: '', // 企标名称
@@ -450,6 +597,83 @@
props: {}, props: {},
watch: {}, watch: {},
methods: { 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) { drawerCheckZRBM (data) {
let list = '' let list = ''
let listName = '' let listName = ''
@@ -718,6 +942,7 @@
_this: this _this: this
}, res => { }, res => {
this.QCDWList = res.data.QCDW // 起草单位 this.QCDWList = res.data.QCDW // 起草单位
this.standSystemOptions = res.data.TXLBBUSS // 体系结构
}, e => { }, e => {
}) })
}, },
@@ -730,6 +955,36 @@
#enterpriseStandardPlan { #enterpriseStandardPlan {
height: 100%; height: 100%;
background: #fff; 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 { /deep/.table-wrap {
.el-table__fixed { .el-table__fixed {
height: calc(~'100% - 20px') !important; height: calc(~'100% - 20px') !important;