From cdeb7f8d193a62f0616a27a6ac88228523a413f2 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Wed, 6 Sep 2023 09:58:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config/index.ts          |  2 +-
 src/utils/request/index.ts   |  5 +++-
 src/views/company/index.vue  | 25 +++++++++++---------
 src/views/contract/index.vue | 44 +++++++++++++++++++-----------------
 4 files changed, 42 insertions(+), 34 deletions(-)

diff --git a/src/config/index.ts b/src/config/index.ts
index 49483f1..efe50ec 100644
--- a/src/config/index.ts
+++ b/src/config/index.ts
@@ -6,7 +6,7 @@ const config = {
     import.meta.env.VITE_APP_BASE_URL
   }/`, //请求接口域名
   urlPrefix: "adminapi", //请求默认前缀
-  timeout: 10 * 1000, //请求超时时长
+  timeout: 20 * 1000, //请求超时时长
 };
 
 export default config;
diff --git a/src/utils/request/index.ts b/src/utils/request/index.ts
index 955d381..409e1ab 100644
--- a/src/utils/request/index.ts
+++ b/src/utils/request/index.ts
@@ -77,7 +77,10 @@ const axiosHooks: AxiosHooks = {
     responseInterceptorsCatchHook(error) {
         NProgress.done()
         if (error.code !== AxiosError.ERR_CANCELED) {
-            error.message && feedback.msgError(error.message)
+            if (error.message.indexOf('timeout') !== -1) {
+                feedback.msgError('请求超时!!!')
+            }
+            else error.message && feedback.msgError(error.message)
         }
         return Promise.reject(error)
     }
diff --git a/src/views/company/index.vue b/src/views/company/index.vue
index 4fb2628..2419cf5 100644
--- a/src/views/company/index.vue
+++ b/src/views/company/index.vue
@@ -235,21 +235,22 @@
                     >生成合同</el-button
                   >
                   <el-button
-                    v-else-if="row.contract?.status == 0"
-                    v-perms="['company/initiate_contract']"
-                    type="warning"
-                    link
-                    @click="auditing"
-                    >签约中</el-button
-                  >
-                  <!-- <el-button
                     v-else-if="row.contract?.check_status == 1"
                     v-perms="['company/initiate_contract']"
                     type="warning"
                     link
-                    @click="auditing"
+                    @click="auditing(1)"
                     >审核中</el-button
                   >
+                  <el-button
+                    v-else-if="row.contract?.status == 0"
+                    v-perms="['company/initiate_contract']"
+                    type="success"
+                    link
+                    @click="auditing(2)"
+                    >签约中</el-button
+                  >
+                  <!-- 
                   <el-button
                     v-else-if="row.contract?.check_status == 2"
                     v-perms="['company/Draftingcontracts']"
@@ -662,8 +663,10 @@ const handleAuthentication = async (id: number | string | any[]) => {
 };
 
 // 审核中
-const auditing = () => {
-  ElMessage.warning("请等待合同签约完成!");
+const auditing = (type: number) => {
+  type == 1
+    ? ElMessage.warning("请等待合同审核完成!")
+    : ElMessage.success("合同双方正在签约!");
 };
 
 getLists();
diff --git a/src/views/contract/index.vue b/src/views/contract/index.vue
index e92d87b..206e298 100644
--- a/src/views/contract/index.vue
+++ b/src/views/contract/index.vue
@@ -144,28 +144,30 @@
                   >详情</router-link
                 >
               </el-button>
-              <el-button v-if="row.check_status == 1" type="warning" link>
-                <router-link
-                  :to="{ path: '/contract/detail', query: { id: row.id } }"
-                  >待审核</router-link
+              <template v-if="row.status == 0">
+                <el-button v-if="row.check_status == 1" type="warning" link>
+                  <router-link
+                    :to="{ path: '/contract/detail', query: { id: row.id } }"
+                    >待审核</router-link
+                  >
+                </el-button>
+                <el-button
+                  v-else-if="row.check_status == 2"
+                  v-perms="['company/Draftingcontracts']"
+                  type="primary"
+                  link
+                  @click="showCreateConctPop(row)"
+                  >发送合同</el-button
                 >
-              </el-button>
-              <el-button
-                v-else-if="row.check_status == 2"
-                v-perms="['company/Draftingcontracts']"
-                type="primary"
-                link
-                @click="showCreateConctPop(row)"
-                >发送合同</el-button
-              >
-              <el-button
-                v-else-if="row.check_status == 3"
-                v-perms="['company/postsms']"
-                type="primary"
-                link
-                @click="(showPop = true), (contractId = row.party_b)"
-                >发送短信</el-button
-              >
+                <el-button
+                  v-else-if="row.check_status == 3"
+                  v-perms="['company/postsms']"
+                  type="primary"
+                  link
+                  @click="(showPop = true), (contractId = row.party_b)"
+                  >发送短信</el-button
+                >
+              </template>
               <!-- <el-button v-perms="['contract.contract/delete']" type="danger" link
                                 @click="handleDelete(row.id)">删除</el-button> -->
             </template>