From b39bf36c1c380285582b7daffb5dd656aa1e1389 Mon Sep 17 00:00:00 2001
From: zuozhengqing <a13193816592@163.com>
Date: 星期一, 06 十一月 2023 17:20:04 +0800
Subject: [PATCH] 退出动态跳转登录页
---
src/components/makepager/CommonFormTableView.vue | 105 ++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 88 insertions(+), 17 deletions(-)
diff --git a/src/components/makepager/CommonFormTableView.vue b/src/components/makepager/CommonFormTableView.vue
index b955bf0..b8e1f51 100644
--- a/src/components/makepager/CommonFormTableView.vue
+++ b/src/components/makepager/CommonFormTableView.vue
@@ -2,12 +2,18 @@
<div class="page-view">
<el-form ref="form" :model="tableList" :show-message="false" label-position="right">
<el-table
+ ref="fromTable"
:data="tableList.tableData"
:show-summary="showSummary.show"
:summary-method="getSummaries"
:span-method="arraySpanMethod"
style="width: 100%"
+ @selection-change="handleSelectionChange"
+ :row-key="(row) => row.productId"
>
+ <el-table-column v-if="selectBox" type="selection" :reserve-selection="true" width="40" align="center">
+ </el-table-column>
+ <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"
@@ -46,7 +52,6 @@
v-else-if="item.productName"
label=" "
:prop="'tableData.' + scope.$index + '.' + item.prop"
- :rules="[{ required: item.isRequird ? true : false, message: '浜у搧鍚嶇О涓嶈兘涓虹┖' }]"
>
<div class="custom-name">
<el-autocomplete
@@ -63,8 +68,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>
@@ -121,24 +130,47 @@
</el-form-item>
<span v-else>{{ scope.row[item.prop] }}</span>
</template>
- <span v-else>{{ scope.row[item.prop] }}</span>
+ <el-form-item
+ v-else-if="item.inputNumber && selectBox"
+ label=" "
+ :prop="'tableData.' + scope.$index + '.' + item.prop"
+ :rules="[{ required: item.isRequird ? true : false, message: '杈撳叆涓嶈兘涓虹┖' }]"
+ >
+ <el-input-number
+ v-model="scope.row[item.prop]"
+ placeholder=""
+ :min="0"
+ :controls="false"
+ size="mini"
+ style="width: 100%; margin-right: 5px"
+ @change="
+ (val) => {
+ commonInputChange(val, item.prop, scope.row)
+ }
+ "
+ ></el-input-number>
+ </el-form-item>
+ <span v-else style="text-align: right">{{ scope.row[item.prop] }}</span>
</template>
</el-table-column>
+ <slot name="tableButton" />
</el-table>
</el-form>
<div v-if="!detailEnter" style="margin: 10px">
<el-button size="small" type="primary" @click="add">鏂板</el-button>
<!-- <el-button size="small" type="primary" disabled>瀵煎叆鏄庣粏</el-button> -->
<el-button size="small" type="primary" @click="empty">娓呯┖</el-button>
- <el-button size="small" type="primary" @click="recalculate">閲嶇畻</el-button>
+ <el-button size="small" type="primary" @click="recalculate" :disabled="isRecalculate ? false : true"
+ >閲嶇畻</el-button
+ >
</div>
- <div v-if="showSummary.total || showSummary.refundable" style="height: 42px; line-height: 42px">
+ <div v-if="false && (showSummary.total || showSummary.refundable)" style="height: 42px; line-height: 42px">
<el-row :gutter="10">
- <el-col v-if="showSummary.total" :span="2" :offset="22">
+ <el-col v-if="showSummary.total" :span="3" :offset="21">
<span style="font-weight: bold">鍚堣</span>
<span style="margin-left: 10px">{{ total }}</span>
</el-col>
- <el-col v-if="showSummary.refundable" :span="2" :offset="22">
+ <el-col v-if="showSummary.refundable" :span="3" :offset="21">
<span style="font-weight: bold">搴旈��娆�</span>
<span style="margin-left: 10px">0.00</span>
</el-col>
@@ -164,11 +196,16 @@
type: Boolean,
default: false
},
+ selectBox: {
+ type: Boolean,
+ default: false
+ },
productTableList: {
type: Object,
default: () => {
return {
tableData: [], // 鎺ュ彛杩斿洖鏁版嵁
+ isReturn: false,
tableColumn: [
// table琛ㄥ崟
{ label: "", prop: "", min: 200, tooltip: true }
@@ -199,12 +236,20 @@
title: "",
infomation: {}
},
- productIndex: 0
+ productIndex: 0,
+ isRecalculate: true
}
},
created() {
- this.getProductList()
+ if (!this.selectBox) {
+ this.getProductList()
+ }
this.tableList = this.productTableList
+ if (this.tableList.tableData.length === 1 && this.tableList.tableData[0].name === "") {
+ this.isRecalculate = false
+ } else {
+ this.isRecalculate = true
+ }
},
computed: {},
methods: {
@@ -216,10 +261,10 @@
page: 1,
pageSize: 5
}).then((res) => {
- console.log(res.data)
- if (res.data.code === 200) {
- if (res.data.data.data && res.data.data.data.length > 0) {
- this.productList = res.data.data.data
+ console.log(res, "浜у搧鍚嶇О")
+ if (res.code === 200) {
+ if (res.data.data && res.data.data.length > 0) {
+ this.productList = res.data.data
}
}
})
@@ -227,6 +272,7 @@
handleReserve(row) {
return row._id ? row._id : row.id
},
+ // 澶氶��
handleSelectionChange(val) {
this.$emit("getSelectArray", val)
},
@@ -256,7 +302,7 @@
sums[index] = "灏忚:"
return
}
- const title = ["#"]
+ const title = ["#", "浜у搧鍚嶇О"]
// 鍘婚櫎鏌愪簺涓嶉渶瑕佽绠楃殑鏁版嵁
if (title.includes(column.label)) {
sums[index] = ""
@@ -319,10 +365,18 @@
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)
},
// 娓呯┖
empty() {
+ this.isRecalculate = false
this.$emit("emptyProductClick")
},
// 閲嶇畻
@@ -334,6 +388,9 @@
})
.then(() => {
this.$emit("recalculateProductClick")
+ this.tableList.tableData.map((ite) => {
+ ite.total = ite.amount ? ite.amount * ite.price : 1 * ite.price
+ })
})
.catch(() => {})
},
@@ -350,6 +407,7 @@
},
handleSelectClient(item, prop, row) {
// this.clientId = item.id
+ this.isRecalculate = true
console.log(item, prop, row)
this.tableList.tableData.map((ite) => {
if (ite.name === item.name) {
@@ -369,6 +427,7 @@
selClient(item) {
console.log(item)
console.log(this.tableList.tableData)
+ this.isRecalculate = true
// this.editConfig.infomation.client_name = row.name
this.tableList.tableData.map((ite, index) => {
if (index === this.productIndex) {
@@ -394,6 +453,17 @@
})
this.$emit("clearupProduct", this.tableList.tableData)
}
+ // 澶氶�夎缃凡閫変腑
+ // toggleSelection(rows) {
+ // console.log("88888888888888888888888888888888888888888")
+ // console.log(rows)
+ // if (rows) {
+ // rows.forEach((row) => {
+ // this.$refs.fromTable.toggleRowSelection(row, true)
+ // console.log(row)
+ // })
+ // }
+ // }
}
}
</script>
@@ -419,7 +489,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 {
@@ -430,7 +500,8 @@
padding: 0 5px;
}
.el-input__inner {
- text-align: left;
+ // text-align: left;
+ text-align: center !important;
}
}
</style>
--
Gitblit v1.8.0