优化文字内容

src/components/Home.vue

@@ -115,7 +115,7 @@ export default {
     transition: all 500ms;
     position: absolute;
     top: 65px;
-    left: 200px;
+    left: 220px;
     bottom: 0;
     right: 0;
   }

src/components/Sidebar.vue

@@ -200,7 +200,7 @@ export default {
 </script>
 <style scoped>
   .sidebar_body{
-    width: 200px;
+    width: 220px;
     /* height: 100%; */
   }
   .sidebar{

src/components/billDetails/index.vue

@@ -13,6 +13,7 @@
           <a-select default-value=""  v-model="query.close_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="4">收款信息错误</a-select-option>
             <a-select-option value="3">用户名和收款人不一致</a-select-option>
             <a-select-option value="5">结算成功</a-select-option>
@@ -102,20 +103,20 @@
           //   align:'center'
           // },
           {
-            title: '发布时间',
+            title: '订单创建时间',
             dataIndex: 'order_createtime',
             width:'120px',
             // // align:'center'
           },
           {
-            title: '身份ISLI认证码',
+            title: '交易主体名称',
-            dataIndex: 'user_isli',
+            dataIndex: 'order_user.name',
             width:'120px',
             // // align:'center'
           },
           {
-            title: '交易主体名称',
+            title: '身份ISLI认证码',
-            dataIndex: 'order_user.name',
+            dataIndex: 'user_isli',
             width:'120px',
             // // align:'center'
           },

src/components/dateSelect/index.vue

@@ -60,7 +60,7 @@
                   <p class="tab_content_title">标的名称：{{entrust_goods.goods_name}}</p>
                   <div class="content_info">
                     <div class="content_info_left content_info_left1">
-                      <p>标的标志码：{{entrust_goods.goods_islicode}}</p>
+                      <p>标的ISLI标识码：{{entrust_goods.goods_islicode}}</p>
                       <p>ISLI合约关联编码：{{entrust_goods.islicode}}</p>
                       <!-- <p>交易关联标识符：{{item.contract_code}}</p> -->
                       <p>交易品种：{{entrust_goods.goods_type==1?'文化资源数据':'文化数字内容'}}</p>
@@ -238,7 +238,7 @@
 
           },
           {
-            title: 'ISLI标志码',
+            title: 'ISLI标识码',
             dataIndex: 'identifier',
             width:'242px',
 
@@ -287,7 +287,7 @@
 
           },
           {
-            title: '数据集标志码',
+            title: '数据集标识码',
             dataIndex: 'identifier',
             width:'310px',
 
@@ -324,7 +324,7 @@
 
           },
           {
-            title: '资源标志码',
+            title: '资源标识码',
             dataIndex: 'identifier',
             width:'310px',
 

src/components/dateSelect/order.vue

@@ -8,7 +8,7 @@
             标的信息
             <span v-if="index>0">{{index+1}}</span>
           </span>
-          <p>标的信息</p>
+          <!-- <p>标的信息</p> -->
           <div class="tab_body">
             <!-- <template v-if="userinfo"> -->
               <div class="tab_body_title">授权方信息</div>
@@ -37,7 +37,7 @@
                   <!-- <div class="content_right_title">标的名称：{{item.goods.goods_name}}</div> -->
                   <div class="content_info">
                     <div class="content_info_left content_info_left1">
-                      <p>标志码：{{item.goods.goods_islicode}}</p>
+                      <p>标的ISLI标识码：{{item.goods.goods_islicode}}</p>
                       <p>ISLI合约关联编码：{{item.goods.islicode}}</p>
                       <p>交易ISLI编码：{{item.goods.contract_code}}</p>
                       <p>交易品种：{{item.goods.goods_type==1?'文化资源数据':'文化数字内容'}}</p>
@@ -49,8 +49,8 @@
                       <p>自报价：{{item.goods.price}}</p>
                       <p>委托开始时间：{{item.goods.contractual_start_time}}</p>
                       <p>委托终止时间：{{item.goods.contractualtime_end_time}}</p>
-                      <p>标的价款：¥ {{item.goods.goods_price}}</p>
                       <p>购买年限：{{item.goods.charges_type==1 || item.goods.goods_entrust==1?'永久':item.goods.transaction_count}}</p>
+                      <p>标的价款：¥ {{item.goods.goods_price}}</p>
                       <p>交易佣金：¥ {{item.goods.service_charge}}</p>
                       <p>小计：¥ {{item.goods.money}}</p>
                       <!-- <p>交易流水号：{{order_info.close_serial_number}}</p> -->
@@ -226,7 +226,7 @@
 
           },
           {
-            title: 'ISLI标志码',
+            title: 'ISLI标识码',
             dataIndex: 'identifier',
             // width:'242px',
 
@@ -281,7 +281,7 @@
 
           },
           {
-            title: '数据集标志码',
+            title: '数据集标识码',
             dataIndex: 'identifier',
             width:'310px',
 
@@ -319,7 +319,7 @@
 
           },
           {
-            title: '资源标志码',
+            title: '资源标识码',
             dataIndex: 'identifier',
             width:'310px',
 

src/components/orderDetails/index.vue

@@ -40,7 +40,7 @@
             <p class="oreder_content_title">订单信息</p>
             <div class="oreder_info">
               <!-- <p>委托方/授权方：{{order_info.entrust_name}}</p> -->
-              <p>被授权方/付款方：{{buyuser.name}}</p>
+              <p>购买方/被授权方：{{buyuser.name}}</p>
               <p>身份ISLI认证码：{{buyuser.islicode}}</p>
               <p class="tab_body_p">统一社会信用代码：{{buyuser.uscc}}</p>
               <p class="tab_body_p">认证类型：{{buyuser.userType}}</p>
@@ -63,14 +63,13 @@
               <p>交易佣金：¥ {{order_info.service_charge}}</p> -->
               <!-- <p>保证金：¥ {{order_info.earnest_money}}</p> -->
               <p v-for="(item,index) in ratio_setting.detail" :key="index">
-                <span>{{item.role_type==2?'被授权方交易佣金':item.role_type==1?'授权方交易结算':'平台方结算'}}比例：
+                <span>{{item.role_type==2?'被授权方交易佣金':item.role_type==1?'授权方交易结算':'平台方交易结算'}}比例：
                   {{item.calculate==1?item.ratio:item.amount}} %
                 </span>
               </p>
-              <p>交易佣金金额：¥ {{order.total_service_charge}}</p>
+              <p>标的价款总额：¥ {{ order.goods_price}} </p>
-              <p>订单金额：¥ {{order_info.total_money}} </p>
+              <p>交易佣金总额：¥ {{order.total_service_charge}}</p>
-              <p>标的总价款：¥ {{ order.goods_price}} </p>
+              <p>订单金额总额：¥ {{order_info.total_money}} </p>
-
             </div>
           </div>
 

src/components/page/admission/index.vue

@@ -10,7 +10,7 @@
         <a-row  justify="space-between" >
           <a-col :lg="8" :xl="8" :xxl="6" class="query_item">
             <span>委托标的：</span>
-            <a-input v-model="query.goods" placeholder="名称/标志码"/>
+            <a-input v-model="query.goods" placeholder="名称/标的ISLI标识码"/>
           </a-col>
           <a-col :lg="8" :xl="8" :xxl="6" class="query_item">
             <span>合约ISLI码：</span>
@@ -162,7 +162,7 @@ export default {
           // align:'center'
         },
         {
-          title: 'ISLI标识码',
+          title: '标的ISLI标识码',
           dataIndex: 'goods_islicode',
           // align:'center'
         },

src/components/page/afterService/invoice.vue

@@ -54,7 +54,7 @@
             </a-select>
           </a-col>
           <a-col :lg="8" :xl="8" :xxl="6" class="query_item query_item2">
-            <span>创建时间：</span>
+            <span>生成时间：</span>
             <a-range-picker valueFormat="YYYY-MM-DD" v-model="query.createtime"/>
           </a-col>
           <a-col :lg="24" :xl="24" :xxl="12" class="query_item query_item1">
@@ -158,18 +158,18 @@ export default {
           dataIndex: 'batchcode',
           // align:'center'
         },
-
-        {
-          title: '纳税人识别号',
-          dataIndex: 'uscc',
-          // align:'center'
-        },
         {
           title: '购方纳税人名称',
           dataIndex: 'name',
           width:'135px'
           // align:'center'
         },
+        {
+          title: '购方纳税人识别号',
+          dataIndex: 'uscc',
+          // align:'center'
+        },
+        
         // {
         //   title: '订单类型',
         //   dataIndex: '',

src/components/page/classification/DataQuery.vue

@@ -11,7 +11,7 @@
         <a-row  type="flex" justify="space-between">
           <a-col  :lg="8" :xl="7" :xxl="6" class="query_item">
             <span>委托标的：</span>
-            <a-input v-model="query.goods" placeholder="名称/标志码"/>
+            <a-input v-model="query.goods" placeholder="名称/标的ISLI标识码"/>
           </a-col>
           <a-col  :lg="8" :xl="7" :xxl="6" class="query_item">
             <span>合约ISLI码:</span>
@@ -60,7 +60,7 @@
             </a-select>
           </a-col> -->
           <a-col :lg="8" :xl="7" :xxl="6" 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="6" class="query_item query_item1">
@@ -154,13 +154,13 @@ export default {
         //   align:'center'
         // },
         {
-          title: '上线时间',
+          title: '发布时间',
           // width:'90px',
           dataIndex: 'createtime',
           // align:'center'
         },
         {
-          title: '标的标识码',
+          title: '标的ISLI标识码',
           dataIndex: 'goods_islicode',
           // align:'center'
         },

src/components/page/fundSettlement/index.vue

@@ -11,7 +11,7 @@
         <a-row  justify="space-between" >
           <a-col :lg="8" :xl="8" :xxl="6" class="query_item">
             <span>交易主体名称：</span>
-            <a-input v-model="query.user_name"/>
+            <a-input v-model="query.user_name" placeholder="名称/身份ISLI认证码"/>
           </a-col>
           <!-- <a-col :span="5" class="query_item">
             <span>结算账户：</span>
@@ -117,18 +117,18 @@ export default {
         //   width:'65px',
         //   // align:'center'
         // },
-        {
-          title: '身份ISLI认证码',
-          dataIndex: 'islicode',
-          // width:'130px',
-          // align:'center'
-        },
         {
           title: '交易主体名称',
           // width:'120px',
           dataIndex: 'name',
           // align:'center'
         },
+        {
+          title: '身份ISLI认证码',
+          dataIndex: 'islicode',
+          // width:'130px',
+          // align:'center'
+        },
         // {
         //   title: '结算账户',
         //   dataIndex: '',

src/components/page/fundSettlement/splitProportion.vue

@@ -87,10 +87,10 @@
         <a-row  justify="space-between" class="modal_select" v-for="(item,index) in query1.ratio" :key="index">
           <a-col :span="5" class="query_item rule_item">
             <span>角色名称：</span>
-            <a-select    v-model="item.role_type">
+            <a-select    v-model="item.role_type" >
-              <a-select-option value="1">授权方</a-select-option>
+              <a-select-option value="1" v-if="index==1">授权方</a-select-option>
-              <a-select-option value="2">被授权方</a-select-option>
+              <a-select-option value="2" v-if="index==0">被授权方</a-select-option>
-              <a-select-option value="3">平台方</a-select-option>
+              <a-select-option value="3" v-if="index==2">平台方</a-select-option>
               <!-- <a-select-option value="4">区域中心</a-select-option>
               <a-select-option value="5">第三方服务机构</a-select-option> -->
             </a-select>
@@ -245,11 +245,11 @@ export default {
         if(res.code==200){
           this.visible=true
           this.ruleList=res.data
-          this.ruleList.splice(
+          // this.ruleList.splice(
-            1,
+          //   1,
-            1,
+          //   1,
-            ...this.ruleList.splice(1 - 1, 1, this.ruleList[1])
+          //   ...this.ruleList.splice(1 - 1, 1, this.ruleList[1])
-          );
+          // );
 
         }else{
           this.$message.error(res.msg);

src/components/page/layout/index.vue

@@ -44,14 +44,14 @@
         <a-row  justify="space-between" class="modal_select">
           <a-col :span="6" class="query_item">
             <span>委托标的：</span>
-            <a-input v-model="query1.goods" placeholder="名称/标志码"/>
+            <a-input v-model="query1.goods" placeholder="名称/标的ISLI标识码"/>
           </a-col>
           <!-- <a-col :span="5" class="query_item">
             <span>标的名称：</span>
             <a-input v-model="query1.goods_name"/>
           </a-col> -->
           <a-col :span="6" class="query_item">
-            <span>授权方：</span>
+            <span>委托方/授权方：</span>
             <a-input v-model="query1.entrust_name"/>
           </a-col>
           <a-col :span="6" class="query_item">
@@ -202,7 +202,7 @@ export default {
           // align:'center'
         },
         {
-          title: 'ISLI标识码',
+          title: '标的ISLI标识码',
           dataIndex: 'goods_islicode',
           // align:'center'
         },
@@ -243,13 +243,13 @@ export default {
         //   align:'center'
         // },
         {
-          title: '创建时间',
+          title: '发布时间',
           // width:'90px',
           dataIndex: 'createtime',
           // align:'center'
         },
         {
-          title: 'ISLI标识码',
+          title: '标的ISLI标识码',
           dataIndex: 'goods_islicode',
           // align:'center'
         },
@@ -266,7 +266,7 @@ export default {
           // align:'center'
         },
         {
-          title: '标的类型',
+          title: '交易品种',
           dataIndex: 'goods_type',
           // width:'90px',
           scopedSlots:{customRender:'goods_type'},

src/components/page/order/closed.vue

@@ -23,7 +23,7 @@
           </a-col>
           <a-col :lg="12" :xl="8" :xxl="6" class="query_item">
             <span>交易标的：</span>
-            <a-input v-model="query.goods_name" placeholder="名称/ISLI标志码"/>
+            <a-input v-model="query.goods_name" placeholder="名称/标的ISLI标识码"/>
           </a-col>
 
           <!-- <a-col :span="5" class="query_item" >

src/components/page/order/completed.vue

@@ -23,7 +23,7 @@
           </a-col>
           <a-col :lg="12" :xl="8" :xxl="6" class="query_item">
             <span>交易标的：</span>
-            <a-input v-model="query.goods_name" placeholder="名称/ISLI标志码"/>
+            <a-input v-model="query.goods_name" placeholder="名称/标的ISLI标识码"/>
           </a-col>
 
           <!-- <a-col :span="5" class="query_item" >

src/components/page/order/index.vue

@@ -23,7 +23,7 @@
           </a-col>
           <a-col :lg="12" :xl="8" :xxl="6" class="query_item">
             <span>交易标的：</span>
-            <a-input v-model="query.goods_name" placeholder="名称/ISLI标志码"/>
+            <a-input v-model="query.goods_name" placeholder="名称/标的ISLI标识码"/>
           </a-col>
 
           <!-- <a-col :span="5" class="query_item" >

src/components/page/order/pendingPayment.vue

@@ -23,7 +23,7 @@
           </a-col>
           <a-col :lg="12" :xl="8" :xxl="6" class="query_item">
             <span>交易标的：</span>
-            <a-input v-model="query.goods_name" placeholder="名称/ISLI标志码"/>
+            <a-input v-model="query.goods_name" placeholder="名称/标的ISLI标识码"/>
           </a-col>
 
           <!-- <a-col :span="5" class="query_item" >

src/components/page/order/toBeDelivered.vue

@@ -23,7 +23,7 @@
           </a-col>
           <a-col :lg="12" :xl="8" :xxl="6" class="query_item">
             <span>交易标的：</span>
-            <a-input v-model="query.goods_name" placeholder="名称/ISLI标志码"/>
+            <a-input v-model="query.goods_name" placeholder="名称/标的ISLI标识码"/>
           </a-col>
 
           <!-- <a-col :span="5" class="query_item" >

src/components/page/order/toBeSettled.vue

@@ -23,7 +23,7 @@
           </a-col>
           <a-col :lg="12" :xl="8" :xxl="6" class="query_item">
             <span>交易标的：</span>
-            <a-input v-model="query.goods_name" placeholder="名称/ISLI标志码"/>
+            <a-input v-model="query.goods_name" placeholder="名称/标的ISLI标识码"/>
           </a-col>
 
           <!-- <a-col :span="5" class="query_item" >