From eb769ca299e81978397fd18dae5d2a8f6d41b69e Mon Sep 17 00:00:00 2001
From: xy <271556543@qq.com>
Date: Sat, 12 Oct 2024 17:54:43 +0800
Subject: [PATCH] init

---
 src/views/contract/contractEdit.vue |  2 +-
 src/views/contract/contractList.vue | 25 ++++++++++++-------------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/views/contract/contractEdit.vue b/src/views/contract/contractEdit.vue
index 2358133..87102a7 100644
--- a/src/views/contract/contractEdit.vue
+++ b/src/views/contract/contractEdit.vue
@@ -1508,7 +1508,7 @@ export default {
                 this.btnLoading = false
                 //this.step = 3;
                 this.$router.push({
-                  path: (this.form.is_simple || !this.form.is_purchase) ? '/contractAll' : '/contract/contractList',
+                  path: (this.form.is_simple || !this.form.is_purchase) ? '/contract/contractAll' : '/contract/contractList',
                   query: {
                     keyword: this.form.name,
                   },
diff --git a/src/views/contract/contractList.vue b/src/views/contract/contractList.vue
index 5dafec3..92caf3c 100644
--- a/src/views/contract/contractList.vue
+++ b/src/views/contract/contractList.vue
@@ -2556,6 +2556,18 @@ export default {
     },
     //获取合同列表
     getContracts: throttle(async function (is_export,noloading=false,isopenOa=false) {
+      let tokens = getToken();
+      if (is_export && this.select.is_export === 1) {
+        var url = "/api/ht/contract/index?is_auth=1&token=" + tokens;
+        Object.keys(this.select).map((key, item) => {
+          url += "&" + key + "=" + this.select[key];
+        });
+        url = location.host + url;
+        console.log(url);
+        window.open("http://" + url, "_blank");
+        this.select.is_export = 0;
+        return;
+      }
       if (/contractLedger/g.test(this.$route.path)) {
         this.select.is_contract = 1
       } else {
@@ -2569,19 +2581,6 @@ export default {
       },noloading);
       delete this.select.id;
 
-      let tokens = getToken();
-      if (is_export && this.select.is_export == 1) {
-        var url = "/api/ht/contract/index?is_auth=1&token=" + tokens;
-        Object.keys(this.select).map((key, item) => {
-          url += "&" + key + "=" + this.select[key];
-        });
-        url = location.host + url;
-        console.log(url);
-        window.open("http://" + url, "_blank");
-        this.select.is_export = 0;
-        return;
-      }
-
       res.list.data.forEach(i => this.handleContractFlow(i))
       this.list = res.list.data;
       this.total = res.list.total;