From 6bd1c1c7d8d3317e1a36312678c3142ef8725c50 Mon Sep 17 00:00:00 2001
From: ltlzx <942659938@qq.com>
Date: Wed, 11 May 2022 16:37:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Header.vue            |  2 +-
 src/components/billDetails/index.vue |  3 +++
 src/components/dateSelect/index.vue  | 26 ++++++++++++--------------
 src/components/dateSelect/order.vue  | 28 +++++++++++++---------------
 4 files changed, 29 insertions(+), 30 deletions(-)

diff --git a/src/components/Header.vue b/src/components/Header.vue
index d867a49..38c1999 100644
--- a/src/components/Header.vue
+++ b/src/components/Header.vue
@@ -11,7 +11,7 @@
         <img src="../assets/icons/svg/user.svg" alt="" >
         <span class="f_title">{{name}}</span>
       </div>
-      <a href="http://10.24.4.57/#/Home">
+      <a href="http://10.24.4.55/#/cache/index">
       <!-- <a href="http://58.30.231.137:8035/#/cache/index"> -->
         <div class="header_right_item">
             <img src="../assets/icons/svg/yingyong.svg" alt="" >
diff --git a/src/components/billDetails/index.vue b/src/components/billDetails/index.vue
index 0c3e681..c9eb6ce 100644
--- a/src/components/billDetails/index.vue
+++ b/src/components/billDetails/index.vue
@@ -305,4 +305,7 @@
     overflow: auto;
     margin-top: 22px;
   }
+  .query_item .ant-select{
+    width: 180px;
+  }
 </style>
diff --git a/src/components/dateSelect/index.vue b/src/components/dateSelect/index.vue
index 8e64bec..df1864a 100644
--- a/src/components/dateSelect/index.vue
+++ b/src/components/dateSelect/index.vue
@@ -84,7 +84,7 @@
             </div>
             <template v-if="gather_arr.length!=0">
               <div class="tab_content">
-                <p class="tab_content_title">{{entrust_goods.goods_type==1?'文化资源数据':'文化数字内容'}}数据集</p>
+                <p class="tab_content_title">{{entrust_goods.goods_type==1?'文化资源':'文化数字内容'}}数据集</p>
               </div>
               <div class="content_table">
                 <a-table :columns="columns1" :data-source="gather_arr" bordered :pagination="false">
@@ -96,7 +96,7 @@
             </template>
             <template v-if="oneSource.length!=0">
               <div class="tab_content">
-                <p class="tab_content_title">{{entrust_goods.goods_type==1?'文化资源数据':'文化数字内容'}}资源</p>
+                <p class="tab_content_title">{{entrust_goods.goods_type==1?'文化资源数据':'文化数字内容'}}</p>
               </div>
               <div class="content_table">
                 <a-table :columns="columns2" :data-source="oneSource" bordered :pagination="false"></a-table>
@@ -275,12 +275,11 @@
             width:'166px',
 
           },
-          {
-            title: '分类',
-            dataIndex: 'class',
-            width:'82px',
-
-          },
+          // {
+          //   title: '分类',
+          //   dataIndex: 'class',
+          //   width:'82px',
+          // },
           {
             title: '生成时间',
             dataIndex: 'registerDate',
@@ -313,12 +312,11 @@
             width:'166px',
 
           },
-          {
-            title: '分类',
-            dataIndex: 'class',
-            width:'82px',
-
-          },
+          // {
+          //   title: '分类',
+          //   dataIndex: 'class',
+          //   width:'82px',
+          // },
           {
             title: '生成时间',
             dataIndex: 'registerDate',
diff --git a/src/components/dateSelect/order.vue b/src/components/dateSelect/order.vue
index 7356977..ae52642 100644
--- a/src/components/dateSelect/order.vue
+++ b/src/components/dateSelect/order.vue
@@ -66,7 +66,7 @@
             </div>
             <template v-if="item.gather_arr.length!=0">
               <div class="tab_content">
-                <p class="tab_content_title">{{item.goods.goods_type==1?'文化资源数据':'文化数字内容'}}数据集</p>
+                <p class="tab_content_title">{{item.goods.goods_type==1?'文化资源':'文化数字内容'}}数据集</p>
               </div>
               <div class="content_table">
                 <a-table :columns="columns1" :data-source="item.gather_arr" bordered :pagination="false">
@@ -78,7 +78,7 @@
             </template>
             <template v-if="item.oneSource.length!=0">
               <div class="tab_content">
-                <p class="tab_content_title">{{item.goods.goods_type==1?'文化资源数据':'文化数字内容'}}资源</p>
+                <p class="tab_content_title">{{item.goods.goods_type==1?'文化资源数据':'文化数字内容'}}</p>
               </div>
               <div class="content_table">
                 <a-table :columns="columns2" :data-source="item.oneSource" bordered :pagination="false">
@@ -269,12 +269,11 @@
             width:'166px',
 
           },
-          {
-            title: '分类',
-            dataIndex: 'class',
-            width:'82px',
-
-          },
+          // {
+          //   title: '分类',
+          //   dataIndex: 'class',
+          //   width:'82px',
+          // },
           {
             title: '生成时间',
             dataIndex: 'registerDate',
@@ -308,12 +307,11 @@
             width:'166px',
 
           },
-          {
-            title: '分类',
-            dataIndex: 'class',
-            width:'82px',
-
-          },
+          // {
+          //   title: '分类',
+          //   dataIndex: 'class',
+          //   width:'82px',
+          // },
           {
             title: '生成时间',
             dataIndex: 'registerDate',
@@ -364,7 +362,7 @@
             if(res.data.length!=0){
               this.orderDate=res.data
               let state=res.data[0].goods.status
-              if(state==1){
+              if(state==1 || state==5){
                 this.columns.pop()
               }
               // this.userinfo=res.data.userinfo