From 5d0120d2e8a6e5cd2e1e95d4c5ffeecf5fc1c4a6 Mon Sep 17 00:00:00 2001
From: songshankun <songshankun@foxmail.com>
Date: 星期二, 10 十月 2023 15:35:58 +0800
Subject: [PATCH] Merge branch 'dev' into songshankun/adjust-style
---
src/components/makepager/CommonFormTableView.vue | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/src/components/makepager/CommonFormTableView.vue b/src/components/makepager/CommonFormTableView.vue
index 55fee16..80520cc 100644
--- a/src/components/makepager/CommonFormTableView.vue
+++ b/src/components/makepager/CommonFormTableView.vue
@@ -8,6 +8,7 @@
:span-method="arraySpanMethod"
style="width: 100%"
>
+ <el-table-column v-if="tableList.isReturn" type="index" label="#" width="50" align="center"></el-table-column>
<el-table-column
v-for="(item, i) in tableList.tableColumn"
:key="i"
@@ -62,8 +63,12 @@
<div class="common-select-btn" @click="selClientClick(scope.row, item.prop)">
<i class="el-icon-circle-plus-outline" title="閫夋嫨"></i>
</div>
- <div class="common-select-btn" @click="clearupClient(scope.row)">
- <i class="el-icon-edit-outline" title="娓呴櫎"></i>
+ <div
+ v-if="scope.row[item.prop] && scope.row[item.prop].length > 0"
+ class="common-select-btn"
+ @click="clearupClient(scope.row)"
+ >
+ <i class="el-icon-remove-outline" title="娓呴櫎"></i>
</div>
</div>
</el-form-item>
@@ -120,7 +125,7 @@
</el-form-item>
<span v-else>{{ scope.row[item.prop] }}</span>
</template>
- <span v-else>{{ scope.row[item.prop] }}</span>
+ <span v-else style="text-align: right">{{ scope.row[item.prop] }}</span>
</template>
</el-table-column>
</el-table>
@@ -170,6 +175,7 @@
default: () => {
return {
tableData: [], // 鎺ュ彛杩斿洖鏁版嵁
+ isReturn: false,
tableColumn: [
// table琛ㄥ崟
{ label: "", prop: "", min: 200, tooltip: true }
@@ -326,6 +332,13 @@
commonInputChange(val, prop, row) {
console.log(val, prop)
console.log(row)
+ if (prop === "amount") {
+ this.tableList.tableData.map((ite) => {
+ if (ite.name === row.name) {
+ ite.total = row.amount * row.price
+ }
+ })
+ }
this.$emit("inputContent", val, prop, row)
},
// 娓呯┖
@@ -432,7 +445,7 @@
}
.el-table__footer-wrapper tbody td.el-table__cell {
background-color: #fff;
- text-align: right;
+ // text-align: right;
font-weight: bold;
}
.el-input--suffix .el-input__inner {
@@ -443,7 +456,8 @@
padding: 0 5px;
}
.el-input__inner {
- text-align: left;
+ // text-align: left;
+ text-align: center !important;
}
}
</style>
--
Gitblit v1.8.0