Browse Source

1.资产绩效申报待办列表页面修改
2.首页新增资产 绩效提成审批 tab

GouGengquan 1 year ago
parent
commit
a27e108cad

+ 5 - 1
src/api/modules/commissonDeclare.js

@@ -34,7 +34,11 @@ export default {
     return request.post(`commissionDeclare/assets`, params)
   },
   // 资产提成申报待审核列表
-  assetsCheckList(params){
+  assetsCheckPage(params){
     return request.get(`commissionDeclare/assets/check`, { params: params })
+  },
+  // 资产提成申报待审核集合
+  assetsCheckList(params){
+    return request.get(`commissionDeclare/assets/check/list`, { params: params })
   }
 }

File diff suppressed because it is too large
+ 109 - 1
src/views/complex/index.vue


+ 4 - 4
src/views/income/assets/checkList.vue

@@ -31,17 +31,17 @@
             <parentTable :data="pageData.records" slot="table" style="width: 100%;">
                 <el-table-column label="订单号" width="150" align="center">
                     <template slot-scope="{row}">
-                        <span>{{ row.orderId }}</span>
+                        <span>{{ row.assetsSimple.orderId }}</span>
                     </template>
                 </el-table-column>
                 <el-table-column label="项目名称" width="150" align="center">
                     <template slot-scope="{row}">
-                        <span>{{ row.name ? row.name : row.orderName }}</span>
+                        <span>{{ row.assetsSimple.name ? row.assetsSimple.name : row.assetsSimple.orderName }}</span>
                     </template>
                 </el-table-column>
                 <el-table-column label="报告号" width="200" align="center">
                     <template slot-scope="{row}">
-                        <span>{{ row.reportNo ? row.reportNo : '--' }}</span>
+                        <span>{{ row.assetsSimple.reportNo ? row.assetsSimple.reportNo : '--' }}</span>
                     </template>
                 </el-table-column>
                 <el-table-column label="申报人" align="center">
@@ -143,7 +143,7 @@ export default {
         },
 
         getList() {
-            this.$api.commissonDeclare.assetsCheckList(this.listQuery).then(res => {
+            this.$api.commissonDeclare.assetsCheckPage(this.listQuery).then(res => {
                 if (res.code === 200) {
                     this.pageData = res.data;
                 }