From 33b49a7e95796e4bce64cc18cb406c33c0b63810 Mon Sep 17 00:00:00 2001
From: 朱佳吉 <1527963051@qq.com>
Date: 星期四, 09 五月 2024 14:13:16 +0800
Subject: [PATCH] 查询不合格样品数据

---
 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 e75c561..0acd9f2 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
 	}
@@ -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'
@@ -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
 							}
 						},
 						{
@@ -246,7 +246,7 @@
 							type: 'text',
 							method: 'handleReview',
 							disabFun: (row, index) => {
-								return row.userId == null || row.insState != 4
+								return row.userId == null || row.insState != 3
 							}
 						}, {
 							id: '',
@@ -286,10 +286,6 @@
 							}]
 						}
 					},
-          spanConfig:{
-            rows:'entrustCode',//鍚堝苟琛�,閫氬父娑夊強涓�涓瓧娈�
-            cols:[],//鍚堝苟鍒�,閫氬父娑夊強鍑犱釜瀛楁
-          },
 					selectField: {},
 					requiredAdd: [],
 					requiredUp: []
@@ -401,7 +397,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'

--
Gitblit v1.9.3