From 282c594eebda801fbb6331cb199c1958ffd68ae1 Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期一, 04 九月 2023 17:04:00 +0800
Subject: [PATCH] 设备台账修改

---
 src/views/eam/EquipmentList.vue |   41 ++++++++++++++++++++---------------------
 1 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/src/views/eam/newEquipment/EquipmentList.vue b/src/views/eam/EquipmentList.vue
similarity index 94%
rename from src/views/eam/newEquipment/EquipmentList.vue
rename to src/views/eam/EquipmentList.vue
index 7da1592..2b74ece 100644
--- a/src/views/eam/newEquipment/EquipmentList.vue
+++ b/src/views/eam/EquipmentList.vue
@@ -6,11 +6,8 @@
         <a-row :gutter="24">
           <a-col :span="6">
             <a-form-item label="璁惧鎵�灞炲垎绫�">
-              <j-dict-select-tag
-                allow-clear
-                placeholder="璇烽�夋嫨璁惧鎵�灞炲垎绫�" 
-                :triggerChange="true"
-                dictCode="mom_eam_equipment_category,name,id"
+              <j-search-select-tag
+                dict="mom_eam_equipment_category,name,id"
                 v-model="queryParam.equipmentCategoryId"
               />
             </a-form-item>
@@ -18,21 +15,21 @@
           <a-col
           :span="6"
           >
-            <a-form-item label="璁惧缂栧彿">
-              <a-input
-                placeholder="璇疯緭鍏ヨ澶囩紪鍙锋煡璇�"
+            <a-form-item label="缁熶竴缂栫爜">
+              <j-input
+                placeholder="璇疯緭鍏ヨ澶囩粺涓�缂栫爜鏌ヨ"
                 v-model="queryParam.num"
-              ></a-input>
+              ></j-input>
             </a-form-item>
           </a-col>
           <a-col
           :span="6"
           >
             <a-form-item label="璁惧鍚嶇О">
-              <a-input
+              <j-input
                 placeholder="璇疯緭鍏ヨ澶囧悕绉版煡璇�"
                 v-model="queryParam.name"
-              ></a-input>
+              ></j-input>
             </a-form-item>
           </a-col>
         </a-row>
@@ -249,13 +246,14 @@
 
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import { mixinDevice } from '@/utils/mixin'
-  import EquipmentModal from '../modules/equipmentNew/EquipmentModal'
+  import EquipmentModal from './modules/equipmentNew/EquipmentModal'
   import { getAction } from '@/api/manage'
-  import EquipmentProcessParametersList from './EquipmentProcessParametersList'
-  import EquipmentDocumentList from './EquipmentDocumentList'
-  import EquipmentPrecisionParametersList from './EquipmentPrecisionParametersList'
+  import EquipmentProcessParametersList from './modules/equipmentNew/EquipmentProcessParametersList'
+  import EquipmentDocumentList from './modules/equipmentNew/EquipmentDocumentList'
+  import EquipmentPrecisionParametersList from './modules/equipmentNew/EquipmentPrecisionParametersList'
   import '@/assets/less/TableExpand.less'
-  import EquipmentResumeDrawer from '../modules/equipment/EquipmentResume/EquipmentResumeDrawer'
+  import EquipmentResumeDrawer from './modules/equipmentNew/EquipmentResume/EquipmentResumeDrawer'
+import JSearchSelectTag from '../../components/dict/JSearchSelectTag.vue'
 
  
   export default {
@@ -266,7 +264,8 @@
       EquipmentDocumentList,
       EquipmentPrecisionParametersList,
       EquipmentModal,
-      EquipmentResumeDrawer
+      EquipmentResumeDrawer,
+        JSearchSelectTag
     },
     data () {
       return {
@@ -331,7 +330,7 @@
         {
           title: 'ABC鏍囪瘑',
           align: "center",
-          dataIndex: 'equipmentImportanceId_dictText',
+          dataIndex: 'equipmentImportanceId',
         },
         {
           title: '鍏抽敭璁惧鏍囪瘑',
@@ -453,7 +452,7 @@
         {
           title: '宸ヨ壓鍙傛暟妯℃澘',
           align: "center",
-          dataIndex: 'processParametersTemplateName',
+          dataIndex: 'processParametersTemplateId_dictText',
         },
         {
           title: '璁惧绮惧害绠＄悊',
@@ -464,7 +463,7 @@
         {
           title: '绮惧害鍙傛暟妯℃澘',
           align: "center",
-          dataIndex: 'precisionParametersTemplateName',
+          dataIndex: 'precisionParametersTemplateId_dictText',
         },
         // {
         //   title: '澶囨敞',
@@ -483,7 +482,7 @@
         },
         ],
         url: {
-          list: "/eam/equipment/list",
+          list: "/eam/equipment/getEquipmentList",
           delete: "/eam/equipment/delete",
           deleteBatch: "/eam/equipment/deleteBatch",
           active: "/eam/equipment/active",

--
Gitblit v1.9.3