Merge branch 'dev-scheduling' of http://42.192.7.176:3000/suojin/jonhon-mes-web into dev-scheduling

dev-scheduling
姜雪 2 months ago
commit a69d3f4a6f
  1. 5
      src/components/basic-container/main.vue
  2. 24
      src/views/basicData/jobTransferManagement.vue
  3. 2
      src/views/basicData/localPlateParts/index.vue
  4. 2
      src/views/basicData/materialQuota/components/KAu.vue
  5. 2
      src/views/basicData/materialQuota/components/silverAnode.vue
  6. 2
      src/views/basicData/platThicknessRelation/index.vue
  7. 2
      src/views/basicData/platingSmall.vue
  8. 2
      src/views/basicData/qualifications.vue
  9. 2
      src/views/basicData/teamManagement.vue
  10. 4
      src/views/changeJobManagement/trainingRecordManagement.vue
  11. 2
      src/views/costManagement/costConfiguration.vue
  12. 2
      src/views/costManagement/subjectFeeMaintenance.vue
  13. 2
      src/views/energyManagement/components/electricityQuota.vue
  14. 2
      src/views/energyManagement/components/electricityTarget.vue
  15. 2
      src/views/energyManagement/components/waterQuota.vue
  16. 2
      src/views/energyManagement/components/waterTarget.vue
  17. 2
      src/views/energyManagement/energyMonitoring.vue
  18. 2
      src/views/inboundOutboundManagement/binTransfer/index.vue
  19. 2
      src/views/inboundOutboundManagement/otherReceiving.vue
  20. 2
      src/views/oem/baseTemplate/index.vue
  21. 2
      src/views/oem/oemProcess/index.vue
  22. 2
      src/views/oem/outsourceBiddingRatio/components/tenderRatio.vue
  23. 2
      src/views/oem/outsourceBiddingRatio/components/unTenderRatio.vue
  24. 2
      src/views/oem/outsourcingAssignmentControl/index.vue
  25. 2
      src/views/oem/proTask/components/inPlantMaintenance.vue
  26. 2
      src/views/oem/settlementRules/components/plate.vue
  27. 2
      src/views/oem/settlementRules/components/process.vue
  28. 2
      src/views/oem/settlementRules/components/settlement.vue
  29. 2
      src/views/orderManagement/plannedOrder.vue
  30. 2
      src/views/orderManagement/sinTerPlanOrder.vue
  31. 2
      src/views/periodicTesting/projectCycle.vue
  32. 2
      src/views/periodicTesting/testProject.vue
  33. 2
      src/views/personnelEfficiencyManagement/salaryManagement/salaryStandard.vue
  34. 8
      src/views/processManagement/bathRefine/components/addPeriodicalClassDialog.vue
  35. 20
      src/views/processManagement/bathRefine/components/planCheckDialog.vue
  36. 24
      src/views/processManagement/bathRefine/planClass.vue
  37. 7
      src/views/processManagement/bathRefine/workCenterDevice.vue
  38. 1
      src/views/processManagement/components/addBasicProcessesDialog.vue
  39. 5
      src/views/processManagement/components/addinPlantMaintenanceDialog.vue
  40. 85
      src/views/processManagement/components/inPlantMaintenance.vue
  41. 2
      src/views/processManagement/components/oemMaintenance.vue
  42. 2
      src/views/processManagement/platingTypeInfo.vue
  43. 2
      src/views/processManagement/processGroup/index.vue
  44. 2
      src/views/processManagement/sinTer/components/moldChild.vue
  45. 2
      src/views/processManagement/sinTer/components/sinterMoldNew.vue
  46. 37
      src/views/productionManagement/blbWorkOrder/components/glass.vue
  47. 37
      src/views/productionManagement/blbWorkOrder/components/others.vue
  48. 6
      src/views/productionManagement/components/closedDialog.vue
  49. 71
      src/views/productionManagement/productionMonitoring/index.vue
  50. 51
      src/views/productionManagement/sinTerWorkOrder/index.vue
  51. 50
      src/views/productionSchedulingPlan/basic/principalProducer.vue
  52. 2
      src/views/qualityManagement/inspectionArchiving/rbFilePreserve/index.vue
  53. 2
      src/views/qualityManagement/remindRedeem/index.vue
  54. 2
      src/views/qualityManagement/similarParts/index.vue
  55. 2
      src/views/qualityManagement/tankSolutionSystem/info.vue
  56. 2
      src/views/qualityManagement/tankSolutionSystem/workTankManagement.vue
  57. 2
      src/views/safetyManagement/equipmentInspectionPoint/index.vue
  58. 2
      src/views/safetyManagement/safetyInspectionPoint/index.vue
  59. 2
      src/views/safetyManagement/wasteGasSet/components/alarmPoint.vue
  60. 2
      src/views/safetyManagement/wasteGasSet/components/dosingRecord.vue
  61. 2
      src/views/safetyManagement/wastewater/components/dischargeRec.vue
  62. 2
      src/views/safetyManagement/wastewater/components/dosingRecord.vue
  63. 2
      src/views/safetyManagement/wastewater/components/meterParameter.vue
  64. 2
      src/views/safetyManagement/wastewater/components/testRecord.vue
  65. 2
      src/views/warehouseManagement/allocationManagement.vue
  66. 18
      src/views/workLicense/personnelEquipment.vue
  67. 2
      src/views/workLicense/workLicense copy.vue
  68. 14
      src/views/workLicense/workLicense.vue

@ -37,6 +37,7 @@ export default {
.basic-container { .basic-container {
padding: 10px 6px; padding: 10px 6px;
box-sizing: border-box; box-sizing: border-box;
height: 100%;
&--block { &--block {
height: 100%; height: 100%;
@ -51,6 +52,10 @@ export default {
&:first-child { &:first-child {
padding-top: 0; padding-top: 0;
height: 100%;
}
.basic-container__card {
height: 100%;
} }
} }

@ -39,7 +39,7 @@
<el-button type="primary" @click="handleImport"> </el-button> <el-button type="primary" @click="handleImport"> </el-button>
</template> </template>
<template #menu="scope"> <template #menu="scope">
<el-button v-show="scope.row.phStatus == 6" type="text" @click="transferToFun(scope.row)" <el-button v-show="scope.row.phStatus == 7" type="text" @click="transferToFun(scope.row)"
>转岗</el-button >转岗</el-button
> >
<!-- v-show="scope.row.phStatus == 3" --> <!-- v-show="scope.row.phStatus == 3" -->
@ -47,16 +47,16 @@
<el-button type="text" @click="individualTakeFun(scope.row)">个人信息</el-button> <el-button type="text" @click="individualTakeFun(scope.row)">个人信息</el-button>
</template> </template>
<template #dataBirth="scope"> <template #dataBirth="scope">
{{ scope.row.dataBirth ?scope.row.dataBirth.substring(0, 10) : ''}} {{ scope.row.dataBirth ? scope.row.dataBirth.substring(0, 10) : '' }}
</template> </template>
<template #contractDuration="scope"> <template #contractDuration="scope">
{{ scope.row.contractDuration ?scope.row.contractDuration.substring(0, 10) : ''}} {{ scope.row.contractDuration ? scope.row.contractDuration.substring(0, 10) : '' }}
</template> </template>
<template #joinJobDate="scope"> <template #joinJobDate="scope">
{{ scope.row.joinJobDate ?scope.row.joinJobDate.substring(0, 10) : ''}} {{ scope.row.joinJobDate ? scope.row.joinJobDate.substring(0, 10) : '' }}
</template> </template>
<template #inJobDate="scope"> <template #inJobDate="scope">
{{ scope.row.inJobDate ?scope.row.inJobDate.substring(0, 10) : ''}} {{ scope.row.inJobDate ? scope.row.inJobDate.substring(0, 10) : '' }}
</template> </template>
</avue-crud> </avue-crud>
@ -103,7 +103,14 @@
</template> </template>
</el-dialog> </el-dialog>
<!-- 个人信息 --> <!-- 个人信息 -->
<el-dialog title="个人信息" append-to-body v-if="personalOpen" v-model="personalOpen" width="60%" border> <el-dialog
title="个人信息"
append-to-body
v-if="personalOpen"
v-model="personalOpen"
width="60%"
border
>
<el-table :data="personData"> <el-table :data="personData">
<el-table-column label="姓名" prop="userName" min-width="120" /> <el-table-column label="姓名" prop="userName" min-width="120" />
<el-table-column label="工号" prop="userCode" min-width="120" /> <el-table-column label="工号" prop="userCode" min-width="120" />
@ -718,7 +725,6 @@ export default {
this.showDialog = false; this.showDialog = false;
this.onLoad(this.page, this.query); this.onLoad(this.page, this.query);
}); });
} else { } else {
console.log('error submit!!'); console.log('error submit!!');
return false; return false;
@ -862,10 +868,8 @@ export default {
} }
const ids = idArr.join(','); const ids = idArr.join(',');
regularization({ ids: ids }).then(res => { regularization({ ids: ids }).then(res => {
if (res.code == 200) {
this.$message.success('转正成功'); this.$message.success('转正成功');
this.onLoad(this.page); this.onLoad(this.page, this.query);
}
}); });
}); });
}, },

@ -30,7 +30,7 @@
<!-- 导入 --> <!-- 导入 -->
<basic-import v-if="isShowImport" title="导入" :isShow="isShowImport" <basic-import v-if="isShowImport" title="导入" :isShow="isShowImport"
templateUrl="/blade-desk/BA/LocallyPlatedPart/downloadExcelTemplate" templateUrl="/blade-desk/BA/LocallyPlatedPart/downloadExcelTemplate"
templateName="局部镀零件模板.xlsx" templateName="局部镀零件模板.xls"
importUrl="/blade-desk/BA/LocallyPlatedPart/importExcel" importUrl="/blade-desk/BA/LocallyPlatedPart/importExcel"
@closeDialog="closeDialog"></basic-import> @closeDialog="closeDialog"></basic-import>
</basic-container> </basic-container>

@ -37,7 +37,7 @@
<!-- 导入 --> <!-- 导入 -->
<basic-import v-if="isShowImport" title="导入" :isShow="isShowImport" <basic-import v-if="isShowImport" title="导入" :isShow="isShowImport"
templateUrl="/blade-desk/BA/MaterialQuota/downloadExcelTemplate" templateUrl="/blade-desk/BA/MaterialQuota/downloadExcelTemplate"
templateName="金钾定额模板.xlsx" templateName="金钾定额模板.xls"
importUrl="/blade-desk/BA/MaterialQuota/importExcel" importUrl="/blade-desk/BA/MaterialQuota/importExcel"
@closeDialog="closeDialog"></basic-import> @closeDialog="closeDialog"></basic-import>
</div> </div>

@ -37,7 +37,7 @@
<!-- 导入 --> <!-- 导入 -->
<basic-import v-if="isShowImport" title="导入" :isShow="isShowImport" <basic-import v-if="isShowImport" title="导入" :isShow="isShowImport"
templateUrl="/blade-desk/QA/CycleTestItem/download-excel-template" templateUrl="/blade-desk/QA/CycleTestItem/download-excel-template"
templateName="试验项目模板.xlsx" templateName="试验项目模板.xls"
importUrl="/blade-desk/QA/CycleTestItem/import-excel" importUrl="/blade-desk/QA/CycleTestItem/import-excel"
@closeDialog="closeDialog"></basic-import> @closeDialog="closeDialog"></basic-import>
</div> </div>

@ -31,7 +31,7 @@
<!-- 导入 --> <!-- 导入 -->
<basic-import v-if="isShowImport" title="导入" :isShow="isShowImport" <basic-import v-if="isShowImport" title="导入" :isShow="isShowImport"
templateUrl="/blade-desk/BA/CoatingThickness/downloadExcelTemplate" templateUrl="/blade-desk/BA/CoatingThickness/downloadExcelTemplate"
templateName="镀层厚度对应表.xlsx" templateName="镀层厚度对应表.xls"
importUrl="/blade-desk/BA/CoatingThickness/importExcel" importUrl="/blade-desk/BA/CoatingThickness/importExcel"
@closeDialog="closeDialog"></basic-import> @closeDialog="closeDialog"></basic-import>
</basic-container> </basic-container>

@ -31,7 +31,7 @@
<!-- 导入 --> <!-- 导入 -->
<basic-import v-if="isShowImport" title="导入" :isShow="isShowImport" <basic-import v-if="isShowImport" title="导入" :isShow="isShowImport"
templateUrl="/blade-desk/QA/CycleTestItem/download-excel-template" templateUrl="/blade-desk/QA/CycleTestItem/download-excel-template"
templateName="试验项目模板.xlsx" templateName="试验项目模板.xls"
importUrl="/blade-desk/QA/CycleTestItem/import-excel" importUrl="/blade-desk/QA/CycleTestItem/import-excel"
@closeDialog="closeDialog"></basic-import> @closeDialog="closeDialog"></basic-import>

@ -25,7 +25,7 @@
<!-- 导入 --> <!-- 导入 -->
<basic-import v-if="isShowImport" title="导入" :isShow="isShowImport" <basic-import v-if="isShowImport" title="导入" :isShow="isShowImport"
templateUrl="/blade-desk/BA/ProdMark/downloadExcelTemplate" templateUrl="/blade-desk/BA/ProdMark/downloadExcelTemplate"
templateName="生产标识模板.xlsx" templateName="生产标识模板.xls"
importUrl="/blade-desk/BA/ProdMark/importExcel" importUrl="/blade-desk/BA/ProdMark/importExcel"
@closeDialog="closeDialog"></basic-import> @closeDialog="closeDialog"></basic-import>
</basic-container> </basic-container>

@ -174,7 +174,7 @@
<!-- 导入 --> <!-- 导入 -->
<basic-import v-if="isShowImport" title="导入" :isShow="isShowImport" <basic-import v-if="isShowImport" title="导入" :isShow="isShowImport"
templateUrl="/blade-desk/BA/TeamSet/downloadExcelTemplate" templateUrl="/blade-desk/BA/TeamSet/downloadExcelTemplate"
templateName="班组模板.xlsx" templateName="班组模板.xls"
importUrl="/blade-desk/BA/TeamSet/importExcel" importUrl="/blade-desk/BA/TeamSet/importExcel"
@closeDialog="closeDialog"></basic-import> @closeDialog="closeDialog"></basic-import>

@ -78,7 +78,7 @@
<el-table-column align="center" label="资料"> <el-table-column align="center" label="资料">
<template #default="scope"> <template #default="scope">
<!-- attachLink --> <!-- attachLink -->
<el-button v-if="scope.row.attachLink!=''" type="text" @click="downloadFile(scope.row)">资料下载</el-button> <el-button v-if="scope.row.attachLink!=''||scope.row.attachLink!=null" type="text" @click="downloadFile(scope.row)">资料下载</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -210,7 +210,7 @@ export default {
addBtn: false, addBtn: false,
labelWidth: 120, labelWidth: 120,
menu: true, menu: true,
menuWidth: 200, menuWidth: 140,
dialogWidth: 600, dialogWidth: 600,
dialogClickModal: false, dialogClickModal: false,
searchEnter: true, searchEnter: true,

@ -124,7 +124,7 @@
<!-- 导入 --> <!-- 导入 -->
<basic-import v-if="isShowImport" title="导入" :isShow="isShowImport" <basic-import v-if="isShowImport" title="导入" :isShow="isShowImport"
templateUrl="/blade-desk/QA/CycleTestItem/download-excel-template" templateUrl="/blade-desk/QA/CycleTestItem/download-excel-template"
templateName="试验项目模板.xlsx" templateName="试验项目模板.xls"
importUrl="/blade-desk/QA/CycleTestItem/import-excel" importUrl="/blade-desk/QA/CycleTestItem/import-excel"
@closeDialog="closeDialog"></basic-import> @closeDialog="closeDialog"></basic-import>
</basic-container> </basic-container>

@ -73,7 +73,7 @@
</el-dialog> </el-dialog>
<!-- 导入 --> <!-- 导入 -->
<basic-import v-if="isShowImport" title="导入" :isShow="isShowImport" <basic-import v-if="isShowImport" title="导入" :isShow="isShowImport"
templateUrl="/blade-desk/QA/CycleTestItem/download-excel-template" templateName="试验项目模板.xlsx" templateUrl="/blade-desk/QA/CycleTestItem/download-excel-template" templateName="试验项目模板.xls"
importUrl="/blade-desk/QA/CycleTestItem/import-excel" @closeDialog="closeDialog"></basic-import> importUrl="/blade-desk/QA/CycleTestItem/import-excel" @closeDialog="closeDialog"></basic-import>
<!-- 成本计算月份选择弹窗 --> <!-- 成本计算月份选择弹窗 -->

@ -31,7 +31,7 @@
<!-- 导入 --> <!-- 导入 -->
<basic-import v-if="isShowImport" title="导入" :isShow="isShowImport" <basic-import v-if="isShowImport" title="导入" :isShow="isShowImport"
templateUrl="/blade-desk/QA/CycleTestItem/download-excel-template" templateUrl="/blade-desk/QA/CycleTestItem/download-excel-template"
templateName="试验项目模板.xlsx" templateName="试验项目模板.xls"
importUrl="/blade-desk/QA/CycleTestItem/import-excel" importUrl="/blade-desk/QA/CycleTestItem/import-excel"
@closeDialog="closeDialog"></basic-import> @closeDialog="closeDialog"></basic-import>
</div> </div>

@ -31,7 +31,7 @@
<!-- 导入 --> <!-- 导入 -->
<basic-import v-if="isShowImport" title="导入" :isShow="isShowImport" <basic-import v-if="isShowImport" title="导入" :isShow="isShowImport"
templateUrl="/blade-desk/QA/CycleTestItem/download-excel-template" templateUrl="/blade-desk/QA/CycleTestItem/download-excel-template"
templateName="试验项目模板.xlsx" templateName="试验项目模板.xls"
importUrl="/blade-desk/QA/CycleTestItem/import-excel" importUrl="/blade-desk/QA/CycleTestItem/import-excel"
@closeDialog="closeDialog"></basic-import> @closeDialog="closeDialog"></basic-import>
</div> </div>

@ -17,7 +17,7 @@
</avue-crud> </avue-crud>
<!-- 导入 --> <!-- 导入 -->
<basic-import v-if="isShowImport" title="导入" :isShow="isShowImport" <basic-import v-if="isShowImport" title="导入" :isShow="isShowImport"
templateUrl="/blade-desk/QA/CycleTestItem/download-excel-template" templateName="试验项目模板.xlsx" templateUrl="/blade-desk/QA/CycleTestItem/download-excel-template" templateName="试验项目模板.xls"
importUrl="/blade-desk/QA/CycleTestItem/import-excel" @closeDialog="closeDialog"></basic-import> importUrl="/blade-desk/QA/CycleTestItem/import-excel" @closeDialog="closeDialog"></basic-import>
</div> </div>
</template> </template>

@ -38,7 +38,7 @@
<!-- 导入 --> <!-- 导入 -->
<basic-import v-if="isShowImport" title="导入" :isShow="isShowImport" <basic-import v-if="isShowImport" title="导入" :isShow="isShowImport"
templateUrl="/blade-desk/QA/CycleTestItem/download-excel-template" templateUrl="/blade-desk/QA/CycleTestItem/download-excel-template"
templateName="试验项目模板.xlsx" templateName="试验项目模板.xls"
importUrl="/blade-desk/QA/CycleTestItem/import-excel" importUrl="/blade-desk/QA/CycleTestItem/import-excel"
@closeDialog="closeDialog"></basic-import> @closeDialog="closeDialog"></basic-import>
</div> </div>

@ -35,7 +35,7 @@
<!-- 导入 --> <!-- 导入 -->
<basic-import v-if="isShowImport" title="导入" :isShow="isShowImport" <basic-import v-if="isShowImport" title="导入" :isShow="isShowImport"
templateUrl="/blade-desk/QA/CycleTestItem/download-excel-template" templateUrl="/blade-desk/QA/CycleTestItem/download-excel-template"
templateName="试验项目模板.xlsx" templateName="试验项目模板.xls"
importUrl="/blade-desk/QA/CycleTestItem/import-excel" importUrl="/blade-desk/QA/CycleTestItem/import-excel"
@closeDialog="closeDialog"></basic-import> @closeDialog="closeDialog"></basic-import>
</basic-container> </basic-container>

@ -19,7 +19,7 @@
</avue-crud> </avue-crud>
<basic-import v-if="isShowImport" title="导入" :isShow="isShowImport" <basic-import v-if="isShowImport" title="导入" :isShow="isShowImport"
templateUrl="/blade-desk/QA/CycleTestItem/download-excel-template" templateUrl="/blade-desk/QA/CycleTestItem/download-excel-template"
templateName="试验项目模板.xlsx" templateName="试验项目模板.xls"
importUrl="/blade-desk/QA/CycleTestItem/import-excel" importUrl="/blade-desk/QA/CycleTestItem/import-excel"
@closeDialog="closeDialog"></basic-import> @closeDialog="closeDialog"></basic-import>
<add-edit-dialog v-if="showDialog" :title="dialogTitle" :showDialog="showDialog" @closeDialog="closeDialog"></add-edit-dialog> <add-edit-dialog v-if="showDialog" :title="dialogTitle" :showDialog="showDialog" @closeDialog="closeDialog"></add-edit-dialog>

@ -27,7 +27,7 @@
:buy-cycle="buyCycle"></addEditDialog> :buy-cycle="buyCycle"></addEditDialog>
<basic-import v-if="isShowImport" title="导入" :isShow="isShowImport" <basic-import v-if="isShowImport" title="导入" :isShow="isShowImport"
templateUrl="/blade-wms/stOtherReceiptRecord/downloadExcelTemplate" templateUrl="/blade-wms/stOtherReceiptRecord/downloadExcelTemplate"
templateName="其他入库模板.xlsx" templateName="其他入库模板.xls"
importUrl="/blade-wms/stOtherReceiptRecord/import-stOtherReceiptRecord" importUrl="/blade-wms/stOtherReceiptRecord/import-stOtherReceiptRecord"
@closeDialog="closeDialog"></basic-import> @closeDialog="closeDialog"></basic-import>
</basic-container> </basic-container>

@ -23,7 +23,7 @@
</maintenanceDialog> </maintenanceDialog>
<basic-import v-if="isShowImport" title="导入" :isShow="isShowImport" <basic-import v-if="isShowImport" title="导入" :isShow="isShowImport"
templateUrl="/blade-desk/mesOemAndAbility/downloadExcelTemplate" templateUrl="/blade-desk/mesOemAndAbility/downloadExcelTemplate"
templateName="外协绩效模板.xlsx" templateName="外协绩效模板.xls"
importUrl="/blade-desk/mesOemAndAbility/importExcel" importUrl="/blade-desk/mesOemAndAbility/importExcel"
@closeDialog="closeDialog"></basic-import> @closeDialog="closeDialog"></basic-import>
</basic-container> </basic-container>

@ -28,7 +28,7 @@
<!-- 导入 --> <!-- 导入 -->
<basic-import v-if="isShowImport" title="导入" :isShow="isShowImport" <basic-import v-if="isShowImport" title="导入" :isShow="isShowImport"
templateUrl="/blade-desk/mesOemProcess/downloadExcelTemplate" templateUrl="/blade-desk/mesOemProcess/downloadExcelTemplate"
templateName="外协工序模板.xlsx" templateName="外协工序模板.xls"
importUrl="/blade-desk/mesOemProcess/importExcel" importUrl="/blade-desk/mesOemProcess/importExcel"
@closeDialog="closeDialog"></basic-import> @closeDialog="closeDialog"></basic-import>
</basic-container> </basic-container>

@ -28,7 +28,7 @@
</avue-crud> </avue-crud>
<basic-import v-if="isShowImport" title="导入" :isShow="isShowImport" <basic-import v-if="isShowImport" title="导入" :isShow="isShowImport"
templateUrl="/blade-desk/QA/CycleTestItem/download-excel-template" templateUrl="/blade-desk/QA/CycleTestItem/download-excel-template"
templateName="试验项目模板.xlsx" templateName="试验项目模板.xls"
importUrl="/blade-desk/QA/CycleTestItem/import-excel" importUrl="/blade-desk/QA/CycleTestItem/import-excel"
@closeDialog="closeDialog"></basic-import> @closeDialog="closeDialog"></basic-import>
</div> </div>

@ -29,7 +29,7 @@
<!-- 导入 --> <!-- 导入 -->
<basic-import v-if="isShowImport" title="导入" :isShow="isShowImport" <basic-import v-if="isShowImport" title="导入" :isShow="isShowImport"
templateUrl="/blade-desk/QA/CycleTestItem/download-excel-template" templateUrl="/blade-desk/QA/CycleTestItem/download-excel-template"
templateName="试验项目模板.xlsx" templateName="试验项目模板.xls"
importUrl="/blade-desk/QA/CycleTestItem/import-excel" importUrl="/blade-desk/QA/CycleTestItem/import-excel"
@closeDialog="closeDialog"></basic-import> @closeDialog="closeDialog"></basic-import>
</div> </div>

@ -54,7 +54,7 @@
<!-- 导入 --> <!-- 导入 -->
<basic-import v-if="isShowImport" title="导入" :isShow="isShowImport" <basic-import v-if="isShowImport" title="导入" :isShow="isShowImport"
templateUrl="/blade-desk/BA/PlanAssignSteer/downloadExcelTemplate" templateUrl="/blade-desk/BA/PlanAssignSteer/downloadExcelTemplate"
templateName="外协分派管理模板.xlsx" templateName="外协分派管理模板.xls"
importUrl="/blade-desk/BA/PlanAssignSteer/importExcel" importUrl="/blade-desk/BA/PlanAssignSteer/importExcel"
@closeDialog="closeDialog"></basic-import> @closeDialog="closeDialog"></basic-import>
</basic-container> </basic-container>

@ -29,7 +29,7 @@
title="导入" title="导入"
:isShow="isShowImport" :isShow="isShowImport"
templateUrl="/blade-desk/QA/CycleTestItem/download-excel-template" templateUrl="/blade-desk/QA/CycleTestItem/download-excel-template"
templateName="试验项目模板.xlsx" templateName="试验项目模板.xls"
importUrl="/blade-desk/QA/CycleTestItem/import-excel" importUrl="/blade-desk/QA/CycleTestItem/import-excel"
@closeDialog="closeDialog" @closeDialog="closeDialog"
></basic-import> ></basic-import>

@ -24,7 +24,7 @@
<!-- 导入 --> <!-- 导入 -->
<basic-import v-if="isShowImport" title="导入" :isShow="isShowImport" <basic-import v-if="isShowImport" title="导入" :isShow="isShowImport"
templateUrl="/blade-desk/mesPlatingTypeRules/downloadExcelTemplate" templateUrl="/blade-desk/mesPlatingTypeRules/downloadExcelTemplate"
templateName="结算规则模板.xlsx" templateName="结算规则模板.xls"
importUrl="/blade-desk/mesPlatingTypeRules/importExcel" importUrl="/blade-desk/mesPlatingTypeRules/importExcel"
@closeDialog="closeDialog"></basic-import> @closeDialog="closeDialog"></basic-import>
</div> </div>

@ -21,7 +21,7 @@
<processDialog :showDialog="isOpen" v-if="isOpen" @closeDialog="closeDialog"></processDialog> <processDialog :showDialog="isOpen" v-if="isOpen" @closeDialog="closeDialog"></processDialog>
<!-- 导入 --> <!-- 导入 -->
<basic-import v-if="isShowImport" title="导入" :isShow="isShowImport" <basic-import v-if="isShowImport" title="导入" :isShow="isShowImport"
templateUrl="/blade-desk/QA/CycleTestItem/download-excel-template" templateName="试验项目模板.xlsx" templateUrl="/blade-desk/QA/CycleTestItem/download-excel-template" templateName="试验项目模板.xls"
importUrl="/blade-desk/QA/CycleTestItem/import-excel" @closeDialog="closeDialog"></basic-import> importUrl="/blade-desk/QA/CycleTestItem/import-excel" @closeDialog="closeDialog"></basic-import>
</div> </div>
</template> </template>

@ -30,7 +30,7 @@
<!-- 导入 --> <!-- 导入 -->
<basic-import v-if="isShowImport" title="导入" :isShow="isShowImport" <basic-import v-if="isShowImport" title="导入" :isShow="isShowImport"
templateUrl="/blade-desk/QA/CycleTestItem/download-excel-template" templateUrl="/blade-desk/QA/CycleTestItem/download-excel-template"
templateName="试验项目模板.xlsx" templateName="试验项目模板.xls"
importUrl="/blade-desk/QA/CycleTestItem/import-excel" importUrl="/blade-desk/QA/CycleTestItem/import-excel"
@closeDialog="closeDialog"></basic-import> @closeDialog="closeDialog"></basic-import>
</div> </div>

@ -77,7 +77,7 @@
title="导入" title="导入"
:isShow="isShowImport" :isShow="isShowImport"
templateUrl="/blade-desk/QA/CycleTestItem/download-excel-template" templateUrl="/blade-desk/QA/CycleTestItem/download-excel-template"
templateName="试验项目模板.xlsx" templateName="试验项目模板.xls"
importUrl="/blade-desk/QA/CycleTestItem/import-excel" importUrl="/blade-desk/QA/CycleTestItem/import-excel"
@closeDialog="closeDialog" @closeDialog="closeDialog"
></basic-import> ></basic-import>

@ -65,7 +65,7 @@
title="导入" title="导入"
:isShow="isShowImport" :isShow="isShowImport"
templateUrl="/blade-desk/QA/CycleTestItem/download-excel-template" templateUrl="/blade-desk/QA/CycleTestItem/download-excel-template"
templateName="试验项目模板.xlsx" templateName="试验项目模板.xls"
importUrl="/blade-desk/QA/CycleTestItem/import-excel" importUrl="/blade-desk/QA/CycleTestItem/import-excel"
@closeDialog="closeDialog" @closeDialog="closeDialog"
></basic-import> ></basic-import>

@ -178,7 +178,7 @@
<basic-import v-if="isShowImport" title="导入" :isShow="isShowImport" <basic-import v-if="isShowImport" title="导入" :isShow="isShowImport"
showTips="请上传 .xls,.xlsx 标准格式文件,请导入数据后维护试验周期!" showTips="请上传 .xls,.xlsx 标准格式文件,请导入数据后维护试验周期!"
templateUrl="/blade-desk/QA/CycleTest/download-excel-template" templateUrl="/blade-desk/QA/CycleTest/download-excel-template"
templateName="试验项目周期模板.xlsx" templateName="试验项目周期模板.xls"
importUrl="/blade-desk/QA/CycleTest/import-excel" importUrl="/blade-desk/QA/CycleTest/import-excel"
@closeDialog="closeDialog"></basic-import> @closeDialog="closeDialog"></basic-import>
</basic-container> </basic-container>

@ -47,7 +47,7 @@
<!-- 导入 --> <!-- 导入 -->
<basic-import v-if="isShowImport" title="导入" :isShow="isShowImport" <basic-import v-if="isShowImport" title="导入" :isShow="isShowImport"
templateUrl="/blade-desk/QA/CycleTestItem/download-excel-template" templateUrl="/blade-desk/QA/CycleTestItem/download-excel-template"
templateName="试验项目模板.xlsx" templateName="试验项目模板.xls"
importUrl="/blade-desk/QA/CycleTestItem/import-excel" importUrl="/blade-desk/QA/CycleTestItem/import-excel"
@closeDialog="closeDialog"></basic-import> @closeDialog="closeDialog"></basic-import>
</basic-container> </basic-container>

@ -42,7 +42,7 @@
<!-- 导入 --> <!-- 导入 -->
<basic-import v-if="isShowImport" title="导入" :isShow="isShowImport" <basic-import v-if="isShowImport" title="导入" :isShow="isShowImport"
templateUrl="/blade-desk/QA/CycleTestItem/download-excel-template" templateUrl="/blade-desk/QA/CycleTestItem/download-excel-template"
templateName="试验项目模板.xlsx" templateName="试验项目模板.xls"
importUrl="/blade-desk/QA/CycleTestItem/import-excel" importUrl="/blade-desk/QA/CycleTestItem/import-excel"
@closeDialog="closeDialog"></basic-import> @closeDialog="closeDialog"></basic-import>
</basic-container> </basic-container>

@ -69,6 +69,7 @@
style="width: 100%" style="width: 100%"
clearable clearable
filterable filterable
@change="batchNoChange(scope.row, scope.$index)"
> >
<el-option <el-option
v-for="item in scope.row.tankList" v-for="item in scope.row.tankList"
@ -188,6 +189,13 @@ export default {
} }
}, },
methods: { methods: {
batchNoChange(row, index){
let select = this.form.tableData[index].tankList.filter(
row => row.id == this.form.tableData[index].batchNo
);
console.log(select, 'select');
this.form.tableData[index].batchNoName = select[0].name;
},
// //
changeWorkCenter(index) { changeWorkCenter(index) {
this.form.batchNo = ''; this.form.batchNo = '';

@ -5,7 +5,7 @@
<template #footer> <template #footer>
<span class="dialog-footer"> <span class="dialog-footer">
<el-button @click="closeDialog"> </el-button> <el-button @click="closeDialog"> </el-button>
<el-button type="primary" @click="submit"> </el-button> <el-button type="primary" @click="submit" v-loading="submitLoading"> </el-button>
</span> </span>
</template> </template>
</el-dialog> </el-dialog>
@ -28,6 +28,7 @@ export default {
return { return {
obj: {}, obj: {},
openShow: false, openShow: false,
submitLoading: false,
option: { option: {
submitBtn: false, submitBtn: false,
emptyBtn: false, emptyBtn: false,
@ -64,29 +65,34 @@ export default {
submit() { submit() {
this.$refs.form.validate((valid, done, msg) => { this.$refs.form.validate((valid, done, msg) => {
if (valid) { if (valid) {
this.submitLoading = true;
// //
if (this.rowItem.approvalStatus == '-1') { if (this.rowItem.approvalStatus == '-1' || this.rowItem.approvalStatus == 1) {
directorApproval({...this.obj,id:this.rowItem.id}).then(res => { directorApproval({ ...this.obj, id: this.rowItem.id }).then(res => {
this.$message({ this.$message({
type: 'success', type: 'success',
message: '操作成功!', message: '操作成功!',
}); });
this.closeDialog(); this.closeDialog();
this.submitLoading = false;
}); });
} }
// //
if (this.rowItem.approvalStatus == '2') { if (this.rowItem.approvalStatus == 2) {
factoryApproval({...this.obj,id:this.rowItem.id}).then(res=>{ factoryApproval({ ...this.obj, id: this.rowItem.id }).then(res => {
this.$message({ this.$message({
type: 'success', type: 'success',
message: '操作成功!', message: '操作成功!',
}); });
this.closeDialog() this.closeDialog();
}) this.submitLoading = false;
});
} }
this.submitLoading = false;
done(); done();
} else { } else {
console.log('error submit!!'); console.log('error submit!!');
this.submitLoading = false;
return false; return false;
} }
}); });

@ -17,7 +17,6 @@
@size-change="sizeChange" @size-change="sizeChange"
@refresh-change="refreshChange" @refresh-change="refreshChange"
@on-load="onLoad" @on-load="onLoad"
> >
<template #menu="scope"> <template #menu="scope">
<!-- <el-button <!-- <el-button
@ -27,7 +26,12 @@
</el-button> --> </el-button> -->
<el-button <el-button
type="text" type="text"
v-if="scope.row.approvalStatus == 1" v-if="
scope.row.approvalStatus == 1 ||
scope.row.approvalStatus == 2 ||
scope.row.approvalStatus == 5 ||
scope.row.approvalStatus == 4
"
@click="checkFn(scope.row)" @click="checkFn(scope.row)"
>审批</el-button >审批</el-button
> >
@ -155,7 +159,7 @@ export default {
headerAlign: 'center', headerAlign: 'center',
align: 'center', align: 'center',
searchLabelWidth: 80, searchLabelWidth: 80,
hide:true, hide: true,
dicUrl: `/blade-desk/BA/WorkTank/listForSelect?workstationId={{wcId}}`, dicUrl: `/blade-desk/BA/WorkTank/listForSelect?workstationId={{wcId}}`,
props: { props: {
label: 'name', label: 'name',
@ -168,10 +172,9 @@ export default {
trigger: 'blur', trigger: 'blur',
}, },
], ],
change: (value)=> { change: value => {
this.form.batchNoName = value.item.name; this.form.batchNoName = value.item.name;
}, },
}, },
{ {
label: '维护内容', label: '维护内容',
@ -202,8 +205,8 @@ export default {
headerAlign: 'center', headerAlign: 'center',
align: 'center', align: 'center',
searchLabelWidth: 80, searchLabelWidth: 80,
addDisplay:false, addDisplay: false,
editDisplay:false, editDisplay: false,
}, },
{ {
label: '安排日期', label: '安排日期',
@ -264,7 +267,6 @@ export default {
value: 5, value: 5,
label: '厂长审核未通过', label: '厂长审核未通过',
}, },
], ],
rules: [ rules: [
{ {
@ -327,7 +329,7 @@ export default {
}); });
}, },
rowSave(row, done, loading) { rowSave(row, done, loading) {
row.arrangeTime = row.arrangeTime+' 00:00:00'; row.arrangeTime = row.arrangeTime + ' 00:00:00';
add([{ ...row, bbpType: 1 }]).then( add([{ ...row, bbpType: 1 }]).then(
() => { () => {
this.onLoad(this.page); this.onLoad(this.page);
@ -344,7 +346,7 @@ export default {
); );
}, },
rowUpdate(row, index, done, loading) { rowUpdate(row, index, done, loading) {
row.arrangeTime = row.arrangeTime+' 00:00:00'; row.arrangeTime = row.arrangeTime + ' 00:00:00';
update([row]).then( update([row]).then(
() => { () => {
this.onLoad(this.page); this.onLoad(this.page);
@ -360,7 +362,7 @@ export default {
} }
); );
}, },
rowDel(row){ rowDel(row) {
this.$confirm('确定将选择数据删除?', { this.$confirm('确定将选择数据删除?', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',

@ -61,11 +61,11 @@ export default {
delBtnIcon: ' ', delBtnIcon: ' ',
editBtnIcon: ' ', editBtnIcon: ' ',
viewBtnText: '详情', viewBtnText: '详情',
labelWidth: 120, labelWidth: 100,
searchLabelWidth: 120, searchLabelWidth: 120,
menu: true, menu: true,
menuWidth: 120, menuWidth: 120,
dialogWidth: 1200, dialogWidth: 450,
dialogClickModal: false, dialogClickModal: false,
searchEnter: true, searchEnter: true,
excelBtn: false, excelBtn: false,
@ -82,7 +82,7 @@ export default {
searchSpan: 6, searchSpan: 6,
searchMenuPosition: 'right', searchMenuPosition: 'right',
align: 'center', align: 'center',
span:24,
column: [ column: [
{ {
label: '作业中心', label: '作业中心',
@ -116,6 +116,7 @@ export default {
type: 'select', type: 'select',
filterable: true, filterable: true,
clearable: true, clearable: true,
span:24,
// multiple: true, // multiple: true,
search: false, search: false,
sortable: true, sortable: true,

@ -195,6 +195,7 @@ export default {
tableData: [], tableData: [],
ruleForm: { ruleForm: {
cycle: 0, cycle: 0,
isCheckout:'0'
}, },
rules: { rules: {
code: [{ required: true, message: '请输入', trigger: 'blur' }], code: [{ required: true, message: '请输入', trigger: 'blur' }],

@ -26,7 +26,6 @@
<el-select <el-select
v-model="scope.row.wcId" v-model="scope.row.wcId"
placeholder="请选择" placeholder="请选择"
@change="workCenterChange"
filterable filterable
> >
<el-option <el-option
@ -41,7 +40,7 @@
</el-table-column> </el-table-column>
<!-- 设备检查项/槽号槽名 --> <!-- 设备检查项/槽号槽名 -->
<el-table-column align="center" label="产线"> <!-- <el-table-column align="center" label="产线">
<template #header> <template #header>
<span><i style="color: red">*</i>产线</span> <span><i style="color: red">*</i>产线</span>
</template> </template>
@ -66,7 +65,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</template> </template>
</el-table-column> </el-table-column> -->
<el-table-column align="center" label="确认名称"> <el-table-column align="center" label="确认名称">
<template #header> <template #header>
<span><i style="color: red">*</i>确认名称</span> <span><i style="color: red">*</i>确认名称</span>

@ -111,7 +111,6 @@ export default {
index: false, index: false,
showOverflowTooltip: true, showOverflowTooltip: true,
gridBtn: false, gridBtn: false,
searchMenuPosition: 'right',
searchLabelPosition: 'left', searchLabelPosition: 'left',
searchGutter: 24, searchGutter: 24,
searchSpan: 6, searchSpan: 6,
@ -150,44 +149,44 @@ export default {
}, },
], ],
}, },
{ // {
label: '产线', // label: '线',
prop: 'equipmentId', // prop: 'equipmentId',
searchLabelWidth: 50, // searchLabelWidth: 50,
search: true, // search: true,
sortable: true, // sortable: true,
filter: true, // filter: true,
span: 12, // span: 12,
headerAlign: 'center', // headerAlign: 'center',
align: 'left', // align: 'left',
type: 'select', // type: 'select',
filterable: true, // filterable: true,
clearable: true, // clearable: true,
hide: true, // hide: true,
dicUrl: `/blade-desk/equipment/page?used=1&workstationId={{wcId}}&size=99999`, // dicUrl: `/blade-desk/equipment/page?used=1&workstationId={{wcId}}&size=99999`,
props: { // props: {
label: 'deviceName', // label: 'deviceName',
value: 'id', // value: 'id',
res: 'data.records', // res: 'data.records',
}, // },
change: val => { // change: val => {
this.equipmentChange(val.item, 'equipmentId'); // this.equipmentChange(val.item, 'equipmentId');
}, // },
}, // },
{ // {
label: '产线', // label: '线',
prop: 'equipmentName', // prop: 'equipmentName',
search: false, // search: false,
sortable: true, // sortable: true,
filter: true, // filter: true,
span: 12, // span: 12,
headerAlign: 'center', // headerAlign: 'center',
align: 'left', // align: 'left',
filterable: true, // filterable: true,
clearable: true, // clearable: true,
addDisplay: false, // addDisplay: false,
editDisplay: false, // editDisplay: false,
}, // },
{ {
label: '确认名称', label: '确认名称',
prop: 'proItem', prop: 'proItem',
@ -288,22 +287,22 @@ export default {
}, },
{ {
label: '状态', label: '状态',
prop: 'syncStatu', prop: 'syncStatus',
search: false, search: false,
sortable: true, sortable: true,
filter: true, filter: true,
span: 12, span: 12,
headerAlign: 'center', headerAlign: 'center',
align: 'left', align: 'center',
type: 'select', type: 'select',
dicData: [ dicData: [
{ {
label: '未同步', label: '未同步',
value: '0', value: 0,
}, },
{ {
label: '已同步', label: '已同步',
value: '1', value: 1,
}, },
], ],
}, },

@ -32,7 +32,7 @@
title="导入" title="导入"
:isShow="isShowImport" :isShow="isShowImport"
templateUrl="/blade-desk/QA/CycleTestItem/download-excel-template" templateUrl="/blade-desk/QA/CycleTestItem/download-excel-template"
templateName="试验项目模板.xlsx" templateName="试验项目模板.xls"
importUrl="/blade-desk/QA/CycleTestItem/import-excel" importUrl="/blade-desk/QA/CycleTestItem/import-excel"
@closeDialog="closeDialog" @closeDialog="closeDialog"
></basic-import> ></basic-import>

@ -49,7 +49,7 @@
<!-- 导入 --> <!-- 导入 -->
<basic-import v-if="isShowImport" title="导入" :isShow="isShowImport" <basic-import v-if="isShowImport" title="导入" :isShow="isShowImport"
templateUrl="/blade-desk/BA/Plating/downloadExcelTemplate" templateUrl="/blade-desk/BA/Plating/downloadExcelTemplate"
templateName="镀种维护模板.xlsx" templateName="镀种维护模板.xls"
importUrl="/blade-desk/BA/Plating/importExcel" importUrl="/blade-desk/BA/Plating/importExcel"
@closeDialog="closeDialog"></basic-import> @closeDialog="closeDialog"></basic-import>
</basic-container> </basic-container>

@ -28,7 +28,7 @@
<!-- 导入 --> <!-- 导入 -->
<basic-import v-if="isShowImport" title="导入" :isShow="isShowImport" <basic-import v-if="isShowImport" title="导入" :isShow="isShowImport"
templateUrl="/blade-desk/QA/CycleTestItem/download-excel-template" templateUrl="/blade-desk/QA/CycleTestItem/download-excel-template"
templateName="试验项目模板.xlsx" templateName="试验项目模板.xls"
importUrl="/blade-desk/QA/CycleTestItem/import-excel" importUrl="/blade-desk/QA/CycleTestItem/import-excel"
@closeDialog="closeDialog"></basic-import> @closeDialog="closeDialog"></basic-import>
</basic-container> </basic-container>

@ -29,7 +29,7 @@
title="导入" title="导入"
:isShow="isShowImport" :isShow="isShowImport"
templateUrl="/blade-desk/QA/CycleTestItem/download-excel-template" templateUrl="/blade-desk/QA/CycleTestItem/download-excel-template"
templateName="试验项目模板.xlsx" templateName="试验项目模板.xls"
importUrl="/blade-desk/QA/CycleTestItem/import-excel" importUrl="/blade-desk/QA/CycleTestItem/import-excel"
@closeDialog="closeDialog" @closeDialog="closeDialog"
></basic-import> ></basic-import>

@ -29,7 +29,7 @@
title="导入" title="导入"
:isShow="isShowImport" :isShow="isShowImport"
templateUrl="/blade-desk/QA/CycleTestItem/download-excel-template" templateUrl="/blade-desk/QA/CycleTestItem/download-excel-template"
templateName="试验项目模板.xlsx" templateName="试验项目模板.xls"
importUrl="/blade-desk/QA/CycleTestItem/import-excel" importUrl="/blade-desk/QA/CycleTestItem/import-excel"
@closeDialog="closeDialog" @closeDialog="closeDialog"
></basic-import> ></basic-import>

@ -29,26 +29,23 @@
<!-- <el-button type="primary" @click="queryOrdersHandle('')">全部</el-button> --> <!-- <el-button type="primary" @click="queryOrdersHandle('')">全部</el-button> -->
</template> </template>
<template #menu="scope"> <template #menu="scope">
<el-row>
<el-col :span="6">
<el-button type="text" @click="clickProduction(scope.row)">生产监控</el-button> <el-button type="text" @click="clickProduction(scope.row)">生产监控</el-button>
<el-button type="text" @click="printCraftCard_new(scope.row)">工艺流程卡</el-button> </el-col>
<el-button type="text" @click="priorityFn(scope.row)" v-if="scope.row.runStatus === 2" <el-col :span="6">
>优先级调整</el-button <el-button type="text" @click="printCraftCard_new(scope.row)">流程卡</el-button>
> </el-col>
<el-button <el-col :span="6" v-if="scope.row.runStatus === 2">
type="text" <el-button type="text" @click="priorityFn(scope.row)">优先级</el-button>
@click="handleBatches(scope.row)" </el-col>
v-if="[2, 3, 4, 6].includes(scope.row.runStatus)" <el-col :span="6" v-if="[2, 3, 4, 6].includes(scope.row.runStatus)">
>分批</el-button <el-button type="text" @click="handleBatches(scope.row)">分批</el-button>
> </el-col>
<el-button <el-col :span="6" v-if="scope.row.runStatus < 15">
type="text" <el-button type="text" @click="handleClose(scope.row)">关闭</el-button>
@click="handleAbnormal(scope.row)" </el-col>
v-if="scope.row.runStatus === 3 || scope.row.runStatus === 4" </el-row>
>异常申报</el-button
>
<el-button type="text" @click="handleClose(scope.row)" v-if="scope.row.runStatus < 15"
>关闭</el-button
>
</template> </template>
</avue-crud> </avue-crud>
<el-dialog append-to-body v-model="printDialog" title="打印标签"> <el-dialog append-to-body v-model="printDialog" title="打印标签">
@ -167,7 +164,7 @@ export default {
editBtnIcon: ' ', editBtnIcon: ' ',
viewBtnText: '详情', viewBtnText: '详情',
labelWidth: 120, labelWidth: 120,
menuWidth: 260, menuWidth: 220,
dialogWidth: 1200, dialogWidth: 1200,
dialogClickModal: false, dialogClickModal: false,
searchEnter: true, searchEnter: true,

@ -29,26 +29,23 @@
<!-- <el-button type="primary" @click="queryOrdersHandle('')">全部</el-button> --> <!-- <el-button type="primary" @click="queryOrdersHandle('')">全部</el-button> -->
</template> </template>
<template #menu="scope"> <template #menu="scope">
<el-row>
<el-col :span="6">
<el-button type="text" @click="clickProduction(scope.row)">生产监控</el-button> <el-button type="text" @click="clickProduction(scope.row)">生产监控</el-button>
<el-button type="text" @click="printCraftCard_new(scope.row)">工艺流程卡</el-button> </el-col>
<el-button type="text" @click="priorityFn(scope.row)" v-if="scope.row.runStatus === 2" <el-col :span="6">
>优先级调整</el-button <el-button type="text" @click="printCraftCard_new(scope.row)">流程卡</el-button>
> </el-col>
<el-button <el-col :span="6" v-if="scope.row.runStatus === 2">
type="text" <el-button type="text" @click="priorityFn(scope.row)">优先级</el-button>
@click="handleBatches(scope.row)" </el-col>
v-if="[2, 3, 4, 6].includes(scope.row.runStatus)" <el-col :span="6" v-if="[2, 3, 4, 6].includes(scope.row.runStatus)">
>分批</el-button <el-button type="text" @click="handleBatches(scope.row)">分批</el-button>
> </el-col>
<el-button <el-col :span="6" v-if="scope.row.runStatus < 15">
type="text" <el-button type="text" @click="handleClose(scope.row)">关闭</el-button>
@click="handleAbnormal(scope.row)" </el-col>
v-if="scope.row.runStatus === 3 || scope.row.runStatus === 4" </el-row>
>异常申报</el-button
>
<el-button type="text" @click="handleClose(scope.row)" v-if="scope.row.runStatus < 15"
>关闭</el-button
>
</template> </template>
</avue-crud> </avue-crud>
<el-dialog append-to-body v-model="printDialog" title="打印标签"> <el-dialog append-to-body v-model="printDialog" title="打印标签">
@ -167,7 +164,7 @@ export default {
editBtnIcon: ' ', editBtnIcon: ' ',
viewBtnText: '详情', viewBtnText: '详情',
labelWidth: 120, labelWidth: 120,
menuWidth: 260, menuWidth: 220,
dialogWidth: 1200, dialogWidth: 1200,
dialogClickModal: false, dialogClickModal: false,
searchEnter: true, searchEnter: true,

@ -45,7 +45,7 @@ export default {
prop: 'memo', prop: 'memo',
type: 'textarea', type: 'textarea',
span: 24, span: 24,
rows: 2, // rows: 2,
rules: [ rules: [
{ {
required: true, required: true,
@ -58,7 +58,9 @@ export default {
}, },
}; };
}, },
mounted() {}, mounted() {
console.log(this.itemData,this.showClose);
},
methods: { methods: {
// //
closeDialog() { closeDialog() {

@ -8,7 +8,6 @@
v-model="form" v-model="form"
v-model:page="page" v-model:page="page"
ref="crud" ref="crud"
@row-del="rowDel"
@search-change="searchChange" @search-change="searchChange"
@search-reset="searchReset" @search-reset="searchReset"
@selection-change="selectionChange" @selection-change="selectionChange"
@ -30,39 +29,56 @@
</template> </template>
<template #menu="scope"> <template #menu="scope">
<el-row>
<el-col :span="6">
<el-button type="text" @click="clickProduction(scope.row)">生产监控</el-button> <el-button type="text" @click="clickProduction(scope.row)">生产监控</el-button>
<el-button type="text" @click="printCraftCard_new(scope.row)">工艺流程卡</el-button> </el-col>
<el-button type="text" @click="priorityFn(scope.row)" v-if="scope.row.runStatus === 2" <el-col :span="6">
>优先级调整</el-button <el-button type="text" @click="printCraftCard_new(scope.row)">流程卡</el-button>
</el-col>
<el-col :span="6" v-if="scope.row.runStatus === 2">
<el-button type="text" @click="priorityFn(scope.row)"
>优先级</el-button
> >
</el-col>
<el-col :span="6" v-if="[2, 3, 4, 6].includes(scope.row.runStatus)">
<el-button <el-button
type="text" type="text"
@click="handleBatches(scope.row)" @click="handleBatches(scope.row)"
v-if="[2, 3, 4, 6].includes(scope.row.runStatus)"
>分批</el-button >分批</el-button
> >
</el-col>
<el-col :span="6" v-if="scope.row.runStatus === 3 || scope.row.runStatus === 4">
<el-button <el-button
type="text" type="text"
@click="handleAbnormal(scope.row)" @click="handleAbnormal(scope.row)"
v-if="scope.row.runStatus === 3 || scope.row.runStatus === 4"
>异常申报</el-button >异常申报</el-button
> >
</el-col>
<el-col :span="6" v-if="scope.row.runStatus <= 6 && scope.row.runStatus !== 5">
<el-button <el-button
type="text" type="text"
@click="handleOutsource(scope.row)" @click="handleOutsource(scope.row)"
v-if="scope.row.runStatus <= 6 && scope.row.runStatus !== 5"
>转外协</el-button >转外协</el-button
> >
</el-col>
<el-col :span="6" v-if="scope.row.runStatus <= 6 && scope.row.runStatus !== 5">
<el-button <el-button
type="text" type="text"
@click="handleSintering(scope.row)" @click="handleSintering(scope.row)"
v-if="scope.row.runStatus <= 6 && scope.row.runStatus !== 5"
>转烧结</el-button >转烧结</el-button
> >
</el-col>
<el-button type="text" @click="handleClose(scope.row)" v-if="scope.row.runStatus < 15" <el-col :span="6" v-if="scope.row.runStatus < 15">
<el-button type="text" @click="handleClose(scope.row)"
>关闭</el-button >关闭</el-button
> >
</el-col>
</el-row>
</template> </template>
</avue-crud> </avue-crud>
<!-- 打印标签 --> <!-- 打印标签 -->
@ -99,12 +115,12 @@
@closeDialog="closeDialog" @closeDialog="closeDialog"
></batches-dialog> ></batches-dialog>
<!-- 关闭弹窗 --> <!-- 关闭弹窗 -->
<closed-dialog <closedDialog
v-if="showClose" v-if="showClose"
:show-close="showClose" :show-close="showClose"
@closeDialog="closeDialog" @closeDialog="closeDialog"
:itemData="itemData" :itemData="itemData"
></closed-dialog> ></closedDialog>
<!-- 异常处理 --> <!-- 异常处理 -->
<abnormalDialog <abnormalDialog
v-if="showAbnormal" v-if="showAbnormal"
@ -120,7 +136,12 @@
></productionMonitoringDialog> ></productionMonitoringDialog>
<!-- 生产监控 --> <!-- 生产监控 -->
<workRate v-if="isWorkRateOpen" :showDialog="isWorkRateOpen" @closeDialog="closeDialog" :rowItem="rowItem"></workRate> <workRate
v-if="isWorkRateOpen"
:showDialog="isWorkRateOpen"
@closeDialog="closeDialog"
:rowItem="rowItem"
></workRate>
</basic-container> </basic-container>
</template> </template>
@ -128,11 +149,11 @@
import outsourceDialog from '../components/outsourceDialog.vue'; import outsourceDialog from '../components/outsourceDialog.vue';
import productionDialog from '../components/productionDialog.vue'; import productionDialog from '../components/productionDialog.vue';
import batchesDialog from '../components/batchesDialog.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 abnormalDialog from '../components/abnormalDialog.vue';
import productionMonitoringDialog from '../components/productionMonitoringDialog.vue'; import productionMonitoringDialog from '../components/productionMonitoringDialog.vue';
import workRate from "@/views/workRate/index.vue"; import workRate from '@/views/workRate/index.vue';
import { getList,turnType } from '@/api/productionManagement/productionMonitoring'; import { getList, turnType } from '@/api/productionManagement/productionMonitoring';
export default { export default {
components: { components: {
@ -188,7 +209,7 @@ export default {
editBtnText: '修改', editBtnText: '修改',
viewBtnText: '详情', viewBtnText: '详情',
labelWidth: 120, labelWidth: 120,
menuWidth: 380, menuWidth: 240,
dialogWidth: 1200, dialogWidth: 1200,
dialogClickModal: false, dialogClickModal: false,
searchEnter: true, searchEnter: true,
@ -215,7 +236,7 @@ export default {
sortable: true, sortable: true,
overHidden: true, overHidden: true,
fixed: 'left', fixed: 'left',
width: 180, width: 130,
}, },
{ {
@ -410,7 +431,6 @@ export default {
overHidden: true, overHidden: true,
width: 150, width: 150,
// searchLabelWidth: 100, // searchLabelWidth: 100,
}, },
{ {
label: '订单优先级', label: '订单优先级',
@ -421,7 +441,7 @@ export default {
overHidden: true, overHidden: true,
width: 150, width: 150,
// searchLabelWidth: 100, // searchLabelWidth: 100,
hide:true, hide: true,
dicUrl: '/blade-system/dict/dictionary?code=orderPriority', dicUrl: '/blade-system/dict/dictionary?code=orderPriority',
props: { props: {
label: 'dictValue', label: 'dictValue',
@ -594,8 +614,8 @@ export default {
}, },
mounted() {}, mounted() {},
methods: { methods: {
printCraftCard_new(row){ printCraftCard_new(row) {
window.open(window.PROCESS_FLOW_CARD_HEAT_METER+'?woId='+row.woId,'_blank'); window.open(window.PROCESS_FLOW_CARD_HEAT_METER + '?woId=' + row.woId, '_blank');
}, },
// //
priorityFn(row) { priorityFn(row) {
@ -635,6 +655,7 @@ export default {
handleClose(row) { handleClose(row) {
this.itemData = [row]; this.itemData = [row];
this.showClose = true; this.showClose = true;
}, },
// //
@ -645,10 +666,10 @@ export default {
type: 'warning', type: 'warning',
}).then(() => { }).then(() => {
let query = { let query = {
id: row.woId, id: row.yoId,
yieldType: '12001', yieldType: '12002',
}; };
turnType(query).then((res) => { turnType(query).then(res => {
this.$message.success('转烧结成功'); this.$message.success('转烧结成功');
this.onLoad(this.page, this.query); this.onLoad(this.page, this.query);
}); });

@ -30,26 +30,30 @@
<el-button type="success" plain @click="queryOrdersHandle('15')">已完工</el-button> <el-button type="success" plain @click="queryOrdersHandle('15')">已完工</el-button>
</template> </template>
<template #menu="scope"> <template #menu="scope">
<el-row>
<el-col :span="6">
<el-button type="text" @click="clickProduction(scope.row)">生产监控</el-button> <el-button type="text" @click="clickProduction(scope.row)">生产监控</el-button>
<el-button type="text" @click="printCraftCard_new(scope.row)">工艺流程卡</el-button> </el-col>
<el-button type="text" @click="priorityFn(scope.row)" v-if="scope.row.runStatus === 2" <el-col :span="6">
>优先级调整</el-button <el-button type="text" @click="printCraftCard_new(scope.row)">流程卡</el-button>
> </el-col>
<el-button <el-col :span="6" v-if="scope.row.runStatus === 2">
type="text" <el-button type="text" @click="priorityFn(scope.row)">优先级</el-button>
@click="handleBatches(scope.row)" </el-col>
v-if="[2, 3, 4, 6].includes(scope.row.runStatus)" <el-col :span="6" v-if="[2, 3, 4, 6].includes(scope.row.runStatus)">
>分批</el-button <el-button type="text" @click="handleBatches(scope.row)">分批</el-button>
> </el-col>
<el-button <el-col :span="6" v-if="scope.row.runStatus < 15">
<el-button type="text" @click="handleClose(scope.row)">关闭</el-button>
</el-col>
</el-row>
<!-- <el-button
type="text" type="text"
@click="handleAbnormal(scope.row)" @click="handleAbnormal(scope.row)"
v-if="scope.row.runStatus === 3 || scope.row.runStatus === 4" v-if="scope.row.runStatus === 3 || scope.row.runStatus === 4"
>异常申报</el-button >异常申报</el-button
> > -->
<el-button type="text" @click="handleClose(scope.row)" v-if="scope.row.runStatus < 15"
>关闭</el-button
>
</template> </template>
</avue-crud> </avue-crud>
<!-- 打印标签 --> <!-- 打印标签 -->
@ -113,7 +117,7 @@ import closedDialog from '../components/closedDialog.vue';
import abnormalDialog from '../components/abnormalDialog.vue'; import abnormalDialog from '../components/abnormalDialog.vue';
import productionMonitoringDialog from '../components/productionMonitoringDialog.vue'; import productionMonitoringDialog from '../components/productionMonitoringDialog.vue';
import { getList,interlocking } from '@/api/productionManagement/sinTerWorkOrder'; import { getList, interlocking } from '@/api/productionManagement/sinTerWorkOrder';
export default { export default {
components: { components: {
productionDialog, productionDialog,
@ -173,7 +177,7 @@ export default {
viewBtnText: '详情', viewBtnText: '详情',
labelWidth: 120, labelWidth: 120,
// searchLabelWidth: 120, // searchLabelWidth: 120,
menuWidth: 260, menuWidth: 220,
dialogWidth: 1200, dialogWidth: 1200,
dialogClickModal: false, dialogClickModal: false,
searchEnter: true, searchEnter: true,
@ -349,7 +353,6 @@ export default {
overHidden: true, overHidden: true,
width: 150, width: 150,
// searchLabelWidth: 100, // searchLabelWidth: 100,
}, },
{ {
label: '订单优先级', label: '订单优先级',
@ -360,7 +363,7 @@ export default {
overHidden: true, overHidden: true,
width: 150, width: 150,
searchLabelWidth: 100, searchLabelWidth: 100,
hide:true, hide: true,
dicUrl: '/blade-system/dict/dictionary?code=orderPriority', dicUrl: '/blade-system/dict/dictionary?code=orderPriority',
props: { props: {
label: 'dictValue', label: 'dictValue',
@ -497,8 +500,8 @@ export default {
}, },
mounted() {}, mounted() {},
methods: { methods: {
printCraftCard_new(row){ printCraftCard_new(row) {
window.open(window.PROCESS_FLOW_CARD_HEAT_SINTER+'?woId='+row.woId); window.open(window.PROCESS_FLOW_CARD_HEAT_SINTER + '?woId=' + row.woId);
}, },
// //
handleInterlocking(row) { handleInterlocking(row) {
@ -510,11 +513,11 @@ export default {
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning', type: 'warning',
}).then(() => { }).then(() => {
let ids= this.selectionList.map(item => item.woId); let ids = this.selectionList.map(item => item.woId);
let query = { let query = {
woIds:ids.join(','), woIds: ids.join(','),
}; };
interlocking(query).then((res) => { interlocking(query).then(res => {
this.$message.success('操作成功'); this.$message.success('操作成功');
this.onLoad(this.page, this.query); this.onLoad(this.page, this.query);
}); });

@ -90,34 +90,34 @@ export default {
searchMenuPosition: 'right', searchMenuPosition: 'right',
align: 'center', align: 'center',
column: [ column: [
{ // {
label: '工序', // label: '',
prop: 'processId', // prop: 'processId',
search: true, // search: true,
sortable: true, // sortable: true,
span: 12, // span: 12,
type: 'select', // type: 'select',
filterable: true, // filterable: true,
dicUrl: '/blade-scheduling/processSet/findList', // dicUrl: '/blade-scheduling/processSet/findList',
props: { // props: {
label: 'name', // label: 'name',
value: 'id', // value: 'id',
}, // },
rules: [ // rules: [
{ // {
required: true, // required: true,
message: '请选择', // message: '',
trigger: 'blur', // trigger: 'blur',
}, // },
], // ],
change: (val, row) => { // change: (val, row) => {
this.onChangeData(val.item, 'processId'); // this.onChangeData(val.item, 'processId');
}, // },
}, // },
{ {
label: '工序', label: '工序',
prop: 'processName', prop: 'processName',
search: false, search: true,
sortable: true, sortable: true,
span: 12, span: 12,
hide: true, hide: true,

@ -75,7 +75,7 @@
title="导入" title="导入"
:isShow="isShowImport" :isShow="isShowImport"
templateUrl="/blade-desk/QA/CycleTestItem/download-excel-template" templateUrl="/blade-desk/QA/CycleTestItem/download-excel-template"
templateName="试验项目模板.xlsx" templateName="试验项目模板.xls"
importUrl="/blade-desk/QA/CycleTestItem/import-excel" importUrl="/blade-desk/QA/CycleTestItem/import-excel"
@closeDialog="closeDialog" @closeDialog="closeDialog"
></basic-import> ></basic-import>

@ -27,7 +27,7 @@
<!-- 导入 --> <!-- 导入 -->
<basic-import v-if="isShowImport" title="导入" :isShow="isShowImport" <basic-import v-if="isShowImport" title="导入" :isShow="isShowImport"
templateUrl="/blade-desk/QA/CycleTestItem/download-excel-template" templateUrl="/blade-desk/QA/CycleTestItem/download-excel-template"
templateName="试验项目模板.xlsx" templateName="试验项目模板.xls"
importUrl="/blade-desk/QA/CycleTestItem/import-excel" importUrl="/blade-desk/QA/CycleTestItem/import-excel"
@closeDialog="closeDialog"></basic-import> @closeDialog="closeDialog"></basic-import>

@ -39,7 +39,7 @@
title="导入" title="导入"
:isShow="isShowImport" :isShow="isShowImport"
templateUrl="/blade-desk/dsSimilarParts/import-template" templateUrl="/blade-desk/dsSimilarParts/import-template"
templateName="相似零件导入模板.xlsx" templateName="相似零件导入模板.xls"
importUrl="/blade-desk//dsSimilarParts/import-excel-simple" importUrl="/blade-desk//dsSimilarParts/import-excel-simple"
@closeDialog="closeDialog" @closeDialog="closeDialog"
></basic-import> ></basic-import>

@ -83,7 +83,7 @@
<!-- 导入 --> <!-- 导入 -->
<basic-import v-if="isShowImport" title="导入" :isShow="isShowImport" <basic-import v-if="isShowImport" title="导入" :isShow="isShowImport"
templateUrl="/blade-desk/QA/LiquidTank/downloadExcelTemplate" templateUrl="/blade-desk/QA/LiquidTank/downloadExcelTemplate"
templateName="槽液信息模板.xlsx" templateName="槽液信息模板.xls"
importUrl="/blade-desk/QA/LiquidTank/importExcel" importUrl="/blade-desk/QA/LiquidTank/importExcel"
@closeDialog="closeDialog"> @closeDialog="closeDialog">
</basic-import> </basic-import>

@ -47,7 +47,7 @@
title="导入" title="导入"
:isShow="isShowImport" :isShow="isShowImport"
templateUrl="/blade-desk/BA/WorkTank/downloadExcelTemplate" templateUrl="/blade-desk/BA/WorkTank/downloadExcelTemplate"
templateName="作业槽模板.xlsx" templateName="作业槽模板.xls"
importUrl="/blade-desk/BA/WorkTank/importExcel" importUrl="/blade-desk/BA/WorkTank/importExcel"
@closeDialog="closeDialog" @closeDialog="closeDialog"
></basic-import> ></basic-import>

@ -33,7 +33,7 @@
<!-- 导入 --> <!-- 导入 -->
<basic-import v-if="isShowImport" title="导入" :isShow="isShowImport" <basic-import v-if="isShowImport" title="导入" :isShow="isShowImport"
templateUrl="/blade-desk/bsEpciuInspectionPoint/downloadExcelTemplate" templateUrl="/blade-desk/bsEpciuInspectionPoint/downloadExcelTemplate"
templateName="环保巡检点配置表模板.xlsx" templateName="环保巡检点配置表模板.xls"
importUrl="/blade-desk/bsEpciuInspectionPoint/importExcel" importUrl="/blade-desk/bsEpciuInspectionPoint/importExcel"
@closeDialog="closeImportDialog"></basic-import> @closeDialog="closeImportDialog"></basic-import>
<!-- 新增弹窗 --> <!-- 新增弹窗 -->

@ -32,7 +32,7 @@
title="导入" title="导入"
:isShow="isShowImport" :isShow="isShowImport"
templateUrl="/blade-desk/bsSafeInspectionPoint/downloadExcelTemplate" templateUrl="/blade-desk/bsSafeInspectionPoint/downloadExcelTemplate"
templateName="安全巡检点配置导入模板.xlsx" templateName="安全巡检点配置导入模板.xls"
importUrl="/blade-desk/bsSafeInspectionPoint/importExcel" importUrl="/blade-desk/bsSafeInspectionPoint/importExcel"
@closeDialog="closeImportDialog" @closeDialog="closeImportDialog"
></basic-import> ></basic-import>

@ -35,7 +35,7 @@
title="导入" title="导入"
:isShow="isShowImport" :isShow="isShowImport"
templateUrl="/blade-desk/bsTower/downloadExcelTemplate" templateUrl="/blade-desk/bsTower/downloadExcelTemplate"
templateName="报警点配置导入模板.xlsx" templateName="报警点配置导入模板.xls"
importUrl="/blade-desk/bsTower/importExcel" importUrl="/blade-desk/bsTower/importExcel"
@closeDialog="closeImportDialog" @closeDialog="closeImportDialog"
></basic-import> ></basic-import>

@ -32,7 +32,7 @@
title="导入" title="导入"
:isShow="isShowImport" :isShow="isShowImport"
templateUrl="/blade-desk/bsDosingRec/downloadExcelTemplate" templateUrl="/blade-desk/bsDosingRec/downloadExcelTemplate"
templateName="废气加药记录导入模板.xlsx" templateName="废气加药记录导入模板.xls"
importUrl="/blade-desk/bsDosingRec/importExcel" importUrl="/blade-desk/bsDosingRec/importExcel"
@closeDialog="closeImportDialog" @closeDialog="closeImportDialog"
></basic-import> ></basic-import>

@ -27,7 +27,7 @@
<!-- 导入 --> <!-- 导入 -->
<basic-import v-if="isShowImport" title="导入" :isShow="isShowImport" <basic-import v-if="isShowImport" title="导入" :isShow="isShowImport"
templateUrl="/blade-desk/bsDischargeRec/downloadExcelTemplate" templateName="槽液排放记录导入模板.xlsx" templateUrl="/blade-desk/bsDischargeRec/downloadExcelTemplate" templateName="槽液排放记录导入模板.xls"
importUrl="/blade-desk/bsDischargeRec/importExcel" @closeDialog="closeDialog"></basic-import> importUrl="/blade-desk/bsDischargeRec/importExcel" @closeDialog="closeDialog"></basic-import>
</div> </div>
</template> </template>

@ -22,7 +22,7 @@
</addEditDialogDosingRecord> </addEditDialogDosingRecord>
<!-- 导入 --> <!-- 导入 -->
<basic-import v-if="isShowImport" title="导入" :isShow="isShowImport" <basic-import v-if="isShowImport" title="导入" :isShow="isShowImport"
templateUrl="/blade-desk/bsDosingRec/downloadExcelTemplate" templateName="废水加药记录导入模板.xlsx" templateUrl="/blade-desk/bsDosingRec/downloadExcelTemplate" templateName="废水加药记录导入模板.xls"
importUrl="/blade-desk/bsDosingRec/importExcel" @closeDialog="closeImportDialog"></basic-import> importUrl="/blade-desk/bsDosingRec/importExcel" @closeDialog="closeImportDialog"></basic-import>
</div> </div>
</template> </template>

@ -30,7 +30,7 @@
title="导入" title="导入"
:isShow="isShowImport" :isShow="isShowImport"
templateUrl="/blade-safety/wasteWaterMeterParameter/download-excel-template" templateUrl="/blade-safety/wasteWaterMeterParameter/download-excel-template"
templateName="废水计量参数导入模板.xlsx" templateName="废水计量参数导入模板.xls"
importUrl="/blade-safety/wasteWaterMeterParameter/import-excel" importUrl="/blade-safety/wasteWaterMeterParameter/import-excel"
@closeDialog="closeDialog" @closeDialog="closeDialog"
></basic-import> ></basic-import>

@ -32,7 +32,7 @@
title="导入" title="导入"
:isShow="isShowImport" :isShow="isShowImport"
templateUrl="/blade-desk/bsInsTest/downloadExcelTemplate" templateUrl="/blade-desk/bsInsTest/downloadExcelTemplate"
templateName="废水化验记录导入模板.xlsx" templateName="废水化验记录导入模板.xls"
importUrl="/blade-desk/bsInsTest/importExcel" importUrl="/blade-desk/bsInsTest/importExcel"
@closeDialog="closeImportDialog" @closeDialog="closeImportDialog"
></basic-import> ></basic-import>

@ -60,7 +60,7 @@
<!-- 导入 --> <!-- 导入 -->
<basic-import v-if="isShowImport" title="导入" :isShow="isShowImport" <basic-import v-if="isShowImport" title="导入" :isShow="isShowImport"
templateUrl="/blade-desk/QA/CycleTestItem/download-excel-template" templateUrl="/blade-desk/QA/CycleTestItem/download-excel-template"
templateName="试验项目模板.xlsx" templateName="试验项目模板.xls"
importUrl="/blade-desk/QA/CycleTestItem/import-excel" importUrl="/blade-desk/QA/CycleTestItem/import-excel"
@closeDialog="closeDialog"></basic-import> @closeDialog="closeDialog"></basic-import>
</basic-container> </basic-container>

@ -16,30 +16,28 @@
@size-change="sizeChange" @size-change="sizeChange"
@refresh-change="refreshChange" @refresh-change="refreshChange"
@on-load="onLoad" @on-load="onLoad"
:row-class-name="rowClassName" :row-class-name="rowClassName"
> >
<!-- :span-method="spanMethod" --> <!-- :span-method="spanMethod" -->
<template #menu-left> <template #menu-left>
<el-button type="danger" @click="handleDeletes">批量删除</el-button>
<el-button type="primary" @click="handleMaintain">设备维护</el-button> <el-button type="primary" @click="handleMaintain">设备维护</el-button>
<el-button type="danger" @click="handleDeletes">批量删除</el-button>
</template> </template>
<template #menu-right> <template #menu-right>
<el-button type="primary" @click="handleImport"> </el-button> <el-button type="primary" @click="handleImport"> </el-button>
</template> </template>
<template #equipmentDate="scope"> <template #equipmentDate="scope">
{{ scope.row.equipmentDate ?scope.row.equipmentDate.substring(0, 10) : ''}} {{ scope.row.equipmentDate ? scope.row.equipmentDate.substring(0, 10) : '' }}
</template> </template>
<template #deviceDueDate="scope"> <template #deviceDueDate="scope">
{{ scope.row.deviceDueDate ?scope.row.deviceDueDate.substring(0, 10) : ''}} {{ scope.row.deviceDueDate ? scope.row.deviceDueDate.substring(0, 10) : '' }}
</template> </template>
<template #dataBirth="scope"> <template #dataBirth="scope">
{{ scope.row.dataBirth ?scope.row.dataBirth.substring(0, 10) : ''}} {{ scope.row.dataBirth ? scope.row.dataBirth.substring(0, 10) : '' }}
</template> </template>
<template #validityPeriodExpire="scope"> <template #validityPeriodExpire="scope">
{{ scope.row.validityPeriodExpire ?scope.row.validityPeriodExpire.substring(0, 10) : ''}} {{ scope.row.validityPeriodExpire ? scope.row.validityPeriodExpire.substring(0, 10) : '' }}
</template> </template>
</avue-crud> </avue-crud>
<!-- 设备维护 --> <!-- 设备维护 -->
<equipmentDialog <equipmentDialog
@ -172,7 +170,7 @@ export default {
overflow: true, overflow: true,
search: true, search: true,
fixed: 'left', fixed: 'left',
searchLabelWidth:50, searchLabelWidth: 50,
}, },
{ {
label: '所属班组', label: '所属班组',
@ -297,9 +295,7 @@ export default {
}, },
}; };
}, },
mounted() { mounted() {},
},
methods: { methods: {
// //
handleImport() { handleImport() {

@ -164,7 +164,7 @@
title="导入" title="导入"
:isShow="isShowImport" :isShow="isShowImport"
templateUrl="/blade-desk/certificateMaintenance/downloadExcelTemplate" templateUrl="/blade-desk/certificateMaintenance/downloadExcelTemplate"
templateName="上岗台账导入模板.xlsx" templateName="上岗台账导入模板.xls"
importUrl="/blade-desk/certificateMaintenance/importExcel" importUrl="/blade-desk/certificateMaintenance/importExcel"
@closeDialog="closeDialog" @closeDialog="closeDialog"
></basic-import> ></basic-import>

@ -19,8 +19,8 @@
> >
<!-- :span-method="spanMethod" --> <!-- :span-method="spanMethod" -->
<template #menu-left> <template #menu-left>
<el-button type="danger" @click="handleDeletes">批量删除</el-button>
<el-button type="primary" @click="handleMaintain">证书维护</el-button> <el-button type="primary" @click="handleMaintain">证书维护</el-button>
<el-button type="danger" @click="handleDeletes">批量删除</el-button>
</template> </template>
<template #menu-right> <template #menu-right>
<el-button type="primary" @click="handleImport"> </el-button> <el-button type="primary" @click="handleImport"> </el-button>
@ -42,7 +42,11 @@
</template> </template>
<template #airworthinessDateExpire="scope"> <template #airworthinessDateExpire="scope">
{{ scope.row.airworthinessDateExpire ? scope.row.airworthinessDateExpire.substring(0, 10) : '' }} {{
scope.row.airworthinessDateExpire
? scope.row.airworthinessDateExpire.substring(0, 10)
: ''
}}
</template> </template>
<template #astronautDate="scope"> <template #astronautDate="scope">
{{ scope.row.astronautDate ? scope.row.astronautDate.substring(0, 10) : '' }} {{ scope.row.astronautDate ? scope.row.astronautDate.substring(0, 10) : '' }}
@ -51,7 +55,11 @@
{{ scope.row.astronautDateExpire ? scope.row.astronautDateExpire.substring(0, 10) : '' }} {{ scope.row.astronautDateExpire ? scope.row.astronautDateExpire.substring(0, 10) : '' }}
</template> </template>
<template #astronautValidityPeriod="scope"> <template #astronautValidityPeriod="scope">
{{ scope.row.astronautValidityPeriod ? scope.row.astronautValidityPeriod.substring(0, 10) : '' }} {{
scope.row.astronautValidityPeriod
? scope.row.astronautValidityPeriod.substring(0, 10)
: ''
}}
</template> </template>
</avue-crud> </avue-crud>
<!-- 证书维护 --> <!-- 证书维护 -->

Loading…
Cancel
Save