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/inspectionProject/InspectionProjectRight.vue | 85 +++++++++++++++++++++++++-----------------
1 files changed, 51 insertions(+), 34 deletions(-)
diff --git a/src/views/eam/modules/inspectionProject/InspectionProjectRight.vue b/src/views/eam/modules/inspectionProject/InspectionProjectRight.vue
index aa044fa..c72aba8 100644
--- a/src/views/eam/modules/inspectionProject/InspectionProjectRight.vue
+++ b/src/views/eam/modules/inspectionProject/InspectionProjectRight.vue
@@ -56,6 +56,19 @@
icon="plus"
:hidden="disabled"
>鏂板</a-button>
+ <a-upload
+ name="file"
+ :showUploadList="false"
+ :multiple="false"
+ :headers="tokenHeader"
+ :action="importExcelUrl"
+ @change="handleImportExcel"
+ >
+ <a-button
+ type="primary"
+ icon="import"
+ >瀵煎叆</a-button>
+ </a-upload>
<a-button
type="primary"
icon="download"
@@ -88,7 +101,7 @@
:loading="loading"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@change="handleTableChange"
- :scroll="{ x: 'calc(1400px + 50%)', y: 900 }"
+ :scroll="{ x: 'calc(600px + 50%)', y: 900 }"
>
<!--瀛楃涓茶秴闀挎埅鍙栫渷鐣ュ彿鏄剧ず-->
<span
@@ -271,52 +284,52 @@
align: "center",
dataIndex: 'detectionStandard',
},
- {
- title: '鍚堟牸鑼冨洿 ',
- align: "center",
- dataIndex: 'acceptabilityLimit',
- },
- {
- title: '鐐规鏂规硶',
- align: "center",
- dataIndex: 'inspectionMethod_dictText',
- },
- {
- title: '妫�楠屽�肩被鍨�',
- align: "center",
- dataIndex: 'testValueType_dictText',
- },
- {
- title: '璁￠噺鍗曚綅',
- align: 'center',
- dataIndex: 'unitId_dictText',
- },
+ // {
+ // title: '鍚堟牸鑼冨洿 ',
+ // align: "center",
+ // dataIndex: 'acceptabilityLimit',
+ // },
+ // {
+ // title: '鐐规鏂规硶',
+ // align: "center",
+ // dataIndex: 'inspectionMethod_dictText',
+ // },
+ // {
+ // title: '妫�楠屽�肩被鍨�',
+ // align: "center",
+ // dataIndex: 'testValueType_dictText',
+ // },
+ // {
+ // title: '璁￠噺鍗曚綅',
+ // align: 'center',
+ // dataIndex: 'unitId_dictText',
+ // },
// {
// title: '鐐规宸ュ叿',
// align: "center",
// dataIndex: 'inspectionTool',
// },
- {
- title: '鍒涘缓浜�',
- align: "center",
- dataIndex: 'createBy',
- },
- {
- title: '鍒涘缓鏃堕棿',
- align: "center",
- dataIndex: 'createTime',
- },
+ // {
+ // title: '鍒涘缓浜�',
+ // align: "center",
+ // dataIndex: 'createBy',
+ // },
+ // {
+ // title: '鍒涘缓鏃堕棿',
+ // align: "center",
+ // dataIndex: 'createTime',
+ // },
{
title: '鎿嶄綔',
dataIndex: 'action',
align: 'center',
+ width: 150,
scopedSlots: {
customRender: 'action'
},
- width: 150,
- fixed: 'right',
},
+ // fixed: 'right',
],
url: {
list: '/eam/inspectionProject/list',
@@ -328,7 +341,11 @@
}
},
-
+ computed: {
+ importExcelUrl: function () {
+ return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+ }
+ },
methods: {
handleAdd: function () {
this.$refs.modalForm.add({ inspectionProjectCategoryNumName: this.inspectionProjectCategoryNumName });
--
Gitblit v1.9.3