From 5cbba170e270e6f1c99a91e27dbb7951a27d596a Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期五, 24 十一月 2023 16:41:32 +0800
Subject: [PATCH] 故障报修验收
---
src/views/eam/modules/equipmentCalibrationOrder/EquipmentCalibrationOrderExeDrawer.vue | 144 +++++++++++++++++-------------------------------
1 files changed, 51 insertions(+), 93 deletions(-)
diff --git a/src/views/eam/modules/equipmentCalibrationOrder/EquipmentCalibrationOrderExeDrawer.vue b/src/views/eam/modules/equipmentCalibrationOrder/EquipmentCalibrationOrderExeDrawer.vue
index c5acd18..38dd45a 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)"
@@ -227,6 +227,18 @@
},
data() {
return {
+ disableMixinCreated:true,
+ ipagination:{
+ current: 1,
+ pageSize: 5,
+ pageSizeOptions: ['5', '10', '50'],
+ showTotal: (total, range) => {
+ return range[0] + "-" + range[1] + " 鍏�" + total + "鏉�"
+ },
+ showQuickJumper: true,
+ showSizeChanger: true,
+ total: 0
+ },
title: "妫�瀹氬伐鍗曟墽琛�",
visible: false,
maskClosable: true,
@@ -248,67 +260,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",
},
@@ -328,37 +313,7 @@
this.dataSource = []
this.visible = true;
this.queryParam.calibrationOrderId = record.id
- this.loadData1(1)
- },
-
- loadData1(arg) {
- if (!this.url.list) {
- this.$message.error("璇疯缃畊rl.list灞炴��!")
- return
- }
- //鍔犺浇鏁版嵁 鑻ヤ紶鍏ュ弬鏁�1鍒欏姞杞界涓�椤电殑鍐呭
- if (arg === 1) {
- this.ipagination.current = 1;
- }
- var params = this.getQueryParams();//鏌ヨ鏉′欢
- this.loading = true;
- getAction(this.url.list, params).then((res) => {
- if (res.success) {
- this.dataSource = res.result.records || res.result;
- if (res.result.total) {
- this.ipagination.total = res.result.total;
- } else {
- this.ipagination.total = 0;
- }
- } else {
- this.$message.warning(res.message)
- }
- }).finally(() => {
- this.loading = false
- })
- },
-
- loadData() {
+ this.loadData(1)
},
getBackground() {
return "background-color:rgba(127, 127, 127,0.08)";
@@ -482,6 +437,9 @@
}
}
+ if(column.dataIndex == 'actualValue'){
+ target[column.dataIndex] = value;
+ }
//鏄剧ず甯﹁繃鏉ョ殑鏁版嵁
that.dataSource = temp;
}
@@ -493,8 +451,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