From b7ba420ad16b223188d3904e868c69dff2f9eec4 Mon Sep 17 00:00:00 2001 From: zhangdi <1104545947@qq.com> Date: Mon, 23 Mar 2026 15:29:45 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E5=B7=A5=E8=89=BA=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/basic-container/main.vue | 5 + .../bathRefine/components/planCheckDialog.vue | 24 ++-- .../bathRefine/planClass.vue | 28 +++-- .../components/addBasicProcessesDialog.vue | 1 + .../productionMonitoring/index.vue | 115 +++++++++++------- 5 files changed, 104 insertions(+), 69 deletions(-) diff --git a/src/components/basic-container/main.vue b/src/components/basic-container/main.vue index b6a2657..b7231bc 100644 --- a/src/components/basic-container/main.vue +++ b/src/components/basic-container/main.vue @@ -37,6 +37,7 @@ export default { .basic-container { padding: 10px 6px; box-sizing: border-box; + height: 100%; &--block { height: 100%; @@ -51,7 +52,11 @@ export default { &:first-child { padding-top: 0; + height: 100%; } + .basic-container__card { + height: 100%; + } } diff --git a/src/views/processManagement/bathRefine/components/planCheckDialog.vue b/src/views/processManagement/bathRefine/components/planCheckDialog.vue index bbb479b..4cb50fb 100644 --- a/src/views/processManagement/bathRefine/components/planCheckDialog.vue +++ b/src/views/processManagement/bathRefine/components/planCheckDialog.vue @@ -5,7 +5,7 @@ @@ -28,6 +28,7 @@ export default { return { obj: {}, openShow: false, + submitLoading: false, option: { submitBtn: false, emptyBtn: false, @@ -64,29 +65,34 @@ export default { submit() { this.$refs.form.validate((valid, done, msg) => { if (valid) { + this.submitLoading = true; // 室主任审核 - if (this.rowItem.approvalStatus == '-1') { - directorApproval({...this.obj,id:this.rowItem.id}).then(res => { + if (this.rowItem.approvalStatus == '-1' || this.rowItem.approvalStatus == 1) { + directorApproval({ ...this.obj, id: this.rowItem.id }).then(res => { this.$message({ type: 'success', message: '操作成功!', }); this.closeDialog(); + this.submitLoading = false; }); } // 厂长审核 - if (this.rowItem.approvalStatus == '2') { - factoryApproval({...this.obj,id:this.rowItem.id}).then(res=>{ - this.$message({ + if (this.rowItem.approvalStatus == 2) { + factoryApproval({ ...this.obj, id: this.rowItem.id }).then(res => { + this.$message({ type: 'success', message: '操作成功!', }); - this.closeDialog() - }) - } + this.closeDialog(); + this.submitLoading = false; + }); + } + this.submitLoading = false; done(); } else { console.log('error submit!!'); + this.submitLoading = false; return false; } }); diff --git a/src/views/processManagement/bathRefine/planClass.vue b/src/views/processManagement/bathRefine/planClass.vue index 53bc07e..79d4426 100644 --- a/src/views/processManagement/bathRefine/planClass.vue +++ b/src/views/processManagement/bathRefine/planClass.vue @@ -17,7 +17,6 @@ @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad" - > @@ -155,7 +159,7 @@ export default { headerAlign: 'center', align: 'center', searchLabelWidth: 80, - hide:true, + hide: true, dicUrl: `/blade-desk/BA/WorkTank/listForSelect?workstationId={{wcId}}`, props: { label: 'name', @@ -168,10 +172,9 @@ export default { trigger: 'blur', }, ], - change: (value)=> { + change: value => { this.form.batchNoName = value.item.name; }, - }, { label: '维护内容', @@ -202,8 +205,8 @@ export default { headerAlign: 'center', align: 'center', searchLabelWidth: 80, - addDisplay:false, - editDisplay:false, + addDisplay: false, + editDisplay: false, }, { label: '安排日期', @@ -244,7 +247,7 @@ export default { searchLabelWidth: 80, searchOrder: 20, dicData: [ - { + { value: 1, label: '待审核', }, @@ -264,7 +267,6 @@ export default { value: 5, label: '厂长审核未通过', }, - ], rules: [ { @@ -327,7 +329,7 @@ export default { }); }, rowSave(row, done, loading) { - row.arrangeTime = row.arrangeTime+' 00:00:00'; + row.arrangeTime = row.arrangeTime + ' 00:00:00'; add([{ ...row, bbpType: 1 }]).then( () => { this.onLoad(this.page); @@ -344,7 +346,7 @@ export default { ); }, rowUpdate(row, index, done, loading) { - row.arrangeTime = row.arrangeTime+' 00:00:00'; + row.arrangeTime = row.arrangeTime + ' 00:00:00'; update([row]).then( () => { this.onLoad(this.page); @@ -360,7 +362,7 @@ export default { } ); }, - rowDel(row){ + rowDel(row) { this.$confirm('确定将选择数据删除?', { confirmButtonText: '确定', cancelButtonText: '取消', diff --git a/src/views/processManagement/components/addBasicProcessesDialog.vue b/src/views/processManagement/components/addBasicProcessesDialog.vue index b7101cb..ae7d6e6 100644 --- a/src/views/processManagement/components/addBasicProcessesDialog.vue +++ b/src/views/processManagement/components/addBasicProcessesDialog.vue @@ -195,6 +195,7 @@ export default { tableData: [], ruleForm: { cycle: 0, + isCheckout:'0' }, rules: { code: [{ required: true, message: '请输入', trigger: 'blur' }], diff --git a/src/views/productionManagement/productionMonitoring/index.vue b/src/views/productionManagement/productionMonitoring/index.vue index 31e6a84..0ae8533 100644 --- a/src/views/productionManagement/productionMonitoring/index.vue +++ b/src/views/productionManagement/productionMonitoring/index.vue @@ -30,39 +30,56 @@ @@ -90,7 +107,7 @@ :itemData="itemData" @closeDialog="closeDialog" > - + - + @@ -131,8 +153,8 @@ import batchesDialog from '../components/batchesDialog.vue'; import closedDialog from '../components/abnormalDialog.vue'; import abnormalDialog from '../components/abnormalDialog.vue'; import productionMonitoringDialog from '../components/productionMonitoringDialog.vue'; -import workRate from "@/views/workRate/index.vue"; -import { getList,turnType } from '@/api/productionManagement/productionMonitoring'; +import workRate from '@/views/workRate/index.vue'; +import { getList, turnType } from '@/api/productionManagement/productionMonitoring'; export default { components: { @@ -188,7 +210,7 @@ export default { editBtnText: '修改', viewBtnText: '详情', labelWidth: 120, - menuWidth: 380, + menuWidth: 240, dialogWidth: 1200, dialogClickModal: false, searchEnter: true, @@ -215,7 +237,7 @@ export default { sortable: true, overHidden: true, fixed: 'left', - width: 180, + width: 130, }, { @@ -410,7 +432,6 @@ export default { overHidden: true, width: 150, // searchLabelWidth: 100, - }, { label: '订单优先级', @@ -421,7 +442,7 @@ export default { overHidden: true, width: 150, // searchLabelWidth: 100, - hide:true, + hide: true, dicUrl: '/blade-system/dict/dictionary?code=orderPriority', props: { label: 'dictValue', @@ -594,8 +615,8 @@ export default { }, mounted() {}, methods: { - printCraftCard_new(row){ - window.open(window.PROCESS_FLOW_CARD_HEAT_METER+'?woId='+row.woId,'_blank'); + printCraftCard_new(row) { + window.open(window.PROCESS_FLOW_CARD_HEAT_METER + '?woId=' + row.woId, '_blank'); }, // 优先级调整 priorityFn(row) { @@ -648,9 +669,9 @@ export default { id: row.woId, yieldType: '12001', }; - turnType(query).then((res) => { - this.$message.success('转烧结成功'); - this.onLoad(this.page, this.query); + turnType(query).then(res => { + this.$message.success('转烧结成功'); + this.onLoad(this.page, this.query); }); }); }, @@ -707,7 +728,7 @@ export default { this.showAbnormal = false; this.isPriorityOpen = false; // if (type) { - this.onLoad(this.page, this.query); + this.onLoad(this.page, this.query); // } }, currentChange(currentPage) { From 79237d71f668696ab2512dc3ffffc96adaf8e890 Mon Sep 17 00:00:00 2001 From: zhangdi <1104545947@qq.com> Date: Mon, 23 Mar 2026 15:36:42 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E5=B7=A5=E8=89=BA=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../addinPlantMaintenanceDialog.vue | 5 +- .../components/inPlantMaintenance.vue | 77 +++++++++---------- 2 files changed, 40 insertions(+), 42 deletions(-) diff --git a/src/views/processManagement/components/addinPlantMaintenanceDialog.vue b/src/views/processManagement/components/addinPlantMaintenanceDialog.vue index d0f46cd..218e5fe 100644 --- a/src/views/processManagement/components/addinPlantMaintenanceDialog.vue +++ b/src/views/processManagement/components/addinPlantMaintenanceDialog.vue @@ -26,7 +26,6 @@ - + - @@ -114,7 +117,7 @@ import closedDialog from '../components/closedDialog.vue'; import abnormalDialog from '../components/abnormalDialog.vue'; import productionMonitoringDialog from '../components/productionMonitoringDialog.vue'; -import { getList,interlocking } from '@/api/productionManagement/sinTerWorkOrder'; +import { getList, interlocking } from '@/api/productionManagement/sinTerWorkOrder'; export default { components: { productionDialog, @@ -174,7 +177,7 @@ export default { viewBtnText: '详情', labelWidth: 120, // searchLabelWidth: 120, - menuWidth: 260, + menuWidth: 220, dialogWidth: 1200, dialogClickModal: false, searchEnter: true, @@ -341,7 +344,7 @@ export default { overHidden: true, width: 150, }, - { + { label: '订单优先级', prop: 'priorityName', type: 'select', @@ -350,7 +353,6 @@ export default { overHidden: true, width: 150, // searchLabelWidth: 100, - }, { label: '订单优先级', @@ -361,7 +363,7 @@ export default { overHidden: true, width: 150, searchLabelWidth: 100, - hide:true, + hide: true, dicUrl: '/blade-system/dict/dictionary?code=orderPriority', props: { label: 'dictValue', @@ -498,8 +500,8 @@ export default { }, mounted() {}, methods: { - printCraftCard_new(row){ - window.open(window.PROCESS_FLOW_CARD_HEAT_SINTER+'?woId='+row.woId); + printCraftCard_new(row) { + window.open(window.PROCESS_FLOW_CARD_HEAT_SINTER + '?woId=' + row.woId); }, // 合批 handleInterlocking(row) { @@ -511,11 +513,11 @@ export default { cancelButtonText: '取消', type: 'warning', }).then(() => { - let ids= this.selectionList.map(item => item.woId); - let query = { - woIds:ids.join(','), + let ids = this.selectionList.map(item => item.woId); + let query = { + woIds: ids.join(','), }; - interlocking(query).then((res) => { + interlocking(query).then(res => { this.$message.success('操作成功'); this.onLoad(this.page, this.query); }); @@ -601,7 +603,7 @@ export default { this.showAbnormal = false; this.isPriorityOpen = false; // if (type) { - this.onLoad(this.page, this.query); + this.onLoad(this.page, this.query); // } }, currentChange(currentPage) { diff --git a/src/views/productionSchedulingPlan/basic/principalProducer.vue b/src/views/productionSchedulingPlan/basic/principalProducer.vue index 25e64a6..a192cf2 100644 --- a/src/views/productionSchedulingPlan/basic/principalProducer.vue +++ b/src/views/productionSchedulingPlan/basic/principalProducer.vue @@ -90,34 +90,34 @@ export default { searchMenuPosition: 'right', align: 'center', column: [ - { - label: '工序', - prop: 'processId', - search: true, - sortable: true, - span: 12, - type: 'select', - filterable: true, - dicUrl: '/blade-scheduling/processSet/findList', - props: { - label: 'name', - value: 'id', - }, - rules: [ - { - required: true, - message: '请选择', - trigger: 'blur', - }, - ], - change: (val, row) => { - this.onChangeData(val.item, 'processId'); - }, - }, + // { + // label: '工序', + // prop: 'processId', + // search: true, + // sortable: true, + // span: 12, + // type: 'select', + // filterable: true, + // dicUrl: '/blade-scheduling/processSet/findList', + // props: { + // label: 'name', + // value: 'id', + // }, + // rules: [ + // { + // required: true, + // message: '请选择', + // trigger: 'blur', + // }, + // ], + // change: (val, row) => { + // this.onChangeData(val.item, 'processId'); + // }, + // }, { label: '工序', prop: 'processName', - search: false, + search: true, sortable: true, span: 12, hide: true, From eb5376cc56536c4a66fa8543348502a265326b4c Mon Sep 17 00:00:00 2001 From: zhangdi <1104545947@qq.com> Date: Mon, 23 Mar 2026 17:59:04 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E5=B7=A5=E8=89=BA=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processManagement/components/inPlantMaintenance.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/processManagement/components/inPlantMaintenance.vue b/src/views/processManagement/components/inPlantMaintenance.vue index c6e6241..f57a665 100644 --- a/src/views/processManagement/components/inPlantMaintenance.vue +++ b/src/views/processManagement/components/inPlantMaintenance.vue @@ -287,22 +287,22 @@ export default { }, { label: '状态', - prop: 'syncStatu', + prop: 'syncStatus', search: false, sortable: true, filter: true, span: 12, headerAlign: 'center', - align: 'left', + align: 'center', type: 'select', dicData: [ { label: '未同步', - value: '0', + value: 0, }, { label: '已同步', - value: '1', + value: 1, }, ], }, From 5b32aba8920c21173aba8e3828324b6490cf1853 Mon Sep 17 00:00:00 2001 From: zhangdi <1104545947@qq.com> Date: Mon, 23 Mar 2026 19:03:24 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E7=9A=84=E5=90=8E=E7=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/basicData/jobTransferManagement.vue | 2 +- src/views/basicData/localPlateParts/index.vue | 2 +- src/views/basicData/materialQuota/components/KAu.vue | 2 +- src/views/basicData/materialQuota/components/silverAnode.vue | 2 +- src/views/basicData/platThicknessRelation/index.vue | 2 +- src/views/basicData/platingSmall.vue | 2 +- src/views/basicData/qualifications.vue | 2 +- src/views/basicData/teamManagement.vue | 2 +- src/views/costManagement/costConfiguration.vue | 2 +- src/views/costManagement/subjectFeeMaintenance.vue | 2 +- src/views/energyManagement/components/electricityQuota.vue | 2 +- src/views/energyManagement/components/electricityTarget.vue | 2 +- src/views/energyManagement/components/waterQuota.vue | 2 +- src/views/energyManagement/components/waterTarget.vue | 2 +- src/views/energyManagement/energyMonitoring.vue | 2 +- src/views/inboundOutboundManagement/binTransfer/index.vue | 2 +- src/views/inboundOutboundManagement/otherReceiving.vue | 2 +- src/views/oem/baseTemplate/index.vue | 2 +- src/views/oem/oemProcess/index.vue | 2 +- src/views/oem/outsourceBiddingRatio/components/tenderRatio.vue | 2 +- .../oem/outsourceBiddingRatio/components/unTenderRatio.vue | 2 +- src/views/oem/outsourcingAssignmentControl/index.vue | 2 +- src/views/oem/proTask/components/inPlantMaintenance.vue | 2 +- src/views/oem/settlementRules/components/plate.vue | 2 +- src/views/oem/settlementRules/components/process.vue | 2 +- src/views/oem/settlementRules/components/settlement.vue | 2 +- src/views/orderManagement/plannedOrder.vue | 2 +- src/views/orderManagement/sinTerPlanOrder.vue | 2 +- src/views/periodicTesting/projectCycle.vue | 2 +- src/views/periodicTesting/testProject.vue | 2 +- .../salaryManagement/salaryStandard.vue | 2 +- src/views/processManagement/components/oemMaintenance.vue | 2 +- src/views/processManagement/platingTypeInfo.vue | 2 +- src/views/processManagement/processCapability.vue | 2 +- src/views/processManagement/processGroup/index.vue | 2 +- src/views/processManagement/sinTer/components/moldChild.vue | 2 +- src/views/processManagement/sinTer/components/sinterMoldNew.vue | 2 +- .../inspectionArchiving/rbFilePreserve/index.vue | 2 +- src/views/qualityManagement/remindRedeem/index.vue | 2 +- src/views/qualityManagement/similarParts/index.vue | 2 +- src/views/qualityManagement/tankSolutionSystem/info.vue | 2 +- .../qualityManagement/tankSolutionSystem/workTankManagement.vue | 2 +- src/views/safetyManagement/equipmentInspectionPoint/index.vue | 2 +- src/views/safetyManagement/safetyInspectionPoint/index.vue | 2 +- .../safetyManagement/wasteGasSet/components/alarmPoint.vue | 2 +- .../safetyManagement/wasteGasSet/components/dosingRecord.vue | 2 +- .../safetyManagement/wastewater/components/dischargeRec.vue | 2 +- .../safetyManagement/wastewater/components/dosingRecord.vue | 2 +- .../safetyManagement/wastewater/components/meterParameter.vue | 2 +- src/views/safetyManagement/wastewater/components/testRecord.vue | 2 +- src/views/warehouseManagement/allocationManagement.vue | 2 +- src/views/workLicense/workLicense copy.vue | 2 +- 52 files changed, 52 insertions(+), 52 deletions(-) diff --git a/src/views/basicData/jobTransferManagement.vue b/src/views/basicData/jobTransferManagement.vue index c898063..c024d04 100644 --- a/src/views/basicData/jobTransferManagement.vue +++ b/src/views/basicData/jobTransferManagement.vue @@ -39,7 +39,7 @@ 导 入 diff --git a/src/views/energyManagement/components/waterTarget.vue b/src/views/energyManagement/components/waterTarget.vue index 065d4f7..176f455 100644 --- a/src/views/energyManagement/components/waterTarget.vue +++ b/src/views/energyManagement/components/waterTarget.vue @@ -31,7 +31,7 @@ diff --git a/src/views/energyManagement/energyMonitoring.vue b/src/views/energyManagement/energyMonitoring.vue index d5c59bf..3a868f4 100644 --- a/src/views/energyManagement/energyMonitoring.vue +++ b/src/views/energyManagement/energyMonitoring.vue @@ -32,7 +32,7 @@ diff --git a/src/views/inboundOutboundManagement/binTransfer/index.vue b/src/views/inboundOutboundManagement/binTransfer/index.vue index 49b41a6..9983c04 100644 --- a/src/views/inboundOutboundManagement/binTransfer/index.vue +++ b/src/views/inboundOutboundManagement/binTransfer/index.vue @@ -19,7 +19,7 @@ diff --git a/src/views/inboundOutboundManagement/otherReceiving.vue b/src/views/inboundOutboundManagement/otherReceiving.vue index dc363ac..f0a82a5 100644 --- a/src/views/inboundOutboundManagement/otherReceiving.vue +++ b/src/views/inboundOutboundManagement/otherReceiving.vue @@ -27,7 +27,7 @@ :buy-cycle="buyCycle"> diff --git a/src/views/oem/baseTemplate/index.vue b/src/views/oem/baseTemplate/index.vue index b70aedf..e4cdeaf 100644 --- a/src/views/oem/baseTemplate/index.vue +++ b/src/views/oem/baseTemplate/index.vue @@ -23,7 +23,7 @@ diff --git a/src/views/oem/oemProcess/index.vue b/src/views/oem/oemProcess/index.vue index 5a82245..77f59cd 100644 --- a/src/views/oem/oemProcess/index.vue +++ b/src/views/oem/oemProcess/index.vue @@ -28,7 +28,7 @@ diff --git a/src/views/oem/outsourceBiddingRatio/components/tenderRatio.vue b/src/views/oem/outsourceBiddingRatio/components/tenderRatio.vue index da19082..13a48cb 100644 --- a/src/views/oem/outsourceBiddingRatio/components/tenderRatio.vue +++ b/src/views/oem/outsourceBiddingRatio/components/tenderRatio.vue @@ -28,7 +28,7 @@ diff --git a/src/views/oem/outsourceBiddingRatio/components/unTenderRatio.vue b/src/views/oem/outsourceBiddingRatio/components/unTenderRatio.vue index 61fc27c..6c845be 100644 --- a/src/views/oem/outsourceBiddingRatio/components/unTenderRatio.vue +++ b/src/views/oem/outsourceBiddingRatio/components/unTenderRatio.vue @@ -29,7 +29,7 @@ diff --git a/src/views/oem/outsourcingAssignmentControl/index.vue b/src/views/oem/outsourcingAssignmentControl/index.vue index 0871c7a..7c34194 100644 --- a/src/views/oem/outsourcingAssignmentControl/index.vue +++ b/src/views/oem/outsourcingAssignmentControl/index.vue @@ -54,7 +54,7 @@ diff --git a/src/views/oem/proTask/components/inPlantMaintenance.vue b/src/views/oem/proTask/components/inPlantMaintenance.vue index 042e2a0..6ff2c79 100644 --- a/src/views/oem/proTask/components/inPlantMaintenance.vue +++ b/src/views/oem/proTask/components/inPlantMaintenance.vue @@ -29,7 +29,7 @@ title="导入" :isShow="isShowImport" templateUrl="/blade-desk/QA/CycleTestItem/download-excel-template" - templateName="试验项目模板.xlsx" + templateName="试验项目模板.xls" importUrl="/blade-desk/QA/CycleTestItem/import-excel" @closeDialog="closeDialog" > diff --git a/src/views/oem/settlementRules/components/plate.vue b/src/views/oem/settlementRules/components/plate.vue index a12278e..79db166 100644 --- a/src/views/oem/settlementRules/components/plate.vue +++ b/src/views/oem/settlementRules/components/plate.vue @@ -24,7 +24,7 @@ diff --git a/src/views/oem/settlementRules/components/process.vue b/src/views/oem/settlementRules/components/process.vue index 1d19677..1d600d3 100644 --- a/src/views/oem/settlementRules/components/process.vue +++ b/src/views/oem/settlementRules/components/process.vue @@ -21,7 +21,7 @@ diff --git a/src/views/oem/settlementRules/components/settlement.vue b/src/views/oem/settlementRules/components/settlement.vue index df95e0f..ed21767 100644 --- a/src/views/oem/settlementRules/components/settlement.vue +++ b/src/views/oem/settlementRules/components/settlement.vue @@ -30,7 +30,7 @@ diff --git a/src/views/orderManagement/plannedOrder.vue b/src/views/orderManagement/plannedOrder.vue index e80b8f9..d87707d 100644 --- a/src/views/orderManagement/plannedOrder.vue +++ b/src/views/orderManagement/plannedOrder.vue @@ -77,7 +77,7 @@ title="导入" :isShow="isShowImport" templateUrl="/blade-desk/QA/CycleTestItem/download-excel-template" - templateName="试验项目模板.xlsx" + templateName="试验项目模板.xls" importUrl="/blade-desk/QA/CycleTestItem/import-excel" @closeDialog="closeDialog" > diff --git a/src/views/orderManagement/sinTerPlanOrder.vue b/src/views/orderManagement/sinTerPlanOrder.vue index b90b1df..60f0dda 100644 --- a/src/views/orderManagement/sinTerPlanOrder.vue +++ b/src/views/orderManagement/sinTerPlanOrder.vue @@ -65,7 +65,7 @@ title="导入" :isShow="isShowImport" templateUrl="/blade-desk/QA/CycleTestItem/download-excel-template" - templateName="试验项目模板.xlsx" + templateName="试验项目模板.xls" importUrl="/blade-desk/QA/CycleTestItem/import-excel" @closeDialog="closeDialog" > diff --git a/src/views/periodicTesting/projectCycle.vue b/src/views/periodicTesting/projectCycle.vue index 2d58558..5667072 100644 --- a/src/views/periodicTesting/projectCycle.vue +++ b/src/views/periodicTesting/projectCycle.vue @@ -178,7 +178,7 @@ diff --git a/src/views/periodicTesting/testProject.vue b/src/views/periodicTesting/testProject.vue index c299edd..527c0f2 100644 --- a/src/views/periodicTesting/testProject.vue +++ b/src/views/periodicTesting/testProject.vue @@ -47,7 +47,7 @@ diff --git a/src/views/personnelEfficiencyManagement/salaryManagement/salaryStandard.vue b/src/views/personnelEfficiencyManagement/salaryManagement/salaryStandard.vue index c1d6200..cc61c87 100644 --- a/src/views/personnelEfficiencyManagement/salaryManagement/salaryStandard.vue +++ b/src/views/personnelEfficiencyManagement/salaryManagement/salaryStandard.vue @@ -42,7 +42,7 @@ diff --git a/src/views/processManagement/components/oemMaintenance.vue b/src/views/processManagement/components/oemMaintenance.vue index bf70d78..9884aa4 100644 --- a/src/views/processManagement/components/oemMaintenance.vue +++ b/src/views/processManagement/components/oemMaintenance.vue @@ -32,7 +32,7 @@ title="导入" :isShow="isShowImport" templateUrl="/blade-desk/QA/CycleTestItem/download-excel-template" - templateName="试验项目模板.xlsx" + templateName="试验项目模板.xls" importUrl="/blade-desk/QA/CycleTestItem/import-excel" @closeDialog="closeDialog" > diff --git a/src/views/processManagement/platingTypeInfo.vue b/src/views/processManagement/platingTypeInfo.vue index 27dc1d1..3c65029 100644 --- a/src/views/processManagement/platingTypeInfo.vue +++ b/src/views/processManagement/platingTypeInfo.vue @@ -49,7 +49,7 @@ diff --git a/src/views/processManagement/processCapability.vue b/src/views/processManagement/processCapability.vue index 6fcbb6c..6c09c94 100644 --- a/src/views/processManagement/processCapability.vue +++ b/src/views/processManagement/processCapability.vue @@ -56,7 +56,7 @@ diff --git a/src/views/processManagement/processGroup/index.vue b/src/views/processManagement/processGroup/index.vue index 4ed32d7..c04a97c 100644 --- a/src/views/processManagement/processGroup/index.vue +++ b/src/views/processManagement/processGroup/index.vue @@ -28,7 +28,7 @@ diff --git a/src/views/processManagement/sinTer/components/moldChild.vue b/src/views/processManagement/sinTer/components/moldChild.vue index de1d19a..17d86ee 100644 --- a/src/views/processManagement/sinTer/components/moldChild.vue +++ b/src/views/processManagement/sinTer/components/moldChild.vue @@ -29,7 +29,7 @@ title="导入" :isShow="isShowImport" templateUrl="/blade-desk/QA/CycleTestItem/download-excel-template" - templateName="试验项目模板.xlsx" + templateName="试验项目模板.xls" importUrl="/blade-desk/QA/CycleTestItem/import-excel" @closeDialog="closeDialog" > diff --git a/src/views/processManagement/sinTer/components/sinterMoldNew.vue b/src/views/processManagement/sinTer/components/sinterMoldNew.vue index de1d19a..17d86ee 100644 --- a/src/views/processManagement/sinTer/components/sinterMoldNew.vue +++ b/src/views/processManagement/sinTer/components/sinterMoldNew.vue @@ -29,7 +29,7 @@ title="导入" :isShow="isShowImport" templateUrl="/blade-desk/QA/CycleTestItem/download-excel-template" - templateName="试验项目模板.xlsx" + templateName="试验项目模板.xls" importUrl="/blade-desk/QA/CycleTestItem/import-excel" @closeDialog="closeDialog" > diff --git a/src/views/qualityManagement/inspectionArchiving/rbFilePreserve/index.vue b/src/views/qualityManagement/inspectionArchiving/rbFilePreserve/index.vue index 7c48c74..da08c5a 100644 --- a/src/views/qualityManagement/inspectionArchiving/rbFilePreserve/index.vue +++ b/src/views/qualityManagement/inspectionArchiving/rbFilePreserve/index.vue @@ -75,7 +75,7 @@ title="导入" :isShow="isShowImport" templateUrl="/blade-desk/QA/CycleTestItem/download-excel-template" - templateName="试验项目模板.xlsx" + templateName="试验项目模板.xls" importUrl="/blade-desk/QA/CycleTestItem/import-excel" @closeDialog="closeDialog" > diff --git a/src/views/qualityManagement/remindRedeem/index.vue b/src/views/qualityManagement/remindRedeem/index.vue index caae048..2bd7a94 100644 --- a/src/views/qualityManagement/remindRedeem/index.vue +++ b/src/views/qualityManagement/remindRedeem/index.vue @@ -27,7 +27,7 @@ diff --git a/src/views/qualityManagement/similarParts/index.vue b/src/views/qualityManagement/similarParts/index.vue index 0cc8b48..bb3aabd 100644 --- a/src/views/qualityManagement/similarParts/index.vue +++ b/src/views/qualityManagement/similarParts/index.vue @@ -39,7 +39,7 @@ title="导入" :isShow="isShowImport" templateUrl="/blade-desk/dsSimilarParts/import-template" - templateName="相似零件导入模板.xlsx" + templateName="相似零件导入模板.xls" importUrl="/blade-desk//dsSimilarParts/import-excel-simple" @closeDialog="closeDialog" > diff --git a/src/views/qualityManagement/tankSolutionSystem/info.vue b/src/views/qualityManagement/tankSolutionSystem/info.vue index 6d13709..e7b717f 100644 --- a/src/views/qualityManagement/tankSolutionSystem/info.vue +++ b/src/views/qualityManagement/tankSolutionSystem/info.vue @@ -83,7 +83,7 @@ diff --git a/src/views/qualityManagement/tankSolutionSystem/workTankManagement.vue b/src/views/qualityManagement/tankSolutionSystem/workTankManagement.vue index a3ae010..3d3e5c1 100644 --- a/src/views/qualityManagement/tankSolutionSystem/workTankManagement.vue +++ b/src/views/qualityManagement/tankSolutionSystem/workTankManagement.vue @@ -47,7 +47,7 @@ title="导入" :isShow="isShowImport" templateUrl="/blade-desk/BA/WorkTank/downloadExcelTemplate" - templateName="作业槽模板.xlsx" + templateName="作业槽模板.xls" importUrl="/blade-desk/BA/WorkTank/importExcel" @closeDialog="closeDialog" > diff --git a/src/views/safetyManagement/equipmentInspectionPoint/index.vue b/src/views/safetyManagement/equipmentInspectionPoint/index.vue index 9b161b8..53b45d3 100644 --- a/src/views/safetyManagement/equipmentInspectionPoint/index.vue +++ b/src/views/safetyManagement/equipmentInspectionPoint/index.vue @@ -33,7 +33,7 @@ diff --git a/src/views/safetyManagement/safetyInspectionPoint/index.vue b/src/views/safetyManagement/safetyInspectionPoint/index.vue index cc15573..b1cce2e 100644 --- a/src/views/safetyManagement/safetyInspectionPoint/index.vue +++ b/src/views/safetyManagement/safetyInspectionPoint/index.vue @@ -32,7 +32,7 @@ title="导入" :isShow="isShowImport" templateUrl="/blade-desk/bsSafeInspectionPoint/downloadExcelTemplate" - templateName="安全巡检点配置导入模板.xlsx" + templateName="安全巡检点配置导入模板.xls" importUrl="/blade-desk/bsSafeInspectionPoint/importExcel" @closeDialog="closeImportDialog" > diff --git a/src/views/safetyManagement/wasteGasSet/components/alarmPoint.vue b/src/views/safetyManagement/wasteGasSet/components/alarmPoint.vue index c667b21..d746a6c 100644 --- a/src/views/safetyManagement/wasteGasSet/components/alarmPoint.vue +++ b/src/views/safetyManagement/wasteGasSet/components/alarmPoint.vue @@ -35,7 +35,7 @@ title="导入" :isShow="isShowImport" templateUrl="/blade-desk/bsTower/downloadExcelTemplate" - templateName="报警点配置导入模板.xlsx" + templateName="报警点配置导入模板.xls" importUrl="/blade-desk/bsTower/importExcel" @closeDialog="closeImportDialog" > diff --git a/src/views/safetyManagement/wasteGasSet/components/dosingRecord.vue b/src/views/safetyManagement/wasteGasSet/components/dosingRecord.vue index 6f7295d..f078662 100644 --- a/src/views/safetyManagement/wasteGasSet/components/dosingRecord.vue +++ b/src/views/safetyManagement/wasteGasSet/components/dosingRecord.vue @@ -32,7 +32,7 @@ title="导入" :isShow="isShowImport" templateUrl="/blade-desk/bsDosingRec/downloadExcelTemplate" - templateName="废气加药记录导入模板.xlsx" + templateName="废气加药记录导入模板.xls" importUrl="/blade-desk/bsDosingRec/importExcel" @closeDialog="closeImportDialog" > diff --git a/src/views/safetyManagement/wastewater/components/dischargeRec.vue b/src/views/safetyManagement/wastewater/components/dischargeRec.vue index 8a95b96..cf6ee11 100644 --- a/src/views/safetyManagement/wastewater/components/dischargeRec.vue +++ b/src/views/safetyManagement/wastewater/components/dischargeRec.vue @@ -27,7 +27,7 @@ diff --git a/src/views/safetyManagement/wastewater/components/dosingRecord.vue b/src/views/safetyManagement/wastewater/components/dosingRecord.vue index 0031070..48a891d 100644 --- a/src/views/safetyManagement/wastewater/components/dosingRecord.vue +++ b/src/views/safetyManagement/wastewater/components/dosingRecord.vue @@ -22,7 +22,7 @@ diff --git a/src/views/safetyManagement/wastewater/components/meterParameter.vue b/src/views/safetyManagement/wastewater/components/meterParameter.vue index d961f41..76a58d3 100644 --- a/src/views/safetyManagement/wastewater/components/meterParameter.vue +++ b/src/views/safetyManagement/wastewater/components/meterParameter.vue @@ -30,7 +30,7 @@ title="导入" :isShow="isShowImport" templateUrl="/blade-safety/wasteWaterMeterParameter/download-excel-template" - templateName="废水计量参数导入模板.xlsx" + templateName="废水计量参数导入模板.xls" importUrl="/blade-safety/wasteWaterMeterParameter/import-excel" @closeDialog="closeDialog" > diff --git a/src/views/safetyManagement/wastewater/components/testRecord.vue b/src/views/safetyManagement/wastewater/components/testRecord.vue index 6f49078..996607b 100644 --- a/src/views/safetyManagement/wastewater/components/testRecord.vue +++ b/src/views/safetyManagement/wastewater/components/testRecord.vue @@ -32,7 +32,7 @@ title="导入" :isShow="isShowImport" templateUrl="/blade-desk/bsInsTest/downloadExcelTemplate" - templateName="废水化验记录导入模板.xlsx" + templateName="废水化验记录导入模板.xls" importUrl="/blade-desk/bsInsTest/importExcel" @closeDialog="closeImportDialog" > diff --git a/src/views/warehouseManagement/allocationManagement.vue b/src/views/warehouseManagement/allocationManagement.vue index 4d32ce2..50f1d6c 100644 --- a/src/views/warehouseManagement/allocationManagement.vue +++ b/src/views/warehouseManagement/allocationManagement.vue @@ -60,7 +60,7 @@ diff --git a/src/views/workLicense/workLicense copy.vue b/src/views/workLicense/workLicense copy.vue index 938c194..099bada 100644 --- a/src/views/workLicense/workLicense copy.vue +++ b/src/views/workLicense/workLicense copy.vue @@ -164,7 +164,7 @@ title="导入" :isShow="isShowImport" templateUrl="/blade-desk/certificateMaintenance/downloadExcelTemplate" - templateName="上岗台账导入模板.xlsx" + templateName="上岗台账导入模板.xls" importUrl="/blade-desk/certificateMaintenance/importExcel" @closeDialog="closeDialog" >