From 585fb0bbd4a7bc7f8f333ecba7c5fecd2ee5cbc2 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 09:46:44 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/vue_mdc_430 into develop
---
src/views/eam/EquipmentCalibrationOrder.vue | 34 ++++++++++++++++++++++++----------
1 files changed, 24 insertions(+), 10 deletions(-)
diff --git a/src/views/eam/EquipmentCalibrationOrder.vue b/src/views/eam/EquipmentCalibrationOrder.vue
index dd553bb..5b7d464 100644
--- a/src/views/eam/EquipmentCalibrationOrder.vue
+++ b/src/views/eam/EquipmentCalibrationOrder.vue
@@ -15,10 +15,10 @@
:sm='8'
>
<a-form-item label='宸ュ崟缂栫爜'>
- <a-input
+ <j-input
placeholder='璇疯緭鍏ュ伐鍗曠紪鐮�'
v-model='queryParam.num'
- ></a-input>
+ ></j-input>
</a-form-item>
</a-col>
<!-- <a-col
@@ -296,6 +296,7 @@
from './modules/equipmentCalibrationOrder/EquipmentCalibrationOrderReportModal'
import EquipmentTechnologyStatusModal from './modules/equipmentCalibrationOrder/EquipmentTechnologyStatusModal'
import TechnologyStatusAuthenticateModal from './modules/equipmentCalibrationOrder/TechnologyStatusAuthenticateModal'
+import { interceptorFunc } from 'vxe-table'
export default {
name: 'EquipmentCalibrationOrder',
@@ -313,10 +314,11 @@
data() {
return {
description: '鎶�鏈姸鎬侀壌瀹氱鐞�',
+ disableMixinCreated: true,
ipagination: {
current: 1,
- pageSize: 5,
- pageSizeOptions: ['5', '10', '50'],
+ pageSize: 20,
+ pageSizeOptions: ['5', '10', '20', '50'],
showTotal: (total, range) => {
return range[0] + '-' + range[1] + ' 鍏�' + total + '鏉�'
},
@@ -391,11 +393,11 @@
// align: 'center',
// dataIndex: 'createBy'
// },
- // {
- // title: '鍒涘缓鏃ユ湡',
- // align: 'center',
- // dataIndex: 'createTime'
- // },
+ {
+ title: '鍒涘缓鏃ユ湡',
+ align: 'center',
+ dataIndex: 'createTime'
+ },
// {
// title: '妫�瀹氫汉',
// align: 'center',
@@ -438,6 +440,17 @@
importExcelUrl: function () {
return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
}
+ },
+ created() {
+ //浠庤矾鐢变腑鑾峰彇鏌ヨ鏉′欢
+ if (this.$route.query) {
+ this.queryParam.equipmentId = this.$route.query.equipmentId;
+ //鏌ヨ鏉′欢鎸夋椂闂村�掑簭
+ this.queryParam.sort = 'createTime';
+ this.queryParam.order = 'desc';
+ }
+ this.loadData()
+ this.initDictConfig();
},
methods: {
@@ -526,7 +539,8 @@
},
handleFinal(record) {
this.$refs.finalModal.edit(record)
- }
+ },
+
}
}
</script>
--
Gitblit v1.9.3