From 7d7fbe920279c9d7a42268a284427d2c42d8f0f2 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期二, 10 十月 2023 14:45:01 +0800
Subject: [PATCH] 弹出搜索框 公共组件修改
---
src/views/service/serviceContract/AddServiceContractDialog.vue | 96 ++++++++++++++++++++++++++++++-----------------
1 files changed, 61 insertions(+), 35 deletions(-)
diff --git a/src/views/service/serviceContract/AddServiceContractDialog.vue b/src/views/service/serviceContract/AddServiceContractDialog.vue
index 52743f7..f6cf395 100644
--- a/src/views/service/serviceContract/AddServiceContractDialog.vue
+++ b/src/views/service/serviceContract/AddServiceContractDialog.vue
@@ -39,8 +39,12 @@
<div class="common-select-btn" @click="selClientClick('client')">
<i class="el-icon-circle-plus-outline" title="閫夋嫨"></i>
</div>
- <div class="common-select-btn" @click="clearupClient('client')">
- <i class="el-icon-edit-outline" title="娓呴櫎"></i>
+ <div
+ v-if="editConfig.infomation.client_name && editConfig.infomation.client_name.length > 0"
+ class="common-select-btn"
+ @click="clearupClient('client')"
+ >
+ <i class="el-icon-remove-outline" title="娓呴櫎"></i>
</div>
</div>
</el-form-item>
@@ -64,7 +68,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="鑱旂郴浜哄鍚�" prop="contactId">
+ <el-form-item label="鑱旂郴浜哄鍚�" prop="contact_name">
<div class="custom-name">
<el-autocomplete
v-model="editConfig.infomation.contact_name"
@@ -79,14 +83,18 @@
<div class="common-select-btn" @click="selClientClick('contact')">
<i class="el-icon-circle-plus-outline" title="閫夋嫨"></i>
</div>
- <div class="common-select-btn" @click="clearupClient('contact')">
- <i class="el-icon-edit-outline" title="娓呴櫎"></i>
+ <div
+ v-if="editConfig.infomation.contact_name && editConfig.infomation.contact_name.length > 0"
+ class="common-select-btn"
+ @click="clearupClient('contact')"
+ >
+ <i class="el-icon-remove-outline" title="娓呴櫎"></i>
</div>
</div>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="閿�鍞満浼�" prop="saleChanceId">
+ <el-form-item label="閿�鍞満浼�" prop="sale_chance_name">
<div class="custom-name">
<el-autocomplete
v-model="editConfig.infomation.sale_chance_name"
@@ -101,14 +109,18 @@
<div class="common-select-btn" @click="selClientClick('chance')">
<i class="el-icon-circle-plus-outline"></i>
</div>
- <div class="common-select-btn" @click="clearupClient('chance')">
- <i class="el-icon-edit-outline"></i>
+ <div
+ v-if="editConfig.infomation.sale_chance_name && editConfig.infomation.sale_chance_name.length > 0"
+ class="common-select-btn"
+ @click="clearupClient('chance')"
+ >
+ <i class="el-icon-remove-outline"></i>
</div>
</div>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="鍚堝悓璁㈠崟" prop="contractId">
+ <el-form-item label="鍚堝悓璁㈠崟" prop="contract_number">
<div class="custom-name">
<el-autocomplete
v-model="editConfig.infomation.contract_number"
@@ -123,14 +135,18 @@
<div class="common-select-btn" @click="selClientClick('contract')">
<i class="el-icon-circle-plus-outline" title="閫夋嫨"></i>
</div>
- <div class="common-select-btn" @click="clearupClient('contract')">
- <i class="el-icon-edit-outline" title="娓呴櫎"></i>
+ <div
+ v-if="editConfig.infomation.contract_number && editConfig.infomation.contract_number.length > 0"
+ class="common-select-btn"
+ @click="clearupClient('contract')"
+ >
+ <i class="el-icon-remove-outline" title="娓呴櫎"></i>
</div>
</div>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="鎶ヤ环鍗�" prop="quotationId">
+ <el-form-item label="鎶ヤ环鍗�" prop="quotation_number">
<div class="custom-name">
<el-autocomplete
v-model="editConfig.infomation.quotation_number"
@@ -145,17 +161,21 @@
<div class="common-select-btn" @click="selClientClick('quotation')">
<i class="el-icon-circle-plus-outline" title="閫夋嫨"></i>
</div>
- <div class="common-select-btn" @click="clearupClient('quotation')">
- <i class="el-icon-edit-outline" title="娓呴櫎"></i>
+ <div
+ v-if="editConfig.infomation.quotation_number && editConfig.infomation.quotation_number.length > 0"
+ class="common-select-btn"
+ @click="clearupClient('quotation')"
+ >
+ <i class="el-icon-remove-outline" title="娓呴櫎"></i>
</div>
</div>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="鍚堝悓绫诲瀷" prop="typeId">
+ <el-form-item label="鍚堝悓绫诲瀷" prop="serviceContractTypeId">
<div class="common-select">
<el-select
- v-model="editConfig.infomation.typeId"
+ v-model="editConfig.infomation.serviceContractTypeId"
placeholder="璇烽�夋嫨"
class="common-select-sel"
size="mini"
@@ -207,10 +227,10 @@
<div class="basic-info-view">
<el-row>
<el-col :span="12">
- <el-form-item label="鍚堝悓鐘舵��" prop="statusId">
+ <el-form-item label="鍚堝悓鐘舵��" prop="serviceContractStatusId">
<div class="common-select">
<el-select
- v-model="editConfig.infomation.statusId"
+ v-model="editConfig.infomation.serviceContractStatusId"
placeholder="璇烽�夋嫨"
class="common-select-sel"
size="mini"
@@ -229,7 +249,14 @@
</el-col>
<el-col :span="12">
<el-form-item label="搴旀湇鍔℃鏁�" prop="serviceTimes">
- <el-input v-model="editConfig.infomation.serviceTimes"></el-input>
+ <el-input-number
+ v-model="editConfig.infomation.serviceTimes"
+ placeholder="璇疯緭鍏�"
+ :min="0"
+ :precision="2"
+ :controls="false"
+ style="width: 100%; margin-right: 5px"
+ ></el-input-number>
</el-form-item>
</el-col>
</el-row>
@@ -453,7 +480,7 @@
show: true,
total: true,
sumProp: ["Amount", "Unit", "total"],
- mergeNumber: 3
+ mergeNumber: 2
},
editSelectClientConfig: {
editVisible: false,
@@ -562,17 +589,7 @@
endTime: data.endTime || "",
memberId: data.memberId || 0,
number: data.number || "",
- products: [
- {
- amount: 0,
- desc: "",
- id: 0,
- name: "",
- number: "",
- price: 0,
- total: 0
- }
- ],
+ products: this.tableData,
quotationId: this.quotationId || 0,
remark: data.remark || "",
saleChanceId: this.saleChanceId || 0,
@@ -580,9 +597,11 @@
serviceTimes: data.serviceTimes || 0,
signTime: data.signTime || "",
startTime: data.startTime || "",
- statusId: data.statusId || 0,
+ statusId: 0,
terms: data.terms || "",
- typeId: data.typeId || 0
+ typeId: 0,
+ serviceContractTypeId: data.serviceContractTypeId || 0,
+ serviceContractStatusId: data.serviceContractStatusId || 0
}
return params
},
@@ -687,7 +706,7 @@
// 璁剧疆鍏佽涓婁紶鏂囦欢鏍煎紡
setFormatClick() {},
setTableForm() {
- if (this.editConfig.title === "鏂板缓") {
+ if (this.editConfig.title === "鏂板缓" || this.editConfig.infomation.products.length === 0) {
this.tableData = [
{
productId: this.productId,
@@ -760,7 +779,11 @@
this.productTableList.tableData = this.tableData
},
// 浜у搧閲嶇畻
- recalculateProductClick() {}
+ recalculateProductClick() {},
+ clearupProduct(data) {
+ this.tableData = data
+ this.productTableList.tableData = this.tableData
+ }
}
}
</script>
@@ -815,6 +838,9 @@
height: 55px;
line-height: 55px;
}
+ .el-input__inner {
+ text-align: left;
+ }
}
}
</style>
--
Gitblit v1.8.0