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 | 45 +++++++++++++++++++++++++--------------------
1 files changed, 25 insertions(+), 20 deletions(-)
diff --git a/src/views/other/payment/receipt/addReceipt.vue b/src/views/other/payment/receipt/addReceipt.vue
index 511ef9b..c38fffc 100644
--- a/src/views/other/payment/receipt/addReceipt.vue
+++ b/src/views/other/payment/receipt/addReceipt.vue
@@ -13,7 +13,7 @@
:model="editConfig.infomation"
:rules="rules"
label-position="right"
- label-width="308px"
+ label-width="168px"
size="mini"
style="height: 60vh; overflow-x: hidden"
>
@@ -35,6 +35,7 @@
"
value-key="name"
@select="handleSelectClient('client', $event)"
+ style="width: 100%"
></el-autocomplete>
<div class="common-select-btn" @click="selClientClick('client')">
<i class="el-icon-circle-plus-outline" title="閫夋嫨"></i>
@@ -44,7 +45,7 @@
class="common-select-btn"
@click="clearupClient('client')"
>
- <i class="el-icon-edit-outline" title="娓呴櫎"></i>
+ <i class="el-icon-remove-outline" title="娓呴櫎"></i>
</div>
</div>
</el-form-item>
@@ -67,6 +68,7 @@
"
value-key="number"
@select="handleSelectClient('serviceContract', $event)"
+ style="width: 100%"
></el-autocomplete>
<div class="common-select-btn" @click="selClientClick('serviceContract')">
<i class="el-icon-circle-plus-outline" title="閫夋嫨"></i>
@@ -79,16 +81,16 @@
class="common-select-btn"
@click="clearupClient('serviceContract')"
>
- <i class="el-icon-edit-outline" title="娓呴櫎"></i>
+ <i class="el-icon-remove-outline" title="娓呴櫎"></i>
</div>
</div>
</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')
@@ -96,16 +98,17 @@
"
value-key="number"
@select="handleSelectClient('contract', $event)"
+ style="width: 100%"
></el-autocomplete>
<div class="common-select-btn" @click="selClientClick('contract')">
<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')"
>
- <i class="el-icon-edit-outline" title="娓呴櫎"></i>
+ <i class="el-icon-remove-outline" title="娓呴櫎"></i>
</div>
</div>
</el-form-item>
@@ -116,7 +119,7 @@
v-model="editConfig.infomation.principalId"
placeholder="璇烽�夋嫨"
size="mini"
- style="width: 63%"
+ style="width: 100%"
>
<el-option v-for="item in memberOptions" :key="item.id" :label="item.username" :value="item.id">
</el-option>
@@ -130,6 +133,7 @@
value-format="yyyy-MM-dd"
type="date"
placeholder="閫夋嫨鏃ユ湡"
+ style="width: 100%"
>
</el-date-picker>
</el-form-item>
@@ -154,7 +158,7 @@
v-model="editConfig.infomation.paymentTypeId"
placeholder="璇烽�夋嫨"
size="mini"
- style="width: 63%"
+ style="width: 100%"
>
<el-option
v-for="item in paymentTypeListOptions"
@@ -172,7 +176,7 @@
v-model="editConfig.infomation.bankAccountId"
placeholder="璇烽�夋嫨"
size="mini"
- style="width: 63%"
+ style="width: 100%"
>
<el-option v-for="item in bankAccountOptions" :key="item.id" :label="item.name" :value="item.id">
</el-option>
@@ -190,7 +194,7 @@
<div class="basic-info-title">鏀舵淇℃伅</div>
<div class="basic-info-view">
<el-row>
- <el-col :span="24">
+ <el-col :span="12">
<el-form-item label="鏈鏀舵閲戦" prop="amount">
<el-input-number
v-model="editConfig.infomation.amount"
@@ -198,7 +202,7 @@
:min="0"
:precision="2"
:controls="false"
- style="width: 25%; margin-right: 5px"
+ style="width: 100%"
></el-input-number>
</el-form-item>
</el-col>
@@ -350,12 +354,13 @@
},
data() {
return {
- dialogWidth: "80%",
+ dialogWidth: "50%",
editConfig: this.editCommonConfig,
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: [],
@@ -404,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
}
})
},
@@ -413,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
}
})
},
@@ -522,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
}
},
@@ -535,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