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

dev-scheduling
姜雪 1 month ago
commit a69d3f4a6f
  1. 5
      src/components/basic-container/main.vue
  2. 32
      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. 24
      src/views/processManagement/bathRefine/components/planCheckDialog.vue
  36. 28
      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. 39
      src/views/productionManagement/blbWorkOrder/components/glass.vue
  47. 39
      src/views/productionManagement/blbWorkOrder/components/others.vue
  48. 6
      src/views/productionManagement/components/closedDialog.vue
  49. 127
      src/views/productionManagement/productionMonitoring/index.vue
  50. 59
      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. 26
      src/views/workLicense/personnelEquipment.vue
  67. 2
      src/views/workLicense/workLicense copy.vue
  68. 18
      src/views/workLicense/workLicense.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%;
}
}

@ -39,7 +39,7 @@
<el-button type="primary" @click="handleImport"> </el-button>
</template>
<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
>
<!-- v-show="scope.row.phStatus == 3" -->
@ -47,16 +47,16 @@
<el-button type="text" @click="individualTakeFun(scope.row)">个人信息</el-button>
</template>
<template #dataBirth="scope">
{{ scope.row.dataBirth ?scope.row.dataBirth.substring(0, 10) : ''}}
{{ scope.row.dataBirth ? scope.row.dataBirth.substring(0, 10) : '' }}
</template>
<template #contractDuration="scope">
{{ scope.row.contractDuration ?scope.row.contractDuration.substring(0, 10) : ''}}
{{ scope.row.contractDuration ? scope.row.contractDuration.substring(0, 10) : '' }}
</template>
<template #joinJobDate="scope">
{{ scope.row.joinJobDate ?scope.row.joinJobDate.substring(0, 10) : ''}}
<template #joinJobDate="scope">
{{ scope.row.joinJobDate ? scope.row.joinJobDate.substring(0, 10) : '' }}
</template>
<template #inJobDate="scope">
{{ scope.row.inJobDate ?scope.row.inJobDate.substring(0, 10) : ''}}
<template #inJobDate="scope">
{{ scope.row.inJobDate ? scope.row.inJobDate.substring(0, 10) : '' }}
</template>
</avue-crud>
@ -103,7 +103,14 @@
</template>
</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-column label="姓名" prop="userName" min-width="120" />
<el-table-column label="工号" prop="userCode" min-width="120" />
@ -579,7 +586,7 @@ export default {
labelWidth: 150,
search: false,
width: 200,
addDisplay: false,
addDisplay: false,
editDisplay: false,
type: 'date',
format: 'YYYY-MM-DD HH:mm:ss',
@ -718,7 +725,6 @@ export default {
this.showDialog = false;
this.onLoad(this.page, this.query);
});
} else {
console.log('error submit!!');
return false;
@ -862,10 +868,8 @@ export default {
}
const ids = idArr.join(',');
regularization({ ids: ids }).then(res => {
if (res.code == 200) {
this.$message.success('转正成功');
this.onLoad(this.page);
}
this.$message.success('转正成功');
this.onLoad(this.page, this.query);
});
});
},

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

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

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

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

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

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

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

@ -78,7 +78,7 @@
<el-table-column align="center" label="资料">
<template #default="scope">
<!-- 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>
</el-table-column>
</el-table>
@ -210,7 +210,7 @@ export default {
addBtn: false,
labelWidth: 120,
menu: true,
menuWidth: 200,
menuWidth: 140,
dialogWidth: 600,
dialogClickModal: false,
searchEnter: true,

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

@ -73,7 +73,7 @@
</el-dialog>
<!-- 导入 -->
<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>
<!-- 成本计算月份选择弹窗 -->

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

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

@ -17,7 +17,7 @@
</avue-crud>
<!-- 导入 -->
<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>
</div>
</template>

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

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

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

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

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

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

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

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

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

@ -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"
></basic-import>

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

@ -21,7 +21,7 @@
<processDialog :showDialog="isOpen" v-if="isOpen" @closeDialog="closeDialog"></processDialog>
<!-- 导入 -->
<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>
</div>
</template>

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

@ -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"
></basic-import>

@ -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"
></basic-import>

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

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

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

@ -69,6 +69,7 @@
style="width: 100%"
clearable
filterable
@change="batchNoChange(scope.row, scope.$index)"
>
<el-option
v-for="item in scope.row.tankList"
@ -188,6 +189,13 @@ export default {
}
},
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) {
this.form.batchNo = '';

@ -5,7 +5,7 @@
<template #footer>
<span class="dialog-footer">
<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>
</template>
</el-dialog>
@ -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;
}
});

@ -17,7 +17,6 @@
@size-change="sizeChange"
@refresh-change="refreshChange"
@on-load="onLoad"
>
<template #menu="scope">
<!-- <el-button
@ -27,13 +26,18 @@
</el-button> -->
<el-button
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)"
>审批</el-button
>
</template>
<template #arrangeTime="scope">
{{ scope.row.arrangeTime ? scope.row.arrangeTime.substring(0, 10) : '' }}
{{ scope.row.arrangeTime ? scope.row.arrangeTime.substring(0, 10) : '' }}
</template>
</avue-crud>
<!-- 审批 -->
@ -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: '取消',

@ -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,

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

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

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

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

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

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

@ -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"
></basic-import>

@ -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"
></basic-import>

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

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

@ -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() {

@ -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 @@
</template>
<template #menu="scope">
<el-button type="text" @click="clickProduction(scope.row)">生产监控</el-button>
<el-button type="text" @click="printCraftCard_new(scope.row)">工艺流程卡</el-button>
<el-button type="text" @click="priorityFn(scope.row)" v-if="scope.row.runStatus === 2"
>优先级调整</el-button
>
<el-button
type="text"
@click="handleBatches(scope.row)"
v-if="[2, 3, 4, 6].includes(scope.row.runStatus)"
>分批</el-button
>
<el-button
type="text"
@click="handleAbnormal(scope.row)"
v-if="scope.row.runStatus === 3 || scope.row.runStatus === 4"
>异常申报</el-button
>
<el-button
type="text"
@click="handleOutsource(scope.row)"
v-if="scope.row.runStatus <= 6 && scope.row.runStatus !== 5"
>转外协</el-button
>
<el-button
type="text"
@click="handleSintering(scope.row)"
v-if="scope.row.runStatus <= 6 && scope.row.runStatus !== 5"
>转烧结</el-button
>
<el-button type="text" @click="handleClose(scope.row)" v-if="scope.row.runStatus < 15"
>关闭</el-button
>
<el-row>
<el-col :span="6">
<el-button type="text" @click="clickProduction(scope.row)">生产监控</el-button>
</el-col>
<el-col :span="6">
<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
type="text"
@click="handleBatches(scope.row)"
>分批</el-button
>
</el-col>
<el-col :span="6" v-if="scope.row.runStatus === 3 || scope.row.runStatus === 4">
<el-button
type="text"
@click="handleAbnormal(scope.row)"
>异常申报</el-button
>
</el-col>
<el-col :span="6" v-if="scope.row.runStatus <= 6 && scope.row.runStatus !== 5">
<el-button
type="text"
@click="handleOutsource(scope.row)"
>转外协</el-button
>
</el-col>
<el-col :span="6" v-if="scope.row.runStatus <= 6 && scope.row.runStatus !== 5">
<el-button
type="text"
@click="handleSintering(scope.row)"
>转烧结</el-button
>
</el-col>
<el-col :span="6" v-if="scope.row.runStatus < 15">
<el-button type="text" @click="handleClose(scope.row)"
>关闭</el-button
>
</el-col>
</el-row>
</template>
</avue-crud>
<!-- 打印标签 -->
@ -90,7 +106,7 @@
:itemData="itemData"
@closeDialog="closeDialog"
></outsource-dialog>
<!-- 分批弹窗 -->
<batches-dialog
v-if="showBatches"
@ -99,12 +115,12 @@
@closeDialog="closeDialog"
></batches-dialog>
<!-- 关闭弹窗 -->
<closed-dialog
<closedDialog
v-if="showClose"
:show-close="showClose"
@closeDialog="closeDialog"
:itemData="itemData"
></closed-dialog>
></closedDialog>
<!-- 异常处理 -->
<abnormalDialog
v-if="showAbnormal"
@ -120,7 +136,12 @@
></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>
</template>
@ -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) {

@ -30,26 +30,30 @@
<el-button type="success" plain @click="queryOrdersHandle('15')">已完工</el-button>
</template>
<template #menu="scope">
<el-button type="text" @click="clickProduction(scope.row)">生产监控</el-button>
<el-button type="text" @click="printCraftCard_new(scope.row)">工艺流程卡</el-button>
<el-button type="text" @click="priorityFn(scope.row)" v-if="scope.row.runStatus === 2"
>优先级调整</el-button
>
<el-button
type="text"
@click="handleBatches(scope.row)"
v-if="[2, 3, 4, 6].includes(scope.row.runStatus)"
>分批</el-button
>
<el-button
<el-row>
<el-col :span="6">
<el-button type="text" @click="clickProduction(scope.row)">生产监控</el-button>
</el-col>
<el-col :span="6">
<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 type="text" @click="handleBatches(scope.row)">分批</el-button>
</el-col>
<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"
@click="handleAbnormal(scope.row)"
v-if="scope.row.runStatus === 3 || scope.row.runStatus === 4"
>异常申报</el-button
>
<el-button type="text" @click="handleClose(scope.row)" v-if="scope.row.runStatus < 15"
>关闭</el-button
>
> -->
</template>
</avue-crud>
<!-- 打印标签 -->
@ -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) {

@ -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,

@ -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"
></basic-import>

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

@ -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"
></basic-import>

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

@ -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"
></basic-import>

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

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

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

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

@ -27,7 +27,7 @@
<!-- 导入 -->
<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>
</div>
</template>

@ -22,7 +22,7 @@
</addEditDialogDosingRecord>
<!-- 导入 -->
<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>
</div>
</template>

@ -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"
></basic-import>

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

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

@ -16,30 +16,28 @@
@size-change="sizeChange"
@refresh-change="refreshChange"
@on-load="onLoad"
:row-class-name="rowClassName"
>
<!-- :span-method="spanMethod" -->
<!-- :span-method="spanMethod" -->
<template #menu-left>
<el-button type="danger" @click="handleDeletes">批量删除</el-button>
<el-button type="primary" @click="handleMaintain">设备维护</el-button>
<el-button type="danger" @click="handleDeletes">批量删除</el-button>
</template>
<template #menu-right>
<el-button type="primary" @click="handleImport"> </el-button>
</template>
<template #equipmentDate="scope">
{{ scope.row.equipmentDate ?scope.row.equipmentDate.substring(0, 10) : ''}}
{{ scope.row.equipmentDate ? scope.row.equipmentDate.substring(0, 10) : '' }}
</template>
<template #deviceDueDate="scope">
{{ scope.row.deviceDueDate ?scope.row.deviceDueDate.substring(0, 10) : ''}}
<template #deviceDueDate="scope">
{{ scope.row.deviceDueDate ? scope.row.deviceDueDate.substring(0, 10) : '' }}
</template>
<template #dataBirth="scope">
{{ scope.row.dataBirth ?scope.row.dataBirth.substring(0, 10) : ''}}
{{ scope.row.dataBirth ? scope.row.dataBirth.substring(0, 10) : '' }}
</template>
<template #validityPeriodExpire="scope">
{{ scope.row.validityPeriodExpire ?scope.row.validityPeriodExpire.substring(0, 10) : ''}}
{{ scope.row.validityPeriodExpire ? scope.row.validityPeriodExpire.substring(0, 10) : '' }}
</template>
</avue-crud>
<!-- 设备维护 -->
<equipmentDialog
@ -172,7 +170,7 @@ export default {
overflow: true,
search: true,
fixed: 'left',
searchLabelWidth:50,
searchLabelWidth: 50,
},
{
label: '所属班组',
@ -247,7 +245,7 @@ export default {
overflow: true,
search: false,
},
{
{
label: '设备编号',
prop: 'deviceCode',
span: 24,
@ -297,9 +295,7 @@ export default {
},
};
},
mounted() {
},
mounted() {},
methods: {
//
handleImport() {
@ -405,7 +401,7 @@ export default {
if (this.selectionList.length == 0) {
this.$message.error('请至少选择一条数据');
} else {
// certificateTypeId
// certificateTypeId
const invalidItem = this.selectionList.find(
item => !item.certificateTypeId || item.certificateTypeId === ''
);

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

@ -19,8 +19,8 @@
>
<!-- :span-method="spanMethod" -->
<template #menu-left>
<el-button type="danger" @click="handleDeletes">批量删除</el-button>
<el-button type="primary" @click="handleMaintain">证书维护</el-button>
<el-button type="danger" @click="handleDeletes">批量删除</el-button>
</template>
<template #menu-right>
<el-button type="primary" @click="handleImport"> </el-button>
@ -42,16 +42,24 @@
</template>
<template #airworthinessDateExpire="scope">
{{ scope.row.airworthinessDateExpire ? scope.row.airworthinessDateExpire.substring(0, 10) : '' }}
{{
scope.row.airworthinessDateExpire
? scope.row.airworthinessDateExpire.substring(0, 10)
: ''
}}
</template>
<template #astronautDate="scope">
{{ scope.row.astronautDate ? scope.row.astronautDate.substring(0, 10) : '' }}
</template>
<template #astronautDateExpire="scope">
<template #astronautDateExpire="scope">
{{ scope.row.astronautDateExpire ? scope.row.astronautDateExpire.substring(0, 10) : '' }}
</template>
<template #astronautValidityPeriod="scope">
{{ scope.row.astronautValidityPeriod ? scope.row.astronautValidityPeriod.substring(0, 10) : '' }}
{{
scope.row.astronautValidityPeriod
? scope.row.astronautValidityPeriod.substring(0, 10)
: ''
}}
</template>
</avue-crud>
<!-- 证书维护 -->
@ -349,7 +357,7 @@ export default {
},
],
},
{
{
label: '宇航有效期(年)',
prop: 'astronautValidityPeriod',
span: 24,

Loading…
Cancel
Save