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/mdc/base/modules/OvertimeManagement/OvertimeManagementList.vue |   41 ++++++++++++++++++++---------------------
 1 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/src/views/mdc/base/modules/OvertimeManagement/OvertimeManagementList.vue b/src/views/mdc/base/modules/OvertimeManagement/OvertimeManagementList.vue
index dbe7ce7..e7b5e18 100644
--- a/src/views/mdc/base/modules/OvertimeManagement/OvertimeManagementList.vue
+++ b/src/views/mdc/base/modules/OvertimeManagement/OvertimeManagementList.vue
@@ -1,12 +1,12 @@
 <template>
-  <a-card :bordered="false" class="device_list">
+  <div :bordered="false" class="device_list">
     <!-- 鏌ヨ鍖哄煙 -->
     <div style="width: 100%; background-color: #fff" class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
           <a-col :md="7" :sm="7">
             <a-form-item label="鏃堕棿">
-              <a-range-picker @change="dateParamChange" v-model="dates"  format="YYYY-MM-DD HH:mm:ss" showTime/>
+              <a-range-picker @change="dateParamChange" v-model="dates"  format="YYYY-MM-DD HH:mm:ss"/>
             </a-form-item>
           </a-col>
           <a-col :md="4" :sm="4">
@@ -35,11 +35,11 @@
     <div class="table-operator" style="display: inline;">
       <a-button @click="handleAdd" type="primary" icon="plus">鏂板
       </a-button>
-      <a-button type="primary" icon="download" @click="importTemplate('鍔犵彮绠$悊妯℃澘')">瀵煎叆妯℃澘</a-button>
+      <!--<a-button type="primary" icon="download" @click="importTemplate('鍔犵彮绠$悊妯℃澘')">瀵煎叆妯℃澘</a-button>-->
       <a-button type="primary" icon="download" @click="handleExportXls('鍔犵彮绠$悊')">瀵煎嚭</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-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
+      <!--&lt;!&ndash;<a-button type="primary" icon="import">瀵煎叆</a-button>&ndash;&gt;-->
+      <!--</a-upload>-->
       <a-dropdown v-if="selectedRowKeys.length > 0">
         <a-menu slot="overlay">
           <a-menu-item key="1" @click="batchDel">
@@ -83,8 +83,7 @@
     <!--<device-repair-model-add  ref="modalFormadd" @ok="modalFormOk"></device-repair-model-add>-->
     <!--<device-repair-model-edit ref="modalFormedit" @ok="modalFormOk"></device-repair-model-edit>-->
     <!--<repair-model ref="repairModelFrom" @ok="modalFormOk"></repair-model>-->
-
-  </a-card>
+  </div>
 </template>
 
 <script>
@@ -155,7 +154,7 @@
           {
             title: '鏃ユ湡',
             align: 'center',
-            dataIndex: 'torqueDate',
+            dataIndex: 'effectiveDate',
             // scopedSlots:{customRender:'startTime'},
             // customRender:(text,row,index) => {
             //   return moment(text).format("YYYY-MM-DD HH:mm:ss")
@@ -164,27 +163,27 @@
           {
             title: '鐝寮�濮嬫椂闂�',
             align: 'center',
-            dataIndex: 'torqueValue'
+            dataIndex: 'startDate'
           },
           {
             title: '鐝缁撴潫鏃堕棿',
             align: 'center',
-            dataIndex: 'torqueValue'
+            dataIndex: 'endDate'
           },
           {
             title: '鍔犵彮寮�濮嬫椂闂�',
             align: 'center',
-            dataIndex: 'torqueValue'
+            dataIndex: 'startTime'
           },
           {
             title: '鍔犵彮缁撴潫鏃堕棿',
             align: 'center',
-            dataIndex: 'torqueValue'
+            dataIndex: 'endTime'
           },
           {
             title: '澶囨敞',
             align: 'center',
-            dataIndex: 'notes'
+            dataIndex: 'remark'
           },
           {
             title: '鎿嶄綔',
@@ -195,12 +194,12 @@
           }
         ],
         url: {
-          list: '/mdc/MdcTorqueConfig/pageList',
-          delete: '/mdc/MdcTorqueConfig/deleteMdcTorqueConfig',
-          deleteBatch: '/mdc/MdcTorqueConfig/deleteBatchMdcTorqueConfig',
+          list: '/mdc/mdcEquipmentOvertime/list',
+          delete: '/mdc/mdcEquipmentOvertime/delete',
+          deleteBatch: '/mdc/mdcEquipmentOvertime/deleteBatch',
           getEquipmentByPid: '/mdc/mdcequipment/getEquipmentByPid',
-          exportXlsUrl: "/mdc/MdcTorqueConfig/exportXls",
-          importExcelUrl: "/mdc/MdcTorqueConfig/importExcel",
+          exportXlsUrl: "/mdc/mdcEquipmentOvertime/exportXls",
+          importExcelUrl: "/mdc/mdcEquipmentOvertime/importExcel",
         }
       }
     },
@@ -569,7 +568,7 @@
             //閲嶆柊璁$畻鍒嗛〉闂
             that.reCalculatePage(1)
             // that.$message.success(res.message);
-            that.$notification.warning({
+            that.$notification.success({
               message:'娑堟伅',
               description:res.message
             });
@@ -611,7 +610,7 @@
                   //閲嶆柊璁$畻鍒嗛〉闂
                   that.reCalculatePage(that.selectedRowKeys.length)
                   // that.$message.success(res.message);
-                  that.$notification.warning({
+                  that.$notification.success({
                     message:'娑堟伅',
                     description:res.message
                   });

--
Gitblit v1.9.3