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/basicData/jobTransferManagement.vue b/src/views/basicData/jobTransferManagement.vue index a73018e..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 f673723..561436b 100644 --- a/src/views/energyManagement/components/waterTarget.vue +++ b/src/views/energyManagement/components/waterTarget.vue @@ -38,7 +38,7 @@ diff --git a/src/views/energyManagement/energyMonitoring.vue b/src/views/energyManagement/energyMonitoring.vue index c198f13..4293335 100644 --- a/src/views/energyManagement/energyMonitoring.vue +++ b/src/views/energyManagement/energyMonitoring.vue @@ -35,7 +35,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/bathRefine/components/addPeriodicalClassDialog.vue b/src/views/processManagement/bathRefine/components/addPeriodicalClassDialog.vue index 9c6191e..94e1eb2 100644 --- a/src/views/processManagement/bathRefine/components/addPeriodicalClassDialog.vue +++ b/src/views/processManagement/bathRefine/components/addPeriodicalClassDialog.vue @@ -69,6 +69,7 @@ style="width: 100%" clearable filterable + @change="batchNoChange(scope.row, scope.$index)" > row.id == this.form.tableData[index].batchNo + ); + console.log(select, 'select'); + this.form.tableData[index].batchNoName = select[0].name; + }, // 切换作业中心 changeWorkCenter(index) { this.form.batchNo = ''; 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/bathRefine/workCenterDevice.vue b/src/views/processManagement/bathRefine/workCenterDevice.vue index c282abb..8be0be0 100644 --- a/src/views/processManagement/bathRefine/workCenterDevice.vue +++ b/src/views/processManagement/bathRefine/workCenterDevice.vue @@ -61,11 +61,11 @@ export default { delBtnIcon: ' ', editBtnIcon: ' ', viewBtnText: '详情', - labelWidth: 120, + labelWidth: 100, searchLabelWidth: 120, menu: true, menuWidth: 120, - dialogWidth: 1200, + dialogWidth: 450, dialogClickModal: false, searchEnter: true, excelBtn: false, @@ -82,7 +82,7 @@ export default { searchSpan: 6, searchMenuPosition: 'right', align: 'center', - + span:24, column: [ { label: '作业中心', @@ -116,6 +116,7 @@ export default { type: 'select', filterable: true, clearable: true, + span:24, // multiple: true, search: false, sortable: true, 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/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 @@ - + @@ -167,7 +164,7 @@ export default { editBtnIcon: ' ', viewBtnText: '详情', labelWidth: 120, - menuWidth: 260, + menuWidth: 220, dialogWidth: 1200, dialogClickModal: false, searchEnter: true, diff --git a/src/views/productionManagement/blbWorkOrder/components/others.vue b/src/views/productionManagement/blbWorkOrder/components/others.vue index 08edf4f..9a705b2 100644 --- a/src/views/productionManagement/blbWorkOrder/components/others.vue +++ b/src/views/productionManagement/blbWorkOrder/components/others.vue @@ -29,26 +29,23 @@ @@ -167,7 +164,7 @@ export default { editBtnIcon: ' ', viewBtnText: '详情', labelWidth: 120, - menuWidth: 260, + menuWidth: 220, dialogWidth: 1200, dialogClickModal: false, searchEnter: true, diff --git a/src/views/productionManagement/components/closedDialog.vue b/src/views/productionManagement/components/closedDialog.vue index 1a345cd..16711bb 100644 --- a/src/views/productionManagement/components/closedDialog.vue +++ b/src/views/productionManagement/components/closedDialog.vue @@ -45,7 +45,7 @@ export default { prop: 'memo', type: 'textarea', span: 24, - rows: 2, + // rows: 2, rules: [ { required: true, @@ -58,7 +58,9 @@ export default { }, }; }, - mounted() {}, + mounted() { + console.log(this.itemData,this.showClose); + }, methods: { // 关闭弹窗 closeDialog() { diff --git a/src/views/productionManagement/productionMonitoring/index.vue b/src/views/productionManagement/productionMonitoring/index.vue index 31e6a84..f7df05c 100644 --- a/src/views/productionManagement/productionMonitoring/index.vue +++ b/src/views/productionManagement/productionMonitoring/index.vue @@ -8,7 +8,6 @@ v-model="form" v-model:page="page" ref="crud" - @row-del="rowDel" @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange" @@ -30,39 +29,56 @@ @@ -90,7 +106,7 @@ :itemData="itemData" @closeDialog="closeDialog" > - + - + > - + @@ -128,11 +149,11 @@ import outsourceDialog from '../components/outsourceDialog.vue'; import productionDialog from '../components/productionDialog.vue'; import batchesDialog from '../components/batchesDialog.vue'; -import closedDialog from '../components/abnormalDialog.vue'; +import closedDialog from '../components/closedDialog.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 +209,7 @@ export default { editBtnText: '修改', viewBtnText: '详情', labelWidth: 120, - menuWidth: 380, + menuWidth: 240, dialogWidth: 1200, dialogClickModal: false, searchEnter: true, @@ -215,7 +236,7 @@ export default { sortable: true, overHidden: true, fixed: 'left', - width: 180, + width: 130, }, { @@ -410,7 +431,6 @@ export default { overHidden: true, width: 150, // searchLabelWidth: 100, - }, { label: '订单优先级', @@ -421,7 +441,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 +614,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) { @@ -635,6 +655,7 @@ export default { handleClose(row) { this.itemData = [row]; this.showClose = true; + }, // 转烧结 @@ -645,12 +666,12 @@ export default { type: 'warning', }).then(() => { let query = { - id: row.woId, - yieldType: '12001', + id: row.yoId, + yieldType: '12002', }; - 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) { diff --git a/src/views/productionManagement/sinTerWorkOrder/index.vue b/src/views/productionManagement/sinTerWorkOrder/index.vue index d415480..9070b6f 100644 --- a/src/views/productionManagement/sinTerWorkOrder/index.vue +++ b/src/views/productionManagement/sinTerWorkOrder/index.vue @@ -30,26 +30,30 @@ 已完工 @@ -113,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, @@ -173,7 +177,7 @@ export default { viewBtnText: '详情', labelWidth: 120, // searchLabelWidth: 120, - menuWidth: 260, + menuWidth: 220, dialogWidth: 1200, dialogClickModal: false, searchEnter: true, @@ -340,7 +344,7 @@ export default { overHidden: true, width: 150, }, - { + { label: '订单优先级', prop: 'priorityName', type: 'select', @@ -349,7 +353,6 @@ export default { overHidden: true, width: 150, // searchLabelWidth: 100, - }, { label: '订单优先级', @@ -360,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', @@ -497,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) { @@ -510,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); }); @@ -600,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, 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/personnelEquipment.vue b/src/views/workLicense/personnelEquipment.vue index 11aca80..f1aeefa 100644 --- a/src/views/workLicense/personnelEquipment.vue +++ b/src/views/workLicense/personnelEquipment.vue @@ -16,30 +16,28 @@ @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad" - :row-class-name="rowClassName" > - + -