From 1194b9f00dd76df45b7b3410155940d8201e8c92 Mon Sep 17 00:00:00 2001
From: ltlzx <942659938@qq.com>
Date: Sat, 7 May 2022 14:29:17 +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/page/admission/index.vue                | 4 +---
 src/components/page/afterService/invoice.vue           | 4 +---
 src/components/page/classification/Category.vue        | 5 +----
 src/components/page/classification/DataQuery.vue       | 4 +---
 src/components/page/fundSettlement/index.vue           | 4 +---
 src/components/page/fundSettlement/splitProportion.vue | 4 +---
 src/components/page/layout/index.vue                   | 4 ++++
 src/components/page/order/closed.vue                   | 4 +---
 src/components/page/order/completed.vue                | 5 ++++-
 src/components/page/order/index.vue                    | 4 +---
 src/components/page/order/pendingPayment.vue           | 4 +---
 src/components/page/order/toBeDelivered.vue            | 4 +---
 src/components/page/order/toBeSettled.vue              | 4 +---
 13 files changed, 19 insertions(+), 35 deletions(-)

diff --git a/src/components/page/admission/index.vue b/src/components/page/admission/index.vue
index 3a4060a..831a51f 100644
--- a/src/components/page/admission/index.vue
+++ b/src/components/page/admission/index.vue
@@ -247,11 +247,9 @@ export default {
       let data=this.query
       data.limit=this.limit
       if(type==1){
-        data.page=1
         this.page=1
-      }else{
-        data.page=this.page
       }
+      data.page=this.page
       getAllDate(data).then(res=>{
         // console.info(res)
         if(res.code==200){
diff --git a/src/components/page/afterService/invoice.vue b/src/components/page/afterService/invoice.vue
index e9e280a..e745fc4 100644
--- a/src/components/page/afterService/invoice.vue
+++ b/src/components/page/afterService/invoice.vue
@@ -205,11 +205,9 @@ export default {
       let data=this.query
       data.limit=this.limit
       if(type==1){
-        data.page=1
         this.page=1
-      }else{
-        data.page=this.page
       }
+      data.page=this.page
       InvoiceManagementList(data).then(res=>{
         // console.info(res)
         if(res.code==200){
diff --git a/src/components/page/classification/Category.vue b/src/components/page/classification/Category.vue
index 2f4d3c6..98f821c 100644
--- a/src/components/page/classification/Category.vue
+++ b/src/components/page/classification/Category.vue
@@ -287,12 +287,9 @@ export default {
       let data=this.query
       data.limit=this.limit
       if(type==1){
-        data.page=1
         this.page=1
-      }else{
-        data.page=this.page
       }
-
+      data.page=this.page
       ClassifyList(data).then(res=>{
         console.info(res)
         if(res.code==200){
diff --git a/src/components/page/classification/DataQuery.vue b/src/components/page/classification/DataQuery.vue
index 94545d6..b03875c 100644
--- a/src/components/page/classification/DataQuery.vue
+++ b/src/components/page/classification/DataQuery.vue
@@ -236,11 +236,9 @@ export default {
       let data=this.query
       data.limit=this.limit
       if(type==1){
-        data.page=1
         this.page=1
-      }else{
-        data.page=this.page
       }
+      data.page=this.page
       getAllDate(data).then(res=>{
         // console.info(res)
         if(res.code==200){
diff --git a/src/components/page/fundSettlement/index.vue b/src/components/page/fundSettlement/index.vue
index 545652b..49e10db 100644
--- a/src/components/page/fundSettlement/index.vue
+++ b/src/components/page/fundSettlement/index.vue
@@ -180,11 +180,9 @@ export default {
       let data=this.query
       data.limit=this.limit
       if(type==1){
-        data.page=1
         this.page=1
-      }else{
-        data.page=this.page
       }
+      data.page=this.page
       closeList(data).then(res=>{
         if(res.code==200){
           this.data=res.data.data
diff --git a/src/components/page/fundSettlement/splitProportion.vue b/src/components/page/fundSettlement/splitProportion.vue
index 3dc0266..ecbdd4e 100644
--- a/src/components/page/fundSettlement/splitProportion.vue
+++ b/src/components/page/fundSettlement/splitProportion.vue
@@ -281,11 +281,9 @@ export default {
       let data=this.query
       data.limit=this.limit
       if(type==1){
-        data.page=1
         this.page=1
-      }else{
-        data.page=this.page
       }
+      data.page=this.page
       ratioList(data).then(res=>{
         if(res.code==200){
           this.data=res.data.data
diff --git a/src/components/page/layout/index.vue b/src/components/page/layout/index.vue
index 84c821f..bae4ce1 100644
--- a/src/components/page/layout/index.vue
+++ b/src/components/page/layout/index.vue
@@ -304,6 +304,10 @@ export default {
       })
     },
     delRank(){
+      if(this.selectedRowKeys1.length==0) {
+        this.$message.error('请选择要删除的标的！');
+        return
+      }
       let data={goods_isli:this.selectedRowKeys1}
       delRanking(data).then(res=>{
         if(res.code==200){
diff --git a/src/components/page/order/closed.vue b/src/components/page/order/closed.vue
index 970385f..e754f13 100644
--- a/src/components/page/order/closed.vue
+++ b/src/components/page/order/closed.vue
@@ -210,11 +210,9 @@ export default {
       let data=this.query
       data.limit=this.limit
       if(type==1){
-        data.page=1
         this.page=1
-      }else{
-        data.page=this.page
       }
+      data.page=this.page
       getOrderList(data).then(res=>{
         if(res.code==200){
           this.data=res.data.data
diff --git a/src/components/page/order/completed.vue b/src/components/page/order/completed.vue
index 6ad6cef..975d911 100644
--- a/src/components/page/order/completed.vue
+++ b/src/components/page/order/completed.vue
@@ -206,8 +206,11 @@ export default {
       Object.assign(this.query, this.$options.data().query)
       this.getList()
     },
-    getList(){
+    getList(type){
       let data=this.query
+      if(type==1){
+        this.page=1
+      }
       data.page=this.page
       data.limit=this.limit
       getOrderList(data).then(res=>{
diff --git a/src/components/page/order/index.vue b/src/components/page/order/index.vue
index 592ae65..98e81dc 100644
--- a/src/components/page/order/index.vue
+++ b/src/components/page/order/index.vue
@@ -234,11 +234,9 @@ export default {
       let data=this.query
       data.limit=this.limit
       if(type==1){
-        data.page=1
         this.page=1
-      }else{
-        data.page=this.page
       }
+      data.page=this.page
       getOrderList(data).then(res=>{
         if(res.code==200){
           this.data=res.data.data
diff --git a/src/components/page/order/pendingPayment.vue b/src/components/page/order/pendingPayment.vue
index 617a649..f03e30c 100644
--- a/src/components/page/order/pendingPayment.vue
+++ b/src/components/page/order/pendingPayment.vue
@@ -209,11 +209,9 @@ export default {
       let data=this.query
       data.limit=this.limit
       if(type==1){
-        data.page=1
         this.page=1
-      }else{
-        data.page=this.page
       }
+      data.page=this.page
       getOrderList(data).then(res=>{
         if(res.code==200){
           this.data=res.data.data
diff --git a/src/components/page/order/toBeDelivered.vue b/src/components/page/order/toBeDelivered.vue
index 8110d19..8569bdc 100644
--- a/src/components/page/order/toBeDelivered.vue
+++ b/src/components/page/order/toBeDelivered.vue
@@ -209,11 +209,9 @@ export default {
       let data=this.query
       data.limit=this.limit
       if(type==1){
-        data.page=1
         this.page=1
-      }else{
-        data.page=this.page
       }
+      data.page=this.page
       getOrderList(data).then(res=>{
         if(res.code==200){
           this.data=res.data.data
diff --git a/src/components/page/order/toBeSettled.vue b/src/components/page/order/toBeSettled.vue
index caccd5f..d74a0c7 100644
--- a/src/components/page/order/toBeSettled.vue
+++ b/src/components/page/order/toBeSettled.vue
@@ -209,11 +209,9 @@ export default {
       let data=this.query
       data.limit=this.limit
       if(type==1){
-        data.page=1
         this.page=1
-      }else{
-        data.page=this.page
       }
+      data.page=this.page
       getOrderList(data).then(res=>{
         if(res.code==200){
           this.data=res.data.data