DVP编制-基本信息-审批记录 查询修改

src/providers/http.js

@@ -540,6 +540,10 @@ export const api = {
   getApprovalRecordList: function (paramObj) {
     return fetch('/DFMEA/dvp/common/getApprovalRecordList',paramObj);
   },
+  // dvp编制-基本信息-审批记录始化
+  getBaseInfoApprovalRecordList: function (paramObj) {
+    return fetch('/DFMEA/dvp/common/getBaseInfoApprovalRecordList',paramObj);
+  },
   // dvp编制-基本信息-日志管理初始化
   initDvpLogManage: function (paramObj) {
     return fetch('/DFMEA/dvp/common/initDvpLogManage', paramObj);

src/views/componentsDVP/baseInfo/approvalRecord/index.vue

@@ -18,15 +18,6 @@
         <template slot="sortNumber" slot-scope="text, row, index">
           {{ (pagination.pageNo - 1) * pagination.pageSize + 1 + index }}
         </template>
-        <template slot="approveResult" slot-scope="text, record">
-          {{
-            record.approveResult == 1
-              ? $t('global-constant.approval-status.agree')
-              : record.approveResult == 2
-                ? $t('global-constant.approval-status.reject')
-                : "-"
-          }}
-        </template>
       </a-table>
     </div>
   </a-card>
@@ -98,13 +89,22 @@ export default {
             customRender: "sortNumber"
           }
         },
+        // 审批性质
+        {
+          title: () => this.$t('base.info.approval-nature'),
+          align: "center",
+          width: 150,
+          dataIndex: "taskName",
+          key: "taskName",
+          ellipsis: true
+        },
         // 审批人
         {
           title: () => this.$t('base.info.reviewer'),
           align: "center",
           width: 150,
-          dataIndex: "approver",
-          key: "approver",
+          dataIndex: "creator",
+          key: "creator",
           ellipsis: true
         },
         // 审批角色
@@ -112,8 +112,8 @@ export default {
           title: () => this.$t('base.info.approval-role'),
           align: "center",
           width: 150,
-          dataIndex: "approveRole",
-          key: "approveRole",
+          dataIndex: "roleName",
+          key: "roleName",
           ellipsis: true
         },
         // 审批结果
@@ -121,11 +121,8 @@ export default {
           title: () => this.$t('base.info.review-result'),
           align: "center",
           width: 150,
-          dataIndex: "approveResult", //1-同意，2-驳回，0-进行中
-          scopedSlots: {
-            customRender: "approveResult"
-          },
-          key: "approveResult",
+          dataIndex: "taskStateName",
+          key: "taskStateName",
           ellipsis: true
         },
         // 审批意见
@@ -133,26 +130,26 @@ export default {
           title: () => this.$t('base.info.review-comments'),
           align: "center",
           width: 150,
-          dataIndex: "approveOpinion",
-          key: "approveOpinion",
+          dataIndex: "voteContent",
+          key: "voteContent",
           ellipsis: true
         },
         // 审批时间
         {
           title: () => this.$t('base.info.review-time'),
           align: "center",
-          dataIndex: "approveTime",
+          dataIndex: "taskEndTime",
           width: 150,
-          key: "approveTime",
+          key: "taskEndTime",
           ellipsis: true
         },
         // 审批类型
         {
           title: () => this.$t('base.info.approval-type'),
           align: "center",
-          dataIndex: "taskType",
+          dataIndex: "approvalTaskType",
           width: 150,
-          key: "taskType",
+          key: "approvalTaskType",
           ellipsis: true
         }
       ],
@@ -177,7 +174,7 @@ export default {
         pageSize: this.pagination.pageSize
       };
       this.loading = true;
-      await this.$api.getApprovalRecordList(data).then((response) => {
+      await this.$api.getBaseInfoApprovalRecordList(data).then((response) => {
         this.loading = false;
         if (response.flag) {
           if (response.data && response.data.data) {

src/views/fullVehicle/baseInfo/approvalRecord/index.vue

@@ -18,15 +18,6 @@
         <template slot="sortNumber" slot-scope="text, row, index">
           {{ (pagination.pageNo - 1) * pagination.pageSize + 1 + index }}
         </template>
-        <template slot="approveResult" slot-scope="text, record">
-          {{
-            record.approveResult == 1
-              ? $t('global-constant.approval-status.agree')
-              : record.approveResult == 2
-                ? $t('global-constant.approval-status.reject')
-                : "-"
-          }}
-        </template>
       </a-table>
     </div>
   </a-card>
@@ -98,13 +89,22 @@ export default {
             customRender: "sortNumber"
           }
         },
+        // 审批性质
+        {
+          title: () => this.$t('base.info.approval-nature'),
+          align: "center",
+          width: 150,
+          dataIndex: "taskName",
+          key: "taskName",
+          ellipsis: true
+        },
         // 审批人
         {
           title: () => this.$t('base.info.reviewer'),
           align: "center",
           width: 150,
-          dataIndex: "approver",
-          key: "approver",
+          dataIndex: "creator",
+          key: "creator",
           ellipsis: true
         },
         // 审批角色
@@ -112,8 +112,8 @@ export default {
           title: () => this.$t('base.info.approval-role'),
           align: "center",
           width: 150,
-          dataIndex: "approveRole",
-          key: "approveRole",
+          dataIndex: "roleName",
+          key: "roleName",
           ellipsis: true
         },
         // 审批结果
@@ -121,11 +121,8 @@ export default {
           title: () => this.$t('base.info.review-result'),
           align: "center",
           width: 150,
-          dataIndex: "approveResult", //1-同意，2-驳回，0-进行中
-          scopedSlots: {
-            customRender: "approveResult"
-          },
-          key: "approveResult",
+          dataIndex: "taskStateName",
+          key: "taskStateName",
           ellipsis: true
         },
         // 审批意见
@@ -133,26 +130,26 @@ export default {
           title: () => this.$t('base.info.review-comments'),
           align: "center",
           width: 150,
-          dataIndex: "approveOpinion",
-          key: "approveOpinion",
+          dataIndex: "voteContent",
+          key: "voteContent",
           ellipsis: true
         },
         // 审批时间
         {
           title: () => this.$t('base.info.review-time'),
           align: "center",
-          dataIndex: "approveTime",
+          dataIndex: "taskEndTime",
           width: 150,
-          key: "approveTime",
+          key: "taskEndTime",
           ellipsis: true
         },
         // 审批类型
         {
           title: () => this.$t('base.info.approval-type'),
           align: "center",
-          dataIndex: "taskType",
+          dataIndex: "approvalTaskType",
           width: 150,
-          key: "taskType",
+          key: "approvalTaskType",
           ellipsis: true
         }
       ],
@@ -177,7 +174,7 @@ export default {
         pageSize: this.pagination.pageSize
       };
       this.loading = true;
-      await this.$api.getApprovalRecordList(data).then((response) => {
+      await this.$api.getBaseInfoApprovalRecordList(data).then((response) => {
         if (response.flag) {
           if (response.data && response.data.data) {
             this.approvalRecordData = response.data.data;

src/views/systemDVP/baseInfo/approvalRecord/index.vue

@@ -18,15 +18,6 @@
         <template slot="sortNumber" slot-scope="text, row, index">
           {{ (pagination.pageNo - 1) * pagination.pageSize + 1 + index }}
         </template>
-        <template slot="approveResult" slot-scope="text, record">
-          {{
-            record.approveResult == 1
-                ? $t('global-constant.approval-status.agree')
-                : record.approveResult == 2
-                ? $t('global-constant.approval-status.reject')
-                : "-"
-          }}
-        </template>
       </a-table>
     </div>
   </a-card>
@@ -96,13 +87,22 @@ export default {
             customRender: "sortNumber"
           }
         },
+        // 审批性质
+        {
+          title: () => this.$t('base.info.approval-nature'),
+          align: "center",
+          width: 150,
+          dataIndex: "taskName",
+          key: "taskName",
+          ellipsis: true
+        },
         // 审批人
         {
           title: () => this.$t('base.info.reviewer'),
           align: "center",
           width: 150,
-          dataIndex: "approver",
-          key: "approver",
+          dataIndex: "creator",
+          key: "creator",
           ellipsis: true
         },
         // 审批角色
@@ -110,8 +110,8 @@ export default {
           title: () => this.$t('base.info.approval-role'),
           align: "center",
           width: 150,
-          dataIndex: "approveRole",
-          key: "approveRole",
+          dataIndex: "roleName",
+          key: "roleName",
           ellipsis: true
         },
         // 审批结果
@@ -119,11 +119,8 @@ export default {
           title: () => this.$t('base.info.review-result'),
           align: "center",
           width: 150,
-          dataIndex: "approveResult", //1-同意，2-驳回，0-进行中
-          scopedSlots: {
-            customRender: "approveResult"
-          },
-          key: "approveResult",
+          dataIndex: "taskStateName",
+          key: "taskStateName",
           ellipsis: true
         },
         // 审批意见
@@ -131,26 +128,26 @@ export default {
           title: () => this.$t('base.info.review-comments'),
           align: "center",
           width: 150,
-          dataIndex: "approveOpinion",
-          key: "approveOpinion",
+          dataIndex: "voteContent",
+          key: "voteContent",
           ellipsis: true
         },
         // 审批时间
         {
           title: () => this.$t('base.info.review-time'),
           align: "center",
-          dataIndex: "approveTime",
+          dataIndex: "taskEndTime",
           width: 150,
-          key: "approveTime",
+          key: "taskEndTime",
           ellipsis: true
         },
         // 审批类型
         {
           title: () => this.$t('base.info.approval-type'),
           align: "center",
-          dataIndex: "taskType",
+          dataIndex: "approvalTaskType",
           width: 150,
-          key: "taskType",
+          key: "approvalTaskType",
           ellipsis: true
         }
       ],
@@ -175,7 +172,7 @@ export default {
         pageSize: this.pagination.pageSize
       };
       this.loading = true;
-      await this.$api.getApprovalRecordList(data).then((response) => {
+      await this.$api.getBaseInfoApprovalRecordList(data).then((response) => {
         if (response.flag) {
           if (response.data && response.data.data) {
             this.approvalRecordData = response.data.data;