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/efficiencyShiftReport/EfficiencyShiftList.vue |   34 ++++++++++++++++++++++------------
 1 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/src/views/mdc/base/modules/efficiencyShiftReport/EfficiencyShiftList.vue b/src/views/mdc/base/modules/efficiencyShiftReport/EfficiencyShiftList.vue
index 19f2705..b3e08fb 100644
--- a/src/views/mdc/base/modules/efficiencyShiftReport/EfficiencyShiftList.vue
+++ b/src/views/mdc/base/modules/efficiencyShiftReport/EfficiencyShiftList.vue
@@ -1,6 +1,6 @@
 <template>
   <div style="width: 100%;">
-    <a-card :bordered="false">
+    <div :bordered="false">
       <!-- 鏌ヨ鍖哄煙 -->
       <div class="seach-content">
         <div class="table-page-search-wrapper">
@@ -33,7 +33,7 @@
 
           </a-row>
           <a-row :gutter="24">
-            <a-col :md="14" :sm="14" :xs="14">
+            <a-col :md="15" :sm="15" :xs="15">
               <a-checkbox-group :value="checkedList" :default-value="['lyl']" :options="efficiencyOptions"
                                 @change="efficiencyOptionsOnChange"/>
             </a-col>
@@ -49,7 +49,7 @@
           </a-row>
         </a-form>
       </div>
-        <div style="width: 400px;top: 20px; right: 0px;">
+        <div style="width: 530px;top: 0; right: 0px;">
         <table cellpadding="5" cellspacing="1" style="border: 1px solid darkgray;">
           <tr>
             <td v-for="(item, index) in identifying">{{item.title}}</td>
@@ -143,7 +143,7 @@
           </table>
         </div>
       </div>
-    </a-card>
+    </div>
   </div>
 </template>
 
@@ -370,11 +370,11 @@
         })
       },
       initShiftSubList(val) {
-        this.queryParam.shiftSubId = null;
+        //姣忔閲嶆柊閫夋嫨鐝埗鏃剁彮娆℃竻绌轰笖鏄剧ずplaceholder鍐呭
+        this.queryParam.shiftSubId = undefined;
         getAction(this.url.initShiftSubList, { shiftId: val }).then((res) => {
           if (res.success) {
             this.shiftSubList = res.result;
-
           }
         })
       },
@@ -406,6 +406,8 @@
       dateParamChange(v1, v2) {
         this.queryParam.startTime = v2[0]
         this.queryParam.endTime = v2[1]
+        // 鐐瑰嚮鏃堕棿閫夋嫨鍣ㄧ殑娓呯┖鎸夐挳鏃朵細瑙﹀彂姝ゅ垽鏂�(鐐瑰嚮閲嶇疆鎸夐挳涓嶄細瑙﹀彂)锛屽疄鐜伴噸缃垪琛ㄥ姛鑳斤紝鍒囧疄鏀瑰彉鍒楄〃鏄剧ず鏁堟灉
+        if(!this.queryParam.startTime&&!this.queryParam.endTime)this.searchReset()
       },
       efficiencyOptionsOnChange(checkedList) {
         let index = checkedList.indexOf('lyl')
@@ -420,14 +422,22 @@
         this.checkedList = checkedList
       },
       searchQuery() {
-        if(this.queryParam.typeTree == "1"){
-          this.queryParam.parentId =  this.queryParamEquip.parentId
-          this.queryParam.equipmentId = this.queryParamEquip.equipmentId
+        if(this.dates != ''){
+          if(this.queryParam.typeTree == "1"){
+            this.queryParam.parentId =  this.queryParamEquip.parentId
+            this.queryParam.equipmentId = this.queryParamEquip.equipmentId
+          }else{
+            this.queryParam.parentId = this.queryParamPeople.parentId
+            this.queryParam.equipmentId = ""
+          }
+          this.loadData()
         }else{
-          this.queryParam.parentId = this.queryParamPeople.parentId
-          this.queryParam.equipmentId = ""
+          // this.$message.warning("璇烽�夋嫨鏃堕棿")
+          this.$notification.warning({
+            message:'娑堟伅',
+            description:"璇烽�夋嫨鏃堕棿"
+          });
         }
-        this.loadData()
         // this.onClearSelected()
       },
       searchReset() {

--
Gitblit v1.9.3