commit

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

@@ -84,7 +84,7 @@
                             ref="Form"
                             :model="roleForm"
                             :rules="roleFormRules"
-                            class="label-input-form">
+                            class="label-input-form myForm">
                         <el-timeline-item timestamp="发起流程" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
                             <el-card>
                                 <el-form-item prop="startUserName" style="margin-bottom: 0">
@@ -430,6 +430,11 @@
 <style lang="less" scoped>
     @import '~@/assets/styles/style';
     .bzdyStep1-1 {
+        .myForm {
+            /deep/.el-form-item__content {
+                line-height: 10px;
+            }
+        }
         /deep/.el-drawer__container {
             .prc-content-border {
                 border: none;

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

@@ -84,7 +84,7 @@
                   ref="Form"
                   :model="roleForm"
                   :rules="roleFormRules"
-                  class="label-input-form">
+                  class="label-input-form myForm">
             <el-timeline-item timestamp="发起流程" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
               <el-card>
                 <el-form-item prop="startUserName" style="margin-bottom: 0">
@@ -419,6 +419,11 @@ export default {
 <style lang="less" scoped>
 @import '~@/assets/styles/style';
 .bzdyStep1 {
+  .myForm {
+    /deep/.el-form-item__content {
+      line-height: 10px;
+    }
+  }
   /deep/.el-drawer__container {
     .prc-content-border {
       border: none;

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

@@ -78,7 +78,7 @@
             ref="Form"
             :model="roleForm"
             :rules="roleFormRules"
-            class="label-input-form">
+            class="label-input-form myForm">
             <el-timeline-item timestamp="发起流程" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
               <el-card>
                 <el-form-item prop="startUserName" style="margin-bottom: 0">
@@ -534,6 +534,11 @@ export default {
 @import '~@/assets/styles/style';
 @import '~@/assets/styles/mixins';
 .bzzqyjStep1 {
+  .myForm {
+    /deep/.el-form-item__content {
+      line-height: 10px;
+    }
+  }
   /deep/.el-drawer__container {
     .prc-content-border {
       border: none;

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

@@ -355,7 +355,7 @@
                         this.form.endTime = data.endTime
                         this.form.cname = data.cname
                         this.json = data
-                        this.data = data.info
+                        this.data = data.info || []
                     }).catch(e => {
                     })
                 })

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

@@ -318,6 +318,7 @@
                         pId: this.pId
                     }).then(res => {
                         let data = JSON.parse(res.mesg)
+                        console.log(data);
                         this.form.cid = data.cid
                         this.form.endTime = data.endTime
                         this.form.cname = data.cname

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

@@ -270,11 +270,21 @@
                         chapterName : '章节名称',
                         commentText: '修改意见内容（包括理由或依据）',
                         department: '提出部门',
-                        responUserName: '提出人'
+                        responUserName: '提出人',
+                        stateText: '处理意见'
                     },
                     dataList: []
                 }
-                params.dataList = row
+                params.dataList = JSON.parse(JSON.stringify(row))
+                params.dataList.forEach(item => {
+                    if (item.state === '1') {
+                        item.stateText = '上报'
+                    } else if (item.state === '2') {
+                        item.stateText = '处理后上报'
+                    } else {
+                        item.stateText = '不上报'
+                    }
+                })
                 this.$http.downloadFile('/api/lawss/activiti/export_excel', params, title, res => {})
                },
             handleTabs(name) {

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

@@ -263,11 +263,21 @@
                         chapterName : '章节名称',
                         commentText: '修改意见内容（包括理由或依据）',
                         department: '提出部门',
-                        responUserName: '提出人'
+                        responUserName: '提出人',
+                        stateText: '处理意见'
                     },
                     dataList: []
                 }
-                params.dataList = row
+                params.dataList = JSON.parse(JSON.stringify(row))
+                params.dataList.forEach(item => {
+                    if (item.state === '1') {
+                        item.stateText = '上报'
+                    } else if (item.state === '2') {
+                        item.stateText = '处理后上报'
+                    } else {
+                        item.stateText = '不上报'
+                    }
+                })
                 this.$http.downloadFile('/api/lawss/activiti/export_excel', params, title, res => {})
             },
             stateText (row) {

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

@@ -263,11 +263,21 @@
                         chapterName : '章节名称',
                         commentText: '修改意见内容（包括理由或依据）',
                         department: '提出部门',
-                        responUserName: '提出人'
+                        responUserName: '提出人',
+                        stateText: '处理意见'
                     },
                     dataList: []
                 }
-                params.dataList = row
+                params.dataList = JSON.parse(JSON.stringify(row))
+                params.dataList.forEach(item => {
+                    if (item.state === '1') {
+                        item.stateText = '上报'
+                    } else if (item.state === '2') {
+                        item.stateText = '处理后上报'
+                    } else {
+                        item.stateText = '不上报'
+                    }
+                })
                 this.$http.downloadFile('/api/lawss/activiti/export_excel', params, title, res => {})
             },
             stateText (row) {

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

@@ -263,11 +263,21 @@
                         chapterName : '章节名称',
                         commentText: '修改意见内容（包括理由或依据）',
                         department: '提出部门',
-                        responUserName: '提出人'
+                        responUserName: '提出人',
+                        stateText: '处理意见'
                     },
                     dataList: []
                 }
-                params.dataList = row
+                params.dataList = JSON.parse(JSON.stringify(row))
+                params.dataList.forEach(item => {
+                    if (item.state === '1') {
+                        item.stateText = '上报'
+                    } else if (item.state === '2') {
+                        item.stateText = '处理后上报'
+                    } else {
+                        item.stateText = '不上报'
+                    }
+                })
                 this.$http.downloadFile('/api/lawss/activiti/export_excel', params, title, res => {})
             },
             stateText (row) {