1.季度审核增加流转记录

kehui-oa-front/src/pages/projectManagements/quarterlyAssessment/quarterlyAssessmentDetail.vue

@@ -53,6 +53,15 @@
         @singleDelete="tableSingleDelete"
       >
       </data-table>
+      <div
+        element-loading-text="拼命加载中"
+        v-for="item in recordsData">
+        <data-table
+          :totalColumnsData="tableColumnsRecordData"
+          :rowsData="item.taskItems"
+        >
+        </data-table>
+      </div>
     </div>
     <!--End Page content-->
   </div>
@@ -78,6 +87,10 @@ export default {
   },
   data () {
     return {
+      tableLoading: true,
+      recordsData: [],
+      tableColumnsRecordData: [],
+      tableRowsRecordData: [],
       isScore: false, //是否是部门打分节点
       isStrategy: true,
       isPlatform: true,
@@ -123,10 +136,44 @@ export default {
     this.projectId = this.$route.params.id
     this.quarter = this.$route.params.quarter
     this.verifyStatus = this.$route.params.verifyStatus
+    this.initRecordTableColumns()
     this.getOffice()
-    // this.initTableColumns()
   },
   methods: {
+    initRecordTableColumns() {
+      this.tableColumnsRecordData = [
+        {
+          label: '审批时间',
+          prop: 'dueDate',
+          show: true
+        },
+        {
+          label: '审批人',
+          prop: 'assigneeName',
+          show: true
+        },
+        {
+          label: '节点名称',
+          prop: 'nodeName',
+          show: true
+        },
+        {
+          label: '审批类型',
+          prop: 'actionName',
+          show: true
+        },
+        {
+          label: '审批意见',
+          prop: 'actionReason',
+          show: true
+        }/*,
+          {
+            label: '操作',
+            prop: 'actionReason',
+            show: true
+          }*/
+      ];
+    },
     cancel () {
       this.$router.push(
         {
@@ -206,7 +253,11 @@ export default {
             params: {id: this.reimburseId}
           })
         } else {
-          this.$message.error(result.data)
+          let data=result.data
+          if(result.data==null || result.data=="null"){
+          data="操作失败"
+          }
+          this.$message.error(data)
         }
       })
     },
@@ -254,6 +305,14 @@ export default {
             }
             this.tableRowsData.push(project)
             this.tableTotalPage = result.data.total
+
+            for (let i = 0; i < project.ext.quarterRecord.ls.length; i++) {
+              let record = project.ext.quarterRecord.ls[i].taskItems;
+              for (let j = 0; j < record.length; j++) {
+                record[j].dueDate = record[j].dueDate ? moment(record[j].dueDate).format('YYYY-MM-DD HH:mm:ss') : '';
+              }
+            }
+            this.recordsData=project.ext.quarterRecord.ls
           }
           if (result.data.ls[0].ext.taskName == '部门主任评级') {
             this.isScore = true
@@ -265,10 +324,7 @@ export default {
     },
     //初始化tableColumns
     initTableColumns () {
-      console.log('谁最快')
       if (!this.isOffice) {
-        console.log('this.isOffice', this.isOffice)
-        console.log('不是办公室')
         this.tableColumnsData = [
           {
             label: '季度',