From 57270c56653fe3bf759928370451067a44efb4f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com>
Date: Fri, 1 Mar 2024 11:15:09 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8=EF=BC=9A?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8F=96=E5=80=BC=E4=B8=8D=E6=AD=A3=E7=A1=AE?=
 =?UTF-8?q?=E3=80=81=E5=AF=BC=E5=87=BA=E5=AF=B9=E5=BA=94=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/BillInfoServiceImpl.java     |  2 +-
 .../src/views/invoice/billinfo/index.vue      | 20 +++++++++----------
 2 files changed, 11 insertions(+), 11 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 2f1da8e..592531e 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("invoice_status");
+            List<SysDictData> invocieStatusData = dictTypeService.selectDictDataByType("bill_state");
 
             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 7960b6d..0518417 100644
--- a/jianshui-ui/src/views/invoice/billinfo/index.vue
+++ b/jianshui-ui/src/views/invoice/billinfo/index.vue
@@ -404,9 +404,9 @@
         </template>
       </el-table-column>
       <el-table-column label="推送方式" align="center" prop="tsfs">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.tsfs" :value="scope.row.tsfs"/>
-        </template>
+<!--        <template slot-scope="scope">-->
+<!--          <dict-tag :options="dict.type.tsfs" :value="scope.row.tsfs"/>-->
+<!--        </template>-->
       </el-table-column>
       <el-table-column label="清单标志" align="center" prop="qdbz">
         <template slot-scope="scope">
@@ -430,9 +430,9 @@
         </template>
       </el-table-column>
       <el-table-column label="订单来源" align="center" prop="source">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.source" :value="scope.row.source"/>
-        </template>
+<!--        <template slot-scope="scope">-->
+<!--          <dict-tag :options="dict.type.source" :value="scope.row.source"/>-->
+<!--        </template>-->
       </el-table-column>
       <!-- <el-table-column label="服务公司" align="center" prop="serviceSupplierKey">
         <template slot-scope="scope">
@@ -440,9 +440,9 @@
         </template>
       </el-table-column> -->
       <el-table-column label="单据类型" align="center" prop="billType">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.bill_type" :value="scope.row.billType"/>
-        </template>
+<!--        <template slot-scope="scope">-->
+<!--          <dict-tag :options="dict.type.bill_type" :value="scope.row.billType"/>-->
+<!--        </template>-->
       </el-table-column>
       <el-table-column label="业务留存字段" align="center" prop="businessRemark" width="120px"/>
       <el-table-column label="开票时间" align="center" prop="invoicedTime" width="100">
@@ -733,7 +733,7 @@ import {
 
 export default {
   name: "Billinfo",
-  dicts: ['invoice_type', 'invoice_kind', 'bill_type'],
+  dicts: ['invoice_type', 'invoice_kind', 'bill_type','bill_state'],
   data() {
     return {
       showMore: false,