From 2e9bfefd8d092112b5f964de6f816e171ab3f1db Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期五, 13 十月 2023 14:51:59 +0800
Subject: [PATCH] bug修复（5139）
---
src/views/sales/salesOpportunity/AddSalesOpportunityDialog.vue | 23 ++--
src/views/sales/salesDetails/AddSalesDetailsDialog.vue | 27 ++++-
src/views/sales/contractManage/AddContractManageDialog.vue | 10 ++
src/views/service/serviceContract/index.vue | 13 ++
src/views/sales/quotation/index.vue | 87 ++++++++---------
src/views/sales/salesDetails/index.vue | 124 ++++++++++++++----------
6 files changed, 169 insertions(+), 115 deletions(-)
diff --git a/src/views/sales/contractManage/AddContractManageDialog.vue b/src/views/sales/contractManage/AddContractManageDialog.vue
index 99bb138..712268d 100644
--- a/src/views/sales/contractManage/AddContractManageDialog.vue
+++ b/src/views/sales/contractManage/AddContractManageDialog.vue
@@ -38,6 +38,15 @@
</el-form-item>
</el-col>
<el-col :span="12">
+ <el-form-item label="鍚堝悓鍚嶇О" prop="name">
+ <div class="custom-name">
+ <el-input v-model="editConfig.infomation.name"></el-input>
+ <!-- <div class="common-select-btn"><i class="el-icon-circle-plus-outline" title="閫夋嫨"></i></div> -->
+ <!-- <div class="common-select-btn"><i class="el-icon-edit" title="缂栬緫"></i></div> -->
+ </div>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
<el-form-item label="瀹㈡埛鍚嶇О" prop="client_name">
<div class="custom-name">
<el-autocomplete
@@ -348,6 +357,7 @@
console.log(data)
let params = {
id: this.editConfig.title === "鏂板缓" ? 0 : data.id,
+ name: data.name || "",
client_id: this.clientId || 0,
file: "",
member_id: data.memberId || 0,
diff --git a/src/views/sales/quotation/index.vue b/src/views/sales/quotation/index.vue
index c27ae12..508e0c1 100644
--- a/src/views/sales/quotation/index.vue
+++ b/src/views/sales/quotation/index.vue
@@ -6,15 +6,10 @@
<div class="filter" v-else>
<div class="filter-card">
- <CommonSearch
- :show-add="false"
- :amount-view="false"
- placeholder="璇疯緭鍏ユ姤浠峰崟鍙�"
- @searchClick="onFilterSearch"
- >
+ <CommonSearch :show-add="false" :amount-view="false" placeholder="璇疯緭鍏ユ姤浠峰崟鍙�" @searchClick="onFilterSearch">
<template slot="leftButton">
- <el-button size="small" type="primary" @click="addBtnClick">鏂板缓</el-button>
-<!-- <el-button size="small" @click="delClick">鍒犻櫎</el-button>-->
+ <el-button size="small" type="primary" @click="addBtnClick">鏂板缓</el-button>
+ <!-- <el-button size="small" @click="delClick">鍒犻櫎</el-button>-->
</template>
</CommonSearch>
</div>
@@ -24,19 +19,19 @@
<div class="body-card">
<div class="list-view">
<TableCommonView
- ref="tableListRef"
- :table-list="tableList"
- @selClientClick="selClientClick"
- @selContactsClick="selContactsClick"
- @selCommonClick="selCommonClick"
- @getSelectArray="getSelectArray"
- @selTableCol="selTableCol"
+ ref="tableListRef"
+ :table-list="tableList"
+ @selClientClick="selClientClick"
+ @selContactsClick="selContactsClick"
+ @selCommonClick="selCommonClick"
+ @getSelectArray="getSelectArray"
+ @selTableCol="selTableCol"
>
<template slot="tableButton">
<el-table-column label="鎿嶄綔" width="90">
<template slot-scope="scope">
<el-button @click="handleClick(scope.row)" type="text" size="small">缂栬緫</el-button>
- <el-button @click="deleteItem(scope.row.id)" type="text" size="small">鍒犻櫎</el-button>
+ <el-button @click="deleteItem(scope.row.id)" type="text" size="small">鍒犻櫎</el-button>
</template>
</el-table-column>
</template>
@@ -131,7 +126,7 @@
label: "鎶ヤ环鍗曞彿"
},
tableColumn: [
- { label: "鎶ヤ环鍗曞彿", prop: "number", min: 90, isCommonClick: true ,default:true}, // 鎶ヤ环鍗曞彿
+ { label: "鎶ヤ环鍗曞彿", prop: "number", min: 90, isCommonClick: true, default: true }, // 鎶ヤ环鍗曞彿
{ label: "瀹㈡埛鍚嶇О", prop: "client_name", min: 120, isClientClick: true }, // 瀹㈡埛鍚嶇О
{ label: "鑱旂郴浜哄鍚�", prop: "contact_name", min: 90, isContactClick: true }, // 鑱旂郴浜哄鍚�
{ label: "閿�鍞礋璐ｄ汉", prop: "member_name" }, // 閿�鍞礋璐ｄ汉
@@ -142,7 +137,7 @@
{ label: "鏁伴噺", prop: "productNumber", isProductAmount: true },
{ label: "浠风◣鍚堣", prop: "priceTax", isProductTotal: true }
],
- showCol:["鎶ヤ环鍗曞彿", "瀹㈡埛鍚嶇О", "鑱旂郴浜哄鍚�", "閿�鍞礋璐ｄ汉", "鏈夋晥鏈�", "浜у搧鍚嶇О", "鏁伴噺", "浠风◣鍚堣"]
+ showCol: ["鎶ヤ环鍗曞彿", "瀹㈡埛鍚嶇О", "鑱旂郴浜哄鍚�", "閿�鍞礋璐ｄ汉", "鏈夋晥鏈�", "浜у搧鍚嶇О", "鏁伴噺", "浠风◣鍚堣"]
}
},
created() {
@@ -151,7 +146,7 @@
this.search_map = {}
} else {
this.search_map = {
- [this.addConfig.id_name]: this.addConfig.client_name
+ [this.addConfig.id_name]: this.addConfig.id
}
}
this.getData(this.search_map)
@@ -159,13 +154,13 @@
methods: {
setTable() {
this.tableList = {
- selectIndex:true,
+ selectIndex: true,
tableInfomation: [],
allcol: [],
showcol: this.showCol,
- tableColumn:this.setColumnVisible(this.showCol)
+ tableColumn: this.setColumnVisible(this.showCol)
}
- this.tableList.allcol = this.tableList.tableColumn.filter(ele=>!ele.default).map(ele=>ele.label);
+ this.tableList.allcol = this.tableList.tableColumn.filter((ele) => !ele.default).map((ele) => ele.label)
this.searchOptions = []
for (let i = 0; i < this.tableList.tableColumn.length; i++) {
const label = this.tableList.tableColumn[i].label
@@ -173,17 +168,17 @@
this.searchOptions.push({ value: value, label: label })
}
},
- setColumnVisible(showCol){
- return this.tableColumn.map(ele=>{
+ setColumnVisible(showCol) {
+ return this.tableColumn.map((ele) => {
return {
...ele,
- isShowColumn:showCol.includes(ele.label)
+ isShowColumn: showCol.includes(ele.label)
}
})
},
selTableCol(val) {
- this.showcol = val;
- this.tableList.tableColumn = this.setColumnVisible(val);
+ this.showcol = val
+ this.tableList.tableColumn = this.setColumnVisible(val)
},
// 璇锋眰鏁版嵁
async getData() {
@@ -222,8 +217,8 @@
})
},
// 鎼滅储
- onFilterSearch(searchText){
- this.search_map.number = searchText ?? ''
+ onFilterSearch(searchText) {
+ this.search_map.number = searchText ?? ""
this.pagerOptions.currPage = 1
this.getData()
},
@@ -273,22 +268,22 @@
cancelButtonText: "鍙栨秷",
type: "warning"
})
- .then(() => {
- getDelQuotation({ids: [id]}).then((response) => {
- if (response.code === 200) {
- this.$message.success("鍒犻櫎鎴愬姛")
- this.getData()
- } else {
- this.$message.warning("鍒犻櫎澶辫触")
- }
- })
- })
- .catch((err) => {
- if (err !== 'cancel') {
- console.error(err)
+ .then(() => {
+ getDelQuotation({ ids: [id] }).then((response) => {
+ if (response.code === 200) {
+ this.$message.success("鍒犻櫎鎴愬姛")
+ this.getData()
+ } else {
this.$message.warning("鍒犻櫎澶辫触")
}
})
+ })
+ .catch((err) => {
+ if (err !== "cancel") {
+ console.error(err)
+ this.$message.warning("鍒犻櫎澶辫触")
+ }
+ })
},
getSelectArray(val) {
console.log(val)
@@ -327,15 +322,15 @@
<!-- Add "scoped" attribute to limit CSS to this component only -->
<style lang="scss" scoped>
-.quotation{
+.quotation {
height: 100%;
overflow: hidden;
- .filter{
+ .filter {
height: 80px;
display: flex;
align-items: center;
padding: 12px 20px 0 20px;
- &-card{
+ &-card {
height: 80px;
display: flex;
align-items: center;
@@ -346,7 +341,7 @@
background-color: #fff;
}
}
- .body{
+ .body {
box-sizing: border-box;
padding: 10px 20px;
border-radius: 12px;
diff --git a/src/views/sales/salesDetails/AddSalesDetailsDialog.vue b/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
index 8b429f9..e487891 100644
--- a/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
+++ b/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
@@ -52,12 +52,17 @@
"
value-key="name"
@select="handleSelectClient('client', $event)"
+ :disabled="isNameChanceEdit"
></el-autocomplete>
- <div class="common-select-btn" @click="selClientClick('client')">
+ <div v-if="!isNameChanceEdit" class="common-select-btn" @click="selClientClick('client')">
<i class="el-icon-circle-plus-outline" title="閫夋嫨"></i>
</div>
<div
- v-if="editConfig.infomation.client_name && editConfig.infomation.client_name.length > 0"
+ v-if="
+ editConfig.infomation.client_name &&
+ editConfig.infomation.client_name.length > 0 &&
+ !isNameChanceEdit
+ "
class="common-select-btn"
@click="clearupClient('client')"
>
@@ -80,12 +85,17 @@
"
value-key="name"
@select="handleSelectClient('chance', $event)"
+ :disabled="isNameChanceEdit"
></el-autocomplete>
- <div class="common-select-btn" @click="selClientClick('chance')">
+ <div v-if="!isNameChanceEdit" class="common-select-btn" @click="selClientClick('chance')">
<i class="el-icon-circle-plus-outline"></i>
</div>
<div
- v-if="editConfig.infomation.sale_chance_name && editConfig.infomation.sale_chance_name.length > 0"
+ v-if="
+ editConfig.infomation.sale_chance_name &&
+ editConfig.infomation.sale_chance_name.length > 0 &&
+ !isNameChanceEdit
+ "
class="common-select-btn"
@click="clearupClient('chance')"
>
@@ -441,7 +451,8 @@
title: "鏂板缓",
infomation: {}
},
- amountTotal: 0
+ amountTotal: 0,
+ isNameChanceEdit: false
}
},
created() {
@@ -450,6 +461,12 @@
this.setTableForm()
this.getCommonData()
this.formInfo()
+ if (this.editConfig.title === "鏂板缓" && this.editConfig.infomation.client_name.length > 0) {
+ this.isNameChanceEdit = true
+ }
+ // else {
+
+ // }
},
watch: {
"editClientManageConfig.visible"(val) {
diff --git a/src/views/sales/salesDetails/index.vue b/src/views/sales/salesDetails/index.vue
index d3f1352..1bf349f 100644
--- a/src/views/sales/salesDetails/index.vue
+++ b/src/views/sales/salesDetails/index.vue
@@ -7,15 +7,15 @@
<div v-else class="filter">
<div class="filter-card">
<CommonSearch
- :show-add="false"
- :show-download="false"
- :amount-view="false"
- :show-action-btn="false"
- placeholder="璇疯緭鍏ヨ鍗曠紪鍙�"
- @searchClick="onFilterSearch"
+ :show-add="false"
+ :show-download="false"
+ :amount-view="false"
+ :show-action-btn="false"
+ placeholder="璇疯緭鍏ヨ鍗曠紪鍙�"
+ @searchClick="onFilterSearch"
>
<template slot="leftButton">
- <el-button size="small" type="primary" @click="addBtnClick">鏂板缓</el-button>
+ <el-button size="small" type="primary" @click="addBtnClick">鏂板缓</el-button>
<!-- <el-button size="small" @click="delClick">鍒犻櫎</el-button> -->
</template>
</CommonSearch>
@@ -26,13 +26,13 @@
<div class="body-card">
<div class="list-view">
<TableCommonView
- ref="tableListRef"
- :show-summary="showSummary"
- :table-list="tableList"
- @selClientClick="selClientClick"
- @selCommonClick="selCommonClick"
- @getSelectArray="getSelectArray"
- @selTableCol="selTableCol"
+ ref="tableListRef"
+ :show-summary="showSummary"
+ :table-list="tableList"
+ @selClientClick="selClientClick"
+ @selCommonClick="selCommonClick"
+ @getSelectArray="getSelectArray"
+ @selTableCol="selTableCol"
>
<template slot="tableButton">
<el-table-column label="鎿嶄綔" width="90">
@@ -161,7 +161,7 @@
infomation: {}
},
tableColumn: [
- { label: "璁㈠崟缂栧彿", prop: "number", isCommonClick: true ,default: true},
+ { label: "璁㈠崟缂栧彿", prop: "number", isCommonClick: true, default: true },
{ label: "瀹㈡埛鍚嶇О", prop: "client_name", isClientClick: true },
{ label: "绛剧害鏃ユ湡", prop: "signTime", width: 150 },
{ label: "閿�鍞礋璐ｄ汉", prop: "member_name" },
@@ -176,7 +176,21 @@
{ label: "閿�鍞崟浠�", prop: "taxUnitPrice", isProductPrice: true },
{ label: "浠风◣鍚堣", prop: "priceTax", isProductTotal: true }
],
- showCol:["璁㈠崟缂栧彿", "瀹㈡埛鍚嶇О", "绛剧害鏃ユ湡", "閿�鍞礋璐ｄ汉", "宸叉敹鎬婚", "鍚堣", "搴旀敹浣欓", "宸插紑绁ㄩ噾棰�", "鏈紑绁ㄩ噾棰�", "浜у搧鍚嶇О", "鏁伴噺", "閿�鍞崟浠�", "浠风◣鍚堣"]
+ showCol: [
+ "璁㈠崟缂栧彿",
+ "瀹㈡埛鍚嶇О",
+ "绛剧害鏃ユ湡",
+ "閿�鍞礋璐ｄ汉",
+ "宸叉敹鎬婚",
+ "鍚堣",
+ "搴旀敹浣欓",
+ "宸插紑绁ㄩ噾棰�",
+ "鏈紑绁ㄩ噾棰�",
+ "浜у搧鍚嶇О",
+ "鏁伴噺",
+ "閿�鍞崟浠�",
+ "浠风◣鍚堣"
+ ]
}
},
created() {
@@ -197,9 +211,9 @@
tableInfomation: [],
allcol: [],
showcol: this.showCol,
- tableColumn:this.setColumnVisible(this.showCol)
+ tableColumn: this.setColumnVisible(this.showCol)
}
- this.tableList.allcol = this.tableList.tableColumn.filter(ele=>!ele.default).map(ele=>ele.label);
+ this.tableList.allcol = this.tableList.tableColumn.filter((ele) => !ele.default).map((ele) => ele.label)
this.searchOptions = []
for (let i = 0; i < this.tableList.tableColumn.length; i++) {
const label = this.tableList.tableColumn[i].label
@@ -207,27 +221,37 @@
this.searchOptions.push({ value: value, label: label })
}
},
- setColumnVisible(showCol){
- return this.tableColumn.map(ele=>{
+ setColumnVisible(showCol) {
+ return this.tableColumn.map((ele) => {
return {
...ele,
- isShowColumn:showCol.includes(ele.label)
+ isShowColumn: showCol.includes(ele.label)
}
})
},
selTableCol(val) {
- this.showcol = val;
- this.tableList.tableColumn = this.setColumnVisible(val);
+ this.showcol = val
+ this.tableList.tableColumn = this.setColumnVisible(val)
},
// 璇锋眰鏁版嵁
async getData() {
this.loading = true
- await getSalesDetailsList({
- keyword: this.keyword,
- keywordType: this.keywordType,
- page: this.pagerOptions.currPage,
- pageSize: this.pagerOptions.pageSize
- })
+ let params = {}
+ if (this.addConfig.id) {
+ params = {
+ saleChanceId: this.addConfig.id,
+ page: this.pagerOptions.currPage,
+ pageSize: this.pagerOptions.pageSize
+ }
+ } else {
+ params = {
+ keyword: this.keyword,
+ keywordType: this.keywordType,
+ page: this.pagerOptions.currPage,
+ pageSize: this.pagerOptions.pageSize
+ }
+ }
+ await getSalesDetailsList(params)
.then((res) => {
console.log(res)
if (res.code === 200) {
@@ -256,8 +280,8 @@
})
},
// 鎼滅储
- onFilterSearch(searchText){
- this.keyword = searchText ?? ''
+ onFilterSearch(searchText) {
+ this.keyword = searchText ?? ""
this.keywordType = "璁㈠崟缂栧彿"
this.pagerOptions.currPage = 1
this.getData()
@@ -277,24 +301,24 @@
},
// 鍒犻櫎
delClick(rowID) {
- console.log(rowID,"xxxxshanchu")
+ console.log(rowID, "xxxxshanchu")
// if (this.selValueList && this.selValueList.length > 0) {
- this.$confirm("鏄惁纭鍒犻櫎?", "璀﹀憡", {
- confirmButtonText: "纭畾",
- cancelButtonText: "鍙栨秷",
- type: "warning"
- })
- .then(() => {
- getDelSalesDetails({ ids: [rowID] }).then((response) => {
- if (response.code === 200) {
- this.$message.success("鍒犻櫎鎴愬姛")
- this.getData()
- } else {
- this.$message.warning("鍒犻櫎澶辫触")
- }
- })
+ this.$confirm("鏄惁纭鍒犻櫎?", "璀﹀憡", {
+ confirmButtonText: "纭畾",
+ cancelButtonText: "鍙栨秷",
+ type: "warning"
+ })
+ .then(() => {
+ getDelSalesDetails({ ids: [rowID] }).then((response) => {
+ if (response.code === 200) {
+ this.$message.success("鍒犻櫎鎴愬姛")
+ this.getData()
+ } else {
+ this.$message.warning("鍒犻櫎澶辫触")
+ }
})
- .catch(() => {})
+ })
+ .catch(() => {})
// } else {
// this.$message.warning("璇疯嚦灏戦�夋嫨涓�鏉¤褰�")
// }
@@ -349,12 +373,12 @@
.sales-details {
height: 100%;
overflow: hidden;
- .filter{
+ .filter {
height: 80px;
display: flex;
align-items: center;
padding: 12px 20px 0 20px;
- &-card{
+ &-card {
height: 80px;
display: flex;
align-items: center;
@@ -365,7 +389,7 @@
background-color: #fff;
}
}
- .body{
+ .body {
box-sizing: border-box;
padding: 10px 20px;
border-radius: 12px;
diff --git a/src/views/sales/salesOpportunity/AddSalesOpportunityDialog.vue b/src/views/sales/salesOpportunity/AddSalesOpportunityDialog.vue
index 45378e9..5e5f9aa 100644
--- a/src/views/sales/salesOpportunity/AddSalesOpportunityDialog.vue
+++ b/src/views/sales/salesOpportunity/AddSalesOpportunityDialog.vue
@@ -46,6 +46,15 @@
</el-form-item>
</el-col>
<el-col :span="12">
+ <el-form-item label="鏈轰細鍚嶇О" prop="name">
+ <div class="custom-name">
+ <el-input v-model="editConfig.infomation.name"></el-input>
+ <!-- <div class="common-select-btn"><i class="el-icon-circle-plus-outline" title="閫夋嫨"></i></div> -->
+ <!-- <div class="common-select-btn"><i class="el-icon-edit" title="缂栬緫"></i></div> -->
+ </div>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
<el-form-item label="瀹㈡埛鍚嶇О" prop="client_name" ref="clientName">
<div class="custom-name">
<el-autocomplete
@@ -71,15 +80,7 @@
</div>
</el-form-item>
</el-col>
- <el-col :span="12">
- <el-form-item label="鏈轰細鍚嶇О" prop="name">
- <div class="custom-name">
- <el-input v-model="editConfig.infomation.name"></el-input>
- <!-- <div class="common-select-btn"><i class="el-icon-circle-plus-outline" title="閫夋嫨"></i></div> -->
- <!-- <div class="common-select-btn"><i class="el-icon-edit" title="缂栬緫"></i></div> -->
- </div>
- </el-form-item>
- </el-col>
+
<el-col :span="12">
<el-form-item label="鑱旂郴浜哄鍚�" prop="contact_name">
<div class="custom-name">
@@ -107,7 +108,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="鍟嗘満鏉ユ簮" prop="sales_sources_id">
+ <el-form-item label="鏈轰細鏉ユ簮" prop="sales_sources_id">
<div class="common-select">
<el-select
v-model="editConfig.infomation.sales_sources_id"
@@ -129,7 +130,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="鍟嗘満绫诲瀷" prop="sale_type_id">
+ <el-form-item label="鏈轰細绫诲瀷" prop="sale_type_id">
<div class="common-select">
<el-select
v-model="editConfig.infomation.sale_type_id"
diff --git a/src/views/service/serviceContract/index.vue b/src/views/service/serviceContract/index.vue
index a6d125c..c43c20c 100644
--- a/src/views/service/serviceContract/index.vue
+++ b/src/views/service/serviceContract/index.vue
@@ -199,12 +199,19 @@
async getData() {
this.loading = true
let params = {}
- if (this.addConfig.id) {
+ console.log(this.addConfig)
+ if (this.addConfig.id && this.addConfig.keywordType === "閿�鍞満浼�") {
+ params = {
+ saleChanceId: this.addConfig.id,
+ page: this.pagerOptions.currPage,
+ pageSize: this.pagerOptions.pageSize
+ }
+ } else if (this.addConfig.id && this.addConfig.keywordType === "閿�鍞槑缁嗗崟") {
params = {
salesDetailsId: this.addConfig.id,
page: this.pagerOptions.currPage,
pageSize: this.pagerOptions.pageSize,
- contactId:this.addConfig.client_id
+ contactId: this.addConfig.client_id
}
} else {
params = {
@@ -212,7 +219,7 @@
keywordType: this.keywordType,
page: this.pagerOptions.currPage,
pageSize: this.pagerOptions.pageSize,
- contactId:this.addConfig.client_id
+ contactId: this.addConfig.client_id
}
}
await getServiceContractList(params)
--
Gitblit v1.8.0