From fb20919d312b7f3bf81805eda670f42fa2d18e39 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期三, 28 二月 2024 14:38:41 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/web/crm-web
---
src/components/makepager/CommonFormTableView.vue | 185 ++++++++++++++++++++++++++--------------------
1 files changed, 104 insertions(+), 81 deletions(-)
diff --git a/src/components/makepager/CommonFormTableView.vue b/src/components/makepager/CommonFormTableView.vue
index 4476b95..6cffcd6 100644
--- a/src/components/makepager/CommonFormTableView.vue
+++ b/src/components/makepager/CommonFormTableView.vue
@@ -44,7 +44,7 @@
:disabled="!isOperate"
@change="
(val) => {
- commonInputChange(val, item.prop, scope.row,scope)
+ commonInputChange(val, item.prop, scope.row, scope)
}
"
></el-input>
@@ -67,15 +67,23 @@
}
"
></el-autocomplete>
- <div class="common-select-btn" v-if="isOperate" @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&&isOperate"
+ 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>
@@ -86,7 +94,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 :disabled="!isOperate" 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
@@ -105,7 +119,7 @@
style="width: 100%; margin-right: 5px"
@change="
(val) => {
- commonInputChange(val, item.prop, scope.row,scope)
+ commonInputChange(val, item.prop, scope.row, scope)
}
"
></el-input-number>
@@ -127,7 +141,7 @@
style="width: 100%; margin-right: 5px"
@change="
(val) => {
- commonInputChange(val, item.prop, scope.row,scope)
+ commonInputChange(val, item.prop, scope.row, scope)
}
"
></el-input-number>
@@ -154,7 +168,7 @@
style="width: 100%; margin-right: 5px"
@change="
(val) => {
- commonInputChange(val, item.prop, scope.row,scope)
+ commonInputChange(val, item.prop, scope.row, scope)
}
"
></el-input-number>
@@ -162,14 +176,9 @@
<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">
+ <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>
+ <el-button type="text" size="small" :disabled="!isOperate" @click="deleteClick(scope)">鍒犻櫎</el-button>
</template>
</el-table-column>
<slot name="tableButton" />
@@ -179,7 +188,7 @@
<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" :disabled="!isOperate" @click="empty">娓呯┖</el-button>
- <el-button size="small" type="primary" @click="recalculate" :disabled="(isRecalculate&&!isOperate) ? false : true"
+ <el-button size="small" type="primary" @click="recalculate" :disabled="isRecalculate && !isOperate ? false : true"
>閲嶇畻</el-button
>
</div>
@@ -199,6 +208,7 @@
<SelectCommonDialog
v-if="editSelCommonConfig.editVisible"
:edit-common-config="editSelCommonConfig"
+ :selectBoxList="tableList.tableData"
:quotationNumber="quotationNumber"
@selClient="selClient"
@getSelectArray="getSelectArray"
@@ -222,24 +232,24 @@
default: false
},
// 閭ｄ釜椤甸潰 鐢ㄦ潵鍒ゆ柇璁＄畻鏂瑰紡
- pageName:{
- type:String,
- default:''
+ pageName: {
+ type: String,
+ default: ""
},
// 鍒楄〃鏂板鏄惁澶氶��
- addTypeIdMultiple:{
- type:Boolean,
- default:false,
+ addTypeIdMultiple: {
+ type: Boolean,
+ default: false
},
// 鏍规嵁鎶ヤ环鍗曟煡璇骇鍝�
- quotationNumber:{
- type:[String,Number],
- default:''
+ quotationNumber: {
+ type: [String, Number],
+ default: ""
},
- // 鏄惁鍙互鎿嶄綔 娣诲姞绛�
- isOperate:{
- type:Boolean,
- default:true,
+ // 鏄惁鍙互鎿嶄綔 娣诲姞绛�
+ isOperate: {
+ type: Boolean,
+ default: true
},
productTableList: {
type: Object,
@@ -274,7 +284,7 @@
tableList: [],
editSelCommonConfig: {
editVisible: false,
- isSelectBox:false,
+ isSelectBox: false,
title: "",
infomation: {}
},
@@ -344,13 +354,13 @@
sums[index] = "灏忚:"
return
}
- const title = ["#", "浜у搧鍚嶇О",'浜у搧缂栧彿','鍗曚綅','閿�鍞崟浠�','鎴愭湰鍗曚环']
+ const title = ["#", "浜у搧鍚嶇О", "浜у搧缂栧彿", "鍗曚綅", "閿�鍞崟浠�", "鎴愭湰鍗曚环"]
// 鍘婚櫎鏌愪簺涓嶉渶瑕佽绠楃殑鏁版嵁
if (title.includes(column.label)) {
sums[index] = ""
return
}
- if(this.pageName=='quotation'&&column.label=='姣涘埄'){
+ if (this.pageName == "quotation" && column.label == "姣涘埄") {
sums[index] = ""
return
}
@@ -406,15 +416,16 @@
},
// 鏂板
add() {
- if(this.addTypeIdMultiple){
+ if (this.addTypeIdMultiple) {
+ this.productIndex = this.tableList.tableData.length
this.editSelCommonConfig.title = "浜у搧鍚嶇О"
- this.editSelCommonConfig.isSelectBox=true;
+ this.editSelCommonConfig.isSelectBox = true
this.editSelCommonConfig.editVisible = true
- }else{
+ } else {
this.$emit("addProductClick")
}
},
- commonInputChange(val, prop, row,scope) {
+ commonInputChange(val, prop, row, scope) {
if (prop === "amount") {
this.tableList.tableData.map((ite) => {
if (ite.name === row.name) {
@@ -422,27 +433,28 @@
}
})
}
- 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;
- }
+ 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+'';
+ 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)
+ this.$emit("inputContent", val, prop, row, scope)
},
// 娓呯┖
empty() {
@@ -450,11 +462,11 @@
this.$emit("emptyProductClick")
},
// 鍒犻櫎
- deleteClick(scope){
- this.tableList.tableData.splice(scope.$index,1)
- this.$forceUpdate();
- this.$message.success('鍒犻櫎鎴愬姛锛�')
- this.$emit("deleteClick",scope)
+ deleteClick(scope) {
+ this.tableList.tableData.splice(scope.$index, 1)
+ this.$forceUpdate()
+ this.$message.success("鍒犻櫎鎴愬姛锛�")
+ this.$emit("deleteClick", scope)
},
// 閲嶇畻
recalculate() {
@@ -496,35 +508,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=false;
+ 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)
+ 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 = ""
@@ -555,7 +579,6 @@
<!-- Add "scoped" attribute to limit CSS to this component only -->
<style lang="scss" scoped>
.page-view {
-
.el-form-item {
margin-bottom: 0;
.custom-name {
--
Gitblit v1.8.0