对接设计符合性确认

jero-web/src/views/processCenter/components/circulationHistory.vue

@@ -67,12 +67,6 @@
 
   export default {
     name: 'circulationHistory',
-    props: {
-      url: {
-        type: String,
-        default: '/workFlow/get_list_by_instance'
-      }
-    },
     data() {
       return {
         dataSource: [],
@@ -147,9 +141,8 @@
       getList() {
         let query = {
           prcNum: this.$route.query.prcNum,
-          prcId: this.$route.query.actiProcInstId
         }
-        getAction(this.url, query).then((res) => {
+        getAction('/workFlow/get_list_by_instance', query).then((res) => {
           this.dataSource = res
         })
       },

jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue

@@ -10,11 +10,12 @@
         <a-col :span="24">
           <div class="box-title-text">
             <div class="title-text">
-              <span class="Required">*</span>
+              <span class="Required" v-if="$route.query.TaskKey == 'zrrclrw'">*</span>
               <span class="title-text-text" :title="$t('reviewResults')">{{$t('reviewResults')}}</span>
             </div>
-            <a-form-model-item class="itemModel" prop="reviewResult">
+            <a-form-model-item class="itemModel" :prop="$route.query.TaskKey == 'fqrsh'?'':'reviewResult'">
               <a-radio-group style="margin-top: 2px"
+                             :disabled="$route.query.TaskKey == 'fqrsh'?true:false"
                              class="box-input"
                              v-model="formInline.reviewResult">
                 <a-radio value="conformity">
@@ -80,7 +81,7 @@
     mounted() {
       if (this.queryBy) {
         this.formInline.reviewResult = this.queryBy.reviewResult || undefined
-        this.formInline.approvalOpinion = this.queryBy.approvalOpinion || ''
+        // this.formInline.approvalOpinion = this.queryBy.approvalOpinion || ''
         this.formInline = { ...this.formInline }
       }
     },

jero-web/src/views/processCenter/components/taskCirculationHistory.vue

@@ -0,0 +1,110 @@
+<template>
+  <div class="box">
+    <div class="box-text">
+      <div class="header-text">
+        {{$t('circulationHistory')}}
+      </div>
+    </div>
+    <div style="width: 100%">
+      <a-table
+        ref="table"
+        :loading="loading"
+        :pagination="false"
+        :scroll="{x: true}"
+        :data-source="dataSource"
+        :columns="columns"
+      >
+        <span slot="approvalResult" slot-scope="text,result">
+            {{approvalResult[text]}}
+        </span>
+      </a-table>
+    </div>
+  </div>
+</template>
+
+<script>
+  import { getAction, postAction, downloadFile } from '@/api/manage'
+  import moment from 'moment'
+  import { Base64 } from 'js-base64'
+
+  export default {
+    name: 'circulationHistory',
+    data() {
+      return {
+        dataSource: [],
+        loading: false,
+        approvalResult: {
+          0: this.$t('agree'),
+          1: this.$t('disagree'),
+          2: this.$t('terminationProcess'),
+          3: this.$t('issue')
+        },
+        columns: [
+          {
+            title: this.$t('result'),
+            dataIndex: 'approvalResult',
+            align: 'center',
+            scopedSlots: { customRender: 'approvalResult' }
+          },
+          {
+            title: this.$t('opinion'),
+            dataIndex: 'approvalOpinion',
+            align: 'center'
+          },
+          {
+            title: this.$t('operationNode'),
+            dataIndex: 'name',
+            align: 'center'
+          },
+          {
+            title: this.$t('Operator'),
+            dataIndex: 'assignee',
+            align: 'center'
+          },
+          {
+            title: this.$t('operationTime'),
+            dataIndex: 'createTime',
+            align: 'center',
+            customRender: function(t, r, index) {
+              return moment(t).format('YYYY-MM-DD HH:mm:ss')
+            }
+          }
+        ],
+        downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download'
+      }
+    },
+    mounted() {
+      this.getList()
+    },
+    methods: {
+      getList() {
+        let query = {
+          prcId: this.$route.query.actiProcInstId
+        }
+        getAction('/workFlow/queryProcessHistoryByPrcId', query).then((res) => {
+          this.dataSource = res
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped lang="less">
+  .box {
+    padding: 0 24px 24px 24px;
+    box-sizing: border-box;
+  }
+
+  .box-text {
+    display: flex;
+    justify-content: space-between;
+    height: 60px;
+    line-height: 40px;
+
+    .header-text {
+      font-size: 16px;
+      font-weight: 400;
+      color: #000F16;
+    }
+  }
+</style>