From 399e6c1b3925f4241e6b1cef6ffe055b84fb53f6 Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期三, 13 十二月 2023 17:45:58 +0800
Subject: [PATCH] 修改
---
src/views/eam/EquipmentListOfAll.vue | 128 +++++++++++++++++++++++++++++-------------
1 files changed, 88 insertions(+), 40 deletions(-)
diff --git a/src/views/eam/EquipmentListOfAll.vue b/src/views/eam/EquipmentListOfAll.vue
index ff4aad0..db2fdd2 100644
--- a/src/views/eam/EquipmentListOfAll.vue
+++ b/src/views/eam/EquipmentListOfAll.vue
@@ -3,8 +3,25 @@
<!-- 鏌ヨ鍖哄煙 -->
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
+ <a-row :gutter="24" style="margin-bottom: 1%;">
+ <a-col
+ :span="24"
+ >
+ <a-form-item
+ label="缁熶竴缂栧彿缇�"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ >
+ <a-textarea
+ placeholder="璇疯緭鍏ユ墍鏈夌粺涓�缂栫爜,椤荤敤绌烘牸闅斿紑,鍚﹀垯鍙兘鏌ヨ鍑洪敊璇俊鎭�"
+ v-model="queryParam.nums"
+ :auto-size="{ minRows: 2, maxRows:2 }"
+ ></a-textarea>
+ </a-form-item>
+ </a-col>
+ </a-row>
<a-row :gutter="24">
- <a-col :span="5">
+ <a-col :span="6">
<a-form-item
label="璁惧鎵�灞炲垎绫�"
:labelCol="labelCol"
@@ -18,7 +35,7 @@
</a-form-item>
</a-col>
<a-col
- :span="5"
+ :span="6"
>
<a-form-item
:labelCol="labelCol"
@@ -32,7 +49,7 @@
</a-form-item>
</a-col>
<a-col
- :span="5"
+ :span="6"
>
<a-form-item
:labelCol="labelCol"
@@ -45,7 +62,7 @@
></a-input>
</a-form-item>
</a-col>
- <a-col :span="5">
+ <a-col :span="6">
<a-form-item
label="鍨嬪彿"
:labelCol="labelCol"
@@ -56,41 +73,25 @@
placeholder="璇疯緭鍏ュ瀷鍙�"
></a-input>
</a-form-item>
- </a-col>
- <a-col :span="4">
- <span
- style="float: left;overflow: hidden;"
- class="table-page-search-submitButtons"
- >
- <a
- @click="handleToggleSearch"
- style="margin-left: 8px"
- >
- {{ toggleSearchStatus ? '鏀惰捣' : '灞曞紑' }}
- <a-icon :type="toggleSearchStatus ? 'up' : 'down'" />
- </a>
- </span>
- </a-col>
-
+ </a-col>
</a-row>
- <template v-if="toggleSearchStatus">
<a-row :gutter="24">
<a-col :span="6">
<a-form-item
- label="浜х嚎"
+ label="宸ュ尯"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
>
<j-dict-select-tag
allow-clear
- placeholder="璇烽�夋嫨浜х嚎"
+ placeholder="璇烽�夋嫨宸ュ尯"
:triggerChange="true"
- dictCode="mom_base_work_center,name,id,del_flag!='1'"
- v-model="queryParam.workCenterId"
+ dictCode="mom_base_area,name,id,del_flag!='1'"
+ v-model="queryParam.factoryModelId"
/>
</a-form-item>
</a-col>
- <a-col :span="6">
+ <!-- <a-col :span="6">
<a-form-item
label="杞﹂棿"
:labelCol="labelCol"
@@ -104,7 +105,7 @@
v-model="queryParam.factoryModelId"
/>
</a-form-item>
- </a-col>
+ </a-col> -->
<a-col :span="6">
<a-form-item
label="缁存姢閮ㄩ棬"
@@ -134,6 +135,21 @@
placeholder="璇烽�夋嫨浣跨敤閮ㄩ棬"
tree-default-expand-all
v-model="queryParam.useId"
+ />
+ </a-form-item>
+ </a-col>
+ <a-col :span="6">
+ <a-form-item
+ label="鏄惁鐢熶骇绾胯澶�"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ >
+ <j-dict-select-tag
+ allow-clear
+ placeholder="璇烽�夋嫨"
+ :triggerChange="true"
+ dictCode="is_product"
+ v-model="queryParam.isLineEquip"
/>
</a-form-item>
</a-col>
@@ -220,7 +236,6 @@
</a-form-model-item>
</a-col>
</a-row>
- </template>
</a-form>
</div>
<!-- 鏌ヨ鍖哄煙-END -->
@@ -253,7 +268,7 @@
<a-table
ref="table"
- size="middle"
+ size="small"
bordered
rowKey="id"
:scroll="{x:true}"
@@ -447,11 +462,17 @@
<a-tab-pane tab="ABC鏍囪瘑鍙樻洿璁板綍" key="5" forceRender>
<equipment-update-ABC-list :mainId="selectedMainId" />
</a-tab-pane>
- <a-tab-pane tab="璐ㄤ繚鏈熷彉鏇磋褰�" key="6" forceRender>
+ <a-tab-pane tab="璐ㄤ繚鏈熷彉鏇�" key="6" forceRender>
<equipment-update-warranty-list :mainId="selectedMainId" />
</a-tab-pane>
- <a-tab-pane tab="淇濆吇鐐规鏍囧噯" key="7" forceRender>
- <standard-of-maintenance :mainId="selectedMainId"/>
+ <a-tab-pane tab="鏃ヤ繚鏍囧噯" key="7" forceRender>
+ <daily-maintenance-list :mainId="selectedMainId"></daily-maintenance-list>
+ </a-tab-pane>
+ <a-tab-pane tab="浜屼繚鏍囧噯" key="8" forceRender>
+ <second-maintenance-list :mainId="selectedMainId"></second-maintenance-list>
+ </a-tab-pane>
+ <a-tab-pane tab="涓変繚鏍囧噯" key="9" forceRender>
+ <third-maintenance-list :mainId="selectedMainId"></third-maintenance-list>
</a-tab-pane>
</a-tabs>
<equipment-modal ref="modalForm" @ok="modalFormOk" :caytegoryParam="caytegoryParam"></equipment-modal>
@@ -477,14 +498,17 @@
import JSearchSelectTag from '../../components/dict/JSearchSelectTag.vue'
import ProcessEditModel from './modules/equipmentNew/edit/ProcessEditModel.vue'
import PrecisionEditModel from './modules/equipmentNew/edit/PrecisionEditModel'
- import EquipmentUpdateABCList from './modules/equipmentNew/EquipmentUpdateABCList.vue'
+ import EquipmentUpdateABCList from './modules/equipmentNew/EquipmentUpdateABCList'
import EquipmentUpdateWarrantyList from './modules/equipmentNew/EquipmentUpdateWarrantyList.vue'
- import ABCUpdateEditModel from './modules/equipmentNew/edit/ABCUpdateEditModel.vue'
+ import ABCUpdateEditModel from './modules/equipmentNew/edit/ABCUpdateEditModel'
import WarrantyUpdateModel from './modules/equipmentNew/edit/WarrantyUpdateModel.vue'
- import EquipmentSpareParts from './modules/equipmentNew/EquipmentSpareParts.vue'
+ import EquipmentSpareParts from './modules/equipmentNew/EquipmentSpareParts'
import EquipmentSparePartsModal from './modules/equipmentNew/EquipmentSparePartsModal'
import StandardOfInspection from './modules/equipmentNew/StandardOfInspection.vue'
import StandardOfMaintenance from './modules/equipmentNew/StandardOfMaintenance.vue'
+ import DailyMaintenanceList from './modules/equipmentNew/DailyMaintenanceList.vue'
+ import SecondMaintenanceList from './modules/equipmentNew/SecondMaintenanceList.vue'
+ import ThirdMaintenanceList from './modules/equipmentNew/ThirdMaintenanceList.vue'
export default {
name: "EquipmentList",
mixins:[JeecgListMixin,mixinDevice],
@@ -505,6 +529,9 @@
EquipmentSparePartsModal,
StandardOfInspection,
StandardOfMaintenance,
+ DailyMaintenanceList,
+ SecondMaintenanceList,
+ ThirdMaintenanceList,
},
data () {
return {
@@ -526,6 +553,11 @@
title: '璁惧绫诲瀷',
align: "center",
dataIndex: 'equipmentCategoryId_dictText',
+ },
+ {
+ title: '鏄惁鐢熶骇绾胯澶�',
+ align: "center",
+ dataIndex: 'isLineEquip_dictText',
},
{
title: '缁熶竴缂栫爜',
@@ -577,11 +609,27 @@
align: "center",
dataIndex: 'specificEquipment_dictText',
},
- // {
- // title: '宸ュ尯',
- // align: "center",
- // dataIndex: 'equipmentUda1',
- // },
+ {
+ title: '鎶�鏈姸鎬�',
+ align: "center",
+ dataIndex: 'technologyStatus_dictText',
+ },
+ {
+ title: '鎶�鏈姸鎬侀壌瀹氱被鍨�',
+ align: "center",
+ dataIndex: 'technologyStatusVerificationType_dictText',
+ },
+
+ {
+ title: '鐢熶骇绾跨紪鍙�',
+ align: "center",
+ dataIndex: 'lineId_dictText',
+ },
+ {
+ title: '涓昏澶�?',
+ align: "center",
+ dataIndex: 'isMeta_dictText',
+ },
// {
// title: '瀹夊叏閰嶇疆',
// align: "center",
--
Gitblit v1.9.3