From 5cbba170e270e6f1c99a91e27dbb7951a27d596a Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期五, 24 十一月 2023 16:41:32 +0800
Subject: [PATCH] 故障报修验收

---
 src/views/eam/modules/inspectionProject/InspectionProjectRight.vue |   96 ++++++++++++++++++++++++++++-------------------
 1 files changed, 57 insertions(+), 39 deletions(-)

diff --git a/src/views/eam/modules/inspectionProject/InspectionProjectRight.vue b/src/views/eam/modules/inspectionProject/InspectionProjectRight.vue
index 93c9582..4a56fb1 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,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(1000px + 50%)', y: 900 }"
       >
         <!--瀛楃涓茶秴闀挎埅鍙栫渷鐣ュ彿鏄剧ず-->
         <span
@@ -244,57 +257,58 @@
           },
           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",
           dataIndex: 'detectionStandard',
         },
-        {
-          title: '鍚堟牸鑼冨洿  ',
-          align: "center",
-          dataIndex: 'acceptabilityLimit',
-        },
-        {
-          title: '鐐规鏂规硶',
-          align: "center",
-          dataIndex: 'inspectionMethod_dictText',
-        },
-        {
-          title: '鐐规宸ュ叿',
-          align: "center",
-          dataIndex: 'inspectionTool',
-        },
+        // {
+        //   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",
@@ -313,9 +327,9 @@
           scopedSlots: {
             customRender: 'action'
           },
-          width: 150,
           fixed: 'right',
         },
+        // width: 150,
       ],
       url: {
         list: '/eam/inspectionProject/list',
@@ -327,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