From d92f8cd997e0fa3b1ed8ddaac18ddc501dd21c4b Mon Sep 17 00:00:00 2001
From: ryoeiken <754264374@qq.com>
Date: Fri, 22 Jan 2021 17:53:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=8F=91=E7=A5=A8=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=89=8D=E7=AB=AF=EF=BC=8C=E4=BF=AE=E5=A4=8D=E4=B8=8D?=
 =?UTF-8?q?=E8=83=BD=E7=BB=84=E5=90=88=E5=BC=80=E7=A5=A8=20bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/fantang/invoiceReturn/index.vue |  6 ++---
 .../src/views/fantang/settlement/index.vue    | 27 +++++--------------
 2 files changed, 10 insertions(+), 23 deletions(-)

diff --git a/ruoyi-ui/src/views/fantang/invoiceReturn/index.vue b/ruoyi-ui/src/views/fantang/invoiceReturn/index.vue
index 6e871bd98..badd976f8 100644
--- a/ruoyi-ui/src/views/fantang/invoiceReturn/index.vue
+++ b/ruoyi-ui/src/views/fantang/invoiceReturn/index.vue
@@ -413,7 +413,7 @@
       <el-table-column label="发票号" align="center" prop="invoiceNum"/>
       <el-table-column label="税号" align="center" prop="taxId"/>
       <el-table-column label="收款方式" align="center" prop="collectionType"/>
-      <el-table-column label="开票类型" align="center" prop="invoiceType" :formatter="formatInvoiceType"/>
+      <el-table-column label="回款跟踪" align="center" prop="invoiceType" :formatter="formatInvoiceType"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -500,9 +500,9 @@ export default {
   methods: {
     formatInvoiceType(row) {
       if (row.invoiceType === 1 || row.invoiceType === "1") {
-        return "开票"
+        return "完成"
       } else {
-        return "挂账"
+        return "未完成"
       }
     },
     /** 查询财务收费开票列表 */
diff --git a/ruoyi-ui/src/views/fantang/settlement/index.vue b/ruoyi-ui/src/views/fantang/settlement/index.vue
index 35f81af4a..77a23cc91 100644
--- a/ruoyi-ui/src/views/fantang/settlement/index.vue
+++ b/ruoyi-ui/src/views/fantang/settlement/index.vue
@@ -188,13 +188,7 @@
 </template>
 
 <script>
-import {
-  addSettlement,
-  delSettlement,
-  exportSettlement,
-  getSettlement,
-  listSettlement
-} from "../../../api/fantang/settlement";
+import {delSettlement, exportSettlement, getSettlement, listSettlement} from "../../../api/fantang/settlement";
 import {addToInvoice} from "../../../api/fantang/invoice";
 
 export default {
@@ -442,19 +436,12 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          if (this.form.settleId != null) {
-            addToInvoice(this.form).then(response => {
-              this.msgSuccess("已开票");
-              this.open = false;
-              this.getList();
-            })
-          } else {
-            addSettlement(this.form).then(response => {
-              this.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
+          addToInvoice(this.form).then(response => {
+            this.msgSuccess("已开票");
+            this.open = false;
+            this.combinationOpen = false;
+            this.getList();
+          })
         }
       });
     },