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/EquipmentCalibrationOrderModal.vue | 119 +++++++++++++++++++++++++++++++++--------------------------
1 files changed, 67 insertions(+), 52 deletions(-)
diff --git a/src/views/eam/modules/equipmentCalibrationOrder/EquipmentCalibrationOrderModal.vue b/src/views/eam/modules/equipmentCalibrationOrder/EquipmentCalibrationOrderModal.vue
index 426cd9d..f8e7bd6 100644
--- a/src/views/eam/modules/equipmentCalibrationOrder/EquipmentCalibrationOrderModal.vue
+++ b/src/views/eam/modules/equipmentCalibrationOrder/EquipmentCalibrationOrderModal.vue
@@ -112,6 +112,21 @@
/>
</a-form-item>
</a-col>
+ <a-col :span="24">
+ <a-form-item
+ :labelCol="{span:3}"
+ :wrapperCol="{span:21}"
+ label="绮惧害鍙傛暟妯℃澘ID"
+ hidden
+ >
+ <a-textarea
+ allow-clear
+ :disabled="disableSubmit"
+ :placeholder="disableSubmit?'':'璇疯緭鍏ョ簿搴﹀弬鏁版ā鏉縄D'"
+ v-decorator="['calibrationOrderUda1', validatorRules.calibrationOrderUda1]"
+ />
+ </a-form-item>
+ </a-col>
</a-row>
</a-form>
</a-spin>
@@ -121,7 +136,10 @@
size="middle"
rowKey='id'
:columns="columns"
+ :pagination="ipagination"
+ :loading="loading"
:dataSource="dataSource"
+ @change="handleTableChange"
>
</a-table>
@@ -154,10 +172,13 @@
import JMultiSelectTag from '@/components/dict/JMultiSelectTag'
import Tooltip from 'ant-design-vue/es/tooltip'
import EquipmentList from './EquipmentList'
+import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+
import Vue from 'vue'
export default {
name: "EquipmentCalibrationOrderModal",
+ mixins:[JeecgListMixin],
components: {
JMultiSelectTag,
Tooltip,
@@ -166,48 +187,33 @@
data() {
return {
columns: [
- {
- title: '#',
- dataIndex: '',
- key: 'rowIndex',
- align: 'center',
- customRender: function (t, r, index) {
- return parseInt(index) + 1
+ {
+ title: '#',
+ dataIndex:'sort',
+ width:100,
+ align:"center",
},
- width: 50,
- },
- {
- 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: 'precisionParametersName',
+ width:300
+ },
+ {
+ title:'浣嶇疆',
+ align:"center",
+ dataIndex: 'precisionParametersUda1',
+ width:300
+ },
+ {
+ title:'鍏佸樊锛坢m锛�',
+ align:"center",
+ dataIndex: 'tolerance',
+ width:300
+ },
],
title: "鎿嶄綔",
+ precisionParametersTemplateId:'',
visible: false,
disableSubmit: false,
codeDisable: true,
@@ -248,7 +254,7 @@
url: {
add: "/eam/calibrationOrder/addNew",
edit: "/eam/calibrationOrder/editNew",
- getPrecisionParameterList: "/eam/calibrationOrder/getPrecisionParameterList",
+ list: "/eam/precisionParametersTemplateDetail/listByPrecisionParametersTemplateId",
},
}
@@ -256,11 +262,9 @@
methods: {
add() {
- this.dataSource = []
+ this.precisionParametersTemplateId='-1';
this.edit({})
-
},
-
edit(record) {
let that = this;
this.form.resetFields();
@@ -323,18 +327,29 @@
sendEquipmentRecord(data) {
this.dataSource = [];
let record = data.record;
- this.form.setFieldsValue({ equipmentId: record.id, equipmentName: record.num + "/" + record.name + "/" + record.model });
- this.getPrecisionParameterList(record.id);
+ this.form.setFieldsValue({calibrationOrderUda1:record.precisionParametersTemplateId,equipmentId: record.id, equipmentName: record.num + "/" + record.name + "/" + record.model });
+ this.precisionParametersTemplateId = record.precisionParametersTemplateId;
},
-
- getPrecisionParameterList(equipmentId) {
- getAction(this.url.getPrecisionParameterList, { equipmentId: equipmentId }).then((res) => {
- if (res.success) {
- this.dataSource = res.result
- }
- })
+ clearList(){
+ this.dataSource=[]
+ this.selectedRowKeys=[]
+ this.ipagination.current = 1
},
},
+ watch:{
+ precisionParametersTemplateId:{
+ immediate: true,
+ handler(val) {
+ if(!this.precisionParametersTemplateId){
+ this.clearList()
+ }else{
+ this.queryParam['precisionParametersTemplateId'] = val;
+ this.queryParam['delFlag'] = 0;
+ this.loadData(1);
+ }
+ }
+ }
+ },
}
</script>
--
Gitblit v1.9.3