src/api/signage.js
@@ -1,6 +1,7 @@ import { getAction, deleteAction, putAction, postAction, httpAction } from '@/api/manage' export default { /* MDC */ // è·åææè½¦é´ä¿¡æ¯ getAllWorkShop: id => getAction('/mdc/home/getAllWorkShop', {}), // æ ¹æ®ç¨æ·IDè·åç¨æ·ä¿¡æ¯ @@ -15,4 +16,14 @@ getEquipmentOEEStatistics: productionId => getAction('/mdc/home/equipmentOEEStatistics', { productionId }), // 设å¤OEEåå©ç¨çå¯¹æ¯ getEquipmentMonthStatisticsApi: productionId => getAction('/mdc/home/equipmentMonthStatistics', { productionId }), /* EAM */ // ææ¯ç¶æ getEquipmentTechnologyStatusApi: () => getAction('/equipment/home/getEquipmentTechnologyStatusList'), // æ éæ¥ä¿® getReportRepairEquipmentApi: () => getAction('/equipment/home/getReportRepairEquipmentList'), // ä¸ä¿è®¡å getThirdMaintenancePlanApi: () => getAction('/equipment/home/getThirdGuaranteesPlan'), // äºä¿è®¡å getSecondMaintenancePlanApi: () => getAction('/equipment/home/getSecondGuaranteesPlan') } src/views/dashboard/Analysis.vue
@@ -3,10 +3,9 @@ :userType="userType" :productionCode="productionCode" :workshopSectionProductionCode="workshopSectionProductionCode" v-if="[1,2,3,4].includes(userType)" > v-if="userType&&userType!==0"> </Component> <div v-else> <!-- ä¸ç»ä»¶æ¸²æäºæ¥ --> <div v-else-if="userType===0"> <!-- ä¸ç»ä»¶æ¸²æäºæ¥ --> <img src="@/assets/index.png" style="width: 100%;height: 785px"> </div> </template> @@ -15,12 +14,14 @@ import signageApi from '@/api/signage' import MdcManagerSignage from './mdcIndex/MdcManagerSignage.vue' import DncManagerSignage from './dncIndex/DncManagerSignage.vue' import EamManagerSignage from './eamIndex/EamManagerSignage.vue' export default { name: "Analysis", name: 'Analysis', components: { MdcManagerSignage, DncManagerSignage DncManagerSignage, EamManagerSignage }, data() { return { @@ -28,7 +29,7 @@ productionCode: '', branchFactoryProductionCode: '', workshopSectionProductionCode: '', userType: '', userType: '' } }, created() { @@ -61,10 +62,10 @@ //dnc this.currentSignage = 'DncManagerSignage' break // case 4: // //设å¤ç®¡ç // this.currentSignage = 'IndexSignage' // break case 4: //设å¤ç®¡ç this.currentSignage = 'EamManagerSignage' break default: this.currentSignage = '' break @@ -83,14 +84,14 @@ </script> <style lang="less" scoped> /deep/ .back-nav { width: 100px; height: 30px; color: #fff; position: absolute; top: 15px; left: 10px; cursor: pointer; z-index: 9999 } /deep/ .back-nav { width: 100px; height: 30px; color: #fff; position: absolute; top: 15px; left: 10px; cursor: pointer; z-index: 9999 } </style> src/views/dashboard/TodoList.vue
@@ -1,24 +1,12 @@ <template> <div> <a-spin :spinning="loading"> <div class="todo-container"> <el-dropdown v-for="(item, index) in todoList" :key="index" class="todo-item" @click.native="handelDetail(item)" > <span class="todo-title" >{{ item.description }}</span> <!-- <el-dropdown-menu slot="dropdown">--> <!-- <el-dropdown-item @click.native="handelDetail(item)">æ§è¡/审æ¹</el-dropdown-item>--> <!-- </el-dropdown-menu>--> <div class="todo-info"> <div class="todo-node">{{ item.name }}</div> <div class="todo-time">{{ item.createTime }}</div> </div> </el-dropdown> </div> </a-spin> <a-list :dataSource="todoList" :loading="loading" class="list-container"> <a-list-item slot="renderItem" slot-scope="item,index" style="cursor: pointer" @click.native="handelDetail(item)"> <a-list-item-meta :description="item.description"> <span slot="title" style="font-weight: bold">{{item.category_dictText}}</span> </a-list-item-meta> <div style="text-align: right">{{item.name}}<br/>{{item.createTime}}</div> </a-list-item> <AssignFileStreamHandle ref='modalFormApproval' @@ -136,507 +124,448 @@ :selectShenpiData='selectEquipmentSealUpData' @searchReset='searchReset' ></AssignEquipmentFileStreamHandle> </div> </a-list> </template> <script> import { JeecgListMixin } from '@/mixins/JeecgListMixin' import { mixinDevice } from '@/utils/mixin' import lossBoundHandle from '@views/flowable/workflow/lossBound/lossBoundHandle.vue' import stocktakingBoundHandle from '@views/flowable/workflow/stocktakingBound/stocktakingBoundHandle.vue' import AssignFileStreamHandle from '@views/flowable/workflow/assignFileStream/AssignFileStreamHandle.vue' import DispatchFileHandle from '@views/flowable/workflow/dispatchFile/DispatchFileHandle.vue' import DispatchFileBachHandleStyle from '@views/flowable/workflow/dispatchFile/DispatchFileBachHandleStyle#Drawer.vue' import WeekMaintenanceBatchApprovalModal from '@views/flowable/workflow/weekMaintenance/WeekMaintenanceBatchApprovalModal.vue' import InspectionOrderBatchHandle from '@views/flowable/workflow/InspectionOrder/InspectionOrderBatchHandle.vue' import JDictSelectTag from '@comp/dict/JDictSelectTag.vue' import WeekMaintenanceApprovalModal from '@views/flowable/workflow/weekMaintenance/WeekMaintenanceApprovalModal.vue' import RepairOrderApprovalModal from '@views/flowable/workflow/repairOrder/RepairOrderApprovalModal.vue' import InspectionOrderHandle from '@views/flowable/workflow/InspectionOrder/InspectionOrderHandle.vue' import EquipmentLeanOutApprovalModal from '@views/flowable/workflow/leanOut/EquipmentLeanOutApprovalModal.vue' import EquipmentReturnApprovalModal from '@views/flowable/workflow/leanOut/EquipmentReturnApprovalModal.vue' import SecondMaintenanceApprovalModal from '@views/flowable/workflow/secondMaintenance/SecondMaintenanceApprovalModal.vue' import ThirdMaintenanceApprovalModal from '@views/flowable/workflow/thirdMaintenance/ThirdMaintenanceApprovalModal.vue' import OutBoundOrderHandle from '@views/flowable/workflow/outBoundOrder/OutBoundOrderHandle.vue' import EquipmentSealUpApprovalModal from '@views/flowable/workflow/sealUp/EquipmentSealUpApprovalModal.vue' import InboundOrderHandle from '@views/flowable/workflow/inboundOrder/InboundOrderHandle.vue' import EquipmentTransferApprovalModal from '@views/flowable/workflow/transfer/EquipmentTransferApprovalModal.vue' import EquipmentScrapApprovalModal from '@views/flowable/workflow/scrap/EquipmentScrapApprovalModal.vue' import SparePartApplyHandle from '@views/flowable/workflow/sparePartApply/SparePartApplyHandle.vue' import StandardizedProcessHandle from '@views/flowable/workflow/standardizedProcess/StandardizedProcessHandle.vue' import GuideCardBatchHandle from '@views/flowable/workflow/guideCardBatch/GuideCardBatchHandle.vue' import AssignEquipmentFileStreamHandle from '@views/flowable/workflow/assignEquipmentFileStream/AssignEquipmentFileStreamHandle.vue' import { getAction } from '@api/manage' import { JeecgListMixin } from '@/mixins/JeecgListMixin' import { mixinDevice } from '@/utils/mixin' import lossBoundHandle from '@views/flowable/workflow/lossBound/lossBoundHandle.vue' import stocktakingBoundHandle from '@views/flowable/workflow/stocktakingBound/stocktakingBoundHandle.vue' import AssignFileStreamHandle from '@views/flowable/workflow/assignFileStream/AssignFileStreamHandle.vue' import DispatchFileHandle from '@views/flowable/workflow/dispatchFile/DispatchFileHandle.vue' import DispatchFileBachHandleStyle from '@views/flowable/workflow/dispatchFile/DispatchFileBachHandleStyle#Drawer.vue' import WeekMaintenanceBatchApprovalModal from '@views/flowable/workflow/weekMaintenance/WeekMaintenanceBatchApprovalModal.vue' import InspectionOrderBatchHandle from '@views/flowable/workflow/InspectionOrder/InspectionOrderBatchHandle.vue' import JDictSelectTag from '@comp/dict/JDictSelectTag.vue' import WeekMaintenanceApprovalModal from '@views/flowable/workflow/weekMaintenance/WeekMaintenanceApprovalModal.vue' import RepairOrderApprovalModal from '@views/flowable/workflow/repairOrder/RepairOrderApprovalModal.vue' import InspectionOrderHandle from '@views/flowable/workflow/InspectionOrder/InspectionOrderHandle.vue' import EquipmentLeanOutApprovalModal from '@views/flowable/workflow/leanOut/EquipmentLeanOutApprovalModal.vue' import EquipmentReturnApprovalModal from '@views/flowable/workflow/leanOut/EquipmentReturnApprovalModal.vue' import SecondMaintenanceApprovalModal from '@views/flowable/workflow/secondMaintenance/SecondMaintenanceApprovalModal.vue' import ThirdMaintenanceApprovalModal from '@views/flowable/workflow/thirdMaintenance/ThirdMaintenanceApprovalModal.vue' import OutBoundOrderHandle from '@views/flowable/workflow/outBoundOrder/OutBoundOrderHandle.vue' import EquipmentSealUpApprovalModal from '@views/flowable/workflow/sealUp/EquipmentSealUpApprovalModal.vue' import InboundOrderHandle from '@views/flowable/workflow/inboundOrder/InboundOrderHandle.vue' import EquipmentTransferApprovalModal from '@views/flowable/workflow/transfer/EquipmentTransferApprovalModal.vue' import EquipmentScrapApprovalModal from '@views/flowable/workflow/scrap/EquipmentScrapApprovalModal.vue' import SparePartApplyHandle from '@views/flowable/workflow/sparePartApply/SparePartApplyHandle.vue' import StandardizedProcessHandle from '@views/flowable/workflow/standardizedProcess/StandardizedProcessHandle.vue' import GuideCardBatchHandle from '@views/flowable/workflow/guideCardBatch/GuideCardBatchHandle.vue' import AssignEquipmentFileStreamHandle from '@views/flowable/workflow/assignEquipmentFileStream/AssignEquipmentFileStreamHandle.vue' import { getAction } from '@api/manage' export default { name: "TodoList", mixins: [JeecgListMixin, mixinDevice], components: { lossBoundHandle, stocktakingBoundHandle, AssignFileStreamHandle, DispatchFileHandle, DispatchFileBachHandleStyle, WeekMaintenanceBatchApprovalModal, InspectionOrderBatchHandle, JDictSelectTag, WeekMaintenanceApprovalModal, RepairOrderApprovalModal, InspectionOrderHandle, EquipmentLeanOutApprovalModal, EquipmentReturnApprovalModal, SecondMaintenanceApprovalModal, ThirdMaintenanceApprovalModal, OutBoundOrderHandle, EquipmentSealUpApprovalModal, InboundOrderHandle, EquipmentTransferApprovalModal, EquipmentScrapApprovalModal, SparePartApplyHandle, StandardizedProcessHandle, GuideCardBatchHandle, AssignEquipmentFileStreamHandle }, props: { // æ·»å é»è®¤åç±»å±æ§ defaultCategories: { type: Array, default: () => [] } }, data() { return { todoList: [], url: { list: '/assign/flow/toTaskBySelf', isSameNode: '/assign/flow/isSameNode' export default { name: 'TodoList', mixins: [JeecgListMixin, mixinDevice], components: { lossBoundHandle, stocktakingBoundHandle, AssignFileStreamHandle, DispatchFileHandle, DispatchFileBachHandleStyle, WeekMaintenanceBatchApprovalModal, InspectionOrderBatchHandle, JDictSelectTag, WeekMaintenanceApprovalModal, RepairOrderApprovalModal, InspectionOrderHandle, EquipmentLeanOutApprovalModal, EquipmentReturnApprovalModal, SecondMaintenanceApprovalModal, ThirdMaintenanceApprovalModal, OutBoundOrderHandle, EquipmentSealUpApprovalModal, InboundOrderHandle, EquipmentTransferApprovalModal, EquipmentScrapApprovalModal, SparePartApplyHandle, StandardizedProcessHandle, GuideCardBatchHandle, AssignEquipmentFileStreamHandle }, props: { // æ·»å é»è®¤åç±»å±æ§ defaultCategories: { type: Array, default: () => [] } }, data() { return { todoList: [], url: { list: '/assign/flow/toTaskBySelf', isSameNode: '/assign/flow/isSameNode' }, dictOptions: {}, selectShenpiData: {}, selectDispatchFileXqData: {}, selectInspectionOrderData: {}, selectWeekMaintenanceData: {}, selectSecondMaintenanceData: {}, selectThirdMaintenanceData: {}, selectBachData: {}, selectRepairOrderData: {}, selectOutBoundOrderData: {}, selectLossBoundOrderData: {}, selectStocktakingBoundOrderData: {}, selectInboundOrderData: {}, selectSparePartApplyData: {}, selectGuideCardData: {}, selectEquipmentAssignProductData: {}, selectEquipmentSealUpData: {}, //ä¸å¡ä¿¡æ¯ID dataId: undefined, loading: false, disableMixinCreated: true } }, computed: { importExcelUrl: function() { return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}` }, dictOptions: {}, selectShenpiData: {}, selectDispatchFileXqData: {}, selectInspectionOrderData: {}, selectWeekMaintenanceData: {}, selectSecondMaintenanceData: {}, selectThirdMaintenanceData: {}, selectBachData: {}, selectRepairOrderData: {}, selectOutBoundOrderData: {}, selectLossBoundOrderData: {}, selectStocktakingBoundOrderData: {}, selectInboundOrderData: {}, selectSparePartApplyData: {}, selectGuideCardData: {}, selectEquipmentAssignProductData: {}, selectEquipmentSealUpData: {}, //ä¸å¡ä¿¡æ¯ID dataId: undefined, loading: false, disableMixinCreated: true }; }, computed: { importExcelUrl: function () { return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}` getTableColumnsTotalWidth() { return this.columns.reduce((total, item) => total + item.width, 0) } }, getTableColumnsTotalWidth() { return this.columns.reduce((total, item) => total + item.width, 0) } }, methods: { loadData(arg) { this.todoList = [] if (!this.url.list) { this.$message.error('请设置url.list屿§!') return } //å è½½æ°æ® è¥ä¼ å ¥åæ°1åå 载第ä¸é¡µçå 容 if (arg === 1) { this.ipagination.current = 1 this.ipagination.page = 1 this.ipagination.pageSize = 50 } this.queryParam.categoryList = this.defaultCategories; // å°è£ æ¥è¯¢æ¡ä»¶ let formData = { pageNo: arg, pageSize: this.ipagination.pageSize, categoryList: this.queryParam.categoryList } this.loading = true getAction(this.url.list, formData).then((res) => { if (res.success) { // console.log(res) //update-begin---author:zhangyafei Date:20201118 forï¼éé ä¸åé¡µçæ°æ®å表------------ this.todoList = res.result.records || res.result if (res.result.total) { this.ipagination.total = res.result.total } else { this.ipagination.total = 0 } if (this.selectedRowKeys.length > 0) this.selectedRowKeys = this.selectionRows = [] //update-end---author:zhangyafei Date:20201118 forï¼éé ä¸åé¡µçæ°æ®å表------------ } else { this.$message.warning(res.message) methods: { loadData(arg) { this.todoList = [] //å è½½æ°æ® è¥ä¼ å ¥åæ°1åå 载第ä¸é¡µçå 容 if (arg === 1) { this.ipagination.current = 1 this.ipagination.page = 1 this.ipagination.pageSize = 50 } }).finally(() => { this.loading = false }) }, handelDetail(item, index) { console.log('ç¹å»äºè¯¦æ ') console.log('item----->', item) console.log('index----->', index) let processType = this.splitAprocessType(item.category) console.log('processType--->', processType) switch (processType) { case 'drApproval': this.handDrDetial(item) break case 'ggApproval': this.handDispatchFileDetial(item) break case 'ncFileSettingProcessApproval': this.handStandardizedDetial(item) break case 'sbdjApproval': this.handInspectionOrder(item) break case 'WEEK_MAINTENANCE': this.handleWeekMaintenance(item) break case 'eam_repair': this.handleRepairOrder(item) break case 'equipment_lean_out': this.handleEquipmentLeanOut(item) break case 'equipment_return': this.handleEquipmentReturn(item) break case 'second_maintenance': this.handleSecondMaintenance(item) break case 'third_maintenance': this.handleThirdMaintenance(item) break case 'toolOutStorageApproval': this.handleToolOutStorageApproval(item) break case 'toolsStocktakingBoundApproval': this.handleToolStocktakingApproval(item) break case 'toolsLossApproval': this.handleToolLossApproval(item) break case 'equipment_seal_up': this.handleEquipmentSealUp(item) break case 'equipment_unseal': this.handleEquipmentUnSeal(item) break case 'toolInStorageApproval': this.handleToolInStorage(item) break case 'equipment_transfer': this.handleEquipmentTransfer(item) break case 'equipment_scrap': this.handleEquipmentScrap(item) break case 'spare_part_apply': this.handleSparePartApplyApproval(item) break case 'programConfirmApproval': this.handleGuideCardApproval(item) break case 'equipmentAssignProductApproval': this.handleEquipmentAssignProductApproval(item) break default: alert('没æ¾å°è¯¥æµç¨') } }, batchHandle() { const categorySet = new Set(this.selectionRows.map(item => item.category)) const nameSet = new Set(this.selectionRows.map(item => item.name)) if (categorySet.size !== 1 || nameSet.size !== 1) { this.$notification.info({ message: 'æ¶æ¯', description: 'è¯·éæ©å䏿µç¨åç±»ä¸çåä¸å½åèç¹' }) return } if (categorySet.has('eam_repair')) { this.$notification.info({ message: 'æ¶æ¯', description: '设å¤ç»´ä¿®æµç¨æ æ³æ¹éå¤ç' }) return } if (categorySet.has('sbdjApproval')) { this.$refs.inspectionOrderBatchHandleRef.visible = true this.$refs.inspectionOrderBatchHandleRef.title = this.selectionRows[0].name this.$refs.inspectionOrderBatchHandleRef.getAllApproveData(this.selectionRows[0]) this.$refs.inspectionOrderBatchHandleRef.getBasicInformation(this.selectionRows[0]) } else if (categorySet.has('WEEK_MAINTENANCE')) { this.$refs.weenMaintenanceBatchApprovalModalRef.handleDetail(this.selectionRows[0]) this.$refs.weenMaintenanceBatchApprovalModalRef.title = this.selectionRows[0].name } else if (categorySet.has('ggApproval')) { let ids = '' for (let a = 0; a < this.selectedRowKeys.length; a++) { ids += this.selectedRowKeys[a] + ',' this.queryParam.categoryList = this.defaultCategories // å°è£ æ¥è¯¢æ¡ä»¶ let formData = { pageNo: arg, pageSize: this.ipagination.pageSize, categoryList: this.queryParam.categoryList } getAction(this.url.isSameNode + '?taskIds=' + ids).then((res) => { this.loading = true getAction(this.url.list, formData).then((res) => { if (res.success) { let taskDefKey = res.result this.selectBachData.taskIds = ids this.selectBachData.taskDefKey = taskDefKey this.$refs.modalFormDispatchFileBatch.title = 'æ¹éå¤ç' this.$refs.modalFormDispatchFileBatch.edit(this.selectBachData) this.$refs.modalFormDispatchFileBatch.disableSubmit = false // console.log(res) //update-begin---author:zhangyafei Date:20201118 forï¼éé ä¸åé¡µçæ°æ®å表------------ this.todoList = res.result.records || res.result if (res.result.total) { this.ipagination.total = res.result.total } else { this.ipagination.total = 0 } if (this.selectedRowKeys.length > 0) this.selectedRowKeys = this.selectionRows = [] //update-end---author:zhangyafei Date:20201118 forï¼éé ä¸åé¡µçæ°æ®å表------------ } else { this.$notification.warning({ message: 'æ¶æ¯', description: res.message }) this.$message.warning(res.message) } }).finally(() => { this.loading = false }) } }, }, splitAprocessType(title) { let parts = title.split('ï¼') // 注æåå·æ¯å ¨è§å符ï¼ä½¿ç¨å¯¹åºçåè¿è¡åå² let result = parts[0] return result }, //DNC-ææ´¾NCç¨åºè³è®¾å¤ handDrDetial(item) { this.selectShenpiData = item this.$refs.modalFormApproval.clearTableSource() this.$refs.modalFormApproval.getAllApproveData(item) }, //DNC-NCç¨åºç¾æ´¾ handDispatchFileDetial(item) { console.log('item----->', item) this.selectDispatchFileXqData = item this.$refs.modalFormDispatchFileXq.clearTableSource() this.$refs.modalFormDispatchFileXq.getAllApproveData(item) }, //DNC-å®å审æ¹é¡µé¢ handStandardizedDetial(item) { this.selectDispatchFileXqData = item this.$refs.StandardizedProcessHandle.clearTableSource() this.$refs.StandardizedProcessHandle.getAllApproveData(item) }, handelDetail(item) { let processType = this.splitAprocessType(item.category) console.log('processType--->', processType) switch (processType) { case 'drApproval': this.handDrDetial(item) break case 'ggApproval': this.handDispatchFileDetial(item) break case 'ncFileSettingProcessApproval': this.handStandardizedDetial(item) break case 'sbdjApproval': this.handInspectionOrder(item) break case 'WEEK_MAINTENANCE': this.handleWeekMaintenance(item) break case 'eam_repair': this.handleRepairOrder(item) break case 'equipment_lean_out': this.handleEquipmentLeanOut(item) break case 'equipment_return': this.handleEquipmentReturn(item) break case 'second_maintenance': this.handleSecondMaintenance(item) break case 'third_maintenance': this.handleThirdMaintenance(item) break case 'toolOutStorageApproval': this.handleToolOutStorageApproval(item) break case 'toolsStocktakingBoundApproval': this.handleToolStocktakingApproval(item) break case 'toolsLossApproval': this.handleToolLossApproval(item) break case 'equipment_seal_up': this.handleEquipmentSealUp(item) break case 'equipment_unseal': this.handleEquipmentUnSeal(item) break case 'toolInStorageApproval': this.handleToolInStorage(item) break case 'equipment_transfer': this.handleEquipmentTransfer(item) break case 'equipment_scrap': this.handleEquipmentScrap(item) break case 'spare_part_apply': this.handleSparePartApplyApproval(item) break case 'programConfirmApproval': this.handleGuideCardApproval(item) break case 'equipmentAssignProductApproval': this.handleEquipmentAssignProductApproval(item) break default: alert('没æ¾å°è¯¥æµç¨') } }, handInspectionOrder(record) { console.log('record----->', record) this.selectInspectionOrderData = Object.assign({}, record) this.$refs.modalFormInspectionOrder.visible = true this.$refs.modalFormInspectionOrder.title = record.name this.$refs.modalFormInspectionOrder.getAllApproveData(record) this.$refs.modalFormInspectionOrder.getBasicInformation(record) }, batchHandle() { const categorySet = new Set(this.selectionRows.map(item => item.category)) const nameSet = new Set(this.selectionRows.map(item => item.name)) if (categorySet.size !== 1 || nameSet.size !== 1) { this.$notification.info({ message: 'æ¶æ¯', description: 'è¯·éæ©å䏿µç¨åç±»ä¸çåä¸å½åèç¹' }) return } handleWeekMaintenance(item) { if (item && item.dataId) { this.selectWeekMaintenanceData = Object.assign({}, item) this.$refs.weekMaintenanceApprovalModal.handleDetail(item) this.$refs.weekMaintenanceApprovalModal.title = item.name this.$refs.weekMaintenanceApprovalModal.disableSubmit = false } }, if (categorySet.has('eam_repair')) { this.$notification.info({ message: 'æ¶æ¯', description: '设å¤ç»´ä¿®æµç¨æ æ³æ¹éå¤ç' }) return } /** * ç¹å»è®¾å¤ç»´ä¿®åç±»æµç¨è¯¦æ æ¶è§¦å * @param record */ handleRepairOrder(record) { this.selectRepairOrderData = Object.assign({}, record) this.$refs.repairOrderApprovalModal.visible = true this.$refs.repairOrderApprovalModal.title = record.name this.$refs.repairOrderApprovalModal.getAllApproveData(record) this.$refs.repairOrderApprovalModal.getBasicInformation(record) }, handleEquipmentLeanOut(item) { this.$refs.equipmentLeanOutApprovalModelRef.visible = true this.$refs.equipmentLeanOutApprovalModelRef.title = item.name this.$refs.equipmentLeanOutApprovalModelRef.handleDetail(item) this.$refs.equipmentLeanOutApprovalModelRef.disableSubmit = false }, handleEquipmentReturn(item) { this.$refs.equipmentReturnApprovalModelRef.visible = true this.$refs.equipmentReturnApprovalModelRef.title = item.name this.$refs.equipmentReturnApprovalModelRef.handleDetail(item) this.$refs.equipmentReturnApprovalModelRef.disableSubmit = false }, handleSecondMaintenance(item) { if (item && item.dataId) { this.selectSecondMaintenanceData = Object.assign({}, item) this.$refs.secondMaintenanceApprovalModal.handleDetail(item) this.$refs.secondMaintenanceApprovalModal.title = item.name this.$refs.secondMaintenanceApprovalModal.disableSubmit = false } }, handleThirdMaintenance(item) { if (item && item.dataId) { this.selectThirdMaintenanceData = Object.assign({}, item) this.$refs.thirdMaintenanceApprovalModal.handleDetail(item) this.$refs.thirdMaintenanceApprovalModal.title = item.name this.$refs.thirdMaintenanceApprovalModal.disableSubmit = false } }, handleToolOutStorageApproval(item) { if (item && item.dataId) { this.selectOutBoundOrderData = Object.assign({}, item) this.$refs.outBoundOrderHandle.auditVisible = true this.$refs.outBoundOrderHandle.clearTableSource() this.$refs.outBoundOrderHandle.getAllApproveData(item) } }, handleToolStocktakingApproval(item) { if (item && item.dataId) { this.selectStocktakingBoundOrderData = Object.assign({}, item) this.$refs.stocktakingBoundHandle.auditVisible = true this.$refs.stocktakingBoundHandle.clearTableSource() this.$refs.stocktakingBoundHandle.getAllApproveData(item) } }, handleToolLossApproval(item) { if (item && item.dataId) { this.selectLossBoundOrderData = Object.assign({}, item) this.$refs.lossBoundHandle.auditVisible = true this.$refs.lossBoundHandle.clearTableSource() this.$refs.lossBoundHandle.getAllApproveData(item) } }, if (categorySet.has('sbdjApproval')) { this.$refs.inspectionOrderBatchHandleRef.visible = true this.$refs.inspectionOrderBatchHandleRef.title = this.selectionRows[0].name this.$refs.inspectionOrderBatchHandleRef.getAllApproveData(this.selectionRows[0]) this.$refs.inspectionOrderBatchHandleRef.getBasicInformation(this.selectionRows[0]) } else if (categorySet.has('WEEK_MAINTENANCE')) { this.$refs.weenMaintenanceBatchApprovalModalRef.handleDetail(this.selectionRows[0]) this.$refs.weenMaintenanceBatchApprovalModalRef.title = this.selectionRows[0].name } else if (categorySet.has('ggApproval')) { let ids = '' for (let a = 0; a < this.selectedRowKeys.length; a++) { ids += this.selectedRowKeys[a] + ',' } getAction(this.url.isSameNode + '?taskIds=' + ids).then((res) => { if (res.success) { let taskDefKey = res.result this.selectBachData.taskIds = ids this.selectBachData.taskDefKey = taskDefKey this.$refs.modalFormDispatchFileBatch.title = 'æ¹éå¤ç' this.$refs.modalFormDispatchFileBatch.edit(this.selectBachData) this.$refs.modalFormDispatchFileBatch.disableSubmit = false } else { this.$notification.warning({ message: 'æ¶æ¯', description: res.message }) } }) } }, handleEquipmentSealUp(item) { this.$refs.equipmentSealUpApprovalModelRef.visible = true this.$refs.equipmentSealUpApprovalModelRef.title = item.name this.$refs.equipmentSealUpApprovalModelRef.handleDetail(item) this.$refs.equipmentSealUpApprovalModelRef.disableSubmit = false }, splitAprocessType(title) { let parts = title.split('ï¼') // 注æåå·æ¯å ¨è§å符ï¼ä½¿ç¨å¯¹åºçåè¿è¡åå² let result = parts[0] return result }, //DNC-ææ´¾NCç¨åºè³è®¾å¤ handDrDetial(item) { this.selectShenpiData = item this.$refs.modalFormApproval.clearTableSource() this.$refs.modalFormApproval.getAllApproveData(item) }, //DNC-NCç¨åºç¾æ´¾ handDispatchFileDetial(item) { console.log('item----->', item) this.selectDispatchFileXqData = item this.$refs.modalFormDispatchFileXq.clearTableSource() this.$refs.modalFormDispatchFileXq.getAllApproveData(item) }, //DNC-å®å审æ¹é¡µé¢ handStandardizedDetial(item) { this.selectDispatchFileXqData = item this.$refs.StandardizedProcessHandle.clearTableSource() this.$refs.StandardizedProcessHandle.getAllApproveData(item) }, handleEquipmentUnSeal(item) { this.$refs.equipmentSealUpApprovalModelRef.visible = true this.$refs.equipmentSealUpApprovalModelRef.title = item.name this.$refs.equipmentSealUpApprovalModelRef.handleDetail(item) this.$refs.equipmentSealUpApprovalModelRef.disableSubmit = false }, handleToolInStorage(item) { if (item && item.dataId) { this.selectInboundOrderData = Object.assign({}, item) this.$refs.inboundOrderApprovalModal.auditVisible = true this.$refs.inboundOrderApprovalModal.clearTableSource() this.$refs.inboundOrderApprovalModal.getAllApproveData(item) handInspectionOrder(record) { console.log('record----->', record) this.selectInspectionOrderData = Object.assign({}, record) this.$refs.modalFormInspectionOrder.visible = true this.$refs.modalFormInspectionOrder.title = record.name this.$refs.modalFormInspectionOrder.getAllApproveData(record) this.$refs.modalFormInspectionOrder.getBasicInformation(record) }, handleWeekMaintenance(item) { if (item && item.dataId) { this.selectWeekMaintenanceData = Object.assign({}, item) this.$refs.weekMaintenanceApprovalModal.handleDetail(item) this.$refs.weekMaintenanceApprovalModal.title = item.name this.$refs.weekMaintenanceApprovalModal.disableSubmit = false } }, /** * ç¹å»è®¾å¤ç»´ä¿®åç±»æµç¨è¯¦æ æ¶è§¦å * @param record */ handleRepairOrder(record) { this.selectRepairOrderData = Object.assign({}, record) this.$refs.repairOrderApprovalModal.visible = true this.$refs.repairOrderApprovalModal.title = record.name this.$refs.repairOrderApprovalModal.getAllApproveData(record) this.$refs.repairOrderApprovalModal.getBasicInformation(record) }, handleEquipmentLeanOut(item) { this.$refs.equipmentLeanOutApprovalModelRef.visible = true this.$refs.equipmentLeanOutApprovalModelRef.title = item.name this.$refs.equipmentLeanOutApprovalModelRef.handleDetail(item) this.$refs.equipmentLeanOutApprovalModelRef.disableSubmit = false }, handleEquipmentReturn(item) { this.$refs.equipmentReturnApprovalModelRef.visible = true this.$refs.equipmentReturnApprovalModelRef.title = item.name this.$refs.equipmentReturnApprovalModelRef.handleDetail(item) this.$refs.equipmentReturnApprovalModelRef.disableSubmit = false }, handleSecondMaintenance(item) { if (item && item.dataId) { this.selectSecondMaintenanceData = Object.assign({}, item) this.$refs.secondMaintenanceApprovalModal.handleDetail(item) this.$refs.secondMaintenanceApprovalModal.title = item.name this.$refs.secondMaintenanceApprovalModal.disableSubmit = false } }, handleThirdMaintenance(item) { if (item && item.dataId) { this.selectThirdMaintenanceData = Object.assign({}, item) this.$refs.thirdMaintenanceApprovalModal.handleDetail(item) this.$refs.thirdMaintenanceApprovalModal.title = item.name this.$refs.thirdMaintenanceApprovalModal.disableSubmit = false } }, handleToolOutStorageApproval(item) { if (item && item.dataId) { this.selectOutBoundOrderData = Object.assign({}, item) this.$refs.outBoundOrderHandle.auditVisible = true this.$refs.outBoundOrderHandle.clearTableSource() this.$refs.outBoundOrderHandle.getAllApproveData(item) } }, handleToolStocktakingApproval(item) { if (item && item.dataId) { this.selectStocktakingBoundOrderData = Object.assign({}, item) this.$refs.stocktakingBoundHandle.auditVisible = true this.$refs.stocktakingBoundHandle.clearTableSource() this.$refs.stocktakingBoundHandle.getAllApproveData(item) } }, handleToolLossApproval(item) { if (item && item.dataId) { this.selectLossBoundOrderData = Object.assign({}, item) this.$refs.lossBoundHandle.auditVisible = true this.$refs.lossBoundHandle.clearTableSource() this.$refs.lossBoundHandle.getAllApproveData(item) } }, handleEquipmentSealUp(item) { this.$refs.equipmentSealUpApprovalModelRef.visible = true this.$refs.equipmentSealUpApprovalModelRef.title = item.name this.$refs.equipmentSealUpApprovalModelRef.handleDetail(item) this.$refs.equipmentSealUpApprovalModelRef.disableSubmit = false }, handleEquipmentUnSeal(item) { this.$refs.equipmentSealUpApprovalModelRef.visible = true this.$refs.equipmentSealUpApprovalModelRef.title = item.name this.$refs.equipmentSealUpApprovalModelRef.handleDetail(item) this.$refs.equipmentSealUpApprovalModelRef.disableSubmit = false }, handleToolInStorage(item) { if (item && item.dataId) { this.selectInboundOrderData = Object.assign({}, item) this.$refs.inboundOrderApprovalModal.auditVisible = true this.$refs.inboundOrderApprovalModal.clearTableSource() this.$refs.inboundOrderApprovalModal.getAllApproveData(item) } }, handleEquipmentTransfer(item) { this.$refs.equipmentTransferApprovalModelRef.visible = true this.$refs.equipmentTransferApprovalModelRef.title = item.name this.$refs.equipmentTransferApprovalModelRef.handleDetail(item) this.$refs.equipmentTransferApprovalModelRef.disableSubmit = false }, handleEquipmentScrap(item) { this.$refs.equipmentScrapApprovalModelRef.visible = true this.$refs.equipmentScrapApprovalModelRef.title = item.name this.$refs.equipmentScrapApprovalModelRef.handleDetail(item) this.$refs.equipmentScrapApprovalModelRef.disableSubmit = false }, handleSparePartApplyApproval(item) { if (item && item.dataId) { debugger this.selectSparePartApplyData = Object.assign({}, item) this.$refs.sparePartApplyModal.auditVisible = true this.$refs.sparePartApplyModal.clearTableSource() this.$refs.sparePartApplyModal.getAllApproveData(item) } }, //DNC-ç¨åºç¡®è®¤è¡¨æµç¨ handleGuideCardApproval(item) { console.log('item----->', item) this.selectGuideCardData = item this.$refs.guideCardBatchHandle.clearTableSource() this.$refs.guideCardBatchHandle.getAllApproveData(item) }, //DNC-设å¤ç»ææ ææ´¾äº§åç»ææ handleEquipmentAssignProductApproval(item) { console.log('item----->', item) this.selectEquipmentSealUpData = item this.$refs.assignEquipmentFileStreamHandle.clearTableSource() this.$refs.assignEquipmentFileStreamHandle.getAllApproveData(item) } }, handleEquipmentTransfer(item) { this.$refs.equipmentTransferApprovalModelRef.visible = true this.$refs.equipmentTransferApprovalModelRef.title = item.name this.$refs.equipmentTransferApprovalModelRef.handleDetail(item) this.$refs.equipmentTransferApprovalModelRef.disableSubmit = false }, handleEquipmentScrap(item) { this.$refs.equipmentScrapApprovalModelRef.visible = true this.$refs.equipmentScrapApprovalModelRef.title = item.name this.$refs.equipmentScrapApprovalModelRef.handleDetail(item) this.$refs.equipmentScrapApprovalModelRef.disableSubmit = false }, handleSparePartApplyApproval(item) { if (item && item.dataId) { debugger this.selectSparePartApplyData = Object.assign({}, item) this.$refs.sparePartApplyModal.auditVisible = true this.$refs.sparePartApplyModal.clearTableSource() this.$refs.sparePartApplyModal.getAllApproveData(item) } }, //DNC-ç¨åºç¡®è®¤è¡¨æµç¨ handleGuideCardApproval(item) { console.log('item----->', item) this.selectGuideCardData = item this.$refs.guideCardBatchHandle.clearTableSource() this.$refs.guideCardBatchHandle.getAllApproveData(item) }, //DNC-设å¤ç»ææ ææ´¾äº§åç»ææ handleEquipmentAssignProductApproval(item) { console.log('item----->', item) this.selectEquipmentSealUpData = item this.$refs.assignEquipmentFileStreamHandle.clearTableSource() this.$refs.assignEquipmentFileStreamHandle.getAllApproveData(item) } } }; </script> <style scoped> .todo-container { width: 100%; margin: 0; box-sizing: border-box; /* æ°å¢ï¼è®¾ç½®å®¹å¨æå¤§é«åº¦ï¼å¯æ ¹æ®é¡µé¢å¸å±è°æ´ï¼å¦500px/80vhï¼ */ max-height: 100vh; /* æ°å¢ï¼åç´æ¹åæº¢åºæ¶æ¾ç¤ºæ»å¨æ¡ï¼æ°´å¹³æ¹å溢åºéèï¼é¿å å¸å±éä¹±ï¼ */ overflow-y: auto; overflow-x: hidden; /* å¯éï¼æ·»å æ»å¨æ¡æ ·å¼ä¼åï¼éé Chrome/Safariï¼å¯éï¼ */ &::-webkit-scrollbar { width: 6px; /* æ»å¨æ¡å®½åº¦ */ <style scoped lang="less"> .list-container { height: 100%; /deep/ .ant-spin-nested-loading, /deep/ .ant-spin-container { height: 100%; } } &::-webkit-scrollbar-thumb { background-color: #e5e7eb; /* æ»å¨æ¡æ»åé¢è² */ border-radius: 3px; /* æ»å¨æ¡åè§ */ } &::-webkit-scrollbar-track { background-color: #f9fafb; /* æ»å¨æ¡è½¨éé¢è² */ } } .todo-item { display: flex; justify-content: space-between; align-items: center; padding: 15px 20px; border-bottom: 1px solid #eee; position: relative; min-width: 300px; box-sizing: border-box; cursor: pointer; } .todo-title { flex: 1; margin-right: 100px; font-size: 14px; } .todo-info { display: flex; flex-direction: column; align-items: flex-end; min-width: 120px; font-size: 12px; } .todo-node { margin-bottom: 5px; white-space: nowrap; } .el-dropdown { width: 100%; } .el-dropdown-menu { min-width: 200px; align-items: center; } </style> src/views/dashboard/dncIndex/DncManagerSignage.vue
@@ -77,7 +77,7 @@ } .home-container { display: flex; min-height: 100vh; height: 100vh; padding: 5px; box-sizing: border-box; gap: 16px; src/views/dashboard/eamIndex/EamManagerSignage.vue
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,435 @@ <template> <div class="outer-container"> <div class="left-container"> <a-card title="ææ¯ç¶æ"> <a-spin class="spinning-container" :spinning="spinning1"> <div id="tech_condition_chart" style="width:100%;height: 100%;"></div> </a-spin> </a-card> <a-card title="è®¾å¤æ¥ä¿®æ é"> <a-spin class="spinning-container" :spinning="spinning2"> <div id="warranty_malfunction_chart" style="width:100%;height: 100%;"></div> </a-spin> </a-card> </div> <div class="right-container"> <div class="right-top-container"> <a-card title="ä¸ä¿è®¡å"> <div class="support-plan-container"> <div v-for="(item,index) in maintenanceEleList" :key="index" class="support-plan-item"> <div>{{item.planTime}}</div> <div class="plan-value-container"> <div class="plan-value">{{$data.thirdMaintenanceParams[item.planValueLabel]}}</div> <div>å°</div> </div> </div> </div> </a-card> <a-card title="äºä¿è®¡å"> <div class="support-plan-container"> <div v-for="(item,index) in maintenanceEleList" :key="index" class="support-plan-item"> <div>{{item.planTime}}</div> <div class="plan-value-container"> <div class="plan-value">{{$data.secondMaintenanceParams[item.planValueLabel]}}</div> <div>å°</div> </div> </div> </div> </a-card> </div> <a-card title="æçå¾ å" class="right-bottom-container"> <a slot="extra" href="#" @click="$router.push('/flowable/workflow/FlowTodo')">æ´å¤</a> <todo-list ref="todoList" :defaultCategories="['equipment_transfer','equipment_scrap','spare_part_apply','equipment_seal_up','equipment_unseal','equipment_return','sbdjApproval','eam_repair','equipment_lean_out','second_maintenance','third_maintenance']" /> </a-card> </div> </div> </template> <script> import TodoList from '../TodoList' import signageApi from '@/api/signage' export default { name: 'EamManagerSignage', components: { TodoList }, data() { return { spinning1: false, spinning2: false, techConditionChart: '', warrantyMalfunctionChart: '', thirdMaintenanceParams: { thisMonthMaintenancePlanNum: 0, thisMonthMaintenanceRealNum: 0, nextMonthMaintenancePlanNum: 0, maintenanceOverdueNum: 0 }, secondMaintenanceParams: { thisMonthMaintenancePlanNum: 0, thisMonthMaintenanceRealNum: 0, nextMonthMaintenancePlanNum: 0, maintenanceOverdueNum: 0 }, maintenanceEleList: [ { planTime: 'æ¬æè®¡å', planValueLabel: 'thisMonthMaintenancePlanNum', backgroundColor: '#719D8E', code: 'bysbzs' }, { planTime: 'æ¬æå®æ', planValueLabel: 'thisMonthMaintenanceRealNum', backgroundColor: '#409EFF', code: 'bwc' }, { planTime: 'ä¸æè®¡å', planValueLabel: 'nextMonthMaintenancePlanNum', backgroundColor: '#A8985D', code: 'xysb' }, { planTime: 'è¶ æ', planValueLabel: 'maintenanceOverdueNum', backgroundColor: '#E86A6A', code: '' } ] } }, mounted() { window.addEventListener('resize', this.handleWindowResize) this.getChartDataByApi() this.$refs.todoList.loadData(1) }, beforeDestroy() { window.removeEventListener('resize', this.handleWindowResize) }, methods: { /* è°ç¨æ¥å£è·åå¾è¡¨æ°æ®æ±æ»æ¹æ³ */ getChartDataByApi() { this.getTechConditionDataByApi() this.getWarrantyMalfunctionDataByApi() this.getThirdMaintenanceConditionByApi() this.getSecondMaintenanceConditionByApi() }, /* è°ç¨æ¥å£è·åææ¯ç¶æ */ getTechConditionDataByApi() { this.techConditionChart = this.$echarts.init(document.getElementById('tech_condition_chart')) this.spinning1 = true signageApi.getEquipmentTechnologyStatusApi() .then(res => { if (res.success && res.result) { this.techConditionData = [ { value: res.result.length > 0 ? res.result[0].qualifiedCount : 0, name: 'åæ ¼' }, { value: res.result.length > 0 ? res.result[0].limitedUseCount : 0, name: 'éç¨' }, { value: res.result.length > 0 ? res.result[0].disabledCount : 0, name: 'ç¦ç¨' } ] this.drawTechConditionChart() } }) }, /* è°ç¨æ¥å£è·åæ éæ¥ä¿® */ getWarrantyMalfunctionDataByApi() { this.warrantyMalfunctionChart = this.$echarts.init(document.getElementById('warranty_malfunction_chart')) this.spinning2 = true signageApi.getReportRepairEquipmentApi() .then(res => { if (res.success && res.result) { this.warrantyMalfunctionData = [ { value: res.result.length > 0 ? res.result[0].noStopCount : 0, name: 'è¿è¡' }, { value: res.result.length > 0 ? res.result[0].failurTotalCount : 0, name: 'æ¥ä¿®' }, { value: res.result.length > 0 ? res.result[0].stopCount : 0, name: 'åæº' } ] this.drawWarrantyMalfunctionChart() } }) }, /* è°ç¨æ¥å£è·åä¸ä¿æ åµ */ getThirdMaintenanceConditionByApi() { signageApi.getThirdMaintenancePlanApi() .then(res => { if (res.success && res.result) { this.thirdMaintenanceParams.thisMonthMaintenancePlanNum = res.result.thisMonthCount this.thirdMaintenanceParams.thisMonthMaintenanceRealNum = res.result.thisMonthFinishCount this.thirdMaintenanceParams.nextMonthMaintenancePlanNum = res.result.nextMonthCount this.thirdMaintenanceParams.maintenanceOverdueNum = res.result.thisMonthOverdueCount } }) }, /* è°ç¨æ¥å£è·åäºä¿æ åµ */ getSecondMaintenanceConditionByApi() { signageApi.getSecondMaintenancePlanApi() .then(res => { if (res.success && res.result) { this.secondMaintenanceParams.thisMonthMaintenancePlanNum = res.result.thisMonthCount this.secondMaintenanceParams.thisMonthMaintenanceRealNum = res.result.thisMonthFinishCount this.secondMaintenanceParams.nextMonthMaintenancePlanNum = res.result.nextMonthCount this.secondMaintenanceParams.maintenanceOverdueNum = res.result.thisMonthOverdueCount } }) }, /* ç»å¶ææ¯ç¶æé¥¼å¾ */ drawTechConditionChart() { const option = { tooltip: { trigger: 'item', formatter: function(params) { return '<span style="font-weight:bolder;">' + params.name + '</span><br/>' + '<span style="display:inline-block; width:10px; height:10px; border-radius:100px; margin-right:5px; background:' + params.color + '"></span>' + `${params.value}ï¼${params.percent}%ï¼` } }, legend: { bottom: 0, right: 'center', itemWidth: 14, itemHeight: 14, itemGap: 15, textStyle: { color: 'inherit', fontSize: 14 }, data: ['åæ ¼', 'éç¨', 'ç¦ç¨'] }, grid: { containLabel: true }, series: [ { type: 'pie', radius: ['40%', '55%'], center: ['50%', '40%'], color: [ '#4DC794', '#3DB1F6', '#F76E6D' ], label: { position: 'outside', show: true, color: 'inherit', fontSize: 16, formatter: function(params) { if (params.name !== '') { return `${params.name}:${params.value}` } } }, labelLine: { show: true, length2: 15, length: 15, lineStyle: { color: 'rgba(0,0,0,.45)' } }, data: this.techConditionData } ] } this.techConditionChart.setOption(option, true) this.spinning1 = false }, /* ç»å¶è®¾å¤æ¥ä¿®æ éé¥¼å¾ */ drawWarrantyMalfunctionChart() { const option = { tooltip: { trigger: 'item', formatter: function(params) { return '<span style="font-weight:bolder;">' + params.name + '</span><br/>' + '<span style="display:inline-block; width:10px; height:10px; border-radius:100px; margin-right:5px; background:' + params.color + '"></span>' + `${params.value}ï¼${params.percent}%ï¼` } }, legend: { bottom: 0, right: 'center', itemWidth: 14, itemHeight: 14, itemGap: 15, textStyle: { color: 'inherit', fontSize: 14 }, data: ['è¿è¡', 'æ¥ä¿®', 'åæº'] }, grid: { containLabel: true }, series: { type: 'pie', radius: ['40%', '55%'], center: ['50%', '40%'], color: [ '#4DC794', '#3DB1F6', '#F76E6D' ], label: { position: 'outside', show: true, color: 'inherit', fontSize: 16, formatter: function(params) { if (params.name !== '') { return `${params.name}:${params.value}` } } }, labelLine: { show: true, length2: 15, length: 15 }, data: this.warrantyMalfunctionData } } this.warrantyMalfunctionChart.setOption(option, true) this.spinning2 = false }, /** * çªå£å°ºå¯¸ååæ¶è§¦å * è°æ´å¾è¡¨å°ºå¯¸ä»¥éåºå辨ç */ handleWindowResize() { if (this.techConditionChart) this.techConditionChart.resize() if (this.warrantyMalfunctionChart) this.warrantyMalfunctionChart.resize() } } } </script> <style scoped lang="less"> @container-margin: 10px; .outer-container { display: flex; justify-content: space-between; height: 100vh; .left-container { width: 30%; height: 100%; margin-right: @container-margin; & > div:first-child { margin-bottom: @container-margin; } /deep/ .ant-card { height: calc(100% / 2 - (@container-margin / 2)); display: flex; flex-direction: column; .ant-card-body { flex: 1; } } } .right-container { width: 70%; height: 100%; display: flex; flex-direction: column; .right-top-container { display: flex; margin-bottom: @container-margin; /deep/ .ant-card { flex: 1; &:first-child { margin-right: @container-margin; } .ant-card-body { padding: 0; } } .support-plan-container { display: flex; justify-content: space-around; flex-wrap: wrap; .support-plan-item { border-radius: 3px; width: calc(100% / 2); padding: 25px; text-align: center; border-left: 1px solid #e8e8e8; border-bottom: 1px solid #e8e8e8; .plan-value-container { margin-top: 5px; display: flex; justify-content: center; align-items: center; .plan-value { margin-right: 10px; font-size: 30px; } } } } } .right-bottom-container { flex: 1; overflow: hidden; display: flex; flex-direction: column; & ::-webkit-scrollbar { width: 6px; /* æ»å¨æ¡å®½åº¦ */ } /deep/ .ant-card-body { padding: 6px 24px 12px; flex: 1; overflow: auto; } } } } .spinning-container { height: 100%; /deep/ .ant-spin-container { height: 100%; } } </style> src/views/tms/modules/baseTools/BaseToolsListRight.vue
@@ -449,14 +449,9 @@ this.selectedRowKeys = selectedRowKeys this.selectionRows = selectionRows //éè¿idæ¥è¯¢ç®¡çåæ°ååæ°æ°æ® getAction(this.url.queryParaByToolCode, { toolCode: this.selectedRowKeys[0], paraTypeFlag: this.selectionRows[0].paraTypeFlag, }).then((res) => { if (res.success) { if (this.selectionRows[0].paraTypeFlag === '1') { if (this.selectionRows[0].paraTypeFlag === '1') { //æ¾ç¤ºå½åéä¸ç±»ååæ° this.$refs.paraCommonToolList.getPara(res.result) this.$refs.paraCommonToolList.getPara(this.selectionRows[0]) //éèå ¶ä»ç±»ååæ° this.$refs.paraHoleToolsList.visable = false this.$refs.paraThreadingToolList.visable = false @@ -464,35 +459,35 @@ this.$refs.paraTurningToolsList.visable = false this.$refs.paraBladeList.visable = false } else if (this.selectionRows[0].paraTypeFlag === '2') { this.$refs.paraHoleToolsList.getPara(res.result) this.$refs.paraHoleToolsList.getPara(this.selectionRows[0]) this.$refs.paraCommonToolList.visable = false this.$refs.paraThreadingToolList.visable = false this.$refs.paraMillToolList.visable = false this.$refs.paraTurningToolsList.visable = false this.$refs.paraBladeList.visable = false } else if (this.selectionRows[0].paraTypeFlag === '3') { this.$refs.paraThreadingToolList.getPara(res.result) this.$refs.paraThreadingToolList.getPara(this.selectionRows[0]) this.$refs.paraCommonToolList.visable = false this.$refs.paraHoleToolsList.visable = false this.$refs.paraMillToolList.visable = false this.$refs.paraTurningToolsList.visable = false this.$refs.paraBladeList.visable = false } else if (this.selectionRows[0].paraTypeFlag === '4') { this.$refs.paraMillToolList.getPara(res.result) this.$refs.paraMillToolList.getPara(this.selectionRows[0]) this.$refs.paraCommonToolList.visable = false this.$refs.paraHoleToolsList.visable = false this.$refs.paraThreadingToolList.visable = false this.$refs.paraTurningToolsList.visable = false this.$refs.paraBladeList.visable = false } else if (this.selectionRows[0].paraTypeFlag === '5') { this.$refs.paraTurningToolsList.getPara(res.result) this.$refs.paraTurningToolsList.getPara(this.selectionRows[0]) this.$refs.paraCommonToolList.visable = false this.$refs.paraHoleToolsList.visable = false this.$refs.paraThreadingToolList.visable = false this.$refs.paraMillToolList.visable = false this.$refs.paraBladeList.visable = false } else if (this.selectionRows[0].paraTypeFlag === '6') { this.$refs.paraBladeList.getPara(res.result) this.$refs.paraBladeList.getPara(this.selectionRows[0]) this.$refs.paraCommonToolList.visable = false this.$refs.paraHoleToolsList.visable = false this.$refs.paraThreadingToolList.visable = false @@ -500,17 +495,69 @@ this.$refs.paraTurningToolsList.visable = false this.$refs.paraBladeList.visable = false } } else { this.$message.warning(res.message) } }) getAction(this.url.queryByToolCode, { toolCode: this.selectedRowKeys[0] }).then((res) => { if (res.success) { this.$refs.toolsConfigPropertyList.getPara(res.result) } else { this.$message.warning(res.message) } }) this.$refs.toolsConfigPropertyList.getPara(this.selectionRows[0]) // getAction(this.url.queryParaByToolCode, { // toolCode: this.selectedRowKeys[0], // paraTypeFlag: this.selectionRows[0].paraTypeFlag, // }).then((res) => { // if (res.success) { // if (this.selectionRows[0].paraTypeFlag === '1') { // //æ¾ç¤ºå½åéä¸ç±»ååæ° // this.$refs.paraCommonToolList.getPara(res.result) // //éèå ¶ä»ç±»ååæ° // this.$refs.paraHoleToolsList.visable = false // this.$refs.paraThreadingToolList.visable = false // this.$refs.paraMillToolList.visable = false // this.$refs.paraTurningToolsList.visable = false // this.$refs.paraBladeList.visable = false // } else if (this.selectionRows[0].paraTypeFlag === '2') { // this.$refs.paraHoleToolsList.getPara(res.result) // this.$refs.paraCommonToolList.visable = false // this.$refs.paraThreadingToolList.visable = false // this.$refs.paraMillToolList.visable = false // this.$refs.paraTurningToolsList.visable = false // this.$refs.paraBladeList.visable = false // } else if (this.selectionRows[0].paraTypeFlag === '3') { // this.$refs.paraThreadingToolList.getPara(res.result) // this.$refs.paraCommonToolList.visable = false // this.$refs.paraHoleToolsList.visable = false // this.$refs.paraMillToolList.visable = false // this.$refs.paraTurningToolsList.visable = false // this.$refs.paraBladeList.visable = false // } else if (this.selectionRows[0].paraTypeFlag === '4') { // this.$refs.paraMillToolList.getPara(res.result) // this.$refs.paraCommonToolList.visable = false // this.$refs.paraHoleToolsList.visable = false // this.$refs.paraThreadingToolList.visable = false // this.$refs.paraTurningToolsList.visable = false // this.$refs.paraBladeList.visable = false // } else if (this.selectionRows[0].paraTypeFlag === '5') { // this.$refs.paraTurningToolsList.getPara(res.result) // this.$refs.paraCommonToolList.visable = false // this.$refs.paraHoleToolsList.visable = false // this.$refs.paraThreadingToolList.visable = false // this.$refs.paraMillToolList.visable = false // this.$refs.paraBladeList.visable = false // } else if (this.selectionRows[0].paraTypeFlag === '6') { // this.$refs.paraBladeList.getPara(res.result) // this.$refs.paraCommonToolList.visable = false // this.$refs.paraHoleToolsList.visable = false // this.$refs.paraThreadingToolList.visable = false // this.$refs.paraMillToolList.visable = false // this.$refs.paraTurningToolsList.visable = false // this.$refs.paraBladeList.visable = false // } // } else { // this.$message.warning(res.message) // } // }) // getAction(this.url.queryByToolCode, { toolCode: this.selectedRowKeys[0] }).then((res) => { // if (res.success) { // this.$refs.toolsConfigPropertyList.getPara(res.result) // } else { // this.$message.warning(res.message) // } // }) }, // å¤çç¼è¾æé®ç¹å»äºä»¶ handleEditSelected() { src/views/tms/modules/baseTools/ParaBladeModal.vue
@@ -68,7 +68,7 @@ :placeholder="disableSubmit ? '' : '请è¾å ¥ä¸æåç§°'" v-model="model.chineseName" :disabled="disableSubmit" @change="e => chineseNameChange(e.target.value)" @change="(e) => chineseNameChange(e.target.value)" /> </a-form-model-item> </a-col> @@ -91,7 +91,7 @@ :placeholder="disableSubmit ? '' : '请è¾å ¥åå·/å¾å·'" v-model="model.toolModel" :disabled="disableSubmit" @change="e => toolModelChange(e.target.value)" @change="(e) => toolModelChange(e.target.value)" /> </a-form-model-item> </a-col> @@ -256,7 +256,7 @@ </a-col> </a-row> <a-row :gutter="24"> <a-row :gutter="24"> <a-col :span="8"> <a-form-model-item prop="price" label="åä»·"> <a-input @@ -288,7 +288,12 @@ </a-form-model-item> </a-col> <a-col :span="6"> <a-form-model-item label="éå¢å ¬å¸ç¼ç " :labelCol="labelCol" :wrapperCol="wrapperCol" prop="groupCompanyCode"> <a-form-model-item label="éå¢å ¬å¸ç¼ç " :labelCol="labelCol" :wrapperCol="wrapperCol" prop="groupCompanyCode" > <a-input v-model="model.groupCompanyCode" :placeholder="disableSubmit ? '' : '请è¾å ¥éå¢å ¬å¸ç¼ç '" @@ -297,11 +302,13 @@ </a-form-model-item> </a-col> <a-col :span="12"> <a-form-model-item label="éå¢å ¬å¸æ è®°" :labelCol="{span:4}" :wrapperCol="{span:20}" prop="groupCompanySign"> <a-input v-model="model.groupCompanySign" :disabled="true" ></a-input> <a-form-model-item label="éå¢å ¬å¸æ è®°" :labelCol="{ span: 4 }" :wrapperCol="{ span: 20 }" prop="groupCompanySign" > <a-input v-model="model.groupCompanySign" :disabled="true"></a-input> </a-form-model-item> </a-col> </a-row> @@ -309,12 +316,14 @@ <a-row :gutter="24"> <a-col :span="6"> <a-form-model-item label="åçå½¢ç¶" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="bladeShape"> <a-input <j-dict-select-tag type="list" v-model="model.bladeShape" :placeholder="disableSubmit ? '' : '请è¾å ¥åçå½¢ç¶'" :triggerChange="true" dictCode="blade_shape" placeholder="è¯·éæ©åçå½¢ç¶" :disabled="disableSubmit" @change="e => bladeShapeChange(e.target.value)" ></a-input> /> </a-form-model-item> </a-col> <a-col :span="6"> @@ -323,7 +332,7 @@ v-model="model.bladeLength" :placeholder="disableSubmit ? '' : '请è¾å ¥åçé¿åº¦'" :disabled="disableSubmit" @change="e => bladeLengthChange(e.target.value)" @change="(e) => bladeLengthChange(e.target.value)" ></a-input> </a-form-model-item> </a-col> @@ -333,7 +342,7 @@ v-model="model.cuttingEdgeCount" :placeholder="disableSubmit ? '' : '请è¾å ¥åååæ°'" :disabled="disableSubmit" @change="e => cuttingEdgeCountChange(e.target.value)" @change="(e) => cuttingEdgeCountChange(e.target.value)" ></a-input> </a-form-model-item> </a-col> @@ -351,11 +360,14 @@ <a-row :gutter="24"> <a-col :span="6"> <a-form-model-item label="夹åºåå¼" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="clampingType"> <a-input <j-dict-select-tag type="list" v-model="model.clampingType" :placeholder="disableSubmit ? '' : '请è¾å ¥å¤¹åºåå¼'" :triggerChange="true" dictCode="clamping_type" placeholder="è¯·éæ©å¤¹åºåå¼" :disabled="disableSubmit" ></a-input> /> </a-form-model-item> </a-col> <a-col :span="6"> @@ -364,17 +376,20 @@ v-model="model.noseAngleR" :placeholder="disableSubmit ? '' : '请è¾å ¥åå°R'" :disabled="disableSubmit" @change="e => noseAngleRChange(e.target.value)" @change="(e) => noseAngleRChange(e.target.value)" ></a-input> </a-form-model-item> </a-col> <a-col :span="6"> <a-form-model-item label="åçææ" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="toolMaterial"> <a-input <j-dict-select-tag type="list" v-model="model.toolMaterial" :placeholder="disableSubmit ? '' : '请è¾å ¥åçææ'" :triggerChange="true" dictCode="tool_material" placeholder="è¯·éæ©åçææ" :disabled="disableSubmit" ></a-input> /> </a-form-model-item> </a-col> <a-col :span="6"> @@ -417,8 +432,8 @@ <a-col :span="6"> <a-form-model-item label="éå ææ¯æ¡ä»¶è¯´æ" :labelCol="{span:12}" :wrapperCol="{span:12}" :labelCol="{ span: 12 }" :wrapperCol="{ span: 12 }" prop="conditionsInfo" > <a-input @@ -450,11 +465,14 @@ </a-col> <a-col :span="6"> <a-form-model-item label="å¶å¼" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="types"> <a-input <j-dict-select-tag type="list" v-model="model.types" :placeholder="disableSubmit ? '' : '请è¾å ¥å¶å¼'" :triggerChange="true" dictCode="types" placeholder="è¯·éæ©å¶å¼" :disabled="disableSubmit" ></a-input> /> </a-form-model-item> </a-col> <a-col :span="6"> @@ -479,11 +497,14 @@ <a-row> <a-col :span="6"> <a-form-model-item label="ååæ¹å" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="cuttingDirection"> <a-input <j-dict-select-tag type="list" v-model="model.cuttingDirection" :placeholder="disableSubmit ? '' : '请è¾å ¥ååæ¹å'" :triggerChange="true" dictCode="cutting_direction" placeholder="è¯·éæ©ååæ¹å" :disabled="disableSubmit" ></a-input> /> </a-form-model-item> </a-col> <a-col :span="6"> @@ -506,22 +527,28 @@ </a-col> <a-col :span="6"> <a-form-model-item label="å å¤èºçº¹" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="inOutThread"> <a-input <j-dict-select-tag type="list" v-model="model.inOutThread" :placeholder="disableSubmit ? '' : '请è¾å ¥å å¤èºçº¹'" :triggerChange="true" dictCode="in_out_thread" placeholder="è¯·éæ©å å¤èºçº¹" :disabled="disableSubmit" ></a-input> /> </a-form-model-item> </a-col> </a-row> <a-row> <a-col :span="6"> <a-form-model-item label="èºçº¹æ å" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="threadStandard"> <a-input <j-dict-select-tag type="list" v-model="model.threadStandard" :placeholder="disableSubmit ? '' : '请è¾å ¥èºçº¹æ å'" :triggerChange="true" dictCode="tool_thread_standard" placeholder="è¯·éæ©èºçº¹æ å" :disabled="disableSubmit" ></a-input> /> </a-form-model-item> </a-col> <a-col :span="6"> @@ -545,8 +572,8 @@ <a-col :span="6"> <a-form-model-item label="æå°å å·¥å èºçº¹å ¬ç§°ç´å¾" :labelCol="{span:15}" :wrapperCol="{span:9}" :labelCol="{ span: 15 }" :wrapperCol="{ span: 9 }" prop="minInternalThread" > <a-input @@ -635,12 +662,12 @@ queryParaByToolCode: '/tms/baseTools/queryByToolCode', }, locationCodeOptions: [], chineseNameChange1:'', toolModelChange1:'', bladeShapeChange1:'', bladeLengthChange1:'', cuttingEdgeCountChange1:'', noseAngleRChange1:'' chineseNameChange1: '', toolModelChange1: '', bladeShapeChange1: '', bladeLengthChange1: '', cuttingEdgeCountChange1: '', noseAngleRChange1: '', } }, created() { @@ -660,8 +687,8 @@ this.editable = false //åå§åé»è®¤å¼ this.model = { positionCode: '' }; positionCode: '', } this.model.classifyId = nodeSelected.key this.model.classifyNum = nodeSelected.entity.classifyId this.model.classifyName = nodeSelected.entity.typeName @@ -672,32 +699,32 @@ this.editable = true this.model = Object.assign({}, record) this.chineseNameChange1 = record.chineseName this.toolModelChange1 = '-'+record.toolModel this.bladeShapeChange1 = '-'+record.bladeShape this.bladeLengthChange1 = '-'+record.bladeLength this.cuttingEdgeCountChange1 = '-'+record.cuttingEdgeCount this.noseAngleRChange1 = '-'+record.noseAngleR this.toolModelChange1 = '-' + record.toolModel this.bladeShapeChange1 = '-' + record.bladeShape this.bladeLengthChange1 = '-' + record.bladeLength this.cuttingEdgeCountChange1 = '-' + record.cuttingEdgeCount this.noseAngleRChange1 = '-' + record.noseAngleR //éè¿idæ¥è¯¢ç®¡çåæ°ååæ°æ°æ® getAction(this.url.queryParaByToolCode, { toolCode: record.toolCodeId, paraTypeFlag: record.paraTypeFlag, }).then((res) => { if (res.success) { this.model = Object.assign({}, res.result) } }) // getAction(this.url.queryParaByToolCode, { // toolCode: record.toolCodeId, // paraTypeFlag: record.paraTypeFlag, // }).then((res) => { // if (res.success) { // this.model = Object.assign({}, res.result) // } // }) this.visible = true }, close() { this.$emit('close') this.visible = false this.$refs.form.clearValidate() this.chineseNameChange1 = '', this.toolModelChange1 = '', this.bladeShapeChange1 = '', this.bladeLengthChange1 = '', this.cuttingEdgeCountChange1 = '', this.noseAngleRChange1 = '' ;(this.chineseNameChange1 = ''), (this.toolModelChange1 = ''), (this.bladeShapeChange1 = ''), (this.bladeLengthChange1 = ''), (this.cuttingEdgeCountChange1 = ''), (this.noseAngleRChange1 = '') }, positionCodeSearch() { let positionCode = [] @@ -771,36 +798,66 @@ } }) }, chineseNameChange(chineseNameChange){ chineseNameChange(chineseNameChange) { this.chineseNameChange1 = chineseNameChange this.model.groupCompanySign = this.chineseNameChange1+this.toolModelChange1+this.bladeShapeChange1+this.bladeLengthChange1 +this.cuttingEdgeCountChange1+this.noseAngleRChange1 this.model.groupCompanySign = this.chineseNameChange1 + this.toolModelChange1 + this.bladeShapeChange1 + this.bladeLengthChange1 + this.cuttingEdgeCountChange1 + this.noseAngleRChange1 }, toolModelChange(toolModelChange){ this.toolModelChange1 = toolModelChange == '' ? '' : '-'+toolModelChange this.model.groupCompanySign = this.chineseNameChange1+this.toolModelChange1+this.bladeShapeChange1+this.bladeLengthChange1 +this.cuttingEdgeCountChange1+this.noseAngleRChange1 toolModelChange(toolModelChange) { this.toolModelChange1 = toolModelChange == '' ? '' : '-' + toolModelChange this.model.groupCompanySign = this.chineseNameChange1 + this.toolModelChange1 + this.bladeShapeChange1 + this.bladeLengthChange1 + this.cuttingEdgeCountChange1 + this.noseAngleRChange1 }, bladeShapeChange(bladeShapeChange){ this.bladeShapeChange1 = bladeShapeChange == '' ? '' : '-'+bladeShapeChange this.model.groupCompanySign = this.chineseNameChange1+this.toolModelChange1+this.bladeShapeChange1+this.bladeLengthChange1 +this.cuttingEdgeCountChange1+this.noseAngleRChange1 bladeShapeChange(bladeShapeChange) { this.bladeShapeChange1 = bladeShapeChange == '' ? '' : '-' + bladeShapeChange this.model.groupCompanySign = this.chineseNameChange1 + this.toolModelChange1 + this.bladeShapeChange1 + this.bladeLengthChange1 + this.cuttingEdgeCountChange1 + this.noseAngleRChange1 }, bladeLengthChange(bladeLengthChange){ this.bladeLengthChange1 = bladeLengthChange == '' ? '' : '-'+bladeLengthChange this.model.groupCompanySign = this.chineseNameChange1+this.toolModelChange1+this.bladeShapeChange1+this.bladeLengthChange1 +this.cuttingEdgeCountChange1+this.noseAngleRChange1 bladeLengthChange(bladeLengthChange) { this.bladeLengthChange1 = bladeLengthChange == '' ? '' : '-' + bladeLengthChange this.model.groupCompanySign = this.chineseNameChange1 + this.toolModelChange1 + this.bladeShapeChange1 + this.bladeLengthChange1 + this.cuttingEdgeCountChange1 + this.noseAngleRChange1 }, cuttingEdgeCountChange(cuttingEdgeCountChange){ this.cuttingEdgeCountChange1 = cuttingEdgeCountChange == '' ? '' : '-'+cuttingEdgeCountChange this.model.groupCompanySign = this.chineseNameChange1+this.toolModelChange1+this.bladeShapeChange1+this.bladeLengthChange1 +this.cuttingEdgeCountChange1+this.noseAngleRChange1 cuttingEdgeCountChange(cuttingEdgeCountChange) { this.cuttingEdgeCountChange1 = cuttingEdgeCountChange == '' ? '' : '-' + cuttingEdgeCountChange this.model.groupCompanySign = this.chineseNameChange1 + this.toolModelChange1 + this.bladeShapeChange1 + this.bladeLengthChange1 + this.cuttingEdgeCountChange1 + this.noseAngleRChange1 }, noseAngleRChange(noseAngleRChange){ this.noseAngleRChange1 = noseAngleRChange == '' ? '' : '-'+noseAngleRChange this.model.groupCompanySign = this.chineseNameChange1+this.toolModelChange1+this.bladeShapeChange1+this.bladeLengthChange1 +this.cuttingEdgeCountChange1+this.noseAngleRChange1 } noseAngleRChange(noseAngleRChange) { this.noseAngleRChange1 = noseAngleRChange == '' ? '' : '-' + noseAngleRChange this.model.groupCompanySign = this.chineseNameChange1 + this.toolModelChange1 + this.bladeShapeChange1 + this.bladeLengthChange1 + this.cuttingEdgeCountChange1 + this.noseAngleRChange1 }, }, } </script> src/views/tms/modules/baseTools/ParaBladeSearchModal.vue
@@ -221,7 +221,7 @@ type="list" v-model="model.inOutThread" :triggerChange="true" dictCode="in_out_thread" dictCode="number_patterns" placeholder="è¯·éæ©å å¤èºçº¹" /> </a-form-model-item> @@ -232,7 +232,7 @@ type="list" v-model="model.threadStandard" :triggerChange="true" dictCode="thread_standard" dictCode="tool_thread_standard" placeholder="è¯·éæ©èºçº¹æ å" /> </a-form-model-item> src/views/tms/modules/baseTools/ParaHoleToolsModal.vue
@@ -264,7 +264,14 @@ <a-row :gutter="24"> <a-col :span="6"> <a-form-model-item label="åå ·ææ" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="toolMaterial"> <a-input v-model="model.toolMaterial" :placeholder="disableSubmit?'':'请è¾å ¥åå ·ææ'" :disabled="disableSubmit"></a-input> <j-dict-select-tag type="list" v-model="model.toolMaterial" :triggerChange="true" dictCode="tool_material" placeholder="è¯·éæ©åå ·ææ" :disabled="disableSubmit" /> </a-form-model-item> </a-col> <a-col :span="6"> @@ -282,7 +289,14 @@ </a-col> <a-col :span="6"> <a-form-model-item label="åå ·åå¼" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="toolPattern"> <a-input v-model="model.toolPattern" :placeholder="disableSubmit?'':'请è¾å ¥åå ·åå¼'" :disabled="disableSubmit" ></a-input> <j-dict-select-tag type="list" v-model="model.toolPattern" :triggerChange="true" dictCode="tool_pattern" placeholder="è¯·éæ©åå ·åå¼" :disabled="disableSubmit" /> </a-form-model-item> </a-col> </a-row> @@ -294,7 +308,14 @@ </a-col> <a-col :span="6"> <a-form-model-item label="å·å´æ¹å¼" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="coolingMethod"> <a-input v-model="model.coolingMethod" :placeholder="disableSubmit?'':'请è¾å ¥å·å´æ¹å¼'" :disabled="disableSubmit" ></a-input> <j-dict-select-tag type="list" v-model="model.coolingMethod" :triggerChange="true" dictCode="cooling_method" placeholder="è¯·éæ©å·å´æ¹å¼" :disabled="disableSubmit" /> </a-form-model-item> </a-col> <a-col :span="6"> @@ -316,7 +337,14 @@ </a-col> <a-col :span="6"> <a-form-model-item label="å¶å¼" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="types"> <a-input v-model="model.types" :placeholder="disableSubmit?'':'请è¾å ¥å¶å¼'" :disabled="disableSubmit" ></a-input> <j-dict-select-tag type="list" v-model="model.types" :triggerChange="true" dictCode="types" placeholder="è¯·éæ©å¶å¼" :disabled="disableSubmit" /> </a-form-model-item> </a-col> <a-col :span="6"> @@ -326,14 +354,28 @@ </a-col> <a-col :span="6"> <a-form-model-item label="æå±æ§½å½¢å¼" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="fluteForm"> <a-input v-model="model.fluteForm" :placeholder="disableSubmit?'':'请è¾å ¥æå±æ§½å½¢å¼'" :disabled="disableSubmit" ></a-input> <j-dict-select-tag type="list" v-model="model.fluteForm" :triggerChange="true" dictCode="flute_form" placeholder="è¯·éæ©æå±æ§½å½¢å¼" :disabled="disableSubmit" /> </a-form-model-item> </a-col> </a-row> <a-row> <a-col :span="6"> <a-form-model-item label="æé¨å½¢å¼" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="handleForm"> <a-input v-model="model.handleForm" :placeholder="disableSubmit?'':'请è¾å ¥æé¨å½¢å¼'" :disabled="disableSubmit" ></a-input> <j-dict-select-tag type="list" v-model="model.handleForm" :triggerChange="true" dictCode="handle_form" placeholder="è¯·éæ©æé¨å½¢å¼" :disabled="disableSubmit" /> </a-form-model-item> </a-col> <a-col :span="6"> @@ -392,7 +434,14 @@ </a-col> <a-col :span="6"> <a-form-model-item label="éç¨èå´" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="scopeOfApplication"> <a-input v-model="model.scopeOfApplication" :placeholder="disableSubmit?'':'请è¾å ¥éç¨èå´'" :disabled="disableSubmit" ></a-input> <j-dict-select-tag type="list" v-model="model.scopeOfApplication" :triggerChange="true" dictCode="scope_of_application" placeholder="è¯·éæ©éç¨èå´" :disabled="disableSubmit" /> </a-form-model-item> </a-col> </a-row> @@ -409,7 +458,14 @@ </a-col> <a-col :span="6"> <a-form-model-item label="å å·¥æ¹å¼" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="processingmethod"> <a-input v-model="model.processingmethod" :placeholder="disableSubmit?'':'请è¾å ¥å å·¥æ¹å¼'" :disabled="disableSubmit" ></a-input> <j-dict-select-tag type="list" v-model="model.processingmethod" :triggerChange="true" dictCode="processingmethod" placeholder="è¯·éæ©å å·¥æ¹å¼" :disabled="disableSubmit" /> </a-form-model-item> </a-col> <a-col :span="6"> @@ -565,20 +621,22 @@ }, edit(record) { this.editable = true; console.log("1111",this.model.classifyNum) this.model = Object.assign({}, record) console.log("2222",this.model.classifyNum) this.chineseNameChange1 = record.chineseName this.toolModelChange1 = '-'+record.toolModel this.diameterChange1 = '-'+record.diameter this.totalLengthChange1 = '-'+record.totalLength //éè¿idæ¥è¯¢ç®¡çåæ°ååæ°æ°æ® getAction(this.url.queryParaByToolCode, { toolCode: record.toolCodeId, paraTypeFlag: record.paraTypeFlag, }).then((res) => { if (res.success) { this.model = Object.assign({}, res.result) } }) // getAction(this.url.queryParaByToolCode, { // toolCode: record.toolCodeId, // paraTypeFlag: record.paraTypeFlag, // }).then((res) => { // if (res.success) { // this.model = Object.assign({}, res.result) // } // }) this.visible = true }, close() { src/views/tms/modules/baseTools/ParaMillToolModal.vue
@@ -263,7 +263,14 @@ <a-row :gutter="24"> <a-col :span="6"> <a-form-model-item label="åå ·ææ" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="toolMaterial"> <a-input v-model="model.toolMaterial" :placeholder="disableSubmit?'':'请è¾å ¥åå ·ææ'" :disabled="disableSubmit"></a-input> <j-dict-select-tag type="list" v-model="model.toolMaterial" :triggerChange="true" dictCode="tool_material" placeholder="è¯·éæ©åå ·ææ" :disabled="disableSubmit" /> </a-form-model-item> </a-col> <a-col :span="6"> @@ -281,7 +288,14 @@ </a-col> <a-col :span="6"> <a-form-model-item label="åå ·åå¼" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="toolPattern"> <a-input v-model="model.toolPattern" :placeholder="disableSubmit?'':'请è¾å ¥åå ·åå¼'" :disabled="disableSubmit" ></a-input> <j-dict-select-tag type="list" v-model="model.toolPattern" :triggerChange="true" dictCode="tool_pattern" placeholder="è¯·éæ©åå ·åå¼" :disabled="disableSubmit" /> </a-form-model-item> </a-col> </a-row> @@ -293,12 +307,26 @@ </a-col> <a-col :span="6"> <a-form-model-item label="æé¨å½¢å¼" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="handleForm"> <a-input v-model="model.handleForm" :placeholder="disableSubmit?'':'请è¾å ¥æé¨å½¢å¼'" :disabled="disableSubmit" ></a-input> <j-dict-select-tag type="list" v-model="model.handleForm" :triggerChange="true" dictCode="mill_handle_form" placeholder="è¯·éæ©æé¨å½¢å¼" :disabled="disableSubmit" /> </a-form-model-item> </a-col> <a-col :span="6"> <a-form-model-item label="å·å´æ¹å¼" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="coolingMethod"> <a-input v-model="model.coolingMethod" :placeholder="disableSubmit?'':'请è¾å ¥å·å´æ¹å¼'" :disabled="disableSubmit" ></a-input> <j-dict-select-tag type="list" v-model="model.coolingMethod" :triggerChange="true" dictCode="cooling_method" placeholder="è¯·éæ©å·å´æ¹å¼" :disabled="disableSubmit" /> </a-form-model-item> </a-col> <a-col :span="6"> @@ -371,7 +399,14 @@ </a-col> <a-col :span="6"> <a-form-model-item label="æé¢å½¢å¼" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="handleNeckForm"> <a-input v-model="model.handleNeckForm" :placeholder="disableSubmit?'':'请è¾å ¥æé¢å½¢å¼'" :disabled="disableSubmit" ></a-input> <j-dict-select-tag type="list" v-model="model.handleNeckForm" :triggerChange="true" dictCode="handle_neck_form" placeholder="è¯·éæ©æé¢å½¢å¼" :disabled="disableSubmit" /> </a-form-model-item> </a-col> <a-col :span="6"> @@ -388,7 +423,14 @@ </a-col> <a-col :span="6"> <a-form-model-item label="é£å头形å¼" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="millingHeadForm"> <a-input v-model="model.millingHeadForm" :placeholder="disableSubmit?'':'请è¾å ¥é£å头形å¼'" :disabled="disableSubmit" ></a-input> <j-dict-select-tag type="list" v-model="model.millingHeadForm" :triggerChange="true" dictCode="milling_head_form" placeholder="è¯·éæ©é£å头形å¼" :disabled="disableSubmit" /> </a-form-model-item> </a-col> <a-col :span="6"> @@ -398,7 +440,14 @@ </a-col> <a-col :span="6"> <a-form-model-item label="åååå½¢å¼" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="cuttingEdgeForm"> <a-input v-model="model.cuttingEdgeForm" :placeholder="disableSubmit?'':'请è¾å ¥åååå½¢å¼'" :disabled="disableSubmit" ></a-input> <j-dict-select-tag type="list" v-model="model.cuttingEdgeForm" :triggerChange="true" dictCode="cutting_edge_form" placeholder="è¯·éæ©åååå½¢å¼" :disabled="disableSubmit" /> </a-form-model-item> </a-col> </a-row> @@ -409,8 +458,15 @@ </a-form-model-item> </a-col> <a-col :span="6"> <a-form-model-item label="å å¤çº¹æ°" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="numberPatterns"> <a-input v-model="model.numberPatterns" :placeholder="disableSubmit?'':'请è¾å ¥å å¤çº¹æ°'" :disabled="disableSubmit" ></a-input> <a-form-model-item label="å å¤èºçº¹" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="numberPatterns"> <j-dict-select-tag type="list" v-model="model.numberPatterns" :triggerChange="true" dictCode="number_patterns" placeholder="è¯·éæ©å å¤èºçº¹" :disabled="disableSubmit" /> </a-form-model-item> </a-col> <a-col :span="6"> @@ -576,14 +632,14 @@ this.totalLengthChange1 = '-'+record.totalLength this.noseAngleRChange1 = '-' + record.noseAngleR //éè¿idæ¥è¯¢ç®¡çåæ°ååæ°æ°æ® getAction(this.url.queryParaByToolCode, { toolCode: record.toolCodeId, paraTypeFlag: record.paraTypeFlag, }).then((res) => { if (res.success) { this.model = Object.assign({}, res.result) } }) // getAction(this.url.queryParaByToolCode, { // toolCode: record.toolCodeId, // paraTypeFlag: record.paraTypeFlag, // }).then((res) => { // if (res.success) { // this.model = Object.assign({}, res.result) // } // }) this.visible = true }, close() { src/views/tms/modules/baseTools/ParaMillToolSearchModal.vue
@@ -279,7 +279,7 @@ type="list" v-model="model.handleForm" :triggerChange="true" dictCode="handle_form" dictCode="mill_handle_form" placeholder="è¯·éæ©æé¨å½¢å¼" /> </a-form-model-item> src/views/tms/modules/baseTools/ParaThreadingToolModal.vue
@@ -250,7 +250,14 @@ </a-col> <a-col :span="6"> <a-form-model-item label="èºçº¹æå" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="rotationDirection"> <a-input v-model="model.rotationDirection" :placeholder="disableSubmit?'':'请è¾å ¥èºçº¹æå'" :disabled="disableSubmit"></a-input> <j-dict-select-tag type="list" v-model="model.rotationDirection" :triggerChange="true" dictCode="rotation_direction" placeholder="è¯·éæ©èºçº¹æå" :disabled="disableSubmit" /> </a-form-model-item> </a-col> <a-col :span="6"> @@ -273,7 +280,14 @@ </a-col> <a-col :span="6"> <a-form-model-item label="åå ·ææ" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="toolMaterial"> <a-input v-model="model.toolMaterial" :placeholder="disableSubmit?'':'请è¾å ¥åå ·ææ'" :disabled="disableSubmit" ></a-input> <j-dict-select-tag type="list" v-model="model.toolMaterial" :triggerChange="true" dictCode="tool_material" placeholder="è¯·éæ©åå ·ææ" :disabled="disableSubmit" /> </a-form-model-item> </a-col> <a-col :span="6"> @@ -320,29 +334,64 @@ </a-col> <a-col :span="6"> <a-form-model-item label="å¶å¼" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="types"> <a-input v-model="model.types" :placeholder="disableSubmit?'':'请è¾å ¥å¶å¼'" :disabled="disableSubmit" ></a-input> <j-dict-select-tag type="list" v-model="model.types" :triggerChange="true" dictCode="types" placeholder="è¯·éæ©å¶å¼" :disabled="disableSubmit" /> </a-form-model-item> </a-col> <a-col :span="6"> <a-form-model-item label="å·å´æ¹å¼" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="coolingMethod"> <a-input v-model="model.coolingMethod" :placeholder="disableSubmit?'':'请è¾å ¥å·å´æ¹å¼'" :disabled="disableSubmit" ></a-input> <j-dict-select-tag type="list" v-model="model.coolingMethod" :triggerChange="true" dictCode="cooling_method" placeholder="è¯·éæ©å·å´æ¹å¼" :disabled="disableSubmit" /> </a-form-model-item> </a-col> </a-row> <a-row> <a-col :span="6"> <a-form-model-item label="èºçº¹æ å" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="threadStandard"> <a-input v-model="model.threadStandard" :placeholder="disableSubmit?'':'请è¾å ¥èºçº¹æ å'" :disabled="disableSubmit" ></a-input> <j-dict-select-tag type="list" v-model="model.threadStandard" :triggerChange="true" dictCode="thread_standard" placeholder="è¯·éæ©èºçº¹æ å" :disabled="disableSubmit" /> </a-form-model-item> </a-col> <a-col :span="6"> <a-form-model-item label="æå±æ§½å" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="fluteSoltType"> <a-input v-model="model.fluteSoltType" :placeholder="disableSubmit?'':'请è¾å ¥æå±æ§½å'" :disabled="disableSubmit" ></a-input> <j-dict-select-tag type="list" v-model="model.fluteSoltType" :triggerChange="true" dictCode="flute_solt_type" placeholder="è¯·éæ©æå±æ§½å" :disabled="disableSubmit" /> </a-form-model-item> </a-col> <a-col :span="6"> <a-form-model-item label="èºçº¹ç±»å" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="threadType"> <a-input v-model="model.threadType" :placeholder="disableSubmit?'':'请è¾å ¥èºçº¹ç±»å'" :disabled="disableSubmit" ></a-input> <j-dict-select-tag type="list" v-model="model.threadType" :triggerChange="true" dictCode="thread_type" placeholder="è¯·éæ©èºçº¹ç±»å" :disabled="disableSubmit" /> </a-form-model-item> </a-col> <a-col :span="6"> @@ -352,6 +401,17 @@ </a-col> </a-row> <a-row> <a-col :span="6"> <a-form-model-item label="èºåç±»å" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="screwHoleType"> <j-dict-select-tag type="list" v-model="model.screwHoleType" :triggerChange="true" dictCode="screw_hole_type" placeholder="è¯·éæ©èºåç±»å" /> </a-form-model-item> </a-col> <a-col :span="6"> <a-form-model-item label="è¿æ¥åå¾" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="connectionAperture"> <a-input v-model="model.connectionAperture" :placeholder="disableSubmit?'':'请è¾å ¥è¿æ¥åå¾'" :disabled="disableSubmit" ></a-input> @@ -510,14 +570,14 @@ this.threadCodeChange1 = '-'+record.threadCode this.pitchChange1 = '-'+record.pitch //éè¿idæ¥è¯¢ç®¡çåæ°ååæ°æ°æ® getAction(this.url.queryParaByToolCode, { toolCode: record.toolCodeId, paraTypeFlag: record.paraTypeFlag, }).then((res) => { if (res.success) { this.model = Object.assign({}, res.result) } }) // getAction(this.url.queryParaByToolCode, { // toolCode: record.toolCodeId, // paraTypeFlag: record.paraTypeFlag, // }).then((res) => { // if (res.success) { // this.model = Object.assign({}, res.result) // } // }) this.visible = true }, close() { src/views/tms/modules/baseTools/ParaThreadingToolSearchModal.vue
@@ -231,6 +231,17 @@ </a-col> </a-row> <a-row> <a-col :span="8"> <a-form-model-item label="èºçº¹ç±»å" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="threadType"> <j-dict-select-tag type="list" v-model="model.threadType" :triggerChange="true" dictCode="thread_type" placeholder="è¯·éæ©èºçº¹ç±»å" /> </a-form-model-item> </a-col> <a-col :span="8"> <a-form-model-item label="æå±æ§½å" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="fluteSoltType"> <j-dict-select-tag @@ -257,6 +268,9 @@ ></a-input> </a-form-item> </a-col> </a-row> <a-row> <a-col :span="8"> <a-form-item label="åååé¿"> <a-input placeholder="请è¾å ¥æå°å¼" class="query-group-cust" v-model="model.smallEdgeLength"></a-input> @@ -264,8 +278,6 @@ <a-input placeholder="请è¾å ¥æå¤§å¼" class="query-group-cust" v-model="model.bigEdgeLength"></a-input> </a-form-item> </a-col> </a-row> <a-row> <a-col :span="8"> <a-form-item label="åå ·æ»é¿"> <a-input placeholder="请è¾å ¥æå°å¼" class="query-group-cust" v-model="model.smallTotalLength"></a-input> src/views/tms/modules/baseTools/ParaTurningToolsModal.vue
@@ -268,12 +268,26 @@ </a-col> <a-col :span="6"> <a-form-model-item label="ååæ¹å" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="cuttingDirection"> <a-input v-model="model.cuttingDirection" :placeholder="disableSubmit?'':'请è¾å ¥ååæ¹å'" :disabled="disableSubmit"></a-input> <j-dict-select-tag type="list" v-model="model.cuttingDirection" :triggerChange="true" dictCode="cutting_direction" placeholder="è¯·éæ©ååæ¹å" :disabled="disableSubmit" /> </a-form-model-item> </a-col> <a-col :span="6"> <a-form-model-item label="åå ·ææ" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="toolMaterial"> <a-input v-model="model.toolMaterial" :placeholder="disableSubmit?'':'请è¾å ¥åå ·ææ'" :disabled="disableSubmit"></a-input> <j-dict-select-tag type="list" v-model="model.toolMaterial" :triggerChange="true" dictCode="tool_material" placeholder="è¯·éæ©åå ·ææ" :disabled="disableSubmit" /> </a-form-model-item> </a-col> <a-col :span="6"> @@ -294,7 +308,14 @@ </a-col> <a-col :span="6"> <a-form-model-item label="åå ·åå¼" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="toolPattern"> <a-input v-model="model.toolPattern" :placeholder="disableSubmit?'':'请è¾å ¥åå ·åå¼'" :disabled="disableSubmit" ></a-input> <j-dict-select-tag type="list" v-model="model.toolPattern" :triggerChange="true" dictCode="tool_pattern" placeholder="è¯·éæ©åå ·åå¼" :disabled="disableSubmit" /> </a-form-model-item> </a-col> <a-col :span="6"> @@ -316,7 +337,14 @@ </a-col> <a-col :span="6"> <a-form-model-item label="å¶å¼" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="types"> <a-input v-model="model.types" :placeholder="disableSubmit?'':'请è¾å ¥å¶å¼'" :disabled="disableSubmit" ></a-input> <j-dict-select-tag type="list" v-model="model.types" :triggerChange="true" dictCode="types" placeholder="è¯·éæ©å¶å¼" :disabled="disableSubmit" /> </a-form-model-item> </a-col> <a-col :span="6"> @@ -326,14 +354,28 @@ </a-col> <a-col :span="6"> <a-form-model-item label="å·å´æ¹å¼" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="coolingMethod"> <a-input v-model="model.coolingMethod" :placeholder="disableSubmit?'':'请è¾å ¥å·å´æ¹å¼'" :disabled="disableSubmit" ></a-input> <j-dict-select-tag type="list" v-model="model.coolingMethod" :triggerChange="true" dictCode="cooling_method" placeholder="è¯·éæ©å·å´æ¹å¼" :disabled="disableSubmit" /> </a-form-model-item> </a-col> </a-row> <a-row> <a-col :span="6"> <a-form-model-item label="åæç±»å«" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="holderCategory"> <a-input v-model="model.holderCategory" :placeholder="disableSubmit?'':'请è¾å ¥åæç±»å«'" :disabled="disableSubmit" ></a-input> <j-dict-select-tag type="list" v-model="model.holderCategory" :triggerChange="true" dictCode="holder_category" placeholder="è¯·éæ©åæç±»å«" :disabled="disableSubmit" /> </a-form-model-item> </a-col> <a-col :span="6"> @@ -343,7 +385,14 @@ </a-col> <a-col :span="6"> <a-form-model-item label="æ¥å£ç´§åºå½¢å¼" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="fasteningForm"> <a-input v-model="model.fasteningForm" :placeholder="disableSubmit?'':'请è¾å ¥æ¥å£ç´§åºå½¢å¼'" :disabled="disableSubmit" ></a-input> <j-dict-select-tag type="list" v-model="model.fasteningForm" :triggerChange="true" dictCode="fastening_form" placeholder="è¯·éæ©æ¥å£ç´§åºå½¢å¼" :disabled="disableSubmit" /> </a-form-model-item> </a-col> <a-col :span="6"> @@ -360,7 +409,14 @@ </a-col> <a-col :span="6"> <a-form-model-item label="åçå½¢ç¶" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="bladeShape"> <a-input v-model="model.bladeShape" :placeholder="disableSubmit?'':'请è¾å ¥åçå½¢ç¶'" :disabled="disableSubmit" ></a-input> <j-dict-select-tag type="list" v-model="model.bladeShape" :triggerChange="true" dictCode="blade_shape" placeholder="è¯·éæ©åçå½¢ç¶" :disabled="disableSubmit" /> </a-form-model-item> </a-col> <a-col :span="6"> @@ -370,7 +426,14 @@ </a-col> <a-col :span="6"> <a-form-model-item label="åææ¹å" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="barDirection"> <a-input v-model="model.barDirection" :placeholder="disableSubmit?'':'请è¾å ¥åææ¹å'" :disabled="disableSubmit" ></a-input> <j-dict-select-tag type="list" v-model="model.barDirection" :triggerChange="true" dictCode="bar_direction" placeholder="è¯·éæ©åææ¹å" :disabled="disableSubmit" /> </a-form-model-item> </a-col> </a-row> @@ -399,7 +462,14 @@ <a-row> <a-col :span="6"> <a-form-model-item label="åçè£ å¤¹æ¹å¼" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="clampingMethod"> <a-input v-model="model.clampingMethod" :placeholder="disableSubmit?'':'请è¾å ¥åçè£ å¤¹æ¹å¼'" :disabled="disableSubmit" ></a-input> <j-dict-select-tag type="list" v-model="model.clampingMethod" :triggerChange="true" dictCode="clamping_method" placeholder="è¯·éæ©åçè£ å¤¹æ¹å¼" :disabled="disableSubmit" /> </a-form-model-item> </a-col> <a-col :span="6"> @@ -587,14 +657,14 @@ this.headSpecificationsChange1 = '-'+record.headSpecifications this.leadAngleChange1 = '-'+record.leadAngle //éè¿idæ¥è¯¢ç®¡çåæ°ååæ°æ°æ® getAction(this.url.queryParaByToolCode, { toolCode: record.toolCodeId, paraTypeFlag: record.paraTypeFlag, }).then((res) => { if (res.success) { this.model = Object.assign({}, res.result) } }) // getAction(this.url.queryParaByToolCode, { // toolCode: record.toolCodeId, // paraTypeFlag: record.paraTypeFlag, // }).then((res) => { // if (res.success) { // this.model = Object.assign({}, res.result) // } // }) this.visible = true }, close() { src/views/tms/modules/toolLedger/ToolLedgerListRight.vue
@@ -453,10 +453,8 @@ this.selectedRowKeys = selectedRowKeys; this.selectionRows = selectionRows //éè¿idæ¥è¯¢ç®¡çåæ°ååæ°æ°æ® getAction(this.url.queryParaByToolCode, { toolCode: this.selectionRows[0].toolCodeId,paraTypeFlag:this.selectionRows[0].paraTypeFlag}).then((res) => { if (res.success) { if(this.selectionRows[0].paraTypeFlag === "1"){ this.$refs.paraCommonToolList.getPara(res.result); if(this.selectionRows[0].paraTypeFlag === "1"){ this.$refs.paraCommonToolList.getPara(this.selectionRows[0]); //éèå ¶ä»ç±»ååæ° this.$refs.paraHoleToolsList.visable =false this.$refs.paraThreadingToolList.visable = false @@ -464,35 +462,35 @@ this.$refs.paraTurningToolsList.visable = false this.$refs.paraBladeList.visable = false }else if(this.selectionRows[0].paraTypeFlag === "2"){ this.$refs.paraHoleToolsList.getPara(res.result); this.$refs.paraHoleToolsList.getPara(this.selectionRows[0]); this.$refs.paraCommonToolList.visable = false this.$refs.paraThreadingToolList.visable = false this.$refs.paraMillToolList.visable = false this.$refs.paraTurningToolsList.visable = false this.$refs.paraBladeList.visable = false }else if(this.selectionRows[0].paraTypeFlag === "3"){ this.$refs.paraThreadingToolList.getPara(res.result); this.$refs.paraThreadingToolList.getPara(this.selectionRows[0]); this.$refs.paraCommonToolList.visable = false this.$refs.paraHoleToolsList.visable =false this.$refs.paraMillToolList.visable = false this.$refs.paraTurningToolsList.visable = false this.$refs.paraBladeList.visable = false }else if(this.selectionRows[0].paraTypeFlag === "4"){ this.$refs.paraMillToolList.getPara(res.result); this.$refs.paraMillToolList.getPara(this.selectionRows[0]); this.$refs.paraCommonToolList.visable = false this.$refs.paraHoleToolsList.visable =false this.$refs.paraThreadingToolList.visable = false this.$refs.paraTurningToolsList.visable = false this.$refs.paraBladeList.visable = false }else if(this.selectionRows[0].paraTypeFlag === "5"){ this.$refs.paraTurningToolsList.getPara(res.result); this.$refs.paraTurningToolsList.getPara(this.selectionRows[0]); this.$refs.paraCommonToolList.visable = false this.$refs.paraHoleToolsList.visable =false this.$refs.paraThreadingToolList.visable = false this.$refs.paraMillToolList.visable = false this.$refs.paraBladeList.visable = false }else if(this.selectionRows[0].paraTypeFlag === "6"){ this.$refs.paraBladeList.getPara(res.result); this.$refs.paraBladeList.getPara(this.selectionRows[0]); this.$refs.paraCommonToolList.visable = false this.$refs.paraHoleToolsList.visable =false this.$refs.paraThreadingToolList.visable = false @@ -500,17 +498,65 @@ this.$refs.paraTurningToolsList.visable = false this.$refs.paraBladeList.visable = false } } else { this.$message.warning(res.message); } }) getAction(this.url.queryByToolCode, { toolCode: this.selectionRows[0].toolCodeId}).then((res) => { if (res.success) { this.$refs.toolsConfigPropertyList.getPara(res.result); } else { this.$message.warning(res.message); } }) this.$refs.toolsConfigPropertyList.getPara(this.selectionRows[0]); // getAction(this.url.queryParaByToolCode, { toolCode: this.selectionRows[0].toolCodeId,paraTypeFlag:this.selectionRows[0].paraTypeFlag}).then((res) => { // if (res.success) { // if(this.selectionRows[0].paraTypeFlag === "1"){ // this.$refs.paraCommonToolList.getPara(res.result); // //éèå ¶ä»ç±»ååæ° // this.$refs.paraHoleToolsList.visable =false // this.$refs.paraThreadingToolList.visable = false // this.$refs.paraMillToolList.visable = false // this.$refs.paraTurningToolsList.visable = false // this.$refs.paraBladeList.visable = false // }else if(this.selectionRows[0].paraTypeFlag === "2"){ // this.$refs.paraHoleToolsList.getPara(res.result); // this.$refs.paraCommonToolList.visable = false // this.$refs.paraThreadingToolList.visable = false // this.$refs.paraMillToolList.visable = false // this.$refs.paraTurningToolsList.visable = false // this.$refs.paraBladeList.visable = false // }else if(this.selectionRows[0].paraTypeFlag === "3"){ // this.$refs.paraThreadingToolList.getPara(res.result); // this.$refs.paraCommonToolList.visable = false // this.$refs.paraHoleToolsList.visable =false // this.$refs.paraMillToolList.visable = false // this.$refs.paraTurningToolsList.visable = false // this.$refs.paraBladeList.visable = false // }else if(this.selectionRows[0].paraTypeFlag === "4"){ // this.$refs.paraMillToolList.getPara(res.result); // this.$refs.paraCommonToolList.visable = false // this.$refs.paraHoleToolsList.visable =false // this.$refs.paraThreadingToolList.visable = false // this.$refs.paraTurningToolsList.visable = false // this.$refs.paraBladeList.visable = false // }else if(this.selectionRows[0].paraTypeFlag === "5"){ // this.$refs.paraTurningToolsList.getPara(res.result); // this.$refs.paraCommonToolList.visable = false // this.$refs.paraHoleToolsList.visable =false // this.$refs.paraThreadingToolList.visable = false // this.$refs.paraMillToolList.visable = false // this.$refs.paraBladeList.visable = false // }else if(this.selectionRows[0].paraTypeFlag === "6"){ // this.$refs.paraBladeList.getPara(res.result); // this.$refs.paraCommonToolList.visable = false // this.$refs.paraHoleToolsList.visable =false // this.$refs.paraThreadingToolList.visable = false // this.$refs.paraMillToolList.visable = false // this.$refs.paraTurningToolsList.visable = false // this.$refs.paraBladeList.visable = false // } // } else { // this.$message.warning(res.message); // } // }) // getAction(this.url.queryByToolCode, { toolCode: this.selectionRows[0].toolCodeId}).then((res) => { // if (res.success) { // this.$refs.toolsConfigPropertyList.getPara(res.result); // } else { // this.$message.warning(res.message); // } // }) this.$bus.$emit('getToolLedgerData', this.selectionRows[0]) }, //ç¦ç¨ç¶ææ ·å¼ src/views/tms/modules/toolsClassify/ToolsClassifyListRight.vue
@@ -54,10 +54,10 @@ > <a-button @click="handleAdd(nodeSelected)" type="primary" icon="plus" :disabled="!nodeSelected.key || nodeSelected.entity.leafFlag === '1'">æ°å¢</a-button> </Tooltip> <!-- <a-button type="primary" icon="download" @click="handleExportXls('å·¥å ·å类信æ¯')">导åº</a-button> <a-button type="primary" icon="download" @click="handleExportXls('å·¥å ·å类信æ¯')">导åº</a-button> <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel"> <a-button type="primary" icon="import">å¯¼å ¥</a-button> </a-upload> --> </a-upload> </div> <!-- tableåºå-begin -->