From 3c456949b70671cc2ad95ad5395dfaceda519f17 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 23 二月 2024 10:12:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
company/src/components/enterprise/directInvoicingApplication.vue | 31 +++++++++++++++++--------------
1 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/company/src/components/enterprise/directInvoicingApplication.vue b/company/src/components/enterprise/directInvoicingApplication.vue
index 9ece041..a6a6441 100644
--- a/company/src/components/enterprise/directInvoicingApplication.vue
+++ b/company/src/components/enterprise/directInvoicingApplication.vue
@@ -28,7 +28,7 @@
</div>
<div class="info_list_item" style="width: 100%;">
<div class="info_list_item_label">鍦板潃銆佺數璇濓細</div>
- <div class="info_list_item_val">{{userInfo.company.invoiceAddr}} {{userInfo.company.phone}}</div>
+ <div class="info_list_item_val">{{userInfo.company.taxAddr}}</div>
</div>
<div class="info_list_item" style="width: 100%;">
<div class="info_list_item_label">寮�绁ㄩ噾棰濓細</div>
@@ -38,14 +38,14 @@
<el-radio v-model="type" label="0">鐢靛瓙鍙戠エ</el-radio>
<div class="list_val">
<div class="list_val_label">鎺ユ敹鍦板潃锛�</div>
- <el-input v-model="val" :disabled="type === '1'" placeholder="111222333@qq.com"></el-input>
+ <el-input v-model="val" :disabled="type === '1'" placeholder="璇疯緭鍏�"></el-input>
</div>
</div>
<div class="list" style="width: 100%;">
<el-radio v-model="type" label="1">绾歌川鍙戠エ</el-radio>
<div class="list_val">
<div class="list_val_label">鎺ユ敹鍦板潃锛�</div>
- <el-input v-model="val1" :disabled="type === '0'" placeholder="瀹夊窘鐪佸悎鑲ュ競缁忔祹鎶�鏈紑鍙戝尯鑾茶姳璺互涓溿�佺煶闂ㄨ矾浠ュ崡鑾茶姳璺�1锛� 0551-63450845"></el-input>
+ <el-input v-model="val1" :disabled="type === '0'" placeholder="璇疯緭鍏�"></el-input>
</div>
</div>
</div>
@@ -71,8 +71,17 @@
</el-table-column>
<el-table-column
align="center"
- prop="insuranceCode"
label="淇濆崟鍙�">
+ <template slot-scope="{row}">
+ <span>{{row.insuranceCode ? row.insuranceCode : '-'}}</span>
+ </template>
+ </el-table-column>
+ <el-table-column
+ align="center"
+ label="鎵瑰崟鍙�">
+ <template slot-scope="{row}">
+ <span>{{row.validCode ? row.validCode : '-'}}</span>
+ </template>
</el-table-column>
<el-table-column
align="center"
@@ -176,14 +185,6 @@
return price
}
},
- watch: {
- type: {
- handler(news) {
- this.val = ''
- this.val1 = ''
- }
- }
- },
methods: {
open (title, target) {
this.title = title
@@ -193,6 +194,8 @@
this.val1 = ''
this.list1 = []
this.list2 = []
+ this.val = this.userInfo.company.invoiceEmail
+ this.val1 = this.userInfo.company.invoiceAddr
this.$nextTick(() => {
for (const key in this.form) {
this.form[key] = target[key]
@@ -205,13 +208,13 @@
this.$message.warning('璇疯緭鍏ユ帴鏀跺湴鍧�')
return
}
- if (this.setectData.length === 0) {
+ if (this.list2.length > 0 && this.setectData.length === 0) {
this.$message.warning('鑷冲皯鍕鹃�変竴椤瑰啿绾㈠崟鏁版嵁')
return
}
this.isWorking = true
directInvoicing({
- address: this.val1 || this.val,
+ address: this.type == 1 ? this.val1 : this.val,
id: this.form.id,
invoicingDetailDTOList: this.setectData.map(item => item.id),
invoicingMoney: this.totalPrice,
--
Gitblit v1.9.3