Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
@@ -312,7 +312,7 @@ export default {
|
||||
}
|
||||
.tree-content {
|
||||
background: #fff;
|
||||
width: 16%;
|
||||
width: 300px;
|
||||
position: relative;
|
||||
.tree {
|
||||
width: 95%;
|
||||
|
||||
@@ -87,6 +87,7 @@ export default {
|
||||
}
|
||||
})
|
||||
}
|
||||
break
|
||||
case '2':
|
||||
if (row.taskInfo === '责任对接人选择责任人') {
|
||||
this.$router.push({
|
||||
@@ -110,9 +111,166 @@ export default {
|
||||
prcType: row.prcType
|
||||
}
|
||||
})
|
||||
} else if (row.taskInfo === '责任对接人审批') {
|
||||
this.$router.push({
|
||||
name: 'bzdyStep4',
|
||||
query: {
|
||||
taskIds: row.taskIds,
|
||||
prcId: row.prcId,
|
||||
prcNum: row.prcNum,
|
||||
prcName: row.prcName,
|
||||
prcType: row.prcType
|
||||
}
|
||||
})
|
||||
} else if (row.taskInfo === '标准法规工程师调研汇总'){
|
||||
this.$router.push({
|
||||
name: 'bzdyStep5',
|
||||
query: {
|
||||
taskIds: row.taskIds,
|
||||
prcId: row.prcId,
|
||||
prcNum: row.prcNum,
|
||||
prcName: row.prcName,
|
||||
prcType: row.prcType
|
||||
}
|
||||
})
|
||||
} else if (row.taskInfo === '责任人会签'){
|
||||
this.$router.push({
|
||||
name: 'bzdyStep6',
|
||||
query: {
|
||||
taskIds: row.taskIds,
|
||||
prcId: row.prcId,
|
||||
prcNum: row.prcNum,
|
||||
prcName: row.prcName,
|
||||
prcType: row.prcType
|
||||
}
|
||||
})
|
||||
} else if (row.taskInfo === '部长+对接人审核') {
|
||||
this.$router.push({
|
||||
name: 'bzdyStep7',
|
||||
query: {
|
||||
taskIds: row.taskIds,
|
||||
prcId: row.prcId,
|
||||
prcNum: row.prcNum,
|
||||
prcName: row.prcName,
|
||||
prcType: row.prcType
|
||||
}
|
||||
})
|
||||
} else if (row.taskInfo.indexOf('工程研究总院院长') == 0 ) {
|
||||
this.$router.push({
|
||||
name: 'bzdyStep9',
|
||||
query: {
|
||||
taskIds: row.taskIds,
|
||||
prcId: row.prcId,
|
||||
prcNum: row.prcNum,
|
||||
prcName: row.prcName,
|
||||
prcType: row.prcType
|
||||
}
|
||||
})
|
||||
} else {
|
||||
this.$router.push({
|
||||
name: 'bzdyStep8',
|
||||
query: {
|
||||
taskIds: row.taskIds,
|
||||
prcId: row.prcId,
|
||||
prcNum: row.prcNum,
|
||||
prcName: row.prcName,
|
||||
prcType: row.prcType
|
||||
}
|
||||
})
|
||||
}
|
||||
break;
|
||||
//标准清单更新/发布流程
|
||||
case '3':
|
||||
if (row.taskInfo === '责任对接人选择责任人') {
|
||||
this.$router.push({
|
||||
name: 'bzzqyjStep2',
|
||||
query: {
|
||||
taskIds: row.taskIds,
|
||||
prcId: row.prcId,
|
||||
prcNum: row.prcNum,
|
||||
prcName: row.prcName,
|
||||
prcType: row.prcType
|
||||
}
|
||||
})
|
||||
} else if (row.taskInfo === '责任人填写征求意见'){
|
||||
this.$router.push({
|
||||
name: 'bzzqyjStep3',
|
||||
query: {
|
||||
taskIds: row.taskIds,
|
||||
prcId: row.prcId,
|
||||
prcNum: row.prcNum,
|
||||
prcName: row.prcName,
|
||||
prcType: row.prcType
|
||||
}
|
||||
})
|
||||
} else if (row.taskInfo === '责任对接人审批') {
|
||||
this.$router.push({
|
||||
name: 'bzzqyjStep4',
|
||||
query: {
|
||||
taskIds: row.taskIds,
|
||||
prcId: row.prcId,
|
||||
prcNum: row.prcNum,
|
||||
prcName: row.prcName,
|
||||
prcType: row.prcType
|
||||
}
|
||||
})
|
||||
} else if (row.taskInfo === '标准法规工程师汇总填写处理意见') {
|
||||
this.$router.push({
|
||||
name: 'bzzqyjStep5',
|
||||
query: {
|
||||
taskIds: row.taskIds,
|
||||
prcId: row.prcId,
|
||||
prcNum: row.prcNum,
|
||||
prcName: row.prcName,
|
||||
prcType: row.prcType
|
||||
}
|
||||
})
|
||||
} else if (row.taskInfo === '责任人会签') {
|
||||
this.$router.push({
|
||||
name: 'bzzqyjStep6',
|
||||
query: {
|
||||
taskIds: row.taskIds,
|
||||
prcId: row.prcId,
|
||||
prcNum: row.prcNum,
|
||||
prcName: row.prcName,
|
||||
prcType: row.prcType
|
||||
}
|
||||
})
|
||||
} else if (row.taskInfo === '部长+对接人审核') {
|
||||
this.$router.push({
|
||||
name: 'bzzqyjStep7',
|
||||
query: {
|
||||
taskIds: row.taskIds,
|
||||
prcId: row.prcId,
|
||||
prcNum: row.prcNum,
|
||||
prcName: row.prcName,
|
||||
prcType: row.prcType
|
||||
}
|
||||
})
|
||||
} else if (row.taskInfo.indexOf('技术委员会相关专委会主任') == 0 ) {
|
||||
this.$router.push({
|
||||
name: 'bzzqyjStep8',
|
||||
query: {
|
||||
taskIds: row.taskIds,
|
||||
prcId: row.prcId,
|
||||
prcNum: row.prcNum,
|
||||
prcName: row.prcName,
|
||||
prcType: row.prcType
|
||||
}
|
||||
})
|
||||
} else {
|
||||
this.$router.push({
|
||||
name: 'bzzqyjStep9',
|
||||
query: {
|
||||
taskIds: row.taskIds,
|
||||
prcId: row.prcId,
|
||||
prcNum: row.prcNum,
|
||||
prcName: row.prcName,
|
||||
prcType: row.prcType
|
||||
}
|
||||
})
|
||||
}
|
||||
break
|
||||
//标准清单更新/发布流程
|
||||
case'4' :
|
||||
if (row.taskInfo === '进行会签,填写意见') {
|
||||
this.$router.push({
|
||||
@@ -148,8 +306,8 @@ export default {
|
||||
}
|
||||
})
|
||||
}
|
||||
break;
|
||||
//项目合规评估流程
|
||||
break
|
||||
//项目合规评估流程
|
||||
case '5' :
|
||||
if(row.taskInfo === '标准法规部业务经理审批'){
|
||||
this.$router.push({
|
||||
@@ -162,8 +320,293 @@ export default {
|
||||
prcType: row.prcType
|
||||
}
|
||||
})
|
||||
}else if(row.taskInfo === '标准评估任务下发'){
|
||||
this.$router.push({
|
||||
name: 'xmpgStep3',
|
||||
query: {
|
||||
taskIds: row.taskIds,
|
||||
prcId: row.prcId,
|
||||
prcNum: row.prcNum,
|
||||
prcName: row.prcName,
|
||||
prcType: row.prcType
|
||||
}
|
||||
})
|
||||
}else if(row.taskInfo === '合规性评估'){
|
||||
this.$router.push({
|
||||
name: 'xmpgStep4',
|
||||
query: {
|
||||
taskIds: row.taskIds,
|
||||
prcId: row.prcId,
|
||||
prcNum: row.prcNum,
|
||||
prcName: row.prcName,
|
||||
prcType: row.prcType
|
||||
}
|
||||
})
|
||||
}else if(row.taskInfo === '分发责任人审核'){
|
||||
this.$router.push({
|
||||
name: 'xmpgStep5',
|
||||
query: {
|
||||
taskIds: row.taskIds,
|
||||
prcId: row.prcId,
|
||||
prcNum: row.prcNum,
|
||||
prcName: row.prcName,
|
||||
prcType: row.prcType
|
||||
}
|
||||
})
|
||||
}else if(row.taskInfo === '汇总审核'){
|
||||
this.$router.push({
|
||||
name: 'xmpgStep6',
|
||||
query: {
|
||||
taskIds: row.taskIds,
|
||||
prcId: row.prcId,
|
||||
prcNum: row.prcNum,
|
||||
prcName: row.prcName,
|
||||
prcType: row.prcType
|
||||
}
|
||||
})
|
||||
}else if(row.taskInfo === '标准法规部领导审核'){
|
||||
this.$router.push({
|
||||
name: 'xmpgStep7',
|
||||
query: {
|
||||
taskIds: row.taskIds,
|
||||
prcId: row.prcId,
|
||||
prcNum: row.prcNum,
|
||||
prcName: row.prcName,
|
||||
prcType: row.prcType
|
||||
}
|
||||
})
|
||||
}
|
||||
break
|
||||
//项目评估流程-项目
|
||||
case '6':
|
||||
if(row.taskInfo === '标准法规部业务经理审批'){
|
||||
this.$router.push({
|
||||
name: 'xmpg2Step2',
|
||||
query: {
|
||||
taskIds: row.taskIds,
|
||||
prcId: row.prcId,
|
||||
prcNum: row.prcNum,
|
||||
prcName: row.prcName,
|
||||
prcType: row.prcType
|
||||
}
|
||||
})
|
||||
}else if(row.taskInfo === '工程经理转办'){
|
||||
this.$router.push({
|
||||
name: 'xmpg2Step3',
|
||||
query: {
|
||||
taskIds: row.taskIds,
|
||||
prcId: row.prcId,
|
||||
prcNum: row.prcNum,
|
||||
prcName: row.prcName,
|
||||
prcType: row.prcType
|
||||
}
|
||||
})
|
||||
} else if(row.taskInfo === '架构经理任务分发') {
|
||||
this.$router.push({
|
||||
name: 'xmpg2Step4',
|
||||
query: {
|
||||
taskIds: row.taskIds,
|
||||
prcId: row.prcId,
|
||||
prcNum: row.prcNum,
|
||||
prcName: row.prcName,
|
||||
prcType: row.prcType
|
||||
}
|
||||
})
|
||||
} else if(row.taskInfo === '分发责任人下发') {
|
||||
this.$router.push({
|
||||
name: 'xmpg2Step5',
|
||||
query: {
|
||||
taskIds: row.taskIds,
|
||||
prcId: row.prcId,
|
||||
prcNum: row.prcNum,
|
||||
prcName: row.prcName,
|
||||
prcType: row.prcType
|
||||
}
|
||||
})
|
||||
} else if(row.taskInfo === '合规性评估') {
|
||||
this.$router.push({
|
||||
name: 'xmpg2Step6',
|
||||
query: {
|
||||
taskIds: row.taskIds,
|
||||
prcId: row.prcId,
|
||||
prcNum: row.prcNum,
|
||||
prcName: row.prcName,
|
||||
prcType: row.prcType
|
||||
}
|
||||
})
|
||||
} else if(row.taskInfo === '分发负责人审批') {
|
||||
this.$router.push({
|
||||
name: 'xmpg2Step7',
|
||||
query: {
|
||||
taskIds: row.taskIds,
|
||||
prcId: row.prcId,
|
||||
prcNum: row.prcNum,
|
||||
prcName: row.prcName,
|
||||
prcType: row.prcType
|
||||
}
|
||||
})
|
||||
} else if(row.taskInfo === '架构经理审批') {
|
||||
this.$router.push({
|
||||
name: 'xmpg2Step8',
|
||||
query: {
|
||||
taskIds: row.taskIds,
|
||||
prcId: row.prcId,
|
||||
prcNum: row.prcNum,
|
||||
prcName: row.prcName,
|
||||
prcType: row.prcType
|
||||
}
|
||||
})
|
||||
} else if(row.taskInfo === '工程经理审批') {
|
||||
this.$router.push({
|
||||
name: 'xmpg2Step9',
|
||||
query: {
|
||||
taskIds: row.taskIds,
|
||||
prcId: row.prcId,
|
||||
prcNum: row.prcNum,
|
||||
prcName: row.prcName,
|
||||
prcType: row.prcType
|
||||
}
|
||||
})
|
||||
} else if(row.taskInfo === '标准法规部经理审批') {
|
||||
this.$router.push({
|
||||
name: 'xmpg2Step10',
|
||||
query: {
|
||||
taskIds: row.taskIds,
|
||||
prcId: row.prcId,
|
||||
prcNum: row.prcNum,
|
||||
prcName: row.prcName,
|
||||
prcType: row.prcType
|
||||
}
|
||||
})
|
||||
} else if(row.taskInfo === '汇总审批') {
|
||||
this.$router.push({
|
||||
name: 'xmpg2Step11',
|
||||
query: {
|
||||
taskIds: row.taskIds,
|
||||
prcId: row.prcId,
|
||||
prcNum: row.prcNum,
|
||||
prcName: row.prcName,
|
||||
prcType: row.prcType
|
||||
}
|
||||
})
|
||||
} else if(row.taskInfo === '标准法规部部长审批') {
|
||||
this.$router.push({
|
||||
name: 'xmpg2Step12',
|
||||
query: {
|
||||
taskIds: row.taskIds,
|
||||
prcId: row.prcId,
|
||||
prcNum: row.prcNum,
|
||||
prcName: row.prcName,
|
||||
prcType: row.prcType
|
||||
}
|
||||
})
|
||||
}
|
||||
break
|
||||
//未符合项整改流程
|
||||
case '8' :
|
||||
if(row.taskInfo === '下发至标准法规工程师'){
|
||||
this.$router.push({
|
||||
name: 'wfhxzgStep2',
|
||||
query: {
|
||||
taskIds: row.taskIds,
|
||||
prcId: row.prcId,
|
||||
prcNum: row.prcNum,
|
||||
prcName: row.prcName,
|
||||
prcType: row.prcType
|
||||
}
|
||||
})
|
||||
} else if (row.taskInfo === '确认+选择责任人') {
|
||||
this.$router.push({
|
||||
name: 'wfhxzgStep3',
|
||||
query: {
|
||||
taskIds: row.taskIds,
|
||||
prcId: row.prcId,
|
||||
prcNum: row.prcNum,
|
||||
prcName: row.prcName,
|
||||
prcType: row.prcType
|
||||
}
|
||||
})
|
||||
}else if (row.taskInfo === '上传佐证材料填写信息') {
|
||||
this.$router.push({
|
||||
name: 'wfhxzgStep4',
|
||||
query: {
|
||||
taskIds: row.taskIds,
|
||||
prcId: row.prcId,
|
||||
prcNum: row.prcNum,
|
||||
prcName: row.prcName,
|
||||
prcType: row.prcType
|
||||
}
|
||||
})
|
||||
}else {
|
||||
this.$router.push({
|
||||
name: 'wfhxzgStep5',
|
||||
query: {
|
||||
taskIds: row.taskIds,
|
||||
prcId: row.prcId,
|
||||
prcNum: row.prcNum,
|
||||
prcName: row.prcName,
|
||||
prcType: row.prcType
|
||||
}
|
||||
})
|
||||
}
|
||||
break
|
||||
case '9':
|
||||
if (row.taskInfo === '选择执行人') {
|
||||
this.$router.push({
|
||||
name: 'bzjdStep2',
|
||||
query: {
|
||||
taskIds: row.taskIds,
|
||||
prcId: row.prcId,
|
||||
prcNum: row.prcNum,
|
||||
prcName: row.prcName,
|
||||
prcType: row.prcType
|
||||
}
|
||||
})
|
||||
} else if (row.taskInfo === '填写解读分析') {
|
||||
this.$router.push({
|
||||
name: 'bzjdStep3',
|
||||
query: {
|
||||
taskIds: row.taskIds,
|
||||
prcId: row.prcId,
|
||||
prcNum: row.prcNum,
|
||||
prcName: row.prcName,
|
||||
prcType: row.prcType
|
||||
}
|
||||
})
|
||||
} else if (row.taskInfo === '责任人审核') {
|
||||
this.$router.push({
|
||||
name: 'bzjdStep4',
|
||||
query: {
|
||||
taskIds: row.taskIds,
|
||||
prcId: row.prcId,
|
||||
prcNum: row.prcNum,
|
||||
prcName: row.prcName,
|
||||
prcType: row.prcType
|
||||
}
|
||||
})
|
||||
} else if (row.taskInfo === '工程师审核') {
|
||||
this.$router.push({
|
||||
name: 'bzjdStep5',
|
||||
query: {
|
||||
taskIds: row.taskIds,
|
||||
prcId: row.prcId,
|
||||
prcNum: row.prcNum,
|
||||
prcName: row.prcName,
|
||||
prcType: row.prcType
|
||||
}
|
||||
})
|
||||
} else if (row.taskInfo === '部长审批') {
|
||||
this.$router.push({
|
||||
name: 'bzjdStep6',
|
||||
query: {
|
||||
taskIds: row.taskIds,
|
||||
prcId: row.prcId,
|
||||
prcNum: row.prcNum,
|
||||
prcName: row.prcName,
|
||||
prcType: row.prcType
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
}
|
||||
},
|
||||
},
|
||||
|
||||
@@ -1273,6 +1273,15 @@ export default {
|
||||
res.data = [];
|
||||
}
|
||||
this.dataList = res.data;
|
||||
this.dataList.forEach(item => {
|
||||
if (item.xcxssrqgj === null){
|
||||
this.$set(item, "XCXSSRQ", '');
|
||||
this.$set(item, "ZCCSSRQ", '');
|
||||
}else{
|
||||
this.$set(item, "XCXSSRQ", item.xcxssrqgj);
|
||||
this.$set(item, "ZCCSSRQ", item.zccssrqgj);
|
||||
}
|
||||
})
|
||||
this.listForm.dataList = res.data;
|
||||
let formId = [];
|
||||
this.dataList.map(item => {
|
||||
|
||||
@@ -125,6 +125,9 @@
|
||||
prop="issueTime"
|
||||
align="center"
|
||||
label="发布日期">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.issueTime ? $moment(scope.row.issueTime).format("YYYY-MM-DD") : "" }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="XCXSSRQ"
|
||||
@@ -393,27 +396,14 @@
|
||||
}}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="applicationScope"
|
||||
label="适用领域"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span
|
||||
v-if="scope.row.applicationScope != null && scope.row.applicationScope !== ''">{{ scope.row.applicationScope
|
||||
}}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="updateTime"
|
||||
label="更新时间"
|
||||
sortable
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<div>
|
||||
{{ scope.row.updateTime ? $moment(scope.row.updateTime).format("YYYY-MM-D hh:mm:ss") : scope.row.updateTime
|
||||
}}
|
||||
</div>
|
||||
</template>
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.updateTime ? $moment(scope.row.updateTime).format("YYYY-MM-DD") : "" }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="updatePeople"
|
||||
@@ -473,26 +463,13 @@
|
||||
}}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="applicationScope"
|
||||
label="适用领域"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span
|
||||
v-if="scope.row.applicationScope != null && scope.row.applicationScope !== ''">{{ scope.row.applicationScope
|
||||
}}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="updateTime"
|
||||
label="更新时间"
|
||||
sortable
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<div>
|
||||
{{ scope.row.updateTime ? $moment(scope.row.updateTime).format("YYYY-MM-DD hh:mm:ss") : scope.row.updateTime
|
||||
}}
|
||||
</div>
|
||||
<span>{{ scope.row.updateTime ? $moment(scope.row.updateTime).format("YYYY-MM-DD") : "" }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
@@ -1270,6 +1247,15 @@ export default {
|
||||
res.data = [];
|
||||
}
|
||||
this.dataList = res.data;
|
||||
this.dataList.forEach(item => {
|
||||
if (item.xcxssrqgj === null){
|
||||
this.$set(item, "XCXSSRQ", '');
|
||||
this.$set(item, "ZCCSSRQ", '');
|
||||
}else{
|
||||
this.$set(item, "XCXSSRQ", item.xcxssrqgj);
|
||||
this.$set(item, "ZCCSSRQ", item.zccssrqgj);
|
||||
}
|
||||
})
|
||||
this.listForm.dataList = res.data;
|
||||
let formId = [];
|
||||
this.dataList.map(item => {
|
||||
|
||||
@@ -93,20 +93,19 @@
|
||||
<el-table-column
|
||||
prop="distributePerson"
|
||||
label="分发责任人">
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- <el-input v-model="scope.row.distributePerson" v-show="false"></el-input>-->
|
||||
<!-- <el-input-->
|
||||
<!-- v-model="dataList.distributePerson"-->
|
||||
<!-- placeholder="请选择分发责任人"-->
|
||||
<!-- @click.native="choiceZRR(scope,'distributePerson', '选择分发责任人', roleForm.distributePerson)"-->
|
||||
<!-- readonly-->
|
||||
<!-- v-if="dataList[scope.$index].distributePerson==null"-->
|
||||
<!-- />-->
|
||||
<!-- </template>-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- <el-input-->
|
||||
<!-- v-model="scope.row.distributePerson"-->
|
||||
<!-- placeholder="请选择分发负责人"-->
|
||||
<!-- readonly-->
|
||||
<!-- @click.native="choiceZRR(scope,'distributePerson', '选择分发责任人', roleForm.distributePerson)"-->
|
||||
<!-- v-if="!scope.row.distributePerson"></el-input>-->
|
||||
<!-- </template>-->
|
||||
<template slot-scope="scope,text" v-if="showColumn">
|
||||
<div>
|
||||
<div @click="choiceZRR(scope,'distributePerson', '选择分发责任人', roleForm.distributePerson)">
|
||||
{{ listForm.dataList[scope.$index].distributePerson == null ? "请选择分发负责人" : listForm.dataList[scope.$index].distributePerson }}
|
||||
{{ listForm.dataList[scope.$index].distributePerson == null ? "请选择分发负责人" : listForm.dataList[scope.$index].distributePerson
|
||||
}}
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
@@ -409,8 +408,8 @@ export default {
|
||||
label: "name"
|
||||
},
|
||||
roleForm: {
|
||||
startUserName: this.$store.getters.userInfo.userName,
|
||||
startUser: this.$store.getters.userInfo.id,
|
||||
prcCreateUserName: this.$store.getters.userInfo.userName,
|
||||
prcCreateUser: this.$store.getters.userInfo.userId,
|
||||
qualityEngineer: "",
|
||||
certifiedEngineer: "",
|
||||
qualityEngineerName: "",
|
||||
@@ -521,10 +520,11 @@ export default {
|
||||
this.listForm.certifiedEngineer = data[0].id;
|
||||
this.listForm.certifiedEngineerName = data[0].name;
|
||||
} else if (this.type === "distributePerson") {
|
||||
// this.dataList.distributePerson = data[0].id;
|
||||
// this.dataList.distributePersonName = data[0].name;
|
||||
this.dataList.distributePersonId = data[0].id;
|
||||
this.dataList.distributePerson = data[0].name;
|
||||
this.listForm.dataList[this.dsadadadsada].distributePersonId = data[0].id;
|
||||
this.listForm.dataList[this.dsadadadsada].distributePerson = data[0].name;
|
||||
console.log(this.dataList)
|
||||
this.showColumn = false;
|
||||
this.$nextTick(() => {
|
||||
this.showColumn = true;
|
||||
@@ -652,6 +652,7 @@ export default {
|
||||
this.$message.warning("请选择分发责任人");
|
||||
} else {
|
||||
var json = Object.assign(this.listForm, this.roleForm);
|
||||
console.log(json);
|
||||
this.$refs["listForm"].validate((valid) => {
|
||||
if (valid) {
|
||||
this.$refs["roleForm"].validate((valid) => {
|
||||
|
||||
@@ -328,33 +328,36 @@ export default {
|
||||
|
||||
//驳回事件
|
||||
beforeBack () {
|
||||
this.listForm.passFlag = '1'
|
||||
this.handleSubmit()
|
||||
if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
|
||||
this.$message.warning('请填写审批意见')
|
||||
}else{
|
||||
this.listForm.passFlag = '1'
|
||||
this.handleSubmit()
|
||||
}
|
||||
},
|
||||
//提交事件
|
||||
handleSubmit() {
|
||||
this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
|
||||
this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId;
|
||||
this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
|
||||
this.listForm.zrUserId = this.$store.getters.userInfo.userId ;
|
||||
this.listForm.commentText = this.commentText;
|
||||
this.listForm.standId = this.listForm.standId;
|
||||
this.listForm.breakdownList = this.listForm.breakdownList
|
||||
const json = JSON.stringify(this.listForm);
|
||||
this.$http.post('lawss/activiti/completeTask', {
|
||||
taskIds: this.taskIds,
|
||||
userId: this.userId,
|
||||
json: json,
|
||||
}, {
|
||||
_this: this
|
||||
}, res => {
|
||||
if (res.success) {
|
||||
this.$message.success(res.message)
|
||||
this.$router.push('/processCenter')
|
||||
}
|
||||
}, e => {
|
||||
if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
|
||||
this.$message.warning('请填写审批意见')
|
||||
}else{
|
||||
this.listForm.commentText = this.commentText
|
||||
const json = JSON.stringify(this.listForm);
|
||||
this.$http.post('lawss/activiti/completeTask', {
|
||||
taskIds: this.taskIds,
|
||||
userId: this.userId,
|
||||
json: json,
|
||||
}, {
|
||||
_this: this
|
||||
}, res => {
|
||||
if (res.success) {
|
||||
this.$message.success(res.message)
|
||||
this.$router.push('/processCenter')
|
||||
}
|
||||
}, e => {
|
||||
|
||||
});
|
||||
}
|
||||
|
||||
});
|
||||
},
|
||||
//标准表格选择框改变
|
||||
selectStandChange(data) {
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<div v-if="bzfggllc">
|
||||
<el-divider content-position="left"><h2>标准法规管理流程</h2></el-divider>
|
||||
<div class="process-box">
|
||||
<el-col :span="size ? 6 : 8">
|
||||
<el-col :span="size ? 6 : 8" v-btn-permission="'9adff72ab464793564c5d1de20b45620'">
|
||||
<el-card shadow="hover">
|
||||
<div class="card-box" @click="handleCreateProcess('1')">
|
||||
<div class="card-top">
|
||||
@@ -22,7 +22,7 @@
|
||||
</div>
|
||||
</el-card>
|
||||
</el-col>
|
||||
<el-col :span="size ? 6 : 8">
|
||||
<el-col :span="size ? 6 : 8" v-btn-permission="'f4eeb9ed48eac5686a456a5582508d9c'">
|
||||
<el-card shadow="hover">
|
||||
<div class="card-box" @click="handleCreateProcess('2')">
|
||||
<div class="card-top">
|
||||
@@ -40,7 +40,7 @@
|
||||
</div>
|
||||
</el-card>
|
||||
</el-col>
|
||||
<el-col :span="size ? 6 : 8">
|
||||
<el-col :span="size ? 6 : 8" v-btn-permission="'fc25b770ad3752cdec52f3bd7b35a6a1'">
|
||||
<el-card shadow="hover">
|
||||
<div class="card-box" @click="handleCreateProcess('3')">
|
||||
<div class="card-top">
|
||||
@@ -58,7 +58,7 @@
|
||||
</div>
|
||||
</el-card>
|
||||
</el-col>
|
||||
<el-col :span="size ? 6 : 8">
|
||||
<el-col :span="size ? 6 : 8" v-btn-permission="'2d0f99ba961c551b1d8cad8ad5223731'">
|
||||
<el-card shadow="hover">
|
||||
<div class="card-box" @click="handleCreateProcess('6')">
|
||||
<div class="card-top">
|
||||
@@ -76,7 +76,7 @@
|
||||
</div>
|
||||
</el-card>
|
||||
</el-col>
|
||||
<el-col :span="size ? 6 : 8">
|
||||
<el-col :span="size ? 6 : 8" v-btn-permission="'90c7bae6308595f053c6f6f90167e493'">
|
||||
<el-card shadow="hover">
|
||||
<div class="card-box" @click="handleCreateProcess('7')">
|
||||
<div class="card-top">
|
||||
@@ -94,7 +94,7 @@
|
||||
</div>
|
||||
</el-card>
|
||||
</el-col>
|
||||
<el-col :span="size ? 6 : 8">
|
||||
<el-col :span="size ? 6 : 8" v-btn-permission="'a151f5e2ee44f8df81e201b8696fca31'">
|
||||
<el-card shadow="hover">
|
||||
<div class="card-box" @click="handleCreateProcess('8')">
|
||||
<div class="card-top">
|
||||
@@ -112,7 +112,7 @@
|
||||
</div>
|
||||
</el-card>
|
||||
</el-col>
|
||||
<el-col :span="size ? 6 : 8">
|
||||
<el-col :span="size ? 6 : 8" v-btn-permission="'2564bd61852551b99e0fe3d49a89b288'">
|
||||
<el-card shadow="hover">
|
||||
<div class="card-box" @click="handleCreateProcess('9')">
|
||||
<div class="card-top">
|
||||
@@ -130,7 +130,7 @@
|
||||
</div>
|
||||
</el-card>
|
||||
</el-col>
|
||||
<el-col :span="size ? 6 : 8">
|
||||
<el-col :span="size ? 6 : 8" v-btn-permission="'7751d25f72d0a6515e4110ae41837db8'">
|
||||
<el-card shadow="hover">
|
||||
<div class="card-box" @click="handleCreateProcess('10')">
|
||||
<div class="card-top">
|
||||
@@ -281,7 +281,8 @@ export default {
|
||||
* @returns {boolean}
|
||||
*/
|
||||
bzfggllc() {
|
||||
return true
|
||||
const idArray = ['2564bd61852551b99e0fe3d49a89b288', '2d0f99ba961c551b1d8cad8ad5223731', '7751d25f72d0a6515e4110ae41837db8', '90c7bae6308595f053c6f6f90167e493', '9adff72ab464793564c5d1de20b45620', 'a151f5e2ee44f8df81e201b8696fca31', 'f4eeb9ed48eac5686a456a5582508d9c', 'fc25b770ad3752cdec52f3bd7b35a6a1']
|
||||
return this.checkPermission(idArray)
|
||||
},
|
||||
/**
|
||||
* 政策管理流程
|
||||
|
||||
@@ -205,10 +205,18 @@ export default {
|
||||
this.toProcessDetail('bzqdfbStep4',row)
|
||||
}else if (prcType === '5'){
|
||||
//标准项目合规评估 标准维度
|
||||
this.toProcessDetail('xmpgStep7',row)
|
||||
if(row.taskInfo === '标准法规部部长审批'){
|
||||
this.toProcessDetail('xmpgStep7',row)
|
||||
}else{
|
||||
this.toProcessDetail('xmpgStep2',row)
|
||||
}
|
||||
}else if(prcType === '6'){
|
||||
//标准项目合规评估 项目维度
|
||||
this.toProcessDetail('xmpg2Step12',row)
|
||||
if(row.taskInfo === '标准法规部领导审核'){
|
||||
this.toProcessDetail('xmpg2Step12',row)
|
||||
}else{
|
||||
this.toProcessDetail('xmpg2Step2',row)
|
||||
}
|
||||
}
|
||||
} else {
|
||||
this.$message.warning('当前流程未全部办理完成,无法查看')
|
||||
|
||||
@@ -216,7 +216,6 @@ export default {
|
||||
dealWith (row) { // 办理
|
||||
this.setHandleInfo(JSON.stringify(row))
|
||||
const prcType = row.prcType
|
||||
console.log(prcType);
|
||||
switch(prcType) {
|
||||
case '1':
|
||||
if (row.taskInfo === '标准法规业务经理审批') {
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<div class="tree-content" :class="{ 'tree-closed': sideClose }">
|
||||
<div class="tree">
|
||||
<el-input
|
||||
placeholder="输入树状图体系"
|
||||
placeholder="输入国内标准法规"
|
||||
v-model="filterText">
|
||||
</el-input>
|
||||
<el-tree
|
||||
|
||||
Reference in New Issue
Block a user