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

---
 src/components/billDetails/index.vue          | 30 +++++++++++++++++--
 src/components/dateSelect/order.vue           |  4 +--
 src/components/orderDetails/index.vue         |  2 +-
 src/components/page/afterService/invoice.vue  |  6 ++--
 .../page/fundSettlement/splitProportion.vue   |  1 +
 src/components/page/layout/index.vue          | 25 ++++++++--------
 6 files changed, 47 insertions(+), 21 deletions(-)

diff --git a/src/components/billDetails/index.vue b/src/components/billDetails/index.vue
index 6314466..bee7a78 100644
--- a/src/components/billDetails/index.vue
+++ b/src/components/billDetails/index.vue
@@ -3,6 +3,18 @@
     <a-modal  v-model="newVisible" title="账单明细" :afterClose="onClose" width="1175px" :bodyStyle="modeStyle">
       <p>本月总收入：{{income}}</p>
       <p>本月总支出：{{disburse}}</p>
+      <a-row  justify="space-between" >
+        <a-col :span="6" class="query_item">
+          <span>订单编号：</span>
+          <a-input v-model="query.batchcode" />
+        </a-col>
+        <a-col :span="18" 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>
+          </a-space>
+        </a-col>
+      </a-row>
       <div class="bill_content">
         <a-table :columns="columns" :data-source="data" bordered :pagination="false">
           <template slot="close_status" slot-scope="close_status">
@@ -63,6 +75,9 @@
         startTotal:1,
         endTotal:10,
         limit:10,
+        query:{
+          batchcode:''
+        },
         // 当前页数
         page:1,
         disburse:'',
@@ -77,7 +92,7 @@
           },
           {
             title: '结算时间',
-            dataIndex: '',
+            dataIndex: 'createtime',
             width:'120px',
             // // align:'center'
           },
@@ -209,10 +224,18 @@
       this.getList()
     },
     methods:{
-      getList(){
-        let data={}
+      // 重置query
+      resetQurey(){
+        Object.assign(this.query, this.$options.data().query)
+        this.getList()
+      },
+      getList(type){
+        let data=this.query
         data.user_isli=this.user_isli
         data.limit=this.limit
+        if(type==1){
+          this.page=1
+        }
         data.page=this.page
         getBillDetail(data).then(res=>{
           if(res.code==200){
@@ -233,6 +256,7 @@
       },
       // 切换一页显示多少条
       onShowSizeChange(current, pageSize){
+        this.page=1
         this.limit = pageSize;
         this.getList()
       },
diff --git a/src/components/dateSelect/order.vue b/src/components/dateSelect/order.vue
index 60d30ee..7356977 100644
--- a/src/components/dateSelect/order.vue
+++ b/src/components/dateSelect/order.vue
@@ -364,7 +364,7 @@
             if(res.data.length!=0){
               this.orderDate=res.data
               let state=res.data[0].goods.status
-              if(state==1|| state==5){
+              if(state==1){
                 this.columns.pop()
               }
               // this.userinfo=res.data.userinfo
@@ -385,7 +385,7 @@
             this.sourceDate=res.data
             this.newVisible1=true
             let state=res.data[0].goods.status
-            if(state==1|| state==5){
+            if(state==1){
                 this.columns2.pop()
               }
           }else{
diff --git a/src/components/orderDetails/index.vue b/src/components/orderDetails/index.vue
index 03adda5..f33fe3d 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==2?'被授权方交易佣金':item.role_type==1?'授权方交易结算':'平台方结算'}}比列：
+                <span>{{item.role_type==2?'被授权方交易佣金':item.role_type==1?'授权方交易结算':'平台方结算'}}比例：
                   {{item.calculate==1?item.ratio:item.amount}}
                 </span>
               </p>
diff --git a/src/components/page/afterService/invoice.vue b/src/components/page/afterService/invoice.vue
index b858c85..e9e280a 100644
--- a/src/components/page/afterService/invoice.vue
+++ b/src/components/page/afterService/invoice.vue
@@ -13,10 +13,10 @@
             <span>发票编号：</span>
             <a-input v-model="query.invoice_number"/>
           </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-input placeholder="名称/纳税人识别号" v-model="query.seller"/>
-          </a-col>
+          </a-col> -->
           <a-col :lg="8" :xl="8" :xxl="6" class="query_item">
             <span>购方纳税人：</span>
             <a-input placeholder="名称/纳税人识别号" v-model="query.buy"/>
@@ -48,7 +48,7 @@
             <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">
+          <a-col :lg="24" :xl="24" :xxl="18" 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>
diff --git a/src/components/page/fundSettlement/splitProportion.vue b/src/components/page/fundSettlement/splitProportion.vue
index 887189f..3dc0266 100644
--- a/src/components/page/fundSettlement/splitProportion.vue
+++ b/src/components/page/fundSettlement/splitProportion.vue
@@ -324,6 +324,7 @@ export default {
           this.$message.success('创建成功！');
           this.getList()
           this.resetQurey1()
+          this.visible2=false
         }else{
           this.$message.error(res.msg);
         }
diff --git a/src/components/page/layout/index.vue b/src/components/page/layout/index.vue
index b5af20d..84c821f 100644
--- a/src/components/page/layout/index.vue
+++ b/src/components/page/layout/index.vue
@@ -42,19 +42,19 @@
     <a-modal  v-model="visible2" title="添加" width="1400px" :bodyStyle="modeStyle">
       <div >
         <a-row  justify="space-between" class="modal_select">
-          <a-col :span="5" class="query_item">
-            <span>ISLI标识码：</span>
-            <a-input v-model="query1.islicode"/>
+          <a-col :span="6" class="query_item">
+            <span>委托标的：</span>
+            <a-input v-model="query1.goods" placeholder="名称/标志码"/>
           </a-col>
-          <a-col :span="5" class="query_item">
+          <!-- <a-col :span="5" class="query_item">
             <span>标的名称：</span>
             <a-input v-model="query1.goods_name"/>
-          </a-col>
-          <a-col :span="5" class="query_item">
+          </a-col> -->
+          <a-col :span="6" class="query_item">
             <span>授权方：</span>
             <a-input v-model="query1.entrust_name"/>
           </a-col>
-          <a-col :span="5" class="query_item">
+          <a-col :span="6" class="query_item">
             <span>交易品种：</span>
             <a-select default-value=""   v-model="query1.goods_type">
               <a-select-option value="">全部</a-select-option>
@@ -62,7 +62,7 @@
               <a-select-option value="2">文化数字内容</a-select-option>
             </a-select>
           </a-col>
-          <a-col :span="5" class="query_item">
+          <a-col :span="6" class="query_item">
             <span>发布状态：</span>
             <a-select default-value=""   v-model="query1.data_type">
               <a-select-option value="">全部文化数据</a-select-option>
@@ -81,7 +81,7 @@
               <a-select-option value="2">竞价</a-select-option>
             </a-select>
           </a-col> -->
-          <a-col :span="5" class="query_item" >
+          <a-col :span="6" class="query_item" >
             <span>是否展示：</span>
             <a-select default-value=""   v-model="query1.show">
               <a-select-option value="">全部</a-select-option>
@@ -89,7 +89,7 @@
               <a-select-option value="2">否</a-select-option>
             </a-select>
           </a-col>
-          <a-col :span="5" class="query_item" >
+          <a-col :span="6" class="query_item" >
             <span>排序方式：</span>
             <a-select default-value="1"   v-model="query1.order_status">
               <a-select-option value="1">销售数量从高到低</a-select-option>
@@ -98,7 +98,7 @@
               <a-select-option value="4">浏览次数从高到低</a-select-option>
             </a-select>
           </a-col>
-          <a-col :span="9" class="query_item query_item1">
+          <a-col :span="12" class="query_item query_item1">
             <a-space :size="21">
               <a-button type="primary" class="query_button" @click="showAdd">查 询</a-button>
               <a-button class="query_button" @click="resetQurey">重 置</a-button>
@@ -184,7 +184,8 @@ export default {
         createtime:[],
         transaction:'',
         show:'',
-        order_status:'1'
+        order_status:'1',
+        goods:''
       },
       data:[],
       data1:[],