From 71c4ece010f68a74eeff5e986caecb9a0bb2e36c Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期四, 25 四月 2024 17:37:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/view/b1-inspect-order-plan.vue | 16 ++++++----------
1 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/src/components/view/b1-inspect-order-plan.vue b/src/components/view/b1-inspect-order-plan.vue
index deabb5e..838a1dc 100644
--- a/src/components/view/b1-inspect-order-plan.vue
+++ b/src/components/view/b1-inspect-order-plan.vue
@@ -1,5 +1,5 @@
<style scoped>
- ins-order-plan-main .title {
+ .ins-order-plan-main .title {
font-size: 20px;
color: #3A7BFA
}
@@ -229,7 +229,7 @@
type: 'text',
method: 'handleInspection',
disabFun: (row, index) => {
- return row.userId == null
+ return row.userId == null || row.insState == 3 || row.insState == 5
}
}, {
id: '',
@@ -237,7 +237,7 @@
type: 'text',
method: 'handleConnect',
disabFun: (row, index) => {
- return row.userId == null
+ return row.userId == null || row.orderUserId == null || row.insState == 5 || row.insState == 3
}
},
{
@@ -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 != 3
+ }
}, {
id: '',
font: '璁ら',
@@ -286,10 +286,6 @@
}]
}
},
- spanConfig:{
- rows:'entrustCode',//鍚堝苟琛�,閫氬父娑夊強涓�涓瓧娈�
- cols:[],//鍚堝苟鍒�,閫氬父娑夊強鍑犱釜瀛楁
- },
selectField: {},
requiredAdd: [],
requiredUp: []
--
Gitblit v1.9.3