From 3457909638c660c0cfcb521b6104ab64c679b914 Mon Sep 17 00:00:00 2001
From: zenglf <18502938215@163.com>
Date: 星期二, 19 九月 2023 16:23:16 +0800
Subject: [PATCH] 修改页面左右展示比例
---
src/views/eam/EquipmentList.vue | 301 ++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 279 insertions(+), 22 deletions(-)
diff --git a/src/views/eam/EquipmentList.vue b/src/views/eam/EquipmentList.vue
index c86c7a0..5b43b6e 100644
--- a/src/views/eam/EquipmentList.vue
+++ b/src/views/eam/EquipmentList.vue
@@ -4,18 +4,27 @@
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
- <a-col :span="6">
- <a-form-item label="璁惧鎵�灞炲垎绫�">
+ <a-col :span="5">
+ <a-form-item
+ label="璁惧鎵�灞炲垎绫�"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ >
<j-search-select-tag
dict="mom_eam_equipment_category,name,id"
+ placeholder="璇疯緭鍏ユ悳绱㈡潯浠跺苟閫夋嫨"
v-model="queryParam.equipmentCategoryId"
/>
</a-form-item>
</a-col>
<a-col
- :span="6"
+ :span="5"
>
- <a-form-item label="缁熶竴缂栫爜">
+ <a-form-item
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ label="缁熶竴缂栫爜"
+ >
<j-input
placeholder="璇疯緭鍏ヨ澶囩粺涓�缂栫爜鏌ヨ"
v-model="queryParam.num"
@@ -23,16 +32,195 @@
</a-form-item>
</a-col>
<a-col
- :span="6"
+ :span="5"
>
- <a-form-item label="璁惧鍚嶇О">
+ <a-form-item
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ label="璁惧鍚嶇О"
+ >
<j-input
placeholder="璇疯緭鍏ヨ澶囧悕绉版煡璇�"
v-model="queryParam.name"
></j-input>
</a-form-item>
</a-col>
+ <a-col :span="5">
+ <a-form-item
+ label="鍨嬪彿"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ >
+ <j-input
+ v-model="queryParam.model"
+ placeholder="璇疯緭鍏ュ瀷鍙�"
+ ></j-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-row>
+ <template v-if="toggleSearchStatus">
+ <a-row :gutter="24">
+ <a-col :span="6">
+ <a-form-item
+ label="浜х嚎"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ >
+ <j-dict-select-tag
+ allow-clear
+ placeholder="璇烽�夋嫨浜х嚎"
+ :triggerChange="true"
+ dictCode="mom_base_work_center,name,id,del_flag!='1'"
+ v-model="queryParam.workCenterId"
+ />
+ </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="mom_base_factory_model,name,id,del_flag!='1'"
+ v-model="queryParam.factoryModelId"
+ />
+ </a-form-item>
+ </a-col>
+ <a-col :span="6">
+ <a-form-item
+ label="缁存姢閮ㄩ棬"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ >
+ <a-tree-select
+ style="width: 100%"
+ :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
+ :tree-data="treeData"
+ placeholder="璇烽�夋嫨缁存姢閮ㄩ棬"
+ tree-default-expand-all
+ v-model="queryParam.manageId"
+ />
+ </a-form-item>
+ </a-col>
+ <a-col :span="6">
+ <a-form-item
+ label="浣跨敤閮ㄩ棬"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ >
+ <a-tree-select
+ style="width: 100%"
+ :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
+ :tree-data="treeData"
+ placeholder="璇烽�夋嫨浣跨敤閮ㄩ棬"
+ tree-default-expand-all
+ v-model="queryParam.useId"
+ />
+ </a-form-item>
+ </a-col>
+ </a-row>
+ <a-row :gutter="24">
+ <a-col :span="6">
+ <a-form-item
+ label="ABC鏍囪瘑"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ >
+ <j-dict-select-tag
+ allow-clear
+ placeholder="璇烽�夋嫨ABC鏍囪瘑"
+ :triggerChange="true"
+ dictCode="ABC-standard-result"
+ v-model="queryParam.equipmentImportanceId"
+ />
+ </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="technology_status"
+ v-model="queryParam.technologyStatus"
+ />
+ </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="equipment_status"
+ v-model="queryParam.equipmentStatus"
+ />
+ </a-form-item>
+ </a-col>
+ <a-col :span="6">
+ <a-form-item
+ label="鍏抽敭璁惧鏍囪瘑"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ >
+ <j-dict-select-tag
+ allow-clear
+ :triggerChange="true"
+ placeholder="璇烽�夋嫨鍏抽敭璁惧鏍囪瘑"
+ dictCode="specific_equipment"
+ v-model="queryParam.specificEquipment"
+ />
+ </a-form-item>
+ </a-col>
+ </a-row>
+ <a-row :gutter="24">
+ <a-col :span="6">
+ <a-form-model-item
+ label="璐ㄤ繚寮�濮嬫棩鏈�"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ >
+ <j-date style="width: 100%;" placeholder="璇烽�夋嫨寮�濮嬫棩鏈�" class="query-group-cust" v-model="queryParam.warrantyStart"></j-date>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="6">
+ <a-form-model-item
+ label="璐ㄤ繚缁撴潫鏃ユ湡"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ >
+ <j-date style="width: 100%;" placeholder="璇烽�夋嫨缁撴潫鏃ユ湡" class="query-group-cust" v-model="queryParam.warrantyEnd"></j-date>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ </template>
</a-form>
</div>
<!-- 鏌ヨ鍖哄煙-END -->
@@ -53,8 +241,9 @@
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
<a-button type="primary" icon="import" v-has="'equipmentAccount:add&delete&import&Edit'">瀵煎叆</a-button>
</a-upload>
+ <a-button :disabled="selectedRowKeys.length==0" @click="handleUpdateABC" type="primary" icon="font-colors" v-has="'equipmentAccount:add&delete&import&Edit'">ABC鏍囪瘑鍙樻洿</a-button>
+ <a-button :disabled="selectedRowKeys.length==0" @click="handleUpdateWarranty" type="primary" icon="calendar" v-has="'equipmentAccount:add&delete&import&Edit'">璐ㄤ繚鏈熷彉鏇�</a-button>
</div>
-
<!-- table鍖哄煙-begin -->
<div>
<div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
@@ -72,7 +261,7 @@
:dataSource="dataSource"
:pagination="ipagination"
:loading="loading"
- :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange, type:'radio'}"
+ :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange, type:'checkbox'}"
:customRow="clickThenSelect"
@change="handleTableChange">
@@ -206,8 +395,17 @@
<a-menu-item>
<a @click="equipmentResumeShow(record)">璁惧灞ュ巻</a>
</a-menu-item>
+ <a-menu-item v-has="'accountSons:add&edit&delete&submit'" v-if="record.processParameters==1">
+ <a @click="editProcess(record)">宸ヨ壓鍙傛暟缁存姢</a>
+ </a-menu-item>
+ <a-menu-item v-has="'accountSons:add&edit&delete&submit'" v-if="record.precisionParameters==1">
+ <a @click="editPrecision(record)">绮惧害鍙傛暟缁存姢</a>
+ </a-menu-item>
<a-menu-item v-has="'equipmentAccount:add&delete&import&Edit'">
<a @click="handleEdit(record)" >缂栬緫</a>
+ </a-menu-item>
+ <a-menu-item v-has="'equipmentAccount:add&delete&import&Edit'">
+ <a @click="handleEditSpareParts(record)" >缂栬緫澶囦欢</a>
</a-menu-item>
<a-menu-item>
<a-popconfirm
@@ -231,20 +429,34 @@
<a-tabs defaultActiveKey="1">
<a-tab-pane tab="宸ヨ壓鍙傛暟" key="1" >
<EquipmentProcessParametersList
- :mainId="equipmentProcessParametersMainId"
+ :mainId="selectedMainId"
:isOpen="isOpenProcess"
/>
</a-tab-pane>
<a-tab-pane tab="璁惧绮惧害" key="2" forceRender>
<EquipmentPrecisionParametersList
:isOpen="isOpenPrecision"
- :mainId="equipmentPrecisionParametersMainId" />
+ :mainId="selectedMainId" />
</a-tab-pane>
<a-tab-pane tab="璁惧鏂囨。" key="3" forceRender>
- <EquipmentDocumentList :mainId="equipmentDocumentMainId" />
+ <EquipmentDocumentList :mainId="selectedMainId" />
+ </a-tab-pane>
+ <a-tab-pane tab="澶囦欢" key="4" forceRender>
+ <EquipmentSpareParts :mainId="selectedMainId" />
+ </a-tab-pane>
+ <a-tab-pane tab="ABC鏍囪瘑鍙樻洿璁板綍" key="5" forceRender>
+ <equipment-update-ABC-list :mainId="selectedMainId" />
+ </a-tab-pane>
+ <a-tab-pane tab="璐ㄤ繚鏈熷彉鏇磋褰�" key="6" forceRender>
+ <equipment-update-warranty-list :mainId="selectedMainId" />
</a-tab-pane>
</a-tabs>
<equipment-modal ref="modalForm" @ok="modalFormOk"></equipment-modal>
+ <process-edit-model ref ="processEditModel"></process-edit-model>
+ <precision-edit-model ref ="precisionEditModel"></precision-edit-model>
+ <aBC-update-edit-model @ok="modalFormOk" :updateList="selectionRows" ref="updateABC"></aBC-update-edit-model>
+ <warranty-update-model :updateList="selectionRows" ref="updateWarranty"></warranty-update-model>
+ <EquipmentSparePartsModal ref="modalFormSpareParts" @ok="modalFormOk" />
</a-card>
</template>
@@ -259,9 +471,15 @@
import EquipmentPrecisionParametersList from './modules/equipmentNew/EquipmentPrecisionParametersList'
import '@/assets/less/TableExpand.less'
import EquipmentResumeDrawer from './modules/equipmentNew/EquipmentResume/EquipmentResumeDrawer'
-import JSearchSelectTag from '../../components/dict/JSearchSelectTag.vue'
-
-
+ 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 EquipmentUpdateWarrantyList from './modules/equipmentNew/EquipmentUpdateWarrantyList.vue'
+ import ABCUpdateEditModel from './modules/equipmentNew/edit/ABCUpdateEditModel.vue'
+ import WarrantyUpdateModel from './modules/equipmentNew/edit/WarrantyUpdateModel.vue'
+ import EquipmentSpareParts from './modules/equipmentNew/EquipmentSpareParts.vue'
+ import EquipmentSparePartsModal from './modules/equipmentNew/EquipmentSparePartsModal'
export default {
name: "EquipmentList",
mixins:[JeecgListMixin,mixinDevice],
@@ -271,7 +489,15 @@
EquipmentPrecisionParametersList,
EquipmentModal,
EquipmentResumeDrawer,
- JSearchSelectTag
+ JSearchSelectTag,
+ ProcessEditModel,
+ PrecisionEditModel,
+ EquipmentUpdateABCList ,
+ EquipmentUpdateWarrantyList,
+ ABCUpdateEditModel,
+ WarrantyUpdateModel,
+ EquipmentSpareParts,
+ EquipmentSparePartsModal
},
data () {
return {
@@ -494,6 +720,7 @@
active: "/eam/equipment/active",
exportXlsUrl: '/eam/equipment/exportXls',
importExcelUrl: "/eam/equipment/importExcel",
+ loadOptions: '/sys/sysDepart/loadDepartTreeOptions',
},
dictOptions:{
},
@@ -516,10 +743,21 @@
equipmentPrecisionParametersMainId: '',
isOpenPrecision:true,
isOpenProcess:true,
+ treeData: [],
+ labelCol: {
+ xs: { span: 24 },
+ sm: { span: 5 },
+ },
+ wrapperCol: {
+ xs: { span: 24 },
+ sm: { span: 16 },
+ },
+ mainId:'',
}
},
created() {
this.getSuperFieldList();
+ this.initOptions();
},
computed: {
importExcelUrl: function(){
@@ -550,16 +788,10 @@
},
onSelectChange(selectedRowKeys, selectionRows) {
if(selectedRowKeys.length==1){
- this.equipmentProcessParametersMainId = selectionRows[0]['id']
- this.equipmentDocumentMainId = selectionRows[0]['id']
- this.equipmentPrecisionParametersMainId = selectionRows[0]['id']
this.selectedMainId=selectedRowKeys[0]
this.isOpenProcess = selectionRows[0].processParameters==1;
this.isOpenPrecision = selectionRows[0].precisionParameters==1;
}else{
- this.equipmentProcessParametersMainId =''
- this.equipmentDocumentMainId = ''
- this.equipmentPrecisionParametersMainId = ''
this.selectedMainId=''
}
this.selectedRowKeys = selectedRowKeys;
@@ -647,7 +879,32 @@
fieldList.push({type:'BigDecimal',value:'coordinateNum',text:'鍧愭爣鏁伴噺',dictCode:''})
fieldList.push({type:'string',value:'projectApprovalNo',text:'绔嬮」鍗″彿',dictCode:''})
this.superFieldList = fieldList
- }
+ },
+ editProcess(record){
+ this.$refs.processEditModel.edit(record);
+ },
+ editPrecision(record){
+ this.$refs.precisionEditModel.edit(record);
+ },
+ initOptions() {
+ getAction(this.url.loadOptions).then(res => {
+ if (res.success) {
+ this.treeData = res.result
+ } else {
+ this.$message.warning(res.message)
+ }
+ })
+ },
+ handleUpdateABC(){
+ this.$refs.updateABC.add();
+ },
+ handleUpdateWarranty(){
+ this.$refs.updateWarranty.add();
+ },
+ handleEditSpareParts(record){
+ this.$refs.modalFormSpareParts.edit(record);
+ }
+
}
}
</script>
--
Gitblit v1.9.3