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:
super_liu
2022-02-17 16:24:06 +08:00
parent 61328f48b8 c3054507bf
commit cad426b0b8
3 changed files with 55 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/details/otherBussStandardDetails/index.vue
+33 -10
View File
@@ -353,12 +353,12 @@
<div class="basic-information-content">
<p class="" style="color: #C42626;"><label style=" margin-right: 171px;">企标号</label><span>{{ sarStandardsInfoEO.standCode }}</span></p>
<template v-for="(child, childIndex) in item.child1">
<p class="files-title"
>
<div class="files-title" style="border-bottom: 1px solid #E5E5E5">
<label style=" margin-right: 172px;">{{ child.attrName }}</label>
<template v-if="child.value && child.value.length > 0" v-for="(file, fileIndex) in child1Func(child.value)">
<span>
<a style="font-size: 16px;color: #409EFF;cursor: pointer" @click="openFileInPdf(file.id, file.oldFileName)" target="_blank" :title="file.oldFileName">{{ file.oldFileName | ellipsis }}</a>
<!-- 单个文件-->
<span v-if="child.value && child.value.length > 0 && child.value.length === 1">
<a style="font-size: 16px;color: #409EFF;cursor: pointer" @click="openFileInPdf(file.id, file.oldFileName)" target="_blank" :title="file.oldFileName">{{ file.oldFileName }}</a>
<i
title="下载"
@click="downloadFile(file.id)"
@@ -374,6 +374,27 @@
/>
<!-- <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
</span>
<!-- 多个文件-->
<div v-else-if="child.value && child.value.length > 0">
<span style="margin-left: 19%">
<a style="font-size: 16px;color: #409EFF;cursor: pointer"
@click="openFileInPdf(file.id, file.oldFileName)" target="_blank"
:title="file.oldFileName">{{ file.oldFileName }}</a>
<i
title="下载"
@click="downloadFile(file.id)"
class="icon-download"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : 'a772afab2a6708883335500f3f86e771'"
/>
<i
title="下载带水印"
@click="downloadFileByWater(file.id, file.fileSuffix)"
class="icon-download2"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'"
/>
</span>
<!-- <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
</div>
<!-- <el-button-->
<!-- v-if="child.attrField === itemNam "-->
<!-- v-for="(itemNam,index) in itemExistList"-->
@@ -384,11 +405,11 @@
<!-- icon="icon-separate"-->
<!-- >标准分解单-->
<!-- </el-button>-->
<el-button v-if="child.value.length > 1" style="color:#409EFF;border: 1px solid #409EFF;background: rgba(64, 158, 255, 0.1);"
class="decomposition-btn" icon="icon-relation" @click="relateEvent1(child.value)">更多</el-button>
<!-- <el-button v-if="child.value.length > 1" style="color:#409EFF;border: 1px solid #409EFF;background: rgba(64, 158, 255, 0.1);"-->
<!-- class="decomposition-btn" icon="icon-relation" @click="relateEvent1(child.value)">更多</el-button>-->
</template>
<template v-if="child.value === null" >-</template>
</p>
</div>
</template>
<p><label style="margin-right: 157px;">中文名称</label><span>{{ sarStandardsInfoEO.standName || '-' }}</span></p>
<p v-if="activeState"><label style=" margin-right: 157px;">英文名称</label><span>{{ sarStandardsInfoEO.standEnName || '-' }}</span></p>
@@ -1961,10 +1982,12 @@ export default {
one: spanOneArr,
}
},
child1Func(child1){
child1Func(child1) {
const list = []
if(child1 && child1.length > 1){
list.push(child1[0])
if (child1 && child1.length > 1) {
for (let i = 0; i < child1.length; i++) {
list.push(child1[i])
}
return list
}
return child1
src/pages/home2/components/todoList/index.vue
+21 -21
View File
@@ -470,7 +470,7 @@ export default {
}
break;
case '2':
if (row.taskInfo === '责任对接人选择责任人') {
if (row.taskInfo === '任务分发') {
this.$router.push({
name: 'bzdyStep2',
query: {
@@ -481,7 +481,7 @@ export default {
prcType: row.prcType
}
})
} else if (row.taskInfo === '责任人上传调研结果') {
} else if (row.taskInfo === '调研结果反馈') {
this.$router.push({
name: 'bzdyStep3',
query: {
@@ -492,7 +492,7 @@ export default {
prcType: row.prcType
}
})
} else if (row.taskInfo === '责任对接人审批') {
} else if (row.taskInfo === '调研结果审批') {
this.$router.push({
name: 'bzdyStep4',
query: {
@@ -503,7 +503,7 @@ export default {
prcType: row.prcType
}
})
} else if (row.taskInfo === '标准法规工程师调研汇总'){
} else if (row.taskInfo === '调研结果处理'){
this.$router.push({
name: 'bzdyStep5',
query: {
@@ -514,7 +514,7 @@ export default {
prcType: row.prcType
}
})
} else if (row.taskInfo === '责任人会签'){
} else if (row.taskInfo === '会签'){
this.$router.push({
name: 'bzdyStep6',
query: {
@@ -525,7 +525,7 @@ export default {
prcType: row.prcType
}
})
} else if (row.taskInfo === '部长+对接人审核') {
} else if (row.taskInfo === '审核') {
this.$router.push({
name: 'bzdyStep7',
query: {
@@ -536,9 +536,9 @@ export default {
prcType: row.prcType
}
})
} else if (row.taskInfo.indexOf('工程研究总院院长') == 0 ) {
} else if (row.taskInfo === '审定') {
this.$router.push({
name: 'bzdyStep9',
name: 'bzdyStep8',
query: {
taskIds: row.taskIds,
prcId: row.prcId,
@@ -547,9 +547,9 @@ export default {
prcType: row.prcType
}
})
} else {
} else if (row.taskInfo === '批准') {
this.$router.push({
name: 'bzdyStep8',
name: 'bzdyStep9',
query: {
taskIds: row.taskIds,
prcId: row.prcId,
@@ -594,7 +594,7 @@ export default {
prcType: row.prcType
}
})
} else if (row.taskInfo === '意见审批（经理、研发副总裁）') {
} else if (row.taskInfo === '意见审批') {
this.$router.push({
name: 'bzzqyjStep4-1',
query: {
@@ -605,7 +605,7 @@ export default {
prcType: row.prcType
}
})
} else if (row.taskInfo === '管理员（起草节点一个人）') {
} else if (row.taskInfo === '管理员') {
this.$router.push({
name: 'bzzqyjStep4-2',
query: {
@@ -627,7 +627,7 @@ export default {
prcType: row.prcType
}
})
} else if (row.taskInfo === '会签（选择会签人部长）') {
} else if (row.taskInfo === '会签') {
this.$router.push({
name: 'bzzqyjStep6',
query: {
@@ -638,7 +638,7 @@ export default {
prcType: row.prcType
}
})
} else if (row.taskInfo === '审核（李部、会签人部长）') {
} else if (row.taskInfo === '审核') {
this.$router.push({
name: 'bzzqyjStep7',
query: {
@@ -649,7 +649,7 @@ export default {
prcType: row.prcType
}
})
} else if (row.taskInfo === '审定（阚主任、技术委员会相关专委会主任/研究总院职能部门领导）' ) {
} else if (row.taskInfo === '审定' ) {
this.$router.push({
name: 'bzzqyjStep8',
query: {
@@ -660,7 +660,7 @@ export default {
prcType: row.prcType
}
})
} else if (row.taskInfo === '批准（工程研究总院院长批准、标准法规主管副院长）') {
} else if (row.taskInfo === '批准') {
this.$router.push({
name: 'bzzqyjStep9',
query: {
@@ -976,7 +976,7 @@ export default {
}
break
case '9':
if (row.taskInfo === '选择执行人') {
if (row.taskInfo === '选择责任人') {
this.$router.push({
name: 'bzjdStep2',
query: {
@@ -987,7 +987,7 @@ export default {
prcType: row.prcType
}
})
} else if (row.taskInfo === '填写解读分析') {
} else if (row.taskInfo === '解读') {
this.$router.push({
name: 'bzjdStep3',
query: {
@@ -998,7 +998,7 @@ export default {
prcType: row.prcType
}
})
} else if (row.taskInfo === '责任人审核') {
} else if (row.taskInfo === '审核') {
this.$router.push({
name: 'bzjdStep4',
query: {
@@ -1009,7 +1009,7 @@ export default {
prcType: row.prcType
}
})
} else if (row.taskInfo === '工程师审核') {
} else if (row.taskInfo === '管理员') {
this.$router.push({
name: 'bzjdStep5',
query: {
@@ -1020,7 +1020,7 @@ export default {
prcType: row.prcType
}
})
} else if (row.taskInfo === '部长审批') {
} else if (row.taskInfo === '批准') {
this.$router.push({
name: 'bzjdStep6',
query: {
src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+1 -1
View File
@@ -3374,7 +3374,7 @@ export default {
let routeUrl = this.$router.resolve({
name: 'OtherBussStandardDetails',
params: {
id: item.standId,
id: item.id,
pageType: 'BUSINESS_STAND'
}
})