From b1e39201f567260dd1fe4cfe3d36d37323af678a Mon Sep 17 00:00:00 2001
From: song2048 <2639528268@qq.com>
Date: Fri, 6 Aug 2021 15:10:47 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E5=9C=A8=E8=A1=A8=E6=A0=BC=E5=90=8E?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E2=80=9C=E6=93=8D=E4=BD=9C=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../localProductsOrProjectLibrary/index.vue                     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
index 601dc8728..03ea3ab2f 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
+++ b/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">

From 4508f0fd4e2d89021587c01ac1b9dbcaf1d19948 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Fri, 6 Aug 2021 15:21:03 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E6=A0=87=E5=87=86=E8=B0=83=E7=A0=94?=
 =?UTF-8?q?=E7=9A=84=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E5=8D=95=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzdy/step1.vue         | 39 +++++++++----------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue
index 45ccf0b85..64ddfde94 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue
+++ b/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

From d59fae7b17d4c6a7521968042823d0561b023611 Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Fri, 6 Aug 2021 15:31:03 +0800
Subject: [PATCH 3/5] commit

---
 src/pages/processCenter/pages/creatProcess/bzdy/step5.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue
index fd03d1776..a8363e696 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue
@@ -329,9 +329,10 @@
                         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
+                        console.log(data);
                     }).catch(e => {
                     })
                 })

From e213095f8fdeabde3e16a0914c62bd53a60f2312 Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Fri, 6 Aug 2021 15:31:34 +0800
Subject: [PATCH 4/5] commit

---
 src/pages/processCenter/pages/creatProcess/bzdy/step5.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue
index a8363e696..1c962674b 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue
@@ -332,7 +332,6 @@
                         this.tableData = data.responUserList
                         this.form.hzfileId = data.hzfileId
                         this.form.hzfileName = data.hzfileName
-                        console.log(data);
                     }).catch(e => {
                     })
                 })

From 75eefe43944a57ee16a48876cabd4a5560f2e748 Mon Sep 17 00:00:00 2001
From: yuezhihang <yuezhihang@91isoft.com>
Date: Fri, 6 Aug 2021 15:39:49 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E6=A0=87=E5=87=86=E8=B0=83=E7=A0=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/processCenter/pages/creatProcess/bzdy/step6.vue | 2 +-
 src/pages/processCenter/pages/creatProcess/bzdy/step7.vue | 2 +-
 src/pages/processCenter/pages/creatProcess/bzdy/step8.vue | 2 +-
 src/pages/processCenter/pages/creatProcess/bzdy/step9.vue | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue
index 307627111..529ac6782 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue
+++ b/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 => {
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue
index caf5acd2d..6bbd01b4f 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue
+++ b/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 => {
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue
index df88eaaca..af250d1cb 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue
+++ b/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 => {
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue
index 16c896fdb..889c9514d 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue
+++ b/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 => {