1

e05c6551 · liudong1993 · 35fcc7de · e05c6551
Commit e05c6551 authored Apr 15, 2024 by liudong1993
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 5 deletions

groupApproval.vue src/components/FinancialModule/groupApproval.vue +10 -5

No files found.
--- a/src/components/FinancialModule/groupApproval.vue
+++ b/src/components/FinancialModule/groupApproval.vue
@@ -167,8 +167,13 @@
                    </template>
                </el-table-column>
                <el-table-column v-if="active==1"
-                prop="AuditEmpName"
+                prop=""
-                label="审批人"></el-table-column>
+                label="审批人" width="130px">
+                <template slot-scope="scope">
+                        <p>待审核：{{scope.row.AuditEmpName}}</p>
+                        <p v-if="scope.row.FinanceAuditEmpName">已审核：{{scope.row.FinanceAuditEmpName}}/{{scope.row.FinanceOutGroupAuditDate}}</p>
+                    </template>
+            </el-table-column>
                <el-table-column v-if="active==2"
                prop=""
                label="审批结果">
@@ -179,10 +184,10 @@
                </el-table-column>
                <el-table-column v-if="active==2"
                prop=""
-                label="审批信息" width="100">
+                label="审批信息" width="130px">
                    <template slot-scope="scope">
-                        <p>{{scope.row.AuditEmpName}}</p>
+                        <p>{{scope.row.AuditEmpName}}/{{scope.row.OutGroupAuditDate}}</p>
-                        <p>{{scope.row.OutGroupAuditDate}}</p>
+                        <p v-if="scope.row.FinanceAuditEmpName">{{scope.row.FinanceAuditEmpName}}/{{scope.row.FinanceOutGroupAuditDate}}</p>
                    </template>
                </el-table-column>
                <el-table-column