From 598e5c1d72e2176cc8d280e0726ac8eef323516e Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期二, 21 十一月 2023 15:43:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/eam/modules/inspectionProject/InspectionProjectRight.vue | 56 ++++++++++++++++++++++++++++++++------------------------
1 files changed, 32 insertions(+), 24 deletions(-)
diff --git a/src/views/eam/modules/inspectionProject/InspectionProjectRight.vue b/src/views/eam/modules/inspectionProject/InspectionProjectRight.vue
index 93c9582..98c902f 100644
--- a/src/views/eam/modules/inspectionProject/InspectionProjectRight.vue
+++ b/src/views/eam/modules/inspectionProject/InspectionProjectRight.vue
@@ -10,7 +10,7 @@
@keyup.enter.native="searchQuery"
>
<a-row :gutter="24">
- <a-col
+ <!-- <a-col
:md="8"
:sm="8"
>
@@ -20,7 +20,7 @@
v-model="queryParam.num"
></j-input>
</a-form-item>
- </a-col>
+ </a-col> -->
<a-col
:md="8"
:sm="8"
@@ -56,6 +56,9 @@
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"
@@ -244,37 +247,28 @@
},
width: 50,
},
+ // {
+ // title: '椤圭洰缂栫爜',
+ // align: 'center',
+ // dataIndex: 'num',
+ // scopedSlots: {
+ // customRender: 'num'
+ // },
+ // },
{
- title: '椤圭洰缂栫爜',
- align: 'center',
- dataIndex: 'num',
- scopedSlots: {
- customRender: 'num'
- },
- },
- {
- title: '椤圭洰鍚嶇О',
+ title: '鐐规椤圭洰',
align: 'center',
dataIndex: 'name',
scopedSlots: {
customRender: 'name'
},
},
- {
- title: '璁￠噺鍗曚綅',
- align: 'center',
- dataIndex: 'unitId_dictText',
- },
+
// {
// title: '鍒嗘瀽鏂规硶',
// align: 'center',
// dataIndex: 'analysisMethod_dictText',
// },
- {
- title: '妫�楠屽�肩被鍨�',
- align: "center",
- dataIndex: 'testValueType_dictText',
- },
{
title: '妫�娴嬫爣鍑�',
align: "center",
@@ -291,10 +285,20 @@
dataIndex: 'inspectionMethod_dictText',
},
{
- title: '鐐规宸ュ叿',
+ title: '妫�楠屽�肩被鍨�',
align: "center",
- dataIndex: 'inspectionTool',
+ dataIndex: 'testValueType_dictText',
},
+ {
+ title: '璁￠噺鍗曚綅',
+ align: 'center',
+ dataIndex: 'unitId_dictText',
+ },
+ // {
+ // title: '鐐规宸ュ叿',
+ // align: "center",
+ // dataIndex: 'inspectionTool',
+ // },
{
title: '鍒涘缓浜�',
align: "center",
@@ -327,7 +331,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