From cb7b584fd1514b790fee941c5cd8efcd4760ef1f Mon Sep 17 00:00:00 2001
From: shenyanpei <shenyanpei>
Date: Mon, 6 Dec 2021 17:37:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E4=BC=9A=E5=8F=82=E4=BC=9A=E5=B8=A6?=
 =?UTF-8?q?=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzhHd-rh/step3.vue        |  5 +++++
 .../pages/creatProcess/bzhHy-ch/step3.vue        |  5 +++++
 .../processCenter/pages/phone/bzhHd-rh/step4.vue |  9 ++++++++-
 .../processCenter/pages/phone/bzhHd-rh/step6.vue |  9 ++++++++-
 .../regulatoryRepository/nonConfomity/index.vue  |  2 +-
 .../nonConfomity/pages/rectificationDatabase.vue | 16 ++++++----------
 6 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue
index 63c49a6c2..af7588ed4 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue
@@ -106,6 +106,7 @@
               <el-col :span="8">
                 <el-form-item class="add-form-item" label="单位:">
                   <el-input
+                    readonly
                     style="width: 100%"
                     placeholder="请填写"
                     v-model="rh_pageData.fillUnit"
@@ -115,6 +116,7 @@
               <el-col :span="8">
                 <el-form-item class="add-form-item" label="部门:">
                   <el-input
+                    readonly
                     style="width: 100%"
                     placeholder="请填写部门"
                     v-model="rh_pageData.fillDept"
@@ -409,6 +411,9 @@ export default {
     getFormFieldList(item) {
       this.$nextTick(() => {
         this.rh_pageData = JSON.parse(JSON.stringify(item)).rh_pageData
+        this.rh_pageData.fillDept = this.$store.getters.userInfo.institutionName
+        this.rh_pageData.fillUnit = this.$store.getters.userInfo.upDeptName
+        this.rh_pageData.fillTel = this.$store.getters.userInfo.phone
         this.rh_pageData.fillPeople = this.$store.getters.userInfo.userName
         if (this.rh_pageData.fillFile !== undefined) {
           this.fillFileList = this.rh_pageData.fillFile
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue
index 45db1b442..c369e42d1 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue
@@ -105,6 +105,7 @@
               <el-col :span="8">
                 <el-form-item class="add-form-item" label="单位:">
                   <el-input
+                    readonly
                     style="width: 100%"
                     placeholder="请填写"
                     v-model="ch_pageData.fillUnit"
@@ -114,6 +115,7 @@
               <el-col :span="8">
                 <el-form-item class="add-form-item" label="部门:">
                   <el-input
+                    readonly
                     style="width: 100%"
                     placeholder="请填写部门"
                     v-model="ch_pageData.fillDept"
@@ -350,6 +352,9 @@ export default {
       this.$nextTick(() => {
         this.ch_pageData = JSON.parse(JSON.stringify(item)).ch_pageData
         this.uploadFileLength = this.ch_pageData.fileTextList.length
+        this.rh_pageData.fillDept = this.$store.getters.userInfo.institutionName
+        this.rh_pageData.fillUnit = this.$store.getters.userInfo.upDeptName
+        this.rh_pageData.fillTel = this.$store.getters.userInfo.phone
         this.ch_pageData.fillPeopleId = this.$store.getters.userInfo.userId
         this.ch_pageData.fillPeople = this.$store.getters.userInfo.userName
         this.roleForm = JSON.parse(JSON.stringify(item)).roleList
diff --git a/src/pages/processCenter/pages/phone/bzhHd-rh/step4.vue b/src/pages/processCenter/pages/phone/bzhHd-rh/step4.vue
index c15538763..71dc62f2f 100644
--- a/src/pages/processCenter/pages/phone/bzhHd-rh/step4.vue
+++ b/src/pages/processCenter/pages/phone/bzhHd-rh/step4.vue
@@ -107,7 +107,14 @@
                 <el-table-column prop="fillPost" align="center" label="身份"/>
                 <el-table-column prop="fillTel" align="center" label="电话"/>
                 <el-table-column prop="fillMail" align="center" label="邮箱"/>
-                <el-table-column prop="fillFile" align="center" label="资料"/>
+                <el-table-column prop="fillFile" align="center" label="资料">
+                  <template slot-scope="scope">
+                    <span v-if="scope.row.fillFile.length === 0">{{ '-' }}</span>
+                    <span v-for="item in scope.row.fillFile" :key="item.id" style="color: #409EFF;" @click="previews(item.id)">
+                    {{ item.name }} {{ ';' }}
+                   </span>
+                  </template>
+                </el-table-column>
               </el-table>
             </el-form-item>
           </el-form>
diff --git a/src/pages/processCenter/pages/phone/bzhHd-rh/step6.vue b/src/pages/processCenter/pages/phone/bzhHd-rh/step6.vue
index fef41fc86..c86900e53 100644
--- a/src/pages/processCenter/pages/phone/bzhHd-rh/step6.vue
+++ b/src/pages/processCenter/pages/phone/bzhHd-rh/step6.vue
@@ -111,7 +111,14 @@
                 <el-table-column prop="fillPost" align="center" label="身份"/>
                 <el-table-column prop="fillTel" align="center" label="电话"/>
                 <el-table-column prop="fillMail" align="center" label="邮箱"/>
-                <el-table-column prop="fillFile" align="center" label="资料"/>
+                <el-table-column prop="fillFile" align="center" label="资料">
+                  <template slot-scope="scope">
+                    <span v-if="scope.row.fillFile.length === 0">{{ '-' }}</span>
+                    <span v-for="item in scope.row.fillFile" :key="item.id" style="color: #409EFF;" @click="previews(item.id)">
+                    {{ item.name }} {{ ';' }}
+                   </span>
+                  </template>
+                </el-table-column>
               </el-table>
             </el-form-item>
           </el-form>
diff --git a/src/pages/regulatoryRepository/nonConfomity/index.vue b/src/pages/regulatoryRepository/nonConfomity/index.vue
index 75ce33ef9..2b3dfc28d 100644
--- a/src/pages/regulatoryRepository/nonConfomity/index.vue
+++ b/src/pages/regulatoryRepository/nonConfomity/index.vue
@@ -50,7 +50,7 @@
 </script>
 <style lang="less" scoped>
   #non-cnfomity {
-    height: 100%;
+    height: inherit;
     display: flex;
     flex-direction: column;
     background-color: #FFFFFF;
diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
index d8715f4d2..88d988853 100644
--- a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
+++ b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
@@ -1188,19 +1188,13 @@ export default {
   color: #606266 !important;
 }
 #rectification-dataBase {
-  /deep/ .el-table__fixed {
-    height: 100% !important; //设置高优先，以覆盖内联样式
-  }
+
   /deep/ .el-table__fixed-right {
     height: 100% !important; //设置高优先，以覆盖内联样式
   }
-  /deep/ .table-wrap {
-    .el-table__fixed {
-      height: calc(~'100% - 20px') !important;
-    }
-  }
 
-  height: 100%;
+  min-height: calc(100% - 100px);
+  overflow-y: auto;
   display: flex;
   flex-direction: column;
 
@@ -1210,6 +1204,7 @@ export default {
   }
 
   .container {
+    height: calc(~'100% - 30px');
     flex: 1;
     overflow: hidden;
     display: flex;
@@ -1222,6 +1217,7 @@ export default {
 
       .inner-wrap {
         position: absolute;
+        height: calc(70vh - 60px);
         top: 0;
         left: 0;
         width: 100%;
@@ -1231,7 +1227,7 @@ export default {
 
     .footer {
       /deep/ .pagination {
-        position: static;
+        position: absolute;
       }
     }
   }