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:
宋伟佳
2021-08-06 16:08:18 +08:00
parent 8975e7a827 75eefe4394
commit d984bf72d3
7 changed files with 25 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzdy/step1.vue
+19 -20
View File
@@ -45,23 +45,23 @@
v-model="form.modelName" v-model="form.modelName"
clearable clearable
></el-input> ></el-input>
<!-- <div v-if="form.modelName" @click="fileUpload" class="fileClass">--> <div v-if="form.modelName" @click="fileUpload" class="fileClass">
<!-- {{ form.modelName }}--> {{ form.modelName }}
<!-- </div>--> </div>
<!-- <div v-else>--> <div v-else>
<!-- <el-button--> <el-button
<!-- type="primary"--> type="primary"
<!-- class="common-button-primary"--> class="common-button-primary"
<!-- @click="fileUpload"--> @click="fileUpload"
<!-- size="mini">--> size="mini">
<!-- 点击上传--> 点击上传
<!-- </el-button>-->
<el-button type="primary" @click="fileUpload">
<i class="el-icon-upload el-icon--right"></i>
{{isFileUploadStr}}
</el-button> </el-button>
<!-- </div>-->
<!-- <el-button type="primary" @click="fileUpload">-->
<!-- <i class="el-icon-upload el-icon&#45;&#45;right"></i>-->
<!-- {{isFileUploadStr}}-->
<!-- </el-button>-->
</div>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@@ -175,7 +175,6 @@
<el-dialog width='400px' :visible.sync="fileMadel" title="上传文件"> <el-dialog width='400px' :visible.sync="fileMadel" title="上传文件">
<el-upload <el-upload
class="upload-demo" class="upload-demo"
multiple
drag drag
:action="fileUrl" :action="fileUrl"
ref="importfile" ref="importfile"
@@ -206,7 +205,7 @@ export default {
name: "bzdyStep1", name: "bzdyStep1",
data() { data() {
return { return {
isFileUploadStr:'点击上传', // isFileUploadStr:'点击上传',
progressType: false, progressType: false,
loadProgress: 0, loadProgress: 0,
commentText: '', commentText: '',
@@ -356,8 +355,8 @@ export default {
// 导入标准数据成功后执行 // 导入标准数据成功后执行
importFileSuccess (response, file) { importFileSuccess (response, file) {
if (response.ok) { if (response.ok) {
this.isFileUploadStr='点击查看已上传文件'; // this.isFileUploadStr='点击查看已上传文件';
this.fileMadel = true; this.fileMadel = false;
this.loadProgress = 0 this.loadProgress = 0
this.progressType = false this.progressType = false
this.form.model = response.data.id this.form.model = response.data.id
src/pages/processCenter/pages/creatProcess/bzdy/step5.vue
+1 -1
View File
@@ -329,7 +329,7 @@
this.form.title = data.title this.form.title = data.title
this.form.date = data.date this.form.date = data.date
this.json = data this.json = data
this.tableData = data.responUserListMap this.tableData = data.responUserList
this.form.hzfileId = data.hzfileId this.form.hzfileId = data.hzfileId
this.form.hzfileName = data.hzfileName this.form.hzfileName = data.hzfileName
}).catch(e => { }).catch(e => {
src/pages/processCenter/pages/creatProcess/bzdy/step6.vue
+1 -1
View File
@@ -344,7 +344,7 @@
this.form.title = data.title this.form.title = data.title
this.form.date = data.date this.form.date = data.date
this.json = data this.json = data
this.tableData = data.responUserListMap this.tableData = data.responUserList
this.form.hzfileName = data.hzfileName this.form.hzfileName = data.hzfileName
this.form.hzfileId = data.hzfileId this.form.hzfileId = data.hzfileId
}).catch(e => { }).catch(e => {
src/pages/processCenter/pages/creatProcess/bzdy/step7.vue
+1 -1
View File
@@ -344,7 +344,7 @@
this.form.title = data.title this.form.title = data.title
this.form.date = data.date this.form.date = data.date
this.json = data this.json = data
this.tableData = data.responUserListMap this.tableData = data.responUserList
this.form.hzfileName = data.hzfileName this.form.hzfileName = data.hzfileName
this.form.hzfileId = data.hzfileId this.form.hzfileId = data.hzfileId
}).catch(e => { }).catch(e => {
src/pages/processCenter/pages/creatProcess/bzdy/step8.vue
+1 -1
View File
@@ -344,7 +344,7 @@
this.form.title = data.title this.form.title = data.title
this.form.date = data.date this.form.date = data.date
this.json = data this.json = data
this.tableData = data.responUserListMap this.tableData = data.responUserList
this.form.hzfileName = data.hzfileName this.form.hzfileName = data.hzfileName
this.form.hzfileId = data.hzfileId this.form.hzfileId = data.hzfileId
}).catch(e => { }).catch(e => {
src/pages/processCenter/pages/creatProcess/bzdy/step9.vue
+1 -1
View File
@@ -344,7 +344,7 @@
this.form.title = data.title this.form.title = data.title
this.form.date = data.date this.form.date = data.date
this.json = data this.json = data
this.tableData = data.responUserListMap this.tableData = data.responUserList
this.form.hzfileName = data.hzfileName this.form.hzfileName = data.hzfileName
this.form.hzfileId = data.hzfileId this.form.hzfileId = data.hzfileId
}).catch(e => { }).catch(e => {
src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
+1 -1
View File
@@ -189,7 +189,7 @@
align="center" align="center"
label="项目经理"> label="项目经理">
</el-table-column> </el-table-column>
<el-table-column label="" fixed="right" width="50" :resizable="false"> <el-table-column label="" fixed="right" width="50" :resizable="false" label="操作" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<div @click.stop style="display: inline-block"> <div @click.stop style="display: inline-block">
<el-dropdown trigger="click" @command="handleCommand"> <el-dropdown trigger="click" @command="handleCommand">