From 67d2338b3dd43c5972159822aa3dd8f53cd3c78b Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期三, 03 四月 2024 11:14:00 +0800
Subject: [PATCH] 合并冲突
---
src/components/view/b1-inspect-order-plan.vue | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/components/view/b1-inspect-order-plan.vue b/src/components/view/b1-inspect-order-plan.vue
index a1d2ee0..deabb5e 100644
--- a/src/components/view/b1-inspect-order-plan.vue
+++ b/src/components/view/b1-inspect-order-plan.vue
@@ -245,9 +245,9 @@
font: '澶嶆牳',
type: 'text',
method: 'handleReview',
- disabFun: (row, index) => {
- return row.userId == null || row.insState != 4
- }
+ // disabFun: (row, index) => {
+ // return row.userId == null || row.insState != 4
+ // }
}, {
id: '',
font: '璁ら',
@@ -401,7 +401,7 @@
row,
rowIndex
}) {
- if (this.currentTime === row.appointed) {
+ if (this.currentTime == row.appointed) {
return 'highlight-warning-row-border'
} else if (this.currentTime > row.appointed) {
return 'highlight-danger-row-border'
@@ -507,7 +507,7 @@
orderId:this.orderId,
userId:this.connectPerson
}).then(res => {
- if (res.code === 200 && res.data) {
+ if (res.code === 200) {
this.loading = false;
this.$message.success("鎿嶄綔鎴愬姛")
this.refreshTable()
--
Gitblit v1.9.3