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
2022-02-07 18:03:55 +08:00
parent f2bcb423e1 e15e9574a8
commit 3fa90f37d5
14 changed files with 356 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/details/otherBussStandardDetails/index.vue
+148 -5
View File
@@ -23,9 +23,9 @@
style="border-top:none;position: absolute;right: 36px;"> style="border-top:none;position: absolute;right: 36px;">
<div class="modular-header" style="height: 50px;"> <div class="modular-header" style="height: 50px;">
<div class="modular-header-btn"> <div class="modular-header-btn">
<el-button type="warning" icon="el-icon-edit" @click="businessCommentDialog = true">企标评价</el-button> <el-button type="warning" icon="el-icon-edit" @click="qbBtn">企标评价</el-button>
<el-dialog title="企业标准评价" :visible.sync="businessCommentDialog" :width="(commentAverageScoreTag === '1' && commentActiveName !== 'dynamicComment')?'90%':'65%'" :close-on-click-modal="false"> <el-dialog title="企业标准评价" :visible.sync="businessCommentDialog" :width="(commentAverageScoreTag === '1' && commentActiveName !== 'dynamicComment')?'90%':'65%'" :close-on-click-modal="false">
<el-tabs v-model="commentActiveName" @tab-click="tabsClick"> <el-tabs v-model="commentActiveName" @tab-click="tabsClickBtn">
<el-tab-pane label="动态评价" name="dynamicComment"> <el-tab-pane label="动态评价" name="dynamicComment">
<el-table ref="businessCommentTable" :data="businessCommentTable.filter((v) => v.code !== '3U9lb')" border style="width: 100%; flex: auto;margin-bottom: 2%" <el-table ref="businessCommentTable" :data="businessCommentTable.filter((v) => v.code !== '3U9lb')" border style="width: 100%; flex: auto;margin-bottom: 2%"
class="comment-table" class="comment-table"
@@ -52,7 +52,7 @@
allow-half> allow-half>
</el-rate> </el-rate>
</el-col> </el-col>
<b style="margin-left: 5px;font-size: 12px;color: #ff9900">{{ scope.row.targetScore * 2 }}</b> <b style="margin-top: 5px;margin-left: -2%;color: #ff9900">{{ scope.row.targetScore * 2 }}</b>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column property="reason" label="简述理由"> <el-table-column property="reason" label="简述理由">
@@ -1585,11 +1585,98 @@ export default {
}) })
} }
},
tabsClickBtn(tab, event){
if (this.commentActiveName === 'dynamicComment'){
this.indexType = 'dynamic'
//查询评分表
const allData = {
lawId: this.$route.params.id,
userId: this.qualityFirstHistoryPeopleId,
evaluationType: this.indexType,
}
this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getEvaluationForm', allData , {
_this: this
}, res => {
this.qualityHistoryCommentTable = res.data
this.historyInfoLoading = false
}, e => {
this.historyInfoLoading = false
})
}
else if (this.commentActiveName === 'historyComment'){
this.historyInfoLoading = true
this.indexType = 'quality'
//查询评分表
const allData = {
lawId: this.$route.params.id,
userId: this.dynamicFirstHistoryPeopleId,
evaluationType: this.indexType
}
this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getEvaluationForm', allData , {
_this: this
}, res => {
this.dynamicHistoryCommentTable = res.data
this.historyCommentForm.revise = res.data[0].targetScore
this.historyCommentForm.reviseReason = res.data[0].commentReason
let averageScore = 0
res.data.forEach(item => {
if (item.valueType === 'number'){
averageScore += parseInt(item.targetScore)
}
})
averageScore = averageScore / 4
this.historyCommentForm.averageScore = averageScore
this.historyInfoLoading = false
}, e => {
this.historyInfoLoading = false
})
}
//查询动态评价总平均分和质量评价总平均分
let standId = this.$route.params.id
this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getScore', {lawId:standId}, {
_this: this
}, res => {
this.qualityCommentScore = res.data.quality.toFixed(3)/2
this.dynamicCommentScore = res.data.dynamic.toFixed(3)/2
}, e => {
})
// 刷新质量评价评分人表格和动态评价评分人表格
const qualityRequest = {
lawId: standId,
evaluationType: 'quality'
}
this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getHistory', qualityRequest, {
_this: this
}, res => {
this.qualityHistoryPeopleTable = res.data.records
this.qualityFirstHistoryPeopleId = res.data.records[0].userId
}, e => {
})
const dynamicRequest = {
lawId: standId,
evaluationType: 'dynamic'
}
this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getHistory', dynamicRequest, {
_this: this
}, res => {
this.dynamicHistoryPeopleTable = res.data.records
this.dynamicFirstHistoryPeopleId = res.data.records[0].userId
}, e => {
})
}, },
tabsClick(tab, event){ tabsClick(tab, event){
this.historyInfoLoading = true this.historyInfoLoading = true
if (this.commentAverageScoreTag === '1'){ if (this.commentAverageScoreTag === '1'){
this.indexType = 'quality' this.indexType = 'quality'
//查询评分表 //查询评分表
const allData = { const allData = {
lawId: this.$route.params.id, lawId: this.$route.params.id,
@@ -2857,7 +2944,63 @@ export default {
let value2 = b[property] let value2 = b[property]
return value1 - value2 return value1 - value2
} }
} },
qbBtn() {
if (this.commentActiveName === 'dynamicComment'){
this.indexType = 'dynamic'
//查询评分表
const allData = {
lawId: this.$route.params.id,
userId: this.qualityFirstHistoryPeopleId,
evaluationType: this.indexType,
}
this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getEvaluationForm', allData , {
_this: this
}, res => {
let averageScore = 0
res.data.forEach(item=>{
item.targetScore = Number(item.targetScore)/2
averageScore += item.targetScore
})
this.businessCommentForm.averageScore = averageScore/4
this.businessCommentTable = res.data
this.historyInfoLoading = false
}, e => {
this.historyInfoLoading = false
})
}
else if (this.commentActiveName === 'historyComment'){
this.indexType = 'quality'
//查询评分表
const allData = {
lawId: this.$route.params.id,
userId: this.dynamicFirstHistoryPeopleId,
evaluationType: this.indexType
}
this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getEvaluationForm', allData , {
_this: this
}, res => {
this.dynamicHistoryCommentTable = res.data
this.historyCommentForm.revise = res.data[0].targetScore
this.historyCommentForm.reviseReason = res.data[0].commentReason
let averageScore = 0
res.data.forEach(item => {
if (item.valueType === 'number'){
averageScore += parseInt(item.targetScore)
}
})
averageScore = averageScore / 4
this.historyCommentForm.averageScore = averageScore
this.historyInfoLoading = false
}, e => {
this.historyInfoLoading = false
})
}
this.businessCommentDialog = true
},
}, },
computed: { computed: {
titleShow () { titleShow () {
src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue
+12 -11
View File
@@ -128,13 +128,13 @@
:model="roleForm" :model="roleForm"
:rules="roleFormRules" :rules="roleFormRules"
class="label-input-form myForm"> class="label-input-form myForm">
<el-timeline-item timestamp="发起流程" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''"> <el-timeline-item timestamp="起草" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
<el-card> <el-card>
<el-form-item prop="startUserName" style="margin-bottom: 0"> <el-form-item prop="startUserName" 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.startUser" style="display: none;"></el-input> <el-input v-model="roleForm.startUser" style="display: none;"></el-input>
<el-input v-model="roleForm.startUserName" placeholder="流程发起人" disabled></el-input> <el-input v-model="roleForm.startUserName" placeholder="标准法规工程师" disabled></el-input>
</div> </div>
</el-form-item> </el-form-item>
</el-card> </el-card>
@@ -145,7 +145,7 @@
<h4>责任部门对接人</h4> <h4>责任部门对接人</h4>
<div style="margin-top: 10px;width: 300px;"> <div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.dockUserList" style="display: none;"></el-input> <el-input v-model="roleForm.dockUserList" style="display: none;"></el-input>
<el-input v-model="roleForm.dockUserName" placeholder="选择责任人" @click.native="choiceZRRS('1')"> <el-input v-model="roleForm.dockUserName" :title="roleForm.dockUserName" placeholder="选择责任部门对接人" readonly="readonly" @click.native="choiceZRRS('1')">
</el-input> </el-input>
</div> </div>
</el-form-item> </el-form-item>
@@ -157,7 +157,7 @@
<h4>标准法规部部长</h4> <h4>标准法规部部长</h4>
<div style="margin-top: 10px;width: 300px;"> <div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.ministerUser" style="display: none;"></el-input> <el-input v-model="roleForm.ministerUser" style="display: none;"></el-input>
<el-input v-model="roleForm.ministerUserName" placeholder="选择标准法规部部长" @click.native="choiceZRR('ministerUser', '选择标准法规部部长', roleForm.ministerUser)"></el-input> <el-input v-model="roleForm.ministerUserName" placeholder="选择标准法规部部长" readonly="readonly" @click.native="choiceZRR('ministerUser', '选择标准法规部部长', roleForm.ministerUser)"></el-input>
</div> </div>
</el-form-item> </el-form-item>
</el-card> </el-card>
@@ -165,21 +165,22 @@
<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="选择技术管理中心主任" 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>
</div> </div>
</el-form-item> </el-form-item>
</el-card> </el-card>
</el-timeline-item> </el-timeline-item>
<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="选择工程研究总院院长/标准法规业务主管副院长" readonly="readonly" @click.native="choiceZRR('presidentUser', '选择工程研究总院院长/标准法规业务主管副院长', roleForm.presidentUser)"></el-input>
</div> </div>
</el-form-item> </el-form-item>
</el-card> </el-card>
@@ -417,7 +418,7 @@
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/step1.vue
+9 -9
View File
@@ -128,13 +128,13 @@
:model="roleForm" :model="roleForm"
:rules="roleFormRules" :rules="roleFormRules"
class="label-input-form myForm"> class="label-input-form myForm">
<el-timeline-item timestamp="发起流程" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''"> <el-timeline-item timestamp="起草" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
<el-card> <el-card>
<el-form-item prop="startUserName" style="margin-bottom: 0"> <el-form-item prop="startUserName" 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.startUser" style="display: none;"></el-input> <el-input v-model="roleForm.startUser" style="display: none;"></el-input>
<el-input v-model="roleForm.startUserName" placeholder="流程发起人" disabled></el-input> <el-input v-model="roleForm.startUserName" placeholder="标准法规工程师" disabled></el-input>
</div> </div>
</el-form-item> </el-form-item>
</el-card> </el-card>
@@ -165,22 +165,22 @@
<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>
</el-timeline-item> </el-timeline-item>
<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>
@@ -408,7 +408,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/bzjd/step1.vue
+2 -2
View File
@@ -220,10 +220,10 @@
<el-timeline-item timestamp="起草" placement="top" :color="roleForm.applyUserId ? '#66b1ff' : ''"> <el-timeline-item timestamp="起草" placement="top" :color="roleForm.applyUserId ? '#66b1ff' : ''">
<el-card> <el-card>
<el-form-item prop="applyUserId" style="margin-bottom: 0"> <el-form-item prop="applyUserId" 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.applyUserId" style="display: none;"/> <el-input v-model="roleForm.applyUserId" style="display: none;"/>
<el-input v-model="roleForm.applyUserIdName" placeholder="流程发起人" disabled/> <el-input v-model="roleForm.applyUserIdName" placeholder="标准法规工程师" disabled/>
</div> </div>
</el-form-item> </el-form-item>
</el-card> </el-card>
src/pages/processCenter/pages/creatProcess/bzpg/step1.vue
+36 -17
View File
@@ -200,7 +200,7 @@
<h4>标准法规工程师</h4> <h4>标准法规工程师</h4>
<div style="margin-top: 10px;width: 300px;"> <div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.startUser" style="display: none;"></el-input> <el-input v-model="roleForm.startUser" style="display: none;"></el-input>
<el-input v-model="roleForm.startUserName" placeholder="流程发起人" disabled></el-input> <el-input v-model="roleForm.startUserName" placeholder="标准法规工程师" disabled></el-input>
</div> </div>
</el-form-item> </el-form-item>
</el-card> </el-card>
@@ -208,11 +208,11 @@
<el-timeline-item timestamp="审核" placement="top" :color="roleForm.dockUser ? '#66b1ff' : ''"> <el-timeline-item timestamp="审核" placement="top" :color="roleForm.dockUser ? '#66b1ff' : ''">
<el-card> <el-card>
<el-form-item prop="dockUserName" style="margin-bottom: 0"> <el-form-item prop="dockUserName" 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.dockUser" style="display: none;"></el-input> <el-input v-model="roleForm.dockUser" style="display: none;"></el-input>
<el-input v-model="roleForm.dockUserName" placeholder="选择业务经理" <el-input v-model="roleForm.dockUserName" placeholder="选择标准法规部法规分析业务经理"
@click.native="choiceZRR(null,'dockUser', '选择业务经理', roleForm.dockUser)"> @click.native="choiceZRR(null,'dockUser', '选择标准法规部法规分析业务经理', roleForm.dockUser)">
</el-input> </el-input>
</div> </div>
</el-form-item> </el-form-item>
@@ -221,11 +221,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="ministerUserName" style="margin-bottom: 0"> <el-form-item prop="ministerUserName" 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.ministerUser" style="display: none;"></el-input> <el-input v-model="roleForm.ministerUser" style="display: none;"></el-input>
<el-input v-model="roleForm.ministerUserName" placeholder="请选择标准法规部领导" <el-input v-model="roleForm.ministerUserName" placeholder="选择标准法规部高级经理"
@click.native="choiceZRR(null,'ministerUser', '选择标准法规部领导', roleForm.ministerUser)"></el-input> @click.native="choiceZRR(null,'ministerUser', '选择标准法规部高级经理', roleForm.ministerUser)"></el-input>
</div> </div>
</el-form-item> </el-form-item>
</el-card> </el-card>
@@ -918,22 +918,34 @@ export default {
if (valid) { if (valid) {
this.$refs["roleForm"].validate((valid) => { this.$refs["roleForm"].validate((valid) => {
if (valid) { if (valid) {
this.$http.post("lawss/activiti/completeTask", { let specialJson = {
createUser: this.$store.getters.userInfo.userId,
createUserName: this.$store.getters.userInfo.userName,
type: "5",
json: {
taskInfo: "选择已拆分标准",
form: this.listForm,
roleForm: this.roleForm,
commentText: this.commentText
}
};
this.$http.post("lawss/activiti/completeTaskNew", {
taskIds: this.$route.query.taskIds, taskIds: this.$route.query.taskIds,
userId: this.$store.getters.userInfo.userId, userId: this.$store.getters.userInfo.userId,
json: JSON.stringify(json), json: JSON.stringify(json),
specialJson: JSON.stringify(specialJson)
}, { }, {
_this: this _this: this
}, res => { }, res => {
if (res.success) { if (res.success) {
this.$message.success(res.message); this.$message.success(res.message);
if (this.bpnId !== '') { if (this.bpnId !== "") {
let taskId = { let taskId = {
id: this.bpnId id: this.bpnId
} };
taskDel(taskId).then(res=>{ taskDel(taskId).then(res => {
return res return res;
}) });
} }
this.$router.push("/processCenter"); this.$router.push("/processCenter");
} }
@@ -1113,10 +1125,17 @@ export default {
bpnId: this.$route.query.bpnId bpnId: this.$route.query.bpnId
}).then(res => { }).then(res => {
let mes = JSON.parse(res.mes); let mes = JSON.parse(res.mes);
this.listForm = mes.listForm; if(!mes.json){
this.dataList = mes.listForm.dataList this.listForm = mes.form
this.roleForm = mes.roleForm; this.dataList = mes.form.dataList;
this.commentText = mes.commentText; this.roleForm = mes.roleForm
this.commentText = mes.commentText
}else{
this.listForm = mes.json.form;
this.dataList = mes.json.form.dataList
this.roleForm = mes.json.roleForm;
this.commentText = mes.json.commentText;
}
}); });
}, },
}, },
src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue
+7 -7
View File
@@ -193,10 +193,10 @@
:color="roleForm.dockUser ? '#66b1ff' : ''" v-if="signFlag === '1'"> :color="roleForm.dockUser ? '#66b1ff' : ''" v-if="signFlag === '1'">
<el-card> <el-card>
<el-form-item prop="dockUserName" style="margin-bottom: 0"> <el-form-item prop="dockUserName" 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.dockUser" style="display: none;"></el-input> <el-input v-model="roleForm.dockUser" style="display: none;"></el-input>
<el-input v-model="roleForm.dockUserName" placeholder="选择会签责任人" <el-input v-model="roleForm.dockUserName" placeholder="选择相关业务单位"
@click.native="choiceZRRS"> @click.native="choiceZRRS">
</el-input> </el-input>
</div> </div>
@@ -207,10 +207,10 @@
:color="roleForm.ministerUser ? '#66b1ff' : ''" v-if="signFlag === '1'"> :color="roleForm.ministerUser ? '#66b1ff' : ''" v-if="signFlag === '1'">
<el-card> <el-card>
<el-form-item prop="ministerUserName" style="margin-bottom: 0"> <el-form-item prop="ministerUserName" 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.ministerUser" style="display: none;"></el-input> <el-input v-model="roleForm.ministerUser" style="display: none;"></el-input>
<el-input v-model="roleForm.ministerUserName" placeholder="选择标准/政策法规工程师" <el-input v-model="roleForm.ministerUserName" placeholder="选择标准法规工程师"
disabled></el-input> disabled></el-input>
</div> </div>
</el-form-item> </el-form-item>
@@ -220,11 +220,11 @@
:color="roleForm.directorUser ? '#66b1ff' : ''"> :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="选择业务经理" <el-input v-model="roleForm.directorUserName" placeholder="选择标准法规部法规分析业务经理"
@click.native="choiceZRR('directorUser', '选择业务经理', roleForm.directorUser)"></el-input> @click.native="choiceZRR('directorUser', '选择标准法规部法规分析业务经理', roleForm.directorUser)"></el-input>
</div> </div>
</el-form-item> </el-form-item>
</el-card> </el-card>
src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+9 -9
View File
@@ -180,10 +180,10 @@
<el-timeline-item timestamp="起草" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''"> <el-timeline-item timestamp="起草" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
<el-card> <el-card>
<el-form-item prop="startUserName" style="margin-bottom: 0"> <el-form-item prop="startUserName" 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.startUser" style="display: none;"></el-input> <el-input v-model="roleForm.startUser" style="display: none;"></el-input>
<el-input v-model="roleForm.startUserName" placeholder="流程发起人" <el-input v-model="roleForm.startUserName" placeholder="选择标准法规工程师"
disabled></el-input> disabled></el-input>
</div> </div>
</el-form-item> </el-form-item>
@@ -193,10 +193,10 @@
:color="roleForm.dockUser ? '#66b1ff' : ''" v-if="signFlag === '1'"> :color="roleForm.dockUser ? '#66b1ff' : ''" v-if="signFlag === '1'">
<el-card> <el-card>
<el-form-item prop="dockUserName" style="margin-bottom: 0"> <el-form-item prop="dockUserName" 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.dockUser" style="display: none;"></el-input> <el-input v-model="roleForm.dockUser" style="display: none;"></el-input>
<el-input v-model="roleForm.dockUserName" placeholder="选择会签责任人" <el-input v-model="roleForm.dockUserName" placeholder="选择相关业务单位"
@click.native="choiceZRRS"> @click.native="choiceZRRS">
</el-input> </el-input>
</div> </div>
@@ -207,10 +207,10 @@
:color="roleForm.ministerUser ? '#66b1ff' : ''" v-if="signFlag === '1'"> :color="roleForm.ministerUser ? '#66b1ff' : ''" v-if="signFlag === '1'">
<el-card> <el-card>
<el-form-item prop="ministerUserName" style="margin-bottom: 0"> <el-form-item prop="ministerUserName" 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.ministerUser" style="display: none;"></el-input> <el-input v-model="roleForm.ministerUser" style="display: none;"></el-input>
<el-input v-model="roleForm.ministerUserName" placeholder="选择标准/政策法规工程师" <el-input v-model="roleForm.ministerUserName" placeholder="选择标准法规工程师"
disabled></el-input> disabled></el-input>
</div> </div>
</el-form-item> </el-form-item>
@@ -220,11 +220,11 @@
:color="roleForm.directorUser ? '#66b1ff' : ''"> :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="选择业务经理" <el-input v-model="roleForm.directorUserName" placeholder="选择标准法规部法规分析业务经理"
@click.native="choiceZRR('directorUser', '选择业务经理', roleForm.directorUser)"></el-input> @click.native="choiceZRR('directorUser', '选择标准法规部法规分析业务经理', roleForm.directorUser)"></el-input>
</div> </div>
</el-form-item> </el-form-item>
</el-card> </el-card>
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+10 -10
View File
@@ -953,9 +953,9 @@
<el-timeline-item timestamp="起草" placement="top" :color="roleForm.prcCreateUserName ? '#66b1ff' : ''"> <el-timeline-item timestamp="起草" placement="top" :color="roleForm.prcCreateUserName ? '#66b1ff' : ''">
<el-card> <el-card>
<el-form-item prop="prcCreateUserName" style="margin-bottom: 0"> <el-form-item prop="prcCreateUserName" style="margin-bottom: 0">
<h4>流程发起人</h4> <h4>标准法规工程师</h4>
<div style="margin-top: 10px;width: 300px;"> <div style="margin-top: 10px;width: 300px;">
<el-input disabled v-model="roleForm.prcCreateUserName" placeholder="流程发起人"></el-input> <el-input disabled v-model="roleForm.prcCreateUserName" placeholder="请选择标准法规工程师"></el-input>
</div> </div>
</el-form-item> </el-form-item>
</el-card> </el-card>
@@ -963,9 +963,9 @@
<el-timeline-item timestamp="会签" v-if="form.signFlag === '1'" prop="zrUserName" placement="top" :color="roleForm.zrUserName ? '#66b1ff' : ''"> <el-timeline-item timestamp="会签" v-if="form.signFlag === '1'" prop="zrUserName" placement="top" :color="roleForm.zrUserName ? '#66b1ff' : ''">
<el-card> <el-card>
<el-form-item prop="zrUserName" style="margin-bottom: 0"> <el-form-item prop="zrUserName" 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.zrUserName" placeholder="选择会签责任人" @click.native="choiceZRRS('zrUserId', '选择责任人', form.zrUserId)"> <el-input v-model="roleForm.zrUserName" placeholder="请选择责任工程师" @click.native="choiceZRRS('zrUserId', '选择责任人', form.zrUserId)">
</el-input> </el-input>
</div> </div>
</el-form-item> </el-form-item>
@@ -974,9 +974,9 @@
<el-timeline-item timestamp="修订" v-if="form.signFlag === '1'" placement="top" :color="roleForm.applyUpdUserName ? '#66b1ff' : ''"> <el-timeline-item timestamp="修订" v-if="form.signFlag === '1'" placement="top" :color="roleForm.applyUpdUserName ? '#66b1ff' : ''">
<el-card> <el-card>
<el-form-item prop="applyUpdUserName" style="margin-bottom: 0"> <el-form-item prop="applyUpdUserName" style="margin-bottom: 0">
<h4>修订申请人</h4> <h4>标准法规工程师</h4>
<div style="margin-top: 10px;width: 300px;"> <div style="margin-top: 10px;width: 300px;">
<el-input disabled v-model="roleForm.applyUpdUserName" placeholder="修订申请人"></el-input> <el-input disabled v-model="roleForm.applyUpdUserName" placeholder="请选择标准法规工程师"></el-input>
</div> </div>
</el-form-item> </el-form-item>
</el-card> </el-card>
@@ -984,9 +984,9 @@
<el-timeline-item timestamp="批准" prop="jlUserName" placement="top" :color="roleForm.jlUserName ? '#66b1ff' : ''"> <el-timeline-item timestamp="批准" prop="jlUserName" placement="top" :color="roleForm.jlUserName ? '#66b1ff' : ''">
<el-card> <el-card>
<el-form-item prop="jlUserName" style="margin-bottom: 0"> <el-form-item prop="jlUserName" 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.jlUserName" placeholder="标准法规业务经理" @click.native="choiceZRR('jlUserId', '选择标准法规业务经理', form.jlUserId)"></el-input> <el-input v-model="roleForm.jlUserName" placeholder="请选择标准法规部法规分析业务经理" @click.native="choiceZRR('jlUserId', '选择标准法规业务经理', form.jlUserId)"></el-input>
</div> </div>
</el-form-item> </el-form-item>
</el-card> </el-card>
@@ -1598,10 +1598,10 @@ export default {
}, },
roleRules: { roleRules: {
zrUserName: [ zrUserName: [
{required: true, message: '请选择会签责任人', trigger: 'blur'}, {required: true, message: '请选择责任工程师', trigger: 'blur'},
], ],
jlUserName: [ jlUserName: [
{required: true, message: '选择标准法规业务经理', trigger: 'blur'}, {required: true, message: '请选择标准法规部法规分析业务经理', trigger: 'blur'},
], ],
}, },
rules: { rules: {
src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue
+74 -91
View File
@@ -12,98 +12,81 @@
<div class="content" v-show="active === '1'"> <div class="content" v-show="active === '1'">
<div style="flex: auto; overflow: auto;"> <div style="flex: auto; overflow: auto;">
<el-form <el-form
ref="bzzqyjForm" ref="Form"
:model="form" :model="roleForm"
:rules="formRules" :rules="roleFormRules"
class="label-input-form" class="label-input-form myForm">
label-width="210px" <el-timeline-item timestamp="起草" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
> <el-card>
<ProcessTitle> <el-form-item prop="startUserName" style="margin-bottom: 0">
<template slot="title">基础信息</template> <h4>标准法规工程师</h4>
</ProcessTitle> <div style="margin-top: 10px;width: 300px;">
<div class="prc-content-border"> <el-input v-model="roleForm.startUser" style="display: none;"/>
<el-row :gutter="24"> <el-input v-model="roleForm.startUserName" placeholder="标准法规工程师" disabled/>
<el-col :span="24"> </div>
<el-form-item label="标准号/名称" prop="cid" class="add-form-item form-item-disabled"> </el-form-item>
<div class="addButton" style="padding-left: 10px"> </el-card>
<el-button size="small" type="primary" @click="addZqyjList">选择标准</el-button> </el-timeline-item>
</div> <el-timeline-item timestamp="任务分发" placement="top" :color="roleForm.dockUserList ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="dockUserList" style="margin-bottom: 0">
<h4>标准法规工程师、事业部标准化员</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.dockUserList" style="display: none;"/>
<el-input <el-input
disabled v-model="roleForm.dockUserListName"
v-model="form.cid" placeholder="选择标准法规工程师、事业部标准化员"
placeholder="请输入标准编号" @click.native="choiceZRRS('1')">
clearable </el-input>
></el-input> </div>
</el-form-item> </el-form-item>
<el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled"> </el-card>
<el-date-picker </el-timeline-item>
v-model="form.endTime" <el-timeline-item timestamp="审核" placement="top" :color="roleForm.ministerUser ? '#66b1ff' : ''">
type="date" <el-card>
:picker-options="pickerOptions" <el-form-item prop="ministerUser" style="margin-bottom: 0">
placeholder="请选择结束日期"> <h4>标准法规部高级经理、责任部门高级经理</h4>
</el-date-picker> <div style="margin-top: 10px;width: 300px;">
</el-form-item> <el-input v-model="roleForm.ministerUser" style="display: none;"/>
<el-form-item label="文本状态" prop="textType" class="add-form-item form-item-disabled">
<el-select :disabled="!form.cid" v-model="form.textType" placeholder="请选择">
<el-option
v-for="(item, index) in textTypeList"
:key="index"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="标准附件" prop="fjListId" class="add-form-item form-item-disabled">
<div class="addButton" style="padding-left: 10px">
<el-button size="small" type="primary" :disabled="!form.cid" @click="addfjList">选择附件</el-button>
</div>
<el-input <el-input
v-model="form.fjListId" v-model="roleForm.ministerUserName"
style="display: none;" placeholder="选择标准法规部高级经理、责任部门高级经理"
></el-input> @click.native="choiceZRR('ministerUser', '选择标准法规部高级经理、责任部门高级经理', roleForm.ministerUser)"
<div style=""> />
<div class="fileClass" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in form.fjList" :key="index"> </div>
<span @click="fileLook(item)" >{{ item.fileName }}</span> </el-form-item>
<el-button </el-card>
size="small" </el-timeline-item>
@click="filesUpload(item)" <el-timeline-item timestamp="审定" placement="top" :color="roleForm.directorUser ? '#66b1ff' : ''">
icon="el-icon-download" <el-card>
style="height: 32px; margin-left: 5px;" <el-form-item prop="directorUser" style="margin-bottom: 0">
></el-button> <h4>技术委员会相关专委会主任/ 工程研究总院责任部门中心主任、技术管理中心主任</h4>
</div> <div style="margin-top: 10px;width: 300px;">
</div> <el-input v-model="roleForm.directorUser" style="display: none;"/>
</el-form-item>
<el-form-item label="上传附件" prop="modelNameList" class="add-form-item form-item-disabled">
<el-input <el-input
disabled v-model="roleForm.directorUserName"
style="display: none;" placeholder="选择技术委员会相关专委会主任/ 工程研究总院责任部门中心主任、技术管理中心主任"
v-model="form.modelNameList" @click.native="choiceZRRS('2')"
clearable />
></el-input> </div>
<div v-if="form.modelList.length > 0" class="fileClass" style=""> </el-form-item>
<div v-for="(item, index) in form.modelList" :key="index" style="margin-right: 5px; padding-left: 10px;"> </el-card>
<span @click="fileLook(item)">{{ item.name }}</span> </el-timeline-item>
<el-button <el-timeline-item timestamp="批准" placement="top" :color="roleForm.presidentUser ? '#66b1ff' : ''">
size="small" <el-card>
@click="filesUpload(item)" <el-form-item prop="presidentUser" style="margin-bottom: 0">
icon="el-icon-download" <h4>工程研究院总院院长/标准法规业务主管副院长</h4>
style="height: 32px; margin-left: 5px;" <div style="margin-top: 10px;width: 300px;">
></el-button> <el-input v-model="roleForm.presidentUser" style="display: none;"/>
</div> <el-input
</div> v-model="roleForm.presidentUserName"
<div class="addButton" style="padding-left: 10px"> placeholder="选择工程研究院总院院长/标准法规业务主管副院长"
<el-button @click.native="choiceZRR('presidentUser', '选择工程研究院总院院长/标准法规业务主管副院长', roleForm.presidentUser)"
type="primary" />
class="common-button-primary" </div>
@click="fileUpload" </el-form-item>
size="small"> </el-card>
点击上传 </el-timeline-item>
</el-button>
</div>
</el-form-item>
</el-col>
</el-row>
</div>
</el-form> </el-form>
</div> </div>
<el-collapse accordion v-model="activeNames"> <el-collapse accordion v-model="activeNames">
@@ -794,12 +777,12 @@ export default {
this.type2 = type this.type2 = type
this.nodeList2 = [] this.nodeList2 = []
if (type === '1') { if (type === '1') {
this.drawerTitle2 = '选择责任部门对接人' this.drawerTitle2 = '选择标准法规工程师、事业部标准化员'
if ( this.roleForm.dockUserList.length > 0) { if ( this.roleForm.dockUserList.length > 0) {
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/bzzqyj/step1.vue
+19 -19
View File
@@ -128,72 +128,72 @@
:model="roleForm" :model="roleForm"
:rules="roleFormRules" :rules="roleFormRules"
class="label-input-form myForm"> class="label-input-form myForm">
<el-timeline-item timestamp="发起流程" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''"> <el-timeline-item timestamp="起草" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
<el-card> <el-card>
<el-form-item prop="startUserName" style="margin-bottom: 0"> <el-form-item prop="startUserName" 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.startUser" style="display: none;"/> <el-input v-model="roleForm.startUser" style="display: none;"/>
<el-input v-model="roleForm.startUserName" placeholder="流程发起人" disabled/> <el-input v-model="roleForm.startUserName" placeholder="标准法规工程师" disabled/>
</div> </div>
</el-form-item> </el-form-item>
</el-card> </el-card>
</el-timeline-item> </el-timeline-item>
<el-timeline-item timestamp="指派责任人" placement="top" :color="roleForm.dockUserList ? '#66b1ff' : ''"> <el-timeline-item timestamp="任务分发" placement="top" :color="roleForm.dockUserList ? '#66b1ff' : ''">
<el-card> <el-card>
<el-form-item prop="dockUserList" style="margin-bottom: 0"> <el-form-item prop="dockUserList" 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.dockUserList" style="display: none;"/> <el-input v-model="roleForm.dockUserList" style="display: none;"/>
<el-input <el-input
v-model="roleForm.dockUserListName" v-model="roleForm.dockUserListName"
placeholder="选择责任部门对接人" placeholder="选择标准法规工程师、事业部标准化员"
@click.native="choiceZRRS('1')"> @click.native="choiceZRRS('1')">
</el-input> </el-input>
</div> </div>
</el-form-item> </el-form-item>
</el-card> </el-card>
</el-timeline-item> </el-timeline-item>
<el-timeline-item timestamp="审核征求意见" placement="top" :color="roleForm.ministerUser ? '#66b1ff' : ''"> <el-timeline-item timestamp="审核" placement="top" :color="roleForm.ministerUser ? '#66b1ff' : ''">
<el-card> <el-card>
<el-form-item prop="ministerUser" style="margin-bottom: 0"> <el-form-item prop="ministerUser" 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.ministerUser" style="display: none;"/> <el-input v-model="roleForm.ministerUser" style="display: none;"/>
<el-input <el-input
v-model="roleForm.ministerUserName" v-model="roleForm.ministerUserName"
placeholder="选择标准法规部部长" placeholder="选择标准法规部高级经理、责任部门高级经理"
@click.native="choiceZRR('ministerUser', '选择标准法规部部长', roleForm.ministerUser)" @click.native="choiceZRR('ministerUser', '选择标准法规部高级经理、责任部门高级经理', roleForm.ministerUser)"
/> />
</div> </div>
</el-form-item> </el-form-item>
</el-card> </el-card>
</el-timeline-item> </el-timeline-item>
<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="choiceZRRS('2')" @click.native="choiceZRRS('2')"
/> />
</div> </div>
</el-form-item> </el-form-item>
</el-card> </el-card>
</el-timeline-item> </el-timeline-item>
<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>
@@ -782,12 +782,12 @@ export default {
this.type2 = type this.type2 = type
this.nodeList2 = [] this.nodeList2 = []
if (type === '1') { if (type === '1') {
this.drawerTitle2 = '选择责任部门对接人' this.drawerTitle2 = '选择标准法规工程师、事业部标准化员'
if ( this.roleForm.dockUserList.length > 0) { if ( this.roleForm.dockUserList.length > 0) {
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/qbzxdjhgk/step1.vue
+9 -9
View File
@@ -114,11 +114,11 @@
:color="roleForm.examine ? '#66b1ff' : ''"> :color="roleForm.examine ? '#66b1ff' : ''">
<el-card> <el-card>
<el-form-item prop="examineName" style="margin-bottom: 0"> <el-form-item prop="examineName" 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.examine" style="display: none;"></el-input> <el-input v-model="roleForm.examine" style="display: none;"></el-input>
<el-input v-model="roleForm.examineName" placeholder="选择标准体系专业工作组组长" <el-input v-model="roleForm.examineName" placeholder="选择标准体系工作组组长"
@click.native="choiceZRR('examine', '选择标准体系专业工作组组长', roleForm.examine)"> @click.native="choiceZRR('examine', '选择标准体系工作组组长', roleForm.examine)">
</el-input> </el-input>
</div> </div>
</el-form-item> </el-form-item>
@@ -128,11 +128,11 @@
:color="roleForm.approver ? '#66b1ff' : ''"> :color="roleForm.approver ? '#66b1ff' : ''">
<el-card> <el-card>
<el-form-item prop="approverName" style="margin-bottom: 0"> <el-form-item prop="approverName" 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.approver" style="display: none;"></el-input> <el-input v-model="roleForm.approver" style="display: none;"></el-input>
<el-input v-model="roleForm.approverName" placeholder="选择工程研究总院标准法规部高级经理" <el-input v-model="roleForm.approverName" placeholder="选择标准法规部高级经理"
@click.native="choiceZRR('approver', '选择工程研究总院标准法规部高级经理', roleForm.approver)"> @click.native="choiceZRR('approver', '选择标准法规部高级经理', roleForm.approver)">
</el-input> </el-input>
</div> </div>
</el-form-item> </el-form-item>
@@ -142,11 +142,11 @@
:color="roleForm.engineer ? '#66b1ff' : ''"> :color="roleForm.engineer ? '#66b1ff' : ''">
<el-card> <el-card>
<el-form-item prop="engineerName" style="margin-bottom: 0"> <el-form-item prop="engineerName" 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.engineer" style="display: none;"></el-input> <el-input v-model="roleForm.engineer" style="display: none;"></el-input>
<el-input v-model="roleForm.engineerName" placeholder="选择相关单位人员、工程研究总院标准法规部周知" <el-input v-model="roleForm.engineerName" placeholder="选择相关单位、工程研究总院标准法规部"
@click.native="choiceZRR('engineer', '选择相关单位人员、工程研究总院标准法规部周知', roleForm.engineer)"> @click.native="choiceZRR('engineer', '选择相关单位、工程研究总院标准法规部', roleForm.engineer)">
</el-input> </el-input>
</div> </div>
</el-form-item> </el-form-item>
src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue
+4 -4
View File
@@ -107,10 +107,10 @@
<el-timeline-item timestamp="起草" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''"> <el-timeline-item timestamp="起草" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
<el-card> <el-card>
<el-form-item prop="startUserName" style="margin-bottom: 0"> <el-form-item prop="startUserName" 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.startUser" :disabled="true" style="display: none;"></el-input> <el-input v-model="roleForm.startUser" :disabled="true" style="display: none;"></el-input>
<el-input v-model="roleForm.startUserName" :disabled="true" placeholder="流程发起人"></el-input> <el-input v-model="roleForm.startUserName" :disabled="true" placeholder="标准法规工程师"></el-input>
</div> </div>
</el-form-item> </el-form-item>
</el-card> </el-card>
@@ -118,10 +118,10 @@
<el-timeline-item timestamp="立项确认" placement="top" :color="roleForm.dockUser ? '#66b1ff' : ''"> <el-timeline-item timestamp="立项确认" placement="top" :color="roleForm.dockUser ? '#66b1ff' : ''">
<el-card> <el-card>
<el-form-item prop="dockUserName" style="margin-bottom: 0"> <el-form-item prop="dockUserName" 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.dockUser" style="display: none;"></el-input> <el-input v-model="roleForm.dockUser" style="display: none;"></el-input>
<el-input v-model="roleForm.dockUserName" placeholder="责任人" disabled> <el-input v-model="roleForm.dockUserName" placeholder="责任工程师" disabled>
</el-input> </el-input>
</div> </div>
</el-form-item> </el-form-item>
src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue
+10 -10
View File
@@ -76,10 +76,10 @@
<el-timeline-item timestamp="起草" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''"> <el-timeline-item timestamp="起草" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
<el-card> <el-card>
<el-form-item prop="startUserName" style="margin-bottom: 0"> <el-form-item prop="startUserName" 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.startUser" :disabled="true" style="display: none;"></el-input> <el-input v-model="roleForm.startUser" :disabled="true" style="display: none;"></el-input>
<el-input v-model="roleForm.startUserName" :disabled="true" placeholder="流程发起人"></el-input> <el-input v-model="roleForm.startUserName" :disabled="true" placeholder="标准法规工程师"></el-input>
</div> </div>
</el-form-item> </el-form-item>
</el-card> </el-card>
@@ -87,10 +87,10 @@
<el-timeline-item timestamp="审核" placement="top" :color="roleForm.dockUser ? '#66b1ff' : ''"> <el-timeline-item timestamp="审核" placement="top" :color="roleForm.dockUser ? '#66b1ff' : ''">
<el-card> <el-card>
<el-form-item prop="dockUserName" style="margin-bottom: 0"> <el-form-item prop="dockUserName" 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.dockUser" style="display: none;"></el-input> <el-input v-model="roleForm.dockUser" style="display: none;"></el-input>
<el-input v-model="roleForm.dockUserName" placeholder="选择标准法规工程师" @click.native="choiceZRR('dockUser', '选择标准法规工程师', roleForm.dockUser)"> <el-input v-model="roleForm.dockUserName" placeholder="请选择标准法规部法规分析业务经理" @click.native="choiceZRR('dockUser', '选择标准法规工程师', roleForm.dockUser)">
</el-input> </el-input>
</div> </div>
</el-form-item> </el-form-item>
@@ -99,10 +99,10 @@
<el-timeline-item timestamp="合规排查(上传合规举证材料)" placement="top" :color="roleForm.dockUser ? '#66b1ff' : ''"> <el-timeline-item timestamp="合规排查(上传合规举证材料)" placement="top" :color="roleForm.dockUser ? '#66b1ff' : ''">
<el-card> <el-card>
<el-form-item prop="dockUserName" style="margin-bottom: 0"> <el-form-item prop="dockUserName" 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.dutyUser" style="display: none;"></el-input> <el-input v-model="roleForm.dutyUser" style="display: none;"></el-input>
<el-input v-model="roleForm.dutyUserName" :disabled="true" placeholder="确认+选择责任人"> <el-input v-model="roleForm.dutyUserName" :disabled="true" placeholder="责任工程师">
</el-input> </el-input>
</div> </div>
</el-form-item> </el-form-item>
@@ -111,10 +111,10 @@
<el-timeline-item timestamp="审定" placement="top" :color="roleForm.uploadUser ? '#66b1ff' : ''"> <el-timeline-item timestamp="审定" placement="top" :color="roleForm.uploadUser ? '#66b1ff' : ''">
<el-card> <el-card>
<el-form-item prop="dockUserName" style="margin-bottom: 0"> <el-form-item prop="dockUserName" 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.uploadUser" style="display: none;"></el-input> <el-input v-model="roleForm.uploadUser" style="display: none;"></el-input>
<el-input v-model="roleForm.uploadUserName" :disabled="true" placeholder="负责人"> <el-input v-model="roleForm.uploadUserName" :disabled="true" placeholder="产品工程经理/项目经理">
</el-input> </el-input>
</div> </div>
</el-form-item> </el-form-item>
@@ -123,10 +123,10 @@
<el-timeline-item timestamp="批准" placement="top" :color="roleForm.checkUser ? '#66b1ff' : ''"> <el-timeline-item timestamp="批准" placement="top" :color="roleForm.checkUser ? '#66b1ff' : ''">
<el-card> <el-card>
<el-form-item prop="dockUserName" style="margin-bottom: 0"> <el-form-item prop="dockUserName" 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.checkUser" style="display: none;"></el-input> <el-input v-model="roleForm.checkUser" style="display: none;"></el-input>
<el-input v-model="roleForm.checkUserName" :disabled="true" placeholder="分发负责人"> <el-input v-model="roleForm.checkUserName" :disabled="true" placeholder="标准法规部高级经理">
</el-input> </el-input>
</div> </div>
</el-form-item> </el-form-item>
src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
+7 -42
View File
@@ -616,49 +616,14 @@ export default {
} }
break break
case '5': case '5':
if(mes !== null && mes.taskInfo !== null){ this.$router.push({
if (mes.taskInfo === '选择已拆分标准') { name: 'bzpgStep1',
this.$router.push({ query: {
name: 'xmpgStep1-1', type: '5',
query: { processName: '项目合规评估流程-标准',
type: '5', bpnId: id
processName: '项目合规评估流程-标准',
bpnId: id,
verifySarStandard: true,
}
})
} }
// else if (mes.taskInfo === '分发责任人分发任务') { })
// this.$router.push({
// name: 'bzqdfbStep1-3',
// query: {
// type: '5',
// processName: '项目合规评估流程-标准',
// bpnId: id
// }
// })
// }else if (mes.taskInfo === '责任人填写评估反馈') {
// this.$router.push({
// name: 'bzqdfbStep1-3',
// query: {
// type: '5',
// processName: '项目合规评估流程-标准',
// bpnId: id
// }
// })
// }
}else {
this.$router.push({
name: 'xmpgStep1-1',
query: {
type: '5',
processName: '项目合规评估流程-标准',
bpnId: id,
verifySarStandard: true,
}
})
}
break break
case '6': case '6':
this.$router.push({ this.$router.push({