From 24404f195670ab3eb96fa2656113ed403238c5b0 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期三, 13 三月 2024 09:15:30 +0800
Subject: [PATCH] 设备管理问题项修改

---
 src/views/eam/Daily3MaintenanceOrderList.vue |  135 ++++++++++++++++++++++++++++----------------
 1 files changed, 86 insertions(+), 49 deletions(-)

diff --git a/src/views/eam/Daily3MaintenanceOrderList.vue b/src/views/eam/Daily3MaintenanceOrderList.vue
index 0ab4543..fe515cf 100644
--- a/src/views/eam/Daily3MaintenanceOrderList.vue
+++ b/src/views/eam/Daily3MaintenanceOrderList.vue
@@ -14,10 +14,10 @@
             :md="6"
             :sm="8"
           >
-            <a-form-item label="涓夌骇宸ュ崟缂栫爜">
+            <a-form-item label="缁熶竴缂栧彿">
               <a-input
-                placeholder="璇疯緭鍏ヤ笁绾у伐鍗曠紪鐮�"
-                v-model="queryParam.num"
+                placeholder="璇疯緭鍏ョ粺涓�缂栧彿"
+                v-model="queryParam.equipmentNum"
               ></a-input>
             </a-form-item>
           </a-col>
@@ -25,22 +25,51 @@
             :md="6"
             :sm="8"
           >
-            <span
-              style="float: left;overflow: hidden;"
-              class="table-page-search-submitButtons"
-            >
-              <a-button
-                type="primary"
-                @click="searchQuery"
-                icon="search"
-              >鏌ヨ</a-button>
-              <a-button
-                type="primary"
-                @click="searchReset"
-                icon="reload"
-                style="margin-left: 8px"
-              >閲嶇疆</a-button>
-            </span>
+            <a-form-item label="淇濆吇宸ュ崟缂栫爜">
+              <a-input
+                placeholder="璇疯緭鍏ヤ繚鍏诲伐鍗曠紪鐮�"
+                v-model="queryParam.num"
+              ></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :span="6">
+            <a-form-item label="浣跨敤閮ㄩ棬">
+              <j-dict-select-tag
+                dictCode="sys_depart,depart_name,id"
+                placeholder="璇疯緭鍏ヤ娇鐢ㄩ儴闂�"
+                v-model="queryParam.useDepartId"
+              />
+            </a-form-item>
+          </a-col>
+          <a-col :span="6">
+            <a-form-item label="鐘舵��">
+              <j-dict-select-tag
+                dictCode="daily_maintenance_order_status"
+                placeholder="璇烽�夋嫨鐘舵��"
+                v-model="queryParam.status"
+              />
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row :gutter="24">
+          <a-col :span="6">
+            <a-form-item label="璐d换鐝粍">
+              <j-dict-select-tag
+                dictCode="mom_base_team,name,id,status='1' and del_flag='0'"
+                placeholder="璇烽�夋嫨璐d换鐝粍"
+                v-model="queryParam.teamId"
+              />
+            </a-form-item>
+          </a-col>
+          <a-col :span="7">
+            <a-form-item label="瀹屽伐鏃堕棿">
+              <a-range-picker
+                style="width: 100%;"
+                format="YYYY-MM-DD HH:mm:ss"
+                v-model="finishTime"
+                @change="timeChange"
+              />
+            </a-form-item>
           </a-col>
         </a-row>
       </a-form>
@@ -55,6 +84,18 @@
         icon="plus"
         v-has="'daily3MaintenanceOrder:add'"
       >鏂板</a-button>
+      <a-button
+        type="primary"
+        @click="searchQuery"
+        icon="search"
+        style="margin-left: 8px"
+      >鏌ヨ</a-button>
+      <a-button
+        type="primary"
+        @click="searchReset"
+        icon="reload"
+        style="margin-left: 8px"
+      >閲嶇疆</a-button>
       <a-button
         v-show="selectedRowKeys.length == 1 && selectionRows[0].status == '8'"
         @click="handlePrintPrecision(selectionRows[0])"
@@ -111,19 +152,7 @@
       </a-dropdown> -->
     </div>
 
-    <!-- table鍖哄煙-begin -->
     <div>
-      <!-- <div
-        class="ant-alert ant-alert-info"
-        style="margin-bottom: 16px;"
-      >
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 宸查�夋嫨 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>椤�
-        <a
-          style="margin-left: 24px"
-          @click="onClearSelected"
-        >娓呯┖</a>
-      </div> -->
-
       <a-table
         ref="table"
         size="middle"
@@ -442,6 +471,7 @@
 import Maintenance3ReceiptModal from './modules/daily3MaintenanceOrder/Maintenance3ReceiptModal.vue'
 import { getAction, postAction, requestPut } from '@/api/manage'
 import JEllipsis from "@/components/jeecg/JEllipsis";
+import moment from 'moment'
 
 export default {
   name: 'DailyMaintenanceOrderList',
@@ -464,6 +494,7 @@
     return {
       description: '涓夌骇淇濆吇宸ュ崟',
       queryParam: { maintenanceType: '3' },
+      finishTime: [],
       // 琛ㄥご
       columns: [
         {
@@ -483,6 +514,11 @@
           scopedSlots: { customRender: 'num' }
         },
         {
+          title: '缁熶竴缂栫爜',
+          align: "center",
+          dataIndex: 'equipmentNum',
+        },
+        {
           title: '鐘舵��',
           align: "center",
           dataIndex: 'statusName',
@@ -500,11 +536,7 @@
         //   dataIndex: 'assignModeName',
         //   width: 100,
         // },
-        {
-          title: '缁熶竴缂栫爜',
-          align: "center",
-          dataIndex: 'equipmentNum',
-        },
+
         {
           title: '璁惧鍚嶇О',
           align: "center",
@@ -547,12 +579,12 @@
         //   align: "center",
         //   dataIndex: 'workingHourQuota'
         // },
-        {
-          title: '璁″垝寮�濮嬫椂闂�',
-          align: "center",
-          dataIndex: 'planStartTime',
-          //width: '120px',
-        },
+        // {
+        //   title: '璁″垝寮�濮嬫椂闂�',
+        //   align: "center",
+        //   dataIndex: 'planStartTime',
+        //   //width: '120px',
+        // },
         // {
         //   title: '璁″垝缁撴潫鏃堕棿',
         //   align: "center",
@@ -560,13 +592,13 @@
         //   //width: '120px',
         // },
         {
-          title: '瀹為檯寮�濮嬫椂闂�',
+          title: '鎵ц鏃堕棿',
           align: "center",
           dataIndex: 'actualStartTime',
           //width: '120px',
         },
         {
-          title: '瀹為檯缁撴潫鏃堕棿',
+          title: '瀹屽伐鏃堕棿',
           align: "center",
           dataIndex: 'actualEndTime',
           //width: '120px',
@@ -576,11 +608,11 @@
         //   align: "center",
         //   dataIndex: 'actualWorkingHourQuota',
         // },
-        {
-          title: '鎶ュ伐浜�',
-          align: "center",
-          dataIndex: 'maintenanceUserId'
-        },
+        // {
+        //   title: '鎶ュ伐浜�',
+        //   align: "center",
+        //   dataIndex: 'maintenanceUserId'
+        // },
         {
           title: '闂鍙婄浉搴斿鐞嗘帾鏂芥弿杩�',
           align: "center",
@@ -809,6 +841,7 @@
     searchReset() {
       this.queryParam = { maintenanceType: '3' }
       this.loadData(1);
+      this.finishTime = []
     },
     // modalFormOk() {
     //   alert(0)
@@ -817,6 +850,10 @@
     //   //娓呯┖鍒楄〃閫変腑
     //   this.onClearSelected()
     // },
+    timeChange() {
+      this.queryParam.finishStartTime = moment(this.finishTime[0]).format("YYYY-MM-DD HH:mm:ss")
+      this.queryParam.finishEndTime = moment(this.finishTime[1]).format("YYYY-MM-DD HH:mm:ss")
+    },
 
     //棰勮棰滆壊
     tableRowClass(record, index) {

--
Gitblit v1.9.3