From 8161ab22f12d878543194d55d19c20d04104957c Mon Sep 17 00:00:00 2001
From: liuxy <lxy1605052545@163.com>
Date: Fri, 22 Jul 2022 16:31:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/sb/stat/devicefaultcae/DtlDialog.vue  | 22 +++++++++----------
 .../wms/sb/stat/deviceooestat/DtlDialog.vue   | 10 +++++++++
 .../views/wms/sb/stat/deviceooestat/index.vue | 17 +++++++++-----
 3 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/mes/qd/src/views/wms/sb/stat/devicefaultcae/DtlDialog.vue b/mes/qd/src/views/wms/sb/stat/devicefaultcae/DtlDialog.vue
index 8ecfee48..59f6f204 100644
--- a/mes/qd/src/views/wms/sb/stat/devicefaultcae/DtlDialog.vue
+++ b/mes/qd/src/views/wms/sb/stat/devicefaultcae/DtlDialog.vue
@@ -4,7 +4,7 @@
     append-to-body
     :visible.sync="dialogVisible"
     destroy-on-close
-    width="1000px"
+    width="1400px"
     @close="close"
     @open="open"
   >
@@ -46,17 +46,17 @@
         size="mini"
         @selection-change="crud.selectionChangeHandler"
       >
-        <el-table-column show-overflow-tooltip prop="create_time" label="报修时间" />
-        <el-table-column show-overflow-tooltip prop="name" label="使用部门" />
-        <el-table-column show-overflow-tooltip prop="class_name" label="故障类型" />
-        <el-table-column show-overflow-tooltip prop="process_time" label="受理时间" />
-        <el-table-column show-overflow-tooltip prop="real_start_date" label="开始维修" />
-        <el-table-column show-overflow-tooltip prop="real_end_date" label="结束维修" />
+        <el-table-column show-overflow-tooltip prop="create_time" label="报修时间" width="140px" />
+        <el-table-column show-overflow-tooltip prop="name" label="使用部门" width="140px" />
+        <el-table-column show-overflow-tooltip prop="class_name" label="故障类型" width="140px" />
+        <el-table-column show-overflow-tooltip prop="process_time" label="受理时间" width="140px" />
+        <el-table-column show-overflow-tooltip prop="real_start_date" label="开始维修" width="140px" />
+        <el-table-column show-overflow-tooltip prop="real_end_date" label="结束维修" width="140px" />
         <el-table-column show-overflow-tooltip prop="outsourceaskfor_optid" label="是否委外" :formatter="formatName" />
-        <el-table-column show-overflow-tooltip prop="confirm_time" label="生产验收" />
-        <el-table-column show-overflow-tooltip prop="audit_time" label="维修确认" />
-        <el-table-column show-overflow-tooltip prop="product_person_name" label="生产配合人" />
-        <el-table-column show-overflow-tooltip prop="update_optname" label="维修人" />
+        <el-table-column show-overflow-tooltip prop="confirm_time" label="生产验收" width="140px" />
+        <el-table-column show-overflow-tooltip prop="audit_time" label="维修确认" width="140px"  />
+        <el-table-column show-overflow-tooltip prop="product_person_name" label="生产配合人" width="140px" />
+        <el-table-column show-overflow-tooltip prop="update_optname" label="维修人" width="140px" />
       </el-table>
       <!--分页组件-->
       <pagination />
diff --git a/mes/qd/src/views/wms/sb/stat/deviceooestat/DtlDialog.vue b/mes/qd/src/views/wms/sb/stat/deviceooestat/DtlDialog.vue
index 985b2e6a..1b1b25bf 100644
--- a/mes/qd/src/views/wms/sb/stat/deviceooestat/DtlDialog.vue
+++ b/mes/qd/src/views/wms/sb/stat/deviceooestat/DtlDialog.vue
@@ -9,6 +9,16 @@
     @close="close"
     @open="open"
   >
+    <el-row :gutter="20">
+      <el-col :span="20" style="border: 1px solid white">
+        <span />
+      </el-col>
+      <el-col :span="4">
+        <span>
+          <el-button icon="el-icon-close" size="mini" type="info" @click="close">关闭</el-button>
+        </span>
+      </el-col>
+    </el-row>
     <div class="head-container">
       <el-form
         size="mini"
diff --git a/mes/qd/src/views/wms/sb/stat/deviceooestat/index.vue b/mes/qd/src/views/wms/sb/stat/deviceooestat/index.vue
index a23b2842..2c42931e 100644
--- a/mes/qd/src/views/wms/sb/stat/deviceooestat/index.vue
+++ b/mes/qd/src/views/wms/sb/stat/deviceooestat/index.vue
@@ -171,9 +171,10 @@ export default {
       })
     },
     openDtl(row) {
-      if (!this.changeTimeAge) {
-        return this.crud.notify('请选择日期', CRUD.NOTIFICATION_TYPE.INFO)
-      }
+      // if (!this.changeTimeAge) {
+      //   return this.crud.notify('请选择日期', CRUD.NOTIFICATION_TYPE.INFO)
+      // }
+      debugger
       this.openParam = {
         'dtlFrom': row,
         'time': this.changeTimeAge
@@ -182,9 +183,13 @@ export default {
     },
     changeTime(val) {
       debugger
-      this.changeTimeAge = {
-        'startTime': val[0],
-        'endTime': val[1]
+      if (val === null) {
+        this.changeTimeAge = {}
+      } else {
+        this.changeTimeAge = {
+          'startTime': val[0],
+          'endTime': val[1]
+        }
       }
       this.crud.toQuery()
     }