From 88bcabcbc56c6bc0a1b69bdf1075bc93216e58f1 Mon Sep 17 00:00:00 2001
From: ltlzx <942659938@qq.com>
Date: Wed, 27 Apr 2022 17:06:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=9620220427=E6=96=87=E6=A1=A3?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/orderDetails/index.vue          |  8 +++++++-
 .../page/fundSettlement/splitProportion.vue    | 18 +++++++++++++-----
 src/components/page/order/index.vue            |  6 +++---
 3 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/src/components/orderDetails/index.vue b/src/components/orderDetails/index.vue
index d2e34c8..4ac8589 100644
--- a/src/components/orderDetails/index.vue
+++ b/src/components/orderDetails/index.vue
@@ -63,7 +63,7 @@
               <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==1?'委托方':item.role_type==2?'购买方':'平台方'}}分账比列：
+                <span>{{item.role_type==2?'被授权方交易佣金':item.role_type==1?'授权商交易结算':'平台方结算'}}比列：
                   {{item.calculate==1?item.ratio:item.amount}}
                 </span>
               </p>
@@ -235,6 +235,12 @@
             this.bill=res.data.bill
             this.buyuser=res.data.buyuser
             this.ratio_setting=res.data.ratio_setting
+            this.ratio_setting.detail.splice(
+              1,
+              1,
+              ...this.ratio_setting.detail.splice(1 - 1, 1, this.ratio_setting.detail[1])
+            );
+            console.info(this.ratio_setting)
           }else{
             this.$message.error(res.msg);
           }
diff --git a/src/components/page/fundSettlement/splitProportion.vue b/src/components/page/fundSettlement/splitProportion.vue
index 2a1fde2..37ccf3f 100644
--- a/src/components/page/fundSettlement/splitProportion.vue
+++ b/src/components/page/fundSettlement/splitProportion.vue
@@ -90,7 +90,7 @@
             <a-select    v-model="item.role_type">
               <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="3">平台方</a-select-option>
               <!-- <a-select-option value="4">区域中心</a-select-option>
               <a-select-option value="5">第三方服务机构</a-select-option> -->
             </a-select>
@@ -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">{{item.role_type==2?'交易佣金':'交易结算'}}</a-select-option>
             </a-select>
           </a-col>
           <a-col :span="7" class="query_item rule_item">
@@ -143,8 +143,8 @@
     <!-- 查看规则 -->
     <a-modal  v-model="visible" title="查看规则" width="570px" :bodyStyle="{'height':'300px'}">
       <div class="rule_item1" v-for="(item,i) in ruleList" :key="i">
-        <span>{{item.role_type==1?'授权方':item.role_type==2?'被授权方':'深圳文化产权交易所'}}：</span>
-        <span class="rule_item1_span">交易服务费用（{{item.calculate==1?'比例':'固定'}}）</span>
+        <span>{{item.role_type==1?'授权方':item.role_type==2?'被授权方':'平台方'}}：</span>
+        <span class="rule_item1_span">{{item.role_type==2?'交易佣金':'交易结算'}}（{{item.calculate==1?'比例':'固定'}}）</span>
         <span v-if="item.calculate==1">{{item.ratio}}%</span>
         <span v-if="item.calculate==2">{{item.amount}}%</span>
       </div>
@@ -165,8 +165,8 @@ export default {
     return{
       query1:{
         ratio:[
-          {role_type:'1',cost_type:'1',calculate:'1',amount:'',ratio:null,},
           {role_type:'2',cost_type:'1',calculate:'1',amount:'',ratio:null,},
+          {role_type:'1',cost_type:'1',calculate:'1',amount:'',ratio:null,},
           {role_type:'3',cost_type:'1',calculate:'1',amount:'',ratio:null,},
         ],
         rule_name:''
@@ -245,6 +245,12 @@ export default {
         if(res.code==200){
           this.visible=true
           this.ruleList=res.data
+          this.ruleList.splice(
+            1,
+            1,
+            ...this.ruleList.splice(1 - 1, 1, this.ruleList[1])
+          );
+
         }else{
           this.$message.error(res.msg);
         }
@@ -362,6 +368,8 @@ export default {
   }
   .rule_item1{
     margin-bottom: 22px;
+    padding-bottom: 10px;
+    border-bottom: 1px solid rgb(153, 153, 153);
   }
   .rule_item1 span{
     display: inline-block;
diff --git a/src/components/page/order/index.vue b/src/components/page/order/index.vue
index 8d99981..2632853 100644
--- a/src/components/page/order/index.vue
+++ b/src/components/page/order/index.vue
@@ -185,7 +185,7 @@ export default {
         // },
         {
           title: '交易方式',
-          // width:'90px',
+          width:'90px',
           dataIndex: 'entrust_type',
           // align:'center'
         },
@@ -196,14 +196,14 @@ export default {
         },
         {
           title: '交易状态',
-          // width:'90px',
+          width:'90px',
           dataIndex: 'status',
           scopedSlots: { customRender: 'status' },
           // align:'center'
         },
         {
           title: '操作',
-          // width:'170px',
+          width:'170px',
           scopedSlots: { customRender: 'operation' },
           // align:'center'
         },