From b84b88134052559ada1962acb61435102e87410d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com>
Date: Wed, 6 Mar 2024 10:20:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E7=A5=A8=E5=88=97=E8=A1=A8=EF=BC=9A?=
 =?UTF-8?q?=E5=BC=80=E7=A5=A8=E7=B1=BB=E5=9E=8B=E4=BF=AE=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?invoice=5Fstatus?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jianshui/invoice/service/impl/BillInfoServiceImpl.java    | 2 +-
 jianshui-ui/src/views/invoice/billinfo/index.vue              | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/BillInfoServiceImpl.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/BillInfoServiceImpl.java
index 592531e..2f1da8e 100644
--- a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/BillInfoServiceImpl.java
+++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/BillInfoServiceImpl.java
@@ -87,7 +87,7 @@ public class BillInfoServiceImpl implements IBillInfoService {
 
             Map<String,String> invocieStatusDictMap = new HashMap<>(); ;
 
-            List<SysDictData> invocieStatusData = dictTypeService.selectDictDataByType("bill_state");
+            List<SysDictData> invocieStatusData = dictTypeService.selectDictDataByType("invoice_status");
 
             if (CollectionUtil.isNotEmpty(invocieStatusData)){
                 invocieStatusData.forEach(e->invocieStatusDictMap.put(e.getDictValue(),e.getDictLabel()));
diff --git a/jianshui-ui/src/views/invoice/billinfo/index.vue b/jianshui-ui/src/views/invoice/billinfo/index.vue
index 0518417..1dc2416 100644
--- a/jianshui-ui/src/views/invoice/billinfo/index.vue
+++ b/jianshui-ui/src/views/invoice/billinfo/index.vue
@@ -426,7 +426,7 @@
       </el-table-column> -->
       <el-table-column label="开票状态" align="center" prop="state">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.bill_state" :value="scope.row.state"/>
+          <dict-tag :options="dict.type.invoice_status" :value="scope.row.state"/>
         </template>
       </el-table-column>
       <el-table-column label="订单来源" align="center" prop="source">
@@ -733,7 +733,7 @@ import {
 
 export default {
   name: "Billinfo",
-  dicts: ['invoice_type', 'invoice_kind', 'bill_type','bill_state'],
+  dicts: ['invoice_type', 'invoice_kind', 'bill_type','invoice_status'],
   data() {
     return {
       showMore: false,