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/modules/dailyInspectionStandard/DailyInspectionStandardDetail.vue | 66 +++++++++++++++++++-------------
1 files changed, 39 insertions(+), 27 deletions(-)
diff --git a/src/views/eam/modules/dailyInspectionStandard/DailyInspectionStandardDetail.vue b/src/views/eam/modules/dailyInspectionStandard/DailyInspectionStandardDetail.vue
index ccdcd82..d6065e7 100644
--- a/src/views/eam/modules/dailyInspectionStandard/DailyInspectionStandardDetail.vue
+++ b/src/views/eam/modules/dailyInspectionStandard/DailyInspectionStandardDetail.vue
@@ -104,17 +104,17 @@
return parseInt(index) + 1;
}
},
- {
- title: '閮ㄤ綅',
- align: "center",
- dataIndex: 'location',
- },
- {
- title: '绀烘剰鍥�',
- align: "center",
- dataIndex: 'photo',
- scopedSlots: { customRender: 'photo' },
- },
+ // {
+ // title: '閮ㄤ綅',
+ // align: "center",
+ // dataIndex: 'location',
+ // },
+ // {
+ // title: '绀烘剰鍥�',
+ // align: "center",
+ // dataIndex: 'photo',
+ // scopedSlots: { customRender: 'photo' },
+ // },
{
title: '鐐规椤圭洰',
align: "center",
@@ -122,28 +122,28 @@
},
{
- title: '妫�娴嬫爣鍑�',
+ title: '瀹屾垚鏁版嵁/瑕佹眰',
align: "center",
dataIndex: 'detectionStandard',
},
- {
- title: '鍚堟牸鑼冨洿',
- align: "center",
- dataIndex: 'acceptabilityLimit',
+ // {
+ // title: '鍚堟牸鑼冨洿',
+ // align: "center",
+ // dataIndex: 'acceptabilityLimit',
- },
- {
- title: '鏂规硶',
- align: "center",
- dataIndex: 'inspectionMethodName',
+ // },
+ // {
+ // title: '鏂规硶',
+ // align: "center",
+ // dataIndex: 'inspectionMethodName',
- },
- {
- title: '宸ュ叿',
- align: "center",
- dataIndex: 'inspectionTool',
- },
+ // },
+ // {
+ // title: '宸ュ叿',
+ // align: "center",
+ // dataIndex: 'inspectionTool',
+ // },
{
title: '鍛ㄦ湡',
align: "center",
@@ -154,6 +154,18 @@
url: {
list: "/eam/inspectionStandardDetail/getInspectionStandardList",//鏁版嵁鏉ユ簮mom_eam_daily_inspection_standard_detail
},
+ /* 鍒嗛〉鍙傛暟 */
+ ipagination: {
+ current: 1,
+ pageSize: 20,
+ pageSizeOptions: ['5', '10', '20', '50'],
+ showTotal: (total, range) => {
+ return range[0] + '-' + range[1] + ' 鍏�' + total + '鏉�'
+ },
+ showQuickJumper: true,
+ showSizeChanger: true,
+ total: 0
+ },
}
},
created() {
--
Gitblit v1.9.3