From c35ccb51c02c8852e345b831ef5d2dd96c2cf500 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期三, 30 八月 2023 16:39:33 +0800
Subject: [PATCH] Merge branch 'master' of ssh://192.168.5.5:29418/web/SRM
---
src/components/makepager/CommonFormTableView.vue | 89 +++++++++++++++++++++++++++++++++++---------
1 files changed, 70 insertions(+), 19 deletions(-)
diff --git a/src/components/makepager/CommonFormTableView.vue b/src/components/makepager/CommonFormTableView.vue
index 91b6d2c..348fce9 100644
--- a/src/components/makepager/CommonFormTableView.vue
+++ b/src/components/makepager/CommonFormTableView.vue
@@ -1,8 +1,12 @@
<template>
<div class="page-view">
- <el-form ref="form" :model="tableList" :show-message="false" label-position="right">
- <el-table :data="tableList.tableData" style="width: 100%">
- <el-table-column type="index" label="缂栧彿" width="50" align="center"></el-table-column>
+ <el-form ref="form" :model="tableList" :show-message="false" label-position="right"
+ >
+ <el-table :data="tableList.tableData" style="width: 100%"
+ :show-summary="showSummary.show"
+ :summary-method="getSummaries"
+ :span-method="arraySpanMethod">
+ <el-table-column type="index" v-if="tableList.tableColumn.length>0" label="缂栧彿" width="50" align="center"></el-table-column>
<el-table-column
v-for="(item, i) in tableList.tableColumn"
:key="i"
@@ -43,6 +47,7 @@
v-model="scope.row[item.prop]"
:fetch-suggestions="querySearchAsync"
value-key="name"
+ style='width:calc(100% - 70px)'
size="mini"
@select="
(val) => {
@@ -50,11 +55,14 @@
}
"
></el-autocomplete>
- <div class="common-select-btn" @click="selClientClick(scope.row, item.prop)">
+ <div class="common-select-btn" @click="selClientClick(scope.row, item.prop,scope)">
<i class="el-icon-circle-plus-outline" title="閫夋嫨"></i>
</div>
- <div class="common-select-btn" @click="clearupClient(scope.row)">
+ <div class="common-select-btn" @click="clearupClient(scope.row,scope)">
<i class="el-icon-remove-outline" title="娓呴櫎"></i>
+ </div>
+ <div class="common-select-btn" v-if="scope.$index!=0" @click="deleteClient(scope.row,scope)">
+ <i class="el-icon-delete" title="鍒犻櫎"></i>
</div>
</div>
</el-form-item>
@@ -94,6 +102,24 @@
:prop="'tableData.' + scope.$index + '.' + item.prop"
:rules="[{ required: item.isRequird ? true : false, message: '杈撳叆涓嶈兘涓虹┖' }]"
>
+ <template v-if="item.multiply">
+ <el-input-number
+ :value="scope.row[showSummary.multiply[0]]*scope.row[showSummary.multiply[1]]"
+ placeholder=""
+ :disabled="item.disabled"
+ :min="0"
+ :precision="2"
+ :controls="false"
+ size="mini"
+ style="width: 100%; margin-right: 5px"
+ @input="
+ (val) => {
+ commonInputChange(val, item.prop, scope.row)
+ }
+ "
+ ></el-input-number>
+ </template>
+ <template v-else>
<el-input-number
v-model="scope.row[item.prop]"
placeholder=""
@@ -108,6 +134,7 @@
}
"
></el-input-number>
+ </template>
</el-form-item>
<span v-else>{{ scope.row[item.prop] }}</span>
<!-- </template> -->
@@ -124,13 +151,14 @@
<SelectCommonDialog
v-if="editSelCommonConfig.editVisible"
:edit-common-config="editSelCommonConfig"
+ :sign="sign"
@selClient="selClient"
/>
</div>
</template>
<script>
-import { getProductListFromGrpc } from "@/api/productManage/product"
+import { getProductListFromGrpc,getProductList } from "@/api/productManage/product"
import SelectCommonDialog from "@/views/other/commonDialog/SelectCommonDialog"
export default {
name: "CommmonFormTableView",
@@ -139,6 +167,10 @@
detailEnter: {
type: Boolean,
default: false
+ },
+ sign:{
+ type:String,
+ default:''
},
productTableList: {
type: Object,
@@ -160,6 +192,7 @@
total: false,
refundable: false,
sumProp: [],
+ multiply:[],
titleProp: ["#", "浜у搧鍚嶇О"],
mergeNumber: 1
}
@@ -168,7 +201,7 @@
recalculateShow: {
type: [Boolean],
defalut: true
- }
+ },
},
data() {
return {
@@ -188,10 +221,16 @@
this.tableList = this.productTableList
},
computed: {},
+ watch:{
+ productTableList(){
+ this.tableList = this.productTableList
+ }
+ },
methods: {
// 浜у搧鍚嶇О
async getProductList() {
- await getProductListFromGrpc({
+ let fn = this.sign == "purchase" ? getProductList : getProductListFromGrpc;
+ await fn({
page: 1,
pageSize: 100
}).then((res) => {
@@ -259,6 +298,7 @@
}
if (column.property === "total") {
this.total = sums[index]
+ this.$emit('getSummaries',this.total)
}
})
return sums
@@ -354,9 +394,9 @@
}
this.$emit("selCommonName", selRow)
},
- selClientClick(row, prop) {
+ selClientClick(row, prop,scope) {
console.log(row, prop)
- this.productIndex = row.productId - 1
+ this.productIndex = scope.$index
this.editSelCommonConfig.title = "浜у搧鍚嶇О"
this.editSelCommonConfig.editVisible = true
},
@@ -379,22 +419,28 @@
this.tableList.tableData.map((ite, index) => {
if (index === this.productIndex) {
ite.name = item.name
+ ite.productId = item.ID
ite.amount = item.amount || 1
ite.number = item.number
ite.purchasePrice = item.purchasePrice
ite.unit = item.unit
ite.deliveryTime = item.deliveryTime
ite.shippingDuration = item.shippingDuration
+ this.$set(this.tableList.tableData,index,ite)
+ this.$forceUpdate()
}
})
+
+
+ console.log(this.tableList.tableData,'=====chanp')
}
},
// 娓呴櫎宸查�夋嫨鐢ㄦ埛
- clearupClient(row) {
- this.productIndex = row.productId - 1
+ clearupClient(row,scope) {
+ this.productIndex = scope.$index
this.tableList.tableData.map((ite, index) => {
- console.log(row.productId)
- if (row.productId && row.productId >= 0) {
+ console.log(scope.$index)
+ if (scope.$index && scope.$index >= 0) {
if (index === this.productIndex) {
ite.name = ""
ite.amount = 1
@@ -416,10 +462,14 @@
})
this.$emit("clearupProduct", this.tableList.tableData)
},
- // 鍒犻櫎
- deleteClient(row) {
- this.$emit("deleteProduct", row)
- }
+ deleteClient(row,scope){
+ if(this.tableList.tableData.length==1){
+ this.$message.error('鑷冲皯淇濈暀涓�鏉★紝涓嶈兘鍒櫎浜嗭紒')
+ return true;
+ }
+ this.tableList.tableData.splice(scope.$index,1)
+ },
+
}
}
</script>
@@ -427,6 +477,7 @@
<!-- Add "scoped" attribute to limit CSS to this component only -->
<style lang="scss" scoped>
.page-view {
+ min-width:100px;
.el-form-item {
margin-bottom: 0;
.custom-name {
@@ -445,7 +496,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 {
--
Gitblit v1.8.0