From e2edf3fe20ab00e25248d738153bf3f464cec7b6 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期二, 05 九月 2023 17:15:49 +0800
Subject: [PATCH] 小修改
---
src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderExeDrawer.vue | 44 +++++++++++++++++++++++++++++---------------
1 files changed, 29 insertions(+), 15 deletions(-)
diff --git a/src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderExeDrawer.vue b/src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderExeDrawer.vue
index c70df55..e5a0ffc 100644
--- a/src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderExeDrawer.vue
+++ b/src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderExeDrawer.vue
@@ -17,18 +17,21 @@
@click="handleSW"
:disabled=SWbuttonDistable
type="primary"
+ v-has="'dailyInspectionOrder:SW'"
>寮�宸�</a-button>
<a-button
:style="{marginRight: '8px'}"
@click="handleReport"
:disabled="buttonDistable"
type="primary"
+ v-has="'dailyInspectionOrder:report'"
>鎶ュ伐</a-button>
<a-button
:style="{marginRight: '8px'}"
@click="handleReset"
:disabled="revocationDistable"
type="primary"
+ v-has="'dailyInspectionOrder:reset'"
>鎾ら攢</a-button>
</a-row>
</div>
@@ -147,18 +150,21 @@
style="max-width:80px;font-size: 12px;font-style: italic;"
/>
<a-select
- v-if="col.dataIndex == 'inspectionProjectResult' && record.analysisMethod == '2'"
+ v-if="col.dataIndex == 'inspectionProjectResult' && record.testValueType == '2'"
:value="text"
- :options="record.inspectionCycles"
@change="(e) => handleChange(e, record.key, col, index)"
style="width: 100%"
:disabled="record.disabled"
- />
+ >
+ <!-- :options="record.inspectionCycles" -->
+ <a-select-option value="1">姝ｅ父</a-select-option>
+ <a-select-option value="2">寮傚父</a-select-option>
+ </a-select>
<a-input-number
:value="text"
- v-if="col.dataIndex == 'inspectionProjectResult' && record.analysisMethod == '1'"
+ v-if="col.dataIndex == 'inspectionProjectResult' && record.testValueType == '1'"
:min="0"
- :max="200"
+ :max="20000"
@change="(e)=>handleChange(e, record.key, col, index,record)"
style="width: 100%"
:disabled="record.disabled"
@@ -262,11 +268,13 @@
@click="handleTS"
:disabled="buttonDistable"
type="primary"
+ v-has="'dailyInspectionOrder:TS'"
>鏆傚瓨</a-button>
<a-button
@click="handleOk"
:disabled="buttonDistable"
type="primary"
+ v-has="'dailyInspectionOrder:save'"
>淇濆瓨</a-button>
</a-row>
</div>
@@ -393,14 +401,12 @@
dataIndex: 'abnormalDesc',
scopedSlots: { customRender: 'abnormalDesc' },
},
- {
- title: '寮傚父鎷嶇収',
- align: 'center',
- dataIndex: 'abnormalPhoto',
- scopedSlots: { customRender: 'abnormalPhoto' },
- // dataIndex: 'action',
- // scopedSlots: { customRender: 'action' },
- },
+ // {
+ // title: '寮傚父鎷嶇収',
+ // align: 'center',
+ // dataIndex: 'abnormalPhoto',
+ // scopedSlots: { customRender: 'abnormalPhoto' },
+ // },
{
title: '*寮傚父澶勭疆',
align: 'center',
@@ -663,7 +669,7 @@
if (target) {
if (column.dataIndex == 'inspectionProjectResult') {
- if (target.analysisMethod === "1") {
+ if (target.testValueType === "1") {
target[column.dataIndex] = value;
let maxValue = target.maxValue
let minValue = target.minValue
@@ -676,7 +682,15 @@
target['judgmentResult'] = "";
}
} else {
-
+ target[column.dataIndex] = value;
+ if (value == "1") {
+ target['judgmentResult'] = "pass";
+ } else {
+ target['judgmentResult'] = "fail";
+ }
+ if (value == null || value == "") {
+ target['judgmentResult'] = "";
+ }
}
}
if (column.dataIndex == 'abnormalDesc') {
--
Gitblit v1.9.3