Merge remote-tracking branch 'origin/master'

supervise-enterprise-ui/src/views/paichanguanliFlow/paichanguanli/haveDone.vue

@@ -238,7 +238,7 @@ export default {
       this.$nextTick(() => {
         this.$refs['form_obj'].clearValidate()
       })
-      this.viewTitle = '厂家采购详情'
+      this.viewTitle = '用章详情'
       req.fetchDetailsBySid(sid).then((resp) => {
         var aa = ''
         this.purchaseForm = resp.data
@@ -311,7 +311,7 @@ export default {
       color: #ffffff;
       background-color: #0294d7;
     }
-  
+
     /deep/ .el-collapse-item__content {
       padding-bottom: 0;
     }
@@ -321,11 +321,11 @@ export default {
       text-align: center;
       justify-content: center;
     }
-  
+
     .trightb_item {
       padding-top: 5px;
     }
-  
+
     .span {
       margin-left: 50px;
       font-size: 15px;

supervise-portal-ui/src/views/flow/havereadList.vue

@@ -339,7 +339,7 @@ export default {
       var token = getStorage()
       const params = { procInsId: procInsId, deployId: procDefId, token: token }
       flowRecord(params).then(res => {
-        this.flowRecordList = res.data
+        this.flowRecordList = res.data.flowList
         // 流程过程中不存在初始化表单 直接读取的流程变量中存储的表单值
         if (res.data.formData) {
           this.formConf = res.data.formData

supervise-portal-ui/src/views/flow/tobereadList.vue

@@ -339,7 +339,7 @@ export default {
       var token = getStorage()
       const params = { procInsId: procInsId, deployId: procDefId, token: token }
       flowRecord(params).then(res => {
-        this.flowRecordList = res.data
+        this.flowRecordList = res.data.flowList
         // 流程过程中不存在初始化表单 直接读取的流程变量中存储的表单值
         if (res.data.formData) {
           this.formConf = res.data.formData