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

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

@@ -82,7 +82,9 @@
         <template slot="title">拆分信息</template>
       </ProcessTitle>
       <div class="action-bar">
-                <el-button type="primary" class="common-button-primary add-button" size="mini" @click="choiceZRRS('', 2, '')">批量编辑</el-button>
+        <el-button type="primary" class="common-button-primary add-button" size="mini" @click="choiceZRRS('', 2, '')">
+          批量编辑
+        </el-button>
       </div>
       <el-table border
                 ref="selection"
@@ -114,7 +116,9 @@
           show-overflow-tooltip
           align="center">
           <template slot-scope="scope">
-                        <el-button size="mini" type="primary" @click="itermsConditionsOpen(scope.row.itermsConditions)" class="common-button-primary">查看条款内容</el-button>
+            <el-button size="mini" type="primary" @click="itermsConditionsOpen(scope.row.itermsConditions)" class="common-button-primary">
+              查看条款内容
+            </el-button>
           </template>
         </el-table-column>
         <el-table-column
@@ -211,11 +215,13 @@
                       size="mini"
                       class="common-button-primary"
 
-                                                @click="sarStandCompareHisInfo">查询</el-button>
+                      @click="sarStandCompareHisInfo">查询
+                    </el-button>
                     <el-button
                       class="common-button-default"
                       size="mini"
-                                                @click="clearSearchStand">清空</el-button>
+                      @click="clearSearchStand">清空
+                    </el-button>
                   </el-formItem>
                 </el-form>
               </div>
@@ -300,7 +306,10 @@
                   label="标准号"
                 >
                   <template slot-scope="scope">
-                                        <div v-if="scope.row.standYear">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</div>
+                    <div v-if="scope.row.standYear">{{ scope.row.standSortShow }} {{
+                        scope.row.standNumber
+                      }}-{{ scope.row.standYear }}
+                    </div>
                     <div v-else>{{ scope.row.standSortShow }} {{ scope.row.standNumber }}</div>
                   </template>
                 </el-table-column>
@@ -357,7 +366,8 @@
       size="800px">
       <div style="height: 500px;overflow: auto;" v-html="itermsConditionsTitle"></div>
       <div slot="footer">
-                <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="itermsConditionsClose">关闭</el-button>
+        <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="itermsConditionsClose">关闭
+        </el-button>
       </div>
     </el-dialog>
     <Role-tree
@@ -376,6 +386,7 @@
 import ProcessFooter from '../../components/ProcessFooter'
 import ProcessTitle from '../../components/ProcessTitle'
 import {saveTaskFirst} from 'api/process'
+
 export default {
   name: "bzjdStep1",
   data() {
@@ -463,6 +474,7 @@
       },
       roleRow: {},
       itemList: [],
+      itemListOld: [],
       zrType: '',
       zrIndex: '',
       zrIdList: []
@@ -645,7 +657,13 @@
               item.zrUserId = ''
               item.zrUserIdName = ''
             })
-                            this.itemList = res.data.list
+
+            this.itemList = res.data.list.filter(item =>{
+              return item.workFlowShow === '1'
+            })
+            this.itemListOld = res.data.list.filter(item =>{
+              return item.workFlowShow === '0'
+            })
           }
           this.loading = false
         })
@@ -790,6 +808,7 @@
                     json.commentText = this.commentText
                     json.standInData = this.sarType
                     json.itemList = this.itemList
+                    json.itemListOld = this.itemListOld
                     this.$http.post('lawss/activiti/completeTask', {
                       json: JSON.stringify(json),
                       taskId: res.data,
@@ -830,6 +849,7 @@
 <style lang="less" scoped>
 @import '~@/assets/styles/style';
 @import '~@/assets/styles/mixins';
+
 .bzjdStep1 {
   /deep/ .el-drawer__container {
     .prc-content-border {
@@ -837,8 +857,10 @@
       padding: 0 20px 0;
     }
   }
+
   position: relative;
   height: 100%;
+
   .headerTabs {
     height: 52px;
     display: flex;
@@ -846,6 +868,7 @@
     position: absolute;
     top: 0;
     right: 10px;
+
     .headerTabsItem {
       border: 1px solid #c1c1c1;
       padding: 0 5px;
@@ -853,12 +876,14 @@
       line-height: 30px;
       cursor: pointer;
     }
+
     .active {
       border: 1px solid #E6A23C;
       color: #fff;
       background: #E6A23C;
     }
   }
+
   .content {
     display: flex;
     flex-direction: column;
@@ -866,33 +891,41 @@
     height: calc(~'100% - 107px');
     overflow: auto;
   }
+
   .standardForComments {
     height: 100%;
     background: #fff;
+
     .el-divider--horizontal {
       display: block;
       height: 1px;
       width: 100%;
       margin: 0;
     }
+
     flex-direction: column;
+
     .action-bar {
       margin-bottom: 5px;
       padding: 0;
     }
+
     .content {
       flex: auto;
       overflow: hidden;
       display: flex;
       flex-direction: column;
+
       .table-wrap {
         flex: auto;
         overflow: hidden;
         position: relative;
       }
     }
+
     & > .pagination {
       position: static;
+
       /deep/ .pagination-slot {
         padding: 0;
       }