From 2de735967d33dba5da5fc87191dee543b000afaf Mon Sep 17 00:00:00 2001 From: lyh <925863403@qq.com> Date: 星期五, 18 七月 2025 20:20:18 +0800 Subject: [PATCH] 删除 --- src/views/eam/equipment/EamEquipmentLedger.vue | 142 +++++++++++++++++------------------------------ 1 files changed, 51 insertions(+), 91 deletions(-) diff --git a/src/views/eam/equipment/EamEquipmentLedger.vue b/src/views/eam/equipment/EamEquipmentLedger.vue index 13250c3..8ce27e9 100644 --- a/src/views/eam/equipment/EamEquipmentLedger.vue +++ b/src/views/eam/equipment/EamEquipmentLedger.vue @@ -40,7 +40,8 @@ <a-col :xl="6" :lg="7" :md="8" :sm="24"> <a-form-item label="缁翠慨鐝粍"> <a-tree-select v-model="queryParam.repairDepartOrgCode" style="width: 100%" - :tree-data="repairDepartTreeData" + show-search :tree-data="repairDepartTreeData" treeNodeFilterProp="title" + :replaceFields="{key:'orgCode',value:'orgCode'}" searchPlaceholder="璇疯緭鍏ュ叧閿瓧鎼滅储" :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }" placeholder="璇烽�夋嫨缁翠慨鐝粍" allow-clear tree-default-expand-all> </a-tree-select> @@ -91,27 +92,17 @@ style="font-weight: 600">{{ selectedRowKeys.length }}</a>椤� <a style="margin-left: 24px" @click="onSelectChange([])">娓呯┖</a> </div> - <a-table - ref="table" - size="middle" - bordered - rowKey="id" - :columns="columns" - :dataSource="dataSource" - :pagination="ipagination" - :loading="loading" - :scroll="{ x: 'max-content' }" - :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" - @change="handleTableChange" - > + <a-table ref="table" size="middle" bordered rowKey="id" :columns="columns" :dataSource="dataSource" + :pagination="ipagination" :loading="loading" :scroll="{ x: 'max-content' }" + :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" @change="handleTableChange"> <!--缁熶竴缂栫爜--> - <template slot="equipmentCode" slot-scope="text"> + <template slot="equipmentCode" slot-scope="text,record"> <a href="#" @click="handleDetail(record)" style="display: inline-block;height: 100%">{{text}}</a> </template> <!--浣跨敤閮ㄩ棬--> <template slot="factoryOrgCode" slot-scope="text,record"> - {{[record.gsfactoryOrgCode_dictText,record.zxfactoryOrgCode_dictText,record.gqfactoryOrgCode_dictText,record.factoryOrgCode_dictText].filter(item=>item).join('/')}} + {{[record.zxfactoryOrgCode_dictText,record.gqfactoryOrgCode_dictText,record.factoryOrgCode_dictText].filter(item=>item).join('/')}} </template> <!--瀹夎浣嶇疆--> @@ -121,7 +112,17 @@ <!--鎿嶄綔绯荤粺--> <template slot="operationSystem" slot-scope="text"> - <a-switch checked-children="鏄�" un-checked-children="鍚�" :checked="+text" disabled/> + <a-switch checked-children="鏄�" un-checked-children="鍚�" :checked="Boolean(+text)" disabled/> + </template> + + <!--鐏伀鍣�--> + <template slot="fireExtinguisher" slot-scope="text"> + <a-switch checked-children="鏄�" un-checked-children="鍚�" :checked="Boolean(+text)" disabled/> + </template> + + <!--鐪熺┖鐑鐞嗙倝--> + <template slot="trueHeatTreatment" slot-scope="text"> + <a-switch checked-children="鏄�" un-checked-children="鍚�" :checked="Boolean(+text)" disabled/> </template> <!--璧勪骇鍒堕�犲晢--> @@ -133,6 +134,7 @@ <a @click.stop="handleEdit(record)">缂栬緫</a> <a-divider type="vertical"/> + <a-dropdown> <a class="ant-dropdown-link">鏇村 <a-icon type="down"/></a> <a-menu slot="overlay"> @@ -154,36 +156,9 @@ </a-table> </div> <!-- table鍖哄煙-end --> - - <!--<a-tabs v-model="activeTabKey" @change="handleTabChange">--> - <!--<a-tab-pane tab="璁惧鏂囨。" :key="1">--> - <!--<eam-equipment-attachment-list ref="tabPaneTableListRef1"/>--> - <!--</a-tab-pane>--> - <!--<a-tab-pane tab="鐐规宸ュ崟" :key="2">--> - <!--<eam-inspection-order-list ref="tabPaneTableListRef2" :isDisplayOperation="false"/>--> - <!--</a-tab-pane>--> - <!--<a-tab-pane tab="浜屼繚宸ュ崟" :key="3">--> - <!--<eam-second-maintenance-order-list ref="tabPaneTableListRef3" :isDisplayOperation="false"/>--> - <!--</a-tab-pane>--> - <!--<a-tab-pane tab="涓変繚宸ュ崟" :key="4">--> - <!--<eam-third-maintenance-order-list ref="tabPaneTableListRef4" :isDisplayOperation="false"/>--> - <!--</a-tab-pane>--> - <!--<a-tab-pane tab="缁翠慨宸ュ崟" :key="5">--> - <!--<eam-repair-order-list ref="tabPaneTableListRef5" :isDisplayOperation="false"/>--> - <!--</a-tab-pane>--> - <!--<a-tab-pane tab="淇濆吇鏍囧噯" :key="6">--> - <!--<eam-maintenance-standard-list ref="tabPaneTableListRef6" :isDisplayOperation="false"/>--> - <!--</a-tab-pane>--> - <!--<a-tab-pane tab="宸ヨ壓鍙傛暟" :key="7" v-if="isOpenProcess">--> - <!--<eam-equipment-process-list ref="tabPaneTableListRef7" :isDisplayOperation="false"/>--> - <!--</a-tab-pane>--> - <!--<a-tab-pane tab="璁惧绮惧害" :key="8" v-if="isOpenPrecision">--> - <!--<eam-equipment-precision-list ref="tabPaneTableListRef8" :isDisplayOperation="false"/>--> - <!--</a-tab-pane>--> - <!--</a-tabs>--> - <!-- 琛ㄥ崟鍖哄煙 --> - <eamEquipment-modal ref="modalForm" @ok="modalFormOk" :productionTreeData="productionTreeData"/> + <eamEquipment-modal ref="modalForm" @ok="modalFormOk" :productionTreeData="productionTreeData" + :repairDepartTreeData="repairDepartTreeData"/> <!--灞ュ巻寮圭獥--> <resume-drawer ref="resumeDrawerRef" :currentTableRowRecord="currentTableRowRecord"/> </a-card> @@ -193,31 +168,14 @@ import EamEquipmentModal from './modules/EamEquipmentModal.vue' import { JeecgListMixin } from '@/mixins/JeecgListMixin' import { getAction, templateXlsDownload } from '@api/manage' - import { getSystemConfigValue } from '@api/api' import ResumeDrawer from '@views/eam/equipment/modules/ResumeDrawer.vue' - import EamMaintenanceStandardList from '@views/eam/base/EamMaintenanceStandardList.vue' - import EamRepairOrderList from '../repair/EamRepairOrderList' - import EamInspectionOrderList from '../maintenance/EamInspectionOrderList' - import EamEquipmentAttachmentList from '@views/eam/equipment/EamEquipmentAttachmentList.vue' - import EamEquipmentProcessList from '@views/eam/equipment/modules/EamEquipmentProcessList.vue' - import EamEquipmentPrecisionList from '@views/eam/equipment/modules/EamEquipmentPrecisionList.vue' - import EamSecondMaintenanceOrderList from '@views/eam/maintenance/EamSecondMaintenanceOrderList.vue' - import EamThirdMaintenanceOrderList from '@views/eam/maintenance/EamThirdMaintenanceOrderList.vue' export default { name: 'EquipmentLedger', mixins: [JeecgListMixin], components: { - EamInspectionOrderList, - EamRepairOrderList, - EamMaintenanceStandardList, ResumeDrawer, - EamEquipmentModal, - EamEquipmentAttachmentList, - EamEquipmentProcessList, - EamEquipmentPrecisionList, - EamSecondMaintenanceOrderList, - EamThirdMaintenanceOrderList + EamEquipmentModal }, data() { return { @@ -246,20 +204,22 @@ align: 'center', dataIndex: 'equipmentCode', scopedSlots: { customRender: 'equipmentCode' }, - ellipsis: true, - fixed: 'left', - sorter: true + fixed: 'left' }, { title: '璁惧鍚嶇О', align: 'center', dataIndex: 'equipmentName', - ellipsis: true, + fixed: 'left' + }, + { + title: '鍨嬪彿', + align: 'center', + dataIndex: 'equipmentModel', fixed: 'left' }, { title: '浣跨敤閮ㄩ棬', - align: 'center', dataIndex: 'factoryOrgCode', scopedSlots: { customRender: 'factoryOrgCode' } }, @@ -291,7 +251,7 @@ { title: '缁翠慨鐝粍', align: 'center', - dataIndex: 'repairDepartOrgCode' + dataIndex: 'repairDepartOrgCode_dictText' }, { title: '瀹夊叏閰嶇疆', @@ -301,12 +261,13 @@ { title: '鍐峰嵈绯荤粺', align: 'center', - dataIndex: 'coolSystem' + dataIndex: 'coolSystem_dictText' }, { title: '鐏伀鍣�', align: 'center', - dataIndex: 'fireExtinguisher' + dataIndex: 'fireExtinguisher', + scopedSlots: { customRender: 'fireExtinguisher' } }, { title: '鐏伀鍣ㄦ湁鏁堟湡', @@ -325,6 +286,12 @@ dataIndex: 'system' }, { + title: '鐪熺┖鐑鐞嗙倝', + align: 'center', + dataIndex: 'trueHeatTreatment', + scopedSlots: { customRender: 'trueHeatTreatment' } + }, + { title: '璁惧绔彛', align: 'center', dataIndex: 'equipmentPort' @@ -337,7 +304,7 @@ { title: '閲嶉噺', align: 'center', - dataIndex: 'weightUnit' + dataIndex: 'equipmentWeight' }, { title: '閲嶉噺璁¢噺鍗曚綅', @@ -384,18 +351,12 @@ title: '璧勪骇鍒堕�犲晢', align: 'center', dataIndex: 'manufacturingEnterprise', - scopedSlots: { customRender: 'manufacturingEnterprise' }, - ellipsis: true + scopedSlots: { customRender: 'manufacturingEnterprise' } }, { title: '璧勪骇鏉ユ簮鍥藉', align: 'center', dataIndex: 'originCountry' - }, - { - title: '鍨嬪彿', - align: 'center', - dataIndex: 'equipmentModel' }, { title: '璁惧瑙勬牸', @@ -433,7 +394,7 @@ dataIndex: 'nextThirdMaintenance' }, { - title: '涓変繚鍛ㄦ湡', + title: '涓変繚鍛ㄦ湡锛堝勾锛�', align: 'center', dataIndex: 'thirdMaintenancePeriod' }, @@ -448,7 +409,7 @@ dataIndex: 'nextTechnologyCheck' }, { - title: '鎶�鏈壌瀹氬懆鏈�', + title: '鎶�鏈壌瀹氬懆鏈燂紙骞达級', align: 'center', dataIndex: 'technologyCheckPeriod' }, @@ -468,7 +429,8 @@ exportXlsUrl: 'eam/equipment/exportXls', importExcelUrl: 'eam/equipment/importExcel', getProductionTreeList: '/eam/BaseFactory/queryTreeList', - templateXlsDownloadUrl: '瀵煎叆妯℃澘/璁惧鍙拌处瀵煎叆妯℃澘_v1.1.xlsx' + repairDepartTreeList: '/eam/eamBaseRepairDepart/queryTreeList', + templateXlsDownloadUrl: '瀵煎叆妯℃澘/璁惧鍙拌处瀵煎叆妯℃澘.xls' }, currentTableRowRecord: {}, productionTreeData: [], @@ -482,6 +444,7 @@ }, created() { this.getProductionTreeDataByApi() + this.getRepairDepartTreeDataByApi() }, methods: { // 鑾峰彇浣跨敤閮ㄩ棬鏍� @@ -499,12 +462,12 @@ }) }, - // 鑾峰彇浣跨敤閮ㄩ棬鏍� - getProductionTreeDataByApi() { - getAction(this.url.getProductionTreeList) + // 鑾峰彇缁翠慨鐝粍鏍� + getRepairDepartTreeDataByApi() { + getAction(this.url.repairDepartTreeList) .then(res => { if (res.success) { - this.productionTreeData = res.result + this.repairDepartTreeData = res.result } else { this.$notification.warning({ message: '娑堟伅', @@ -531,7 +494,4 @@ } } } -</script> -<style scoped> - @import '~@assets/less/common.less'; -</style> \ No newline at end of file +</script> \ No newline at end of file -- Gitblit v1.9.3