Merge branch 'develop' into 'FOTON'

Develop

See merge request LAWS/laws-system-front-FOTON!237

src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue

@@ -701,7 +701,7 @@ export default {
       if (this.type === 'leaderUser') {
         this.roleForm.leaderUser = data[0].name
         this.roleForm.leaderUserId = data[0].id
-      } else if(this.type === 'ngineerUser'){
+      } else if(this.type === 'engineerUser'){
         this.roleForm.engineerUser = data[0].name
         this.roleForm.engineerUserId = data[0].id
       } else {

src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue

@@ -2,7 +2,7 @@
   <div class="bzchStep2">
     <ProcessHeader toggle>
       <template slot="proName">外部标准化协会参会流程</template>
-      <template slot="proNode">参会人员确认</template>
+      <template slot="proNode">提名入会代表</template>
     </ProcessHeader>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>

src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue

@@ -574,6 +574,7 @@
                     id: id,
                     department: this.$store.getters.userInfo.upDeptName,
                     responUserName: this.$store.getters.userInfo.userName,
+                    responUser: this.$store.getters.userInfo.userId
                 }
                 this.data.push(json)
                 this.itemId = id

src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue

@@ -496,6 +496,7 @@ export default {
         id: id,
         department: this.$store.getters.userInfo.upDeptName,
         responUserName: this.$store.getters.userInfo.userName,
+        responUser: this.$store.getters.userInfo.userId
       }
       this.data.push(json)
       this.itemId = id

src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue

@@ -35,7 +35,12 @@
                       @click="handleQueryPdf(file)"
                       :key="item">
                {{ file.name }}
-                    <el-button  type="primary" class="common-button-primary" size="mini" @click="downloadFile(file.attId)">下载</el-button>
+                  <el-button
+                          size="small"
+                          @click="downloadFile(file.attId)"
+                          icon="el-icon-download"
+                          style="height: 32px; margin-left: 5px;"
+                  ></el-button>
              </div>
             </div>
           </div>
@@ -51,7 +56,12 @@
                    @click="handleQueryPdf(file)"
                    :key="item">
                 {{ file.name }}
-                <el-button  type="primary" class="common-button-primary" size="mini" @click="downloadFile(file.attId)">下载</el-button>
+                <el-button
+                        size="small"
+                        @click="downloadFile(file.attId)"
+                        icon="el-icon-download"
+                        style="height: 32px; margin-left: 5px;"
+                ></el-button>
               </div>
             </div>
           </div>
@@ -73,6 +83,7 @@
         添加
       </el-button>
       <el-button type="primary" class="common-button-primary" size="mini"  @click="exportAll">导出</el-button>
+      <el-button type="primary" class="common-button-primary" size="mini"  @click="exportAll1">导出上报意见</el-button>
     </div>
     <div class="container">
       <el-table
@@ -309,6 +320,9 @@ export default {
     exportAll() {
       window.open('/api/slrs/sar-public-idea-all/tuallStand?cid=' + this.$route.query.item.cid)
     },
+    exportAll1() {
+      window.open('/api/slrs/sar-public-idea-all/tuallStand?type=1&cid=' + this.$route.query.item.id)
+    },
     getIdeaKey() {
       this.$http.get('slrs/sar-public-idea-all/checkIsShow', {
         endTime: this.form.endTime