From 87f7f7a7588e926c6535eea2910ae98ca4101994 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期二, 29 八月 2023 18:52:49 +0800
Subject: [PATCH] 采购 添加 列表编辑 子段补充，联调
---
src/components/makepager/CommonFormTableView.vue | 337 ++++++++++++++++++++++++++++---------------------------
1 files changed, 172 insertions(+), 165 deletions(-)
diff --git a/src/components/makepager/CommonFormTableView.vue b/src/components/makepager/CommonFormTableView.vue
index 035740b..91b6d2c 100644
--- a/src/components/makepager/CommonFormTableView.vue
+++ b/src/components/makepager/CommonFormTableView.vue
@@ -1,13 +1,8 @@
<template>
<div class="page-view">
<el-form ref="form" :model="tableList" :show-message="false" label-position="right">
- <el-table
- :data="tableList.tableData"
- :show-summary="showSummary.show"
- :summary-method="getSummaries"
- :span-method="arraySpanMethod"
- style="width: 100%"
- >
+ <el-table :data="tableList.tableData" style="width: 100%">
+ <el-table-column type="index" label="缂栧彿" width="50" align="center"></el-table-column>
<el-table-column
v-for="(item, i) in tableList.tableColumn"
:key="i"
@@ -24,128 +19,108 @@
</template>
<!-- column鏍峰紡 -->
<template slot-scope="scope">
- <template v-if="!detailEnter">
- <el-form-item
- v-if="item.input"
- label=" "
- :prop="'tableData.' + scope.$index + '.' + item.prop"
- :rules="[{ required: item.isRequird ? true : false, message: '杈撳叆涓嶈兘涓虹┖' }]"
- >
- <el-input
- v-model.trim="scope.row[item.prop]"
- maxlength="50"
+ <!-- <template v-if="!detailEnter"> -->
+ <el-form-item
+ v-if="item.input"
+ label=" "
+ :prop="'tableData.' + scope.$index + '.' + item.prop"
+ :rules="[{ required: item.isRequird ? true : false, message: '杈撳叆涓嶈兘涓虹┖' }]"
+ >
+ <el-input
+ v-model.trim="scope.row[item.prop]"
+ maxlength="50"
+ size="mini"
+ @change="
+ (val) => {
+ commonInputChange(val, item.prop, scope.row)
+ }
+ "
+ ></el-input>
+ </el-form-item>
+ <el-form-item v-else-if="item.productName" label=" " :prop="'tableData.' + scope.$index + '.' + item.prop">
+ <div class="custom-name">
+ <el-autocomplete
+ v-model="scope.row[item.prop]"
+ :fetch-suggestions="querySearchAsync"
+ value-key="name"
size="mini"
- @change="
+ @select="
(val) => {
- commonInputChange(val, item.prop, scope.row)
+ handleSelectClient(val, item.prop, scope.row)
}
"
- ></el-input>
- </el-form-item>
- <el-form-item
- v-else-if="item.productName"
- label=" "
- :prop="'tableData.' + scope.$index + '.' + item.prop"
- >
- <div class="custom-name">
- <el-autocomplete
- v-model="scope.row[item.prop]"
- :fetch-suggestions="querySearchAsync"
- value-key="name"
- size="mini"
- @select="
- (val) => {
- handleSelectClient(val, item.prop, scope.row)
- }
- "
- ></el-autocomplete>
- <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-remove-outline" title="娓呴櫎"></i>
- </div>
+ ></el-autocomplete>
+ <div class="common-select-btn" @click="selClientClick(scope.row, item.prop)">
+ <i class="el-icon-circle-plus-outline" title="閫夋嫨"></i>
</div>
- </el-form-item>
- <el-form-item
- v-else-if="item.date"
- label=" "
- :prop="'tableData.' + scope.$index + '.' + item.prop"
- :rules="[{ required: item.isRequird ? true : false, message: '杈撳叆涓嶈兘涓虹┖' }]"
- >
- <!-- <el-input v-model.trim="scope.row[item.prop]" maxlength="50" size="mini"></el-input> -->
- <el-date-picker v-model="scope.row[item.prop]" type="date" size="mini" style="width: 110px">
- </el-date-picker>
- </el-form-item>
- <el-form-item
- v-else-if="item.inputNumber"
- 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>
- <el-form-item
- v-else-if="item.inputFloat"
- 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"
- :precision="2"
- :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>{{ scope.row[item.prop] }}</span>
- </template>
+ <div class="common-select-btn" @click="clearupClient(scope.row)">
+ <i class="el-icon-remove-outline" title="娓呴櫎"></i>
+ </div>
+ </div>
+ </el-form-item>
+ <el-form-item
+ v-else-if="item.date"
+ label=" "
+ :prop="'tableData.' + scope.$index + '.' + item.prop"
+ :rules="[{ required: item.isRequird ? true : false, message: '杈撳叆涓嶈兘涓虹┖' }]"
+ >
+ <!-- <el-input v-model.trim="scope.row[item.prop]" maxlength="50" size="mini"></el-input> -->
+ <el-date-picker v-model="scope.row[item.prop]" type="date" size="mini" style="width: 110px">
+ </el-date-picker>
+ </el-form-item>
+ <el-form-item
+ v-else-if="item.inputNumber"
+ 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>
+ <el-form-item
+ v-else-if="item.inputFloat"
+ 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"
+ :precision="2"
+ :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>{{ scope.row[item.prop] }}</span>
+ <!-- </template> -->
+ <!-- <span v-else>{{ scope.row[item.prop] }}</span> -->
</template>
</el-table-column>
</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" v-if="recalculateShow" type="primary" @click="recalculate" :disabled="isRecalculate ? false : true"
- >閲嶇畻</el-button
- >
</div>
- <div v-if="showSummary.total || showSummary.refundable" style="height: 42px; line-height: 42px">
- <el-row :gutter="10">
- <el-col v-if="showSummary.total" :span="2" :offset="22">
- <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">
- <span style="font-weight: bold">搴旈��娆�</span>
- <span style="margin-left: 10px">0.00</span>
- </el-col>
- </el-row>
- </div>
- <!-- 鍚堝悓璁㈠崟 -->
+ <!-- 浜у搧鍚嶇О -->
<SelectCommonDialog
v-if="editSelCommonConfig.editVisible"
:edit-common-config="editSelCommonConfig"
@@ -155,7 +130,7 @@
</template>
<script>
-import { getProductList } from "@/api/common/other"
+import { getProductListFromGrpc } from "@/api/productManage/product"
import SelectCommonDialog from "@/views/other/commonDialog/SelectCommonDialog"
export default {
name: "CommmonFormTableView",
@@ -185,16 +160,15 @@
total: false,
refundable: false,
sumProp: [],
- titleProp:["#", "浜у搧鍚嶇О"],
+ titleProp: ["#", "浜у搧鍚嶇О"],
mergeNumber: 1
}
}
},
- recalculateShow:{
- type:[Boolean],
- defalut:true,
- },
-
+ recalculateShow: {
+ type: [Boolean],
+ defalut: true
+ }
},
data() {
return {
@@ -206,33 +180,25 @@
title: "",
infomation: {}
},
- productIndex: 0,
- isRecalculate: true
+ productIndex: 0
}
},
created() {
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: {
// 浜у搧鍚嶇О
async getProductList() {
- await getProductList({
- productName: "",
- productNumber: "",
+ await getProductListFromGrpc({
page: 1,
- pageSize: 5
+ pageSize: 100
}).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
+ if (res.data.data.list && res.data.data.list.length > 0) {
+ this.productList = res.data.data.list
}
}
})
@@ -297,6 +263,7 @@
})
return sums
},
+
// 鏁板瓧鎹㈣涓洪噾棰濇樉绀烘牸寮�
number_format(number, decimals, dec_point, thousands_sep) {
decimals = 2 //杩欓噷榛樿璁剧疆淇濈暀涓や綅灏忔暟锛屼篃鍙互娉ㄩ噴杩欏彞閲囩敤浼犲叆鐨勫弬鏁�
@@ -336,23 +303,7 @@
},
// 娓呯┖
empty() {
- this.isRecalculate = false
this.$emit("emptyProductClick")
- },
- // 閲嶇畻
- recalculate() {
- this.$confirm("纭畾瑕侀噸绠楁槑缁嗘墍鏈夎?", "鎻愮ず", {
- confirmButtonText: "纭畾",
- cancelButtonText: "鍙栨秷",
- type: "warning"
- })
- .then(() => {
- this.$emit("recalculateProductClick")
- this.tableList.tableData.map((ite) => {
- ite.total = ite.amount ? ite.amount * ite.price : 1 * ite.price
- })
- })
- .catch(() => {})
},
// 閫夋嫨浜у搧鍚嶇О鐩稿叧鏂规硶
querySearchAsync(queryString, cb) {
@@ -367,16 +318,41 @@
},
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) {
+ ite.ID = row.ID
ite.amount = item.amount || 1
ite.number = item.number
- ite.price = item.price
- ite.total = item.amount ? item.amount * item.price : 1 * item.price
+ ite.purchasePrice = item.purchasePrice
+ ite.unit = item.unit
+ ite.deliveryTime = item.deliveryTime
+ ite.shippingDuration = item.shippingDuration
+ ite.modelNumber = item.modelNumber
}
})
+ if (this.detailEnter) {
+ this.setEditName(item, row.ID)
+ }
+ },
+ setEditName(item, ID) {
+ let selRow = {
+ ID: ID,
+ deliveryTime: item.deliveryTime,
+ maximumStock: item.maximumStock,
+ minimumStock: item.minimumStock,
+ modelNumber: item.modelNumber,
+ name: item.name,
+ number: item.number,
+ productType: item.productType,
+ purchasePrice: item.purchasePrice,
+ remark: item.remark,
+ shippingDuration: item.shippingDuration,
+ specifications: item.specifications,
+ supplierId: item.supplierId,
+ unit: item.unit
+ }
+ this.$emit("selCommonName", selRow)
},
selClientClick(row, prop) {
console.log(row, prop)
@@ -387,31 +363,62 @@
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) {
+ if (this.detailEnter) {
+ this.tableList.tableData.map((ite) => {
+ ite.ID
ite.name = item.name
ite.amount = item.amount || 1
ite.number = item.number
- ite.price = item.price
- ite.total = item.amount ? item.amount * item.price : 1 * item.price
- }
- })
+ ite.purchasePrice = item.purchasePrice
+ ite.unit = item.unit
+ ite.deliveryTime = item.deliveryTime
+ ite.shippingDuration = item.shippingDuration
+ })
+ this.setEditName(item, this.tableList.tableData[0].ID)
+ } else {
+ this.tableList.tableData.map((ite, index) => {
+ if (index === this.productIndex) {
+ ite.name = item.name
+ 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
+ }
+ })
+ }
},
// 娓呴櫎宸查�夋嫨鐢ㄦ埛
clearupClient(row) {
this.productIndex = row.productId - 1
this.tableList.tableData.map((ite, index) => {
- if (index === this.productIndex) {
+ console.log(row.productId)
+ if (row.productId && row.productId >= 0) {
+ if (index === this.productIndex) {
+ ite.name = ""
+ ite.amount = 1
+ ite.number = ""
+ ite.purchasePrice = 0
+ ite.unit = ""
+ ite.deliveryTime = 0
+ ite.shippingDuration = 0
+ }
+ } else {
ite.name = ""
ite.amount = 1
ite.number = ""
- ite.price = 0
- ite.total = 0
+ ite.purchasePrice = 0
+ ite.unit = ""
+ ite.deliveryTime = 0
+ ite.shippingDuration = 0
}
})
this.$emit("clearupProduct", this.tableList.tableData)
+ },
+ // 鍒犻櫎
+ deleteClient(row) {
+ this.$emit("deleteProduct", row)
}
}
}
--
Gitblit v1.8.0