From 83830b509d3cce2dba0be3fdbc6f4db054b78d74 Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期三, 18 十月 2023 18:43:30 +0800
Subject: [PATCH] 鉴定
---
src/views/eam/modules/equipmentCalibrationOrder/EquipmentCalibrationOrderExeDrawer.vue | 100 +++++++++++++++++++-------------------------------
1 files changed, 38 insertions(+), 62 deletions(-)
diff --git a/src/views/eam/modules/equipmentCalibrationOrder/EquipmentCalibrationOrderExeDrawer.vue b/src/views/eam/modules/equipmentCalibrationOrder/EquipmentCalibrationOrderExeDrawer.vue
index c5acd18..bf95c23 100644
--- a/src/views/eam/modules/equipmentCalibrationOrder/EquipmentCalibrationOrderExeDrawer.vue
+++ b/src/views/eam/modules/equipmentCalibrationOrder/EquipmentCalibrationOrderExeDrawer.vue
@@ -146,7 +146,7 @@
<div :key="col.dataIndex">
<a-input-number
:value="text"
- v-if="col.dataIndex == 'calibrationItemResult'"
+ v-if="col.dataIndex == 'actualValue'"
:min="0"
:max="20000000"
@change="(e)=>handleChange(e, record.key, col, index,record)"
@@ -248,67 +248,40 @@
sm: { span: 16 },
},
columns: [
- {
- title: '#',
- dataIndex: '',
- key: 'rowIndex',
- align: 'center',
- width: 60,
- customRender: function (t, r, index) {
- return parseInt(index) + 1
- }
- },
- {
- title: '绮惧害鍙傛暟缂栫爜',
- align: 'center',
- dataIndex: 'num',
- },
- {
- title: '绮惧害鍙傛暟鍚嶇О',
- align: 'center',
- dataIndex: 'name',
- },
- {
- title: '璁￠噺鍗曚綅',
- align: 'center',
- dataIndex: 'unitName',
- },
- {
- title: '涓嬮檺鍊�',
- align: 'center',
- dataIndex: 'lowerLimit',
- },
- {
- title: '涓婇檺鍊�',
- align: 'center',
- dataIndex: 'upperLimit',
- },
- {
- title: '娴嬪畾鍊�',
- align: 'center',
- dataIndex: 'actualValue',
- },
- {
- title: '瀹為檯娴嬪畾鍊�',
- align: 'center',
- dataIndex: 'calibrationItemResult',
- scopedSlots: { customRender: 'calibrationItemResult' },
- width: 160,
- },
- // {
- // title: '鍒ゅ畾缁撴灉',
- // align: 'center',
- // dataIndex: 'judgmentResultName',
- // class: "notshow"
- // },
- {
- title: '鍒ゅ畾缁撴灉',
- align: 'center',
- dataIndex: 'judgmentResult',
- },
+ {
+ title: '#',
+ dataIndex:'sort',
+ width:100,
+ align:"center",
+ },
+ {
+ title:'妫�楠岄」鐩悕绉�',
+ align:"center",
+ dataIndex: 'name',
+ width:300
+ },
+ {
+ title:'浣嶇疆',
+ align:"center",
+ dataIndex: 'precisionParametersUda1',
+ width:300
+ },
+ {
+ title:'鍏佸樊锛坢m锛�',
+ align:"center",
+ dataIndex: 'tolerance',
+ width:300
+ },
+ {
+ title:'瀹炴祴鍊�',
+ align:"center",
+ dataIndex: 'actualValue',
+ scopedSlots: { customRender: 'actualValue' },
+ width:300
+ },
],
url: {
- list: "/eam/calibrationOrderDetail/getCalibrationOrderDetailList",
+ list: "/eam/calibrationOrder/listByMainId",
report: "/eam/calibrationOrder/report",
save: "/eam/calibrationOrderDetail/save",
},
@@ -482,6 +455,9 @@
}
}
+ if(column.dataIndex == 'actualValue'){
+ target[column.dataIndex] = value;
+ }
//鏄剧ず甯﹁繃鏉ョ殑鏁版嵁
that.dataSource = temp;
}
@@ -493,8 +469,8 @@
let formData = Object.assign(this.model);
for (let i = 0; i < that.dataSource.length; i++) {
let o = this.dataSource[i]
- if (o.calibrationItemResult == null || o.calibrationItemResult == '') {
- that.$message.warning('璇疯緭鍏ユ瀹氱粨鏋滐紒')
+ if (o.actualValue == null || o.actualValue == '') {
+ that.$message.warning('璇疯緭鍏ュ簭鍙蜂负'+o.sort+'妫�楠岄」鐨勫疄娴嬪��')
that.confirmLoading = false;
return
}
--
Gitblit v1.9.3