From eb91fd817dce989b3e81eac971068badaa6bcf53 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期一, 05 二月 2024 16:31:18 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.5.5:10010/r/web/crm-web into dev
---
src/views/sales/salesDetails/AddSalesDetailsDialog.vue | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/src/views/sales/salesDetails/AddSalesDetailsDialog.vue b/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
index 37d3683..c8fcea5 100644
--- a/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
+++ b/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
@@ -116,7 +116,7 @@
:disabled="isNameChanceEdit || isView"
></el-autocomplete>
<div
- v-if="!isNameChanceEdit && !isView"
+ v-if="!isNameChanceEdit && !isView&&editConfig.infomation.client_name"
class="common-select-btn"
@click="selClientClick('chance')"
>
@@ -196,7 +196,7 @@
:disabled="isAddQuatation || isView"
></el-autocomplete>
<div
- v-if="!isAddQuatation && !isView"
+ v-if="!isAddQuatation && !isView&&editConfig.infomation.sale_chance_name"
class="common-select-btn"
@click="selClientClick('quotation')"
>
@@ -319,7 +319,7 @@
></el-input>
</el-form-item>
</el-col>
- <el-col :span="12">
+ <!-- <el-col :span="12">
<el-form-item label="鐗╂祦鍏徃" prop="logisticCompany">
<el-input v-model="editConfig.infomation.logisticCompany" :disabled="isView"></el-input>
</el-form-item>
@@ -328,7 +328,7 @@
<el-form-item label="鐗╂祦鍗曞彿" prop="logisticNumber">
<el-input v-model="editConfig.infomation.logisticNumber" :disabled="isView"></el-input>
</el-form-item>
- </el-col>
+ </el-col> -->
<el-col :span="12">
<el-form-item label="鐗╂祦璐圭敤" prop="logisticCost">
<el-input-number
@@ -809,6 +809,7 @@
if (res.code == 200) {
console.log(res)
this.quotationList = res.data.list
+ this.count=res.data.count;
if (value === "鍏ㄩ儴浜у搧") {
// this.quotationList.map((item) => {
// if (item.id === this.editConfig.infomation.quotationId) {
@@ -834,11 +835,15 @@
restaurants = this.clientList
console.log(restaurants, "瀹㈡埛鍗�")
} else if (value === "chance") {
- restaurants = this.saleChancelist
+ if(this.editConfig.infomation.client_name){
+ restaurants = this.saleChancelist
+ }
} else if (value === "subbill") {
restaurants = this.subOrderList
} else if (value === "quotation") {
- restaurants = this.quotationList
+ if(this.editConfig.infomation.sale_chance_name){
+ restaurants = this.quotationList
+ }
}
var results = queryString ? restaurants.filter(this.createStateFilter(queryString, value)) : restaurants
cb(results)
@@ -916,6 +921,8 @@
this.editSelCommonConfig.title = "鎶ヤ环鍗�"
this.editSelCommonConfig.editVisible = true
this.editSelCommonConfig.clientId = this.clientId
+ this.editSelCommonConfig.isRequest = false
+ this.editSelCommonConfig.count=this.count
this.editSelCommonConfig.tableInfomation = [...this.quotationList]
}
},
--
Gitblit v1.8.0