From 2260b47026088827f177bec0931ded0fd73d97ba Mon Sep 17 00:00:00 2001
From: zuozhengqing <a13193816592@163.com>
Date: 星期二, 26 三月 2024 10:48:43 +0800
Subject: [PATCH] 销售明细单发货弹窗样式优化
---
src/components/makepager/CommonFormTableView.vue | 488 +++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 443 insertions(+), 45 deletions(-)
diff --git a/src/components/makepager/CommonFormTableView.vue b/src/components/makepager/CommonFormTableView.vue
index 128caa4..0fb598e 100644
--- a/src/components/makepager/CommonFormTableView.vue
+++ b/src/components/makepager/CommonFormTableView.vue
@@ -1,15 +1,22 @@
<template>
<div class="page-view">
- <el-form ref="form" :model="productTableList" :show-message="false" label-position="right">
+ <el-form ref="form" :model="tableList" :show-message="false" label-position="right">
<el-table
- :data="productTableList.tableData"
+ ref="fromTable"
+ :border="isBorder"
+ :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 productTableList.tableColumn"
+ v-for="(item, i) in tableList.tableColumn"
:key="i"
:prop="item.prop"
:label="item.label"
@@ -35,12 +42,51 @@
v-model.trim="scope.row[item.prop]"
maxlength="50"
size="mini"
+ :disabled="!isOperate"
@change="
(val) => {
- commonInputChange(val, item.prop, scope.row)
+ commonInputChange(val, item.prop, scope.row, scope)
}
"
></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"
+ :disabled="!isOperate"
+ size="mini"
+ @select="
+ (val) => {
+ handleSelectClient(val, item.prop, scope.row)
+ }
+ "
+ ></el-autocomplete>
+
+ <div
+ v-if="scope.row[item.prop] && scope.row[item.prop].length > 0 && isOperate"
+ class="common-select-btn"
+ @click="handleEditClient(scope, item.prop)"
+ >
+ <i class="el-icon-edit" title="缂栬緫"></i>
+ </div>
+ <div
+ v-if="scope.row[item.prop] && scope.row[item.prop].length > 0 && isOperate"
+ class="common-select-btn"
+ @click="clearupClient(scope)"
+ >
+ <i class="el-icon-remove-outline" title="娓呴櫎"></i>
+ </div>
+ <div class="common-select-btn" v-else @click="selClientClick(scope, item.prop)">
+ <i class="el-icon-circle-plus-outline" title="閫夋嫨"></i>
+ </div>
+ </div>
</el-form-item>
<el-form-item
v-else-if="item.date"
@@ -49,42 +95,186 @@
: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
+ :disabled="!isOperate"
+ v-model="scope.row[item.prop]"
+ type="date"
+ size="mini"
+ style="width: 110px"
+ >
</el-date-picker>
</el-form-item>
- <span v-else>{{ scope.row[item.prop] }}</span>
+ <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"
+ :disabled="!isOperate"
+ size="mini"
+ style="width: 100%; margin-right: 5px"
+ @change="
+ (val) => {
+ commonInputChange(val, item.prop, scope.row, scope)
+ }
+ "
+ ></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"
+ :disabled="!isOperate"
+ :controls="false"
+ size="mini"
+ style="width: 100%; margin-right: 5px"
+ @change="
+ (val) => {
+ commonInputChange(val, item.prop, scope.row, scope)
+ }
+ "
+ ></el-input-number>
+ </el-form-item>
+ <span v-else>
+ <template>
+ {{ scope.row[item.prop] }}
+ </template>
+ </span>
</template>
- <span v-else>{{ scope.row[item.prop] }}</span>
+ <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"
+ :disabled="!isOperate"
+ :controls="false"
+ size="mini"
+ style="width: 100%; margin-right: 5px"
+ @change="
+ (val) => {
+ commonInputChange(val, item.prop, scope.row, scope)
+ }
+ "
+ ></el-input-number>
+ </el-form-item>
+ <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"
+ :disabled="!isOperate"
+ size="mini"
+ style="width: 100%; margin-right: 5px"
+ @change="
+ (val) => {
+ commonInputChange(val, item.prop, scope.row, scope)
+ }
+ "
+ ></el-input-number>
+ </el-form-item>
+ <span v-else style="text-align: right">{{ scope.row[item.prop] }}</span>
</template>
</el-table-column>
+ <el-table-column label="鎿嶄綔" width="40" v-if="!detailEnter" align="center">
+ <template slot-scope="scope">
+ <el-button type="text" size="small" :disabled="!isOperate" @click="deleteClick(scope)">鍒犻櫎</el-button>
+ </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="!isOperate" @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" :disabled="!isOperate" @click="empty">娓呯┖</el-button>
+ <el-button size="small" type="primary" @click="recalculate" :disabled="isRecalculate && !isOperate ? 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>
</el-row>
</div>
+ <!-- 鍚堝悓璁㈠崟 -->
+ <SelectCommonDialog
+ v-if="editSelCommonConfig.editVisible"
+ :edit-common-config="editSelCommonConfig"
+ :selectBoxList="tableList.tableData"
+ :quotationNumber="quotationNumber"
+ @selClient="selClient"
+ @getSelectArray="getSelectArray"
+ />
</div>
</template>
<script>
+import { getProductList } from "@/api/common/other"
+import SelectCommonDialog from "@/views/other/commonDialog/SelectCommonDialog"
export default {
name: "CommmonFormTableView",
+ components: { SelectCommonDialog },
props: {
detailEnter: {
+ type: Boolean,
+ default: false
+ },
+ selectBox: {
+ type: Boolean,
+ default: false
+ },
+ // 閭ｄ釜椤甸潰 鐢ㄦ潵鍒ゆ柇璁＄畻鏂瑰紡
+ pageName: {
+ type: String,
+ default: ""
+ },
+ // 鍒楄〃鏂板鏄惁澶氶��
+ addTypeIdMultiple: {
+ type: Boolean,
+ default: false
+ },
+ // 鏍规嵁鎶ヤ环鍗曟煡璇骇鍝�
+ quotationNumber: {
+ type: [String, Number],
+ default: ""
+ },
+ // 鏄惁鍙互鎿嶄綔 娣诲姞绛�
+ isOperate: {
+ type: Boolean,
+ default: true
+ },
+ isBorder:{
type: Boolean,
default: false
},
@@ -93,6 +283,7 @@
default: () => {
return {
tableData: [], // 鎺ュ彛杩斿洖鏁版嵁
+ isReturn: false,
tableColumn: [
// table琛ㄥ崟
{ label: "", prop: "", min: 200, tooltip: true }
@@ -115,14 +306,63 @@
},
data() {
return {
- total: 0
+ total: 0,
+ productList: [],
+ tableList: [],
+ editSelCommonConfig: {
+ editVisible: false,
+ isSelectBox: false,
+ title: "",
+ infomation: {}
+ },
+ productIndex: 0,
+ isRecalculate: true
+ }
+ },
+ created() {
+ if (!this.selectBox) {
+ this.getProductList()
+ }
+ this.getTableInfo()
+ },
+ watch:{
+ "productTableList": {
+ handler() {
+ this.getTableInfo()
+ },
+ immediate: true
}
},
computed: {},
methods: {
+ getTableInfo(){
+ this.tableList = this.productTableList
+ if (this.tableList.tableData.length === 1 && this.tableList.tableData[0].name === "") {
+ this.isRecalculate = false
+ } else {
+ this.isRecalculate = true
+ }
+ },
+ // 浜у搧鍚嶇О
+ async getProductList() {
+ await getProductList({
+ productName: "",
+ productNumber: "",
+ page: 1,
+ pageSize: 100
+ }).then((res) => {
+ console.log(res, "浜у搧鍚嶇О")
+ if (res.code === 200) {
+ if (res.data.data && res.data.data.length > 0) {
+ this.productList = res.data.data
+ }
+ }
+ })
+ },
handleReserve(row) {
return row._id ? row._id : row.id
},
+ // 澶氶��
handleSelectionChange(val) {
this.$emit("getSelectArray", val)
},
@@ -144,32 +384,45 @@
},
// 鍚堣
getSummaries(param) {
- if (this.showSummary.show) {
- const { columns, data } = param
- const sums = []
- columns.forEach((column, index) => {
- if (index === this.showSummary.mergeNumber) {
- sums[index] = "灏忚"
- }
- const values = data.map((item) => Number(item[column.property]))
- // if (column.property === this.showSummary.sumProp) {
- if (this.showSummary.sumProp.includes(column.property)) {
- sums[index] = values.reduce((prev, curr) => {
- const value = Number(curr)
- if (!isNaN(value)) {
- return this.number_format(prev + curr, 2, ".", ",")
- } else {
- return this.number_format(prev, 2, ".", ",")
- }
- }, 0)
- if (column.property === "total") {
- this.total = sums[index]
+ const { columns, data } = param
+ const sums = []
+ columns.forEach((column, index) => {
+ // // 鏇存敼琛屽悕绉�
+ if (index === this.showSummary.mergeNumber) {
+ sums[index] = "灏忚:"
+ return
+ }
+ const title = ["#", "浜у搧鍚嶇О", "浜у搧缂栧彿", "鍗曚綅", "閿�鍞崟浠�", "鎴愭湰鍗曚环"]
+ // 鍘婚櫎鏌愪簺涓嶉渶瑕佽绠楃殑鏁版嵁
+ if (title.includes(column.label)) {
+ sums[index] = ""
+ return
+ }
+ if (this.pageName == "quotation" && column.label == "姣涘埄") {
+ sums[index] = ""
+ return
+ }
+ // 鎶婂綋鍓嶈〃鏍兼暟鎹腑鍚屼釜鍒嗙被鐨勬暟鎹敹闆嗚捣鏉�
+ const values = data.map((item) => Number(item[column.property]))
+ // 杩囨护鎺�
+ if (!values.every((value) => Number.isNaN(value))) {
+ sums[index] = ` ${values.reduce((prev, curr) => {
+ const value = Number(curr)
+ if (!Number.isNaN(value)) {
+ const num = prev + curr
+ return Number(num.toFixed(2))
+ } else {
+ return Number(prev.toFixed(2))
}
- sums[index]
- }
- })
- return sums
- }
+ }, 0)}`
+ } else {
+ sums[index] = ""
+ }
+ if (column.property === "total") {
+ this.total = sums[index]
+ }
+ })
+ return sums
},
// 鏁板瓧鎹㈣涓洪噾棰濇樉绀烘牸寮�
number_format(number, decimals, dec_point, thousands_sep) {
@@ -201,16 +454,57 @@
},
// 鏂板
add() {
- this.$emit("addProductClick")
+ if (this.addTypeIdMultiple) {
+ this.productIndex = this.tableList.tableData.length
+ this.editSelCommonConfig.title = "浜у搧鍚嶇О"
+ this.editSelCommonConfig.isSelectBox = true
+ this.editSelCommonConfig.editVisible = true
+ } else {
+ this.$emit("addProductClick")
+ }
},
- commonInputChange(val, prop, row) {
- console.log(val, prop)
- console.log(row)
- this.$emit("inputContent", val, prop, row)
+ commonInputChange(val, prop, row, scope) {
+ if (prop === "amount") {
+ this.tableList.tableData.map((ite) => {
+ if (ite.name === row.name) {
+ ite.total = row.amount * row.price
+ }
+ })
+ }
+ if (this.pageName == "quotation" && prop == "cost" && scope.row.cost) {
+ let value = scope.row.cost
+ let reg2 = /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/
+ if (!reg2.test(value) || value == 0) {
+ this.$message.error("鎴愭湰鍗曚环闇�瑕佸～鍐欏ぇ浜�0鐨�2浣嶅皬鏁帮紒")
+ return true
+ }
+ this.$forceUpdate()
+ }
+ if (this.pageName == "quotation") {
+ if (prop == "price" || prop == "cost") {
+ if (scope.row.price && scope.row.cost) {
+ let profit = Number(scope.row.price) - Number(scope.row.cost)
+ scope.row.profit = profit + ""
+ let margin = (((Number(scope.row.price) - Number(scope.row.cost)) * 100) / Number(scope.row.cost)).toFixed(
+ 2
+ )
+ scope.row.margin = margin + ""
+ }
+ }
+ }
+ this.$emit("inputContent", val, prop, row, scope)
},
// 娓呯┖
empty() {
+ this.isRecalculate = false
this.$emit("emptyProductClick")
+ },
+ // 鍒犻櫎
+ deleteClick(scope) {
+ this.tableList.tableData.splice(scope.$index, 1)
+ this.$forceUpdate()
+ this.$message.success("鍒犻櫎鎴愬姛锛�")
+ this.$emit("deleteClick", scope)
},
// 閲嶇畻
recalculate() {
@@ -221,9 +515,101 @@
})
.then(() => {
this.$emit("recalculateProductClick")
+ this.tableList.tableData.map((ite) => {
+ ite.total = ite.amount ? ite.amount * ite.price : 1 * ite.price
+ })
})
.catch(() => {})
+ },
+ // 閫夋嫨浜у搧鍚嶇О鐩稿叧鏂规硶
+ querySearchAsync(queryString, cb) {
+ var restaurants = this.productList
+ var results = queryString ? restaurants.filter(this.createStateFilter(queryString)) : restaurants
+ cb(results)
+ },
+ createStateFilter(queryString) {
+ return (state) => {
+ return state.name.toLowerCase().indexOf(queryString.toLowerCase()) === 0
+ }
+ },
+ 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.amount = item.amount || 1
+ ite.number = item.number
+ ite.price = item.price
+ ite.total = item.amount ? item.amount * item.price : 1 * item.price
+ ite.unit = item.unit
+ }
+ })
+ },
+ // 鏂板
+ selClientClick(scope, prop) {
+ console.log(scope, prop)
+ this.productIndex = scope.$index
+ this.editSelCommonConfig.title = "浜у搧鍚嶇О"
+ this.editSelCommonConfig.isSelectBox = true
+ this.editSelCommonConfig.editVisible = true
+ },
+ // 缂栬緫
+ handleEditClient(scope, prop) {
+ console.log(scope, prop)
+ this.productIndex = scope.$index
+ this.editSelCommonConfig.title = "浜у搧鍚嶇О"
+ this.editSelCommonConfig.isSelectBox = false
+ this.editSelCommonConfig.editVisible = true
+ },
+ selClient(item) {
+ let list = this.tableList.tableData.map((item) => item.number)
+ if (list.findIndex((v) => v == item.number) == -1) {
+ this.isRecalculate = true
+ // this.editConfig.infomation.client_name = row.name
+ this.tableList.tableData.map((ite, index) => {
+ if (index === this.productIndex) {
+ 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.unit = item.unit
+ }
+ })
+ } else {
+ this.$message.error("涓嶈兘閫夋嫨閲嶅鐨勪骇鍝侊紝 璇烽噸鏂伴�夋嫨")
+ }
+ },
+ getSelectArray(val) {
+ this.$emit("getSelectArray", val, this.productIndex)
+ },
+ // 娓呴櫎宸查�夋嫨鐢ㄦ埛
+ clearupClient(scope) {
+ this.productIndex = scope.$index
+ this.tableList.tableData.map((ite, index) => {
+ if (index === this.productIndex) {
+ ite.name = ""
+ ite.amount = 1
+ ite.number = ""
+ ite.price = 0
+ ite.total = 0
+ ite.unit = ""
+ }
+ })
+ 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>
@@ -233,6 +619,14 @@
.page-view {
.el-form-item {
margin-bottom: 0;
+ .custom-name {
+ display: flex;
+ .common-select-btn {
+ margin-left: 5px;
+ font-size: 18px;
+ cursor: pointer;
+ }
+ }
}
}
::v-deep {
@@ -241,7 +635,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 {
@@ -251,5 +645,9 @@
.el-table th.el-table__cell > .cell {
padding: 0 5px;
}
+ .el-input__inner {
+ // text-align: left;
+ text-align: center !important;
+ }
}
</style>
--
Gitblit v1.8.0