From 4092f6b7281ecd826e3dbece5a37c03aa94ac736 Mon Sep 17 00:00:00 2001
From: ltlzx <942659938@qq.com>
Date: Sat, 16 Apr 2022 21:51:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=85=A8=E9=83=A8=E6=96=87?=
 =?UTF-8?q?=E5=8C=96=E6=95=B0=E6=8D=AE=E6=9F=A5=E8=AF=A2=E7=9A=84=E5=A7=94?=
 =?UTF-8?q?=E6=89=98=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../page/classification/DataQuery.vue          | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/components/page/classification/DataQuery.vue b/src/components/page/classification/DataQuery.vue
index de7777e..d4dd172 100644
--- a/src/components/page/classification/DataQuery.vue
+++ b/src/components/page/classification/DataQuery.vue
@@ -41,7 +41,7 @@
           </a-col>
           <a-col :span="5" class="query_item">
             <span>交易方式：</span>
-            <a-select    v-model="query.goods_entrust">
+            <a-select   v-model="query.transaction" >
               <a-select-option value="">全部</a-select-option>
               <a-select-option value="1">转让</a-select-option>
               <a-select-option value="2">授权</a-select-option>
@@ -49,12 +49,13 @@
           </a-col>
           <a-col :span="5" class="query_item">
             <span>委托状态：</span>
-            <a-select    >
+            <a-select  v-model="query.entrust_status"  >
               <a-select-option value="">全部</a-select-option>
               <a-select-option value="1">委托中</a-select-option>
-              <a-select-option value="2">撤销中</a-select-option>
-              <a-select-option value="2">撤销失败</a-select-option>
               <a-select-option value="2">撤销成功</a-select-option>
+              <a-select-option value="3">委托结束</a-select-option>
+              <a-select-option value="4">撤销中</a-select-option>
+              <a-select-option value="5">撤销失败</a-select-option>
             </a-select>
           </a-col>
           <a-col :span="5" class="query_item query_item2">
@@ -81,6 +82,9 @@
           <template slot="goods_type" slot-scope="goods_type">
             <span>{{goods_type==1?'文化资源数据':'文化数字内容'}}</span>
           </template>
+          <template slot="entrust_status" slot-scope="entrust_status">
+            <span>{{entrust_status==1?'委托中':entrust_status==2?'撤销成功':entrust_status==3?'委托结束':entrust_status==4?'撤销中':'撤销失败'}}</span>
+          </template>
           <template slot="operation" slot-scope="item">
             <a-space :size="24" >
               <span class="table_operation" @click="SelectDate(item.goods_islicode)">数据查看</span>
@@ -125,6 +129,8 @@ export default {
         goods_type:'',
         data_type:'',
         createtime:[],
+        entrust_status:'',
+        transaction:''
       },
       visible:false,
       //数据查看所需要的数据
@@ -179,8 +185,8 @@ export default {
         },
         {
           title: '委托状态',
-          dataIndex: '',
-          // scopedSlots:{customRender:'goods_status'},
+          dataIndex: 'entrust_status',
+          scopedSlots:{customRender:'entrust_status'},
           align:'center'
         },
         {