From 585fb0bbd4a7bc7f8f333ecba7c5fecd2ee5cbc2 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 09:46:44 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/vue_mdc_430 into develop

---
 src/views/eam/modules/repairorder/moudles/select/FaultReportRepair.vue |   31 ++++++++++++++++---------------
 1 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/views/eam/modules/repairorder/moudles/select/FaultReportRepair.vue b/src/views/eam/modules/repairorder/moudles/select/FaultReportRepair.vue
index 078e810..8c7fa97 100644
--- a/src/views/eam/modules/repairorder/moudles/select/FaultReportRepair.vue
+++ b/src/views/eam/modules/repairorder/moudles/select/FaultReportRepair.vue
@@ -22,10 +22,10 @@
                 :sm="8"
               >
                 <a-form-item label="鍗曟嵁鍙�">
-                  <j-input
+                  <a-input
                     placeholder="璇疯緭鍏ュ崟鎹彿妫�绱�"
                     v-model="queryParam.num"
-                  ></j-input>
+                  ></a-input>
                 </a-form-item>
               </a-col>
 
@@ -34,10 +34,21 @@
                 :sm="8"
               >
                 <a-form-item label="璁惧鍚嶇О">
-                  <j-input
+                  <a-input
                     placeholder="璇疯緭鍏ヨ澶囧悕绉版绱�"
                     v-model="queryParam.equipmentName"
-                  ></j-input>
+                  ></a-input>
+                </a-form-item>
+              </a-col>
+              <a-col
+                :md="6"
+                :sm="8"
+              >
+                <a-form-item label="缁熶竴缂栫爜">
+                  <a-input
+                    placeholder="璇疯緭鍏ョ粺涓�缂栫爜妫�绱�"
+                    v-model="queryParam.equipmentNum"
+                  ></a-input>
                 </a-form-item>
               </a-col>
               <a-col
@@ -96,16 +107,6 @@
 import { JeecgListMixin } from '@/mixins/JeecgListMixin'
 import JEllipsis from '@/components/jeecg/JEllipsis'//寮曞叆杩囬暱瑁佸壀
 import store from '@/store'
-import {
-  ACCESS_TOKEN,
-  USER_NAME,
-  USER_INFO,
-  USER_AUTH,
-  SYS_BUTTON_AUTH,
-  UI_CACHE_DB_DICT_DATA,
-  TENANT_ID,
-  CACHE_INCLUDED_ROUTES
-} from '@/store/mutation-types'
 
 export default {
   name: "FaultReportRepair",
@@ -207,7 +208,7 @@
           dataIndex: 'faultTime'
         },
         {
-          title: '鏄惁鍋滄満寰呬慨',
+          title: '鏄惁鍋滄満',
           align: "center",
           dataIndex: 'isStopName',
         },

--
Gitblit v1.9.3