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

src/pages/processCenter/pages/creatProcess/bzdy/step1.vue

@@ -45,23 +45,23 @@
                           v-model="form.modelName"
                           clearable
                   ></el-input>
-<!--                  <div v-if="form.modelName" @click="fileUpload" class="fileClass">-->
-<!--                    {{ form.modelName }}-->
-<!--                  </div>-->
-<!--                  <div v-else>-->
-<!--                    <el-button-->
-<!--                            type="primary"-->
-<!--                            class="common-button-primary"-->
-<!--                            @click="fileUpload"-->
-<!--                            size="mini">-->
-<!--                      点击上传-->
-<!--                    </el-button>-->
-
-                    <el-button type="primary" @click="fileUpload">
-                      <i class="el-icon-upload el-icon--right"></i>
-                      {{isFileUploadStr}}
+                  <div v-if="form.modelName" @click="fileUpload" class="fileClass">
+                    {{ form.modelName }}
+                  </div>
+                  <div v-else>
+                    <el-button
+                            type="primary"
+                            class="common-button-primary"
+                            @click="fileUpload"
+                            size="mini">
+                      点击上传
                     </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-col>
             </el-row>
@@ -175,7 +175,6 @@
     <el-dialog width='400px' :visible.sync="fileMadel" title="上传文件">
       <el-upload
               class="upload-demo"
-              multiple
               drag
               :action="fileUrl"
               ref="importfile"
@@ -206,7 +205,7 @@ export default {
   name: "bzdyStep1",
   data() {
     return {
-      isFileUploadStr:'点击上传',
+      // isFileUploadStr:'点击上传',
       progressType: false,
       loadProgress: 0,
       commentText: '',
@@ -356,8 +355,8 @@ export default {
     // 导入标准数据成功后执行
     importFileSuccess (response, file) {
       if (response.ok) {
-        this.isFileUploadStr='点击查看已上传文件';
-        this.fileMadel = true;
+        // this.isFileUploadStr='点击查看已上传文件';
+        this.fileMadel = false;
         this.loadProgress = 0
         this.progressType = false
         this.form.model = response.data.id

src/pages/processCenter/pages/creatProcess/bzdy/step5.vue

@@ -329,7 +329,7 @@
                         this.form.title = data.title
                         this.form.date = data.date
                         this.json = data
-                        this.tableData = data.responUserListMap
+                        this.tableData = data.responUserList
                         this.form.hzfileId = data.hzfileId
                         this.form.hzfileName = data.hzfileName
                     }).catch(e => {

src/pages/processCenter/pages/creatProcess/bzdy/step6.vue

@@ -344,7 +344,7 @@
                         this.form.title = data.title
                         this.form.date = data.date
                         this.json = data
-                        this.tableData = data.responUserListMap
+                        this.tableData = data.responUserList
                         this.form.hzfileName = data.hzfileName
                         this.form.hzfileId = data.hzfileId
                     }).catch(e => {

src/pages/processCenter/pages/creatProcess/bzdy/step7.vue

@@ -344,7 +344,7 @@
                         this.form.title = data.title
                         this.form.date = data.date
                         this.json = data
-                        this.tableData = data.responUserListMap
+                        this.tableData = data.responUserList
                         this.form.hzfileName = data.hzfileName
                         this.form.hzfileId = data.hzfileId
                     }).catch(e => {

src/pages/processCenter/pages/creatProcess/bzdy/step8.vue

@@ -344,7 +344,7 @@
                         this.form.title = data.title
                         this.form.date = data.date
                         this.json = data
-                        this.tableData = data.responUserListMap
+                        this.tableData = data.responUserList
                         this.form.hzfileName = data.hzfileName
                         this.form.hzfileId = data.hzfileId
                     }).catch(e => {

src/pages/processCenter/pages/creatProcess/bzdy/step9.vue

@@ -344,7 +344,7 @@
                         this.form.title = data.title
                         this.form.date = data.date
                         this.json = data
-                        this.tableData = data.responUserListMap
+                        this.tableData = data.responUserList
                         this.form.hzfileName = data.hzfileName
                         this.form.hzfileId = data.hzfileId
                     }).catch(e => {

src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue

@@ -189,7 +189,7 @@
           align="center"
           label="项目经理">
         </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">
             <div @click.stop style="display: inline-block">
               <el-dropdown trigger="click" @command="handleCommand">