From 7b6c3dc450c20525ddb64bbd9a20c3f0976ea147 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期四, 25 七月 2024 18:11:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/do/b1-inspect-order-plan/Inspection.vue | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index eeaebea..0467e3d 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -497,7 +497,7 @@
ref="wareTableData"
border
v-loading="wareTableDataLoading"
- style="width: 100%;margin-bottom: 30px;" align="center">
+ style="width: 100%;margin-bottom: 30px;" align="center" v-show="wareForm.inspectionItemSubclass!='20(甯告俯)'&&wareForm.inspectionItemSubclass!='20'||(wareForm.inspectionItemSubclass=='20(甯告俯)'&&wareForm.inspectionItem==1)||(wareForm.inspectionItemSubclass=='20'&&wareForm.inspectionItem==numOptions.length)">
<el-table-column
label="搴忓彿"
type="index"
@@ -787,7 +787,6 @@
import ValueTable from '../../tool/value-table.vue'
import file from '../../../util/file'
import excelFunction from '../../../util/excelFountion'
-import { number } from 'echarts'
export default {
props: ['sonLaboratory', 'orderId', 'state'],
components: {
@@ -1175,6 +1174,7 @@
})
})
},
+ // 澶氱嚎绋�
startWorker() {
if (this.worker) {
this.stopWorker(); // 纭繚涔嬪墠鐨� Worker 宸插仠姝�
--
Gitblit v1.9.3