From 3a8223b71d18205d40b894fd0b4c0fa1ca773e86 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期一, 13 十一月 2023 10:44:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdc-test' into mdc-test
---
src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderExeDrawer.vue | 55 ++++++++++++++++++++++++++++++++++---------------------
1 files changed, 34 insertions(+), 21 deletions(-)
diff --git a/src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderExeDrawer.vue b/src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderExeDrawer.vue
index 8f34416..5658db1 100644
--- a/src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderExeDrawer.vue
+++ b/src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderExeDrawer.vue
@@ -129,7 +129,7 @@
:pagination="ipagination"
:loading="loading"
@change="handleTableChange"
- :scroll="{ x: 'calc(1200px + 50%)', y: 900 }"
+ :scroll="{ x: 'calc(1000px + 50%)', y: 900 }"
>
<template
v-for="col in columns"
@@ -152,11 +152,16 @@
<a-select
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-option value="3">鏁呴殰鍋滄満</a-select-option>
+ <a-select-option value="4">娌″紑鏈�</a-select-option>
+ </a-select>
<a-input-number
:value="text"
v-if="col.dataIndex == 'inspectionProjectResult' && record.testValueType == '1'"
@@ -358,28 +363,28 @@
align: 'center',
dataIndex: 'detectionStandard',
},
- {
- title: '鍚堟牸鑼冨洿',
- align: 'center',
- dataIndex: 'acceptabilityLimit',
- },
- {
- title: '鏂规硶',
- align: 'center',
- dataIndex: 'inspectionMethod_dictText',
- },
- {
- title: '宸ュ叿',
- align: 'center',
- dataIndex: 'inspectionTool',
- },
+ // {
+ // title: '鍚堟牸鑼冨洿',
+ // align: 'center',
+ // dataIndex: 'acceptabilityLimit',
+ // },
+ // {
+ // title: '鏂规硶',
+ // align: 'center',
+ // dataIndex: 'inspectionMethod_dictText',
+ // },
+ // {
+ // title: '宸ュ叿',
+ // align: 'center',
+ // dataIndex: 'inspectionTool',
+ // },
{
title: '*鐐规缁撴灉',
align: 'center',
dataIndex: 'inspectionProjectResult',
scopedSlots: { customRender: 'inspectionProjectResult' },
- className: 'red',
},
+ // className: 'red',
{
title: '鍒ゅ畾',
align: 'center',
@@ -408,9 +413,9 @@
title: '*寮傚父澶勭疆',
align: 'center',
dataIndex: 'treatmentMeasure',
- className: 'red',
scopedSlots: { customRender: 'treatmentMeasure' },
},
+ // className: 'red',
],
url: {
list: "/eam/inspectionOrderDetail/list",
@@ -679,7 +684,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