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:
396572590@qq.com
2022-07-01 14:39:19 +08:00
parent d2af044c34 cd442b280f
commit ce615c034c
4 changed files with 93 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzdy/step9.vue
+44 -1
View File
@@ -63,6 +63,38 @@
- -
</div>
</el-form-item>
<el-form-item label="调研模板" prop="model" class="add-form-item form-item-disabled">
<div v-if="form.modelList.length > 0">
<div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;padding-left: 10px">
<span @click="clickButtonToUpload(item)">{{ item.name }}</span>
<el-button
size="small"
@click="updateFile2(item)"
icon="el-icon-download"
style="height: 32px; margin-left: 5px;"
></el-button>
</div>
</div>
<div v-else>
- -
</div>
</el-form-item>
<el-form-item label="相关附件" prop="model" class="add-form-item form-item-disabled">
<div v-if="form.fjList.length > 0">
<div v-for="(item, index) in form.fjList" class="fileClass" :key="index" style="margin-right: 5px;padding-left: 10px">
<span @click="clickButtonToUpload(item)">{{ item.name }}</span>
<el-button
size="small"
@click="updateFile2(item)"
icon="el-icon-download"
style="height: 32px; margin-left: 5px;"
></el-button>
</div>
</div>
<div v-else>
- -
</div>
</el-form-item>
<!-- <el-form-item label="批准意见" prop="textpz" class="add-form-item form-item-disabled">-->
<!-- <el-input-->
<!-- v-model="form.textpz"-->
@@ -263,7 +295,9 @@
date: '', // 完成时间
hzfileId: '',
hzfileName: '',
textpz: ''
textpz: '',
modelList:[],
fjList: []
},
formRules: {
textpz: [
@@ -285,6 +319,10 @@
const attId = file
this.$preview(attId)
},
clickButtonToUpload(file) {
const attId = file.attId
this.$preview(attId)
},
handleTransfer() {
this.drawerModal = true
},
@@ -331,6 +369,10 @@
updateFile (fileId) {
window.location.href = '/api/att/attFile/downloadFile?fileId=' + fileId
},
updateFile2 (item) {
let id = item.id
window.location.href = '/api/att/attFile/downloadFile?fileId=' + id
},
// 导入按钮 上传之前的钩子
beginImportFile (file) {
var filename = file.name
@@ -428,6 +470,7 @@
this.form.hzfileId = data.hzfileId || data.form.hzfileId
this.form.hzfileName = data.hzfileName || data.form.hzfileName
this.commentText9 = data.commentText9 || ''
this.form.modelList = data.form ? data.form.modelList : data.modelList
}).catch(e => {
})
})
src/pages/processCenter/pages/phone/bzdy/step2.vue
+3
View File
@@ -108,6 +108,7 @@
import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle'
import {inboundLiaisonDetail,processCreateStand,saveTaskForPub,changeAssigneeNew} from 'api/process'
import hwh5 from '@/api/hwh5-cloudonline.js'
import axios from "axios";
export default {
@@ -170,6 +171,7 @@
this.drawerModal = false
this.$message.success('调整成功')
this.processNum()
hwh5.close()
this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
} else {
this.$message.warning(res.message)
@@ -258,6 +260,7 @@
}, {}, res => {
if (res.success) {
this.$message.success('提交成功')
hwh5.close()
this.$router.push('/processCenter')
}
this.isSubmit = false
src/pages/processCenter/pages/phone/bzpg/step6.vue
+1 -1
View File
@@ -2,7 +2,7 @@
<div class="phoneXmpgStep6 phoneBox">
<ProcessHeaderPhone toggle>
<template slot="proName">标准合规评估流程</template>
<template slot="proNode">审核2</template>
<template slot="proNode">审核</template>
</ProcessHeaderPhone>
<div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+45 -13
View File
@@ -197,19 +197,30 @@
width="150"
>
<template slot-scope="scope">
<a v-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C" class="table-jump" @click="handlePreview(scope.row)">{{
scope.row.standSortShow
}} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
<a v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF" class="table-jump" @click="handlePreview(scope.row)">{{
scope.row.standSortShow
}} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
<a v-else-if="scope.row.standYear" style="color: #333333" class="table-jump" @click="handlePreview(scope.row)">{{
scope.row.standSortShow
}} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
<a v-else style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{
scope.row.standSortShow
}}
{{ scope.row.standNumber }}</a>
<a v-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C" class="table-jump" @click="handlePreview(scope.row)">
{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}
</a>
<a v-else-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF" class="table-jump" @click="handlePreview(scope.row)">
{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}
</a>
<a v-else-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '参考' " style="color: #98E165" class="table-jump" @click="handlePreview(scope.row)">
{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}
</a>
<a v-else-if="scope.row.standYear" style="color: #333333" class="table-jump" @click="handlePreview(scope.row)">
{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}
</a>
<a v-else-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C" class="table-jump" @click="handlePreview(scope.row)" >
{{ scope.row.standSortShow }} {{ scope.row.standNumber }}
</a>
<a v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF" class="table-jump" @click="handlePreview(scope.row)">
{{ scope.row.standSortShow }} {{ scope.row.standNumber }}
</a>
<a v-else-if="textStatusMap[scope.row.textStatus] === '参考' " style="color: #98E165" class="table-jump" @click="handlePreview(scope.row)">
{{ scope.row.standSortShow }} {{ scope.row.standNumber }}
</a>
<a v-else style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">
{{ scope.row.standSortShow }} {{ scope.row.standNumber }}
</a>
</template>
</el-table-column>
<el-table-column
@@ -225,6 +236,9 @@
<a v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF" @click="handlePreview(scope.row)" class="table-jump">{{
scope.row.standName
}}</a>
<a v-else-if="textStatusMap[scope.row.textStatus] === '参考' " style="color: #98E165" @click="handlePreview(scope.row)" class="table-jump">{{
scope.row.standName
}}</a>
<a v-else style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{
scope.row.standName
}}</a>
@@ -243,6 +257,9 @@
<a v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF" @click="handlePreview(scope.row)" class="table-jump">{{
scope.row.standEnName
}}</a>
<a v-else-if="textStatusMap[scope.row.textStatus] === '参考' " style="color: #98E165" @click="handlePreview(scope.row)" class="table-jump">{{
scope.row.standEnName
}}</a>
<a v-else style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{
scope.row.standEnName
}}</a>
@@ -260,6 +277,9 @@
<div v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">
{{ formatIssueDate(scope.row.issueTime) }}
</div>
<div v-else-if="textStatusMap[scope.row.textStatus] === '参考' " style="color: #98E165">
{{ formatIssueDate(scope.row.issueTime) }}
</div>
<div v-else style="color: #333333">
{{ formatIssueDate(scope.row.issueTime) }}
</div>
@@ -277,6 +297,9 @@
<span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
scope.row.SSRQ
}}</span>
<span v-else-if="textStatusMap[scope.row.textStatus] === '参考' " style="color: #98E165">{{
scope.row.SSRQ
}}</span>
<span v-else style="color: #333333">{{ scope.row.SSRQ }}</span>
</template>
@@ -292,6 +315,9 @@
<span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
scope.row.XCXSSRQ
}}</span>
<span v-else-if="textStatusMap[scope.row.textStatus] === '参考' " style="color: #98E165">{{
scope.row.XCXSSRQ
}}</span>
<span v-else style="color: #333333">{{
scope.row.XCXSSRQ
}}</span>
@@ -308,6 +334,9 @@
<span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
scope.row.ZCCSSRQ
}}</span>
<span v-else-if="textStatusMap[scope.row.textStatus] === '参考' " style="color: #98E165">{{
scope.row.ZCCSSRQ
}}</span>
<span v-else style="color: #333333">{{
scope.row.ZCCSSRQ
}}</span>
@@ -329,6 +358,9 @@
<span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
textStatusMap[scope.row.textStatus]
}}</span>
<span v-else-if="textStatusMap[scope.row.textStatus] === '参考' " style="color: #98E165">{{
textStatusMap[scope.row.textStatus]
}}</span>
<span v-else style="color: #333333">{{ textStatusMap[scope.row.textStatus] }}</span>
</template>
</el-table-column>