From 3a4041f3eef38f38fa03d6305bea9faead06c133 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期五, 10 五月 2024 16:36:43 +0800
Subject: [PATCH] 合并冲突
---
src/components/view/b1-inspect-order-plan.vue | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/components/view/b1-inspect-order-plan.vue b/src/components/view/b1-inspect-order-plan.vue
index 867b6f1..56ea018 100644
--- a/src/components/view/b1-inspect-order-plan.vue
+++ b/src/components/view/b1-inspect-order-plan.vue
@@ -189,7 +189,7 @@
<script>
import ValueTable from '../tool/value-table.vue'
- import Inspection from '../do/b1-inspect-order-plan/Inspection.vue'
+ import Inspection from '../do/b1-inspect-order-plan/Inspection.vue'
import {
getYearAndMonthAndDays
} from '../../util/date'
@@ -245,9 +245,9 @@
font: '澶嶆牳',
type: 'text',
method: 'handleReview',
- /* disabFun: (row, index) => {
+ disabFun: (row, index) => {
return row.userId == null || row.insState != 3
- } */
+ }
}, {
id: '',
font: '璁ら',
--
Gitblit v1.9.3