From ffd3a617b48869d29f9ebb5b611f19795ab5e295 Mon Sep 17 00:00:00 2001
From: ltlzx <942659938@qq.com>
Date: Sat, 23 Apr 2022 00:36:45 +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/App.vue                                   |  16 +-
 src/api/index.js                              |   6 +-
 src/components/Sidebar.vue                    |   2 +-
 src/components/accountDetails/index.vue       |   2 +-
 src/components/billDetails/index.vue          |   4 +-
 src/components/dateSelect/index.vue           |  20 +-
 src/components/dateSelect/order.vue           | 457 ++++++++++++++++++
 src/components/orderDetails/index.vue         |  43 +-
 src/components/page/Home/index.vue            |  27 +-
 src/components/page/admission/index.vue       |  25 +-
 src/components/page/afterService/invoice.vue  |  36 +-
 .../page/classification/Category.vue          |  12 +-
 .../page/classification/DataQuery.vue         |  43 +-
 src/components/page/fundSettlement/index.vue  |  12 +-
 .../page/fundSettlement/splitProportion.vue   |  16 +-
 src/components/page/layout/index.vue          |  35 +-
 src/components/page/order/closed.vue          |  60 ++-
 src/components/page/order/completed.vue       |  60 ++-
 src/components/page/order/index.vue           |  68 +--
 src/components/page/order/pendingPayment.vue  |  60 ++-
 src/components/page/order/toBeDelivered.vue   |  60 ++-
 src/components/page/order/toBeSettled.vue     |  60 ++-
 src/router/index.js                           |   2 +-
 23 files changed, 818 insertions(+), 308 deletions(-)
 create mode 100644 src/components/dateSelect/order.vue

diff --git a/src/App.vue b/src/App.vue
index 5fa0375..aab5b99 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -15,23 +15,9 @@ export default {
   name: 'App',
   data(){
     return{
-      zh_CN,
-      transitionName: "turn-on",
+      zh_CN
     }
   },
-  watch: {
-    $route (to, from) {
-        // 切换动画
-        // 页面之间的跳转一般由路由中的level来实现
-        let level = this.$route.meta.level // 监听路由的层级
-        console.log(level)
-        if (level === 1) {
-          this.transitionName = 'turn-on'
-        } else {
-          this.transitionName = 'turn-off'
-      }
-    }
-  }
 }
 </script>
 
diff --git a/src/api/index.js b/src/api/index.js
index 95ddf8a..7369713 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -8,7 +8,7 @@ export const getAllDate = query => {
       data: query
   });
 };
-//数据查看
+//标的信息
 export const goodsDetail = query => {
   return request({
       url: '/admin/goods.Goods/goodsDetail',
@@ -16,7 +16,7 @@ export const goodsDetail = query => {
       data: query
   });
 };
-//数据查看-资源详情
+//标的信息-资源详情
 export const sourceDetail = query => {
   return request({
       url: '/admin/goods.Goods/sourceDetail',
@@ -88,7 +88,7 @@ export const getOrderList = query => {
       data: query
   });
 };
-//订单数据查看
+//订单标的信息
 export const orderDetail = query => {
   return request({
       url: '/admin/order.Order/orderDetail',
diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue
index ec2604e..5118083 100644
--- a/src/components/Sidebar.vue
+++ b/src/components/Sidebar.vue
@@ -69,7 +69,7 @@ export default {
             {icon:'',url:"pendingPayment",title:"待付款订单",key:'/pendingPayment',auth:'PendingPayment',isShow:true},
             {icon:'',url:"toBeDelivered",title:"待交付订单",key:'/toBeDelivered',auth:'PendDelivery',isShow:true},
             {icon:'',url:"toBeSettled",title:"待结算订单",key:'/toBeSettled',auth:'PendBalance',isShow:true},
-            {icon:'',url:"completed",title:"已完成订单",key:'/completed',auth:'OrderCompleted',isShow:true},
+            {icon:'',url:"completed",title:"已终止订单",key:'/completed',auth:'OrderCompleted',isShow:true},
             {icon:'',url:"closed",title:"已关闭订单",key:'/closed',auth:'OrderClosed',isShow:true},
           ]
         },
diff --git a/src/components/accountDetails/index.vue b/src/components/accountDetails/index.vue
index 718a5fc..3e0d275 100644
--- a/src/components/accountDetails/index.vue
+++ b/src/components/accountDetails/index.vue
@@ -14,7 +14,7 @@
         <p>认证状态：{{data.attest_status==1?'认证中':data.attest_status==2?'认证成功':'认证失败'}}</p>
         <p>基本信息：{{data.username}}</p>
         <p v-if="data.institution_code">统一社会信用代码：{{data.institution_code}}</p>
-        <p>账户ISLI标识码：{{data.user_isli}}</p>
+        <p>身份ISLI认证码：{{data.user_isli}}</p>
       </div>
       <template slot="footer">
         <div>
diff --git a/src/components/billDetails/index.vue b/src/components/billDetails/index.vue
index e1fa2f3..530937d 100644
--- a/src/components/billDetails/index.vue
+++ b/src/components/billDetails/index.vue
@@ -154,7 +154,7 @@
             // align:'center'
           },
           {
-            title: '佣金/服务费（含税）',
+            title: '佣金/交易佣金（含税）',
             dataIndex: 'service_charge',
             width:'120px',
             // align:'center'
@@ -178,7 +178,7 @@
             // align:'center'
           },
           {
-            title: '服务费分配',
+            title: '交易佣金分配',
             dataIndex: 'service_charge_allot',
             width:'120px',
             // align:'center'
diff --git a/src/components/dateSelect/index.vue b/src/components/dateSelect/index.vue
index 4394141..7cc68ec 100644
--- a/src/components/dateSelect/index.vue
+++ b/src/components/dateSelect/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="component_body">
-    <a-modal  v-model="newVisible" title="数据查看" :afterClose="onClose" width="1350px" :bodyStyle="modeStyle">
+    <a-modal  v-model="newVisible" title="标的信息" :afterClose="onClose" width="1350px" :bodyStyle="modeStyle">
       <a-tabs default-active-key="1" tab-position="left" :tabBarStyle="tabsStyle">
         <a-tab-pane key="1">
           <span slot="tab">
@@ -11,11 +11,11 @@
           <div class="tab_body">
             <template v-if="userinfo">
               <div class="tab_body_content" >
+                <p class="tab_body_p">机构名称：{{userinfo.name}}</p>
                 <p class="tab_body_p">认证类型：{{userinfo.userType}}</p>
                 <p class="tab_body_p">认证状态：{{userinfo.state==0?'认证中':userinfo.state==1?'认证成功':'认证失败'}}</p>
-                <p class="tab_body_p">基本信息：{{userinfo.name}}</p>
                 <p class="tab_body_p">统一社会信用代码：{{userinfo.uscc}}</p>
-                <p class="tab_body_p">账户ISLI标识码：{{userinfo.islicode}}</p>
+                <p class="tab_body_p">身份ISLI认证码：{{userinfo.islicode}}</p>
                 <!-- <p class="tab_body_p">机构类型：{{item.userType}}</p>
 
                 <p class="tab_body_p" v-if="item.certType">证件类型：{{item.certType}}</p>
@@ -61,14 +61,16 @@
                   <div class="content_info">
                     <div class="content_info_left">
                       <p>标志码：{{item.goods_islicode}}</p>
-                      <p>交易关联标识符：{{item.contract_code}}</p>
-                      <p>标的类型：{{item.goods_type==1?'文化资源数据':'文化数字内容'}}</p>
+                      <!-- <p>交易关联标识符：{{item.contract_code}}</p> -->
+                      <p>交易品种：{{item.goods_type==1?'文化资源数据':'文化数字内容'}}</p>
                       <p>交易方式：{{item.goods_entrust==1?'转让':'授权'}}</p>
-                      <p>权益：{{item.goods_ownership_str}}</p>
-                      <p>委托周期：{{item.contractual_period==1?'永久性委托':item.contractual_period==2?'一次性委托':'阶段性委托'}}</p>
+                      <p>权利类型：{{item.goods_ownership_str}}</p>
+                      <p>委托类型：{{item.contractual_period==1?'永久性委托':item.contractual_period==2?'一次性委托':'阶段性委托'}}</p>
                       <p>收费类型：{{item.charges_type==1?'免费':'付费'}}</p>
                       <!-- <p>交易保证金：{{item.earnest_money}}</p> -->
                       <p>自报价：{{item.price}}</p>
+                      <p>委托开始时间：{{item.contractual_start_time}}</p>
+                      <p>委托终止时间：{{item.contractualtime_end_time}}</p>
                     </div>
                   </div>
                 </div>
@@ -110,7 +112,7 @@
       </template>
     </a-modal>
 
-    <a-modal  v-model="newVisible1" title="数据查看" width="1172px" :bodyStyle="modeStyle">
+    <a-modal  v-model="newVisible1" title="标的信息" width="1172px" :bodyStyle="modeStyle">
         <div class="tab_body">
           <div class="tab_body_title">
             <p class="tab_body_title_bg"></p>
@@ -274,7 +276,7 @@
             align:'center'
           },
           {
-            title: '资源总数',
+            title: '关联目标数量',
             dataIndex: 'source_count',
             width:'110px',
             align:'center'
diff --git a/src/components/dateSelect/order.vue b/src/components/dateSelect/order.vue
new file mode 100644
index 0000000..b791cfc
--- /dev/null
+++ b/src/components/dateSelect/order.vue
@@ -0,0 +1,457 @@
+<template>
+  <div class="component_body">
+    <a-modal  v-model="newVisible" title="标的信息" :afterClose="onClose" width="1350px" :bodyStyle="modeStyle">
+      <a-tabs default-active-key="1" tab-position="left" :tabBarStyle="tabsStyle">
+        <a-tab-pane :key="index" v-for="(item,index) in orderDate">
+          <span slot="tab">
+            <span class="tab_span">*</span>
+            标的信息
+            <span v-if="index>0">{{index+1}}</span>
+          </span>
+          <p>标的信息</p>
+          <div class="tab_body">
+            <!-- <template v-if="userinfo"> -->
+              <div class="tab_body_content" >
+                <p class="tab_body_p">机构名称：{{item.userinfo.name}}</p>
+                <p class="tab_body_p">认证类型：{{item.userinfo.userType}}</p>
+                <p class="tab_body_p">认证状态：{{item.userinfo.state==0?'认证中':item.userinfo.state==1?'认证成功':'认证失败'}}</p>
+                <p class="tab_body_p">统一社会信用代码：{{item.userinfo.uscc}}</p>
+                <p class="tab_body_p">身份ISLI认证码：{{item.userinfo.islicode}}</p>
+              </div>
+
+              <div class="tab_body_title">
+              <p class="tab_body_title_bg"></p>
+              <div>{{item.goods.goods_type==1?'文化资源数据':'文化数字内容'}}-基本信息</div>
+            </div>
+            <!-- <template v-if="entrust_goods.goods.length!=0"> -->
+              <div class="tab_content " >
+                <div class="tab_content_infoImg">
+                  <img :src="item.goods.goods_image" class="tab_content_img" v-if="item.goods.goods_image!=''">
+                  <img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMIAAADDCAYAAADQvc6UAAABRWlDQ1BJQ0MgUHJvZmlsZQAAKJFjYGASSSwoyGFhYGDIzSspCnJ3UoiIjFJgf8LAwSDCIMogwMCcmFxc4BgQ4ANUwgCjUcG3awyMIPqyLsis7PPOq3QdDFcvjV3jOD1boQVTPQrgSkktTgbSf4A4LbmgqISBgTEFyFYuLykAsTuAbJEioKOA7DkgdjqEvQHEToKwj4DVhAQ5A9k3gGyB5IxEoBmML4BsnSQk8XQkNtReEOBxcfXxUQg1Mjc0dyHgXNJBSWpFCYh2zi+oLMpMzyhRcASGUqqCZ16yno6CkYGRAQMDKMwhqj/fAIcloxgHQqxAjIHBEugw5sUIsSQpBobtQPdLciLEVJYzMPBHMDBsayhILEqEO4DxG0txmrERhM29nYGBddr//5/DGRjYNRkY/l7////39v///y4Dmn+LgeHANwDrkl1AuO+pmgAAADhlWElmTU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAAqACAAQAAAABAAAAwqADAAQAAAABAAAAwwAAAAD9b/HnAAAHlklEQVR4Ae3dP3PTWBSGcbGzM6GCKqlIBRV0dHRJFarQ0eUT8LH4BnRU0NHR0UEFVdIlFRV7TzRksomPY8uykTk/zewQfKw/9znv4yvJynLv4uLiV2dBoDiBf4qP3/ARuCRABEFAoBEgghggQAQZQKAnYEaQBAQaASKIAQJEkAEEegJmBElAoBEgghggQAQZQKAnYEaQBAQaASKIAQJEkAEEegJmBElAoBEgghggQAQZQKAnYEaQBAQaASKIAQJEkAEEegJmBElAoBEgghggQAQZQKAnYEaQBAQaASKIAQJEkAEEegJmBElAoBEgghggQAQZQKAnYEaQBAQaASKIAQJEkAEEegJmBElAoBEgghggQAQZQKAnYEaQBAQaASKIAQJEkAEEegJmBElAoBEgghggQAQZQKAnYEaQBAQaASKIAQJEkAEEegJmBElAoBEgghggQAQZQKAnYEaQBAQaASKIAQJEkAEEegJmBElAoBEgghggQAQZQKAnYEaQBAQaASKIAQJEkAEEegJmBElAoBEgghggQAQZQKAnYEaQBAQaASKIAQJEkAEEegJmBElAoBEgghggQAQZQKAnYEaQBAQaASKIAQJEkAEEegJmBElAoBEgghggQAQZQKAnYEaQBAQaASKIAQJEkAEEegJmBElAoBEgghgg0Aj8i0JO4OzsrPv69Wv+hi2qPHr0qNvf39+iI97soRIh4f3z58/u7du3SXX7Xt7Z2enevHmzfQe+oSN2apSAPj09TSrb+XKI/f379+08+A0cNRE2ANkupk+ACNPvkSPcAAEibACyXUyfABGm3yNHuAECRNgAZLuYPgEirKlHu7u7XdyytGwHAd8jjNyng4OD7vnz51dbPT8/7z58+NB9+/bt6jU/TI+AGWHEnrx48eJ/EsSmHzx40L18+fLyzxF3ZVMjEyDCiEDjMYZZS5wiPXnyZFbJaxMhQIQRGzHvWR7XCyOCXsOmiDAi1HmPMMQjDpbpEiDCiL358eNHurW/5SnWdIBbXiDCiA38/Pnzrce2YyZ4//59F3ePLNMl4PbpiL2J0L979+7yDtHDhw8vtzzvdGnEXdvUigSIsCLAWavHp/+qM0BcXMd/q25n1vF57TYBp0a3mUzilePj4+7k5KSLb6gt6ydAhPUzXnoPR0dHl79WGTNCfBnn1uvSCJdegQhLI1vvCk+fPu2ePXt2tZOYEV6/fn31dz+shwAR1sP1cqvLntbEN9MxA9xcYjsxS1jWR4AIa2Ibzx0tc44fYX/16lV6NDFLXH+YL32jwiACRBiEbf5KcXoTIsQSpzXx4N28Ja4BQoK7rgXiydbHjx/P25TaQAJEGAguWy0+2Q8PD6/Ki4R8EVl+bzBOnZY95fq9rj9zAkTI2SxdidBHqG9+skdw43borCXO/ZcJdraPWdv22uIEiLA4q7nvvCug8WTqzQveOH26fodo7g6uFe/a17W3+nFBAkRYENRdb1vkkz1CH9cPsVy/jrhr27PqMYvENYNlHAIesRiBYwRy0V+8iXP8+/fvX11Mr7L7ECueb/r48eMqm7FuI2BGWDEG8cm+7G3NEOfmdcTQw4h9/55lhm7DekRYKQPZF2ArbXTAyu4kDYB2YxUzwg0gi/41ztHnfQG26HbGel/crVrm7tNY+/1btkOEAZ2M05r4FB7r9GbAIdxaZYrHdOsgJ/wCEQY0J74TmOKnbxxT9n3FgGGWWsVdowHtjt9Nnvf7yQM2aZU/TIAIAxrw6dOnAWtZZcoEnBpNuTuObWMEiLAx1HY0ZQJEmHJ3HNvGCBBhY6jtaMoEiJB0Z29vL6ls58vxPcO8/zfrdo5qvKO+d3Fx8Wu8zf1dW4p/cPzLly/dtv9Ts/EbcvGAHhHyfBIhZ6NSiIBTo0LNNtScABFyNiqFCBChULMNNSdAhJyNSiECRCjUbEPNCRAhZ6NSiAARCjXbUHMCRMjZqBQiQIRCzTbUnAARcjYqhQgQoVCzDTUnQIScjUohAkQo1GxDzQkQIWejUogAEQo121BzAkTI2agUIkCEQs021JwAEXI2KoUIEKFQsw01J0CEnI1KIQJEKNRsQ80JECFno1KIABEKNdtQcwJEyNmoFCJAhELNNtScABFyNiqFCBChULMNNSdAhJyNSiECRCjUbEPNCRAhZ6NSiAARCjXbUHMCRMjZqBQiQIRCzTbUnAARcjYqhQgQoVCzDTUnQIScjUohAkQo1GxDzQkQIWejUogAEQo121BzAkTI2agUIkCEQs021JwAEXI2KoUIEKFQsw01J0CEnI1KIQJEKNRsQ80JECFno1KIABEKNdtQcwJEyNmoFCJAhELNNtScABFyNiqFCBChULMNNSdAhJyNSiECRCjUbEPNCRAhZ6NSiAARCjXbUHMCRMjZqBQiQIRCzTbUnAARcjYqhQgQoVCzDTUnQIScjUohAkQo1GxDzQkQIWejUogAEQo121BzAkTI2agUIkCEQs021JwAEXI2KoUIEKFQsw01J0CEnI1KIQJEKNRsQ80JECFno1KIABEKNdtQcwJEyNmoFCJAhELNNtScABFyNiqFCBChULMNNSdAhJyNSiEC/wGgKKC4YMA4TAAAAABJRU5ErkJggg==" class="tab_content_img" v-else>
+                </div>
+                <div class="tab_content_right">
+                  <div class="content_right_title">标的名称：{{item.goods.goods_name}}</div>
+                  <div class="content_info">
+                    <div class="content_info_left">
+                      <p>标志码：{{item.goods.goods_islicode}}</p>
+                      <p>交易ISLI编码：{{item.goods.contract_code}}</p>
+                      <p>交易品种：{{item.goods.goods_type==1?'文化资源数据':'文化数字内容'}}</p>
+                      <p>交易方式：{{item.goods.goods_entrust==1?'转让':'授权'}}</p>
+                      <p>权利类型：{{item.goods.goods_ownership_str}}</p>
+                      <p>委托类型：{{item.goods.contractual_period==1?'永久性委托':item.goods.contractual_period==2?'一次性委托':'阶段性委托'}}</p>
+                      <p>收费类型：{{item.goods.charges_type==1?'免费':'付费'}}</p>
+                      <!-- <p>交易保证金：{{item.earnest_money}}</p> -->
+                      <p>自报价：{{item.goods.price}}</p>
+                      <p>交易佣金：{{item.goods.price}}</p>
+                      <p>委托开始时间：{{item.goods.contractual_start_time}}</p>
+                      <p>委托终止时间：{{item.goods.contractualtime_end_time}}</p>
+                      <p>标的价款：¥ {{item.goods.money}}</p>
+                      <p>购买年限：{{item.goods.transaction_count}}</p>
+                      <p>交易佣金：¥ {{item.goods.service_charge}}</p>
+                      <!-- <p>交易流水号：{{order_info.close_serial_number}}</p> -->
+                    </div>
+                  </div>
+                </div>
+              </div>
+            <!-- </template> -->
+            <!-- <p v-else class="none_p">暂无数据</p> -->
+            <div class="tab_body_title">
+              <p class="tab_body_title_bg"></p>
+              <div>{{item.goods.goods_type==1?'文化资源数据':'文化数字内容'}}-关联资源</div>
+            </div>
+            <div class="tab_content">
+              <p class="tab_content_title">{{item.goods.goods_type==1?'文化资源数据':'文化数字内容'}}集</p>
+            </div>
+            <div class="content_table">
+              <a-table :columns="columns1" :data-source="item.source_gather" bordered :pagination="false">
+                <template slot="operation" >
+                  <span @click="selectDetails(item.goods.goods_islicode)" class="details_span">详情</span>
+                </template>
+              </a-table>
+            </div>
+            <!-- </template> -->
+            <!-- <span v-else>暂无数据</span> -->
+          </div>
+        </a-tab-pane>
+      </a-tabs>
+      <template slot="footer">
+        <div>
+          <a-button type="white" @click="onClose">返 回</a-button>
+        </div>
+      </template>
+    </a-modal>
+
+    <a-modal  v-model="newVisible1" title="标的信息" width="1172px" :bodyStyle="modeStyle">
+        <div class="tab_body">
+          <div class="tab_body_title">
+            <p class="tab_body_title_bg"></p>
+            <div>{{sourceDate.collectionType}}-基本信息</div>
+          </div>
+          <div class="tab_content ">
+            <!-- <div class="tab_content_infoImg"> -->
+              <!-- <img src="../../assets/img/test.png" class="tab_content_img"> -->
+            <!-- </div> -->
+            <div class="tab_content_right">
+              <div class="content_right_title">标的名称：{{sourceDate.source_name}}</div>
+              <div class="content_info">
+                <div class="content_info_left">
+                  <p>其他标识符：{{sourceDate.otherIdentifiers}}</p>
+                  <p>标识符：{{sourceDate.identifier}}</p>
+                  <p>类型：{{sourceDate.collectionType}}</p>
+                  <p>服务类型：{{sourceDate.serviceType}}</p>
+                  <p>分类：{{sourceDate.classification}}</p>
+                  <p>贡献者：{{sourceDate.contributors}}</p>
+                  <p>著作权人：{{sourceDate.copyrightOwner}}</p>
+                  <p>载体：{{sourceDate.carrier}}</p>
+                  <p>登记者：{{sourceDate.registrant}}</p>
+                  <p>登记日期：{{sourceDate.registerDate}}</p>
+                </div>
+                <div>
+                  <p>所属/收藏机构：{{sourceDate.repositoryName}}</p>
+                  <p>尺寸：{{sourceDate.dimensions}}</p>
+                  <p>组件数量：{{sourceDate.quantity}}</p>
+                  <p>标签：{{sourceDate.label}}</p>
+                  <p>描述：{{sourceDate.description}}</p>
+                  <p>哈希值：{{sourceDate.md5}}</p>
+                  <p>版本：{{sourceDate.edition}}</p>
+                  <p>现况：{{sourceDate.collectionCondition}}</p>
+                  <p>封面：{{sourceDate.covers}}</p>
+                </div>
+              </div>
+            </div>
+          </div>
+
+          <div class="tab_body_title">
+            <p class="tab_body_title_bg"></p>
+            <div>{{sourceDate.collectionType}}-关联资源</div>
+          </div>
+          <div v-for="(item,index) in sourceDate.entrust_goods.source" :key="index">
+            <div class="tab_content">
+              <p class="tab_content_title">{{item.serviceType}}</p>
+            </div>
+            <div class="content_table">
+              <a-table :columns="columns" :data-source="item.data" bordered :pagination="false"></a-table>
+            </div>
+          </div>
+        </div>
+      <template slot="footer">
+        <div>
+          <a-button type="white" @click="onClose(1)">返 回</a-button>
+        </div>
+      </template>
+    </a-modal>
+
+  </div>
+</template>
+
+<script>
+  import {goodsDetail,sourceDetail,orderDetail} from '../../api/index'
+  export default {
+    name:'dataSelect',
+    props:{
+      visible:{
+        type:Boolean,
+        require: true
+      },
+      goods_islicode:{
+        type:String,
+      },
+      batchcode:{
+        type:String,
+      },
+      type:{
+        type:Number
+      }
+    },
+    data(){
+      return{
+        newVisible:true,
+        newVisible1:false,
+        modeStyle:{
+          'height':'530px'
+        },
+        tabsStyle:{
+          'height':'500px'
+        },
+        entrust_goods:{
+          goods:[{goods_type:''}]
+        },
+        orderDate:[],
+        userinfo:[],
+        sourceDate:{
+          entrust_goods:{}
+        },
+        data:[],
+        columns:[
+          {
+            title: '资源名称',
+            dataIndex: 'source_name',
+            width:'144px',
+            align:'center'
+          },
+          {
+            title: 'ISLI标志码',
+            dataIndex: 'islicode',
+            // width:'242px',
+            align:'center'
+          },
+          {
+            title: 'ISLI关联编码',
+            dataIndex: 'relevancy_isli',
+            // width:'259px',
+            align:'center'
+          },
+          {
+            title: '大小',
+            dataIndex: 'filesize',
+            width:'70px',
+            align:'center'
+          },
+          {
+            title: '格式',
+            dataIndex: 'format',
+            width:'70px',
+            align:'center'
+          },
+          {
+            title: '时间',
+            dataIndex: 'registerDate',
+            width:'148px',
+            align:'center'
+          },
+          {
+            title: '下载状态',
+            dataIndex: 'registerDate',
+            // width:'148px',
+            align:'center'
+          },
+        ],
+        columns1:[
+          {
+            title: '文化数字内容集名称',
+            dataIndex: 'source_name',
+            width:'166px',
+            align:'center'
+          },
+          {
+            title: '分类',
+            dataIndex: 'source_type',
+            width:'82px',
+            align:'center'
+          },
+          {
+            title: '生成时间',
+            dataIndex: 'allocationtime',
+            width:'177px',
+            align:'center'
+          },
+          {
+            title: 'ISLI标志码',
+            dataIndex: 'linkCode',
+            width:'310px',
+            align:'center'
+          },
+          {
+            title: '关联目标数量',
+            dataIndex: 'source_count',
+            width:'110px',
+            align:'center'
+          },
+          {
+            title: '查看',
+            scopedSlots: { customRender: 'operation' },
+            width:'138px',
+            align:'center'
+          },
+        ]
+      }
+    },
+    created(){
+      if(this.type==0){
+        this.goodsDetail()
+      }else{
+        this.orderDetail()
+      }
+    },
+    methods:{
+      //订单数据查看
+      orderDetail(){
+        let data={batchcode:this.batchcode}
+        orderDetail(data).then(res=>{
+          console.info(res)
+          if(res.code==200){
+            if(res.data.length!=0){
+              this.orderDate=res.data
+              // this.userinfo=res.data.userinfo
+              // console.info(this.userinfo)
+              // this=res.data
+              // this.columns1[0].title=this.goods[0].goods_type==1?'文化资源数据集名称': '文化数字内容集名称'
+            }
+          }else{
+            this.$message.error(res.msg);
+          }
+        })
+      },
+      selectDetails(val){
+        let data={isli:val}
+        sourceDetail(data).then(res=>{
+          console.info(res)
+          if(res.code==200){
+            this.sourceDate=res.data
+            this.newVisible1=true
+          }else{
+            this.$message.error(res.msg);
+          }
+        })
+      },
+      // goodsDetail(){
+      //   let data={islicode:this.goods_islicode}
+      //   goodsDetail(data).then(res=>{
+      //     console.info(res)
+      //     if(res.code==200){
+      //       // this.userinfo.push(res.data.userinfo)
+      //       this.userinfo=res.data.userinfo
+      //       console.info(this.userinfo)
+      //       let goods=[res.data.goods]
+      //       this=res.data
+      //       this.goods=goods
+      //       this.columns1[0].title=this.goods[0].goods_type==1?'文化资源数据集名称': '文化数字内容集名称'
+      //     }else{
+      //       this.$message.error(res.msg);
+      //     }
+      //   })
+      // },
+      onClose(type) {
+        if(type==1){
+          this.newVisible1=false
+        }else{
+          this.newVisible=false
+          this.$emit('update:visible', false)
+        }
+      }
+    },
+  }
+
+
+</script>
+
+<style scoped>
+  .tab_span{
+    color: red;
+  }
+  /deep/ .ant-modal-header{
+    border-bottom: none;
+  }
+  /deep/ .ant-modal-footer{
+    border-top: none;
+    padding: 20px 16px;
+  }
+  .tab_body{
+    width: 100%;
+    height: 476px;
+    overflow-y: auto;
+    border: 1px solid #9A9A9A;
+    border-top-width: 2px;
+    border-left-width: 2px;
+    border-right-color: #EEEEEE;
+    border-bottom-color: #EEEEEE;
+    padding:20px 15px;
+    box-sizing: border-box;
+  }
+  .tab_body_p{
+    margin-bottom: 5px;
+  }
+  .tab_body_title{
+    font-size: 19px;
+    position: relative;
+    margin-bottom: 28px;
+  }
+  .tab_body_title div{
+    /* display: inline-block; */
+    position: relative;
+    z-index: 100;
+  }
+  .tab_body_title_bg{
+    width: 198px;
+    background: #AAAAAA;
+    margin-bottom: 0;
+    height: 10px;
+    position: absolute;
+    top: 50%;
+    margin-top: -5px;
+    z-index: 99;
+  }
+  .tab_content{
+    padding-left: 40px;
+    margin-bottom: 28px;
+    display: flex;
+    align-items: center;
+  }
+  .tab_content_infoImg{
+    width: 254px;
+    height: 260px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    border: 1px solid rgba(215, 215, 215, 1);
+    box-shadow: 2px 2px 5px rgb(0 0 0 / 35%);
+    margin-right: 15px;
+  }
+  .tab_content_img{
+    width: 242px;
+    height: 194px;
+  }
+  .content_right_title{
+    font-size: 16px;
+    margin-bottom: 30px;
+  }
+  .content_info{
+    display: flex;
+    font-size: 14px;
+  }
+  .content_info p{
+    margin-bottom: 0px;
+  }
+  .content_info_left{
+    margin-right: 36px;
+  }
+  .tab_content_title{
+    position: relative;
+    padding-left: 20px;
+
+  }
+  .tab_content_title::before{
+    content: '';
+    width: 7px;
+    height: 25px;
+    background-color: #374AA5;
+    border: 1px solid #9AA4D1;
+    position: absolute;
+    left: 0;
+    top: 50%;
+    margin-top: -12.5px;
+
+  }
+  .content_table{
+    padding-left: 90px;
+    margin-bottom: 30px;
+  }
+  /deep/ .ant-table-tbody > tr > td {
+    padding: 5px 16px;
+  }
+  /deep/ .ant-table-thead > tr > th {
+    padding: 5px 16px;
+  }
+  .details_span{
+    cursor: pointer;
+  }
+  .tab_body_content{
+    margin-bottom: 20px;
+  }
+  .tab_body_content:last-child{
+    margin-bottom: 0;
+  }
+  .none_p{
+    text-align: center;
+  }
+</style>
diff --git a/src/components/orderDetails/index.vue b/src/components/orderDetails/index.vue
index 751d0c0..5e5fd24 100644
--- a/src/components/orderDetails/index.vue
+++ b/src/components/orderDetails/index.vue
@@ -5,7 +5,7 @@
         <span v-if="order.status==1">等待购买方付款</span>
         <span v-else-if="order.status==2">等待买卖双方交付</span>
         <span v-else-if="order.status==3">正在结算中</span>
-        <span v-else-if="order.status==4">订单已完成</span>
+        <span v-else-if="order.status==4">订单已终止</span>
         <span v-else-if="order.status==5">订单已关闭</span>
       </p>
       <div class="steps_body">
@@ -17,7 +17,7 @@
           <a-step title="待付款订单"  :description="order.paymenttime" />
           <a-step title="待交付订单" :description="order.receivetime" />
           <a-step title="待结算订单" :description="order.closetime" />
-          <a-step title="已完成订单" :description="order.completetime" />
+          <a-step title="已终止订单" :description="order.completetime" />
         </a-steps>
       </div>
       <div class="order_body">
@@ -29,7 +29,7 @@
             <!-- <span @click="orederActive=3">交易凭证</span>
             <span @click="orederActive=4">交付内容</span> -->
           </div>
-          <div class="order_title_right">
+          <div class="order_title_right" v-if="order.status<2 " >
             <span>{{order.status==5?'订单已关闭':'关闭订单'}}</span>
             <a-switch default-checked class="order_switch"  @change="closeOrder" :loading="closeLoad" :disabled="order.status==5"/>
           </div>
@@ -39,26 +39,35 @@
           <div v-show="orederActive==0">
             <p class="oreder_content_title">订单信息</p>
             <div class="oreder_info">
-              <p>授权方/卖方：{{order_info.entrust_name}}</p>
+              <!-- <p>委托方/授权方：{{order_info.entrust_name}}</p> -->
               <p>被授权方/付款方：{{order_info.buy_username}}</p>
+              <p>身份ISLI认证码：{{buyuser.islicode}}</p>
+              <p class="tab_body_p">统一社会信用代码：{{buyuser.uscc}}</p>
+              <p class="tab_body_p">认证类型：{{buyuser.userType}}</p>
+              <p class="tab_body_p">认证状态：{{buyuser.state==0?'认证中':buyuser.state==1?'认证成功':'认证失败'}}</p>
             </div>
             <div class="oreder_info">
               <p>订单类型：{{order_info.type==1?'委托订单':order_info.type==2?'认证订单':'服务订单'}}</p>
               <p>订单编号：{{order_info.batchcode}}</p>
-              <p>订单ISLI标识码：{{order_info.contract_code}}</p>
-              <p>交易流水号：{{order_info.close_serial_number}}</p>
+              <!-- <p>订单ISLI标识码：{{order_info.contract_code}}</p>
+              <p>交易流水号：{{order_info.close_serial_number}}</p> -->
             </div>
             <div class="oreder_info">
-              <p>标的名称：{{order_info.goods_name}}</p>
-              <p>标的类型：{{order_info.goods_type==1?'文化资源数据':'文化数字内容'}}</p>
+              <!-- <p>标的名称：{{order_info.goods_name}}</p> -->
+              <!-- <p>交易品种：{{order_info.goods_type==1?'文化资源数据':'文化数字内容'}}</p> -->
               <!-- <p>交易方式：{{order_info.goods_entrust==1?'转让':'授权'}}</p> -->
-              <p>交易方式：{{order_info.goods_entrust}}</p>
-              <p>权属类型：{{order_info.goods_ownership_str}}</p>
-              <p>交易价额：¥ {{order_info.price}}</p>
-              <p>交易数量：{{order_info.transaction_count}}</p>
+              <!-- <p>交易方式：{{order_info.goods_entrust}}</p> -->
+              <!-- <p>权属类型：{{order_info.goods_ownership_str}}</p> -->
+              <!-- <p>标的价款：¥ {{order_info.price}}</p>
+              <p>购买年限：{{order_info.transaction_count}}</p>
+              <p>交易佣金：¥ {{order_info.service_charge}}</p> -->
               <!-- <p>保证金：¥ {{order_info.earnest_money}}</p> -->
-              <p>服务费：¥ {{order_info.service_charge}}</p>
-              <p>交易总额：¥ {{order_info.total_money}} 元</p>
+              <p v-for="(item,index) in ratio_setting.detail" :key="index">
+                <span>{{item.role_type==1?'委托方':item.role_type==2?'购买方':'平台方'}}分账比列：
+                  {{item.calculate==1?item.ratio:item.amount}}
+                </span>
+              </p>
+              <p>订单金额：¥ {{order_info.total_money}} 元</p>
             </div>
           </div>
 
@@ -81,7 +90,7 @@
               <!-- <a :href="bill.buy_bill" target="_blank" rel="nofollow">购买方服务费发票</a>
               <a :href="bill.entrust_bill" target="_blank" rel="nofollow">委托方服务费发票</a>
               <a :href="bill.third_party" target="_blank" rel="nofollow">第三方机构服务发票</a> -->
-              <a :href="bill.platform" target="_blank" rel="nofollow">平台服务发票</a>
+              <a :href="bill.platform" target="_blank" rel="nofollow">交易佣金发票</a>
               <!-- <span>购买方服务费发票</span>
               <span>委托方服务费发票</span>
               <span>第三方机构服务发票</span>
@@ -139,6 +148,8 @@
         },
         order:{},
         order_info:{},
+        buyuser:{},
+        ratio_setting:{},
         bill:[],
         step:0,
         data:[],
@@ -220,6 +231,8 @@
             this.order_info=res.data.order_info
             this.data=res.data.close
             this.bill=res.data.bill
+            this.buyuser=res.data.buyuser
+            this.ratio_setting=res.data.ratio_setting
           }else{
             this.$message.error(res.msg);
           }
diff --git a/src/components/page/Home/index.vue b/src/components/page/Home/index.vue
index 326587b..e4dde4a 100644
--- a/src/components/page/Home/index.vue
+++ b/src/components/page/Home/index.vue
@@ -49,7 +49,7 @@
       <a-col  :span="12">
         <a-card :loading="loading" :bordered="false" :body-style="{padding: '0'}" class="statistics_item">
           <div class="salesCard">
-            <a-tabs default-active-key="1" size="large" :tab-bar-style="{marginBottom: '24px', paddingLeft: '16px'}">
+            <a-tabs default-active-key="2" size="large" :tab-bar-style="{marginBottom: '24px', paddingLeft: '16px'}">
               <div class="extra-wrapper" slot="tabBarExtraContent">
                 <div class="extra-item">
                   <!-- <a>今日</a>
@@ -60,12 +60,12 @@
                 </div>
                 <!-- <a-range-picker :style="{width: '256px'}" /> -->
               </div>
-              <a-tab-pane tab="访问量" key="1">
+              <a-tab-pane tab="销售量" key="2">
                 <a-row>
                   <a-col>
                     <div class="rank">
                       <ul class="list">
-                        <li :key="index" v-for="(item, index) in rankList">
+                        <li :key="index" v-for="(item, index) in rankList1">
                           <span :class="index < 3 ? 'active' : null">{{ index + 1 }}</span>
                           <span>{{ item.username }}</span>
                           <span>{{ item.count }}</span>
@@ -75,12 +75,12 @@
                   </a-col>
                 </a-row>
               </a-tab-pane>
-              <a-tab-pane tab="销售量" key="2">
+              <a-tab-pane tab="访问量" key="1">
                 <a-row>
                   <a-col>
                     <div class="rank">
                       <ul class="list">
-                        <li :key="index" v-for="(item, index) in rankList1">
+                        <li :key="index" v-for="(item, index) in rankList">
                           <span :class="index < 3 ? 'active' : null">{{ index + 1 }}</span>
                           <span>{{ item.username }}</span>
                           <span>{{ item.count }}</span>
@@ -90,6 +90,7 @@
                   </a-col>
                 </a-row>
               </a-tab-pane>
+
             </a-tabs>
           </div>
         </a-card>
@@ -109,17 +110,17 @@ export default {
         {name:'待付款订单',url:'/pendingPayment',num:'',id:'awaitpay_count'},
         {name:'待交付订单',url:'/toBeDelivered',num:'',id:'awaitdelivery_count'},
         {name:'待结算订单',url:'/toBeSettled',num:'',id:'awaitclose_count'},
-        {name:'已完成订单',url:'/completed',num:'',id:'complete_count'},
+        {name:'已终止订单',url:'/completed',num:'',id:'complete_count'},
         {name:'已关闭订单',url:'/closed',num:'',id:'close_count'},
       ],
       tadayWorkList:[
-        {name:'交易总额',price:'¥845,256,996.30',id:'deal_money'},
-        {name:'订单总额',price:'¥672,356,258.70',id:'order_money'},
-        {name:'交易文化数据',price:'1,888',id:'deal_goods_count'},
-        {name:'上架文化数据',price:'99',id:'shelf_count'},
-        {name:'下架文化数据',price:'9',id:'out_count'},
-        {name:'新增订单',price:'2,169',id:'yester_order_count'},
-        {name:'已完成订单',price:'1,169',id:'yester_complete_count'},
+        {name:'订单金额总额',price:'',id:'deal_money'},
+        {name:'标的价款总额',price:'',id:'order_money'},
+        {name:'交易文化数据',price:'',id:'deal_goods_count'},
+        {name:'已发布文化数据',price:'',id:'shelf_count'},
+        {name:'委托期满文化数据',price:'',id:'out_count'},
+        {name:'新增订单',price:'',id:'yester_order_count'},
+        {name:'已终止订单',price:'',id:'yester_complete_count'},
       ],
       query:{
         leftDate:'year',
diff --git a/src/components/page/admission/index.vue b/src/components/page/admission/index.vue
index 6b61b8d..8537494 100644
--- a/src/components/page/admission/index.vue
+++ b/src/components/page/admission/index.vue
@@ -17,11 +17,11 @@
             <a-input v-model="query.goods_name"/>
           </a-col>
           <a-col :lg="8" :xl="8" :xxl="6" class="query_item">
-            <span>委托方：</span>
-            <a-input v-model="query.entrust_name"/>
+            <span>委托方/授权方：</span>
+            <a-input v-model="query.entrust_name" placeholder="身份ISLI认证码/名称"/>
           </a-col>
           <a-col :lg="8" :xl="8" :xxl="6" class="query_item" >
-            <span>标的类型：</span>
+            <span>交易品种：</span>
             <a-select default-value=""   v-model="query.goods_type">
               <a-select-option value="">全部</a-select-option>
               <a-select-option value="1">文化资源数据</a-select-option>
@@ -29,13 +29,14 @@
             </a-select>
           </a-col>
           <a-col :lg="8" :xl="8" :xxl="6" class="query_item" >
-            <span>数据状态：</span>
+            <span>发布状态：</span>
             <a-select default-value=""   v-model="query.data_type">
               <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="1">已发布文化数据</a-select-option>
+              <a-select-option value="5">暂停中文化数据</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="4">委托期满文化数据</a-select-option>
             </a-select>
           </a-col>
           <a-col :lg="8" :xl="8" :xxl="6" class="query_item">
@@ -65,14 +66,14 @@
         </div>
         <a-table :columns="columns" :data-source="data" bordered :pagination="false" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange,type:'radio' }">
           <template slot="goods_status" slot-scope="goods_status">
-            <span>{{goods_status==1?'上架中':goods_status==2?'下架中':goods_status==3?'已转让':'已失效'}}</span>
+            <span>{{goods_status==1?'已发布':goods_status==2?'已终止':goods_status==3?'已转让':goods_status==4?'委托期满':'暂停中'}}</span>
           </template>
           <template slot="goods_type" slot-scope="goods_type">
             <span>{{goods_type==1?'文化资源数据':'文化数字内容'}}</span>
           </template>
           <template slot="operation" slot-scope="item">
             <a-space :size="24" >
-              <span class="table_operation" @click="SelectDate(item.goods_islicode)">数据查看</span>
+              <span class="table_operation" @click="SelectDate(item.goods_islicode)">标的信息</span>
               <span class="table_operation" @click="selectRecords(item.id)">操作记录</span>
               <span class="table_operation" @click="associatedOrder(item.goods_islicode)">关联订单</span>
             </a-space>
@@ -153,7 +154,7 @@ export default {
         //   align:'center'
         // },
         {
-          title: '创建时间',
+          title: '上线时间',
           dataIndex: 'createtime',
           // align:'center'
         },
@@ -168,7 +169,7 @@ export default {
           // align:'center'
         },
         {
-          title: '授权方',
+          title: '委托方/授权方',
           dataIndex: 'username',
           // align:'center'
         },
@@ -179,7 +180,7 @@ export default {
           // align:'center'
         },
         {
-          title: '数据状态',
+          title: '发布状态',
           dataIndex: 'goods_status',
           scopedSlots:{customRender:'goods_status'},
           // align:'center'
diff --git a/src/components/page/afterService/invoice.vue b/src/components/page/afterService/invoice.vue
index c0b9c78..6f4cbbd 100644
--- a/src/components/page/afterService/invoice.vue
+++ b/src/components/page/afterService/invoice.vue
@@ -15,25 +15,25 @@
           </a-col>
           <a-col :lg="8" :xl="8" :xxl="6" class="query_item">
             <span>销方纳税人：</span>
-            <a-input/>
+            <a-input placeholder="名称/纳税人识别号"/>
           </a-col>
           <a-col :lg="8" :xl="8" :xxl="6" class="query_item">
             <span>购方纳税人：</span>
-            <a-input/>
+            <a-input placeholder="名称/纳税人识别号"/>
           </a-col>
           <a-col :lg="8" :xl="8" :xxl="6" class="query_item">
             <span>订单编号：</span>
             <a-input/>
           </a-col>
 
-          <a-col :lg="8" :xl="8" :xxl="6" class="query_item" >
+          <!-- <a-col :lg="8" :xl="8" :xxl="6" class="query_item" >
             <span>订单类型：</span>
             <a-select default-value="全部" >
               <a-select-option value="全部">
                 全部
               </a-select-option>
             </a-select>
-          </a-col>
+          </a-col> -->
 
           <a-col :lg="8" :xl="8" :xxl="6" class="query_item">
             <span>订单状态：</span>
@@ -43,11 +43,11 @@
               </a-select-option>
             </a-select>
           </a-col>
-          <a-col :lg="12" :xl="12" :xxl="6" class="query_item query_item2">
+          <a-col :lg="8" :xl="8" :xxl="6" class="query_item query_item2">
             <span>创建时间：</span>
             <a-range-picker valueFormat="YYYY-MM-DD"/>
           </a-col>
-          <a-col :lg="12" :xl="12" :xxl="6" class="query_item query_item1">
+          <a-col :lg="24" :xl="24" :xxl="12" class="query_item query_item1">
             <a-space :size="21">
               <a-button type="primary" class="query_button" @click="getAllDate(1)">查 询</a-button>
               <a-button class="query_button" @click="resetQurey">重 置</a-button>
@@ -102,13 +102,13 @@ export default {
       page:1,
       data:[],
       columns:[
-        {
-          title: '序号',
-          className: 'table_column',
-          dataIndex: 'id',
-          width:'65px',
-          align:'center'
-        },
+        // {
+        //   title: '序号',
+        //   className: 'table_column',
+        //   dataIndex: 'id',
+        //   width:'65px',
+        //   align:'center'
+        // },
         {
           title: '生成时间',
           dataIndex: 'money',
@@ -140,11 +140,11 @@ export default {
           dataIndex: '',
           align:'center'
         },
-        {
-          title: '订单类型',
-          dataIndex: '',
-          align:'center'
-        },
+        // {
+        //   title: '订单类型',
+        //   dataIndex: '',
+        //   align:'center'
+        // },
         {
           title: '发票金额',
           dataIndex: '',
diff --git a/src/components/page/classification/Category.vue b/src/components/page/classification/Category.vue
index 3b3d1dd..0813177 100644
--- a/src/components/page/classification/Category.vue
+++ b/src/components/page/classification/Category.vue
@@ -164,12 +164,12 @@ export default {
       logDate:[],
       data:[],
       columns:[
-        {
-          title: '序号',
-          dataIndex: 'id',
-          width:'65px',
-          align:'center'
-        },
+        // {
+        //   title: '序号',
+        //   dataIndex: 'id',
+        //   width:'65px',
+        //   align:'center'
+        // },
         {
           title: '创建时间',
           dataIndex: 'createtime',
diff --git a/src/components/page/classification/DataQuery.vue b/src/components/page/classification/DataQuery.vue
index a925122..ba5dd9f 100644
--- a/src/components/page/classification/DataQuery.vue
+++ b/src/components/page/classification/DataQuery.vue
@@ -10,7 +10,7 @@
       <div class="query">
         <a-row  type="flex" justify="space-between">
           <a-col  :lg="8" :xl="7" :xxl="5" class="query_item">
-            <span>ISLI标识码：</span>
+            <span>标的ISLI标识码：</span>
             <a-input v-model="query.islicode"/>
           </a-col>
           <a-col  :lg="8" :xl="7" :xxl="5" class="query_item">
@@ -18,11 +18,11 @@
             <a-input v-model="query.goods_name"/>
           </a-col>
           <a-col  :lg="8" :xl="7" :xxl="5" class="query_item">
-            <span>委托方：</span>
-            <a-input v-model="query.entrust_name"/>
+            <span>委托方/授权方：</span>
+            <a-input v-model="query.entrust_name" placeholder="身份ISLI认证码/名称"/>
           </a-col>
           <a-col  :lg="8" :xl="7" :xxl="5" class="query_item" >
-            <span>标的类型：</span>
+            <span>交易品种：</span>
             <a-select    v-model="query.goods_type">
               <a-select-option value="">全部</a-select-option>
               <a-select-option value="1">文化资源数据</a-select-option>
@@ -30,13 +30,14 @@
             </a-select>
           </a-col>
           <a-col :lg="8" :xl="7" :xxl="4" class="query_item" >
-            <span>数据状态：</span>
+            <span>发布状态：</span>
             <a-select   v-model="query.data_type">
               <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="1">已发布文化数据</a-select-option>
+              <a-select-option value="5">暂停中文化数据</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="4">委托期满文化数据</a-select-option>
             </a-select>
           </a-col>
           <a-col :lg="8" :xl="7" :xxl="5" class="query_item">
@@ -59,7 +60,7 @@
             </a-select>
           </a-col>
           <a-col :lg="8" :xl="7" :xxl="5" class="query_item query_item2">
-            <span>创建时间：</span>
+            <span>上线时间：</span>
             <a-range-picker  v-model="query.createtime"  valueFormat="YYYY-MM-DD"/>
           </a-col>
           <a-col :lg="8" :xl="7" :xxl="9" class="query_item query_item1">
@@ -77,7 +78,7 @@
         </div>
         <a-table :columns="columns" :data-source="data" bordered :pagination="false" >
           <template slot="goods_status" slot-scope="goods_status">
-            <span>{{goods_status==1?'上架中':goods_status==2?'下架中':goods_status==3?'已转让':'已失效'}}</span>
+            <span>{{goods_status==1?'已发布':goods_status==2?'已终止':goods_status==3?'已转让':goods_status==4?'委托期满':'暂停中'}}</span>
           </template>
           <template slot="goods_type" slot-scope="goods_type">
             <span>{{goods_type==1?'文化资源数据':'文化数字内容'}}</span>
@@ -87,7 +88,7 @@
           </template>
           <template slot="operation" slot-scope="item">
             <a-space :size="24" >
-              <span class="table_operation" @click="SelectDate(item.goods_islicode)">数据查看</span>
+              <span class="table_operation" @click="SelectDate(item.goods_islicode)">标的信息</span>
               <span class="table_operation" @click="selectRecords(item.id)">操作记录</span>
             </a-space>
           </template>
@@ -145,19 +146,19 @@ export default {
       page:1,
       data:[],
       columns:[
+        // {
+        //   title: '序号',
+        //   dataIndex: 'id',
+        //   width:'65px',
+        //   align:'center'
+        // },
         {
-          title: '序号',
-          dataIndex: 'id',
-          width:'65px',
-          align:'center'
-        },
-        {
-          title: '创建时间',
+          title: '上线时间',
           dataIndex: 'createtime',
           // align:'center'
         },
         {
-          title: 'ISLI标识码',
+          title: '标的ISLI标识码',
           dataIndex: 'goods_islicode',
           // align:'center'
         },
@@ -167,7 +168,7 @@ export default {
           // align:'center'
         },
         {
-          title: '授权方',
+          title: '委托方/授权方',
           dataIndex: 'username',
           // align:'center'
         },
@@ -178,7 +179,7 @@ export default {
           // align:'center'
         },
         {
-          title: '数据状态',
+          title: '发布状态',
           dataIndex: 'goods_status',
           scopedSlots:{customRender:'goods_status'},
           // align:'center'
diff --git a/src/components/page/fundSettlement/index.vue b/src/components/page/fundSettlement/index.vue
index dcbaf2a..42b251e 100644
--- a/src/components/page/fundSettlement/index.vue
+++ b/src/components/page/fundSettlement/index.vue
@@ -111,12 +111,12 @@ export default {
       islicode:'',
       data:[],
       columns:[
-        {
-          title: '序号',
-          dataIndex: 'id',
-          width:'65px',
-          // align:'center'
-        },
+        // {
+        //   title: '序号',
+        //   dataIndex: 'id',
+        //   width:'65px',
+        //   // align:'center'
+        // },
         {
           title: '用户编码',
           dataIndex: 'islicode',
diff --git a/src/components/page/fundSettlement/splitProportion.vue b/src/components/page/fundSettlement/splitProportion.vue
index 27a4eff..2a1fde2 100644
--- a/src/components/page/fundSettlement/splitProportion.vue
+++ b/src/components/page/fundSettlement/splitProportion.vue
@@ -101,7 +101,7 @@
               <!-- <a-select-option value="1">委托服务费用</a-select-option>
               <a-select-option value="2">交易服务费用</a-select-option>
               <a-select-option value="3">认证服务费用</a-select-option> -->
-              <a-select-option value="1">平台服务费用</a-select-option>
+              <a-select-option value="1">交易佣金费用</a-select-option>
             </a-select>
           </a-col>
           <a-col :span="7" class="query_item rule_item">
@@ -194,12 +194,12 @@ export default {
       },
       data:[],
       columns:[
-        {
-          title: '序号',
-          dataIndex: 'id',
-          width:'65px',
-          align:'center'
-        },
+        // {
+        //   title: '序号',
+        //   dataIndex: 'id',
+        //   width:'65px',
+        //   align:'center'
+        // },
         {
           title: '创建时间',
           dataIndex: 'createtime',
@@ -304,7 +304,7 @@ export default {
       this.query1.rule_name=''
     },
     addRule(){
-      if(parseInt(this.query1.ratio[0].ratio)+parseInt(this.query1.ratio[2].ratio)!=100){
+      if(parseFloat(this.query1.ratio[0].ratio)+parseFloat(this.query1.ratio[2].ratio)!=100){
         this.$message.error('授权方和平台方的加起来比列要等于100');
         return
       }
diff --git a/src/components/page/layout/index.vue b/src/components/page/layout/index.vue
index 380eb0f..bfa0dbb 100644
--- a/src/components/page/layout/index.vue
+++ b/src/components/page/layout/index.vue
@@ -23,7 +23,7 @@
         </div>
         <a-table :columns="columns" :data-source="data" bordered :pagination="false" :row-selection="active==2?{ selectedRowKeys: selectedRowKeys1,onChange: onSelectChange1 }:null">
           <template slot="goods_status" slot-scope="goods_status">
-            <span>{{goods_status==1?'上架中':goods_status==2?'下架中':goods_status==3?'已转让':'已失效'}}</span>
+            <span>{{goods_status==1?'已发布':goods_status==2?'已终止':goods_status==3?'已转让':goods_status==4?'委托期满':'暂停中'}}</span>
           </template>
           <template slot="goods_type" slot-scope="goods_type">
             <span>{{goods_type==1?'文化资源数据':'文化数字内容'}}</span>
@@ -55,7 +55,7 @@
             <a-input v-model="query1.entrust_name"/>
           </a-col>
           <a-col :span="5" class="query_item">
-            <span>标的类型：</span>
+            <span>交易品种：</span>
             <a-select default-value=""   v-model="query1.goods_type">
               <a-select-option value="">全部</a-select-option>
               <a-select-option value="1">文化资源数据</a-select-option>
@@ -63,13 +63,14 @@
             </a-select>
           </a-col>
           <a-col :span="5" class="query_item">
-            <span>数据状态：</span>
+            <span>发布状态：</span>
             <a-select default-value=""   v-model="query1.data_type">
               <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="1">已发布文化数据</a-select-option>
+              <a-select-option value="5">暂停中文化数据</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="4">委托期满文化数据</a-select-option>
             </a-select>
           </a-col>
           <a-col :span="5" class="query_item">
@@ -106,7 +107,7 @@
         </a-row>
         <a-table :columns="columns1" :data-source="data1" bordered :pagination="false" :row-selection="{ selectedRowKeys: selectedRowKeys,onChange: onSelectChange }">
           <template slot="goods_status" slot-scope="goods_status">
-            <span>{{goods_status==1?'上架中':goods_status==2?'下架中':goods_status==3?'已转让':'已失效'}}</span>
+            <span>{{goods_status==1?'已发布':goods_status==2?'已终止':goods_status==3?'已转让':goods_status==4?'委托期满':'暂停中'}}</span>
           </template>
           <template slot="goods_type" slot-scope="goods_type">
             <span>{{goods_type==1?'文化资源数据':'文化数字内容'}}</span>
@@ -188,12 +189,12 @@ export default {
       data:[],
       data1:[],
       columns1:[
-        {
-          title: '序号',
-          dataIndex: 'id',
-          width:'65px',
-          align:'center'
-        },
+        // {
+        //   title: '序号',
+        //   dataIndex: 'id',
+        //   width:'65px',
+        //   align:'center'
+        // },
         {
           title: '创建时间',
           dataIndex: 'createtime',
@@ -210,7 +211,7 @@ export default {
           // align:'center'
         },
         {
-          title: '授权方',
+          title: '委托方/授权方',
           dataIndex: 'username',
           // align:'center'
         },
@@ -221,7 +222,7 @@ export default {
           // align:'center'
         },
         {
-          title: '数据状态',
+          title: '发布状态',
           dataIndex: 'goods_status',
           scopedSlots:{customRender:'goods_status'},
           // align:'center'
@@ -256,7 +257,7 @@ export default {
           // align:'center'
         },
         {
-          title: '授权方',
+          title: '委托方/授权方',
           dataIndex: 'username',
           // align:'center'
         },
@@ -267,7 +268,7 @@ export default {
           // align:'center'
         },
         {
-          title: '数据状态',
+          title: '发布状态',
           dataIndex: 'goods_status',
           scopedSlots:{customRender:'goods_status'},
           // align:'center'
diff --git a/src/components/page/order/closed.vue b/src/components/page/order/closed.vue
index 10290ba..a8ba107 100644
--- a/src/components/page/order/closed.vue
+++ b/src/components/page/order/closed.vue
@@ -9,21 +9,21 @@
     <div class="body">
       <div class="query">
         <a-row type="flex" justify="space-between" >
-          <a-col :lg="8" :xl="8" :xxl="6" class="query_item">
+          <a-col :lg="12" :xl="8" :xxl="6" class="query_item">
             <span>订单编号：</span>
             <a-input v-model="query.batchcode"/>
           </a-col>
-          <a-col :lg="8" :xl="8" :xxl="6" class="query_item">
-            <span>授权方：</span>
-            <a-input v-model="query.entrust_name"/>
+          <a-col :lg="12" :xl="8" :xxl="6" class="query_item">
+            <span>委托方/授权方：</span>
+            <a-input v-model="query.entrust_name" placeholder="名称/身份ISLI认证码"/>
           </a-col>
-          <a-col :lg="8" :xl="8" :xxl="6" class="query_item">
-            <span>被授权方：</span>
-            <a-input v-model="query.buy_name"/>
+          <a-col :lg="12" :xl="8" :xxl="6" class="query_item">
+            <span>购买方/被授权方：</span>
+            <a-input v-model="query.buy_name" placeholder="名称/身份ISLI认证码"/>
           </a-col>
-          <a-col :lg="8" :xl="8" :xxl="6" class="query_item">
-            <span>标的名称:</span>
-            <a-input v-model="query.goods_name"/>
+          <a-col :lg="12" :xl="8" :xxl="6" class="query_item">
+            <span>交易标的：</span>
+            <a-input v-model="query.goods_name" placeholder="名称/ISLI标志码"/>
           </a-col>
 
           <!-- <a-col :span="5" class="query_item" >
@@ -35,8 +35,15 @@
               <a-select-option value="3">服务订单</a-select-option>
             </a-select>
           </a-col> -->
-
-          <a-col :lg="8" :xl="8" :xxl="6" class="query_item">
+          <a-col :lg="12" :xl="8" :xxl="6" class="query_item">
+            <span>收费类型：</span>
+            <a-select default-value=""   v-model="query.charges_type">
+              <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>
+          </a-col>
+          <a-col :lg="12" :xl="8" :xxl="6" class="query_item">
             <span>交易方式：</span>
             <a-select default-value=""   v-model="query.entrust_type">
               <a-select-option value="">全部</a-select-option>
@@ -44,11 +51,11 @@
               <a-select-option value="2">授权</a-select-option>
             </a-select>
           </a-col>
-          <a-col :lg="8" :xl="8" :xxl="6" class="query_item query_item2">
+          <a-col :lg="12" :xl="8" :xxl="6" class="query_item query_item2">
             <span>创建时间：</span>
             <a-range-picker  v-model="query.createtime" valueFormat="YYYY-MM-DD"/>
           </a-col>
-          <a-col :lg="24" :xl="24" :xxl="12" class="query_item query_item1">
+          <a-col :lg="12" :xl="16" :xxl="6" class="query_item query_item1">
             <a-space :size="21">
               <a-button type="primary" class="query_button" @click="getList(1)">查 询</a-button>
               <a-button class="query_button" @click="resetQurey">重 置</a-button>
@@ -67,7 +74,7 @@
           </template>
           <template slot="operation" slot-scope="item">
             <a-space :size="24">
-              <span class="table_operation" @click="SelectDate(item.batchcode)">数据查看</span>
+              <span class="table_operation" @click="SelectDate(item.batchcode)">标的信息</span>
               <span class="table_operation" @click="SelectOrder(item.batchcode)">订单详情</span>
             </a-space>
           </template>
@@ -89,7 +96,7 @@
         </a-pagination>
       </div>
     </div>
-    <dataSelect :visible.sync="visible" v-if="visible" :batchcode="batchcode" :type="1"></dataSelect>
+    <orderDataSelect :visible.sync="visible" v-if="visible" :batchcode="batchcode" :type="1"></orderDataSelect>
     <orderDetails :visible.sync="visible2" v-if="visible2" :batchcode="batchcode"></orderDetails>
   </div>
 </template>
@@ -109,6 +116,7 @@ export default {
         transaction_status:'5',
         createtime:'',
         goods_isli:'',
+        charges_type:'',
       },
       visible:false,
       visible2:false,
@@ -122,12 +130,12 @@ export default {
       page:1,
       data:[],
       columns:[
-        {
-          title: '序号',
-          dataIndex: 'id',
-          width:'65px',
-          align:'center'
-        },
+        // {
+        //   title: '序号',
+        //   dataIndex: 'id',
+        //   width:'65px',
+        //   align:'center'
+        // },
         {
           title: '订单创建时间',
           dataIndex: 'createtime',
@@ -140,7 +148,7 @@ export default {
           // align:'center'
         },
         {
-          title: '授权方/卖方',
+          title: '委托方/授权方',
           dataIndex: 'entrust_name',
           // align:'center'
         },
@@ -150,7 +158,7 @@ export default {
           // align:'center'
         },
         {
-          title: '被授权方/买方',
+          title: '购买方/被授权方',
           dataIndex: 'buy_username',
           // width:'130px',
           // align:'center'
@@ -168,7 +176,7 @@ export default {
           // align:'center'
         },
         {
-          title: '交易总额',
+          title: '订单金额',
           dataIndex: 'total_money',
           // width:'90px',
           // align:'center'
@@ -184,7 +192,7 @@ export default {
   },
   components:{
     Operation,
-    dataSelect: () => import('../../dateSelect/index.vue'),
+    orderDataSelect: () => import('../../dateSelect/order.vue'),
     orderDetails: () => import('../../orderDetails/index.vue'),
   },
   created(){
diff --git a/src/components/page/order/completed.vue b/src/components/page/order/completed.vue
index 99c1f9a..fee2095 100644
--- a/src/components/page/order/completed.vue
+++ b/src/components/page/order/completed.vue
@@ -9,21 +9,21 @@
     <div class="body">
       <div class="query">
         <a-row  type="flex" justify="space-between" >
-          <a-col :lg="8" :xl="8" :xxl="6" class="query_item">
+          <a-col :lg="12" :xl="8" :xxl="6" class="query_item">
             <span>订单编号：</span>
             <a-input v-model="query.batchcode"/>
           </a-col>
-          <a-col :lg="8" :xl="8" :xxl="6" class="query_item">
-            <span>授权方：</span>
-            <a-input v-model="query.entrust_name"/>
+          <a-col :lg="12" :xl="8" :xxl="6" class="query_item">
+            <span>委托方/授权方：</span>
+            <a-input v-model="query.entrust_name" placeholder="名称/身份ISLI认证码"/>
           </a-col>
-          <a-col :lg="8" :xl="8" :xxl="6" class="query_item">
-            <span>被授权方：</span>
-            <a-input v-model="query.buy_name"/>
+          <a-col :lg="12" :xl="8" :xxl="6" class="query_item">
+            <span>购买方/被授权方：</span>
+            <a-input v-model="query.buy_name" placeholder="名称/身份ISLI认证码"/>
           </a-col>
-          <a-col :lg="8" :xl="8" :xxl="6" class="query_item">
-            <span>标的名称:</span>
-            <a-input v-model="query.goods_name"/>
+          <a-col :lg="12" :xl="8" :xxl="6" class="query_item">
+            <span>交易标的：</span>
+            <a-input v-model="query.goods_name" placeholder="名称/ISLI标志码"/>
           </a-col>
 
           <!-- <a-col :span="5" class="query_item" >
@@ -35,8 +35,15 @@
               <a-select-option value="3">服务订单</a-select-option>
             </a-select>
           </a-col> -->
-
-          <a-col :lg="8" :xl="8" :xxl="6" class="query_item">
+          <a-col :lg="12" :xl="8" :xxl="6" class="query_item">
+            <span>收费类型：</span>
+            <a-select default-value=""   v-model="query.charges_type">
+              <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>
+          </a-col>
+          <a-col :lg="12" :xl="8" :xxl="6" class="query_item">
             <span>交易方式：</span>
             <a-select default-value=""   v-model="query.entrust_type">
               <a-select-option value="">全部</a-select-option>
@@ -44,11 +51,11 @@
               <a-select-option value="2">授权</a-select-option>
             </a-select>
           </a-col>
-          <a-col :lg="8" :xl="8" :xxl="6" class="query_item query_item2">
+          <a-col :lg="12" :xl="8" :xxl="6" class="query_item query_item2">
             <span>创建时间：</span>
             <a-range-picker  v-model="query.createtime" valueFormat="YYYY-MM-DD"/>
           </a-col>
-          <a-col :lg="24" :xl="24" :xxl="12" class="query_item query_item1">
+          <a-col :lg="12" :xl="16" :xxl="6" class="query_item query_item1">
             <a-space :size="21">
               <a-button type="primary" class="query_button" @click="getList(1)">查 询</a-button>
               <a-button class="query_button" @click="resetQurey">重 置</a-button>
@@ -67,7 +74,7 @@
           </template>
           <template slot="operation" slot-scope="item">
             <a-space :size="24">
-              <span class="table_operation" @click="SelectDate(item.batchcode)">数据查看</span>
+              <span class="table_operation" @click="SelectDate(item.batchcode)">标的信息</span>
               <span class="table_operation" @click="SelectOrder(item.batchcode)">订单详情</span>
             </a-space>
           </template>
@@ -89,7 +96,7 @@
         </a-pagination>
       </div>
     </div>
-    <dataSelect :visible.sync="visible" v-if="visible" :batchcode="batchcode" :type="1"></dataSelect>
+    <orderDataSelect :visible.sync="visible" v-if="visible" :batchcode="batchcode" :type="1"></orderDataSelect>
     <orderDetails :visible.sync="visible2" v-if="visible2" :batchcode="batchcode"></orderDetails>
   </div>
 </template>
@@ -109,6 +116,7 @@ export default {
         transaction_status:'4',
         createtime:'',
         goods_isli:'',
+        charges_type:'',
       },
       visible:false,
       visible2:false,
@@ -122,12 +130,12 @@ export default {
       page:1,
       data:[],
       columns:[
-        {
-          title: '序号',
-          dataIndex: 'id',
-          width:'65px',
-          align:'center'
-        },
+        // {
+        //   title: '序号',
+        //   dataIndex: 'id',
+        //   width:'65px',
+        //   align:'center'
+        // },
         {
           title: '订单创建时间',
           dataIndex: 'createtime',
@@ -140,7 +148,7 @@ export default {
           // align:'center'
         },
         {
-          title: '授权方/卖方',
+          title: '委托方/授权方',
           dataIndex: 'entrust_name',
           // align:'center'
         },
@@ -150,7 +158,7 @@ export default {
           // align:'center'
         },
         {
-          title: '被授权方/买方',
+          title: '购买方/被授权方',
           dataIndex: 'buy_username',
           // width:'130px',
           // align:'center'
@@ -168,7 +176,7 @@ export default {
           // align:'center'
         },
         {
-          title: '交易总额',
+          title: '订单金额',
           dataIndex: 'total_money',
           // width:'90px',
           // align:'center'
@@ -184,7 +192,7 @@ export default {
   },
   components:{
     Operation,
-    dataSelect: () => import('../../dateSelect/index.vue'),
+    orderDataSelect: () => import('../../dateSelect/order.vue'),
     orderDetails: () => import('../../orderDetails/index.vue'),
   },
   created(){
diff --git a/src/components/page/order/index.vue b/src/components/page/order/index.vue
index b442fed..8d99981 100644
--- a/src/components/page/order/index.vue
+++ b/src/components/page/order/index.vue
@@ -9,21 +9,21 @@
     <div class="body">
       <div class="query">
         <a-row type="flex" justify="space-between" >
-          <a-col :lg="8" :xl="8" :xxl="6" class="query_item">
+          <a-col :lg="12" :xl="8" :xxl="6" class="query_item">
             <span>订单编号：</span>
             <a-input v-model="query.batchcode" />
           </a-col>
-          <a-col :lg="8" :xl="8" :xxl="6" class="query_item">
-            <span>授权方：</span>
-            <a-input v-model="query.entrust_name"/>
+          <a-col :lg="12" :xl="8" :xxl="6" class="query_item">
+            <span>委托方/授权方：</span>
+            <a-input v-model="query.entrust_name" placeholder="名称/身份ISLI认证码"/>
           </a-col>
-          <a-col :lg="8" :xl="8" :xxl="6" class="query_item">
-            <span>被授权方：</span>
-            <a-input v-model="query.buy_name"/>
+          <a-col :lg="12" :xl="8" :xxl="6" class="query_item">
+            <span>购买方/被授权方：</span>
+            <a-input v-model="query.buy_name" placeholder="名称/身份ISLI认证码"/>
           </a-col>
-          <a-col :lg="8" :xl="8" :xxl="6" class="query_item">
-            <span>标的名称:</span>
-            <a-input v-model="query.goods_name"/>
+          <a-col :lg="12" :xl="8" :xxl="6" class="query_item">
+            <span>交易标的：</span>
+            <a-input v-model="query.goods_name" placeholder="名称/ISLI标志码"/>
           </a-col>
 
           <!-- <a-col :span="5" class="query_item" >
@@ -35,8 +35,15 @@
               <a-select-option value="3">服务订单</a-select-option>
             </a-select>
           </a-col> -->
-
-          <a-col :lg="8" :xl="8" :xxl="6" class="query_item">
+          <a-col :lg="12" :xl="8" :xxl="6" class="query_item">
+            <span>收费类型：</span>
+            <a-select default-value=""   v-model="query.charges_type">
+              <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>
+          </a-col>
+          <a-col :lg="12" :xl="8" :xxl="6" class="query_item">
             <span>交易方式：</span>
             <a-select default-value=""   v-model="query.entrust_type">
               <a-select-option value="">全部</a-select-option>
@@ -44,22 +51,22 @@
               <a-select-option value="2">授权</a-select-option>
             </a-select>
           </a-col>
-          <a-col :lg="8" :xl="8" :xxl="6" class="query_item" >
-            <span>交易状态：</span>
+          <a-col :lg="12" :xl="8" :xxl="6" class="query_item" >
+            <span>订单状态：</span>
             <a-select default-value=""  v-model="query.transaction_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="3">待结算</a-select-option>
-              <a-select-option value="4">已完成</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 :lg="8" :xl="8" :xxl="6" class="query_item query_item2">
+          <a-col :lg="12" :xl="8" :xxl="6" class="query_item query_item2">
             <span>订单创建时间：</span>
             <a-range-picker  v-model="query.createtime" valueFormat="YYYY-MM-DD"/>
           </a-col>
-          <a-col :lg="8" :xl="8" :xxl="6" class="query_item query_item1">
+          <a-col :lg="24" :xl="8" :xxl="24" class="query_item query_item1">
             <a-space :size="21">
               <a-button type="primary" class="query_button" @click="getList(1)">查 询</a-button>
               <a-button class="query_button" @click="resetQurey">重 置</a-button>
@@ -77,11 +84,11 @@
             <span>{{type==1?'委托订单':type==2?'认证订单':'服务订单'}}</span>
           </template>
           <template slot="status" slot-scope="status">
-            <span>{{status==1?'待付款':status==2?'待交付':status==3?'待结算':status==4?'已完成':'已关闭'}}</span>
+            <span>{{status==1?'待付款':status==2?'待交付':status==3?'待结算':status==4?'已终止':'已关闭'}}</span>
           </template>
           <template slot="operation" slot-scope="item">
             <a-space :size="24">
-              <span class="table_operation" @click="SelectDate(item.batchcode)">数据查看</span>
+              <span class="table_operation" @click="SelectDate(item.batchcode)">标的信息</span>
               <span class="table_operation" @click="SelectOrder(item.batchcode)">订单详情</span>
             </a-space>
           </template>
@@ -103,7 +110,7 @@
         </a-pagination>
       </div>
     </div>
-    <dataSelect :visible.sync="visible" v-if="visible" :batchcode="batchcode" :type="1"></dataSelect>
+    <orderDataSelect :visible.sync="visible" v-if="visible" :batchcode="batchcode" :type="1"></orderDataSelect>
     <orderDetails :visible.sync="visible2" v-if="visible2" :batchcode="batchcode"></orderDetails>
   </div>
 </template>
@@ -123,6 +130,7 @@ export default {
         transaction_status:'',
         createtime:'',
         goods_isli:'',
+        charges_type:'',
       },
       batchcode:'',
       visible:false,
@@ -136,12 +144,12 @@ export default {
       page:1,
       data:[],
       columns:[
-        {
-          title: '序号',
-          dataIndex: 'id',
-          width:'65px',
-          align:'center'
-        },
+        // {
+        //   title: '序号',
+        //   dataIndex: 'id',
+        //   width:'65px',
+        //   align:'center'
+        // },
         {
           title: '订单创建时间',
           // width:'160px',
@@ -154,7 +162,7 @@ export default {
           // align:'center'
         },
         {
-          title: '授权方/卖方',
+          title: '委托方/授权方',
           dataIndex: 'entrust_name',
           // align:'center'
         },
@@ -164,7 +172,7 @@ export default {
           // align:'center'
         },
         {
-          title: '被授权方/买方',
+          title: '购买方/被授权方',
           dataIndex: 'buy_username',
           // width:'130px',
           // align:'center'
@@ -182,7 +190,7 @@ export default {
           // align:'center'
         },
         {
-          title: '交易总额',
+          title: '订单金额',
           dataIndex: 'total_money',
           // align:'center'
         },
@@ -204,7 +212,7 @@ export default {
   },
   components:{
     Operation,
-    dataSelect: () => import('../../dateSelect/index.vue'),
+    orderDataSelect: () => import('../../dateSelect/order.vue'),
     orderDetails: () => import('../../orderDetails/index.vue'),
   },
   created(){
diff --git a/src/components/page/order/pendingPayment.vue b/src/components/page/order/pendingPayment.vue
index 6f041a8..2e00de4 100644
--- a/src/components/page/order/pendingPayment.vue
+++ b/src/components/page/order/pendingPayment.vue
@@ -9,21 +9,21 @@
     <div class="body">
       <div class="query">
         <a-row  type="flex" justify="space-between" >
-          <a-col :lg="8" :xl="8" :xxl="6" class="query_item">
+          <a-col :lg="12" :xl="8" :xxl="6" class="query_item">
             <span>订单编号：</span>
             <a-input v-model="query.batchcode"/>
           </a-col>
-          <a-col :lg="8" :xl="8" :xxl="6" class="query_item">
-            <span>授权方：</span>
-            <a-input v-model="query.entrust_name"/>
+          <a-col :lg="12" :xl="8" :xxl="6" class="query_item">
+            <span>委托方/授权方：</span>
+            <a-input v-model="query.entrust_name" placeholder="名称/身份ISLI认证码"/>
           </a-col>
-          <a-col :lg="8" :xl="8" :xxl="6" class="query_item">
-            <span>被授权方：</span>
-            <a-input v-model="query.buy_name"/>
+          <a-col :lg="12" :xl="8" :xxl="6" class="query_item">
+            <span>购买方/被授权方：</span>
+            <a-input v-model="query.buy_name" placeholder="名称/身份ISLI认证码"/>
           </a-col>
-          <a-col :lg="8" :xl="8" :xxl="6" class="query_item">
-            <span>标的名称:</span>
-            <a-input v-model="query.goods_name"/>
+          <a-col :lg="12" :xl="8" :xxl="6" class="query_item">
+            <span>交易标的：</span>
+            <a-input v-model="query.goods_name" placeholder="名称/ISLI标志码"/>
           </a-col>
 
           <!-- <a-col :span="5" class="query_item" >
@@ -35,8 +35,15 @@
               <a-select-option value="3">服务订单</a-select-option>
             </a-select>
           </a-col> -->
-
-          <a-col :lg="8" :xl="8" :xxl="6" class="query_item">
+          <a-col :lg="12" :xl="8" :xxl="6" class="query_item">
+            <span>收费类型：</span>
+            <a-select default-value=""   v-model="query.charges_type">
+              <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>
+          </a-col>
+          <a-col :lg="12" :xl="8" :xxl="6" class="query_item">
             <span>交易方式：</span>
             <a-select default-value=""   v-model="query.entrust_type">
               <a-select-option value="">全部</a-select-option>
@@ -44,11 +51,11 @@
               <a-select-option value="2">授权</a-select-option>
             </a-select>
           </a-col>
-          <a-col :lg="8" :xl="8" :xxl="6" class="query_item query_item2">
+          <a-col :lg="12" :xl="8" :xxl="6" class="query_item query_item2">
             <span>订单创建时间：</span>
             <a-range-picker  v-model="query.createtime" valueFormat="YYYY-MM-DD"/>
           </a-col>
-          <a-col :lg="24" :xl="24" :xxl="12" class="query_item query_item1">
+          <a-col :lg="12" :xl="16" :xxl="6" class="query_item query_item1">
             <a-space :size="21">
               <a-button type="primary" class="query_button" @click="getList(1)">查 询</a-button>
               <a-button class="query_button" @click="resetQurey">重 置</a-button>
@@ -66,7 +73,7 @@
           </template>
           <template slot="operation" slot-scope="item">
             <a-space :size="24">
-              <span class="table_operation" @click="SelectDate(item.batchcode)">数据查看</span>
+              <span class="table_operation" @click="SelectDate(item.batchcode)">标的信息</span>
               <span class="table_operation" @click="SelectOrder(item.batchcode)">订单详情</span>
             </a-space>
           </template>
@@ -88,7 +95,7 @@
         </a-pagination>
       </div>
     </div>
-    <dataSelect :visible.sync="visible" v-if="visible" :batchcode="batchcode" :type="1"></dataSelect>
+    <orderDataSelect :visible.sync="visible" v-if="visible" :batchcode="batchcode" :type="1"></orderDataSelect>
     <orderDetails :visible.sync="visible2" v-if="visible2" :batchcode="batchcode"></orderDetails>
   </div>
 </template>
@@ -108,6 +115,7 @@ export default {
         transaction_status:'1',
         createtime:'',
         goods_isli:'',
+        charges_type:'',
       },
       batchcode:'',
       visible:false,
@@ -121,12 +129,12 @@ export default {
       page:1,
       data:[],
       columns:[
-        {
-          title: '序号',
-          dataIndex: 'id',
-          width:'65px',
-          align:'center'
-        },
+        // {
+        //   title: '序号',
+        //   dataIndex: 'id',
+        //   width:'65px',
+        //   align:'center'
+        // },
         {
           title: '订单创建时间',
           // width:'160px',
@@ -139,7 +147,7 @@ export default {
           // align:'center'
         },
         {
-          title: '授权方/卖方',
+          title: '委托方/授权方',
           dataIndex: 'entrust_name',
           align:'center'
         },
@@ -149,7 +157,7 @@ export default {
           align:'center'
         },
         {
-          title: '被授权方/买方',
+          title: '购买方/被授权方',
           dataIndex: 'buy_username',
           // width:'130px',
           align:'center'
@@ -167,7 +175,7 @@ export default {
           align:'center'
         },
         {
-          title: '交易总额',
+          title: '订单金额',
           dataIndex: 'total_money',
           align:'center'
         },
@@ -182,7 +190,7 @@ export default {
   },
   components:{
     Operation,
-    dataSelect: () => import('../../dateSelect/index.vue'),
+    orderDataSelect: () => import('../../dateSelect/order.vue'),
     orderDetails: () => import('../../orderDetails/index.vue'),
   },
   created(){
diff --git a/src/components/page/order/toBeDelivered.vue b/src/components/page/order/toBeDelivered.vue
index 1b4c257..ca9a790 100644
--- a/src/components/page/order/toBeDelivered.vue
+++ b/src/components/page/order/toBeDelivered.vue
@@ -9,21 +9,21 @@
     <div class="body">
       <div class="query">
         <a-row  type="flex" justify="space-between" >
-          <a-col :lg="8" :xl="8" :xxl="6" class="query_item">
+          <a-col :lg="12" :xl="8" :xxl="6" class="query_item">
             <span>订单编号：</span>
             <a-input v-model="query.batchcode"/>
           </a-col>
-          <a-col :lg="8" :xl="8" :xxl="6" class="query_item">
-            <span>授权方：</span>
-            <a-input v-model="query.entrust_name"/>
+          <a-col :lg="12" :xl="8" :xxl="6" class="query_item">
+            <span>委托方/授权方：</span>
+            <a-input v-model="query.entrust_name" placeholder="名称/身份ISLI认证码"/>
           </a-col>
-          <a-col :lg="8" :xl="8" :xxl="6" class="query_item">
-            <span>被授权方：</span>
-            <a-input v-model="query.buy_name"/>
+          <a-col :lg="12" :xl="8" :xxl="6" class="query_item">
+            <span>购买方/被授权方：</span>
+            <a-input v-model="query.buy_name" placeholder="名称/身份ISLI认证码"/>
           </a-col>
-          <a-col :lg="8" :xl="8" :xxl="6" class="query_item">
-            <span>标的名称:</span>
-            <a-input v-model="query.goods_name"/>
+          <a-col :lg="12" :xl="8" :xxl="6" class="query_item">
+            <span>交易标的：</span>
+            <a-input v-model="query.goods_name" placeholder="名称/ISLI标志码"/>
           </a-col>
 
           <!-- <a-col :span="5" class="query_item" >
@@ -35,8 +35,15 @@
               <a-select-option value="3">服务订单</a-select-option>
             </a-select>
           </a-col> -->
-
-          <a-col :lg="8" :xl="8" :xxl="6" class="query_item">
+          <a-col :lg="12" :xl="8" :xxl="6" class="query_item">
+            <span>收费类型：</span>
+            <a-select default-value=""   v-model="query.charges_type">
+              <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>
+          </a-col>
+          <a-col :lg="12" :xl="8" :xxl="6" class="query_item">
             <span>交易方式：</span>
             <a-select default-value=""   v-model="query.entrust_type">
               <a-select-option value="">全部</a-select-option>
@@ -44,11 +51,11 @@
               <a-select-option value="2">授权</a-select-option>
             </a-select>
           </a-col>
-          <a-col :lg="8" :xl="8" :xxl="6" class="query_item query_item2">
+          <a-col :lg="12" :xl="8" :xxl="6" class="query_item query_item2">
             <span>订单创建时间：</span>
             <a-range-picker  v-model="query.createtime" valueFormat="YYYY-MM-DD"/>
           </a-col>
-          <a-col :lg="24" :xl="24" :xxl="12" class="query_item query_item1">
+          <a-col :lg="12" :xl="16" :xxl="6" class="query_item query_item1">
             <a-space :size="21">
               <a-button type="primary" class="query_button" @click="getList(1)">查 询</a-button>
               <a-button class="query_button" @click="resetQurey">重 置</a-button>
@@ -67,7 +74,7 @@
           </template>
           <template slot="operation" slot-scope="item">
             <a-space :size="24">
-              <span class="table_operation" @click="SelectDate(item.batchcode)">数据查看</span>
+              <span class="table_operation" @click="SelectDate(item.batchcode)">标的信息</span>
               <span class="table_operation" @click="SelectOrder(item.batchcode)">订单详情</span>
             </a-space>
           </template>
@@ -89,7 +96,7 @@
         </a-pagination>
       </div>
     </div>
-    <dataSelect :visible.sync="visible" v-if="visible" :batchcode="batchcode" :type="1"></dataSelect>
+    <orderDataSelect :visible.sync="visible" v-if="visible" :batchcode="batchcode" :type="1"></orderDataSelect>
     <orderDetails :visible.sync="visible2" v-if="visible2" :batchcode="batchcode"></orderDetails>
   </div>
 </template>
@@ -109,6 +116,7 @@ export default {
         transaction_status:'2',
         createtime:'',
         goods_isli:'',
+        charges_type:'',
       },
       visible:false,
       visible2:false,
@@ -122,12 +130,12 @@ export default {
       page:1,
       data:[],
       columns:[
-        {
-          title: '序号',
-          dataIndex: 'id',
-          width:'65px',
-          align:'center'
-        },
+        // {
+        //   title: '序号',
+        //   dataIndex: 'id',
+        //   width:'65px',
+        //   align:'center'
+        // },
         {
           title: '订单创建时间',
           dataIndex: 'createtime',
@@ -140,7 +148,7 @@ export default {
           // align:'center'
         },
         {
-          title: '授权方/卖方',
+          title: '委托方/授权方',
           dataIndex: 'entrust_name',
           // align:'center'
         },
@@ -150,7 +158,7 @@ export default {
           // align:'center'
         },
         {
-          title: '被授权方/买方',
+          title: '购买方/被授权方',
           dataIndex: 'buy_username',
           // width:'130px',
           // align:'center'
@@ -168,7 +176,7 @@ export default {
           // align:'center'
         },
         {
-          title: '交易总额',
+          title: '订单金额',
           dataIndex: 'total_money',
           // width:'90px',
           // align:'center'
@@ -184,7 +192,7 @@ export default {
   },
   components:{
     Operation,
-    dataSelect: () => import('../../dateSelect/index.vue'),
+    orderDataSelect: () => import('../../dateSelect/order.vue'),
     orderDetails: () => import('../../orderDetails/index.vue'),
   },
   created(){
diff --git a/src/components/page/order/toBeSettled.vue b/src/components/page/order/toBeSettled.vue
index a0f77a3..99f28b3 100644
--- a/src/components/page/order/toBeSettled.vue
+++ b/src/components/page/order/toBeSettled.vue
@@ -9,21 +9,21 @@
     <div class="body">
       <div class="query">
         <a-row type="flex" justify="space-between" >
-          <a-col :lg="8" :xl="8" :xxl="6" class="query_item">
+          <a-col :lg="12" :xl="8" :xxl="6" class="query_item">
             <span>订单编号：</span>
             <a-input v-model="query.batchcode"/>
           </a-col>
-          <a-col :lg="8" :xl="8" :xxl="6" class="query_item">
-            <span>授权方：</span>
-            <a-input v-model="query.entrust_name"/>
+          <a-col :lg="12" :xl="8" :xxl="6" class="query_item">
+            <span>委托方/授权方：</span>
+            <a-input v-model="query.entrust_name" placeholder="名称/身份ISLI认证码"/>
           </a-col>
-          <a-col :lg="8" :xl="8" :xxl="6" class="query_item">
-            <span>被授权方：</span>
-            <a-input v-model="query.buy_name"/>
+          <a-col :lg="12" :xl="8" :xxl="6" class="query_item">
+            <span>购买方/被授权方：</span>
+            <a-input v-model="query.buy_name" placeholder="名称/身份ISLI认证码"/>
           </a-col>
-          <a-col :lg="8" :xl="8" :xxl="6" class="query_item">
-            <span>标的名称:</span>
-            <a-input v-model="query.goods_name"/>
+          <a-col :lg="12" :xl="8" :xxl="6" class="query_item">
+            <span>交易标的：</span>
+            <a-input v-model="query.goods_name" placeholder="名称/ISLI标志码"/>
           </a-col>
 
           <!-- <a-col :span="5" class="query_item" >
@@ -35,8 +35,15 @@
               <a-select-option value="3">服务订单</a-select-option>
             </a-select>
           </a-col> -->
-
-          <a-col :lg="8" :xl="8" :xxl="6" class="query_item">
+          <a-col :lg="12" :xl="8" :xxl="6" class="query_item">
+            <span>收费类型：</span>
+            <a-select default-value=""   v-model="query.charges_type">
+              <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>
+          </a-col>
+          <a-col :lg="12" :xl="8" :xxl="6" class="query_item">
             <span>交易方式：</span>
             <a-select default-value=""   v-model="query.entrust_type">
               <a-select-option value="">全部</a-select-option>
@@ -44,11 +51,11 @@
               <a-select-option value="2">授权</a-select-option>
             </a-select>
           </a-col>
-          <a-col :lg="8" :xl="8" :xxl="6" class="query_item query_item2">
+          <a-col :lg="12" :xl="8" :xxl="6" class="query_item query_item2">
             <span>创建时间：</span>
             <a-range-picker  v-model="query.createtime" valueFormat="YYYY-MM-DD"/>
           </a-col>
-          <a-col :lg="24" :xl="24" :xxl="12" class="query_item query_item1">
+          <a-col :lg="12" :xl="16" :xxl="6" class="query_item query_item1">
             <a-space :size="21">
               <a-button type="primary" class="query_button" @click="getList(1)">查 询</a-button>
               <a-button class="query_button" @click="resetQurey">重 置</a-button>
@@ -67,7 +74,7 @@
           </template>
           <template slot="operation" slot-scope="item">
             <a-space :size="24">
-              <span class="table_operation" @click="SelectDate(item.batchcode)">数据查看</span>
+              <span class="table_operation" @click="SelectDate(item.batchcode)">标的信息</span>
               <span class="table_operation" @click="SelectOrder(item.batchcode)">订单详情</span>
             </a-space>
           </template>
@@ -89,7 +96,7 @@
         </a-pagination>
       </div>
     </div>
-    <dataSelect :visible.sync="visible" v-if="visible" :batchcode="batchcode" :type="1"></dataSelect>
+    <orderDataSelect :visible.sync="visible" v-if="visible" :batchcode="batchcode" :type="1"></orderDataSelect>
     <orderDetails :visible.sync="visible2" v-if="visible2" :batchcode="batchcode"></orderDetails>
   </div>
 </template>
@@ -109,6 +116,7 @@ export default {
         transaction_status:'3',
         createtime:'',
         goods_isli:'',
+        charges_type:'',
       },
       visible:false,
       visible2:false,
@@ -122,12 +130,12 @@ export default {
       page:1,
       data:[],
       columns:[
-        {
-          title: '序号',
-          dataIndex: 'id',
-          width:'65px',
-          align:'center'
-        },
+        // {
+        //   title: '序号',
+        //   dataIndex: 'id',
+        //   width:'65px',
+        //   align:'center'
+        // },
         {
           title: '订单创建时间',
           dataIndex: 'createtime',
@@ -140,7 +148,7 @@ export default {
           // align:'center'
         },
         {
-          title: '授权方/卖方',
+          title: '委托方/授权方',
           dataIndex: 'entrust_name',
           // align:'center'
         },
@@ -150,7 +158,7 @@ export default {
           // align:'center'
         },
         {
-          title: '被授权方/买方',
+          title: '购买方/被授权方',
           dataIndex: 'buy_username',
           // width:'130px',
           // align:'center'
@@ -168,7 +176,7 @@ export default {
           // align:'center'
         },
         {
-          title: '交易总额',
+          title: '订单金额',
           dataIndex: 'total_money',
           // width:'90px',
           // align:'center'
@@ -184,7 +192,7 @@ export default {
   },
   components:{
     Operation,
-    dataSelect: () => import('../../dateSelect/index.vue'),
+    orderDataSelect: () => import('../../dateSelect/order.vue'),
     orderDetails: () => import('../../orderDetails/index.vue'),
   },
   created(){
diff --git a/src/router/index.js b/src/router/index.js
index a2bafe4..3e09acd 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -60,7 +60,7 @@ export default new Router({
         {
           path: '/completed',
           component: () => import(/* webpackChunkName: "dashboard" */ '../components/page/order/completed.vue'),
-          meta: { title: '已完成订单' }
+          meta: { title: '已终止订单' }
         },
         {
           path: '/closed',