From a0b97eb8e934ba28b9e51824d4cbbcc99cc70e17 Mon Sep 17 00:00:00 2001
From: charles <981744753@qq.com>
Date: 星期四, 18 七月 2024 23:08:00 +0800
Subject: [PATCH] fxi:解决发货bug
---
src/components/makepager/CommonFormTableView.vue | 333 +++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 282 insertions(+), 51 deletions(-)
diff --git a/src/components/makepager/CommonFormTableView.vue b/src/components/makepager/CommonFormTableView.vue
index 364b17f..bca864a 100644
--- a/src/components/makepager/CommonFormTableView.vue
+++ b/src/components/makepager/CommonFormTableView.vue
@@ -3,11 +3,13 @@
<el-form ref="form" :model="tableList" :show-message="false" label-position="right">
<el-table
ref="fromTable"
+ :border="isBorder"
:data="tableList.tableData"
:show-summary="showSummary.show"
:summary-method="getSummaries"
:span-method="arraySpanMethod"
style="width: 100%"
+ :header-cell-style="{ background: '#f1f3f8', color: '#000009', 'font-size': '14px', 'font-family': 'PingFangSC' }"
@selection-change="handleSelectionChange"
:row-key="(row) => row.productId"
>
@@ -15,14 +17,18 @@
</el-table-column>
<el-table-column v-if="tableList.isReturn" type="index" label="#" width="50" align="center"></el-table-column>
<el-table-column
+ align="center"
v-for="(item, i) in tableList.tableColumn"
:key="i"
:prop="item.prop"
:label="item.label"
:width="item.width"
:min-width="item.min"
- align="center"
- >
+ show-overflow-tooltip
+ :sortable="item.sortable"
+ v-if="(item.isShowColumn&&colOpenShow)||item.isShowColumn==undefined"
+ >
+ <!-- 鎵�鏈夌殑琛ㄦ牸淇敼涓哄彲閰嶇疆琛ㄥご鐨勪箣鍚� v-if淇敼涓簐-if="item.isShowColumn" -->
<!-- 琛ㄥご鏍峰紡 -->
<template slot="header">
<span v-if="item.isRequird" style="color: #f56c6c">*</span>
@@ -41,9 +47,10 @@
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>
@@ -58,6 +65,7 @@
v-model="scope.row[item.prop]"
:fetch-suggestions="querySearchAsync"
value-key="name"
+ :disabled="!isOperate"
size="mini"
@select="
(val) => {
@@ -65,15 +73,23 @@
}
"
></el-autocomplete>
- <div class="common-select-btn" @click="selClientClick(scope.row, item.prop)">
- <i class="el-icon-circle-plus-outline" title="閫夋嫨"></i>
+
+ <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"
+ v-if="scope.row[item.prop] && scope.row[item.prop].length > 0 && isOperate"
class="common-select-btn"
- @click="clearupClient(scope.row)"
+ @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>
@@ -84,7 +100,13 @@
: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>
<el-form-item
@@ -98,11 +120,12 @@
placeholder=""
:min="0"
:controls="false"
+ :disabled="!isOperate"
size="mini"
style="width: 100%; margin-right: 5px"
@change="
(val) => {
- commonInputChange(val, item.prop, scope.row)
+ commonInputChange(val, item.prop, scope.row, scope)
}
"
></el-input-number>
@@ -118,18 +141,45 @@
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)
+ commonInputChange(val, item.prop, scope.row, scope)
}
"
></el-input-number>
</el-form-item>
- <span v-else>{{ scope.row[item.prop] }}</span>
+ <span v-else>
+ <template>
+ {{ scope.row[item.prop] }}
+ </template>
+ </span>
</template>
+ <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=" "
@@ -141,11 +191,12 @@
placeholder=""
:min="0"
:controls="false"
+ :disabled="!isOperate"
size="mini"
style="width: 100%; margin-right: 5px"
@change="
(val) => {
- commonInputChange(val, item.prop, scope.row)
+ commonInputChange(val, item.prop, scope.row, scope)
}
"
></el-input-number>
@@ -153,14 +204,26 @@
<span v-else style="text-align: right">{{ scope.row[item.prop] }}</span>
</template>
</el-table-column>
+ <el-table-column label="鎿嶄綔" width="70" v-if="!detailEnter" align="center" fixed='right'>
+ <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>
+ <div class="styleBtn" v-if="colOpenShow">
+ <i @click="checkCol()" class="label">...</i>
+ <el-checkbox-group v-model="showcol" v-show="iscolopen" class="checkbox-group" @change="selectCheckBoxList">
+ <el-checkbox v-for="item in tableList.allcol" :label="item" :key="item">{{ item }} </el-checkbox>
+ </el-checkbox-group>
+ </div>
</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" :disabled="isRecalculate ? false : true"
+ <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>
@@ -180,7 +243,10 @@
<SelectCommonDialog
v-if="editSelCommonConfig.editVisible"
:edit-common-config="editSelCommonConfig"
+ :selectBoxList="tableList.tableData"
+ :quotationNumber="quotationNumber"
@selClient="selClient"
+ @getSelectArray="getSelectArray"
/>
</div>
</template>
@@ -196,7 +262,36 @@
type: Boolean,
default: false
},
+ // 鏄惁鍙互閰嶇疆鍒楄〃 琛ㄥご
+ colOpenShow: {
+ 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
},
@@ -206,6 +301,8 @@
return {
tableData: [], // 鎺ュ彛杩斿洖鏁版嵁
isReturn: false,
+ allcol: [],
+ showcol: [],
tableColumn: [
// table琛ㄥ崟
{ label: "", prop: "", min: 200, tooltip: true }
@@ -233,26 +330,68 @@
tableList: [],
editSelCommonConfig: {
editVisible: false,
+ isSelectBox: false,
title: "",
infomation: {}
},
productIndex: 0,
- isRecalculate: true
+ isRecalculate: true,
+ iscolopen: false,
+ showcol: [],
+ mergeNumber:1
}
},
created() {
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
- }
+ this.getTableInfo()
+ },
+ watch:{
+ "productTableList": {
+ handler() {
+ this.showcol = this.productTableList.showcol
+ this.getTableInfo()
+ },
+ immediate: true
+ },
+ "productTableList.showcol": {
+ handler(newVal) {
+ this.showcol = newVal
+ this.getMergeNumber()
+ },
+ immediate: true
+ },
},
computed: {},
methods: {
+ getMergeNumber(){
+ let pattern=new RegExp("[0-9]+");
+ if(pattern.test(this.showSummary.mergeNumber)){
+ this.mergeNumber=this.showSummary.mergeNumber
+ }else{
+ for(let i in this.showcol){
+ if(this.showcol[i]==this.showSummary.mergeNumber){
+ this.mergeNumber=Number(i)+1;
+ }
+ }
+ }
+ },
+ checkCol() {
+ this.iscolopen = !this.iscolopen
+ },
+ selectCheckBoxList(val) {
+ this.getMergeNumber()
+ this.$emit("selTableCol", val)
+ },
+ 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({
@@ -283,11 +422,11 @@
if (this.$refs.table) {
var current = this.$refs.table.querySelector(".el-table__footer-wrapper").querySelector(".el-table__footer")
var cell = current.rows[0].cells
- for (let i = 0; i < this.showSummary.mergeNumber; i++) {
+ for (let i = 0; i < this.mergeNumber; i++) {
cell[i].style.display = "none"
}
- cell[this.showSummary.mergeNumber].classList.remove("is-left")
- cell[this.showSummary.mergeNumber].colSpan = this.showSummary.mergeNumber.toString()
+ cell[this.mergeNumber].classList.remove("is-left")
+ cell[this.mergeNumber].colSpan = this.mergeNumber.toString()
}
})
}
@@ -298,13 +437,17 @@
const sums = []
columns.forEach((column, index) => {
// // 鏇存敼琛屽悕绉�
- if (index === this.showSummary.mergeNumber) {
+ if (index === this.mergeNumber) {
sums[index] = "灏忚:"
return
}
- const title = ["#", "浜у搧鍚嶇О"]
+ const title = ["#", "浜у搧鍚嶇О", "浜у搧缂栧彿", "鍗曚綅", "閿�鍞崟浠�", "鎴愭湰鍗曚环"]
// 鍘婚櫎鏌愪簺涓嶉渶瑕佽绠楃殑鏁版嵁
if (title.includes(column.label)) {
+ sums[index] = ""
+ return
+ }
+ if (this.pageName == "quotation" && column.label == "姣涘埄") {
sums[index] = ""
return
}
@@ -360,11 +503,16 @@
},
// 鏂板
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)
+ commonInputChange(val, prop, row, scope) {
if (prop === "amount") {
this.tableList.tableData.map((ite) => {
if (ite.name === row.name) {
@@ -372,12 +520,40 @@
}
})
}
- this.$emit("inputContent", val, prop, row)
+ 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() {
@@ -419,31 +595,47 @@
}
})
},
- selClientClick(row, prop) {
- console.log(row, prop)
- this.productIndex = row.productId - 1
+ // 鏂板
+ 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) {
- 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) {
- 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
- }
- })
+ 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(row) {
- this.productIndex = row.productId - 1
+ clearupClient(scope) {
+ this.productIndex = scope.$index
this.tableList.tableData.map((ite, index) => {
if (index === this.productIndex) {
ite.name = ""
@@ -474,6 +666,7 @@
<!-- Add "scoped" attribute to limit CSS to this component only -->
<style lang="scss" scoped>
.page-view {
+ position: relative;
.el-form-item {
margin-bottom: 0;
.custom-name {
@@ -502,9 +695,47 @@
.el-table th.el-table__cell > .cell {
padding: 0 5px;
}
+ .el-table__fixed-footer-wrapper tbody td.el-table__cell{
+ background:#fff;
+ }
.el-input__inner {
// text-align: left;
text-align: center !important;
}
+ .styleBtn {
+ position: absolute;
+ width: 30px;
+ height: 48px;
+ // line-height: 26px;
+ // background: #06c062;
+ top: 0;
+ right: -6px;
+ z-index: 11;
+ .label {
+ position: absolute;
+ top: 11px;
+ font-size: 20px;
+ // line-height: 5px;
+ cursor: pointer;
+ color: #000;
+ transform: rotate(-90deg);
+ }
+ .checkbox-group {
+ width: 160px;
+ height: 180px;
+ overflow: auto;
+ display: flex;
+ flex-direction: column;
+ line-height: 25px;
+ background: #ffffff;
+ border-radius: 16px;
+ padding: 12px;
+ position: absolute;
+ right: 0;
+ top: 30px;
+ z-index: 99;
+ box-shadow: 0 0 2px 2px #f8f8f8;
+ }
+ }
}
</style>
--
Gitblit v1.8.0