From 7c87b6624282f4c4c01e012cd0bcedf6188167d7 Mon Sep 17 00:00:00 2001
From: xy <271556543@qq.com>
Date: Fri, 20 Dec 2024 09:46:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=B1=A5=E7=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../contract/components/contractSign.vue | 54 +++++++++----------
src/views/contract/contractList.vue | 9 +++-
2 files changed, 34 insertions(+), 29 deletions(-)
diff --git a/src/views/contract/components/contractSign.vue b/src/views/contract/components/contractSign.vue
index f5e2b5c..f75b5a3 100644
--- a/src/views/contract/components/contractSign.vue
+++ b/src/views/contract/components/contractSign.vue
@@ -85,33 +85,33 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/contract/contractList.vue b/src/views/contract/contractList.vue
index a360e83..615374b 100644
--- a/src/views/contract/contractList.vue
+++ b/src/views/contract/contractList.vue
@@ -2908,9 +2908,14 @@ export default {
if (item.is_end === 0) {
flowStatus["zhifu"].setStatus(1)
//最后一笔没付完
- if ((item.is_purchase === 0 && item.other_flow_status === 3) || (!item.is_contract && !item.is_substitute && item.purchase_status === 3) || (item.purchase_way?.value === "网上商城" && item.purchase_status === 3) ||
+ if (
+ (item.is_purchase === 0 && item.other_flow_status === 3) ||
+ (!item.is_contract && !item.is_substitute && item.purchase_status === 3) ||
+ (item.purchase_way?.value === "网上商城" && item.purchase_status === 3) ||
item.status === 2 ||
- (!item.is_contract && item.is_simple) || (item.is_contract && item.is_substitute && item.join_status === 3)) {
+ (!item.is_contract && item.is_simple) ||
+ (item.is_contract && item.is_substitute && item.join_status === 3)
+ ) {
//网上商场的话采购完成 合同签订完成 不为合同并且为简易
flowStatus["zhifu"].setExecutable(true)
}