FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
yanyizhou
2021-08-08 17:58:56 +08:00
parent 9a9b320460 39b8a924f4
commit 378d525055
7 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/personalCenter/index.vue
+1 -1
View File
@@ -37,7 +37,7 @@ export default {
}, },
methods: { methods: {
toHome () { toHome () {
this.$router.push('/home') this.$router.push('/home1')
}, },
// 获取当前时间 // 获取当前时间
getTime () { getTime () {
src/pages/processCenter/pages/creatProcess/bzdy/step3.vue
+4 -1
View File
@@ -156,6 +156,7 @@
</ProcessFooter> </ProcessFooter>
<el-dialog width='400px' :visible.sync="fileMadel" title="上传文件"> <el-dialog width='400px' :visible.sync="fileMadel" title="上传文件">
<el-upload <el-upload
class="upload-demo"
multiple multiple
drag drag
:action="fileUrl" :action="fileUrl"
@@ -164,7 +165,7 @@
accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx" accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx"
:before-upload="beginImportFile" :before-upload="beginImportFile"
:on-success="importFileSuccess" :on-success="importFileSuccess"
:show-file-list="false" :show-file-list="true"
> >
<div style="padding: 20px 0"> <div style="padding: 20px 0">
<i class="el-icon-upload" style="color: #3399ff"></i> <i class="el-icon-upload" style="color: #3399ff"></i>
@@ -309,6 +310,8 @@
this.json = data this.json = data
this.form.model = data.model this.form.model = data.model
this.form.modelName = data.modelName this.form.modelName = data.modelName
this.form.fileName = data.fileName || ''
this.form.fileId = data.fileId || ''
}).catch(e => { }).catch(e => {
}) })
}) })
src/pages/processCenter/pages/creatProcess/bzdy/step5.vue
+3 -2
View File
@@ -92,7 +92,7 @@
label="文件" label="文件"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<div @click="updateFile(scope.row.id)" class="fileClass"> <div @click="updateFile(scope.row.fileId)" class="fileClass">
{{scope.row.fileName}} {{scope.row.fileName}}
</div> </div>
</template> </template>
@@ -183,6 +183,7 @@
</ProcessFooter> </ProcessFooter>
<el-dialog width='400px' :visible.sync="fileMadel" title="上传文件"> <el-dialog width='400px' :visible.sync="fileMadel" title="上传文件">
<el-upload <el-upload
class="upload-demo"
multiple multiple
drag drag
:action="fileUrl" :action="fileUrl"
@@ -191,7 +192,7 @@
accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx" accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx"
:before-upload="beginImportFile" :before-upload="beginImportFile"
:on-success="importFileSuccess" :on-success="importFileSuccess"
:show-file-list="false" :show-file-list="true"
> >
<div style="padding: 20px 0"> <div style="padding: 20px 0">
<i class="el-icon-upload" style="color: #3399ff"></i> <i class="el-icon-upload" style="color: #3399ff"></i>
src/pages/processCenter/pages/creatProcess/bzdy/step6.vue
+1 -1
View File
@@ -87,7 +87,7 @@
label="文件" label="文件"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<div @click="updateFile(scope.row.id)" class="fileClass"> <div @click="updateFile(scope.row.fileId)" class="fileClass">
{{scope.row.fileName}} {{scope.row.fileName}}
</div> </div>
</template> </template>
src/pages/processCenter/pages/creatProcess/bzdy/step7.vue
+2 -2
View File
@@ -3,7 +3,7 @@
<!-- 标准调研流程--> <!-- 标准调研流程-->
<ProcessHeader toggle> <ProcessHeader toggle>
<template slot="proName">标准调研流程</template> <template slot="proName">标准调研流程</template>
<template slot="proNode">标准法规部部长审核</template> <template slot="proNode">责任部门对接人及标准法规部部长审核</template>
</ProcessHeader> </ProcessHeader>
<div class="headerTabs"> <div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div> <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
@@ -87,7 +87,7 @@
label="文件" label="文件"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<div @click="updateFile(scope.row.id)" class="fileClass"> <div @click="updateFile(scope.row.fileId)" class="fileClass">
{{scope.row.fileName}} {{scope.row.fileName}}
</div> </div>
</template> </template>
src/pages/processCenter/pages/creatProcess/bzdy/step8.vue
+1 -1
View File
@@ -87,7 +87,7 @@
label="文件" label="文件"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<div @click="updateFile(scope.row.id)" class="fileClass"> <div @click="updateFile(scope.row.fileId)" class="fileClass">
{{scope.row.fileName}} {{scope.row.fileName}}
</div> </div>
</template> </template>
src/pages/processCenter/pages/creatProcess/bzdy/step9.vue
+2 -2
View File
@@ -3,7 +3,7 @@
<!-- 标准调研流程--> <!-- 标准调研流程-->
<ProcessHeader toggle> <ProcessHeader toggle>
<template slot="proName">标准调研流程</template> <template slot="proName">标准调研流程</template>
<template slot="proNode">责任对接人审批</template> <template slot="proNode">工程研究总院院长审批</template>
</ProcessHeader> </ProcessHeader>
<div class="headerTabs"> <div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div> <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
@@ -87,7 +87,7 @@
label="文件" label="文件"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<div @click="updateFile(scope.row.id)" class="fileClass"> <div @click="updateFile(scope.row.fileId)" class="fileClass">
{{scope.row.fileName}} {{scope.row.fileName}}
</div> </div>
</template> </template>