From 6ab7d9bee6290c963726cb1545505e3398bff9ab Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期二, 17 十月 2023 09:38:37 +0800
Subject: [PATCH] Merge branch 'zhengwenfeng/modify-style' into dev
---
src/views/other/payment/receipt/addReceipt.vue | 12 ++++++------
src/views/sales/salesDetails/DetailSpecification.vue | 2 +-
src/views/other/payment/receipt/index.vue | 2 +-
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/views/other/payment/receipt/addReceipt.vue b/src/views/other/payment/receipt/addReceipt.vue
index ed5daa4..c38fffc 100644
--- a/src/views/other/payment/receipt/addReceipt.vue
+++ b/src/views/other/payment/receipt/addReceipt.vue
@@ -409,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
}
})
},
@@ -418,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
}
})
},
@@ -527,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
}
},
@@ -540,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
}
},
diff --git a/src/views/other/payment/receipt/index.vue b/src/views/other/payment/receipt/index.vue
index 3270ab7..c6ad29d 100644
--- a/src/views/other/payment/receipt/index.vue
+++ b/src/views/other/payment/receipt/index.vue
@@ -247,7 +247,7 @@
this.editConfig.visible = true
this.editConfig.title = "鏂板缓"
this.editConfig.sourceType = this.sourceType
- this.editConfig.infomation = { ...this.addConfig, number: "" }
+ this.editConfig.infomation = { ...this.addConfig, saleDetailNumber: "" }
}
}
}
diff --git a/src/views/sales/salesDetails/DetailSpecification.vue b/src/views/sales/salesDetails/DetailSpecification.vue
index 23a9264..e4f1699 100644
--- a/src/views/sales/salesDetails/DetailSpecification.vue
+++ b/src/views/sales/salesDetails/DetailSpecification.vue
@@ -9,7 +9,7 @@
>
<template slot="title">
<div class="header">
- <span class="header-label">璁㈠崟缂栧彿</span>
+ <span class="header-label">閿�鍞槑缁嗗崟</span>
<span class="header-title">{{ detailConfig.infomation.number }}</span>
</div>
</template>
--
Gitblit v1.8.0