From 70d58992dfed107ff4fa0d4b2b336dcf731ef14d Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 10 四月 2024 10:08:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_xp'
---
src/views/system/calculate/record/index.vue | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/views/system/calculate/record/index.vue b/src/views/system/calculate/record/index.vue
index bde3514..e132a74 100644
--- a/src/views/system/calculate/record/index.vue
+++ b/src/views/system/calculate/record/index.vue
@@ -90,7 +90,7 @@
<div v-if="scope.row.unitId == 2">鎴愰兘x杩愮淮</div>
</template>
</el-table-column>
- <el-table-column label="鎬绘湇鍔¤垂" align="center" prop="totalMount" />
+ <el-table-column label="鎬绘湇鍔¤垂" align="center" prop="totalAmount" />
<el-table-column label="鎵ｅ噺鏈嶅姟璐�" align="center" prop="deductAmount" />
<el-table-column label="鑰冩牳鍒嗘暟" align="center" prop="score" />
<el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
@@ -144,8 +144,8 @@
placeholder="璇烽�夋嫨鏍哥畻璁板綍鏃ユ湡">
</el-date-picker>
</el-form-item>
- <el-form-item label="鎬绘湇鍔¤垂" prop="totalMount">
- <el-input v-model="form.totalMount" placeholder="璇疯緭鍏ユ�绘湇鍔¤垂" />
+ <el-form-item label="鎬绘湇鍔¤垂" prop="totalAmount">
+ <el-input v-model="form.totalAmount" placeholder="璇疯緭鍏ユ�绘湇鍔¤垂" />
</el-form-item>
<el-form-item label="鎵ｅ噺鏈嶅姟璐�" prop="deductAmount">
<el-input v-model="form.deductAmount" placeholder="璇疯緭鍏ユ墸鍑忔湇鍔¤垂" />
@@ -194,7 +194,7 @@
date: null,
ruleId: null,
unitId: null,
- totalMount: null,
+ totalAmount: null,
deductAmount: null,
score: null
},
@@ -233,7 +233,7 @@
date: null,
ruleId: null,
unitId: null,
- totalMount: null,
+ totalAmount: null,
deductAmount: null,
score: null
};
--
Gitblit v1.8.0