From bfdb9298d906c0dc262d0d441ac5b91d44f1e8a8 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期二, 14 五月 2024 11:31:20 +0800
Subject: [PATCH] 11

---
 src/views/project/tallage/index.vue               |   10 +++++++---
 src/views/project/tallage/computingBill/index.vue |    2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/views/project/tallage/computingBill/index.vue b/src/views/project/tallage/computingBill/index.vue
index 3d1becf..8e485f2 100644
--- a/src/views/project/tallage/computingBill/index.vue
+++ b/src/views/project/tallage/computingBill/index.vue
@@ -996,7 +996,7 @@
       this.title = "鏂板涓撳璐规眹鎬诲崟";
       //鑾峰彇鐧诲綍鑰呬俊鎭�
       getUserProfile().then(res => {
-        this.form.username = res.createBy;
+        this.form.username = res.data.createBy;
       });
     },
 
diff --git a/src/views/project/tallage/index.vue b/src/views/project/tallage/index.vue
index af1f8e5..f15e25b 100644
--- a/src/views/project/tallage/index.vue
+++ b/src/views/project/tallage/index.vue
@@ -88,7 +88,7 @@
           <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="缁忓姙浜�" align="center" prop="username" />
+      <!-- <el-table-column label="缁忓姙浜�" align="center" prop="username" /> -->
       <el-table-column
         label="鐢宠鍗曞彿"
         width="180"
@@ -108,10 +108,14 @@
           />
         </template>
       </el-table-column>
-      <el-table-column label="鎬婚噾棰�" align="center" prop="taxamount" />
+      <!-- <el-table-column label="鎬婚噾棰�" align="center" prop="taxamount" /> -->
 
       <el-table-column label="绠楃◣鏃堕棿" align="center" prop="taxedtime" />
-      <el-table-column label="浠樻鐘舵��" align="center" prop="isdistribute" />
+      <el-table-column label="浠樻鐘舵��" align="center" prop="isdistribute">
+        <template slot-scope="scope">
+          <span>{{ scope.row.isdistribute == "0" ? "鏈粯娆�" : "宸蹭粯娆�" }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="浠樻鏃ユ湡" align="center" prop="riqi" />
       <el-table-column label="鎿嶄綔" width="280" align="center">
         <template slot-scope="scope">

--
Gitblit v1.9.3