From a63d71177a2899b01da37e5bfc2d498bec5f80be Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期二, 17 十月 2023 15:10:13 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.5.5:10010/r/web/crm-web into zhengwenfeng/modify-style
---
src/views/other/payment/receipt/addReceipt.vue | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/src/views/other/payment/receipt/addReceipt.vue b/src/views/other/payment/receipt/addReceipt.vue
index da78aa7..c38fffc 100644
--- a/src/views/other/payment/receipt/addReceipt.vue
+++ b/src/views/other/payment/receipt/addReceipt.vue
@@ -87,10 +87,10 @@
</el-form-item>
</el-col>
<el-col v-else :span="12">
- <el-form-item label="鍚堝悓璁㈠崟">
+ <el-form-item label="閿�鍞槑缁嗗崟" prop="saleDetailNumber">
<div class="custom-name">
<el-autocomplete
- v-model="editConfig.infomation.number"
+ v-model="editConfig.infomation.saleDetailNumber"
:fetch-suggestions="
(queryString, callback) => {
querySearchAsync(queryString, callback, 'contract')
@@ -104,7 +104,7 @@
<i class="el-icon-circle-plus-outline" title="閫夋嫨"></i>
</div>
<div
- v-if="editConfig.infomation.number && editConfig.infomation.number.length > 0"
+ v-if="editConfig.infomation.saleDetailNumber && editConfig.infomation.saleDetailNumber.length > 0"
class="common-select-btn"
@click="clearupClient('contract')"
>
@@ -359,7 +359,8 @@
rules: {
client_name: [{ required: true, message: "璇烽�夋嫨瀹㈡埛鍚嶇О", trigger: "change" }],
signTime: [{ required: true, message: "璇烽�夋嫨鏀舵鏃ユ湡", trigger: "change" }],
- memberId: [{ required: true, message: "璇烽�夋嫨閿�鍞礋璐ｄ汉", trigger: "change" }]
+ memberId: [{ required: true, message: "璇烽�夋嫨閿�鍞礋璐ｄ汉", trigger: "change" }],
+ saleDetailNumber: [{ required: true, message: "璇烽�夋嫨閿�鍞槑缁嗗崟", trigger: "change" }]
// approvalOpinion: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }]
},
memberOptions: [],
@@ -408,8 +409,8 @@
await getPaymentTypeList().then((res) => {
console.log("鏀粯鏂瑰紡")
console.log(res.data)
- if (res.data.code === 200) {
- this.paymentTypeListOptions = res.data.data.data
+ if (res.code === 200) {
+ this.paymentTypeListOptions = res.data.data
}
})
},
@@ -417,8 +418,8 @@
await getBankAccountList().then((res) => {
console.log("璐︽埛")
console.log(res.data)
- if (res.data.code === 200) {
- this.bankAccountOptions = res.data.data.data
+ if (res.code === 200) {
+ this.bankAccountOptions = res.data.data
}
})
},
@@ -526,7 +527,7 @@
this.editConfig.infomation.serviceContract_Number = row.number
this.serviceContractId = row.id
} else if (value === "contract") {
- this.editConfig.infomation.number = row.number
+ this.editConfig.infomation.saleDetailNumber = row.number
this.SalesDetailsId = row.id
}
},
@@ -539,7 +540,7 @@
this.editConfig.infomation.serviceContract_Number = ""
this.serviceContractId = 0
} else if (value === "contract") {
- this.editConfig.infomation.number = ""
+ this.editConfig.infomation.saleDetailNumber = ""
this.SalesDetailsId = 0
}
},
--
Gitblit v1.8.0