From 445cfc2c5cee3d8fc0f8f1ffae5b66d9c761e681 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期三, 22 十一月 2023 19:15:39 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/views/eam/ABC/modules/StreamModal.vue | 65
src/views/eam/modules/specialtyMaintenanceStandard/SpecialtyMaintenanceStandardModal.vue | 6
src/views/eam/modules/maintenanceProject/MaintenanceProjectModel.vue | 15
src/views/eam/EquipmentListOfTruck.vue | 27
src/views/eam/modules/equipmentReturn/EquipmentUnloadingReturnDetail.vue | 2
src/views/eam/EquipmentListOfAll.vue | 31
src/views/eam/modules/equipmentSeal/EquipmentSealForm.vue | 2
src/views/eam/modules/repairorder/moudles/select/EquipmentList.vue | 2
src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerModalList.vue | 6
src/views/spare/modules/sparePart/EquipmentList.vue | 2
src/views/eam/modules/specialtyMaintenancePlan/SpecialtyMaintenancePlanModal.vue | 4
src/views/eam/modules/equipmentNew/EquipmentResume/EquipmentResumeDrawer.vue | 2
src/views/eam/modules/equipmentCalibrationOrder/EquipmentCalibrationOrderModal.vue | 78
src/views/eam/modules/projectMaintenanceOrder/ProjectMaintenanceOrderForm.vue | 2
src/views/mdc/base/modules/deviceRepair/DeviceRepairEditListModel.vue | 6
src/views/eam/modules/daily3MaintenanceOrder/DailyMaintenanceOrderExeDrawer.vue | 27
src/views/eam/modules/repairorderfinished/RepairOrderFinishedReportModel.vue | 4
src/views/eam/modules/equipmentBorrow/EquipmentUnloadingBorrowDetail.vue | 2
src/views/eam/modules/repairorder/repairOrderExcuteDrawer.vue | 482 ++
src/views/eam/modules/equipmentReturn/EquipmentUnloadingReturnDetailModal.vue | 2
src/views/eam/MalfunctionRepair.vue | 214 +
src/views/eam/modules/projectMaintenanceOrder/ProjectMaintenanceOrderDetailList.vue | 2
src/views/eam/DailyInspectionOrderList.vue | 129
src/views/eam/DailyInspectionStandardList.vue | 183
src/views/eam/modules/FaultInfoForm.vue | 473 ++
src/views/eam/modules/equipmentScrap/EquipmentScrapDetailList.vue | 6
src/views/eam/RepairOrderList.vue | 225
src/views/eam/OperationCertificateApplyList.vue | 32
src/views/eam/modules/equipmentUnseal/EquipmentUnsealDetailModal.vue | 4
src/views/eam/modules/equipmentCalibrationOrder/EquipmentCalibrationOrderReportList.vue | 46
src/views/eam/PredictiveWorkOrderList.vue | 6
src/views/eam/repairOrderFinishedReport/modules/RepairOrderFaultAnalysisReportModel.vue | 2
src/views/system/RoleUserList.vue | 4
src/components/tools/EquipmentSelection.vue | 8
src/views/eam/SpecialtyInspectionStandardList.vue | 4
src/views/mdc/base/modules/deviceManager/DeviceListModel.vue | 6
src/views/eam/modules/projectMaintenanceOrder/ProjectMaintenanceOrderDetailModal.vue | 4
src/views/eam/modules/equipmentCalibrationOrder/FinalModal.vue | 2
src/views/eam/modules/maintenanceProject/MaintenanceProjectRight.vue | 113
src/views/eam/modules/equipmentDisposal/EquipmentDisposalForm.vue | 2
src/views/eam/EquipmentListOfWeldingMachine.vue | 29
src/views/eam/modules/equipmentScrap/EquipmentScrapForm.vue | 2
src/views/mdc/base/modules/alarmManager/alarmManangerEqupment.vue | 6
src/views/eam/modules/inspectionProject/InspectionProjectRight.vue | 66
src/views/eam/modules/repairorder/moudles/select/FaultReportRepair.vue | 4
src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderExeDrawer.vue | 226
src/views/eam/ABC/modules/StreamForm.vue | 572 +++
src/views/eam/modules/equipmentBorrow/EquipmentUnloadingBorrowDetailModal.vue | 2
src/views/eam/modules/specialtyInspectionPlan/SpecialtyInspectionPlanDetail.vue | 2
src/views/eam/ABC/modules/NodeModel.vue | 148
src/views/eam/modules/specialtyInspectionStandard/SpecialtylnspectionStandardModal.vue | 2
src/views/eam/modules/QuanlityConfirmForm.vue | 158
src/views/eam/modules/equipmentDisposal/EquipmentDisposalDetailModal.vue | 4
src/views/eam/modules/specialtyMaintenanceOrder/SpecialtyMaintenanceOrderAssignModal.vue | 2
src/views/system/WorkshopSignageManagement.vue | 4
src/views/eam/modules/equipmentChange/EquipmentChangeDetail.vue | 2
src/views/eam/modules/specialtyMaintenancePlan/SpecialtyMaintenancePlanDetail.vue | 2
src/views/mdc/base/modules/DepartList/DepartListContent/DepartListModel.vue | 6
src/views/eam/EquipmentListOfEnvProEquipment.vue | 29
src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderModal.vue | 24
src/views/eam/modules/equipmentScrap/EquipmentScrapForm-bak.vue | 6
src/views/mdc/base/modules/mdcProcessQuantity/mdcProcessQuantityModalList.vue | 6
src/views/eam/modules/dailyMaintenanceStandard/DailyMaintenanceStandardDetail.vue | 51
src/views/eam/modules/malfunctionRepair/EquipmentList.vue | 56
src/views/eam/modules/specialtyInspectionOrder/SpecialtyInspectionPlanList.vue | 2
src/views/eam/repairOrderFinishedReport/modules/RepairOrderActualHoursReportModel copy.vue | 2
src/views/eam/modules/specialtyInspectionOrder/SpecialtyInspectionOrderAssignModal.vue | 2
src/views/eam/modules/specialtyMaintenanceOrder/SpecialyMaintenanceOrderExeDrawer.vue | 2
src/views/eam/SpecialtyInspectionPlanList.vue | 4
src/views/eam/modules/repairorder/RepairOrderModal.vue | 2
src/views/eam/modules/specialtyMaintenanceOrder/SpecialtyMaintenancePlanList.vue | 2
src/views/eam/common/EquipmentList.vue | 2
src/views/eam/modules/equipmentTransfer/EquipmentTransferOutDetail.vue | 2
src/views/eam/modules/equipmentCalibrationOrder/EquipmentTechnologyStatusModal.vue | 285 +
src/views/eam/modules/repairorderfinished/RepairOrderFinishedReportModel copy.vue | 2
src/views/eam/modules/QuanlityConfirmModal.vue | 60
src/views/eam/modules/dailyMaintenanceOrder/MaintenanceOrderModal.vue | 18
src/views/eam/EquipmentOfLine.vue | 410 ++
src/views/eam/EquipmentVerification/CertifiedWorkOrder.vue | 2
src/views/eam/modules/dailyMaintenanceOrder/DailyMaintenanceOrderExeDrawer.vue | 27
src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationModalList.vue | 6
src/views/eam/ABC/ABCAssessmentList.vue | 215 +
src/views/eam/modules/dailyMaintenanceStandard/JSelectMaintenanceStandardModal.vue | 20
src/views/mdc/base/modules/EquipmentList/UserModal.vue | 4
src/views/mdc/base/modules/DepartList/DepartListContent/DepartList.vue | 2
src/views/eam/modules/equipmentTransferIn/EquipmentTransferInDetailModal.vue | 2
src/views/eam/modules/predictiveWorkOrder/PredictiveWorkPlanList.vue | 2
src/views/common/JSelectEquipmentModal.vue | 6
src/views/eam/modules/inspectionProject/InspectionProjectModel.vue | 239
src/views/eam/modules/equipmentTransfer/EquipmentTransferOutDetailModal.vue | 2
src/views/eam/modules/equipmentUnseal/EquipmentUnsealDetailList.vue | 2
src/views/eam/ABC/modules/EquipmentSelectModel.vue | 303 +
src/views/eam/EquipmentListOfTester.vue | 29
src/views/mdc/base/modules/OvertimeManagement/OvertimeManagementModalList.vue | 4
src/views/mdc/base/modules/deviceCalendar/DeviceCalendarListModel.vue | 6
src/views/eam/EquipmentListOfProduct.vue | 29
src/views/eam/modules/malfunctionRepair/MalfunctionRepaireForm.vue | 4
src/views/eam/modules/repairorder/moudles/RepairOrderFaultAnalysisReport.vue | 91
src/views/mdc/base/modules/mdcStandardProcessDuration/MdcStandardProcessDurationModalList.vue | 6
src/views/eam/ABC/StreamOperationList.vue | 177 +
src/views/eam/modules/equipmentChange/EquipmentChangeDetailModal.vue | 2
src/views/eam/modules/equipmentUnseal/EquipmentUnsealForm.vue | 2
src/views/eam/modules/repairorder/RepairOrderModal copy.vue | 2
src/views/eam/modules/repairorder/moudles/RepairOrderActualMaterialReportModel.vue | 2
src/views/eam/modules/operationCertificateApply/OperationCertificateApplyAudit.vue | 137
src/views/eam/modules/specialtyInspectionPlan/SpecialtyInspectionPlanModal.vue | 18
src/views/eam/DailyMaintenanceOrderList.vue | 167
src/views/eam/modules/repairorder/moudles/RepairOrderActualHoursReportModel.vue | 2
src/views/eam/modules/specialtyInspectionStandard/EquipmentList.vue | 2
src/views/eam/modules/dailyInspectionStandard/AuditApprovalModal.vue | 260 +
src/views/eam/modules/dailyInspectionOrder/DailyInspectionStandardList.vue | 4
src/views/eam/modules/equipmentScrap/EquipmentSelectModal copy.vue | 12
src/views/eam/modules/equipmentDisposal/EquipmentDisposalDetailList.vue | 2
src/views/eam/QuanlityConfirmList.vue | 313 +
src/views/eam/modules/specialtyMaintenanceOrder/InspectionOrderAssignModal.vue | 2
src/views/eam/EquipmentListOfPressureVessel.vue | 27
src/views/eam/modules/specialtyInspectionOrder/SpecialyInspectionOrderExeDrawer.vue | 2
src/views/mdc/base/modules/deviceRepair/DeviceRepairListModel.vue | 6
src/views/eam/modules/equipmentScrap/EquipmentSelectModal.vue | 84
src/views/mdc/base/modules/DepartList/DepartListContent/DepartListSeachList.vue | 6
src/views/eam/modules/equipmentCalibrationOrder/EquipmentCalibrationOrderReportModal.vue | 4
src/views/eam/modules/specialtyMaintenanceOrder/MaintenancePlanList.vue | 2
src/views/eam/modules/line/EquipmentOfLineForm.vue | 363 ++
src/views/eam/modules/equipmentCalibrationOrder/EquipmentList.vue | 2
src/views/eam/EquipmentListOfRide.vue | 27
src/views/mdc/base/modules/HolidayManagement/HolidayManagementModalList.vue | 6
src/views/eam/modules/equipment/EquipmentModel.vue | 2
src/views/eam/RepairOrderFinishedReport.vue | 6
src/views/eam/modules/predictiveWorkPlan/PredictiveWorkPlanModal.vue | 2
src/views/eam/modules/dailyInspectionStandard/DailylnspectionStandardModal.vue | 14
src/views/eam/modules/equipmentUnseal/EquipmentSelectModal.vue | 6
src/views/eam/modules/equipmentSeal/EquipmentSealDetailModal.vue | 4
src/views/eam/EquipmentListOfCrane.vue | 42
src/views/eam/modules/specialtyInspectionPlan/JSelectSpecialtylnspectionStandardModal.vue | 2
src/views/eam/ABC/StreamList.vue | 345 ++
src/views/eam/EquipmentVerification/VerificationExecution.vue | 2
src/views/eam/modules/repairorder/RepairOrderAssignTask.vue | 4
src/views/eam/PredictiveWorkPlanList.vue | 2
src/views/eam/modules/equipmentTransferIn/EquipmentTransferInDetail.vue | 2
src/views/eam/SpecialtyInspectionOrderList.vue | 2
src/views/eam/modules/line/EquipmentListOfLine.vue | 200 +
src/views/eam/modules/equipmentSeal/EquipmentSelectModal.vue | 10
src/views/eam/modules/specialtyInspectionOrder/SpecialtyInspectionOrderModal.vue | 2
src/views/eam/modules/dailyMaintenanceStandard/AuditApprovalModal.vue | 254 +
src/views/eam/modules/line/EquipmentOfLineModal.vue | 75
src/views/mdc/base/modules/mdcPassRate/mdcPassRateModalList.vue | 6
src/views/eam/modules/malfunctionRepair/MalfunctionRepaireModal.vue | 202
src/views/eam/EquipmentListOfFilesCarousel.vue | 27
src/views/eam/modules/daily3MaintenanceOrder/EquipmentPrecisionCheckOrderModal.vue | 35
src/views/eam/modules/equipment/EquipmentResume/EquipmentResumeDrawer.vue | 2
src/views/eam/modules/dailyMaintenanceOrder/FinishDevolutionModal.vue | 104
src/views/mdc/base/modules/deviceManager/DeviceList.vue | 2
src/views/eam/modules/dailyMaintenanceOrder/MaintenanceOrderAssignModal.vue | 2
src/views/mdc/base/modules/deviceManager/DeviceModel.vue | 2
src/views/eam/modules/FaultInfoModal.vue | 61
src/views/eam/modules/repairorder/moudles/select/ProjectMaintenanceOrder.vue | 2
src/views/mdc/base/modules/EquipmentList/DeviceListModal.vue | 6
src/views/eam/DailyMaintenanceStandardList.vue | 156
src/views/eam/modules/dailyMaintenanceStandard/DailyMaintenanceStandardModal.vue | 105
src/views/eam/EquipmentCalibrationOrder.vue | 120
src/components/tools/UnsealEquipmentSelection.vue | 8
src/views/eam/Daily3MaintenanceOrderList.vue | 161
src/views/eam/modules/equipmentSeal/EquipmentSealDetailList.vue | 2
src/views/eam/modules/repairorder/moudles/RepairOrderFaultAnalysisReportModel.vue | 2
src/views/eam/modules/equipmentScrap/EquipmentScrapDetailModal.vue | 4
src/views/eam/FaultInfoList.vue | 447 ++
166 files changed, 7,820 insertions(+), 1,682 deletions(-)
diff --git a/src/components/tools/EquipmentSelection.vue b/src/components/tools/EquipmentSelection.vue
index 6553fb7..51208b3 100644
--- a/src/components/tools/EquipmentSelection.vue
+++ b/src/components/tools/EquipmentSelection.vue
@@ -7,8 +7,8 @@
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :md="5" :sm="4">
- <a-form-item label="璁惧缂栫爜">
- <a-input placeholder="璇疯緭鍏ヨ澶囩紪鐮�" v-model="queryParam.num" />
+ <a-form-item label="缁熶竴缂栫爜">
+ <a-input placeholder="璇疯緭鍏ョ粺涓�缂栫爜" v-model="queryParam.num" />
</a-form-item>
</a-col>
<a-col :md="5" :sm="4">
@@ -86,7 +86,7 @@
queryParam: {},
columns: [
{
- title: '璁惧缂栫爜',
+ title: '缁熶竴缂栫爜',
align: 'center',
dataIndex: 'num',
width: 120,
@@ -153,7 +153,7 @@
],
selectColumns: [
{
- title: '璁惧缂栫爜',
+ title: '缁熶竴缂栫爜',
align: 'center',
dataIndex: 'num',
width: 120,
diff --git a/src/components/tools/UnsealEquipmentSelection.vue b/src/components/tools/UnsealEquipmentSelection.vue
index 822609d..99d7900 100644
--- a/src/components/tools/UnsealEquipmentSelection.vue
+++ b/src/components/tools/UnsealEquipmentSelection.vue
@@ -7,8 +7,8 @@
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :md="5" :sm="4">
- <a-form-item label="璁惧缂栫爜">
- <a-input placeholder="璇疯緭鍏ヨ澶囩紪鐮�" v-model="queryParam.num" />
+ <a-form-item label="缁熶竴缂栫爜">
+ <a-input placeholder="璇疯緭鍏ョ粺涓�缂栫爜" v-model="queryParam.num" />
</a-form-item>
</a-col>
<a-col :md="5" :sm="4">
@@ -86,7 +86,7 @@
queryParam: {},
columns: [
{
- title: '璁惧缂栫爜',
+ title: '缁熶竴缂栫爜',
align: 'center',
dataIndex: 'num',
width: 120,
@@ -153,7 +153,7 @@
],
selectColumns: [
{
- title: '璁惧缂栫爜',
+ title: '缁熶竴缂栫爜',
align: 'center',
dataIndex: 'num',
width: 120,
diff --git a/src/views/common/JSelectEquipmentModal.vue b/src/views/common/JSelectEquipmentModal.vue
index 9072bc3..4965315 100644
--- a/src/views/common/JSelectEquipmentModal.vue
+++ b/src/views/common/JSelectEquipmentModal.vue
@@ -32,9 +32,9 @@
:md='8'
:sm='6'
>
- <a-form-item label='璁惧缂栫爜'>
+ <a-form-item label='缁熶竴缂栫爜'>
<a-input
- placeholder='璇疯緭鍏ヨ澶囩紪鐮�'
+ placeholder='璇疯緭鍏ョ粺涓�缂栫爜'
v-model='queryParam.num'
/>
</a-form-item>
@@ -104,7 +104,7 @@
width: 50
},
{
- title: '璁惧缂栫爜',
+ title: '缁熶竴缂栫爜',
align: 'center',
dataIndex: 'num'
},
diff --git a/src/views/eam/ABC/ABCAssessmentList.vue b/src/views/eam/ABC/ABCAssessmentList.vue
new file mode 100644
index 0000000..6acfc1e
--- /dev/null
+++ b/src/views/eam/ABC/ABCAssessmentList.vue
@@ -0,0 +1,215 @@
+<template>
+ <a-card :bordered="false" :class="'cust-erp-sub-tab'">
+ <!-- 鏌ヨ鍖哄煙 -->
+ <div class="table-page-search-wrapper">
+ <a-form layout="inline" @keyup.enter.native="searchQuery">
+ <a-row :gutter="24">
+ </a-row>
+ </a-form>
+ </div>
+ <!-- 鏌ヨ鍖哄煙-END -->
+
+ <!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
+ <div class="table-operator" v-if="mainId">
+ <a-dropdown v-if="selectedRowKeys.length > 0">
+ <a-menu slot="overlay">
+ <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>鍒犻櫎</a-menu-item>
+ </a-menu>
+ <a-button style="margin-left: 8px"> 鎵归噺鎿嶄綔 <a-icon type="down" /></a-button>
+ </a-dropdown>
+ </div>
+
+ <!-- table鍖哄煙-begin -->
+ <div>
+ <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+ <i class="anticon anticon-info-circle ant-alert-icon"></i> 宸查�夋嫨 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>椤�
+ <a style="margin-left: 24px" @click="onClearSelected">娓呯┖</a>
+ </div>
+
+ <a-table
+ ref="table"
+ size="middle"
+ bordered
+ rowKey="id"
+ :scroll="{x:true}"
+ :columns="columns"
+ :dataSource="dataSource"
+ :pagination="ipagination"
+ :loading="loading"
+ @change="handleTableChange">
+
+ <template slot="htmlSlot" slot-scope="text">
+ <div v-html="text"></div>
+ </template>
+ <template slot="imgSlot" slot-scope="text,record">
+ <span v-if="!text" style="font-size: 12px;font-style: italic;">鏃犲浘鐗�</span>
+ <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+ </template>
+ <template slot="fileSlot" slot-scope="text">
+ <span v-if="!text" style="font-size: 12px;font-style: italic;">鏃犳枃浠�</span>
+ <a-button
+ v-else
+ :ghost="true"
+ type="primary"
+ icon="download"
+ size="small"
+ @click="downloadFile(text)">
+ 涓嬭浇
+ </a-button>
+ </template>
+
+ <span slot="action" slot-scope="text, record">
+ <a @click="handleEdit(record)">缂栬緫</a>
+ <a-divider type="vertical" />
+ <a-popconfirm title="纭畾鍒犻櫎鍚�?" @confirm="() => handleDelete(record.id)">
+ <a>鍒犻櫎</a>
+ </a-popconfirm>
+ </span>
+
+ </a-table>
+ </div>
+ </a-card>
+</template>
+
+<script>
+
+ import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+
+ export default {
+ name: "ABCAssessmentList",
+ mixins:[JeecgListMixin],
+ components: { },
+ props:{
+ mainId:{
+ type:String,
+ default:'',
+ required:false
+ }
+ },
+ watch:{
+ mainId:{
+ immediate: true,
+ handler(val) {
+ if(!this.mainId){
+ this.clearList()
+ }else{
+ this.queryParam['streamId'] = val
+ this.loadData(1);
+ }
+ }
+ }
+ },
+ data () {
+ return {
+ description: '璁惧ABC璇勪环绠＄悊椤甸潰',
+ disableMixinCreated:true,
+ // 琛ㄥご
+ columns: [
+ {
+ title: '#',
+ dataIndex: '',
+ key:'rowIndex',
+ width:60,
+ align:"center",
+ customRender:function (t,r,index) {
+ return parseInt(index)+1;
+ }
+ },
+ {
+ title:'缁熶竴缂栧彿',
+ align:"center",
+ dataIndex: 'num',
+ width:200
+ },
+ {
+ title:'璁惧鍚嶇О',
+ align:"center",
+ dataIndex: 'name',
+ width:200
+ },
+ {
+ title:'璁惧鍨嬪彿',
+ align:"center",
+ dataIndex: 'model',
+ width:200
+ },
+ {
+ title:'骞冲潎浣跨敤鐜�',
+ align:"center",
+ dataIndex: 'standardA_dictText',
+ width:200
+ },
+ {
+ title:'鍙浛鎹㈡��',
+ align:"center",
+ dataIndex: 'standardB_dictText',
+ width:200
+ },
+ {
+ title:'鏁呴殰褰卞搷搴�',
+ align:"center",
+ dataIndex: 'standardC_dictText',
+ width:200
+ },
+ {
+ title:'鐢熶骇瓒呭樊搴�',
+ align:"center",
+ dataIndex: 'standardD_dictText',
+ width:200
+ },
+ {
+ title:'鏁呴殰棰戠巼',
+ align:"center",
+ dataIndex: 'standardE_dictText',
+ width:200
+ },
+ {
+ title:'璁惧浠峰��',
+ align:"center",
+ dataIndex: 'standardF_dictText',
+ width:200
+ },
+ {
+ title:'鏃ф爣璇�',
+ align:"center",
+ dataIndex: 'equipmentImportanceId_dictText',
+ width:200
+ },
+ {
+ title:'鏂版爣璇�',
+ align:"center",
+ dataIndex: 'finalStandard_dictText',
+ width:200
+ },
+ ],
+ url: {
+ list: "/eam/stream/listABCAssessmentByMainId",
+ delete: "/eam/stream/deleteABCAssessment",
+ deleteBatch: "/eam/stream/deleteBatchABCAssessment",
+ exportXlsUrl: "/eam/stream/exportABCAssessment",
+ importUrl: "/eam/stream/importABCAssessment",
+ },
+ dictOptions:{
+ }
+ }
+ },
+ created() {
+ },
+ computed: {
+ importExcelUrl(){
+ return `${window._CONFIG['domianURL']}/${this.url.importUrl}/${this.mainId}`;
+ }
+ },
+ methods: {
+ clearList(){
+ this.dataSource=[]
+ this.selectedRowKeys=[]
+ this.ipagination.current = 1
+ }
+
+ }
+ }
+</script>
+<style scoped>
+ @import '~@assets/less/common.less'
+</style>
diff --git a/src/views/eam/ABC/StreamList.vue b/src/views/eam/ABC/StreamList.vue
new file mode 100644
index 0000000..974f945
--- /dev/null
+++ b/src/views/eam/ABC/StreamList.vue
@@ -0,0 +1,345 @@
+<template>
+ <a-card :bordered="false">
+ <!-- 鏌ヨ鍖哄煙 -->
+ <div class="table-page-search-wrapper">
+ <a-form layout="inline" @keyup.enter.native="searchQuery">
+ <a-row :gutter="24">
+ <a-col
+ :span="6"
+ >
+ <a-form-item
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ label="鍗曟嵁鍙�"
+ >
+ <a-input
+ placeholder="璇疯緭鍏ュ崟鎹彿鏌ヨ"
+ v-model="queryParam.num"
+ ></a-input>
+ </a-form-item>
+ </a-col>
+ </a-row>
+ </a-form>
+ </div>
+ <!-- 鏌ヨ鍖哄煙-END -->
+
+ <!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
+ <div class="table-operator">
+ <a-button
+ type="primary"
+ @click="searchQuery"
+ icon="search"
+ >鏌ヨ</a-button>
+ <a-button
+ @click="searchReset"
+ icon="reload"
+ >閲嶇疆</a-button>
+ <a-button @click="handleAdd" type="primary" icon="plus" v-if="nodeSort===1">鏂板</a-button>
+ <!-- <a-button type="primary" icon="download" @click="handleExportXls('璁惧ABC璇勪环')">瀵煎嚭</a-button>
+ <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+ <a-button type="primary" icon="import">瀵煎叆</a-button>
+ </a-upload> -->
+ <!-- 楂樼骇鏌ヨ鍖哄煙 -->
+ <!-- <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query> -->
+ </div>
+
+ <!-- table鍖哄煙-begin -->
+ <div>
+ <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+ <i class="anticon anticon-info-circle ant-alert-icon"></i> 宸查�夋嫨 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>椤�
+ <a style="margin-left: 24px" @click="onClearSelected">娓呯┖</a>
+ </div>
+
+ <a-table
+ ref="table"
+ size="middle"
+ bordered
+ rowKey="id"
+ class="j-table-force-nowrap"
+ :scroll="{x:true}"
+ :columns="columns"
+ :dataSource="dataSource"
+ :pagination="ipagination"
+ :loading="loading"
+ :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange, type:'radio'}"
+ :customRow="clickThenSelect"
+ @change="handleTableChange">
+
+ <template slot="htmlSlot" slot-scope="text">
+ <div v-html="text"></div>
+ </template>
+ <template slot="imgSlot" slot-scope="text,record">
+ <span v-if="!text" style="font-size: 12px;font-style: italic;">鏃犲浘鐗�</span>
+ <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+ </template>
+ <template slot="fileSlot" slot-scope="text">
+ <span v-if="!text" style="font-size: 12px;font-style: italic;">鏃犳枃浠�</span>
+ <a-button
+ v-else
+ :ghost="true"
+ type="primary"
+ icon="download"
+ size="small"
+ @click="downloadFile(text)">
+ 涓嬭浇
+ </a-button>
+ </template>
+ <span slot="action" slot-scope="text, record">
+ <div v-if="nodeValue===record.status">
+ <a @click="handleStreamNext(record)" :disabled="nodeSort===1&&nodeValue!==record.status" >{{button1.name}}</a>
+ <a-divider type="vertical" />
+ <a @click="handleStreamLast(record)" :disabled="nodeSort===1" >{{button2.name}}</a>
+ </div>
+ <div v-if="nodeSort===1&&nodeValue===record.status">
+ <a-divider type="vertical" />
+ <a-dropdown>
+ <a class="ant-dropdown-link">鏇村 <a-icon type="down" /></a>
+ <a-menu slot="overlay">
+ <a-menu-item>
+ <a-popconfirm title="纭畾鍒犻櫎鍚�?" @confirm="() => handleDelete(record.id)">
+ <a>鍒犻櫎</a>
+ </a-popconfirm>
+ </a-menu-item>
+ <a-menu-item>
+ <a @click="handleEdit(record)">缂栬緫</a>
+ </a-menu-item>
+ </a-menu>
+ </a-dropdown>
+ </div>
+ </span>
+
+ </a-table>
+ </div>
+
+ <a-tabs defaultActiveKey="1">
+ <a-tab-pane tab="鎿嶄綔璁板綍" key="1" >
+ <StreamOperationList :mainId="streamOperationMainId" />
+ </a-tab-pane>
+ <a-tab-pane tab="ABC璇勫垎" key="2" forceRender>
+ <ABCAssessmentList :mainId="aBCAssessmentMainId" />
+ </a-tab-pane>
+ </a-tabs>
+
+ <stream-modal ref="modalForm" @ok="modalFormOk"></stream-modal>
+ <node-model ref="nodeModel" @ok="modalFormOk"></node-model>
+ </a-card>
+</template>
+
+<script>
+
+ import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+ import StreamModal from './modules/StreamModal'
+ import { getAction } from '@/api/manage'
+ import StreamOperationList from './StreamOperationList'
+ import ABCAssessmentList from './ABCAssessmentList'
+ import '@/assets/less/TableExpand.less'
+ import NodeModel from './modules/NodeModel.vue'
+
+
+ export default {
+ name: "StreamList",
+ mixins:[JeecgListMixin],
+ components: {
+ StreamOperationList,
+ ABCAssessmentList,
+ StreamModal,
+ NodeModel
+ },
+ data () {
+ return {
+ description: '璁惧ABC璇勪环绠＄悊椤甸潰',
+ // 琛ㄥご
+ columns: [
+ {
+ title: '#',
+ dataIndex: '',
+ key:'rowIndex',
+ width:60,
+ align:"center",
+ customRender:function (t,r,index) {
+ return parseInt(index)+1;
+ }
+ },
+ {
+ title:'鍗曟嵁鍙�',
+ align:"center",
+ dataIndex: 'num',
+ width:400
+ },
+ {
+ title:'褰撳墠鑺傜偣',
+ align:"center",
+ dataIndex: 'status_dictText',
+ width:300
+ },
+ {
+ title:'鍗曟嵁绫诲瀷',
+ align:"center",
+ dataIndex: 'type_dictText',
+ width:300
+ },
+ {
+ title:'鍙戣捣鏃堕棿',
+ align:"center",
+ dataIndex: 'createTime',
+ width:300
+ },
+ {
+ title:'鍙戣捣浜�',
+ align:"center",
+ dataIndex: 'createBy_dictText'
+ },
+ {
+ title: '鎿嶄綔',
+ dataIndex: 'action',
+ align:"center",
+ fixed:"right",
+ width:200,
+ scopedSlots: { customRender: 'action' },
+ }
+ ],
+ url: {
+ list: "/eam/stream/list",
+ delete: "/eam/stream/delete",
+ deleteBatch: "/eam/stream/deleteBatch",
+ exportXlsUrl: "/eam/stream/exportXls",
+ importExcelUrl: "eam/stream/importExcel",
+ getPreInfo:"eam/stream/getPreInfo"
+ },
+ dictOptions:{
+ },
+ /* 鍒嗛〉鍙傛暟 */
+ ipagination:{
+ current: 1,
+ pageSize: 5,
+ pageSizeOptions: ['5', '10', '50'],
+ showTotal: (total, range) => {
+ return range[0] + "-" + range[1] + " 鍏�" + total + "鏉�"
+ },
+ showQuickJumper: true,
+ showSizeChanger: true,
+ total: 0
+ },
+ selectedMainId:'',
+ superFieldList:[],
+ streamOperationMainId: '',
+ aBCAssessmentMainId: '',
+ button1:{},
+ button2:{},
+ nodeSort:0,
+ nodeValue:''
+ }
+ },
+ created() {
+ this.getSuperFieldList();
+ },
+ mounted(){
+ this.getPreInfo();
+ },
+ computed: {
+ importExcelUrl: function(){
+ return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+ }
+ },
+ methods: {
+ initDictConfig(){
+ },
+ clickThenSelect(record) {
+ return {
+ on: {
+ click: () => {
+ this.onSelectChange(record.id.split(","), [record]);
+ }
+ }
+ }
+ },
+ handleStreamNext(record){
+ var step = {
+ name:this.button1.name,
+ value:this.button1.value,
+ opType:'next',
+ nodeSort:this.nodeSort,
+ node:this.nodeValue,
+ streamId:record.id
+ }
+ this.$refs.nodeModel.title = this.button1.name+"鎿嶄綔";
+ this.$refs.nodeModel.edit(step);
+ },
+ handleStreamLast(record){
+ var step = {
+ name:this.button2.name,
+ value:this.button2.value,
+ opType:'last',
+ nodeSort:this.nodeSort,
+ node:this.nodeValue,
+ streamId:record.id
+ }
+ this.$refs.nodeModel.title = this.button2.name+"鎿嶄綔";
+ this.$refs.nodeModel.edit(step);
+ },
+ onClearSelected() {
+ this.selectedRowKeys = [];
+ this.selectionRows = [];
+ this.selectedMainId=''
+ },
+ onSelectChange(selectedRowKeys, selectionRows) {
+ if(selectedRowKeys.length===1){
+ this.selectedMainId=selectedRowKeys[0]
+ this.streamOperationMainId = selectionRows[0]['id']
+ this.aBCAssessmentMainId = selectionRows[0]['id']
+ }else{
+ this.selectedMainId=''
+ this.streamOperationMainId = ''
+ this.aBCAssessmentMainId = ''
+ }
+
+ this.selectedRowKeys = selectedRowKeys;
+ this.selectionRows = selectionRows;
+
+ },
+ loadData(arg) {
+ if(!this.url.list){
+ this.$message.error("璇疯缃畊rl.list灞炴��!")
+ return
+ }
+ //鍔犺浇鏁版嵁 鑻ヤ紶鍏ュ弬鏁�1鍒欏姞杞界涓�椤电殑鍐呭
+ if (arg === 1) {
+ this.ipagination.current = 1;
+ }
+ this.onClearSelected()
+ var params = this.getQueryParams();//鏌ヨ鏉′欢
+ this.loading = true;
+ getAction(this.url.list, params).then((res) => {
+ if (res.success) {
+ this.dataSource = res.result.records;
+ this.ipagination.total = res.result.total;
+ }
+ if(res.code===510){
+ this.$message.warning(res.message)
+ }
+ this.loading = false;
+ })
+ },
+ getSuperFieldList(){
+ let fieldList=[];
+ fieldList.push({type:'string',value:'num',text:'num',dictCode:''})
+ fieldList.push({type:'string',value:'status',text:'status',dictCode:''})
+ fieldList.push({type:'string',value:'type',text:'鍗曟嵁绫诲瀷',dictCode:''})
+ this.superFieldList = fieldList
+ },
+ getPreInfo(){
+ getAction(this.url.getPreInfo).then(res=>{
+ if(res.result.msg==='ok'){
+ this.button1 = res.result.buttons[0];
+ this.button2 = res.result.buttons[1];
+ this.nodeSort = res.result.nodeSort;
+ this.nodeValue = res.result.nodeValue;
+ }
+ })
+ }
+ }
+ }
+</script>
+<style scoped>
+ @import '~@assets/less/common.less'
+</style>
\ No newline at end of file
diff --git a/src/views/eam/ABC/StreamOperationList.vue b/src/views/eam/ABC/StreamOperationList.vue
new file mode 100644
index 0000000..846a617
--- /dev/null
+++ b/src/views/eam/ABC/StreamOperationList.vue
@@ -0,0 +1,177 @@
+<template>
+ <a-card :bordered="false" :class="'cust-erp-sub-tab'">
+ <!-- 鏌ヨ鍖哄煙 -->
+ <div class="table-page-search-wrapper">
+ <a-form layout="inline" @keyup.enter.native="searchQuery">
+ <a-row :gutter="24">
+ </a-row>
+ </a-form>
+ </div>
+ <!-- 鏌ヨ鍖哄煙-END -->
+
+ <!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
+ <div class="table-operator" v-if="mainId">
+ <a-dropdown v-if="selectedRowKeys.length > 0">
+ <a-menu slot="overlay">
+ <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>鍒犻櫎</a-menu-item>
+ </a-menu>
+ <a-button style="margin-left: 8px"> 鎵归噺鎿嶄綔 <a-icon type="down" /></a-button>
+ </a-dropdown>
+ </div>
+
+ <!-- table鍖哄煙-begin -->
+ <div>
+ <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+ <i class="anticon anticon-info-circle ant-alert-icon"></i> 宸查�夋嫨 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>椤�
+ <a style="margin-left: 24px" @click="onClearSelected">娓呯┖</a>
+ </div>
+
+ <a-table
+ ref="table"
+ size="middle"
+ bordered
+ rowKey="id"
+ :scroll="{x:true}"
+ :columns="columns"
+ :dataSource="dataSource"
+ :pagination="ipagination"
+ :loading="loading"
+ @change="handleTableChange">
+
+ <template slot="htmlSlot" slot-scope="text">
+ <div v-html="text"></div>
+ </template>
+ <template slot="imgSlot" slot-scope="text,record">
+ <span v-if="!text" style="font-size: 12px;font-style: italic;">鏃犲浘鐗�</span>
+ <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+ </template>
+ <template slot="fileSlot" slot-scope="text">
+ <span v-if="!text" style="font-size: 12px;font-style: italic;">鏃犳枃浠�</span>
+ <a-button
+ v-else
+ :ghost="true"
+ type="primary"
+ icon="download"
+ size="small"
+ @click="downloadFile(text)">
+ 涓嬭浇
+ </a-button>
+ </template>
+
+ <span slot="action" slot-scope="text, record">
+ <a @click="handleEdit(record)">缂栬緫</a>
+ <a-divider type="vertical" />
+ <a-popconfirm title="纭畾鍒犻櫎鍚�?" @confirm="() => handleDelete(record.id)">
+ <a>鍒犻櫎</a>
+ </a-popconfirm>
+ </span>
+
+ </a-table>
+ </div>
+ </a-card>
+</template>
+
+<script>
+
+ import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+
+ export default {
+ name: "StreamOperationList",
+ mixins:[JeecgListMixin],
+ components: { },
+ props:{
+ mainId:{
+ type:String,
+ default:'',
+ required:false
+ }
+ },
+ watch:{
+ mainId:{
+ immediate: true,
+ handler(val) {
+ if(!this.mainId){
+ this.clearList()
+ }else{
+ this.queryParam['streamId'] = val
+ this.loadData(1);
+ }
+ }
+ }
+ },
+ data () {
+ return {
+ description: '璁惧ABC璇勪环绠＄悊椤甸潰',
+ disableMixinCreated:true,
+ // 琛ㄥご
+ columns: [
+ {
+ title:'鎺掑簭',
+ align:"center",
+ dataIndex: 'sort',
+ width:60
+ },
+ {
+ title:'鎿嶄綔',
+ align:"center",
+ dataIndex: 'operation_dictText',
+ width:300
+ },
+ {
+ title:'鎿嶄綔鑺傜偣',
+ align:"center",
+ dataIndex: 'operationNode_dictText',
+ width:300
+ },
+
+ {
+ title:'鎿嶄綔浜�',
+ align:"center",
+ dataIndex: 'userId_dictText',
+ width:300
+ },
+
+ {
+ title:'鎿嶄綔鏃堕棿',
+ align:"center",
+ dataIndex: 'createTime',
+ width:300
+ },
+ {
+ title:'鎿嶄綔浜烘剰瑙�',
+ align:"center",
+ dataIndex: 'remark',
+ width:500
+ },
+ ],
+ url: {
+ list: "/eam/stream/listStreamOperationByMainId",
+ delete: "/eam/stream/deleteStreamOperation",
+ deleteBatch: "/eam/stream/deleteBatchStreamOperation",
+ exportXlsUrl: "/eam/stream/exportStreamOperation",
+ importUrl: "/eam/stream/importStreamOperation",
+ },
+ dictOptions:{
+ }
+ }
+ },
+ created() {
+ },
+ computed: {
+ importExcelUrl(){
+ return `${window._CONFIG['domianURL']}/${this.url.importUrl}/${this.mainId}`;
+ }
+ },
+ methods: {
+ clearList(){
+ this.dataSource=[]
+ this.selectedRowKeys=[]
+ this.ipagination.current = 1
+ }
+
+ }
+ }
+</script>
+<style scoped>
+ @import '~@assets/less/common.less'
+</style>
diff --git a/src/views/eam/ABC/modules/EquipmentSelectModel.vue b/src/views/eam/ABC/modules/EquipmentSelectModel.vue
new file mode 100644
index 0000000..fbbcb6d
--- /dev/null
+++ b/src/views/eam/ABC/modules/EquipmentSelectModel.vue
@@ -0,0 +1,303 @@
+<template>
+ <!--鏀寔鍏ㄥ睆缂╂斁-->
+ <a-modal
+ :visible="visible"
+ :title="title"
+ switchFullscreen
+ @ok="handleSubmit"
+ @cancel="close"
+ style="top:50px"
+ cancelText="鍏抽棴"
+ :width="1400"
+ >
+ <a-card :bordered="false">
+ <div class="table-page-search-wrapper">
+ <a-form
+ layout="inline"
+ @keyup.enter.native="searchQuery"
+ >
+ <a-row :gutter="24">
+ <a-col
+ :md="8"
+ :sm="6"
+ >
+ <a-form-item label="缁熶竴缂栫爜">
+ <a-input
+ placeholder="璇疯緭鍏ョ粺涓�缂栫爜"
+ v-model="queryParam.num"
+ />
+ </a-form-item>
+ </a-col>
+ <a-col
+ :md="8"
+ :sm="6"
+ >
+ <a-form-item label="璁惧鍚嶇О">
+ <a-input
+ placeholder="璁惧鍚嶇О"
+ v-model="queryParam.name"
+ />
+ </a-form-item>
+ </a-col>
+ <a-col :md="3">
+ <span
+ style="float: left;overflow: hidden;"
+ class="table-page-search-submitButtons"
+ >
+ <a-button
+ type="primary"
+ @click="searchQuery"
+ icon="search"
+ >鏌ヨ</a-button>
+ <a-button
+ @click="searchReset"
+ icon="reload"
+ style="margin-left: 10px"
+ >閲嶇疆</a-button>
+ </span>
+ </a-col>
+ </a-row>
+ </a-form>
+ </div>
+ <a-table
+ ref="table"
+ :scroll="scrollTrigger"
+ size="middle"
+ rowKey="id"
+ bordered
+ :columns="columns"
+ :dataSource="dataSource"
+ :pagination="ipagination"
+ :rowSelection="rowSelection"
+ :loading="loading"
+ @change="handleTableChange"
+ >
+ <template slot="equipmentPhoto" slot-scope="text,record">
+ <span v-if="!text" style="font-size: 12px;font-style: italic;">鏃犲浘鐗�</span>
+ <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+ </template>
+ </a-table>
+ </a-card>
+ </a-modal>
+</template>
+
+<script>
+import { filterObj } from '@/utils/util'
+import { getAction } from '@/api/manage'
+import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+
+export default {
+ name: 'EquipmentSelectModel',
+ mixins: [JeecgListMixin],
+ components: {},
+ props: {},
+ data() {
+ return {
+ queryParam: {},
+ columns: [
+ {
+ title: '#',
+ dataIndex: 'id',
+ key: 'rowIndex',
+ width: 50,
+ align: 'center',
+ customRender: function(t, r, index) {
+ return parseInt(index) + 1
+ }
+ },
+ {
+ title: '缁熶竴缂栫爜',
+ align: 'center',
+ dataIndex: 'num',
+ width:200
+ },
+ {
+ title: '璁惧鍚嶇О',
+ align: 'center',
+ dataIndex: 'name',
+ width:200
+ },
+ {
+ title: '璁惧鍨嬪彿',
+ align: 'center',
+ dataIndex: 'model',
+ width:200
+ },
+ {
+ title: '璁惧瑙勬牸',
+ align: 'center',
+ dataIndex: 'specification',
+ width:200
+ },
+ {
+ title: 'ABC鏍囪瘑',
+ align: "center",
+ dataIndex: 'equipmentImportanceId',
+ width:100
+ },
+ {
+ title: '鍏抽敭璁惧鏍囪瘑',
+ align: "center",
+ dataIndex: 'specificEquipment_dictText',
+ width:100
+ },
+ {
+ title: '璁惧鐘舵��',
+ align: 'center',
+ dataIndex: 'equipmentStatus_dictText',
+ width:100
+ },
+ {
+ title: '鎶�鏈姸鎬�',
+ align: 'center',
+ dataIndex: 'technologyStatus_dictText',
+ width:100
+ },
+ ],
+ selectedRowKeys: [],
+ oldSelectRows: [],
+ scrollTrigger: {},
+ dataSource: [],
+ selectionRows: [],
+ title: '閫夋嫨璁惧',
+ ipagination: {
+ current: 1,
+ pageSize: 10,
+ pageSizeOptions: ['5', '10', '30', '50', '100'],
+ showTotal: (total, range) => {
+ return range[0] + '-' + range[1] + ' 鍏�' + total + '鏉�'
+ },
+ showQuickJumper: true,
+ showSizeChanger: true,
+ total: 0
+ },
+ isorter: {
+ column: 'num',
+ order: 'desc'
+ },
+ visible: false,
+ loading: false,
+ url: {
+ list: '/eam/equipment/list'
+ }
+ }
+ },
+ computed: {
+ rowSelection() {
+ return {
+ type: 'checkbox',
+ onChange: (selectedRowKeys, selectedRows) => {
+ this.selectedRowKeys = selectedRowKeys
+ this.onSelectChange(selectedRows)
+ },
+ getCheckboxProps: record => ({
+ props: {
+ disabled: record.distable
+ }
+ }),
+ selectedRowKeys: this.selectedRowKeys
+ }
+ }
+ },
+
+ methods: {
+
+ async loadData(arg) {
+ if (arg === 1) {
+ this.ipagination.current = 1
+ }
+ let that = this
+ this.loading = true
+ let params = this.getQueryParams()//鏌ヨ鏉′欢
+ // params.equipmentStatus = '1'
+ await getAction(this.url.list, params).then((res) => {
+ if (res.success) {
+ for (let i = 0; i < res.result.records.length; i++) {
+ if (that.oldSelectRows.indexOf(res.result.records[i].id) > -1) {
+ res.result.records[i].distable = true
+ } else {
+ res.result.records[i].distable = false
+ }
+ }
+ this.dataSource = res.result.records
+ this.ipagination.total = res.result.total
+ }
+ if (res.code === 510) {
+ this.$message.warning(res.message)
+ }
+ this.loading = false
+ })
+ },
+
+ showModals(oldSelectRows) {
+ this.oldSelectRows = oldSelectRows
+ this.visible = true
+ this.loadData(1)
+ },
+ getQueryParams() {
+ let param = Object.assign({}, this.queryParam, this.isorter)
+ param.field = this.getQueryField()
+ param.pageNo = this.ipagination.current
+ param.pageSize = this.ipagination.pageSize
+ return filterObj(param)
+ },
+ //鏌ヨ鏉′欢澶勭悊
+ getQueryField() {
+ let str = 'id,'
+ for (let a = 0; a < this.columns.length; a++) {
+ str += ',' + this.columns[a].dataIndex
+ }
+ return str
+ },
+ searchReset(num) {
+ let that = this
+ this.queryParam = []
+ if (num !== 0) {
+ that.loadData(1)
+ }
+ that.selectborrowIds = []
+ },
+ close() {
+ this.searchReset(0)
+ this.selectedRowKeys = []
+ this.visible = false
+ },
+ handleTableChange(pagination, filters, sorter) {
+ //TODO 绛涢��
+
+ if (Object.keys(sorter).length > 0) {
+ this.isorter.column = sorter.field
+ this.isorter.order = 'ascend' === sorter.order ? 'asc' : 'desc'
+ }
+ this.ipagination = pagination
+ this.loadData()
+ },
+ handleSubmit() {
+ this.$emit('selectionRows', this.selectionRows)
+ this.searchReset(0)
+ this.close()
+ },
+ onSelectChange(selectionRows) {
+ this.selectionRows = selectionRows
+ },
+ searchQuery() {
+ this.loadData(1)
+ }
+ }
+}
+</script>
+
+<style scoped>
+.ant-table-tbody .ant-table-row td {
+ padding-top: 10px;
+ padding-bottom: 10px;
+}
+
+#components-layout-demo-custom-trigger .trigger {
+ font-size: 18px;
+ line-height: 64px;
+ padding: 0 24px;
+ cursor: pointer;
+ transition: color 0.3s;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/eam/ABC/modules/NodeModel.vue b/src/views/eam/ABC/modules/NodeModel.vue
new file mode 100644
index 0000000..91ff5ae
--- /dev/null
+++ b/src/views/eam/ABC/modules/NodeModel.vue
@@ -0,0 +1,148 @@
+<template>
+ <j-modal
+ :title="title"
+ :width="width"
+ :visible="visible"
+ :confirmLoading="confirmLoading"
+ switchFullscreen
+ @ok="handleOk"
+ @cancel="handleCancel"
+ cancelText="鍏抽棴"
+ >
+ <a-spin :spinning="confirmLoading">
+ <a-form-model
+ ref="form"
+ :model="model"
+ :rules="validatorRules"
+ >
+ <a-row :gutter="24">
+ <a-col :span="24">
+ <a-form-model-item
+ label="鎰忚鎴栧師鍥�"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="remark"
+ >
+ <a-textarea v-model="model.remark" rows="4" placeholder="鎰忚鎴栧師鍥�" />
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ </a-form-model>
+ </a-spin>
+ </j-modal>
+</template>
+<script>
+import { httpAction } from '@/api/manage'
+import { validateDuplicateValue } from '@/utils/util'
+import pick from 'lodash.pick'
+import { postAction, requestPut, getAction } from '@/api/manage'
+import { duplicateCheck } from '@/api/api'
+import moment from 'moment'
+import { JVxeTableModelMixin } from '@/mixins/JVxeTableModelMixin.js'
+import { JVXETypes } from '@/components/jeecg/JVxeTable'
+export default {
+ name: "NodeModel",
+ mixins: [JVxeTableModelMixin],
+ components: {
+ validateDuplicateValue,
+ },
+ props: {
+ disableSubmit: {
+ type: Boolean,
+ default: false,
+ required: false
+ },
+ caytegoryParam: {
+ type: String,
+ default: '',
+ required: false
+ }
+ },
+ data() {
+ return {
+ title: "鎿嶄綔",
+ width: 1500,
+ visible: false,
+ model: {
+ },
+ labelCol: {
+ xs: { span: 24 },
+ sm: { span: 5 },
+ },
+ wrapperCol: {
+ xs: { span: 24 },
+ sm: { span: 16 },
+ },
+
+ confirmLoading: false,
+ validatorRules: {
+ remark: [
+ { min: 0, max: 100, message: '闀垮害涓嶈秴杩� 100 涓瓧绗�', trigger: 'blur' },
+ ],
+ },
+ url: {
+ next: "/eam/stream/next",
+ last: "/eam/stream/last",
+ },
+ }
+ },
+ created() {
+ //澶囦唤model鍘熷鍊�
+ this.initOptions();
+ this.modelDefault = JSON.parse(JSON.stringify(this.model));
+ },
+ methods: {
+ add() {
+ this
+ this.edit(this.modelDefault);
+ },
+ edit(record) {
+ this.model = Object.assign({}, record);
+ this.visible = true;
+ },
+ close() {
+ this.$emit('close');
+ this.visible = false;
+ this.$refs.form.clearValidate();
+ },
+ handleOk() {
+ const that = this;
+ // 瑙﹀彂琛ㄥ崟楠岃瘉
+ this.$refs.form.validate(valid => {
+ if (valid) {
+ that.confirmLoading = true;
+ let httpurl = '';
+ let method = '';
+ if (this.model.opType=='next') {
+ httpurl += this.url.next;
+ } else {
+ httpurl += this.url.last;
+ }
+ method = 'post';
+ httpAction(httpurl, this.model, method).then((res) => {
+ if (res.success) {
+ that.$message.success(res.message);
+ that.$emit('ok');
+ } else {
+ that.$message.warning(res.message);
+ }
+ }).finally(() => {
+ that.confirmLoading = false;
+ that.close();
+ })
+ } else {
+ return false
+ }
+ })
+ },
+ handleCancel() {
+ this.close()
+ },
+ },
+ computed: {
+ formDisabled() {
+ return this.disableSubmit
+ },
+ },
+}
+</script>
\ No newline at end of file
diff --git a/src/views/eam/ABC/modules/StreamForm.vue b/src/views/eam/ABC/modules/StreamForm.vue
new file mode 100644
index 0000000..7f32450
--- /dev/null
+++ b/src/views/eam/ABC/modules/StreamForm.vue
@@ -0,0 +1,572 @@
+<template>
+ <a-spin :spinning="confirmLoading">
+ <j-form-container :disabled="formDisabled">
+ <!-- 涓昏〃鍗曞尯鍩� -->
+ <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
+ <a-row :gutter="24">
+ <a-col :span="12" >
+ <a-form-model-item label="鍗曟嵁鍙�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="num">
+ <a-input v-model="model.num" placeholder="绯荤粺鑷姩鐢熸垚" :disabled="true" ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="12">
+ <a-form-model-item
+ label="鏂癆BC鏍囪瘑"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="finalStandard"
+ :disabled="true"
+ >
+ <j-dict-select-tag
+ allow-clear
+ :disabled="true"
+ placeholder="璇烽�夋嫨ABC鏍囪瘑"
+ :triggerChange="true"
+ dictCode="ABC-standard-result"
+ v-model="model.finalStandard"
+ />
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row :gutter="24">
+ <a-col :span="12">
+ <a-form-model-item
+ label="骞冲潎浣跨敤鐜�"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="standardA"
+ >
+ <j-dict-select-tag
+ allow-clear
+ placeholder="璇烽�夋嫨骞冲潎浣跨敤鐜�"
+ :disabled="formDisabled"
+ :triggerChange="true"
+ dictCode="ABC-standardA"
+ v-model="model.standardA"
+ @change="(e) =>standardResultCompute(e,'A')"
+ />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="12">
+ <a-form-model-item
+ label="鍙浛鎹㈡��"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="standardB"
+ >
+ <j-dict-select-tag
+ allow-clear
+ placeholder="璇烽�夋嫨鍙浛鎹㈡��"
+ :disabled="formDisabled"
+ :triggerChange="true"
+ dictCode="ABC-standardB"
+ v-model="model.standardB"
+ @change="(e) =>standardResultCompute(e,'B')"
+ />
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row :gutter="24">
+ <a-col :span="12">
+ <a-form-model-item
+ label="鏁呴殰褰卞搷搴�"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="standardC"
+ >
+ <j-dict-select-tag
+ allow-clear
+ placeholder="璇烽�夋嫨鏁呴殰褰卞搷搴�"
+ :disabled="formDisabled"
+ :triggerChange="true"
+ dictCode="ABC-standardC"
+ v-model="model.standardC"
+ @change="(e) =>standardResultCompute(e,'C')"
+ />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="12">
+ <a-form-model-item
+ label="鐢熶骇瓒呭樊搴�"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="standardD"
+ >
+ <j-dict-select-tag
+ allow-clear
+ placeholder="璇烽�夋嫨鐢熶骇瓒呭樊搴�"
+ :disabled="formDisabled"
+ :triggerChange="true"
+ dictCode="ABC-standardD"
+ v-model="model.standardD"
+ @change="(e) =>standardResultCompute(e,'D')"
+ />
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row :gutter="24">
+ <a-col :span="12">
+ <a-form-model-item
+ label="鏁呴殰棰戠巼"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="standardE"
+ >
+ <j-dict-select-tag
+ allow-clear
+ placeholder="璇烽�夋嫨鏁呴殰棰戠巼"
+ :disabled="formDisabled"
+ :triggerChange="true"
+ dictCode="ABC-standardE"
+ v-model="model.standardE"
+ @change="(e) =>standardResultCompute(e,'E')"
+ />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="12">
+ <a-form-model-item
+ label="璁惧浠峰��"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="standardF"
+ >
+ <j-dict-select-tag
+ allow-clear
+ placeholder="璇烽�夋嫨璁惧浠峰��"
+ :disabled="formDisabled"
+ :triggerChange="true"
+ dictCode="ABC-standardF"
+ v-model="model.standardF"
+ @change="(e) =>standardResultCompute(e,'F')"
+ />
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ </a-form-model>
+ </j-form-container>
+ <!-- 瀛愯〃鍗曞尯鍩� -->
+ <a-tabs v-model="activeKey" @change="handleChangeTabs">
+ <a-tab-pane tab="ABC璇勪环" :key="refKeys[0]" :forceRender="true">
+ <j-vxe-table
+ keep-source
+ :ref="refKeys[0]"
+ :loading="aBCAssessmentTable.loading"
+ :columns="aBCAssessmentTable.columns"
+ :dataSource="aBCAssessmentTable.dataSource"
+ :maxHeight="300"
+ :disabled="formDisabled"
+ :rowNumber="true"
+ :rowSelection="true"
+ :toolbar="true"
+ :alwaysEdit="true"
+ @valueChange="changeDate"
+ :toolbarConfig="toolbarConfig"
+ >
+ <template slot="toolbarPrefix">
+ <a-button type="primary" @click="selectEquipmentList" :disabled="formDisabled">閫夋嫨璁惧
+ </a-button>
+ </template>
+ </j-vxe-table>
+ </a-tab-pane>
+ </a-tabs>
+ <equipment-select-model ref="EquipmentSelectModal" @selectionRows="addSelectedEquipments"></equipment-select-model>
+ </a-spin>
+</template>
+
+<script>
+
+ import { getAction } from '@/api/manage'
+ import { JVxeTableModelMixin } from '@/mixins/JVxeTableModelMixin.js'
+ import { JVXETypes } from '@/components/jeecg/JVxeTable'
+ import { getRefPromise,VALIDATE_FAILED} from '@/components/jeecg/JVxeTable/utils/vxeUtils.js'
+ import { validateDuplicateValue } from '@/utils/util'
+ import JFormContainer from '@/components/jeecg/JFormContainer'
+ import EquipmentSelectModel from './EquipmentSelectModel'
+
+ export default {
+ name: 'StreamForm',
+ mixins: [JVxeTableModelMixin],
+ components: {
+ JFormContainer,
+ EquipmentSelectModel
+ },
+ data() {
+ return {
+ toolbarConfig: {
+ // prefix 鍓嶇紑锛泂uffix 鍚庣紑
+ slot: ['prefix', 'suffix'],
+ // add 鏂板鎸夐挳锛況emove 鍒犻櫎鎸夐挳锛沜learSelection 娓呯┖閫夋嫨鎸夐挳
+ btn: ['remove', 'clearSelection']
+ },
+ labelCol: {
+ xs: { span: 24 },
+ sm: { span: 5 },
+ },
+ wrapperCol: {
+ xs: { span: 24 },
+ sm: { span: 16 },
+ },
+ model:{
+ },
+ // 鏂板鏃跺瓙琛ㄩ粯璁ゆ坊鍔犲嚑琛岀┖鏁版嵁
+ addDefaultRowNum: 0,
+ validatorRules: {
+ },
+ refKeys: ['aBCAssessment' ],
+ tableKeys:[ 'aBCAssessment' ],
+ activeKey: 'streamOperation',
+ // ABC璇勪环
+ aBCAssessmentTable: {
+ loading: false,
+ dataSource: [],
+ columns: [
+ {
+ title: '缁熶竴缂栫爜',
+ key: 'num',
+ type: JVXETypes.normal,
+ width:"250px",
+ placeholder: '璇疯緭鍏�${title}',
+ disabled:true,
+ align:'center',
+ defaultValue:'',
+ },
+ {
+ title: '璁惧鍚嶇О',
+ key: 'name',
+ type: JVXETypes.normal,
+ width:"250px",
+ placeholder: '璇疯緭鍏�${title}',
+ disabled:true,
+ align:'center',
+ defaultValue:'',
+ },
+ {
+ title: '璁惧鍨嬪彿',
+ key: 'model',
+ type: JVXETypes.normal,
+ width:"250px",
+ placeholder: '璇疯緭鍏�${title}',
+ disabled:true,
+ align:'center',
+ defaultValue:'',
+ },
+ {
+ title: '璁惧ID',
+ key: 'equipmentId',
+ type: JVXETypes.hidden,
+ width:"250px",
+ placeholder: '璇疯緭鍏�${title}',
+ defaultValue:'',
+ align:'center',
+ },
+ {
+ title: '骞冲潎浣跨敤鐜�',
+ key: 'standardA',
+ type: JVXETypes.select,
+ width:"250px",
+ placeholder: '璇疯緭鍏�${title}',
+ defaultValue:'',
+ dictCode:'ABC-standardA',
+ options:[],
+ align:'center',
+ validateRules: [
+ {
+ required: true, // 蹇呭～
+ message: '璇疯緭鍏�${title}' // 鏄剧ず鐨勬枃鏈�
+ },
+ ]
+ },
+ {
+ title: '鍙浛鎹㈡��',
+ key: 'standardB',
+ type: JVXETypes.select,
+ width:"250px",
+ placeholder: '璇疯緭鍏�${title}',
+ defaultValue:'',
+ dictCode:'ABC-standardB',
+ options:[],
+ align:'center',
+ validateRules: [
+ {
+ required: true, // 蹇呭～
+ message: '璇疯緭鍏�${title}' // 鏄剧ず鐨勬枃鏈�
+ },
+ ]
+ },
+ {
+ title: '鏁呴殰褰卞搷搴�',
+ key: 'standardC',
+ type: JVXETypes.select,
+ width:"250px",
+ placeholder: '璇疯緭鍏�${title}',
+ defaultValue:'',
+ dictCode:'ABC-standardC',
+ options:[],
+ align:'center',
+ validateRules: [
+ {
+ required: true, // 蹇呭～
+ message: '璇疯緭鍏�${title}' // 鏄剧ず鐨勬枃鏈�
+ },
+ ]
+ },
+ {
+ title: '鐢熶骇瓒呭樊搴�',
+ key: 'standardD',
+ type: JVXETypes.select,
+ width:"250px",
+ placeholder: '璇疯緭鍏�${title}',
+ defaultValue:'',
+ dictCode:'ABC-standardD',
+ options:[],
+ align:'center',
+ validateRules: [
+ {
+ required: true, // 蹇呭～
+ message: '璇疯緭鍏�${title}' // 鏄剧ず鐨勬枃鏈�
+ },
+ ]
+ },
+ {
+ title: '鏁呴殰棰戠巼',
+ key: 'standardE',
+ type: JVXETypes.select,
+ width:"250px",
+ placeholder: '璇疯緭鍏�${title}',
+ defaultValue:'',
+ dictCode:'ABC-standardE',
+ options:[],
+ align:'center',
+ validateRules: [
+ {
+ required: true, // 蹇呭～
+ message: '璇疯緭鍏�${title}' // 鏄剧ず鐨勬枃鏈�
+ },
+ ]
+ },
+ {
+ title: '璁惧浠峰��',
+ key: 'standardF',
+ type: JVXETypes.select,
+ width:"250px",
+ placeholder: '璇疯緭鍏�${title}',
+ defaultValue:'',
+ dictCode:'ABC-standardF',
+ options:[],
+ align:'center',
+ validateRules: [
+ {
+ required: true, // 蹇呭～
+ message: '璇疯緭鍏�${title}' // 鏄剧ず鐨勬枃鏈�
+ },
+ ]
+ },
+ {
+ title: '鏃ф爣璇�',
+ key: 'equipmentImportanceId',
+ type: JVXETypes.select,
+ width:"250px",
+ disabled:true,
+ placeholder: '璇疯緭鍏�${title}',
+ defaultValue:'',
+ dictCode:'ABC-standard-result',
+ options:[],
+ align:'center',
+ },
+ {
+ title: '鏂版爣璇�',
+ key: 'finalStandard',
+ type: JVXETypes.select,
+ width:"250px",
+ placeholder: '璇疯緭鍏�${title}',
+ defaultValue:'',
+ dictCode:'ABC-standard-result',
+ options:[],
+ align:'center',
+ validateRules: [
+ {
+ required: true, // 蹇呭～
+ message: '璇疯緭鍏�${title}' // 鏄剧ず鐨勬枃鏈�
+ },
+ ]
+ },
+ ]
+ },
+ url: {
+ add: "/eam/stream/add",
+ edit: "/eam/stream/edit",
+ queryById: "/eam/stream/queryById",
+ getNum:'/eam/sysIdentity/getNumNew',
+ aBCAssessment: {
+ list: '/eam/stream/queryABCAssessmentByMainId'
+ },
+ }
+ }
+ },
+ props: {
+ //琛ㄥ崟绂佺敤
+ disabled: {
+ type: Boolean,
+ default: false,
+ required: false
+ }
+ },
+ computed: {
+ formDisabled(){
+ return this.disabled
+ },
+ },
+ created () {
+ },
+ methods: {
+ addBefore(){
+ let that = this;
+ let param = {
+ type: 'ABCAssement',
+ length: 4
+ };
+ getAction(this.url.getNum,param).then(res=>{
+ if(res.success){
+ that.model.num = res.result;
+ }
+ })
+ this.aBCAssessmentTable.dataSource=[]
+ },
+ getAllTable() {
+ let values = this.tableKeys.map(key => getRefPromise(this, key))
+ return Promise.all(values)
+ },
+ /** 璋冪敤瀹宔dit()鏂规硶涔嬪悗浼氳嚜鍔ㄨ皟鐢ㄦ鏂规硶 */
+ editAfter() {
+ this.$nextTick(() => {
+ })
+ // 鍔犺浇瀛愯〃鏁版嵁
+ if (this.model.id) {
+ let params = { id: this.model.id }
+ this.requestSubTableData(this.url.aBCAssessment.list, params, this.aBCAssessmentTable)
+ }
+ },
+ //鏍￠獙鎵�鏈変竴瀵逛竴瀛愯〃琛ㄥ崟
+ validateSubForm(allValues){
+ return new Promise((resolve,reject)=>{
+ Promise.all([
+ ]).then(() => {
+ resolve(allValues)
+ }).catch(e => {
+ if (e.error === VALIDATE_FAILED) {
+ // 濡傛灉鏈夋湭閫氳繃琛ㄥ崟楠岃瘉鐨勫瓙琛紝灏辫嚜鍔ㄨ烦杞埌瀹冩墍鍦ㄧ殑tab
+ this.activeKey = e.index == null ? this.activeKey : this.refKeys[e.index]
+ } else {
+ console.error(e)
+ }
+ })
+ })
+ },
+ /** 鏁寸悊鎴恌ormData */
+ classifyIntoFormData(allValues) {
+ let main = Object.assign(this.model, allValues.formValue)
+ return {
+ ...main, // 灞曞紑
+ assessmentList: allValues.tablesValue[0].tableData
+ }
+ },
+ validateError(msg){
+ this.$message.error(msg)
+ },
+ standardResultCompute(e,index) {
+ let keyIndex = 'standard'+index;
+ let tableData =this.$refs.aBCAssessment.getTableData();
+ for(var i = 0;i<tableData.length;i++){
+ let row = this.$refs.aBCAssessment.getRowById(tableData[i].equipmentId);
+ row[keyIndex]=e
+ this.changeDateByRow(row);
+ }
+ var standardA = this.model.standardA == null || this.model.standardA == undefined || this.model.standardA == '' ? 0 : parseInt(this.model.standardA);
+ var standardB = this.model.standardB == null || this.model.standardB == undefined || this.model.standardB == '' ? 0 : parseInt(this.model.standardB);
+ var standardC = this.model.standardA == null || this.model.standardC == undefined || this.model.standardC == '' ? 0 : parseInt(this.model.standardC);
+ var standardD = this.model.standardD == null || this.model.standardD == undefined || this.model.standardD == '' ? 0 : parseInt(this.model.standardD);
+ var standardE = this.model.standardE == null || this.model.standardE == undefined || this.model.standardE == '' ? 0 : parseInt(this.model.standardE);
+ var standardF = this.model.standardF == null || this.model.standardF == undefined || this.model.standardF == '' ? 0 : parseInt(this.model.standardF);
+ var sum = standardA + standardB + standardC + standardD + standardE + standardF;
+ console.log(sum)
+ if (sum >= 18) {
+ this.model.finalStandard = 'A'
+ } else if (sum >= 10 && sum <= 17) {
+ this.model.finalStandard = 'B'
+ } else {
+ this.model.finalStandard = 'C'
+ }
+ this.model = Object.assign({}, this.model);
+ },
+ //閫夋嫨璁惧
+ selectEquipmentList() {
+ let ids = []
+ let tableData = this.$refs.aBCAssessment.getTableData()
+ let deleteData = this.$refs.aBCAssessment.getDeleteData()
+ for (let i = 0; i < tableData.length; i++) {
+ ids.push(tableData[i].equipmentId)
+ }
+ this.$refs.EquipmentSelectModal.showModals(ids)
+ this.$refs.EquipmentSelectModal.title = '閫夋嫨璁惧'
+ this.$refs.EquipmentSelectModal.disableSubmit = false
+ },
+ addSelectedEquipments(data) {
+ let tableData = this.$refs.aBCAssessment.getTableData()
+ // const seletedEquipmentIds = tableData.
+ var tableStr = JSON.stringify(tableData)
+ const addRows = []
+ for (let i = 0; i < data.length; i++) {
+ var equipment = {}
+ if (tableStr.indexOf(data[i].id)==-1) {
+ equipment = {
+ id:data[i].id,
+ equipmentId: data[i].id,
+ num: data[i].num,
+ name: data[i].name,
+ model:data[i].model,
+ equipmentImportanceId:data[i].equipmentImportanceId,
+ }
+ }
+ addRows.push(equipment)
+ }
+ this.$refs.aBCAssessment.pushRows(addRows)
+ },
+ changeDate(target){
+ var standardA = target.row.standardA == null || target.row.standardA == undefined || target.row.standardA == '' ? 0 : parseInt(target.row.standardA);
+ var standardB = target.row.standardB == null || target.row.standardB == undefined || target.row.standardB == '' ? 0 : parseInt(target.row.standardB);
+ var standardC = target.row.standardA == null || target.row.standardC == undefined || target.row.standardC == '' ? 0 : parseInt(target.row.standardC);
+ var standardD = target.row.standardD == null || target.row.standardD == undefined || target.row.standardD == '' ? 0 : parseInt(target.row.standardD);
+ var standardE = target.row.standardE == null || target.row.standardE == undefined || target.row.standardE == '' ? 0 : parseInt(target.row.standardE);
+ var standardF = target.row.standardF == null || target.row.standardF == undefined || target.row.standardF == '' ? 0 : parseInt(target.row.standardF);
+ var sum = standardA + standardB + standardC + standardD + standardE + standardF;
+ console.log(sum)
+ if (sum >= 18) {
+ target.row.finalStandard = 'A'
+ } else if (sum >= 10 && sum <= 17) {
+ target.row.finalStandard = 'B'
+ } else {
+ target.row.finalStandard = 'C'
+ }
+ },
+ changeDateByRow(row){
+ var standardA = row.standardA == null || row.standardA == undefined || row.standardA == '' ? 0 : parseInt(row.standardA);
+ var standardB = row.standardB == null || row.standardB == undefined || row.standardB == '' ? 0 : parseInt(row.standardB);
+ var standardC = row.standardA == null || row.standardC == undefined || row.standardC == '' ? 0 : parseInt(row.standardC);
+ var standardD = row.standardD == null || row.standardD == undefined || row.standardD == '' ? 0 : parseInt(row.standardD);
+ var standardE = row.standardE == null || row.standardE == undefined || row.standardE == '' ? 0 : parseInt(row.standardE);
+ var standardF = row.standardF == null || row.standardF == undefined || row.standardF == '' ? 0 : parseInt(row.standardF);
+ var sum = standardA + standardB + standardC + standardD + standardE + standardF;
+ if (sum >= 18) {
+ row.finalStandard = 'A'
+ } else if (sum >= 10 && sum <= 17) {
+ row.finalStandard = 'B'
+ } else {
+ row.finalStandard = 'C'
+ }
+ },
+ }
+ }
+</script>
+
+<style scoped>
+</style>
\ No newline at end of file
diff --git a/src/views/eam/ABC/modules/StreamModal.vue b/src/views/eam/ABC/modules/StreamModal.vue
new file mode 100644
index 0000000..4c1d193
--- /dev/null
+++ b/src/views/eam/ABC/modules/StreamModal.vue
@@ -0,0 +1,65 @@
+<template>
+ <j-modal
+ :title="title"
+ :width="1200"
+ :visible="visible"
+ :maskClosable="false"
+ switchFullscreen
+ :fullscreen="true"
+ @ok="handleOk"
+ :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+ @cancel="handleCancel">
+ <stream-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"/>
+ </j-modal>
+</template>
+
+<script>
+
+ import StreamForm from './StreamForm'
+
+ export default {
+ name: 'StreamModal',
+ components: {
+ StreamForm
+ },
+ data() {
+ return {
+ title:'',
+ width:800,
+ visible: false,
+ disableSubmit: false
+ }
+ },
+ methods:{
+ add () {
+ this.visible=true
+ this.$nextTick(()=>{
+ this.$refs.realForm.add();
+ })
+ },
+ edit (record) {
+ this.visible=true
+ this.$nextTick(()=>{
+ this.$refs.realForm.edit(record);
+ })
+ },
+ close () {
+ this.$emit('close');
+ this.visible = false;
+ },
+ handleOk () {
+ this.$refs.realForm.handleOk();
+ },
+ submitCallback(){
+ this.$emit('ok');
+ this.visible = false;
+ },
+ handleCancel () {
+ this.close()
+ }
+ }
+ }
+</script>
+
+<style scoped>
+</style>
\ No newline at end of file
diff --git a/src/views/eam/Daily3MaintenanceOrderList.vue b/src/views/eam/Daily3MaintenanceOrderList.vue
index c08a5cc..532592d 100644
--- a/src/views/eam/Daily3MaintenanceOrderList.vue
+++ b/src/views/eam/Daily3MaintenanceOrderList.vue
@@ -53,24 +53,24 @@
@click="handleAdd"
type="primary"
icon="plus"
- v-has="'dailyMaintenanceOrder:add'"
+ v-has="'daily3MaintenanceOrder:add'"
>鏂板</a-button>
<a-button
- v-if="selectedRowKeys.length == 1 && selectionRows[0].status == '8'"
+ v-show="selectedRowKeys.length == 1 && selectionRows[0].status == '8'"
@click="handlePrintPrecision(selectionRows[0])"
type="primary"
style="margin-left: 8px"
>绮惧害妫�楠屽崟鎵撳嵃
</a-button>
<a-button
- v-if="selectedRowKeys.length == 1 && selectionRows[0].status == '8'"
+ v-show="selectedRowKeys.length == 1 && selectionRows[0].status == '8'"
@click="handlePrintCheck(selectionRows[0])"
type="primary"
style="margin-left: 8px"
>楠屾敹鍗曟墦鍗�
</a-button>
<a-button
- v-if="selectedRowKeys.length == 1 && selectionRows[0].status == '8'"
+ v-show="selectedRowKeys.length == 1 && selectionRows[0].status == '8'"
@click="handlePrintInfo(selectionRows[0])"
type="primary"
style="margin-left: 8px"
@@ -147,12 +147,12 @@
<a-popconfirm
title="纭畾鎺ユ敹宸ュ崟鍚�?"
@confirm="() => handleOrderIssue(record)"
- v-has="'dailyMaintenanceOrder:issue'"
+ v-has="'daily3MaintenanceOrder:issue'"
>
- <a v-if="record.status == '1'">鎺ユ敹</a>
+ <a v-show="record.status == '1'">鎺ユ敹</a>
</a-popconfirm>
<a-divider
- v-if="record.status == '1'"
+ v-show="record.status == '1'"
type="vertical"
/>
<!-- <a
@@ -166,15 +166,15 @@
<a-popconfirm
title="纭畾鎾ゅ洖宸ュ崟鍚�?"
@confirm="() => handleOrderReset(record)"
- v-has="'dailyMaintenanceOrder:issue'"
+ v-has="'daily3MaintenanceOrder:issue'"
>
- <a v-if="record.status == '2'">鎾ゅ洖</a>
+ <a v-show="record.status == '2'">鎾ゅ洖</a>
</a-popconfirm>
<a-divider
- v-if="record.status == '2'"
+ v-show="record.status == '2'"
type="vertical"
/>
- <a-popconfirm
+ <!-- <a-popconfirm
title="纭畾鎭㈠宸ュ崟鍚�?"
@confirm="() => handleOrderRecover(record)"
v-has="'dailyMaintenanceOrder:recover'"
@@ -184,8 +184,8 @@
<a-divider
v-if="record.status == '7'"
type="vertical"
- />
- <a-popconfirm
+ /> -->
+ <!-- <a-popconfirm
title="纭畾浣滃簾宸ュ崟鍚�?"
@confirm="() => handleOrderCancel(record)"
v-has="'dailyMaintenanceOrder:recover'"
@@ -195,15 +195,15 @@
<a-divider
v-if="record.status == '2'"
type="vertical"
- />
+ /> -->
<a-popconfirm
title="纭畾棰嗗彇宸ュ崟鍚�?"
@confirm="() => handleOrderGet(record)"
- v-has="'dailyMaintenanceOrder:get'"
+ v-has="'daily3MaintenanceOrder:get'"
>
- <a v-if="record.status == '2' && record.assignMode == '1'">棰嗗彇</a>
+ <a v-show="record.status == '2' && record.assignMode == '1'">棰嗗彇</a>
</a-popconfirm>
- <a
+ <!-- <a
v-if="record.status == '2' && record.assignMode == '2' "
@click="handleAssignOrder(record)"
v-has="'dailyMaintenanceOrder:assign'"
@@ -212,35 +212,35 @@
v-if="record.status == '3'&& record.assignMode == '2' && record.maintenanceUserName != null "
@click="handleAssignOrder(record)"
v-has="'dailyMaintenanceOrder:assign'"
- >鏀规淳</a>
+ >鏀规淳</a> -->
<!-- <a
v-if="record.status == '3'"
@click="handleAssignOrder(record)"
>鏀规淳</a> -->
- <a-divider
+ <!-- <a-divider
v-if="record.status == '2'"
type="vertical"
- />
+ />-->
<a-divider
- v-if="record.status === '3'&& record.assignMode == '2' && record.maintenanceUserName != null "
+ v-show="record.status === '2'"
type="vertical"
/>
<a
- v-if="record.status === '3' || record.status === '4' "
+ v-show="record.status === '3' || record.status === '4' "
@click="handleOrderExe(record)"
- v-has="'dailyMaintenanceOrder:exe'"
+ v-has="'daily3MaintenanceOrder:exe'"
>鎵ц</a>
<a-divider
v-if="record.status === '3' || record.status === '4' "
type="vertical"
/>
<a
- v-if="record.status === '1'"
+ v-show="record.status === '1'"
@click="handleEdit(record)"
- v-has="'dailyMaintenanceOrder:edit'"
+ v-has="'daily3MaintenanceOrder:edit'"
>缂栬緫</a>
<a-divider
- v-if="record.status === '1'"
+ v-show="record.status === '1'"
type="vertical"
/>
<!-- <a
@@ -251,36 +251,76 @@
v-if="record.status === '5'"
type="vertical"
/> -->
+ <!-- 绮惧害妫�楠岃�呮搷浣滅簿搴︽楠屽崟 -->
<a
- v-if="record.status === '5' && record.isNotStoveCategoryFlag == false && record.precisionParameters == '1' && (record.precisionInspectionStatus == '0' ||record.precisionInspectionStatus == '1' ||record.precisionInspectionStatus == '2' ||record.precisionInspectionStatus == '3' ||record.precisionInspectionStatus == '4')"
+ v-show="record.status === '5' && record.isNotStoveCategoryFlag == false && record.precisionParameters == '1' && (record.precisionInspectionStatus == '0' )"
+ @click="handlePrecisionCheckOrder(record)"
+ v-has="'daily3MaintenanceOrder:precisionInspectionUser'"
+ >绮惧害妫�楠�</a>
+ <!-- 缁翠慨瀹や富浠绘搷浣滅簿搴︽楠屽崟 -->
+ <a
+ v-show="record.status === '5' && record.isNotStoveCategoryFlag == false && record.precisionParameters == '1' && (record.precisionInspectionStatus == '1' )"
+ @click="handlePrecisionCheckOrder(record)"
+ v-has="'daily3MaintenanceOrder:repairDirectorUser'"
+ >绮惧害妫�楠�</a>
+ <!-- 璁惧妫�楠屽憳鎿嶄綔绮惧害妫�楠屽崟 -->
+ <a
+ v-show="record.status === '5' && record.isNotStoveCategoryFlag == false && record.precisionParameters == '1' && (record.precisionInspectionStatus == '2' )"
+ @click="handlePrecisionCheckOrder(record)"
+ v-has="'daily3MaintenanceOrder:equipmentInspectorUser'"
+ >绮惧害妫�楠�</a>
+ <!-- 浣跨敤鍗曚綅鎶�鏈富绠℃搷浣滅簿搴︽楠屽崟 -->
+ <a
+ v-show="record.status === '5' && record.isNotStoveCategoryFlag == false && record.precisionParameters == '1' && (record.precisionInspectionStatus == '3' )"
+ @click="handlePrecisionCheckOrder(record)"
+ v-has="'daily3MaintenanceOrder:useUnitDirectorUser'"
+ >绮惧害妫�楠�</a>
+ <!-- 璁惧妫�楠屽憳绛惧瓧 鎿嶄綔绮惧害妫�楠屽崟 -->
+ <a
+ v-show="record.status === '5' && record.isNotStoveCategoryFlag == false && record.precisionParameters == '1' && (record.precisionInspectionStatus == '4')"
+ @click="handlePrecisionCheckOrder(record)"
+ v-has="'daily3MaintenanceOrder:equipmentInspectorSignUser'"
+ >绮惧害妫�楠�</a>
+ <!-- 绮惧害妫�楠屽崟 鏌ョ湅 -->
+ <a
+ v-show="record.status === '5' && record.isNotStoveCategoryFlag == false && record.precisionParameters == '1' && (record.precisionInspectionStatus == '5')"
@click="handlePrecisionCheckOrder(record)"
>绮惧害妫�楠�</a>
+ <!--绠＄悊鍛樻搷浣滅簿搴︽楠屽崟 -->
+ <a
+ v-show="record.status === '5' && record.isNotStoveCategoryFlag == false && record.precisionParameters == '1' && (record.precisionInspectionStatus == '0' ||record.precisionInspectionStatus == '1' ||record.precisionInspectionStatus == '2' ||record.precisionInspectionStatus == '3' ||record.precisionInspectionStatus == '4' )"
+ @click="handlePrecisionCheckOrder(record)"
+ v-has="'daily3MaintenanceOrder:admin'"
+ >绮惧害妫�楠�</a>
<a-divider
- v-if="record.status === '5'&& record.isNotStoveCategoryFlag == false && record.precisionParameters == '1' && (record.precisionInspectionStatus == '0' ||record.precisionInspectionStatus == '1' ||record.precisionInspectionStatus == '2' ||record.precisionInspectionStatus == '3' ||record.precisionInspectionStatus == '4')"
+ v-show="record.status === '5'&& record.isNotStoveCategoryFlag == false && record.precisionParameters == '1' "
type="vertical"
/>
<a
- v-if="record.status === '5' && record.isNotStoveCategoryFlag == true && (record.stoveExemptStatus == '0' ||record.stoveExemptStatus == '1' ||record.stoveExemptStatus == '2')"
+ v-show="record.status === '5' && record.isNotStoveCategoryFlag == true && (record.stoveExemptStatus == '0' ||record.stoveExemptStatus == '1' ||record.stoveExemptStatus == '2')"
@click="handleStoveDetection(record)"
+ v-has="'daily3MaintenanceOrder:StoveCategory'"
>鐐夌被妫�娴�</a>
<a-divider
- v-if="record.status === '5'&& record.isNotStoveCategoryFlag == true && (record.stoveExemptStatus == '0' ||record.stoveExemptStatus == '1' ||record.stoveExemptStatus == '2')"
+ v-show="record.status === '5'&& record.isNotStoveCategoryFlag == true && (record.stoveExemptStatus == '0' ||record.stoveExemptStatus == '1' ||record.stoveExemptStatus == '2')"
type="vertical"
/>
<a
- v-if="record.status === '5' && record.isNotStoveCategoryFlag == false && record.precisionParameters == '0'"
+ v-show="record.status === '5' && record.isNotStoveCategoryFlag == false && record.precisionParameters == '0'"
@click="handleTechnologyStatus(record)"
+ v-has="'daily3MaintenanceOrder:TechnologyStatus'"
>鎶�鏈姸鎬侀壌瀹�</a>
<a-divider
- v-if="record.status === '5'&& record.isNotStoveCategoryFlag == false && record.precisionParameters == '0' "
+ v-show="record.status === '5'&& record.isNotStoveCategoryFlag == false && record.precisionParameters == '0' "
type="vertical"
/>
<a
- v-if="record.status === '5' "
+ v-show="record.status === '5' "
@click="handleMaintenance3Receipt(record)"
+ v-has="'daily3MaintenanceOrder:Receipt'"
>楠屾敹鍗�</a>
<a-divider
- v-if="record.status === '5' "
+ v-show="record.status === '5' "
type="vertical"
/>
<a-dropdown>
@@ -293,9 +333,9 @@
<a-popconfirm
title="纭畾鍒犻櫎鍚�?"
@confirm="() => handleDelete(record.id)"
- v-has="'dailyMaintenanceOrder:delete'"
+ v-has="'daily3MaintenanceOrder:delete'"
>
- <a v-if="record.status === '1'">鍒犻櫎</a>
+ <a v-show="record.status === '1'">鍒犻櫎</a>
</a-popconfirm>
</a-menu-item>
</a-menu>
@@ -423,18 +463,21 @@
{
title: '鐘舵��',
align: "center",
- dataIndex: 'statusName'
+ dataIndex: 'statusName',
+ width: 100,
},
{
title: '淇濆吇鍛ㄦ湡',
align: "center",
dataIndex: 'maintenanceCycleName',
+ width: 100,
},
- {
- title: '娲惧伐鏂瑰紡',
- align: "center",
- dataIndex: 'assignModeName'
- },
+ // {
+ // title: '娲惧伐鏂瑰紡',
+ // align: "center",
+ // dataIndex: 'assignModeName',
+ // width: 100,
+ // },
{
title: '缁熶竴缂栫爜',
align: "center",
@@ -456,7 +499,7 @@
dataIndex: 'checkStatusName',
},
{
- title: '鏈�氳繃鍘熷洜',
+ title: '楠屾敹鏈�氳繃鍘熷洜',
align: "center",
dataIndex: 'notPassReason',
scopedSlots: { customRender: 'notPassReason' }
@@ -477,23 +520,23 @@
align: "center",
dataIndex: 'teamName'
},
- {
- title: '宸ユ椂瀹氶',
- align: "center",
- dataIndex: 'workingHourQuota'
- },
+ // {
+ // title: '宸ユ椂瀹氶',
+ // align: "center",
+ // dataIndex: 'workingHourQuota'
+ // },
{
title: '璁″垝寮�濮嬫椂闂�',
align: "center",
dataIndex: 'planStartTime',
//width: '120px',
},
- {
- title: '璁″垝缁撴潫鏃堕棿',
- align: "center",
- dataIndex: 'planEndTime',
- //width: '120px',
- },
+ // {
+ // title: '璁″垝缁撴潫鏃堕棿',
+ // align: "center",
+ // dataIndex: 'planEndTime',
+ // //width: '120px',
+ // },
{
title: '瀹為檯寮�濮嬫椂闂�',
align: "center",
@@ -506,11 +549,11 @@
dataIndex: 'actualEndTime',
//width: '120px',
},
- {
- title: '瀹為檯鐢ㄦ椂',
- align: "center",
- dataIndex: 'actualWorkingHourQuota',
- },
+ // {
+ // title: '瀹為檯鐢ㄦ椂',
+ // align: "center",
+ // dataIndex: 'actualWorkingHourQuota',
+ // },
{
title: '鎵ц浜�',
align: "center",
diff --git a/src/views/eam/DailyInspectionOrderList.vue b/src/views/eam/DailyInspectionOrderList.vue
index d94dec3..a5a1cf9 100644
--- a/src/views/eam/DailyInspectionOrderList.vue
+++ b/src/views/eam/DailyInspectionOrderList.vue
@@ -150,7 +150,7 @@
v-if="record.status == '2'"
type="vertical"
/>
- <a-popconfirm
+ <!-- <a-popconfirm
title="纭畾鎭㈠宸ュ崟鍚�?"
@confirm="() => handleOrderRecover(record)"
v-has="'dailyInspectionOrder:recover'"
@@ -160,8 +160,8 @@
<a-divider
v-if="record.status == '7'"
type="vertical"
- />
- <a-popconfirm
+ /> -->
+ <!-- <a-popconfirm
title="纭畾浣滃簾宸ュ崟鍚�?"
@confirm="() => handleOrderCancel(record)"
v-has="'dailyInspectionOrder:recover'"
@@ -171,7 +171,7 @@
<a-divider
v-if="record.status == '2'"
type="vertical"
- />
+ /> -->
<a-popconfirm
title="纭畾棰嗗彇宸ュ崟鍚�?"
@confirm="() => handleOrderGet(record)"
@@ -179,12 +179,12 @@
>
<a v-if="record.status == '2' && record.assignMode == '1'">棰嗗彇</a>
</a-popconfirm>
- <a
+ <!-- <a
v-if="record.status == '2' && record.assignMode == '2' "
@click="handleAssignOrder(record)"
v-has="'dailyInspectionOrder:assign'"
- >娲惧伐</a>
- <a
+ >娲惧伐</a> -->
+ <!-- <a
v-if="record.status == '2'&& record.assignMode == '3' && record.inspectionUserName != null "
@click="handleAssignOrder(record)"
v-has="'dailyInspectionOrder:assign'"
@@ -193,7 +193,7 @@
v-if="record.status == '3'"
@click="handleAssignOrder(record)"
v-has="'dailyInspectionOrder:assign'"
- >鏀规淳</a>
+ >鏀规淳</a>-->
<a-divider
v-if="record.status == '2'"
type="vertical"
@@ -209,6 +209,17 @@
>鎵ц</a>
<a-divider
v-if="record.status === '3' || record.status === '4' "
+ type="vertical"
+ />
+ <a-popconfirm
+ title="缁翠慨浜虹‘璁ゅ畬宸ュ悧?"
+ @confirm="() => handleOrderRepairConfirm(record)"
+ v-has="'dailyInspectionOrder:repairConfirm'"
+ >
+ <a v-if="record.status == '5'">缁翠慨纭</a>
+ </a-popconfirm>
+ <a-divider
+ v-if="record.status == '5'"
type="vertical"
/>
<a
@@ -244,7 +255,7 @@
slot-scope="text, record"
>
<a
- v-if="record.status === '3' || record.status === '4' ||record.status === '5' ||record.status === '7' "
+ v-if="record.status === '3' || record.status === '4' ||record.status === '5' ||record.status === '6' "
class="lot"
@click="handleOrderExe(record)"
>{{record.num}}</a>
@@ -321,7 +332,14 @@
{
title: '鐘舵��',
align: "center",
+ width: 100,
dataIndex: 'statusName'
+ },
+ {
+ title: '鐐规鍛ㄦ湡',
+ align: "center",
+ width: 100,
+ dataIndex: 'inspectionCycleName'
},
// {
// title: '鐐规鏃ユ湡',
@@ -331,19 +349,19 @@
// return !text ? "" : (text.length > 10 ? text.substr(0, 10) : text)
// }
// },
- {
- title: '鐐规鏃堕棿',
- align: "center",
- dataIndex: 'inspectionTime',
- // customRender: function (text) {
- // return !text ? "" : (text.length > 10 ? text.substr(11, 20) : text)
- // }
- },
- {
- title: '鎴鏃堕棿',
- align: "center",
- dataIndex: 'inspectionDeadline',
- },
+ // {
+ // title: '鐐规鏃堕棿',
+ // align: "center",
+ // dataIndex: 'inspectionTime',
+ // // customRender: function (text) {
+ // // return !text ? "" : (text.length > 10 ? text.substr(11, 20) : text)
+ // // }
+ // },
+ // {
+ // title: '鎴鏃堕棿',
+ // align: "center",
+ // dataIndex: 'inspectionDeadline',
+ // },
{
title: '缁熶竴缂栫爜',
align: "center",
@@ -381,33 +399,29 @@
// }
// },
// },
- {
- title: '鐐规鏍囧噯缂栫爜',
- align: "center",
- dataIndex: 'inspectionStandardNum'
- },
- {
- title: '鐐规鍛ㄦ湡',
- align: "center",
- dataIndex: 'inspectionCycleName'
- },
- {
- title: '娲惧伐鏂瑰紡',
- align: "center",
- dataIndex: 'assignModeName'
- },
- {
- title: '鐐规缁撴灉',
- align: "center",
- dataIndex: 'result'
- },
+ // {
+ // title: '鐐规鏍囧噯缂栫爜',
+ // align: "center",
+ // dataIndex: 'inspectionStandardNum'
+ // },
+
+ // {
+ // title: '娲惧伐鏂瑰紡',
+ // align: "center",
+ // dataIndex: 'assignModeName'
+ // },
+ // {
+ // title: '鐐规缁撴灉',
+ // align: "center",
+ // dataIndex: 'result'
+ // },
{
title: '鐐规浜�',
align: "center",
dataIndex: 'inspectionUserName'
},
{
- title: '瀹屾垚鏃堕棿',
+ title: '鐐规鏃堕棿',
align: "center",
dataIndex: 'actualEndTime',
// customRender: function (text) {
@@ -415,10 +429,23 @@
// }
},
{
- title: '鍒涘缓浜�',
+ title: '缁翠慨纭浜�',
align: "center",
- dataIndex: 'createBy'
+ dataIndex: 'repairConfirmPerson'
},
+ {
+ title: '纭鏃堕棿',
+ align: "center",
+ dataIndex: 'repairConfirmDate',
+ // customRender: function (text) {
+ // return !text ? "" : (text.length > 10 ? text.substr(0, 10) : text)
+ // }
+ },
+ // {
+ // title: '鍒涘缓浜�',
+ // align: "center",
+ // dataIndex: 'createBy'
+ // },
{
title: '鍒涘缓鏃ユ湡',
align: "center",
@@ -496,7 +523,7 @@
this.$refs.DailyInspectionOrderExeDrawer.buttonDistable = true
this.$refs.DailyInspectionOrderExeDrawer.revocationDistable = false
this.$refs.DailyInspectionOrderExeDrawer.SWbuttonDistable = true
- } else if (record.status === '7') {
+ } else if (record.status === '6') {
this.$refs.DailyInspectionOrderExeDrawer.buttonDistable = true
this.$refs.DailyInspectionOrderExeDrawer.revocationDistable = true
this.$refs.DailyInspectionOrderExeDrawer.SWbuttonDistable = true
@@ -541,15 +568,15 @@
}
})
},
- //浣滃簾
- handleOrderCancel(record) {
+ //缁翠慨纭
+ handleOrderRepairConfirm(record) {
const that = this;
- requestPut(that.url.edit, { id: record.id, status: '7' }).then((res) => {
+ requestPut(that.url.edit, { id: record.id, status: '6' }).then((res) => {
if (res.success) {
- that.$message.success("宸ュ崟浣滃簾鎴愬姛锛�")
+ that.$message.success("宸ュ崟瀹屽伐鎴愬姛锛�")
that.loadData()
} else {
- that.$message.warning("宸ュ崟浣滃簾澶辫触锛�")
+ that.$message.warning("宸ュ崟瀹屽伐澶辫触锛�")
}
})
},
diff --git a/src/views/eam/DailyInspectionStandardList.vue b/src/views/eam/DailyInspectionStandardList.vue
index dcd9b00..2ba59ba 100644
--- a/src/views/eam/DailyInspectionStandardList.vue
+++ b/src/views/eam/DailyInspectionStandardList.vue
@@ -67,7 +67,20 @@
type='primary'
icon='plus'
v-has="'dailyInspectionStandard:add'"
- >鏂板</a-button>
+ >缂栧埗</a-button>
+ <a-upload
+ name="file"
+ :showUploadList="false"
+ :multiple="false"
+ :headers="tokenHeader"
+ :action="importExcelUrl"
+ @change="handleImportExcel"
+ >
+ <a-button
+ type="primary"
+ icon="import"
+ >瀵煎叆</a-button>
+ </a-upload>
<a-button
type="primary"
@click="searchQuery"
@@ -99,7 +112,7 @@
size='middle'
bordered
rowKey='id'
- :scroll="{ x: 'calc(1600px + 50%)', y: 900 }"
+ :scroll="{ x: 'calc(2300px + 50%)', y: 900 }"
:columns='columns'
:dataSource='dataSource'
:pagination='ipagination'
@@ -135,32 +148,51 @@
slot="action"
slot-scope="text, record"
>
+
<a
- v-if="record.versionStatus == '2'"
- @click="handleRevise(record)"
- v-has="'dailyInspectionStandard:revise'"
- >鍗囩増</a>
+ v-show="record.versionStatus == '1' && record.approvalStatus == '1' "
+ @click="handleAuditApproval(record)"
+ v-has="'dailyInspectionStandard:audit'"
+ >瀹℃牳</a>
<a-divider type="vertical" />
<a
- v-if="record.versionStatus == '1'"
- @click="handleTakeEffect(record)"
- v-has="'dailyInspectionStandard:takeEffect'"
- >鐢熸晥</a>
+ v-show="record.versionStatus == '1' && record.approvalStatus == '4'"
+ @click="handleAuditApproval(record)"
+ v-has="'dailyInspectionStandard:againAudit'"
+ >閲嶆柊瀹℃牳</a>
<a-divider type="vertical" />
<a
- v-if="record.versionStatus == '1'"
+ v-show="record.versionStatus == '1'&& record.approvalStatus == '3' "
+ @click="handleAuditApproval(record)"
+ v-has="'dailyInspectionStandard:approval'"
+ >瀹℃壒</a>
+ <a-divider type="vertical" />
+ <a
+ v-show="record.versionStatus == '1' && (record.approvalStatus == '1' || record.approvalStatus == '2')"
@click="handleEdit(record)"
v-has="'dailyInspectionStandard:edit'"
>缂栬緫</a>
<a-divider type="vertical" />
<a-popconfirm
- v-if="record.versionStatus == '1'"
+ v-show="record.versionStatus == '1' && (record.approvalStatus == '1' || record.approvalStatus == '2')"
title="纭畾鍒犻櫎鍚�?"
@confirm="() => handleDelete(record.id)"
v-has="'dailyInspectionStandard:delete'"
>
<a>鍒犻櫎</a>
</a-popconfirm>
+ <a-divider type="vertical" />
+ <a
+ v-show="record.versionStatus != '1'"
+ @click="handleRevise(record)"
+ v-has="'dailyInspectionStandard:revise'"
+ >鍗囩増</a>
+ <a-divider type="vertical" />
+ <a
+ v-show="record.versionStatus == '2'"
+ @click="handleTakeEffect(record)"
+ v-has="'dailyInspectionStandard:loseEfficacy'"
+ >澶辨晥</a>
</span>
</a-table>
@@ -184,6 +216,11 @@
ref='modalForm'
@ok='modalFormOk'
></dailylnspection-standard-modal>
+
+ <audit-approval-modal
+ ref='auditApprovalModal'
+ @ok='modalFormOk'
+ ></audit-approval-modal>
</a-card>
</template>
@@ -194,6 +231,7 @@
import { getAction, requestPut } from '@/api/manage'
import DailyInspectionStandardDetail from './modules/dailyInspectionStandard/DailyInspectionStandardDetail'
import DailylnspectionStandardModal from './modules/dailyInspectionStandard/DailylnspectionStandardModal'
+import AuditApprovalModal from './modules/dailyInspectionStandard/AuditApprovalModal'
import '@/assets/less/TableExpand.less'
export default {
@@ -201,7 +239,8 @@
mixins: [JeecgListMixin],
components: {
DailyInspectionStandardDetail,
- DailylnspectionStandardModal
+ DailylnspectionStandardModal,
+ AuditApprovalModal
},
data() {
return {
@@ -223,12 +262,13 @@
dataIndex: 'num',
},
{
- title: '浣跨敤閮ㄩ棬',
+ title: '绛惧鐘舵��',
align: 'center',
- dataIndex: 'useDepartName',
+ dataIndex: 'approvalStatusName',
},
+
{
- title: '璁惧缂栫爜',
+ title: '缁熶竴缂栫爜',
align: 'center',
dataIndex: 'equipmentNum',
},
@@ -243,6 +283,11 @@
dataIndex: 'equipmentModel',
},
{
+ title: '浣跨敤閮ㄩ棬',
+ align: 'center',
+ dataIndex: 'useDepartName',
+ },
+ {
title: '璐ｄ换鐝粍',
align: 'center',
dataIndex: 'teamName',
@@ -252,16 +297,54 @@
align: 'center',
dataIndex: 'assignModeName',
},
- // {
- // title: '鐢熸晥鏃堕棿',
- // align: 'center',
- // dataIndex: 'takeEffectTime',
- // },
- // {
- // title: '澶辨晥鏃堕棿',
- // align: 'center',
- // dataIndex: 'loseEfficacyTime',
- // },
+ {
+ title: '瀹℃牳鎰忚',
+ align: 'center',
+ dataIndex: 'auditFeedback',
+ },
+ {
+ title: '瀹℃壒鎰忚',
+ align: 'center',
+ dataIndex: 'approvalFeedback',
+ },
+ {
+ title: '缂栧埗浜�',
+ align: 'center',
+ dataIndex: 'writePerson',
+ },
+ {
+ title: '瀹℃牳浜�',
+ align: 'center',
+ dataIndex: 'auditPerson',
+ },
+ {
+ title: '瀹℃壒浜�',
+ align: 'center',
+ dataIndex: 'approvalPerson',
+ },
+ {
+ title: '澶辨晥浜�',
+ align: 'center',
+ dataIndex: 'loseEfficacyPerson',
+ },
+ {
+ title: '缂栧埗鏃ユ湡',
+ align: 'center',
+ dataIndex: 'createTime',
+ width: 150,
+ },
+ {
+ title: '鐢熸晥鏃堕棿',
+ align: 'center',
+ dataIndex: 'takeEffectTime',
+ width: 150,
+ },
+ {
+ title: '澶辨晥鏃堕棿',
+ align: 'center',
+ dataIndex: 'loseEfficacyTime',
+ width: 150,
+ },
{
title: '鐗堟湰',
align: 'center',
@@ -272,16 +355,12 @@
align: 'center',
dataIndex: 'versionStatusName',
},
- {
- title: '鍒涘缓浜�',
- align: 'center',
- dataIndex: 'createBy',
- },
- {
- title: '鍒涘缓鏃ユ湡',
- align: 'center',
- dataIndex: 'createTime',
- },
+ // {
+ // title: '鍒涘缓浜�',
+ // align: 'center',
+ // dataIndex: 'createBy',
+ // },
+
// {
// title: '鏇存柊浜�',
// align: 'center',
@@ -306,6 +385,7 @@
delete: '/eam/inspectionStandard/delete',
deleteBatch: '/eam/inspectionStandard/deleteBatch',
versionTakeEffect: "/eam/inspectionStandard/versionTakeEffect",
+ importExcelUrl: "/eam/inspectionStandard/importExcel",
},
version: '1.0',
dictOptions: {},
@@ -322,6 +402,11 @@
total: 0
},
inspectionStandardId: '-1'
+ }
+ },
+ computed: {
+ importExcelUrl: function () {
+ return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
}
},
methods: {
@@ -362,6 +447,12 @@
this.$refs.modalForm.isRevise = false;
},
+ //瀹℃牳瀹℃壒
+ handleAuditApproval: function (record) {
+ this.$refs.auditApprovalModal.showModals(record);
+ this.$refs.auditApprovalModal.title = "瀹℃牳";
+ },
+
//鍗囩増
handleRevise: function (record) {
this.$refs.modalForm.edit(record);
@@ -369,23 +460,22 @@
this.$refs.modalForm.disableSubmit = false;
this.$refs.modalForm.isRevise = true;
},
-
- //鐢熸晥
+ //澶辨晥
handleTakeEffect(record) {
const that = this;
that.confirmLoading = true;
this.$confirm({
- title: '鏃ュ父鐐规鏍囧噯鐗堟湰鐢熸晥锛�',
- content: '鎻愮ず锛氱増鏈敓鏁堝悗涓婁竴鐗堟湰灏嗚嚜鍔ㄥけ鏁堬紝璇疯皑鎱庢搷浣滐紒',
+ title: '鏃ュ父鐐规鏍囧噯鐗堟湰澶辨晥锛�',
+ content: '鎻愮ず锛氱増鏈け鏁堝悗灏嗙姝娇鐢紝璇疯皑鎱庢搷浣滐紒',
okText: '纭',
cancelText: '鍙栨秷',
onOk() {
- requestPut(that.url.versionTakeEffect, { id: record.id, num: record.num, versionStatus: '2' }).then((res) => {
+ requestPut(that.url.versionTakeEffect, { id: record.id, num: record.num, versionStatus: '3' }).then((res) => {
if (res.success) {
- that.$message.success("鐗堟湰鐢熸晥鎴愬姛锛�")
+ that.$message.success("鐗堟湰澶辨晥鎴愬姛锛�")
that.loadData(1)
} else {
- that.$message.warning("鐗堟湰鐢熸晥澶辫触锛�")
+ that.$message.warning("鐗堟湰澶辨晥澶辫触锛�")
}
}).finally(() => {
that.confirmLoading = false;
@@ -427,6 +517,13 @@
this.queryParam = {}
this.loadData(1);
},
+ modalFormOk() {
+ // 鏂板/淇敼 鎴愬姛鏃讹紝閲嶈浇鍒楄〃
+ this.loadData();
+ //娓呯┖鍒楄〃閫変腑
+ // this.onClearSelected()
+ },
+
}
}
</script>
diff --git a/src/views/eam/DailyMaintenanceOrderList.vue b/src/views/eam/DailyMaintenanceOrderList.vue
index 3d0edaf..bf01a53 100644
--- a/src/views/eam/DailyMaintenanceOrderList.vue
+++ b/src/views/eam/DailyMaintenanceOrderList.vue
@@ -67,14 +67,14 @@
v-has="'dailyMaintenanceOrder:add'"
>鏂板</a-button>
<a-button
- v-if="selectedRowKeys.length == 1 && selectionRows[0].status == '8'"
+ v-show="selectedRowKeys.length == 1 && selectionRows[0].status == '8'"
@click="handlePrintInfo(selectionRows[0])"
type="primary"
style="margin-left: 8px"
>绉讳氦鍗曟墦鍗�
</a-button>
<!-- <a-button
- v-if="selectedRowKeys.length > 0"
+ v-show="selectedRowKeys.length > 0"
type="primary"
@click="batchAssign"
style="margin-left: 8px"
@@ -97,7 +97,7 @@
icon="import"
>瀵煎叆</a-button>
</a-upload> -->
- <!-- <a-dropdown v-if="selectedRowKeys.length > 0">
+ <!-- <a-dropdown v-show="selectedRowKeys.length > 0">
<a-menu slot="overlay">
<a-menu-item
key="1"
@@ -146,10 +146,10 @@
@confirm="() => handleOrderIssue(record)"
v-has="'dailyMaintenanceOrder:issue'"
>
- <a v-if="record.status == '1'">鎺ユ敹</a>
+ <a v-show="record.status == '1'">鎺ユ敹</a>
</a-popconfirm>
<a-divider
- v-if="record.status == '1'"
+ v-show="record.status == '1'"
type="vertical"
/>
<a-popconfirm
@@ -157,32 +157,14 @@
@confirm="() => handleOrderReset(record)"
v-has="'dailyMaintenanceOrder:issue'"
>
- <a v-if="record.status == '2'">鎾ゅ洖</a>
+ <a v-show="record.status == '2'">鎾ゅ洖</a>
</a-popconfirm>
<a-divider
- v-if="record.status == '2'"
+ v-show="record.status == '2'"
type="vertical"
/>
- <a-popconfirm
- title="纭畾鎭㈠宸ュ崟鍚�?"
- @confirm="() => handleOrderRecover(record)"
- v-has="'dailyMaintenanceOrder:recover'"
- >
- <a v-if="record.status == '7'">鎭㈠</a>
- </a-popconfirm>
<a-divider
- v-if="record.status == '7'"
- type="vertical"
- />
- <a-popconfirm
- title="纭畾浣滃簾宸ュ崟鍚�?"
- @confirm="() => handleOrderCancel(record)"
- v-has="'dailyMaintenanceOrder:recover'"
- >
- <a v-if="record.status == '2'">浣滃簾</a>
- </a-popconfirm>
- <a-divider
- v-if="record.status == '2'"
+ v-show="record.status == '2'"
type="vertical"
/>
<a-popconfirm
@@ -190,54 +172,66 @@
@confirm="() => handleOrderGet(record)"
v-has="'dailyMaintenanceOrder:get'"
>
- <a v-if="record.status == '2' && record.assignMode == '1'">棰嗗彇</a>
+ <a v-show="record.status == '2' && record.assignMode == '1'">棰嗗彇</a>
</a-popconfirm>
- <a
- v-if="record.status == '2' && record.assignMode == '2' "
+ <!-- <a
+ v-show="record.status == '2' && record.assignMode == '2' "
@click="handleAssignOrder(record)"
v-has="'dailyMaintenanceOrder:assign'"
>娲惧伐</a>
- <a
- v-if="record.status == '3'&& record.assignMode == '2' && record.maintenanceUserName != null "
- @click="handleAssignOrder(record)"
- v-has="'dailyMaintenanceOrder:assign'"
- >鏀规淳</a>
- <!-- <a
- v-if="record.status == '3'"
- @click="handleAssignOrder(record)"
- >鏀规淳</a> -->
+
<a-divider
- v-if="record.status == '2'"
+ v-show="record.status == '2'"
type="vertical"
- />
+ /> -->
<a-divider
- v-if="record.status === '3'&& record.assignMode == '2' && record.maintenanceUserName != null "
+ v-show="record.status === '3'&& record.assignMode == '2' && record.maintenanceUserName != null "
type="vertical"
/>
<a
- v-if="record.status === '3' || record.status === '4' "
+ v-show="record.status === '3' || record.status === '4' "
@click="handleOrderExe(record)"
v-has="'dailyMaintenanceOrder:exe'"
>鎵ц</a>
<a-divider
- v-if="record.status === '3' || record.status === '4' "
+ v-show="record.status === '3' || record.status === '4' "
type="vertical"
/>
<a
- v-if="record.status === '1'"
+ v-show="record.status === '1'"
@click="handleEdit(record)"
v-has="'dailyMaintenanceOrder:edit'"
>缂栬緫</a>
<a-divider
- v-if="record.status === '1'"
+ v-show="record.status === '1'"
type="vertical"
/>
<a
- v-if="record.status === '5' || record.status === '8'"
+ v-show="(record.status === '5' || record.status === '8') && (record.confirmStatus === '0' || record.confirmStatus === '2')"
+ @click="handleFinish(record)"
+ v-has="'dailyMaintenanceOrder:operateUser'"
+ >瀹屽伐绉讳氦鍗�</a>
+ <a
+ v-show="(record.status === '5' || record.status === '8') && (record.confirmStatus === '1' || record.confirmStatus === '4')"
+ @click="handleFinish(record)"
+ v-has="'dailyMaintenanceOrder:repairUser'"
+ >瀹屽伐绉讳氦鍗�</a>
+ <a
+ v-show="(record.status === '5' || record.status === '8') && (record.confirmStatus === '3' || record.confirmStatus === '6')"
+ @click="handleFinish(record)"
+ v-has="'dailyMaintenanceOrder:repairDirectorUser'"
+ >瀹屽伐绉讳氦鍗�</a>
+ <a
+ v-show="(record.status === '5' || record.status === '8') && (record.confirmStatus === '5')"
+ @click="handleFinish(record)"
+ v-has="'dailyMaintenanceOrder:equipmentInspectorUser'"
+ >瀹屽伐绉讳氦鍗�</a>
+ <a
+ v-show="(record.status === '5' || record.status === '8') && (record.confirmStatus === '7')"
@click="handleFinish(record)"
>瀹屽伐绉讳氦鍗�</a>
<a-divider
- v-if="record.status === '5' || record.status === '8'"
+ v-show="record.status === '5' || record.status === '8'"
type="vertical"
/>
<a-dropdown>
@@ -252,7 +246,7 @@
@confirm="() => handleDelete(record.id)"
v-has="'dailyMaintenanceOrder:delete'"
>
- <a v-if="record.status === '1'">鍒犻櫎</a>
+ <a v-show="record.status === '1'">鍒犻櫎</a>
</a-popconfirm>
</a-menu-item>
</a-menu>
@@ -264,7 +258,7 @@
slot-scope="text, record"
>
<a
- v-if="record.status === '3' || record.status === '4' ||record.status === '5' ||record.status === '7' "
+ v-if="record.status === '3' || record.status === '4' ||record.status === '5' ||record.status === '7' ||record.status === '8'"
class="lot"
@click="handleOrderExe(record)"
>{{record.num}}</a>
@@ -338,6 +332,7 @@
{
title: '鐘舵��',
align: "center",
+ width: 100,
dataIndex: 'statusName'
},
// {
@@ -345,15 +340,21 @@
// align: "center",
// dataIndex: 'maintenanceTypeName',
// },
+ // {
+ // title: '淇濆吇鍛ㄦ湡',
+ // align: "center",
+ // dataIndex: 'maintenanceCycleName',
+ // },
+ // {
+ // title: '娲惧伐鏂瑰紡',
+ // align: "center",
+ // dataIndex: 'assignModeName',
+ // width: 100,
+ // },
{
- title: '淇濆吇鍛ㄦ湡',
+ title: '绉讳氦鍗曠‘璁ょ姸鎬�',
align: "center",
- dataIndex: 'maintenanceCycleName',
- },
- {
- title: '娲惧伐鏂瑰紡',
- align: "center",
- dataIndex: 'assignModeName'
+ dataIndex: 'confirmStatusName'
},
{
title: '缁熶竴缂栫爜',
@@ -370,11 +371,11 @@
align: "center",
dataIndex: 'equipmentModel',
},
- {
- title: '淇濆吇鏍囧噯缂栫爜',
- align: "center",
- dataIndex: 'maintenanceStandardNum',
- },
+ // {
+ // title: '淇濆吇鏍囧噯缂栫爜',
+ // align: "center",
+ // dataIndex: 'maintenanceStandardNum',
+ // },
{
title: '浣跨敤閮ㄩ棬',
@@ -386,23 +387,23 @@
align: "center",
dataIndex: 'teamName'
},
- {
- title: '宸ユ椂瀹氶',
- align: "center",
- dataIndex: 'workingHourQuota'
- },
- {
- title: '璁″垝寮�濮嬫椂闂�',
- align: "center",
- dataIndex: 'planStartTime',
- //width: '120px',
- },
- {
- title: '璁″垝缁撴潫鏃堕棿',
- align: "center",
- dataIndex: 'planEndTime',
- //width: '120px',
- },
+ // {
+ // title: '宸ユ椂瀹氶',
+ // align: "center",
+ // dataIndex: 'workingHourQuota'
+ // },
+ // {
+ // title: '璁″垝寮�濮嬫椂闂�',
+ // align: "center",
+ // dataIndex: 'planStartTime',
+ // //width: '120px',
+ // },
+ // {
+ // title: '璁″垝缁撴潫鏃堕棿',
+ // align: "center",
+ // dataIndex: 'planEndTime',
+ // //width: '120px',
+ // },
{
title: '瀹為檯寮�濮嬫椂闂�',
align: "center",
@@ -415,11 +416,11 @@
dataIndex: 'actualEndTime',
//width: '120px',
},
- {
- title: '瀹為檯鐢ㄦ椂',
- align: "center",
- dataIndex: 'actualWorkingHourQuota',
- },
+ // {
+ // title: '瀹為檯鐢ㄦ椂',
+ // align: "center",
+ // dataIndex: 'actualWorkingHourQuota',
+ // },
{
title: '鎵ц浜�',
align: "center",
diff --git a/src/views/eam/DailyMaintenanceStandardList.vue b/src/views/eam/DailyMaintenanceStandardList.vue
index 6a743f4..c2b817e 100644
--- a/src/views/eam/DailyMaintenanceStandardList.vue
+++ b/src/views/eam/DailyMaintenanceStandardList.vue
@@ -90,7 +90,7 @@
type='primary'
icon='plus'
v-has="'dailyMaintenanceStandard:add'"
- >鏂板</a-button>
+ >缂栧埗</a-button>
<a-button
type='primary'
@click='searchQuery'
@@ -122,7 +122,7 @@
size='middle'
bordered
rowKey='id'
- :scroll="{ x: 'calc(1600px + 50%)', y: 900 }"
+ :scroll="{ x: 'calc(2300px + 50%)', y: 900 }"
:columns='columns'
:dataSource='dataSource'
:pagination='ipagination'
@@ -159,30 +159,49 @@
slot-scope="text, record"
>
<a
- v-if="record.versionStatus == '2'"
- @click="handleRevise(record)"
- v-has="'dailyMaintenanceStandard:revise'"
- >鍗囩増</a>
- <a
- v-if="record.versionStatus == '1'"
- @click="handleTakeEffect(record)"
- v-has="'dailyMaintenanceStandard:takeEffect'"
- >鐢熸晥</a>
+ v-show="record.versionStatus == '1' && record.approvalStatus == '1' "
+ @click="handleAuditApproval(record)"
+ v-has="'dailyMaintenanceStandard:audit'"
+ >瀹℃牳</a>
<a-divider type="vertical" />
<a
- v-if="record.versionStatus == '1'"
+ v-show="record.versionStatus == '1' && record.approvalStatus == '4'"
+ @click="handleAuditApproval(record)"
+ v-has="'dailyMaintenanceStandard:againAudit'"
+ >閲嶆柊瀹℃牳</a>
+ <a-divider type="vertical" />
+ <a
+ v-show="record.versionStatus == '1'&& record.approvalStatus == '3' "
+ @click="handleAuditApproval(record)"
+ v-has="'dailyMaintenanceStandard:approval'"
+ >瀹℃壒</a>
+ <a-divider type="vertical" />
+ <a
+ v-show="record.versionStatus == '1' && (record.approvalStatus == '1' || record.approvalStatus == '2')"
@click="handleEdit(record)"
v-has="'dailyMaintenanceStandard:edit'"
>缂栬緫</a>
<a-divider type="vertical" />
<a-popconfirm
- v-if="record.versionStatus == '1'"
+ v-show="record.versionStatus == '1' && (record.approvalStatus == '1' || record.approvalStatus == '2')"
title="纭畾鍒犻櫎鍚�?"
@confirm="() => handleDelete(record.id)"
v-has="'dailyMaintenanceStandard:delete'"
>
<a>鍒犻櫎</a>
</a-popconfirm>
+ <a-divider type="vertical" />
+ <a
+ v-show="record.versionStatus != '1'"
+ @click="handleRevise(record)"
+ v-has="'dailyMaintenanceStandard:revise'"
+ >鍗囩増</a>
+ <a-divider type="vertical" />
+ <a
+ v-show="record.versionStatus == '2'"
+ @click="handleTakeEffect(record)"
+ v-has="'dailyMaintenanceStandard:loseEfficacy'"
+ >澶辨晥</a>
</span>
</a-table>
@@ -242,6 +261,11 @@
ref='modalForm'
@ok='modalFormOk'
></daily-maintenance-standard-modal>
+
+ <audit-approval-modal
+ ref='auditApprovalModal'
+ @ok='modalFormOk'
+ ></audit-approval-modal>
</a-card>
</template>
@@ -255,6 +279,7 @@
import MaintenanceStandardSafetyRequirement from '@/views/eam/modules/dailyMaintenanceStandard/MaintenanceStandardSafetyRequirement'
import DailyMaintenanceStandardModal from './modules/dailyMaintenanceStandard/DailyMaintenanceStandardModal'
import MaintenanceStandardWorkInstruction from '@/views/eam/modules/dailyMaintenanceStandard/MaintenanceStandardWorkInstruction'
+import AuditApprovalModal from './modules/dailyMaintenanceStandard/AuditApprovalModal'
import '@/assets/less/TableExpand.less'
export default {
@@ -265,7 +290,8 @@
DailyMaintenanceStandardModal,
MaintenanceStandardPlanningMaterial,
MaintenanceStandardSafetyRequirement,
- MaintenanceStandardWorkInstruction
+ MaintenanceStandardWorkInstruction,
+ AuditApprovalModal
},
data() {
return {
@@ -285,7 +311,11 @@
align: 'center',
dataIndex: 'num',
},
-
+ {
+ title: '绛惧鐘舵��',
+ align: 'center',
+ dataIndex: 'approvalStatusName',
+ },
{
title: '缁熶竴缂栫爜',
align: 'center',
@@ -316,21 +346,59 @@
align: 'center',
dataIndex: 'teamName',
},
+ // {
+ // title: '鐗圭璁惧',
+ // align: 'center',
+ // dataIndex: 'specificEquipment',
+ // },
{
- title: '鐗圭璁惧',
+ title: '瀹℃牳鎰忚',
align: 'center',
- dataIndex: 'specificEquipment',
+ dataIndex: 'auditFeedback',
},
- // {
- // title: '鐢熸晥鏃堕棿',
- // align: 'center',
- // dataIndex: 'takeEffectTime',
- // },
- // {
- // title: '澶辨晥鏃堕棿',
- // align: 'center',
- // dataIndex: 'loseEfficacyTime',
- // },
+ {
+ title: '瀹℃壒鎰忚',
+ align: 'center',
+ dataIndex: 'approvalFeedback',
+ },
+ {
+ title: '缂栧埗浜�',
+ align: 'center',
+ dataIndex: 'writePerson',
+ },
+ {
+ title: '瀹℃牳浜�',
+ align: 'center',
+ dataIndex: 'auditPerson',
+ },
+ {
+ title: '瀹℃壒浜�',
+ align: 'center',
+ dataIndex: 'approvalPerson',
+ },
+ {
+ title: '澶辨晥浜�',
+ align: 'center',
+ dataIndex: 'loseEfficacyPerson',
+ },
+ {
+ title: '缂栧埗鏃ユ湡',
+ align: 'center',
+ dataIndex: 'createTime',
+ width: 150,
+ },
+ {
+ title: '鐢熸晥鏃堕棿',
+ align: 'center',
+ dataIndex: 'takeEffectTime',
+ width: 150,
+ },
+ {
+ title: '澶辨晥鏃堕棿',
+ align: 'center',
+ dataIndex: 'loseEfficacyTime',
+ width: 150,
+ },
{
title: '鐗堟湰',
align: 'center',
@@ -341,16 +409,12 @@
align: 'center',
dataIndex: 'versionStatusName',
},
- {
- title: '鍒涘缓浜�',
- align: 'center',
- dataIndex: 'createBy',
- },
- {
- title: '鍒涘缓鏃ユ湡',
- align: 'center',
- dataIndex: 'createTime',
- },
+ // {
+ // title: '鍒涘缓浜�',
+ // align: 'center',
+ // dataIndex: 'createBy',
+ // },
+
// {
// title: '鏇存柊浜�',
// align: 'center',
@@ -464,6 +528,12 @@
this.$refs.modalForm.isRevise = false;
},
+ //瀹℃牳瀹℃壒
+ handleAuditApproval: function (record) {
+ this.$refs.auditApprovalModal.showModals(record);
+ this.$refs.auditApprovalModal.title = "瀹℃牳";
+ },
+
//鍗囩増
handleRevise: function (record) {
this.$refs.modalForm.edit(record);
@@ -472,22 +542,22 @@
this.$refs.modalForm.isRevise = true;
},
- //鐢熸晥
+ //澶辨晥
handleTakeEffect(record) {
const that = this;
that.confirmLoading = true;
this.$confirm({
- title: '鏃ュ父淇濆吇鏍囧噯鐗堟湰鐢熸晥锛�',
- content: '鎻愮ず锛氱増鏈敓鏁堝悗涓婁竴鐗堟湰灏嗚嚜鍔ㄥけ鏁堬紝璇疯皑鎱庢搷浣滐紒',
+ title: '淇濆吇鏍囧噯鐗堟湰澶辨晥锛�',
+ content: '鎻愮ず锛氱増鏈け鏁堝悗灏嗙姝娇鐢紝璇疯皑鎱庢搷浣滐紒',
okText: '纭',
cancelText: '鍙栨秷',
onOk() {
- requestPut(that.url.versionTakeEffect, { id: record.id, num: record.num, versionStatus: '2' }).then((res) => {
+ requestPut(that.url.versionTakeEffect, { id: record.id, num: record.num, versionStatus: '3' }).then((res) => {
if (res.success) {
- that.$message.success("鐗堟湰鐢熸晥鎴愬姛锛�")
+ that.$message.success("鐗堟湰澶辨晥鎴愬姛锛�")
that.loadData(1)
} else {
- that.$message.warning("鐗堟湰鐢熸晥澶辫触锛�")
+ that.$message.warning("鐗堟湰澶辨晥澶辫触锛�")
}
}).finally(() => {
that.confirmLoading = false;
diff --git a/src/views/eam/EquipmentCalibrationOrder.vue b/src/views/eam/EquipmentCalibrationOrder.vue
index 0bc40df..bdec41f 100644
--- a/src/views/eam/EquipmentCalibrationOrder.vue
+++ b/src/views/eam/EquipmentCalibrationOrder.vue
@@ -64,6 +64,7 @@
@click='handleAdd'
type='primary'
icon='plus'
+ v-has="'calibrationOrder:add'"
>鏂板
</a-button>
</div>
@@ -74,8 +75,7 @@
class='ant-alert ant-alert-info'
style='margin-bottom: 16px;'
>
- <i class='anticon anticon-info-circle ant-alert-icon'></i> 宸查�夋嫨 <a
- style='font-weight: 600'>{{ selectedRowKeys.length }}</a>椤�
+ <i class='anticon anticon-info-circle ant-alert-icon'></i> 宸查�夋嫨 <a style='font-weight: 600'>{{ selectedRowKeys.length }}</a>椤�
<a
style='margin-left: 24px'
@click='onClearSelected'
@@ -85,7 +85,7 @@
<a-table
ref='table'
size='middle'
- :scroll="{ x: 'calc(700px + 50%)', y: 900 }"
+ :scroll="{ x: 'calc(1000px + 50%)', y: 900 }"
bordered
rowKey='id'
:columns='columns'
@@ -102,15 +102,27 @@
slot='action'
slot-scope='text, record'
>
- <a
- v-if="record.status === '1'"
- @click='handleAddOrderReport(record)'
- >缁撴灉褰曞叆</a>
- <a-divider
- v-if="record.status === '1'"
- type='vertical'
- />
- <a @click='handleDetail(record)'>璇︽儏</a>
+ <a
+ v-show="record.status === '1' || record.status === '3'"
+ @click='handleAddOrderReport(record)'
+ v-has="'calibrationOrder:write'"
+ >缁撴灉褰曞叆</a>
+
+ <a-divider
+ v-show="record.status === '1' || record.status === '3'"
+ type='vertical'
+ />
+ <a
+ v-show="record.status === '2'"
+ @click='handleTechnologyStatus(record)'
+ v-has="'calibrationOrder:audit'"
+ >缁撴灉瀹℃牳</a>
+
+ <a-divider
+ v-show="record.status === '2'"
+ type='vertical'
+ />
+ <a @click='handleDetail(record)'>璇︽儏</a>
<!-- <a-popconfirm-->
<!-- title='纭畾涓嬪彂宸ュ崟鍚�?'-->
<!-- @confirm='() => handleOrderIssue(record)'-->
@@ -194,7 +206,7 @@
<!-- </a-dropdown>-->
</span>
- <span
+ <!-- <span
slot='num'
slot-scope='text, record'
>
@@ -205,11 +217,9 @@
>{{ record.num }}</a>
<span v-else>{{ record.num }}</span>
- </span>
+ </span> -->
</a-table>
- <a-tabs
- defaultActiveKey='2'
- >
+ <a-tabs defaultActiveKey='2'>
<!-- <a-tab-pane -->
<!-- key="1"-->
<!-- tab="妫�楠岄」"-->
@@ -221,8 +231,10 @@
key='2'
tab='妫�瀹氭姤鍛�'
>
- <equipment-calibration-order-report-list ref='EquipmentCalibrationOrderReportList'
- :calibrationOrderId='mainId'></equipment-calibration-order-report-list>
+ <equipment-calibration-order-report-list
+ ref='EquipmentCalibrationOrderReportList'
+ :calibrationOrderId='mainId'
+ ></equipment-calibration-order-report-list>
</a-tab-pane>
</a-tabs>
@@ -237,12 +249,20 @@
ref='EquipmentCalibrationOrderExeDrawer'
@ok='modalFormOk'
></equipment-calibration-order-exe-drawer>
- <final-modal ref='finalModal' @ok='modalFormOk'></final-modal>
+ <final-modal
+ ref='finalModal'
+ @ok='modalFormOk'
+ ></final-modal>
<equipment-calibration-order-report-modal
ref='equipmentCalibrationOrderReportModal'
@ok='modalFormOk'
></equipment-calibration-order-report-modal>
+
+ <equipment-technology-status-modal
+ ref="EquipmentTechnologyStatusModal"
+ @ok="modalFormOk"
+ ></equipment-technology-status-modal>
</a-card>
</template>
@@ -259,6 +279,7 @@
import FinalModal from './modules/equipmentCalibrationOrder/FinalModal.vue'
import EquipmentCalibrationOrderReportModal
from './modules/equipmentCalibrationOrder/EquipmentCalibrationOrderReportModal'
+import EquipmentTechnologyStatusModal from './modules/equipmentCalibrationOrder/EquipmentTechnologyStatusModal'
export default {
name: 'EquipmentCalibrationOrder',
@@ -269,7 +290,8 @@
EquipmentPrecisionParametersList,
EquipmentCalibrationOrderReportList,
EquipmentCalibrationOrderReportModal,
- FinalModal
+ FinalModal,
+ EquipmentTechnologyStatusModal
},
data() {
return {
@@ -295,7 +317,7 @@
key: 'rowIndex',
width: 60,
align: 'center',
- customRender: function(t, r, index) {
+ customRender: function (t, r, index) {
return parseInt(index) + 1
}
},
@@ -307,12 +329,22 @@
// scopedSlots: { customRender: 'num' }
},
{
- title: '妫�瀹氭柟寮�',
+ title: '鐘舵��',
align: 'center',
- dataIndex: 'calibrationType_dictText'
+ dataIndex: 'status_dictText'
},
{
- title: '璁惧缂栫爜',
+ title: '鍒ゅ畾缁撴灉',
+ align: 'center',
+ dataIndex: 'calibrationResult_dictText'
+ },
+ // {
+ // title: '妫�瀹氭柟寮�',
+ // align: 'center',
+ // dataIndex: 'calibrationType_dictText'
+ // },
+ {
+ title: '缁熶竴缂栫爜',
align: 'center',
dataIndex: 'equipmentNum'
},
@@ -331,21 +363,12 @@
align: 'center',
dataIndex: 'equipmentSpecification'
},
- {
- title: '鍒ゅ畾渚濇嵁',
- align: 'center',
- dataIndex: 'managementMode_dictText'
- },
- {
- title: '鐘舵��',
- align: 'center',
- dataIndex: 'status_dictText'
- },
- {
- title: '鍒ゅ畾缁撴灉',
- align: 'center',
- dataIndex: 'calibrationResult_dictText'
- },
+ // {
+ // title: '鍒ゅ畾渚濇嵁',
+ // align: 'center',
+ // dataIndex: 'managementMode_dictText'
+ // },
+
// {
// title: '鍒涘缓浜�',
// align: 'center',
@@ -366,6 +389,11 @@
align: 'center',
dataIndex: 'calibrationTime'
},
+ {
+ title: '瀹℃牳鎰忚',
+ align: 'center',
+ dataIndex: 'remark'
+ },
// {
// title: '涓嬪彂鏃堕棿',
// align: 'center',
@@ -375,8 +403,8 @@
title: '鎿嶄綔',
dataIndex: 'action',
align: 'center',
+ width: 200,
fixed: 'right',
- width: 120,
scopedSlots: { customRender: 'action' }
}
],
@@ -390,7 +418,7 @@
},
computed: {
- importExcelUrl: function() {
+ importExcelUrl: function () {
return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
}
},
@@ -405,6 +433,12 @@
}
this.selectedRowKeys = selectedRowKeys
this.selectionRows = selectionRows
+ },
+
+ handleTechnologyStatus(record) {
+ this.$refs.EquipmentTechnologyStatusModal.edit(record);
+ this.$refs.EquipmentTechnologyStatusModal.title = "瀹℃牳";
+ this.$refs.EquipmentTechnologyStatusModal.disableSubmit = false;
},
handleOrderExe(record) {
@@ -461,7 +495,7 @@
}
},
// 鐩存帴涓婁紶閴村畾鎶ュ憡
- handleAddOrderReport: function(record) {
+ handleAddOrderReport: function (record) {
this.$refs.equipmentCalibrationOrderReportModal.add(record.id)
this.$refs.equipmentCalibrationOrderReportModal.title = '涓婁紶妫�瀹氭姤鍛�'
this.$refs.equipmentCalibrationOrderReportModal.disableSubmit = false
diff --git a/src/views/eam/EquipmentListOfAll.vue b/src/views/eam/EquipmentListOfAll.vue
index 51e7e03..4992313 100644
--- a/src/views/eam/EquipmentListOfAll.vue
+++ b/src/views/eam/EquipmentListOfAll.vue
@@ -4,7 +4,7 @@
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
- <a-col :span="5">
+ <a-col :span="6">
<a-form-item
label="璁惧鎵�灞炲垎绫�"
:labelCol="labelCol"
@@ -18,7 +18,7 @@
</a-form-item>
</a-col>
<a-col
- :span="5"
+ :span="6"
>
<a-form-item
:labelCol="labelCol"
@@ -32,7 +32,7 @@
</a-form-item>
</a-col>
<a-col
- :span="5"
+ :span="6"
>
<a-form-item
:labelCol="labelCol"
@@ -45,7 +45,7 @@
></a-input>
</a-form-item>
</a-col>
- <a-col :span="5">
+ <a-col :span="6">
<a-form-item
label="鍨嬪彿"
:labelCol="labelCol"
@@ -56,24 +56,8 @@
placeholder="璇疯緭鍏ュ瀷鍙�"
></a-input>
</a-form-item>
- </a-col>
- <a-col :span="4">
- <span
- style="float: left;overflow: hidden;"
- class="table-page-search-submitButtons"
- >
- <a
- @click="handleToggleSearch"
- style="margin-left: 8px"
- >
- {{ toggleSearchStatus ? '鏀惰捣' : '灞曞紑' }}
- <a-icon :type="toggleSearchStatus ? 'up' : 'down'" />
- </a>
- </span>
- </a-col>
-
+ </a-col>
</a-row>
- <template v-if="toggleSearchStatus">
<a-row :gutter="24">
<a-col :span="6">
<a-form-item
@@ -220,7 +204,6 @@
</a-form-model-item>
</a-col>
</a-row>
- </template>
</a-form>
</div>
<!-- 鏌ヨ鍖哄煙-END -->
@@ -477,9 +460,9 @@
import JSearchSelectTag from '../../components/dict/JSearchSelectTag.vue'
import ProcessEditModel from './modules/equipmentNew/edit/ProcessEditModel.vue'
import PrecisionEditModel from './modules/equipmentNew/edit/PrecisionEditModel'
- import EquipmentUpdateABCList from './modules/equipmentNew/EquipmentUpdateABCList.vue'
+ import EquipmentUpdateABCList from './modules/equipmentNew/EquipmentUpdateABCList'
import EquipmentUpdateWarrantyList from './modules/equipmentNew/EquipmentUpdateWarrantyList.vue'
- import ABCUpdateEditModel from './modules/equipmentNew/edit/ABCUpdateEditModel.vue'
+ import ABCUpdateEditModel from './modules/equipmentNew/edit/ABCUpdateEditModel'
import WarrantyUpdateModel from './modules/equipmentNew/edit/WarrantyUpdateModel.vue'
import EquipmentSpareParts from './modules/equipmentNew/EquipmentSpareParts.vue'
import EquipmentSparePartsModal from './modules/equipmentNew/EquipmentSparePartsModal'
diff --git a/src/views/eam/EquipmentListOfCrane.vue b/src/views/eam/EquipmentListOfCrane.vue
index 246b7a3..4508fb3 100644
--- a/src/views/eam/EquipmentListOfCrane.vue
+++ b/src/views/eam/EquipmentListOfCrane.vue
@@ -4,7 +4,7 @@
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
- <a-col :span="5">
+ <a-col :span="6">
<a-form-item
label="璁惧鎵�灞炲垎绫�"
:labelCol="labelCol"
@@ -18,7 +18,7 @@
</a-form-item>
</a-col>
<a-col
- :span="5"
+ :span="6"
>
<a-form-item
:labelCol="labelCol"
@@ -32,7 +32,7 @@
</a-form-item>
</a-col>
<a-col
- :span="5"
+ :span="6"
>
<a-form-item
:labelCol="labelCol"
@@ -45,7 +45,7 @@
></a-input>
</a-form-item>
</a-col>
- <a-col :span="5">
+ <a-col :span="6">
<a-form-item
label="鍨嬪彿"
:labelCol="labelCol"
@@ -57,23 +57,7 @@
></a-input>
</a-form-item>
</a-col>
- <a-col :span="4">
- <span
- style="float: left;overflow: hidden;"
- class="table-page-search-submitButtons"
- >
- <a
- @click="handleToggleSearch"
- style="margin-left: 8px"
- >
- {{ toggleSearchStatus ? '鏀惰捣' : '灞曞紑' }}
- <a-icon :type="toggleSearchStatus ? 'up' : 'down'" />
- </a>
- </span>
- </a-col>
-
</a-row>
- <template v-if="toggleSearchStatus">
<a-row :gutter="24">
<a-col :span="6">
<a-form-item
@@ -90,21 +74,6 @@
/>
</a-form-item>
</a-col>
- <!-- <a-col :span="6">
- <a-form-item
- label="杞﹂棿"
- :labelCol="labelCol"
- :wrapperCol="wrapperCol"
- >
- <j-dict-select-tag
- allow-clear
- placeholder="璇烽�夋嫨璧勮溅闂�"
- :triggerChange="true"
- dictCode="mom_base_factory_model,name,id,del_flag!='1'"
- v-model="queryParam.factoryModelId"
- />
- </a-form-item>
- </a-col> -->
<a-col :span="6">
<a-form-item
label="缁存姢閮ㄩ棬"
@@ -220,7 +189,6 @@
</a-form-model-item>
</a-col>
</a-row>
- </template>
</a-form>
</div>
<!-- 鏌ヨ鍖哄煙-END -->
@@ -479,7 +447,7 @@
import PrecisionEditModel from './modules/equipmentNew/edit/PrecisionEditModel'
import EquipmentUpdateABCList from './modules/equipmentNew/EquipmentUpdateABCList.vue'
import EquipmentUpdateWarrantyList from './modules/equipmentNew/EquipmentUpdateWarrantyList.vue'
- import ABCUpdateEditModel from './modules/equipmentNew/edit/ABCUpdateEditModel.vue'
+ import ABCUpdateEditModel from './modules/equipmentNew/edit/ABCUpdateEditModel'
import WarrantyUpdateModel from './modules/equipmentNew/edit/WarrantyUpdateModel.vue'
import EquipmentSpareParts from './modules/equipmentNew/EquipmentSpareParts.vue'
import EquipmentSparePartsModal from './modules/equipmentNew/EquipmentSparePartsModal'
diff --git a/src/views/eam/EquipmentListOfEnvProEquipment.vue b/src/views/eam/EquipmentListOfEnvProEquipment.vue
index 670aaac..8085d38 100644
--- a/src/views/eam/EquipmentListOfEnvProEquipment.vue
+++ b/src/views/eam/EquipmentListOfEnvProEquipment.vue
@@ -4,7 +4,7 @@
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
- <a-col :span="5">
+ <a-col :span="6">
<a-form-item
label="璁惧鎵�灞炲垎绫�"
:labelCol="labelCol"
@@ -18,7 +18,7 @@
</a-form-item>
</a-col>
<a-col
- :span="5"
+ :span="6"
>
<a-form-item
:labelCol="labelCol"
@@ -32,7 +32,7 @@
</a-form-item>
</a-col>
<a-col
- :span="5"
+ :span="6"
>
<a-form-item
:labelCol="labelCol"
@@ -45,7 +45,7 @@
></a-input>
</a-form-item>
</a-col>
- <a-col :span="5">
+ <a-col :span="6">
<a-form-item
label="鍨嬪彿"
:labelCol="labelCol"
@@ -56,24 +56,8 @@
placeholder="璇疯緭鍏ュ瀷鍙�"
></a-input>
</a-form-item>
- </a-col>
- <a-col :span="4">
- <span
- style="float: left;overflow: hidden;"
- class="table-page-search-submitButtons"
- >
- <a
- @click="handleToggleSearch"
- style="margin-left: 8px"
- >
- {{ toggleSearchStatus ? '鏀惰捣' : '灞曞紑' }}
- <a-icon :type="toggleSearchStatus ? 'up' : 'down'" />
- </a>
- </span>
- </a-col>
-
+ </a-col>
</a-row>
- <template v-if="toggleSearchStatus">
<a-row :gutter="24">
<a-col :span="6">
<a-form-item
@@ -220,7 +204,6 @@
</a-form-model-item>
</a-col>
</a-row>
- </template>
</a-form>
</div>
<!-- 鏌ヨ鍖哄煙-END -->
@@ -482,7 +465,7 @@
import PrecisionEditModel from './modules/equipmentNew/edit/PrecisionEditModel'
import EquipmentUpdateABCList from './modules/equipmentNew/EquipmentUpdateABCList.vue'
import EquipmentUpdateWarrantyList from './modules/equipmentNew/EquipmentUpdateWarrantyList.vue'
- import ABCUpdateEditModel from './modules/equipmentNew/edit/ABCUpdateEditModel.vue'
+ import ABCUpdateEditModel from './modules/equipmentNew/edit/ABCUpdateEditModel'
import WarrantyUpdateModel from './modules/equipmentNew/edit/WarrantyUpdateModel.vue'
import EquipmentSpareParts from './modules/equipmentNew/EquipmentSpareParts.vue'
import EquipmentSparePartsModal from './modules/equipmentNew/EquipmentSparePartsModal'
diff --git a/src/views/eam/EquipmentListOfFilesCarousel.vue b/src/views/eam/EquipmentListOfFilesCarousel.vue
index 050faad..eeacfcf 100644
--- a/src/views/eam/EquipmentListOfFilesCarousel.vue
+++ b/src/views/eam/EquipmentListOfFilesCarousel.vue
@@ -4,7 +4,7 @@
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
- <a-col :span="5">
+ <a-col :span="6">
<a-form-item
label="璁惧鎵�灞炲垎绫�"
:labelCol="labelCol"
@@ -18,7 +18,7 @@
</a-form-item>
</a-col>
<a-col
- :span="5"
+ :span="6"
>
<a-form-item
:labelCol="labelCol"
@@ -32,7 +32,7 @@
</a-form-item>
</a-col>
<a-col
- :span="5"
+ :span="6"
>
<a-form-item
:labelCol="labelCol"
@@ -45,7 +45,7 @@
></a-input>
</a-form-item>
</a-col>
- <a-col :span="5">
+ <a-col :span="6">
<a-form-item
label="鍨嬪彿"
:labelCol="labelCol"
@@ -57,23 +57,7 @@
></a-input>
</a-form-item>
</a-col>
- <a-col :span="4">
- <span
- style="float: left;overflow: hidden;"
- class="table-page-search-submitButtons"
- >
- <a
- @click="handleToggleSearch"
- style="margin-left: 8px"
- >
- {{ toggleSearchStatus ? '鏀惰捣' : '灞曞紑' }}
- <a-icon :type="toggleSearchStatus ? 'up' : 'down'" />
- </a>
- </span>
- </a-col>
-
</a-row>
- <template v-if="toggleSearchStatus">
<a-row :gutter="24">
<a-col :span="6">
<a-form-item
@@ -220,7 +204,6 @@
</a-form-model-item>
</a-col>
</a-row>
- </template>
</a-form>
</div>
<!-- 鏌ヨ鍖哄煙-END -->
@@ -479,7 +462,7 @@
import PrecisionEditModel from './modules/equipmentNew/edit/PrecisionEditModel'
import EquipmentUpdateABCList from './modules/equipmentNew/EquipmentUpdateABCList.vue'
import EquipmentUpdateWarrantyList from './modules/equipmentNew/EquipmentUpdateWarrantyList.vue'
- import ABCUpdateEditModel from './modules/equipmentNew/edit/ABCUpdateEditModel.vue'
+ import ABCUpdateEditModel from './modules/equipmentNew/edit/ABCUpdateEditModel'
import WarrantyUpdateModel from './modules/equipmentNew/edit/WarrantyUpdateModel.vue'
import EquipmentSpareParts from './modules/equipmentNew/EquipmentSpareParts.vue'
import EquipmentSparePartsModal from './modules/equipmentNew/EquipmentSparePartsModal'
diff --git a/src/views/eam/EquipmentListOfPressureVessel.vue b/src/views/eam/EquipmentListOfPressureVessel.vue
index a61b854..56cd8c0 100644
--- a/src/views/eam/EquipmentListOfPressureVessel.vue
+++ b/src/views/eam/EquipmentListOfPressureVessel.vue
@@ -4,7 +4,7 @@
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
- <a-col :span="5">
+ <a-col :span="6">
<a-form-item
label="璁惧鎵�灞炲垎绫�"
:labelCol="labelCol"
@@ -18,7 +18,7 @@
</a-form-item>
</a-col>
<a-col
- :span="5"
+ :span="6"
>
<a-form-item
:labelCol="labelCol"
@@ -32,7 +32,7 @@
</a-form-item>
</a-col>
<a-col
- :span="5"
+ :span="6"
>
<a-form-item
:labelCol="labelCol"
@@ -45,7 +45,7 @@
></a-input>
</a-form-item>
</a-col>
- <a-col :span="5">
+ <a-col :span="6">
<a-form-item
label="鍨嬪彿"
:labelCol="labelCol"
@@ -57,23 +57,7 @@
></a-input>
</a-form-item>
</a-col>
- <a-col :span="4">
- <span
- style="float: left;overflow: hidden;"
- class="table-page-search-submitButtons"
- >
- <a
- @click="handleToggleSearch"
- style="margin-left: 8px"
- >
- {{ toggleSearchStatus ? '鏀惰捣' : '灞曞紑' }}
- <a-icon :type="toggleSearchStatus ? 'up' : 'down'" />
- </a>
- </span>
- </a-col>
-
</a-row>
- <template v-if="toggleSearchStatus">
<a-row :gutter="24">
<a-col :span="6">
<a-form-item
@@ -220,7 +204,6 @@
</a-form-model-item>
</a-col>
</a-row>
- </template>
</a-form>
</div>
<!-- 鏌ヨ鍖哄煙-END -->
@@ -479,7 +462,7 @@
import PrecisionEditModel from './modules/equipmentNew/edit/PrecisionEditModel'
import EquipmentUpdateABCList from './modules/equipmentNew/EquipmentUpdateABCList.vue'
import EquipmentUpdateWarrantyList from './modules/equipmentNew/EquipmentUpdateWarrantyList.vue'
- import ABCUpdateEditModel from './modules/equipmentNew/edit/ABCUpdateEditModel.vue'
+ import ABCUpdateEditModel from './modules/equipmentNew/edit/ABCUpdateEditModel'
import WarrantyUpdateModel from './modules/equipmentNew/edit/WarrantyUpdateModel.vue'
import EquipmentSpareParts from './modules/equipmentNew/EquipmentSpareParts.vue'
import EquipmentSparePartsModal from './modules/equipmentNew/EquipmentSparePartsModal'
diff --git a/src/views/eam/EquipmentListOfProduct.vue b/src/views/eam/EquipmentListOfProduct.vue
index ee58a1a..a224421 100644
--- a/src/views/eam/EquipmentListOfProduct.vue
+++ b/src/views/eam/EquipmentListOfProduct.vue
@@ -4,7 +4,7 @@
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
- <a-col :span="5">
+ <a-col :span="6">
<a-form-item
label="璁惧鎵�灞炲垎绫�"
:labelCol="labelCol"
@@ -18,7 +18,7 @@
</a-form-item>
</a-col>
<a-col
- :span="5"
+ :span="6"
>
<a-form-item
:labelCol="labelCol"
@@ -32,7 +32,7 @@
</a-form-item>
</a-col>
<a-col
- :span="5"
+ :span="6"
>
<a-form-item
:labelCol="labelCol"
@@ -45,7 +45,7 @@
></a-input>
</a-form-item>
</a-col>
- <a-col :span="5">
+ <a-col :span="6">
<a-form-item
label="鍨嬪彿"
:labelCol="labelCol"
@@ -56,24 +56,8 @@
placeholder="璇疯緭鍏ュ瀷鍙�"
></a-input>
</a-form-item>
- </a-col>
- <a-col :span="4">
- <span
- style="float: left;overflow: hidden;"
- class="table-page-search-submitButtons"
- >
- <a
- @click="handleToggleSearch"
- style="margin-left: 8px"
- >
- {{ toggleSearchStatus ? '鏀惰捣' : '灞曞紑' }}
- <a-icon :type="toggleSearchStatus ? 'up' : 'down'" />
- </a>
- </span>
- </a-col>
-
+ </a-col>
</a-row>
- <template v-if="toggleSearchStatus">
<a-row :gutter="24">
<a-col :span="6">
<a-form-item
@@ -220,7 +204,6 @@
</a-form-model-item>
</a-col>
</a-row>
- </template>
</a-form>
</div>
<!-- 鏌ヨ鍖哄煙-END -->
@@ -479,7 +462,7 @@
import PrecisionEditModel from './modules/equipmentNew/edit/PrecisionEditModel'
import EquipmentUpdateABCList from './modules/equipmentNew/EquipmentUpdateABCList.vue'
import EquipmentUpdateWarrantyList from './modules/equipmentNew/EquipmentUpdateWarrantyList.vue'
- import ABCUpdateEditModel from './modules/equipmentNew/edit/ABCUpdateEditModel.vue'
+ import ABCUpdateEditModel from './modules/equipmentNew/edit/ABCUpdateEditModel'
import WarrantyUpdateModel from './modules/equipmentNew/edit/WarrantyUpdateModel.vue'
import EquipmentSpareParts from './modules/equipmentNew/EquipmentSpareParts.vue'
import EquipmentSparePartsModal from './modules/equipmentNew/EquipmentSparePartsModal'
diff --git a/src/views/eam/EquipmentListOfRide.vue b/src/views/eam/EquipmentListOfRide.vue
index c4dd9f7..be47e9c 100644
--- a/src/views/eam/EquipmentListOfRide.vue
+++ b/src/views/eam/EquipmentListOfRide.vue
@@ -4,7 +4,7 @@
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
- <a-col :span="5">
+ <a-col :span="6">
<a-form-item
label="璁惧鎵�灞炲垎绫�"
:labelCol="labelCol"
@@ -18,7 +18,7 @@
</a-form-item>
</a-col>
<a-col
- :span="5"
+ :span="6"
>
<a-form-item
:labelCol="labelCol"
@@ -32,7 +32,7 @@
</a-form-item>
</a-col>
<a-col
- :span="5"
+ :span="6"
>
<a-form-item
:labelCol="labelCol"
@@ -45,7 +45,7 @@
></a-input>
</a-form-item>
</a-col>
- <a-col :span="5">
+ <a-col :span="6">
<a-form-item
label="鍨嬪彿"
:labelCol="labelCol"
@@ -57,23 +57,7 @@
></a-input>
</a-form-item>
</a-col>
- <a-col :span="4">
- <span
- style="float: left;overflow: hidden;"
- class="table-page-search-submitButtons"
- >
- <a
- @click="handleToggleSearch"
- style="margin-left: 8px"
- >
- {{ toggleSearchStatus ? '鏀惰捣' : '灞曞紑' }}
- <a-icon :type="toggleSearchStatus ? 'up' : 'down'" />
- </a>
- </span>
- </a-col>
-
</a-row>
- <template v-if="toggleSearchStatus">
<a-row :gutter="24">
<a-col :span="6">
<a-form-item
@@ -220,7 +204,6 @@
</a-form-model-item>
</a-col>
</a-row>
- </template>
</a-form>
</div>
<!-- 鏌ヨ鍖哄煙-END -->
@@ -479,7 +462,7 @@
import PrecisionEditModel from './modules/equipmentNew/edit/PrecisionEditModel'
import EquipmentUpdateABCList from './modules/equipmentNew/EquipmentUpdateABCList.vue'
import EquipmentUpdateWarrantyList from './modules/equipmentNew/EquipmentUpdateWarrantyList.vue'
- import ABCUpdateEditModel from './modules/equipmentNew/edit/ABCUpdateEditModel.vue'
+ import ABCUpdateEditModel from './modules/equipmentNew/edit/ABCUpdateEditModel'
import WarrantyUpdateModel from './modules/equipmentNew/edit/WarrantyUpdateModel.vue'
import EquipmentSpareParts from './modules/equipmentNew/EquipmentSpareParts.vue'
import EquipmentSparePartsModal from './modules/equipmentNew/EquipmentSparePartsModal'
diff --git a/src/views/eam/EquipmentListOfTester.vue b/src/views/eam/EquipmentListOfTester.vue
index cea194a..28d63ed 100644
--- a/src/views/eam/EquipmentListOfTester.vue
+++ b/src/views/eam/EquipmentListOfTester.vue
@@ -4,7 +4,7 @@
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
- <a-col :span="5">
+ <a-col :span="6">
<a-form-item
label="璁惧鎵�灞炲垎绫�"
:labelCol="labelCol"
@@ -18,7 +18,7 @@
</a-form-item>
</a-col>
<a-col
- :span="5"
+ :span="6"
>
<a-form-item
:labelCol="labelCol"
@@ -32,7 +32,7 @@
</a-form-item>
</a-col>
<a-col
- :span="5"
+ :span="6"
>
<a-form-item
:labelCol="labelCol"
@@ -45,7 +45,7 @@
></a-input>
</a-form-item>
</a-col>
- <a-col :span="5">
+ <a-col :span="6">
<a-form-item
label="鍨嬪彿"
:labelCol="labelCol"
@@ -56,24 +56,8 @@
placeholder="璇疯緭鍏ュ瀷鍙�"
></a-input>
</a-form-item>
- </a-col>
- <a-col :span="4">
- <span
- style="float: left;overflow: hidden;"
- class="table-page-search-submitButtons"
- >
- <a
- @click="handleToggleSearch"
- style="margin-left: 8px"
- >
- {{ toggleSearchStatus ? '鏀惰捣' : '灞曞紑' }}
- <a-icon :type="toggleSearchStatus ? 'up' : 'down'" />
- </a>
- </span>
- </a-col>
-
+ </a-col>
</a-row>
- <template v-if="toggleSearchStatus">
<a-row :gutter="24">
<a-col :span="6">
<a-form-item
@@ -220,7 +204,6 @@
</a-form-model-item>
</a-col>
</a-row>
- </template>
</a-form>
</div>
<!-- 鏌ヨ鍖哄煙-END -->
@@ -479,7 +462,7 @@
import PrecisionEditModel from './modules/equipmentNew/edit/PrecisionEditModel'
import EquipmentUpdateABCList from './modules/equipmentNew/EquipmentUpdateABCList.vue'
import EquipmentUpdateWarrantyList from './modules/equipmentNew/EquipmentUpdateWarrantyList.vue'
- import ABCUpdateEditModel from './modules/equipmentNew/edit/ABCUpdateEditModel.vue'
+ import ABCUpdateEditModel from './modules/equipmentNew/edit/ABCUpdateEditModel'
import WarrantyUpdateModel from './modules/equipmentNew/edit/WarrantyUpdateModel.vue'
import EquipmentSpareParts from './modules/equipmentNew/EquipmentSpareParts.vue'
import EquipmentSparePartsModal from './modules/equipmentNew/EquipmentSparePartsModal'
diff --git a/src/views/eam/EquipmentListOfTruck.vue b/src/views/eam/EquipmentListOfTruck.vue
index 4622452..88fc3c8 100644
--- a/src/views/eam/EquipmentListOfTruck.vue
+++ b/src/views/eam/EquipmentListOfTruck.vue
@@ -4,7 +4,7 @@
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
- <a-col :span="5">
+ <a-col :span="6">
<a-form-item
label="璁惧鎵�灞炲垎绫�"
:labelCol="labelCol"
@@ -18,7 +18,7 @@
</a-form-item>
</a-col>
<a-col
- :span="5"
+ :span="6"
>
<a-form-item
:labelCol="labelCol"
@@ -32,7 +32,7 @@
</a-form-item>
</a-col>
<a-col
- :span="5"
+ :span="6"
>
<a-form-item
:labelCol="labelCol"
@@ -45,7 +45,7 @@
></a-input>
</a-form-item>
</a-col>
- <a-col :span="5">
+ <a-col :span="6">
<a-form-item
label="鍨嬪彿"
:labelCol="labelCol"
@@ -57,23 +57,7 @@
></a-input>
</a-form-item>
</a-col>
- <a-col :span="4">
- <span
- style="float: left;overflow: hidden;"
- class="table-page-search-submitButtons"
- >
- <a
- @click="handleToggleSearch"
- style="margin-left: 8px"
- >
- {{ toggleSearchStatus ? '鏀惰捣' : '灞曞紑' }}
- <a-icon :type="toggleSearchStatus ? 'up' : 'down'" />
- </a>
- </span>
- </a-col>
-
</a-row>
- <template v-if="toggleSearchStatus">
<a-row :gutter="24">
<a-col :span="6">
<a-form-item
@@ -220,7 +204,6 @@
</a-form-model-item>
</a-col>
</a-row>
- </template>
</a-form>
</div>
<!-- 鏌ヨ鍖哄煙-END -->
@@ -479,7 +462,7 @@
import PrecisionEditModel from './modules/equipmentNew/edit/PrecisionEditModel'
import EquipmentUpdateABCList from './modules/equipmentNew/EquipmentUpdateABCList.vue'
import EquipmentUpdateWarrantyList from './modules/equipmentNew/EquipmentUpdateWarrantyList.vue'
- import ABCUpdateEditModel from './modules/equipmentNew/edit/ABCUpdateEditModel.vue'
+ import ABCUpdateEditModel from './modules/equipmentNew/edit/ABCUpdateEditModel'
import WarrantyUpdateModel from './modules/equipmentNew/edit/WarrantyUpdateModel.vue'
import EquipmentSpareParts from './modules/equipmentNew/EquipmentSpareParts.vue'
import EquipmentSparePartsModal from './modules/equipmentNew/EquipmentSparePartsModal'
diff --git a/src/views/eam/EquipmentListOfWeldingMachine.vue b/src/views/eam/EquipmentListOfWeldingMachine.vue
index f9f0a3a..89b277d 100644
--- a/src/views/eam/EquipmentListOfWeldingMachine.vue
+++ b/src/views/eam/EquipmentListOfWeldingMachine.vue
@@ -4,7 +4,7 @@
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
- <a-col :span="5">
+ <a-col :span="6">
<a-form-item
label="璁惧鎵�灞炲垎绫�"
:labelCol="labelCol"
@@ -18,7 +18,7 @@
</a-form-item>
</a-col>
<a-col
- :span="5"
+ :span="6"
>
<a-form-item
:labelCol="labelCol"
@@ -32,7 +32,7 @@
</a-form-item>
</a-col>
<a-col
- :span="5"
+ :span="6"
>
<a-form-item
:labelCol="labelCol"
@@ -45,7 +45,7 @@
></a-input>
</a-form-item>
</a-col>
- <a-col :span="5">
+ <a-col :span="6">
<a-form-item
label="鍨嬪彿"
:labelCol="labelCol"
@@ -56,24 +56,8 @@
placeholder="璇疯緭鍏ュ瀷鍙�"
></a-input>
</a-form-item>
- </a-col>
- <a-col :span="4">
- <span
- style="float: left;overflow: hidden;"
- class="table-page-search-submitButtons"
- >
- <a
- @click="handleToggleSearch"
- style="margin-left: 8px"
- >
- {{ toggleSearchStatus ? '鏀惰捣' : '灞曞紑' }}
- <a-icon :type="toggleSearchStatus ? 'up' : 'down'" />
- </a>
- </span>
- </a-col>
-
+ </a-col>
</a-row>
- <template v-if="toggleSearchStatus">
<a-row :gutter="24">
<a-col :span="6">
<a-form-item
@@ -220,7 +204,6 @@
</a-form-model-item>
</a-col>
</a-row>
- </template>
</a-form>
</div>
<!-- 鏌ヨ鍖哄煙-END -->
@@ -479,7 +462,7 @@
import PrecisionEditModel from './modules/equipmentNew/edit/PrecisionEditModel'
import EquipmentUpdateABCList from './modules/equipmentNew/EquipmentUpdateABCList.vue'
import EquipmentUpdateWarrantyList from './modules/equipmentNew/EquipmentUpdateWarrantyList.vue'
- import ABCUpdateEditModel from './modules/equipmentNew/edit/ABCUpdateEditModel.vue'
+ import ABCUpdateEditModel from './modules/equipmentNew/edit/ABCUpdateEditModel'
import WarrantyUpdateModel from './modules/equipmentNew/edit/WarrantyUpdateModel.vue'
import EquipmentSpareParts from './modules/equipmentNew/EquipmentSpareParts.vue'
import EquipmentSparePartsModal from './modules/equipmentNew/EquipmentSparePartsModal'
diff --git a/src/views/eam/EquipmentOfLine.vue b/src/views/eam/EquipmentOfLine.vue
new file mode 100644
index 0000000..6a33fba
--- /dev/null
+++ b/src/views/eam/EquipmentOfLine.vue
@@ -0,0 +1,410 @@
+<template>
+ <a-card :bordered="false" title="杩愯緭杞�">
+ <!-- 鏌ヨ鍖哄煙 -->
+ <div class="table-page-search-wrapper">
+ <a-form layout="inline" @keyup.enter.native="searchQuery">
+ <a-row :gutter="24">
+ <a-col :span="6">
+ <a-form-item
+ label="鍒嗙被"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ >
+ <j-dict-select-tag
+ :dictCode="'mom_eam_equipment_category,name,id,equipment_category_uda1='+'\''+caytegoryParam+'\''"
+ placeholder="璇疯緭鍏ユ悳绱㈡潯浠跺苟閫夋嫨"
+ v-model="queryParam.equipmentCategoryId"
+ />
+ </a-form-item>
+ </a-col>
+ <a-col
+ :span="6"
+ >
+ <a-form-item
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ label="鐢熶骇绾跨紪鍙�"
+ >
+ <a-input
+ placeholder="璇疯緭鍏ョ敓浜х嚎缂栫爜鏌ヨ"
+ v-model="queryParam.num"
+ ></a-input>
+ </a-form-item>
+ </a-col>
+ <a-col
+ :span="6"
+ >
+ <a-form-item
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ label="鐢熶骇绾垮悕绉�"
+ >
+ <a-input
+ placeholder="璇疯緭鍏ョ敓浜х嚎鍚嶇О鏌ヨ"
+ v-model="queryParam.name"
+ ></a-input>
+ </a-form-item>
+ </a-col>
+ </a-row>
+ </a-form>
+ </div>
+ <!-- 鏌ヨ鍖哄煙-END -->
+
+ <!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
+ <div class="table-operator">
+ <a-button
+ type="primary"
+ @click="searchQuery"
+ icon="search"
+ >鏌ヨ</a-button>
+ <a-button
+ @click="searchReset"
+ icon="reload"
+ >閲嶇疆</a-button>
+ <a-button @click="handleAdd" type="primary" icon="plus" v-has="'equipmentAccount:add&delete&import&Edit'">鏂板</a-button>
+ <!-- <a-button type="primary" icon="download" @click="handleExportXls('璁惧鍙拌处')" v-has="'equipmentAccount:outport'">瀵煎嚭</a-button>
+ <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+ <a-button type="primary" icon="import" v-has="'equipmentAccount:add&delete&import&Edit'">瀵煎叆</a-button>
+ </a-upload>
+ <a-button :disabled="selectedRowKeys.length==0" @click="handleUpdateABC" type="primary" icon="font-colors" v-has="'equipmentAccount:add&delete&import&Edit'">ABC鏍囪瘑鍙樻洿</a-button>
+ <a-button :disabled="selectedRowKeys.length==0" @click="handleUpdateWarranty" type="primary" icon="calendar" v-has="'equipmentAccount:add&delete&import&Edit'">璐ㄤ繚鏈熷彉鏇�</a-button> -->
+ </div>
+ <!-- table鍖哄煙-begin -->
+ <div>
+ <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+ <i class="anticon anticon-info-circle ant-alert-icon"></i> 宸查�夋嫨 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>椤�
+ <a style="margin-left: 24px" @click="onClearSelected">娓呯┖</a>
+ </div>
+
+ <a-table
+ ref="table"
+ size="middle"
+ bordered
+ rowKey="id"
+ :scroll="{x:true}"
+ :columns="columns"
+ :dataSource="dataSource"
+ :pagination="ipagination"
+ :loading="loading"
+ :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange, type:'checkbox'}"
+ :customRow="clickThenSelect"
+ @change="handleTableChange">
+
+ <template slot="htmlSlot" slot-scope="text">
+ <div v-html="text"></div>
+ </template>
+ <template slot="imgSlot" slot-scope="text,record">
+ <span v-if="!text" style="font-size: 12px;font-style: italic;">鏃犲浘鐗�</span>
+ <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+ </template>
+ <template slot="fileSlot" slot-scope="text">
+ <span v-if="!text" style="font-size: 12px;font-style: italic;">鏃犳枃浠�</span>
+ <a-button
+ v-else
+ :ghost="true"
+ type="primary"
+ icon="download"
+ size="small"
+ @click="downloadFile(text)">
+ 涓嬭浇
+ </a-button>
+ </template>
+ <span
+ slot="action"
+ slot-scope="text, record"
+ >
+ <a
+ href="javascript:;"
+ @click='handleDetail(record)'
+ >璇︽儏</a>
+ <a-divider type="vertical" />
+ <a @click="handleEdit(record)" >缂栬緫</a>
+ <a-dropdown>
+ <a class="ant-dropdown-link">
+ 鏇村
+ <a-icon type="down" />
+ </a>
+ <a-menu slot="overlay">
+ <a-menu-item v-has="'equipmentAccount:add&delete&import&Edit'">
+
+ </a-menu-item>
+ <a-menu-item>
+ <a-popconfirm
+ title="纭畾鍒犻櫎鍚�?"
+ @confirm="() => handleDelete(record.id)"
+ v-has="'equipmentAccount:add&delete&import&Edit'"
+ >
+ <a>鍒犻櫎</a>
+ </a-popconfirm>
+ </a-menu-item>
+ </a-menu>
+ </a-dropdown>
+ </span>
+ </a-table>
+ </div>
+ <a-tabs defaultActiveKey="1">
+ <a-tab-pane tab="璁惧" key="1" forceRender>
+ <equipment-list-of-line :mainId="selectedMainId"></equipment-list-of-line>
+ </a-tab-pane>
+ </a-tabs>
+ <equipment-of-line-modal ref="modalForm" @ok="modalFormOk" :caytegoryParam="caytegoryParam"></equipment-of-line-modal>
+ </a-card>
+</template>
+
+<script>
+
+ import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+ import { mixinDevice } from '@/utils/mixin'
+ import { getAction } from '@/api/manage'
+ import '@/assets/less/TableExpand.less'
+ import JSearchSelectTag from '../../components/dict/JSearchSelectTag.vue'
+ import EquipmentOfLineModal from './modules/line/EquipmentOfLineModal.vue'
+ import EquipmentListOfLine from './modules/line/EquipmentListOfLine.vue'
+ export default {
+ name: "EquipmentOfLine",
+ mixins:[JeecgListMixin,mixinDevice],
+ components: {
+ JSearchSelectTag,
+ EquipmentOfLineModal,
+ EquipmentListOfLine,
+ },
+ data () {
+ return {
+ description: '璁惧鍙拌处绠＄悊椤甸潰',
+ caytegoryParam:'line',
+ // 琛ㄥご
+ columns: [
+ {
+ title: '#',
+ dataIndex: '',
+ key: 'rowIndex',
+ align: 'center',
+ customRender: function (t, r, index) {
+ return parseInt(index) + 1
+ },
+ width: 50,
+ },
+ {
+ title: '鐢熶骇绾跨紪鐮�',
+ align: "center",
+ dataIndex: 'num',
+ },
+ {
+ title: '鐢熶骇绾垮悕绉�',
+ align: "center",
+ dataIndex: 'name',
+ },
+ {
+ title: '璁惧鎬绘暟',
+ align: "center",
+ dataIndex: 'sumOfEquipment',
+ },
+ {
+ title: '鎿嶄綔',
+ align: "center",
+ dataIndex: 'action',
+ scopedSlots: {
+ customRender: 'action',
+ },
+ width: 147,
+ fixed: 'right',
+ },
+ ],
+ url: {
+ list: "/eam/equipment/getEquipmentList",
+ delete: "/eam/equipment/delete",
+ deleteBatch: "/eam/equipment/deleteBatch",
+ active: "/eam/equipment/active",
+ exportXlsUrl: '/eam/equipment/exportXls',
+ importExcelUrl: "/eam/equipment/importExcel",
+ loadOptions: '/sys/sysDepart/loadDepartTreeOptions',
+ },
+ dictOptions:{
+ },
+ /* 鍒嗛〉鍙傛暟 */
+ ipagination:{
+ current: 1,
+ pageSize: 5,
+ pageSizeOptions: ['5', '10', '50'],
+ showTotal: (total, range) => {
+ return range[0] + "-" + range[1] + " 鍏�" + total + "鏉�"
+ },
+ showQuickJumper: true,
+ showSizeChanger: true,
+ total: 0
+ },
+ selectedMainId:'',
+ superFieldList:[],
+ equipmentProcessParametersMainId: '',
+ equipmentDocumentMainId: '',
+ equipmentPrecisionParametersMainId: '',
+ precisionParametersTemplateId:'',
+ isOpenPrecision:true,
+ isOpenProcess:true,
+ treeData: [],
+ labelCol: {
+ xs: { span: 24 },
+ sm: { span: 5 },
+ },
+ wrapperCol: {
+ xs: { span: 24 },
+ sm: { span: 16 },
+ },
+ mainId:'',
+ }
+ },
+ created() {
+ this.getSuperFieldList();
+ this.initOptions();
+ },
+ computed: {
+ importExcelUrl: function(){
+ return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+ }
+ },
+ methods: {
+ initDictConfig(){
+ },
+ equipmentResumeShow(record) {
+ this.$refs.EquipmentResumeDrawer.visible = true
+ this.$refs.EquipmentResumeDrawer.title = '璁惧灞ュ巻'
+ this.$refs.EquipmentResumeDrawer.handleShow(record)
+ },
+ clickThenSelect(record) {
+ return {
+ on: {
+ click: () => {
+ this.onSelectChange(record.id.split(","), [record]);
+ }
+ }
+ }
+ },
+ onClearSelected() {
+ this.selectedRowKeys = [];
+ this.selectionRows = [];
+ this.selectedMainId=''
+ },
+ onSelectChange(selectedRowKeys, selectionRows) {
+ if(selectedRowKeys.length==1){
+ this.selectedMainId=selectedRowKeys[0]
+ }else{
+ this.selectedMainId=''
+ }
+ this.selectedRowKeys = selectedRowKeys;
+ this.selectionRows = selectionRows;
+ },
+ loadData(arg) {
+ if(!this.url.list){
+ this.$message.error("璇疯缃畊rl.list灞炴��!")
+ return
+ }
+ //鍔犺浇鏁版嵁 鑻ヤ紶鍏ュ弬鏁�1鍒欏姞杞界涓�椤电殑鍐呭
+ if (arg === 1) {
+ this.ipagination.current = 1;
+ }
+ this.onClearSelected()
+ this.queryParam.equipmentCategoryUda1 = this.caytegoryParam;
+ var params = this.getQueryParams();//鏌ヨ鏉′欢
+ this.loading = true;
+ getAction(this.url.list, params).then((res) => {
+ if (res.success) {
+ this.dataSource = res.result.records;
+ this.ipagination.total = res.result.total;
+ }
+ if(res.code===510){
+ this.$message.warning(res.message)
+ }
+ this.loading = false;
+ })
+ },
+ getSuperFieldList(){
+ let fieldList=[];
+ fieldList.push({type:'string',value:'num',text:'缁熶竴缂栫爜',dictCode:''})
+ fieldList.push({type:'string',value:'name',text:'璁惧鍚嶇О',dictCode:''})
+ fieldList.push({type:'string',value:'model',text:'鍨嬪彿',dictCode:''})
+ fieldList.push({type:'string',value:'specification',text:'瑙勬牸',dictCode:''})
+ fieldList.push({type:'string',value:'equipmentStatus',text:'璁惧鐘舵��',dictCode:''})
+ fieldList.push({type:'string',value:'technologyStatus',text:'technologyStatus',dictCode:''})
+ fieldList.push({type:'string',value:'assetNumber',text:'assetNumber',dictCode:''})
+ fieldList.push({type:'string',value:'equipmentCategoryId',text:'equipmentCategoryId',dictCode:''})
+ fieldList.push({type:'string',value:'specificEquipment',text:'specificEquipment',dictCode:''})
+ fieldList.push({type:'string',value:'equipmentPhoto',text:'equipmentPhoto',dictCode:''})
+ fieldList.push({type:'string',value:'constructorId',text:'璧勪骇鍒堕�犲晢',dictCode:''})
+ fieldList.push({type:'string',value:'supplierId',text:'supplierId',dictCode:''})
+ fieldList.push({type:'string',value:'factoryNumber',text:'factoryNumber',dictCode:''})
+ fieldList.push({type:'string',value:'leaveFactoryDate',text:'鍑哄巶鏃ユ湡',dictCode:''})
+ fieldList.push({type:'string',value:'acceptanceCheckDate',text:'楠屾敹鏃ユ湡',dictCode:''})
+ fieldList.push({type:'string',value:'affiliationId',text:'affiliationId',dictCode:''})
+ fieldList.push({type:'string',value:'manageId',text:'缁存姢閮ㄩ棬ID',dictCode:''})
+ fieldList.push({type:'string',value:'manager',text:'manager',dictCode:''})
+ fieldList.push({type:'string',value:'useId',text:'浣跨敤閮ㄩ棬ID',dictCode:''})
+ fieldList.push({type:'string',value:'functionary',text:'functionary',dictCode:''})
+ fieldList.push({type:'string',value:'location',text:'location',dictCode:''})
+ fieldList.push({type:'string',value:'equipmentImportanceId',text:'ABC鏍囪瘑ID',dictCode:''})
+ fieldList.push({type:'string',value:'processParameters',text:'processParameters',dictCode:''})
+ fieldList.push({type:'string',value:'processParametersTemplateId',text:'processParametersTemplateId',dictCode:''})
+ fieldList.push({type:'string',value:'precisionParameters',text:'precisionParameters',dictCode:''})
+ fieldList.push({type:'string',value:'precisionParametersTemplateId',text:'precisionParametersTemplateId',dictCode:''})
+ fieldList.push({type:'string',value:'verification',text:'verification',dictCode:''})
+ fieldList.push({type:'string',value:'verificationPeriod',text:'verificationPeriod',dictCode:''})
+ fieldList.push({type:'string',value:'lastVerificationDate',text:'lastVerificationDate',dictCode:''})
+ fieldList.push({type:'string',value:'nextVerificationDate',text:'nextVerificationDate',dictCode:''})
+ fieldList.push({type:'string',value:'status',text:'status',dictCode:''})
+ fieldList.push({type:'string',value:'remark',text:'remark',dictCode:''})
+ fieldList.push({type:'string',value:'equipmentUda1',text:'宸ュ尯',dictCode:''})
+ fieldList.push({type:'string',value:'equipmentUda2',text:'瀹夎浣嶇疆',dictCode:''})
+ fieldList.push({type:'string',value:'equipmentUda3',text:'閲嶉噺',dictCode:''})
+ fieldList.push({type:'string',value:'equipmentUda4',text:'閲嶉噺璁￠噺鍗曚綅ID',dictCode:''})
+ fieldList.push({type:'string',value:'equipmentUda5',text:'鍔熻兘浣嶇疆',dictCode:''})
+ fieldList.push({type:'string',value:'tenantId',text:'tenantId',dictCode:''})
+ fieldList.push({type:'int',value:'delFlag',text:'delFlag',dictCode:''})
+ fieldList.push({type:'string',value:'teamId',text:'缁翠慨鐝粍ID',dictCode:''})
+ fieldList.push({type:'string',value:'sourceId',text:'sourceId',dictCode:''})
+ fieldList.push({type:'string',value:'fundSource',text:'璧勯噾鏉ユ簮',dictCode:''})
+ fieldList.push({type:'string',value:'factoryNo',text:'鍑哄巶缂栧彿',dictCode:''})
+ fieldList.push({type:'string',value:'mfr',text:'鍒堕�犲晢',dictCode:''})
+ fieldList.push({type:'string',value:'sourceCountry',text:'璧勪骇鏉ユ簮鍥藉',dictCode:''})
+ fieldList.push({type:'string',value:'gpo',text:'鎬诲姛鐜�',dictCode:''})
+ fieldList.push({type:'string',value:'keyEquipmentIdentification',text:'鍏抽敭璁惧鏍囪瘑',dictCode:''})
+ fieldList.push({type:'string',value:'securityConfiguration',text:'瀹夊叏閰嶇疆',dictCode:''})
+ fieldList.push({type:'string',value:'coolingSystem',text:'鍐峰嵈绯荤粺',dictCode:''})
+ fieldList.push({type:'string',value:'fireExtinguisher',text:'鐏伀鍣�',dictCode:''})
+ fieldList.push({type:'string',value:'fireExtinguisherValidityPeriod',text:'鐏伀鍣ㄦ湁鏁堟湡',dictCode:''})
+ fieldList.push({type:'string',value:'operatingSystem',text:'鎿嶄綔绯荤粺',dictCode:''})
+ fieldList.push({type:'string',value:'system',text:'绯荤粺',dictCode:''})
+ fieldList.push({type:'string',value:'port',text:'绔彛',dictCode:''})
+ fieldList.push({type:'BigDecimal',value:'coordinateNum',text:'鍧愭爣鏁伴噺',dictCode:''})
+ fieldList.push({type:'string',value:'projectApprovalNo',text:'绔嬮」鍗″彿',dictCode:''})
+ this.superFieldList = fieldList
+ },
+ editProcess(record){
+ this.$refs.processEditModel.edit(record);
+ },
+ editPrecision(record){
+ this.$refs.precisionEditModel.edit(record);
+ },
+ initOptions() {
+ getAction(this.url.loadOptions).then(res => {
+ if (res.success) {
+ this.treeData = res.result
+ } else {
+ this.$message.warning(res.message)
+ }
+ })
+ },
+ handleUpdateABC(){
+ this.$refs.updateABC.add();
+ },
+ handleUpdateWarranty(){
+ this.$refs.updateWarranty.add();
+ },
+ handleEditSpareParts(record){
+ this.$refs.modalFormSpareParts.edit(record);
+ }
+
+ }
+ }
+</script>
+<style scoped>
+ @import '~@assets/less/common.less'
+</style>
\ No newline at end of file
diff --git a/src/views/eam/EquipmentVerification/CertifiedWorkOrder.vue b/src/views/eam/EquipmentVerification/CertifiedWorkOrder.vue
index d0d5848..5e6e448 100644
--- a/src/views/eam/EquipmentVerification/CertifiedWorkOrder.vue
+++ b/src/views/eam/EquipmentVerification/CertifiedWorkOrder.vue
@@ -200,7 +200,7 @@
},
},
{
- title: '璁惧缂栫爜',
+ title: '缁熶竴缂栫爜',
align: "center",
dataIndex: 'numCode',
ellipsis: true,
diff --git a/src/views/eam/EquipmentVerification/VerificationExecution.vue b/src/views/eam/EquipmentVerification/VerificationExecution.vue
index cfd8093..68ac30c 100644
--- a/src/views/eam/EquipmentVerification/VerificationExecution.vue
+++ b/src/views/eam/EquipmentVerification/VerificationExecution.vue
@@ -17,7 +17,7 @@
</a-form-item>
</a-col>
<a-col :span="3" class="colright">
- <a-form-item label='璁惧缂栫爜'>
+ <a-form-item label='缁熶竴缂栫爜'>
<a-input v-model="obj.numCode" readOnly></a-input>
</a-form-item>
</a-col>
diff --git a/src/views/eam/FaultInfoList.vue b/src/views/eam/FaultInfoList.vue
new file mode 100644
index 0000000..28ac680
--- /dev/null
+++ b/src/views/eam/FaultInfoList.vue
@@ -0,0 +1,447 @@
+<template>
+ <a-card :bordered="false">
+ <!-- 鏌ヨ鍖哄煙 -->
+ <div class="table-page-search-wrapper">
+ <a-form layout="inline" @keyup.enter.native="searchQuery">
+ <a-row :gutter="24">
+ <a-col
+ :xl='6'
+ :lg='7'
+ :md='8'
+ :sm='24'
+ >
+ <a-form-item label='鍗曟嵁鍙�'>
+ <j-input
+ placeholder='鍗曟嵁鍙锋绱�'
+ v-model='queryParam.num'
+ ></j-input>
+ </a-form-item>
+ </a-col>
+ <a-col
+ :xl='6'
+ :lg='7'
+ :md='8'
+ :sm='24'
+ >
+ <a-form-item label='鏄惁宸茬‘璁ょ粨鏋�'>
+ <j-dict-select-tag
+ allow-clear
+ placeholder=""
+ :triggerChange="true"
+ dictCode="is_product"
+ v-model='queryParam.isConfirm'
+ />
+ </a-form-item>
+ </a-col>
+ </a-row>
+ </a-form>
+ </div>
+ <!-- 鏌ヨ鍖哄煙-END -->
+
+ <!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
+ <div class="table-operator">
+ <a-button
+ type='primary'
+ @click='searchQuery'
+ icon='search'
+ >鏌ヨ</a-button>
+ <a-button
+ type='primary'
+ @click='searchReset'
+ icon='reload'
+ style='margin-left: 8px'
+ >閲嶇疆</a-button>
+ <!-- <a-button @click="handleAdd" type="primary" icon="plus">鏂板</a-button>
+ <a-button type="primary" icon="download" @click="handleExportXls('璁惧浜嬫晠鐧昏')">瀵煎嚭</a-button>
+ <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+ <a-button type="primary" icon="import">瀵煎叆</a-button>
+ </a-upload> -->
+ <!-- 楂樼骇鏌ヨ鍖哄煙 -->
+ <!-- <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+ <a-dropdown v-if="selectedRowKeys.length > 0">
+ <a-menu slot="overlay">
+ <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>鍒犻櫎</a-menu-item>
+ </a-menu>
+ <a-button style="margin-left: 8px"> 鎵归噺鎿嶄綔 <a-icon type="down" /></a-button>
+ </a-dropdown> -->
+ </div>
+
+ <!-- table鍖哄煙-begin -->
+ <div>
+ <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+ <i class="anticon anticon-info-circle ant-alert-icon"></i> 宸查�夋嫨 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>椤�
+ <a style="margin-left: 24px" @click="onClearSelected">娓呯┖</a>
+ </div>
+
+ <a-table
+ ref="table"
+ size="middle"
+ :scroll="{x:true}"
+ bordered
+ rowKey="id"
+ :columns="columns"
+ :dataSource="dataSource"
+ :pagination="ipagination"
+ :loading="loading"
+ :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+ class="j-table-force-nowrap"
+ @change="handleTableChange">
+
+ <template slot="htmlSlot" slot-scope="text">
+ <div v-html="text"></div>
+ </template>
+ <template slot="imgSlot" slot-scope="text,record">
+ <span v-if="!text" style="font-size: 12px;font-style: italic;">鏃犲浘鐗�</span>
+ <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+ </template>
+ <template slot="fileSlot" slot-scope="text">
+ <span v-if="!text" style="font-size: 12px;font-style: italic;">鏃犳枃浠�</span>
+ <a-button
+ v-else
+ :ghost="true"
+ type="primary"
+ icon="download"
+ size="small"
+ @click="downloadFile(text)">
+ 涓嬭浇
+ </a-button>
+ </template>
+
+ <span slot="action" slot-scope="text, record">
+ <a @click="handleEdit(record)" v-if="record.isConfirm!=='yes'">褰曞叆</a>
+
+ <a-divider type="vertical" />
+ <a @click="handleDetail(record)">璇︽儏</a>
+ <a-divider type="vertical" />
+ <a-popconfirm
+ title="纭缁撴灉鍚庝笉鍙啀褰曞叆锛岀‘璁ゅ悧?"
+ @confirm="() => handleConfirm(record)"
+ >
+ <a v-if="record.isConfirm!=='yes'">纭</a>
+ </a-popconfirm>
+ </span>
+
+ </a-table>
+ </div>
+
+ <fault-info-modal ref="modalForm" @ok="modalFormOk"></fault-info-modal>
+ </a-card>
+</template>
+
+<script>
+
+ import '@/assets/less/TableExpand.less'
+ import { mixinDevice } from '@/utils/mixin'
+ import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+ import FaultInfoModal from './modules/FaultInfoModal'
+import { putAction } from '../../api/manage'
+
+ export default {
+ name: 'FaultInfoList',
+ mixins:[JeecgListMixin, mixinDevice],
+ components: {
+ FaultInfoModal
+ },
+ data () {
+ return {
+ description: '璁惧浜嬫晠鐧昏绠＄悊椤甸潰',
+ // 琛ㄥご
+ columns: [
+ {
+ title: '#',
+ dataIndex: '',
+ key:'rowIndex',
+ width:60,
+ align:"center",
+ customRender:function (t,r,index) {
+ return parseInt(index)+1;
+ }
+ },
+ {
+ title:'鍗曟嵁鍙�',
+ align:"center",
+ dataIndex: 'num'
+ },
+ {
+ title:'璐ㄩ噺闅愭偅纭鍗�',
+ align:"center",
+ dataIndex: 'quanlityId_dictText'
+ },
+ {
+ title:'鐢熶骇鍗曚綅',
+ align:"center",
+ dataIndex: 'departId'
+ },
+ {
+ title:'璁惧鍚嶇О',
+ align:"center",
+ dataIndex: 'equipName'
+ },
+ {
+ title:'璁惧鍨嬪彿',
+ align:"center",
+ dataIndex: 'equipModel'
+ },
+ {
+ title:'缁熶竴缂栧彿',
+ align:"center",
+ dataIndex: 'equipNum'
+ },
+ {
+ title:'宸ュ尯',
+ align:"center",
+ dataIndex: 'area1'
+ },
+ {
+ title:'鍗曞厓/宸ユ',
+ align:"center",
+ dataIndex: 'area2'
+ },
+ {
+ title:'缁翠慨璐圭敤',
+ align:"center",
+ dataIndex: 'cost'
+ },
+ {
+ title:'鎿嶄綔鑰�',
+ align:"center",
+ dataIndex: 'operator_dictText'
+ },
+ {
+ title:'鍑虹敓骞存湀',
+ align:"center",
+ dataIndex: 'birthday'
+ },
+ {
+ title:'宸ヤ綔鏃堕棿',
+ align:"center",
+ dataIndex: 'workStartTime'
+ },
+ // {
+ // title:'鎿嶄綔鍛樻槸鍚︽湁鎿嶄綔璇�',
+ // align:"center",
+ // dataIndex: 'isCertificate'
+ // },
+ // {
+ // title:'鏄惁鏂數閲嶅惎',
+ // align:"center",
+ // dataIndex: 'isOutage'
+ // },
+ // {
+ // title:'鍔犲伐杩囩▼涓殑鍙樺姩鍥犵礌',
+ // align:"center",
+ // dataIndex: 'factor'
+ // },
+ // {
+ // title:'鍏蜂綋鏇存敼鍐呭',
+ // align:"center",
+ // dataIndex: 'modifyContent'
+ // },
+ // {
+ // title:'鍙戠敓浜嬫晠鏃惰澶囨墍鎵ц鐨勭▼搴�',
+ // align:"center",
+ // dataIndex: 'equipmentProcess'
+ // },
+ // {
+ // title:'鍙戠敓浜嬫晠鏃剁殑鐜拌薄',
+ // align:"center",
+ // dataIndex: 'phenomenon'
+ // },
+ // {
+ // title:'閲囧彇鎺柦1',
+ // align:"center",
+ // dataIndex: 'method1'
+ // },
+ // {
+ // title:'閲囧彇鎺柦2',
+ // align:"center",
+ // dataIndex: 'method2'
+ // },
+ // {
+ // title:'閲囧彇鎺柦3',
+ // align:"center",
+ // dataIndex: 'method3'
+ // },
+ // {
+ // title:'浜嬫晠鎵�閫犳垚鐨勭粨鏋�',
+ // align:"center",
+ // dataIndex: 'result'
+ // },
+ // {
+ // title:'寮�濮嬫鏌ユ椂闂�',
+ // align:"center",
+ // dataIndex: 'startCheckTime',
+ // customRender:function (text) {
+ // return !text?"":(text.length>10?text.substr(0,10):text)
+ // }
+ // },
+ // {
+ // title:'鍙戠敓浜嬫晠鍚庤澶囩殑鐘舵��',
+ // align:"center",
+ // dataIndex: 'equipmentStatus'
+ // },
+ // {
+ // title:'缁翠慨浜哄憳瀵逛簨鏁呯殑鍒嗘瀽',
+ // align:"center",
+ // dataIndex: 'anlysis'
+ // },
+ // {
+ // title:'缁翠慨浜哄憳妫�鏌ョ粨鏋�',
+ // align:"center",
+ // dataIndex: 'checkResult'
+ // },
+ // {
+ // title:'浜嬫晠鍘熷洜鍒嗘瀽杩囩▼涓墍閲囧彇鐨勭浉鍏宠涓�',
+ // align:"center",
+ // dataIndex: 'active'
+ // },
+ // {
+ // title:'寤鸿閲囧彇鐨勬帾鏂藉強鏃堕棿鑺傜偣',
+ // align:"center",
+ // dataIndex: 'suggest'
+ // },
+ // {
+ // title:'浜嬫晠鍙戠敓鍘熷洜鍒嗘瀽鐨勬牳瀵�',
+ // align:"center",
+ // dataIndex: 'judgment'
+ // },
+ // {
+ // title:'涓嶅悓鐨勬剰瑙佸強鍒嗘瀽',
+ // align:"center",
+ // dataIndex: 'differentJudgment'
+ // },
+ // {
+ // title:'鏁存敼鎺柦',
+ // align:"center",
+ // dataIndex: 'updateMethod'
+ // },
+ // {
+ // title:'浜嬫晠缁撹',
+ // align:"center",
+ // dataIndex: 'finalResult'
+ // },
+ // {
+ // title:'缁翠慨璐ｄ换浜�',
+ // align:"center",
+ // dataIndex: 'engineer'
+ // },
+ // {
+ // title:'鎶�鏈礋璐ｄ汉',
+ // align:"center",
+ // dataIndex: 'mechanic'
+ // },
+ // {
+ // title:'宸ラ暱',
+ // align:"center",
+ // dataIndex: 'workLeader'
+ // },
+ // {
+ // title:'涓績涓讳换',
+ // align:"center",
+ // dataIndex: 'centerLeader'
+ // },
+ // {
+ // title:'缁勯暱',
+ // align:"center",
+ // dataIndex: 'teamLeader'
+ // },
+ // {
+ // title:'缁翠慨绔欑珯闀�',
+ // align:"center",
+ // dataIndex: 'repairLeader'
+ // },
+ // {
+ // title:'绠＄悊瀹や笟鍔＄粡鐞�',
+ // align:"center",
+ // dataIndex: 'equipLeader'
+ // },
+ // {
+ // title:'杩愯淇濋殰閮ㄤ富绠￠瀵�',
+ // align:"center",
+ // dataIndex: 'guaranteeLeader'
+ // },
+ {
+ title: '鎿嶄綔',
+ dataIndex: 'action',
+ align:"center",
+ fixed:"right",
+ width:147,
+ scopedSlots: { customRender: 'action' }
+ }
+ ],
+ url: {
+ list: "/li/faultInfo/list",
+ delete: "/li/faultInfo/delete",
+ deleteBatch: "/li/faultInfo/deleteBatch",
+ exportXlsUrl: "/li/faultInfo/exportXls",
+ importExcelUrl: "li/faultInfo/importExcel",
+ confirm: "li/faultInfo/confirm"
+
+ },
+ dictOptions:{},
+ superFieldList:[],
+ }
+ },
+ created() {
+ this.getSuperFieldList();
+ },
+ computed: {
+ importExcelUrl: function(){
+ return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+ },
+ },
+ methods: {
+ initDictConfig(){
+ },
+ getSuperFieldList(){
+ let fieldList=[];
+ fieldList.push({type:'string',value:'num',text:'缂栫爜'})
+ fieldList.push({type:'string',value:'qId',text:'璐ㄩ噺闅愭偅纭鍗旾D'})
+ fieldList.push({type:'string',value:'cost',text:'缁翠慨璐圭敤'})
+ fieldList.push({type:'string',value:'isCertificate',text:'鎿嶄綔鍛樻槸鍚︽湁鎿嶄綔璇�'})
+ fieldList.push({type:'string',value:'isOutage',text:'鏄惁鏂數閲嶅惎'})
+ fieldList.push({type:'string',value:'factor',text:'鍔犲伐杩囩▼涓殑鍙樺姩鍥犵礌'})
+ fieldList.push({type:'string',value:'modifyContent',text:'鍏蜂綋鏇存敼鍐呭'})
+ fieldList.push({type:'string',value:'equipmentProcess',text:'鍙戠敓浜嬫晠鏃惰澶囨墍鎵ц鐨勭▼搴�'})
+ fieldList.push({type:'string',value:'phenomenon',text:'鍙戠敓浜嬫晠鏃剁殑鐜拌薄'})
+ fieldList.push({type:'string',value:'method1',text:'閲囧彇鎺柦1'})
+ fieldList.push({type:'string',value:'method2',text:'閲囧彇鎺柦2'})
+ fieldList.push({type:'string',value:'method3',text:'閲囧彇鎺柦3'})
+ fieldList.push({type:'string',value:'result',text:'浜嬫晠鎵�閫犳垚鐨勭粨鏋�'})
+ fieldList.push({type:'date',value:'startCheckTime',text:'寮�濮嬫鏌ユ椂闂�'})
+ fieldList.push({type:'string',value:'equipmentStatus',text:'鍙戠敓浜嬫晠鍚庤澶囩殑鐘舵��'})
+ fieldList.push({type:'string',value:'anlysis',text:'缁翠慨浜哄憳瀵逛簨鏁呯殑鍒嗘瀽'})
+ fieldList.push({type:'string',value:'checkResult',text:'缁翠慨浜哄憳妫�鏌ョ粨鏋�'})
+ fieldList.push({type:'string',value:'active',text:'浜嬫晠鍘熷洜鍒嗘瀽杩囩▼涓墍閲囧彇鐨勭浉鍏宠涓�'})
+ fieldList.push({type:'string',value:'suggest',text:'寤鸿閲囧彇鐨勬帾鏂藉強鏃堕棿鑺傜偣'})
+ fieldList.push({type:'string',value:'judgment',text:'浜嬫晠鍙戠敓鍘熷洜鍒嗘瀽鐨勬牳瀵�'})
+ fieldList.push({type:'string',value:'differentJudgment',text:'涓嶅悓鐨勬剰瑙佸強鍒嗘瀽'})
+ fieldList.push({type:'string',value:'updateMethod',text:'鏁存敼鎺柦'})
+ fieldList.push({type:'string',value:'finalResult',text:'浜嬫晠缁撹'})
+ fieldList.push({type:'string',value:'operater',text:'鎿嶄綔鑰�'})
+ fieldList.push({type:'string',value:'engineer',text:'缁翠慨璐ｄ换浜�'})
+ fieldList.push({type:'string',value:'mechanic',text:'鎶�鏈礋璐ｄ汉'})
+ fieldList.push({type:'string',value:'workLeader',text:'宸ラ暱'})
+ fieldList.push({type:'string',value:'centerLeader',text:'涓績涓讳换'})
+ fieldList.push({type:'string',value:'teamLeader',text:'缁勯暱'})
+ fieldList.push({type:'string',value:'repairLeader',text:'缁翠慨绔欑珯闀�'})
+ fieldList.push({type:'string',value:'equipLeader',text:'绠＄悊瀹や笟鍔＄粡鐞�'})
+ fieldList.push({type:'string',value:'guaranteeLeader',text:'杩愯淇濋殰閮ㄤ富绠￠瀵�'})
+ this.superFieldList = fieldList
+ },
+ handleConfirm(record) {
+ putAction(this.url.confirm, record).then(res => {
+ if (res.result) {
+ this.$message.success('纭鎴愬姛');
+ this.loadData();
+ } else {
+ this.$message.error('纭鍑虹幇寮傚父')
+ }
+ })
+ },
+ }
+ }
+</script>
+<style scoped>
+ @import '~@assets/less/common.less';
+</style>
\ No newline at end of file
diff --git a/src/views/eam/MalfunctionRepair.vue b/src/views/eam/MalfunctionRepair.vue
index 5227684..12934f5 100644
--- a/src/views/eam/MalfunctionRepair.vue
+++ b/src/views/eam/MalfunctionRepair.vue
@@ -8,11 +8,24 @@
<a-form
layout="inline"
@keyup.enter.native="searchQuery"
- >
+ > <a-row :gutter="24" style="margin-bottom: 1%;">
+ <a-col
+ :md="24"
+ :sm="6"
+ >
+ <a-form-item label="缁熶竴缂栧彿缇�">
+ <a-textarea
+ placeholder="璇疯緭鍏ユ墍鏈夌粺涓�缂栫爜,椤荤敤鈥�,鈥濋殧寮�,鍚﹀垯鍙兘鏌ヨ鍑洪敊璇俊鎭�"
+ v-model="queryParam.nums"
+ :auto-size="{ minRows: 2, maxRows:2 }"
+ ></a-textarea>
+ </a-form-item>
+ </a-col>
+ </a-row>
<a-row :gutter="24">
<a-col
:md="6"
- :sm="8"
+ :sm="6"
>
<a-form-item label="鍗曟嵁鍙�">
<a-input
@@ -23,23 +36,148 @@
</a-col>
<a-col
:md="6"
- :sm="8"
+ :sm="6"
>
- <a-form-item label="璁惧缂栫爜">
+ <a-form-item label="缁熶竴缂栧彿">
<a-input
- placeholder="璇疯緭鍏ヨ澶囩紪鐮�"
+ placeholder="璇疯緭鍏ョ粺涓�缂栧彿"
v-model="queryParam.equipmentNum"
></a-input>
</a-form-item>
</a-col>
<a-col
:md="6"
- :sm="8"
+ :sm="6"
>
- <span
- style="float: left;overflow: hidden;"
- class="table-page-search-submitButtons"
- >
+ <a-form-item label="璁惧鍚嶇О">
+ <a-input
+ placeholder="璇疯緭鍏ヨ澶囧悕绉�"
+ v-model="queryParam.equipmentName"
+ ></a-input>
+ </a-form-item>
+ </a-col>
+ <a-col
+ :md="6"
+ :sm="6"
+ >
+ <a-form-item label="璁惧鍨嬪彿">
+ <a-input
+ placeholder="璇疯緭鍏ヨ澶囧瀷鍙�"
+ v-model="queryParam.model"
+ ></a-input>
+ </a-form-item>
+ </a-col>
+ </a-row>
+ <a-row :gutter="24">
+ <a-col
+ :md="6"
+ :sm="6"
+ >
+ <a-form-item label="璁惧瑙勬牸">
+ <a-input
+ placeholder="璇疯緭鍏ヨ澶囪鏍�"
+ v-model="queryParam.specification"
+ ></a-input>
+ </a-form-item>
+ </a-col>
+ <a-col
+ :md="6"
+ :sm="6"
+ >
+ <a-form-item label="浣跨敤閮ㄩ棬">
+ <a-tree-select
+ style="width: 100%"
+ :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
+ :tree-data="treeData"
+ placeholder="璇烽�夋嫨浣跨敤閮ㄩ棬"
+ tree-default-expand-all
+ v-model="queryParam.useId"
+ />
+ </a-form-item>
+ </a-col>
+ <a-col
+ :md="6"
+ :sm="6"
+ >
+ <a-form-item label="鏁呴殰鏃堕棿">
+ <a-range-picker
+ style="width: 100%;"
+ format="YYYY-MM-DD HH:mm:ss"
+ v-model="faultTime"
+ @change="timeChange"
+ />
+ </a-form-item>
+ </a-col>
+ <a-col
+ :md="6"
+ :sm="6"
+ >
+ <a-form-item label="鎶ヤ慨浜�">
+ <a-input
+ placeholder="璇疯緭鍏ユ姤淇汉"
+ v-model="queryParam.errUda2"
+ ></a-input>
+ </a-form-item>
+ </a-col>
+ </a-row>
+ <a-row :gutter="24">
+ <a-col
+ :md="6"
+ :sm="6"
+ >
+ <a-form-item label="鍗曟嵁鐘舵��">
+ <j-dict-select-tag
+ allow-clear
+ placeholder="璇烽�夋嫨鍗曟嵁鐘舵��"
+ :triggerChange="true"
+ dictCode="equipment_report_repair_status"
+ v-model="queryParam.status"
+ />
+ </a-form-item>
+ </a-col>
+ <a-col
+ :md="6"
+ :sm="6"
+ >
+ <a-form-item label="鏄惁鍋滄満缁翠慨">
+ <j-dict-select-tag
+ allow-clear
+ placeholder="璇烽�夋嫨鏄惁鍋滄満缁翠慨"
+ :triggerChange="true"
+ dictCode="is_stop"
+ v-model="queryParam.isStop"
+ />
+ </a-form-item>
+ </a-col>
+ <a-col
+ :md="6"
+ :sm="6"
+ >
+ <a-form-item label="鏄惁鍔犲伐闆朵欢">
+ <j-dict-select-tag
+ allow-clear
+ placeholder="璇烽�夋嫨鏄惁鍦ㄥ姞宸ラ浂浠�"
+ :triggerChange="true"
+ dictCode="is_product"
+ v-model="queryParam.errUda1"
+ />
+ </a-form-item>
+ </a-col>
+ <a-col
+ :md="6"
+ :sm="6"
+ >
+ <a-form-item label="鍒跺崟浜�">
+ <a-input
+ placeholder="璇疯緭鍏ュ埗鍗曚汉"
+ v-model="queryParam.createBy"
+ ></a-input>
+ </a-form-item>
+ </a-col>
+ </a-row>
+ </a-form>
+ </div>
+ <div class="table-operator">
<a-button
type="primary"
@click="searchQuery"
@@ -51,12 +189,6 @@
icon="reload"
style="margin-left: 8px"
>閲嶇疆</a-button>
- </span>
- </a-col>
- </a-row>
- </a-form>
- </div>
- <div class="table-operator">
<a-button
@click="handleAdd"
type="primary"
@@ -188,6 +320,7 @@
import FaultDescriptionList from './modules/malfunctionRepair/FaultDescriptionList'
import ApprovelModal from './modules/malfunctionRepair/ApprovelModal'
import JEllipsis from '@/components/jeecg/JEllipsis'
+import moment from 'moment'
export default {
name: 'MalfunctionRepairList',
@@ -200,6 +333,8 @@
},
data() {
return {
+ treeData:[],
+ faultTime:[],
description: '鏁呴殰鎶ヤ慨',
queryParam: { delflag: 0 },
selectedRowKeys: [],
@@ -226,7 +361,7 @@
dataIndex: 'num'
},
{
- title: '璁惧缂栫爜',
+ title: '缁熶竴缂栧彿',
align: "center",
dataIndex: 'equipmentNum'
},
@@ -270,11 +405,11 @@
// dataIndex: 'photo',
// scopedSlots: { customRender: 'imgSlot' }
// },
- // {
- // title: '鏁呴殰鍘熷洜',
- // align: "center",
- // dataIndex: 'faultReason'
- // },
+ {
+ title: '鎶ヤ慨浜�',
+ align: "center",
+ dataIndex: 'errUda2'
+ },
{
title: '鏁呴殰鏃堕棿',
align: "center",
@@ -286,15 +421,20 @@
dataIndex: 'isStopName',
},
{
- title: '鍒涘缓浜�',
+ title: '鏄惁鍦ㄥ姞宸ラ浂浠�',
+ align: "center",
+ dataIndex: 'errUda1_dictText',
+ },
+ {
+ title: '鍒跺崟浜�',
align: "center",
dataIndex: 'createBy'
},
- {
- title: '鍒涘缓鏃堕棿',
- align: "center",
- dataIndex: 'createTime',
- },
+ // {
+ // title: '鍒涘缓鏃堕棿',
+ // align: "center",
+ // dataIndex: 'createTime',
+ // },
{
title: '澶囨敞',
align: "center",
@@ -316,6 +456,7 @@
exportXlsUrl: "/eam/equipmentReportRepair/exportXls",
importExcelUrl: "eam/equipmentReportRepair/importExcel",
edit: "/eam/equipmentReportRepair/edit",
+ loadOptions: '/sys/sysDepart/loadDepartTreeOptions',
},
/* 鍒嗛〉鍙傛暟 */
ipagination: {
@@ -332,7 +473,7 @@
}
},
created() {
-
+ this.initOptions();
},
computed: {
importExcelUrl: function () {
@@ -476,9 +617,22 @@
this.queryParam = {}
this.loadData(1)
this.onClearSelected()
+ this.faultTime = []
this.$refs.FaultDescriptionList.faultId = '-1'
},
-
+ initOptions() {
+ getAction(this.url.loadOptions).then(res => {
+ if (res.success) {
+ this.treeData = res.result
+ } else {
+ this.$message.warning(res.message)
+ }
+ })
+ },
+ timeChange(){
+ this.queryParam.faultStartTime = moment(this.faultTime[0]).format("YYYY-MM-DD HH:mm:ss")
+ this.queryParam.faultEndTime = moment(this.faultTime[1]).format("YYYY-MM-DD HH:mm:ss")
+ }
}
}
</script>
diff --git a/src/views/eam/OperationCertificateApplyList.vue b/src/views/eam/OperationCertificateApplyList.vue
index 349cd26..ca8f095 100644
--- a/src/views/eam/OperationCertificateApplyList.vue
+++ b/src/views/eam/OperationCertificateApplyList.vue
@@ -111,19 +111,33 @@
>
<a>鎾ゅ洖</a>
</a-popconfirm>
- <a-popconfirm
+ <!-- <a-popconfirm
v-if="record.auditStatus == 'submitted' || record.auditStatus == 'approved'"
title="纭椹冲洖鍚�?"
@confirm="() =>handleCommit(record, 'back')"
>
<a>椹冲洖</a>
- </a-popconfirm>
+ </a-popconfirm> -->
<a-divider
v-if="record.auditStatus == 'created' || record.auditStatus == 'submitted'"
type="vertical"
/>
<a @click="handleEdit(record)" v-if="record.auditStatus == 'created'">缂栬緫</a>
- <a-popconfirm
+ <a-divider
+ v-if="record.auditStatus == 'created'"
+ type="vertical"
+ />
+ <a
+ v-show="record.auditStatus == 'submitted'"
+ @click="handleFinish(record)"
+ v-has="'OperationCertificateApply:operationCertificateAudit'"
+ >瀹℃牳</a>
+ <a
+ v-show="record.auditStatus == 'approved'"
+ @click="handleFinish(record)"
+ v-has="'OperationCertificateApply:equipmentAdmin'"
+ >瀹℃牳</a>
+ <!-- <a-popconfirm
v-if="record.auditStatus == 'submitted'"
title="纭閫氳繃瀹℃壒鍚�?"
@confirm="() =>handleCommit(record, 'approved')"
@@ -136,7 +150,7 @@
@confirm="() =>handleCommit(record, 'audited')"
>
<a>瀹℃牳</a>
- </a-popconfirm>
+ </a-popconfirm> -->
<a-divider type="vertical" v-if="record.auditStatus == 'created' || record.auditStatus == 'submitted' || record.auditStatus == 'approved'"/>
<a-dropdown>
<a class="ant-dropdown-link">鏇村 <a-icon type="down" /></a>
@@ -167,6 +181,7 @@
</a-tabs>
<operation-certificate-apply-modal ref="modalForm" @ok="modalFormOk" />
+ <operation-certificate-apply-audit ref="modalFormAudit" @ok="modalFormOk" />
</a-card>
</template>
@@ -174,6 +189,7 @@
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import OperationCertificateApplyModal from './modules/operationCertificateApply/OperationCertificateApplyModal'
+ import OperationCertificateApplyAudit from './modules/operationCertificateApply/OperationCertificateApplyAudit'
import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
import { getAction, postAction } from '@/api/manage'
import OperationCertificateApplyDetailList from './modules/operationCertificateApply/OperationCertificateApplyDetailList'
@@ -184,7 +200,8 @@
mixins:[JeecgListMixin],
components: {
OperationCertificateApplyModal,
- OperationCertificateApplyDetailList
+ OperationCertificateApplyDetailList,
+ OperationCertificateApplyAudit
},
data () {
return {
@@ -322,6 +339,11 @@
this.$refs.modalForm.disableSubmit = false;
this.$refs.modalForm.isAchievement = true;
},
+ handleFinish: function (record) {
+ this.$refs.modalFormAudit.edit(record);
+ this.$refs.modalFormAudit.title = "鎿嶄綔璇佺敵璇峰鏍�";
+ this.$refs.modalFormAudit.disableSubmit = true;
+ },
onSelectChange(selectedRowKeys, selectionRows) {
if (selectedRowKeys.length == 1) {
diff --git a/src/views/eam/PredictiveWorkOrderList.vue b/src/views/eam/PredictiveWorkOrderList.vue
index 450350b..8b6f356 100644
--- a/src/views/eam/PredictiveWorkOrderList.vue
+++ b/src/views/eam/PredictiveWorkOrderList.vue
@@ -39,9 +39,9 @@
:md="6"
:sm="8"
>
- <a-form-item label="璁惧缂栫爜">
+ <a-form-item label="缁熶竴缂栫爜">
<a-input
- placeholder="璇疯緭鍏ヨ澶囩紪鐮�"
+ placeholder="璇疯緭鍏ョ粺涓�缂栫爜"
v-model="queryParam.equipmentNum"
></a-input>
</a-form-item>
@@ -316,7 +316,7 @@
dataIndex: 'monitorType_dictText'
},
{
- title: '璁惧缂栫爜',
+ title: '缁熶竴缂栫爜',
align: "center",
dataIndex: 'equipmentNum',
},
diff --git a/src/views/eam/PredictiveWorkPlanList.vue b/src/views/eam/PredictiveWorkPlanList.vue
index 839030f..bcba22e 100644
--- a/src/views/eam/PredictiveWorkPlanList.vue
+++ b/src/views/eam/PredictiveWorkPlanList.vue
@@ -313,7 +313,7 @@
dataIndex: 'monitorTypeName'
},
{
- title: '璁惧缂栫爜',
+ title: '缁熶竴缂栫爜',
align: 'center',
dataIndex: 'deviceNum'
},
diff --git a/src/views/eam/QuanlityConfirmList.vue b/src/views/eam/QuanlityConfirmList.vue
new file mode 100644
index 0000000..098dcff
--- /dev/null
+++ b/src/views/eam/QuanlityConfirmList.vue
@@ -0,0 +1,313 @@
+<template>
+ <a-card :bordered="false">
+ <!-- 鏌ヨ鍖哄煙 -->
+ <div class="table-page-search-wrapper">
+ <a-form layout="inline" @keyup.enter.native="searchQuery">
+ <a-row :gutter="24">
+ <a-col
+ :xl='6'
+ :lg='7'
+ :md='8'
+ :sm='24'
+ >
+ <a-form-item label='鍗曟嵁鍙�'>
+ <j-input
+ placeholder='鍗曟嵁鍙锋绱�'
+ v-model='queryParam.num'
+ ></j-input>
+ </a-form-item>
+ </a-col>
+ <a-col
+ :xl='6'
+ :lg='7'
+ :md='8'
+ :sm='24'
+ >
+ <a-form-item label='淇濋殰淇濅慨鍗�'>
+ <j-input
+ placeholder='鏁呴殰鎶ヤ慨鍗曟绱�'
+ v-model='queryParam.reportNum'
+ ></j-input>
+ </a-form-item>
+ </a-col>
+ <a-col
+ :xl='6'
+ :lg='7'
+ :md='8'
+ :sm='24'
+ >
+ <a-form-item label='缁熶竴缂栧彿'>
+ <j-input
+ placeholder='缁熶竴缂栧彿妫�绱�'
+ v-model='queryParam.equipmentNum'
+ ></j-input>
+ </a-form-item>
+ </a-col>
+ </a-row>
+ </a-form>
+ </div>
+ <!-- 鏌ヨ鍖哄煙-END -->
+
+ <!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
+ <div class="table-operator">
+ <a-button
+ type='primary'
+ @click='searchQuery'
+ icon='search'
+ >鏌ヨ</a-button>
+ <a-button
+ type='primary'
+ @click='searchReset'
+ icon='reload'
+ style='margin-left: 8px'
+ >閲嶇疆</a-button>
+ <!-- <a-button @click="handleAdd" type="primary" icon="plus">鏂板</a-button> -->
+ <!-- <a-button type="primary" icon="download" @click="handleExportXls('浜у搧璐ㄩ噺闅愭偅纭')">瀵煎嚭</a-button>
+ <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+ <a-button type="primary" icon="import">瀵煎叆</a-button>
+ </a-upload> -->
+ <!-- 楂樼骇鏌ヨ鍖哄煙 -->
+ <!-- <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+ <a-dropdown v-if="selectedRowKeys.length > 0">
+ <a-menu slot="overlay">
+ <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>鍒犻櫎</a-menu-item>
+ </a-menu>
+ <a-button style="margin-left: 8px"> 鎵归噺鎿嶄綔 <a-icon type="down" /></a-button>
+ </a-dropdown> -->
+ </div>
+
+ <!-- table鍖哄煙-begin -->
+ <div>
+ <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+ <i class="anticon anticon-info-circle ant-alert-icon"></i> 宸查�夋嫨 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>椤�
+ <a style="margin-left: 24px" @click="onClearSelected">娓呯┖</a>
+ </div>
+
+ <a-table
+ ref="table"
+ size="middle"
+ :scroll="{x:true}"
+ bordered
+ rowKey="id"
+ :columns="columns"
+ :dataSource="dataSource"
+ :pagination="ipagination"
+ :loading="loading"
+ :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+ class="j-table-force-nowrap"
+ @change="handleTableChange">
+
+ <template slot="htmlSlot" slot-scope="text">
+ <div v-html="text"></div>
+ </template>
+ <template slot="imgSlot" slot-scope="text,record">
+ <span v-if="!text" style="font-size: 12px;font-style: italic;">鏃犲浘鐗�</span>
+ <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+ </template>
+ <template slot="fileSlot" slot-scope="text">
+ <span v-if="!text" style="font-size: 12px;font-style: italic;">鏃犳枃浠�</span>
+ <a-button
+ v-else
+ :ghost="true"
+ type="primary"
+ icon="download"
+ size="small"
+ @click="downloadFile(text)">
+ 涓嬭浇
+ </a-button>
+ </template>
+
+ <span slot="action" slot-scope="text, record">
+ <a @click="handleEdit(record)" :disabled="record.isConfirm==='yes'">纭</a>
+
+ <!-- <a-divider type="vertical" />
+ <a-dropdown>
+ <a class="ant-dropdown-link">鏇村 <a-icon type="down" /></a>
+ <a-menu slot="overlay">
+ <a-menu-item>
+ <a @click="handleDetail(record)">璇︽儏</a>
+ </a-menu-item>
+ <a-menu-item>
+ <a-popconfirm title="纭畾鍒犻櫎鍚�?" @confirm="() => handleDelete(record.id)">
+ <a>鍒犻櫎</a>
+ </a-popconfirm>
+ </a-menu-item>
+ </a-menu>
+ </a-dropdown> -->
+ </span>
+
+ </a-table>
+ </div>
+
+ <quanlity-confirm-modal ref="modalForm" @ok="modalFormOk"></quanlity-confirm-modal>
+ </a-card>
+</template>
+
+<script>
+
+ import '@/assets/less/TableExpand.less'
+ import { mixinDevice } from '@/utils/mixin'
+ import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+ import QuanlityConfirmModal from './modules/QuanlityConfirmModal'
+
+ export default {
+ name: 'QuanlityConfirmList',
+ mixins:[JeecgListMixin, mixinDevice],
+ components: {
+ QuanlityConfirmModal
+ },
+ data () {
+ return {
+ description: '浜у搧璐ㄩ噺闅愭偅纭绠＄悊椤甸潰',
+ // 琛ㄥご
+ columns: [
+ {
+ title: '#',
+ dataIndex: '',
+ key:'rowIndex',
+ width:60,
+ align:"center",
+ customRender:function (t,r,index) {
+ return parseInt(index)+1;
+ }
+ },
+ {
+ title:'鍗曟嵁鍙�',
+ align:"center",
+ dataIndex: 'num',
+ width:200
+ },
+ {
+ title:'鏁呴殰鎶ヤ慨鍗�',
+ align:"center",
+ dataIndex: 'reportNum',
+ width:200
+ },
+ {
+ title:'璁惧鍚嶇О',
+ align:"center",
+ dataIndex: 'equipmentName',
+ width:200
+ },
+ {
+ title:'璁惧鍨嬪彿',
+ align:"center",
+ dataIndex: 'equipmentModel',
+ width:200
+ },
+ {
+ title:'缁熶竴缂栧彿',
+ align:"center",
+ dataIndex: 'equipmentNum',
+ width:200
+ },
+ {
+ title:'鍔犲伐闆朵欢鍙�',
+ align:"center",
+ dataIndex: 'partNumber',
+ width:200
+ },
+ {
+ title:'鎵规鍙�',
+ align:"center",
+ dataIndex: 'batchNo',
+ width:200
+ },
+ {
+ title:'浠舵暟',
+ align:"center",
+ dataIndex: 'quantity',
+ width:100
+ },
+ {
+ title:'鎿嶄綔鍛�',
+ align:"center",
+ dataIndex: 'operator_dictText',
+ width:100
+ },
+ {
+ title:'鏄惁宸茬‘璁�',
+ align:"center",
+ dataIndex: 'isConfirm_dictText'
+ ,
+ width:100
+ },
+ {
+ title:'纭棰嗗',
+ align:"center",
+ dataIndex: 'leader_dictText'
+ ,
+ width:100
+ },
+ {
+ title:'棰嗗纭鏃堕棿',
+ align:"center",
+ dataIndex: 'confirmTime',
+ customRender:function (text) {
+ return !text?"":(text.length>10?text.substr(0,10):text)
+ },
+ width:200
+ },
+ {
+ title:'浜у搧鎹熷け鎯呭喌',
+ align:"center",
+ dataIndex: 'condition',
+ width:100
+ },
+ {
+ title:'鎹熷け鎯呭喌鍒嗘瀽',
+ align:"center",
+ dataIndex: 'conditionAnalysis',
+ width:200
+ },
+ {
+ title: '鎿嶄綔',
+ dataIndex: 'action',
+ align:"center",
+ fixed:"right",
+ width:147,
+ scopedSlots: { customRender: 'action' }
+ }
+ ],
+ url: {
+ list: "/li/quanlityConfirm/list",
+ delete: "/li/quanlityConfirm/delete",
+ deleteBatch: "/li/quanlityConfirm/deleteBatch",
+ exportXlsUrl: "/li/quanlityConfirm/exportXls",
+ importExcelUrl: "li/quanlityConfirm/importExcel",
+
+ },
+ dictOptions:{},
+ superFieldList:[],
+ }
+ },
+ created() {
+ this.getSuperFieldList();
+ },
+ computed: {
+ importExcelUrl: function(){
+ return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+ },
+ },
+ methods: {
+ initDictConfig(){
+ },
+ getSuperFieldList(){
+ let fieldList=[];
+ fieldList.push({type:'string',value:'reportId',text:'鏁呴殰鎶ヤ慨鍗旾D'})
+ fieldList.push({type:'string',value:'condition',text:'浜у搧鎹熷け鎯呭喌'})
+ fieldList.push({type:'string',value:'conditionAnalysis',text:'鎹熷け鎯呭喌鍒嗘瀽'})
+ fieldList.push({type:'string',value:'partNumber',text:'闆朵欢鍙�'})
+ fieldList.push({type:'string',value:'batchNo',text:'鎵规鍙�'})
+ fieldList.push({type:'int',value:'qunatity',text:'浠舵暟'})
+ fieldList.push({type:'string',value:'leader',text:'纭棰嗗'})
+ fieldList.push({type:'date',value:'confirmTime',text:'棰嗗纭鏃堕棿'})
+ fieldList.push({type:'string',value:'isConfirm',text:'鏄惁宸茬‘璁�'})
+ this.superFieldList = fieldList
+ }
+ }
+ }
+</script>
+<style scoped>
+ @import '~@assets/less/common.less';
+</style>
\ No newline at end of file
diff --git a/src/views/eam/RepairOrderFinishedReport.vue b/src/views/eam/RepairOrderFinishedReport.vue
index c6ca35a..595f531 100644
--- a/src/views/eam/RepairOrderFinishedReport.vue
+++ b/src/views/eam/RepairOrderFinishedReport.vue
@@ -54,9 +54,9 @@
:md="8"
:sm="24"
>
- <a-form-item label="璁惧缂栫爜">
+ <a-form-item label="缁熶竴缂栫爜">
<a-input
- placeholder="璇疯緭鍏ヨ澶囩紪鐮�"
+ placeholder="璇疯緭鍏ョ粺涓�缂栫爜"
v-model="queryParam.equipmentNum"
></a-input>
</a-form-item>
@@ -420,7 +420,7 @@
dataIndex: 'num'
},
{
- title: '璁惧缂栫爜',
+ title: '缁熶竴缂栫爜',
align: "center",
dataIndex: 'equipmentNum'
},
diff --git a/src/views/eam/RepairOrderList.vue b/src/views/eam/RepairOrderList.vue
index 764d7a9..e606ddc 100644
--- a/src/views/eam/RepairOrderList.vue
+++ b/src/views/eam/RepairOrderList.vue
@@ -1,6 +1,6 @@
<template>
<a-card
- title="缁翠慨宸ュ崟"
+ title="缁翠慨"
:bordered="false"
>
<div class="table-page-search-wrapper">
@@ -8,6 +8,22 @@
layout="inline"
@keyup.enter.native="searchQuery"
>
+ <a-row :gutter="24" style="margin-bottom: 1%;">
+ <a-col
+ :xl="24"
+ :lg="7"
+ :md="8"
+ :sm="24"
+ >
+ <a-form-item label="缁熶竴缂栧彿缇�">
+ <a-textarea
+ placeholder="璇疯緭鍏ユ墍鏈夌粺涓�缂栫爜,椤荤敤鈥�,鈥濋殧寮�,鍚﹀垯鍙兘鏌ヨ鍑洪敊璇俊鎭�"
+ v-model="queryParam.nums"
+ :auto-size="{ minRows: 2, maxRows:2 }"
+ ></a-textarea>
+ </a-form-item>
+ </a-col>
+ </a-row>
<a-row :gutter="24">
<a-col
:xl="6"
@@ -20,7 +36,7 @@
allow-clear
placeholder="璇烽�夋嫨宸ュ崟鐘舵��"
:triggerChange="true"
- dictCode="repair_order_status"
+ dictCode="true_repair_status"
v-model="queryParam.status"
/>
</a-form-item>
@@ -44,14 +60,14 @@
:md="8"
:sm="24"
>
- <a-form-item label="璁惧缂栫爜">
+ <a-form-item label="缁熶竴缂栫爜">
<a-input
- placeholder="璇疯緭鍏ヨ澶囩紪鐮�"
+ placeholder="璇疯緭鍏ョ粺涓�缂栫爜"
v-model="queryParam.equipmentNum"
></a-input>
</a-form-item>
</a-col>
- <a-col :span="3">
+ <!-- <a-col :span="3">
<span
style="float: left;overflow: hidden;"
class="table-page-search-submitButtons"
@@ -64,12 +80,8 @@
<a-icon :type="toggleSearchStatus ? 'up' : 'down'" />
</a>
</span>
- </a-col>
- </a-row>
-
- <template v-if="toggleSearchStatus">
- <a-row :gutter="24">
- <a-col
+ </a-col> -->
+ <a-col
:xl="6"
:lg="7"
:md="8"
@@ -82,6 +94,8 @@
></a-input>
</a-form-item>
</a-col>
+ </a-row>
+ <a-row :gutter="24">
<a-col
:xl="6"
:lg="7"
@@ -110,7 +124,7 @@
allow-clear
placeholder="璇烽�夋嫨璧勫伐鍖�"
:triggerChange="true"
- dictCode="mom_base_factory_model,name,id,del_flag!='1'"
+ dictCode="mom_base_area,name,id,del_flag!='1'"
v-model="queryParam.factoryModelId"
/>
</a-form-item>
@@ -130,6 +144,22 @@
:triggerChange="true"
dictCode="specific_equipment"
v-model="queryParam.specificEquipment"
+ />
+ </a-form-item>
+ </a-col>
+ <a-col
+ :xl="6"
+ :lg="7"
+ :md="8"
+ :sm="24"
+ >
+ <a-form-item label="缁翠慨鐘舵��">
+ <j-dict-select-tag
+ allow-clear
+ placeholder="璇烽�夋嫨缁翠慨鐘舵��"
+ :triggerChange="true"
+ dictCode="repair_status"
+ v-model="queryParam.repairOrderUda1"
/>
</a-form-item>
</a-col>
@@ -153,7 +183,6 @@
</a-form-item>
</a-col>
</a-row> -->
- </template>
</a-form>
</div>
<!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
@@ -235,10 +264,18 @@
:loading="loading"
@change="handleTableChange"
:customRow="clickThenSelect"
+ :rowClassName="tableRowClass"
>
<span slot="jell" slot-scope="text">
<j-ellipsis :value="text" :length="8" />
</span>
+ <span
+ slot="specificEquipment"
+ slot-scope="text"
+ >
+ <a-icon type="check" style="color: chartreuse;" v-if="text==='0'" />
+ <a-icon type="close" v-else style="color:red;"/>
+ </span>
<span
slot="num"
slot-scope="text, record"
@@ -422,6 +459,7 @@
</repair-order-excute-drawer>
<fault-report-repair
ref="FaultReportRepair"
+ @ok="modalFormOk"
></fault-report-repair>
</a-card>
</template>
@@ -444,16 +482,7 @@
import FaultDescriptionList from './FaultDescriptionList'
import FaultReportRepair from './modules/repairorder/moudles/select/FaultReportRepair.vue'
import store from '@/store'
-import {
- ACCESS_TOKEN,
- USER_NAME,
- USER_INFO,
- USER_AUTH,
- SYS_BUTTON_AUTH,
- UI_CACHE_DB_DICT_DATA,
- TENANT_ID,
- CACHE_INCLUDED_ROUTES
-} from '@/store/mutation-types'
+import dayjs from 'dayjs'
export default {
name: "RepairOrderList",
mixins: [JeecgListMixin],
@@ -473,6 +502,11 @@
FaultReportRepair,
store
},
+ mounted(){
+ let intervalId = setInterval(() => {
+ this.loadData();
+ }, 600*1000); // 1000姣锛屽嵆1绉�
+ },
data() {
return {
description: '缁翠慨宸ュ崟绠＄悊椤甸潰',
@@ -489,9 +523,23 @@
}
},
{
+ title: '鍏抽敭璁惧?',
+ align: "center",
+ dataIndex: 'specificEquipment',
+ scopedSlots: { customRender: 'specificEquipment' }
+ },
+ {
title: '鐘舵��',
align: "center",
dataIndex: 'status_dictText'
+ },
+ {
+ title: '缁翠慨鐘舵��',
+ align: "center",
+ dataIndex: 'repairOrderUda1_dictText',
+ customRender:function (t,r,index) {
+ return t===null||r.repairOrderUda1===null?'/':t;
+ }
},
{
title: '鍗曟嵁鍙�',
@@ -505,7 +553,7 @@
// dataIndex: 'businessType_dictText'
// },
{
- title: '璁惧缂栫爜',
+ title: '缁熶竴缂栫爜',
align: "center",
dataIndex: 'equipmentNum'
},
@@ -552,16 +600,26 @@
align: "center",
dataIndex: 'responsibilityId_dictText'
},
- {
- title: '娲惧伐鏂瑰紡',
- align: "center",
- dataIndex: 'dispatchMethod_dictText'
- },
+ // {
+ // title: '娲惧伐鏂瑰紡',
+ // align: "center",
+ // dataIndex: 'dispatchMethod_dictText'
+ // },
// {
// title: '鐗圭璁惧',
// align: "center",
// dataIndex: 'specificEquipment_dictText'
// },
+ {
+ title: '鏁呴殰鏃堕棿',
+ align: "center",
+ dataIndex: 'faultTime'
+ },
+ {
+ title: '鎶ヤ慨浜�',
+ align: "center",
+ dataIndex: 'errUda2'
+ },
{
title: '鏁呴殰鎻忚堪',
align: "center",
@@ -570,30 +628,25 @@
customRender: 'jell'
}
},
- {
- title: '鏁呴殰鍘熷洜',
- align: "center",
- dataIndex: 'faultReason'
- },
- {
- title: '鏁呴殰鐜拌薄',
- align: "center",
- dataIndex: 'faultPhenomenon'
- },
- {
- title: '鏁呴殰鎺掗櫎',
- align: "center",
- dataIndex: 'faultRemove'
- },
- {
- title: '棰勯槻鎺柦',
- align: "center",
- dataIndex: 'preventiveMeasure'
- },
// {
- // title: '鏁呴殰鏃堕棿',
+ // title: '鏁呴殰鍘熷洜',
// align: "center",
- // dataIndex: 'faultTime'
+ // dataIndex: 'faultReason'
+ // },
+ // {
+ // title: '鏁呴殰鐜拌薄',
+ // align: "center",
+ // dataIndex: 'faultPhenomenon'
+ // },
+ // {
+ // title: '鏁呴殰鎺掗櫎',
+ // align: "center",
+ // dataIndex: 'faultRemove'
+ // },
+ // {
+ // title: '棰勯槻鎺柦',
+ // align: "center",
+ // dataIndex: 'preventiveMeasure'
// },
// {
// title: '鏁呴殰鐓х墖',
@@ -611,31 +664,31 @@
// align: "center",
// dataIndex: 'workingHourQuota'
// },
- {
- title: '瀹為檯宸ユ椂',
- align: "center",
- dataIndex: 'actualHour'
- },
- {
- title: '璁″垝寮�濮嬫椂闂�',
- align: "center",
- dataIndex: 'planStartTime'
- },
- {
- title: '璁″垝缁撴潫鏃堕棿',
- align: "center",
- dataIndex: 'planEndTime'
- },
- {
- title: '瀹為檯寮�濮嬫椂闂�',
- align: "center",
- dataIndex: 'actualStartTime'
- },
- {
- title: '瀹為檯缁撴潫鏃堕棿',
- align: "center",
- dataIndex: 'actualEndTime'
- },
+ // {
+ // title: '瀹為檯宸ユ椂',
+ // align: "center",
+ // dataIndex: 'actualHour'
+ // },
+ // {
+ // title: '璁″垝寮�濮嬫椂闂�',
+ // align: "center",
+ // dataIndex: 'planStartTime'
+ // },
+ // {
+ // title: '璁″垝缁撴潫鏃堕棿',
+ // align: "center",
+ // dataIndex: 'planEndTime'
+ // },
+ // {
+ // title: '瀹為檯寮�濮嬫椂闂�',
+ // align: "center",
+ // dataIndex: 'actualStartTime'
+ // },
+ // {
+ // title: '瀹為檯缁撴潫鏃堕棿',
+ // align: "center",
+ // dataIndex: 'actualEndTime'
+ // },
{
title: '鍒涘缓浜�',
align: "center",
@@ -889,12 +942,30 @@
},
getReports(){
this.$refs.FaultReportRepair.title = '鏁呴殰鎶ヤ慨鍗�';
+ this.$refs.FaultReportRepair.loadData();
this.$refs.FaultReportRepair.visible = true;
- }
+ },
+ tableRowClass(record, index) {
+ if ("2" === record.status) {
+ if (record.specificEquipment==='0'&&dayjs(record.faultTime).add(12,'hour')<dayjs()) {
+ return 'error'
+ } else if(dayjs(record.faultTime).add(7,'day')<dayjs()){
+ return 'primary'
+ }
+ }
+ },
},
}
</script>
<style scoped>
@import '~@assets/less/common.less';
+.error {
+ color: red;
+ font-weight: bold;
+}
+.primary {
+ color: rgb(255, 0, 251);
+ font-weight: bold;
+}
</style>
\ No newline at end of file
diff --git a/src/views/eam/SpecialtyInspectionOrderList.vue b/src/views/eam/SpecialtyInspectionOrderList.vue
index 56fb681..310e68d 100644
--- a/src/views/eam/SpecialtyInspectionOrderList.vue
+++ b/src/views/eam/SpecialtyInspectionOrderList.vue
@@ -306,7 +306,7 @@
scopedSlots: { customRender: 'num' }
},
{
- title: '瀵硅薄閮ㄩ棬',
+ title: '浣跨敤閮ㄩ棬',
align: "center",
dataIndex: 'departName',
},
diff --git a/src/views/eam/SpecialtyInspectionPlanList.vue b/src/views/eam/SpecialtyInspectionPlanList.vue
index c470fc3..d925c6f 100644
--- a/src/views/eam/SpecialtyInspectionPlanList.vue
+++ b/src/views/eam/SpecialtyInspectionPlanList.vue
@@ -15,7 +15,7 @@
>
<a-form-item label='鐐规鏂规缂栫爜'>
<a-input
- placeholder='璇疯緭鍏ヨ澶囩紪鐮�'
+ placeholder='璇疯緭鍏ョ粺涓�缂栫爜'
v-model='queryParam.num'
></a-input>
</a-form-item>
@@ -207,7 +207,7 @@
dataIndex: 'inspectionCycleName',
},
{
- title: '瀵硅薄閮ㄩ棬',
+ title: '浣跨敤閮ㄩ棬',
align: 'center',
dataIndex: 'useDepartName',
},
diff --git a/src/views/eam/SpecialtyInspectionStandardList.vue b/src/views/eam/SpecialtyInspectionStandardList.vue
index a99b9fa..3aa44cd 100644
--- a/src/views/eam/SpecialtyInspectionStandardList.vue
+++ b/src/views/eam/SpecialtyInspectionStandardList.vue
@@ -248,12 +248,12 @@
dataIndex: 'num',
},
{
- title: '瀵硅薄閮ㄩ棬',
+ title: '浣跨敤閮ㄩ棬',
align: 'center',
dataIndex: 'useDepartName',
},
{
- title: '璁惧缂栫爜',
+ title: '缁熶竴缂栫爜',
align: 'center',
dataIndex: 'equipmentNum',
},
diff --git a/src/views/eam/common/EquipmentList.vue b/src/views/eam/common/EquipmentList.vue
index ef8e940..c5b5b49 100644
--- a/src/views/eam/common/EquipmentList.vue
+++ b/src/views/eam/common/EquipmentList.vue
@@ -144,7 +144,7 @@
}
},
{
- title: '璁惧缂栫爜',
+ title: '缁熶竴缂栫爜',
align: 'center',
dataIndex: 'num',
},
diff --git a/src/views/eam/modules/FaultInfoForm.vue b/src/views/eam/modules/FaultInfoForm.vue
new file mode 100644
index 0000000..7f900ac
--- /dev/null
+++ b/src/views/eam/modules/FaultInfoForm.vue
@@ -0,0 +1,473 @@
+<template>
+ <a-spin :spinning="confirmLoading">
+ <j-form-container :disabled="formDisabled">
+ <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
+ <a-row>
+ <a-divider
+ orientation="center"
+ style="font-size: large;font-style: italic;color: #66aeed;"
+ > 琛ㄥご </a-divider>
+ <a-col :span="8">
+ <a-form-model-item label="鐢熶骇鍗曚綅" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="num">
+ <j-dict-select-tag
+ allow-clear
+ placeholder="鐢熶骇鍗曚綅"
+ :triggerChange="true"
+ dictCode="sys_depart,depart_name,id,del_flag='0'"
+ v-model="model.departId"
+ />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item label="宸ュ尯" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="area1">
+ <j-dict-select-tag
+ allow-clear
+ placeholder="宸ュ尯"
+ :triggerChange="true"
+ dictCode="mom_base_area,name,id,del_flag='0'"
+ v-model="model.area1"
+ />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item label="鎿嶄綔鑰�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="operater">
+ <j-dict-select-tag
+ allow-clear
+ placeholder="璇疯緭鍏ユ搷浣滆��"
+ :triggerChange="true"
+ dictCode="sys_user,realname,id,del_flag='0'"
+ v-model="model.operater"
+ />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item label="璁惧鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="eName">
+ <a-input v-model="model.equipName" placeholder="璁惧鍚嶇О" ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item label="鍗曞厓/宸ユ" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="area2">
+ <a-input v-model="model.area2" placeholder="鍗曞厓/宸ユ" ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item label="鍑虹敓骞存湀" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="birthday">
+ <j-date placeholder="鍑虹敓骞存湀" v-model="model.birthday" style="width: 100%" />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item label="璁惧鍨嬪彿" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="eModel">
+ <a-input v-model="model.equipModel" placeholder="璇疯緭鍏ヨ澶囧瀷鍙�" ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item label="浜嬫晠鍙戠敓鏃堕棿" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="faultTime">
+ <j-date placeholder="璇疯緭鍏ヤ簨鏁呭彂鐢熸椂闂�" v-model="model.faultTime" style="width: 100%" />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item label="鎶�鏈瓑绾�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="level">
+ <a-input v-model="model.level" placeholder="璇疯緭鍏ユ妧鏈瓑绾�" ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item label="缁熶竴缂栧彿" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="eNum">
+ <a-input v-model="model.equipNum" placeholder="璇疯緭鍏ョ粺涓�缂栧彿" ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item label="缁翠慨璐圭敤" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="cost">
+ <a-input v-model="model.cost" placeholder="璇疯緭鍏ョ淮淇垂鐢�" ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item label="宸ヤ綔鏃堕棿" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="workStartTime">
+ <j-date placeholder="璇疯緭鍏ュ伐浣滄椂闂�" v-model="model.workStartTime" style="width: 100%" />
+ </a-form-model-item>
+ </a-col>
+ <a-divider
+ orientation="center"
+ style="font-size: large;font-style: italic;color: #66aeed;"
+ > 鎿嶄綔鑰呭～鍐欎簨鏁呭彂鐢熺粡杩� </a-divider>
+ <a-col :span="8">
+ <a-form-model-item label="鎿嶄綔鍛樻槸鍚︽湁鎿嶄綔璇�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="isCertificate">
+ <j-dict-select-tag
+ allow-clear
+ placeholder="璇疯緭鍏ユ搷浣滃憳鏄惁鏈夋搷浣滆瘉"
+ :triggerChange="true"
+ dictCode="is_product"
+ v-model="model.isCertificate"
+ />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item label="浜嬫晠鍙戠敓鍚庢槸鍚︽柇鐢甸噸鍚�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="isOutage">
+ <j-dict-select-tag
+ allow-clear
+ placeholder="璇疯緭鍏ユ槸鍚︽柇鐢甸噸鍚�"
+ :triggerChange="true"
+ dictCode="is_product"
+ v-model="model.isOutage"
+ />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item label="鍔犲伐杩囩▼涓殑鍙樺姩鍥犵礌" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="factor">
+ <j-multi-select-tag
+ allow-clear
+ placeholder="璇疯緭鍏ュ姞宸ヨ繃绋嬩腑鐨勫彉鍔ㄥ洜绱�"
+ dictCode="fault_change_factor"
+ v-model="model.factor"
+ />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item label="鍏蜂綋鏇存敼鍐呭" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="modifyContent">
+ <a-textarea v-model="model.modifyContent" rows="4" placeholder="璇疯緭鍏ュ叿浣撴洿鏀瑰唴瀹�" />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item label="鍙戠敓浜嬫晠鏃惰澶囨墍鎵ц鐨勭▼搴�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentProcess">
+ <a-textarea v-model="model.equipmentProcess" rows="4" placeholder="璇疯緭鍏ュ彂鐢熶簨鏁呮椂璁惧鎵�鎵ц鐨勭▼搴�" />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item label="鍙戠敓浜嬫晠鏃剁殑鐜拌薄" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="phenomenon">
+ <a-textarea v-model="model.phenomenon" rows="4" placeholder="璇疯緭鍏ュ彂鐢熶簨鏁呮椂鐨勭幇璞�" />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item label="閲囧彇鎺柦1" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="method1">
+ <a-textarea v-model="model.method1" rows="4" placeholder="璇疯緭鍏ラ噰鍙栨帾鏂�1" />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item label="閲囧彇鎺柦2" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="method2">
+ <a-textarea v-model="model.method2" rows="4" placeholder="璇疯緭鍏ラ噰鍙栨帾鏂�2" />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item label="閲囧彇鎺柦3" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="method3">
+ <a-textarea v-model="model.method3" rows="4" placeholder="璇疯緭鍏ラ噰鍙栨帾鏂�3" />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item label="浜嬫晠鎵�閫犳垚鐨勭粨鏋�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="result">
+ <a-input v-model="model.result" placeholder="璇疯緭鍏ヤ簨鏁呮墍閫犳垚鐨勭粨鏋�" ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item label="宸ラ暱" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="workLeader">
+ <a-input v-model="model.workLeader" placeholder="璇疯緭鍏ュ伐闀�" ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item label="涓績涓讳换" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="centerLeader">
+ <a-input v-model="model.centerLeader" placeholder="璇疯緭鍏ヤ腑蹇冧富浠�" ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-divider
+ orientation="center"
+ style="font-size: large;font-style: italic;color: #66aeed;"
+ > 缁翠慨浜哄憳杩涜浜嬫晠鍒嗘瀽 </a-divider>
+ <a-col :span="8">
+ <a-form-model-item label="寮�濮嬫鏌ユ椂闂�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="startCheckTime">
+ <j-date placeholder="璇烽�夋嫨寮�濮嬫鏌ユ椂闂�" v-model="model.startCheckTime" style="width: 100%" />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item label="鍙戠敓浜嬫晠鍚庤澶囩殑鐘舵��" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentStatus">
+ <a-input v-model="model.equipmentStatus" placeholder="璇疯緭鍏ュ彂鐢熶簨鏁呭悗璁惧鐨勭姸鎬�" ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item label="缁翠慨浜哄憳瀵逛簨鏁呯殑鍒嗘瀽" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="anlysis">
+ <a-textarea v-model="model.anlysis" rows="4" placeholder="璇疯緭鍏ョ淮淇汉鍛樺浜嬫晠鐨勫垎鏋�" />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item label="缁翠慨浜哄憳妫�鏌ョ粨鏋�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="checkResult">
+ <a-textarea v-model="model.checkResult" rows="4" placeholder="璇疯緭鍏ョ淮淇汉鍛樻鏌ョ粨鏋�" />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item label="浜嬫晠鍘熷洜鍒嗘瀽杩囩▼涓墍閲囧彇鐨勭浉鍏宠涓�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="active">
+ <a-textarea v-model="model.active" rows="4" placeholder="璇疯緭鍏ヤ簨鏁呭師鍥犲垎鏋愯繃绋嬩腑鎵�閲囧彇鐨勭浉鍏宠涓�" />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item label="寤鸿閲囧彇鐨勬帾鏂藉強鏃堕棿鑺傜偣" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="suggest">
+ <a-textarea v-model="model.suggest" rows="4" placeholder="璇疯緭鍏ュ缓璁噰鍙栫殑鎺柦鍙婃椂闂磋妭鐐�" />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item label="缁翠慨璐ｄ换浜�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="engineer">
+ <a-input v-model="model.engineer" placeholder="璇疯緭鍏ョ淮淇矗浠讳汉" ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item label="缁勯暱" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="teamLeader">
+ <a-input v-model="model.teamLeader" placeholder="璇疯緭鍏ョ粍闀�" ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item label="缁翠慨绔欑珯闀�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="repairLeader">
+ <a-input v-model="model.repairLeader" placeholder="璇疯緭鍏ョ淮淇珯绔欓暱" ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-divider
+ orientation="center"
+ style="font-size: large;font-style: italic;color: #66aeed;"
+ > 璁惧鎶�鏈笓瀹舵剰瑙� </a-divider>
+ <a-col :span="8">
+ <a-form-model-item label="浜嬫晠鍙戠敓鍘熷洜鍒嗘瀽鐨勬牳瀵�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="judgment">
+ <j-dict-select-tag
+ allow-clear
+ placeholder="璇疯緭鍏ヤ簨鏁呭彂鐢熷師鍥犲垎鏋愮殑鏍稿"
+ :triggerChange="true"
+ dictCode="opinion"
+ v-model="model.judgment"
+ />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item label="涓嶅悓鐨勬剰瑙佸強鍒嗘瀽" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="differentJudgment">
+ <a-textarea v-model="model.differentJudgment" rows="4" placeholder="璇疯緭鍏ヤ笉鍚岀殑鎰忚鍙婂垎鏋�" />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item label="鏁存敼鎺柦" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="updateMethod">
+ <a-textarea v-model="model.updateMethod" rows="4" placeholder="璇疯緭鍏ユ暣鏀规帾鏂�" />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item label="浜嬫晠缁撹" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="finalResult">
+ <a-textarea v-model="model.finalResult" rows="4" placeholder="璇疯緭鍏ヤ簨鏁呯粨璁�" />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item label="鎶�鏈礋璐ｄ汉" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="mechanic">
+ <a-input v-model="model.mechanic" placeholder="璇疯緭鍏ユ妧鏈礋璐ｄ汉" ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item label="绠＄悊瀹や笟鍔＄粡鐞�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipLeader">
+ <a-input v-model="model.equipLeader" placeholder="璇疯緭鍏ョ鐞嗗涓氬姟缁忕悊" ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item label="杩愯淇濋殰閮ㄤ富绠￠瀵�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="guaranteeLeader">
+ <a-input v-model="model.guaranteeLeader" placeholder="璇疯緭鍏ヨ繍琛屼繚闅滈儴涓荤棰嗗" ></a-input>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ </a-form-model>
+ </j-form-container>
+ </a-spin>
+</template>
+
+<script>
+
+ import { httpAction, getAction } from '@/api/manage'
+ import { validateDuplicateValue } from '@/utils/util'
+
+ export default {
+ name: 'FaultInfoForm',
+ components: {
+ },
+ props: {
+ //琛ㄥ崟绂佺敤
+ disabled: {
+ type: Boolean,
+ default: false,
+ required: false
+ }
+ },
+ data () {
+ return {
+ model:{
+ },
+ labelCol: {
+ xs: { span: 24 },
+ sm: { span: 10 },
+ },
+ wrapperCol: {
+ xs: { span: 24 },
+ sm: { span: 14 },
+ },
+ confirmLoading: false,
+ validatorRules: {
+ num:[
+ { required: true, message: '蹇呭～!' },
+ ],
+ area1:[
+ { required: true, message: '蹇呭～!' },
+ ],
+ operater:[
+ { required: true, message: '蹇呭～!' },
+ ],
+ eName:[
+ { required: true, message: '蹇呭～!' },
+ ],
+ area2:[
+ { required: true, message: '蹇呭～!' },
+ ],
+ birthday:[
+ { required: true, message: '蹇呭～!' },
+ ],
+ eModel:[
+ { required: true, message: '蹇呭～!' },
+ ],
+ faultTime:[
+ { required: true, message: '蹇呭～!' },
+ ],
+ level:[
+ { required: true, message: '蹇呭～!' },
+ ],
+ eNum:[
+ { required: true, message: '蹇呭～!' },
+ ],
+ cost:[
+ { required: true, message: '蹇呭～!' },
+ ],
+ workStartTime:[
+ { required: true, message: '蹇呭～!' },
+ ],
+ isCertificate:[
+ { required: true, message: '蹇呭～!' },
+ ],
+ isOutage:[
+ { required: true, message: '蹇呭～!' },
+ ],
+ factor:[
+ { required: true, message: '蹇呭～!' },
+ ],
+ modifyContent:[
+ { required: true, message: '蹇呭～!' },
+ ],
+ equipmentProcess:[
+ { required: true, message: '蹇呭～!' },
+ ],
+ phenomenon:[
+ { required: true, message: '蹇呭～!' },
+ ],
+ method1:[
+ { required: true, message: '蹇呭～!' },
+ ],
+ method2:[
+ { required: true, message: '蹇呭～!' },
+ ],
+ method3:[
+ { required: true, message: '蹇呭～!' },
+ ],
+ result:[
+ { required: true, message: '蹇呭～!' },
+ ],
+ workLeader:[
+ { required: true, message: '蹇呭～!' },
+ ],
+ centerLeader:[
+ { required: true, message: '蹇呭～!' },
+ ],
+ startCheckTime:[
+ { required: true, message: '蹇呭～!' },
+ ],
+ equipmentStatus:[
+ { required: true, message: '蹇呭～!' },
+ ],
+ anlysis:[
+ { required: true, message: '蹇呭～!' },
+ ],
+ checkResult:[
+ { required: true, message: '蹇呭～!' },
+ ],
+ active:[
+ { required: true, message: '蹇呭～!' },
+ ],
+ suggest:[
+ { required: true, message: '蹇呭～!' },
+ ],
+ engineer:[
+ { required: true, message: '蹇呭～!' },
+ ],
+ teamLeader:[
+ { required: true, message: '蹇呭～!' },
+ ],
+ repairLeader:[
+ { required: true, message: '蹇呭～!' },
+ ],
+ differentJudgment:[
+ { required: true, message: '蹇呭～!' },
+ ],
+ updateMethod:[
+ { required: true, message: '蹇呭～!' },
+ ],
+ finalResult:[
+ { required: true, message: '蹇呭～!' },
+ ],
+ mechanic:[
+ { required: true, message: '蹇呭～!' },
+ ],
+ equipLeader:[
+ { required: true, message: '蹇呭～!' },
+ ],
+ guaranteeLeader:[
+ { required: true, message: '蹇呭～!' },
+ ],
+ },
+ url: {
+ add: "/li/faultInfo/add",
+ edit: "/li/faultInfo/edit",
+ queryById: "/li/faultInfo/queryById"
+ }
+ }
+ },
+ computed: {
+ formDisabled(){
+ return this.disabled
+ },
+ },
+ created () {
+ //澶囦唤model鍘熷鍊�
+ this.modelDefault = JSON.parse(JSON.stringify(this.model));
+ },
+ methods: {
+ add () {
+ this.edit(this.modelDefault);
+ },
+ edit (record) {
+ this.model = Object.assign({}, record);
+ this.visible = true;
+ },
+ submitForm () {
+ const that = this;
+ // 瑙﹀彂琛ㄥ崟楠岃瘉
+ this.$refs.form.validate(valid => {
+ if (valid) {
+ that.confirmLoading = true;
+ let httpurl = '';
+ let method = '';
+ if(!this.model.id){
+ httpurl+=this.url.add;
+ method = 'post';
+ }else{
+ httpurl+=this.url.edit;
+ method = 'put';
+ }
+ httpAction(httpurl,this.model,method).then((res)=>{
+ if(res.success){
+ that.$message.success(res.message);
+ that.$emit('ok');
+ }else{
+ that.$message.warning(res.message);
+ }
+ }).finally(() => {
+ that.confirmLoading = false;
+ })
+ }
+
+ })
+ },
+ }
+ }
+</script>
\ No newline at end of file
diff --git a/src/views/eam/modules/FaultInfoModal.vue b/src/views/eam/modules/FaultInfoModal.vue
new file mode 100644
index 0000000..1aa4e9a
--- /dev/null
+++ b/src/views/eam/modules/FaultInfoModal.vue
@@ -0,0 +1,61 @@
+<template>
+ <j-modal
+ :title="'璁惧浜嬫晠鐧昏琛�'"
+ :width="width"
+ :visible="visible"
+ switchFullscreen
+ :fullscreen="true"
+ @ok="handleOk"
+ :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+ @cancel="handleCancel"
+ cancelText="鍏抽棴">
+ <fault-info-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></fault-info-form>
+ </j-modal>
+</template>
+
+<script>
+
+ import FaultInfoForm from './FaultInfoForm'
+ export default {
+ name: 'FaultInfoModal',
+ components: {
+ FaultInfoForm
+ },
+ data () {
+ return {
+ title:'璁惧浜嬫晠鐧昏琛�',
+ width:1500,
+ visible: false,
+ disableSubmit: false
+ }
+ },
+ methods: {
+ add () {
+ this.visible=true
+ this.$nextTick(()=>{
+ this.$refs.realForm.add();
+ })
+ },
+ edit (record) {
+ this.visible=true
+ this.$nextTick(()=>{
+ this.$refs.realForm.edit(record);
+ })
+ },
+ close () {
+ this.$emit('close');
+ this.visible = false;
+ },
+ handleOk () {
+ this.$refs.realForm.submitForm();
+ },
+ submitCallback(){
+ this.$emit('ok');
+ this.visible = false;
+ },
+ handleCancel () {
+ this.close()
+ }
+ }
+ }
+</script>
\ No newline at end of file
diff --git a/src/views/eam/modules/QuanlityConfirmForm.vue b/src/views/eam/modules/QuanlityConfirmForm.vue
new file mode 100644
index 0000000..8bf741f
--- /dev/null
+++ b/src/views/eam/modules/QuanlityConfirmForm.vue
@@ -0,0 +1,158 @@
+<template>
+ <a-spin :spinning="confirmLoading">
+ <j-form-container :disabled="formDisabled">
+ <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
+ <a-row>
+ <!-- <a-col :span="24">
+ <a-form-model-item label="鏁呴殰鎶ヤ慨鍗旾D" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="reportId">
+ <a-input v-model="model.reportId" placeholder="璇疯緭鍏ユ晠闅滄姤淇崟ID" ></a-input>
+ </a-form-model-item>
+ </a-col> -->
+ <a-col :span="24">
+ <a-form-model-item label="浜у搧鎹熷け鎯呭喌" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="condition">
+ <j-dict-select-tag
+ allow-clear
+ placeholder="璇疯緭鍏ヤ骇鍝佹崯澶辨儏鍐�"
+ :triggerChange="true"
+ dictCode="is_product"
+ v-model="model.condition"
+ />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="24">
+ <a-form-model-item label="鎹熷け鎯呭喌鍒嗘瀽" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="conditionAnalysis">
+ <a-textarea v-model="model.conditionAnalysis" rows="4" placeholder="璇疯緭鍏ユ崯澶辨儏鍐靛垎鏋�" />
+ </a-form-model-item>
+ </a-col>
+ <!-- <a-col :span="24">
+ <a-form-model-item label="闆朵欢鍙�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="partNumber">
+ <a-input v-model="model.partNumber" placeholder="璇疯緭鍏ラ浂浠跺彿" ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="24">
+ <a-form-model-item label="鎵规鍙�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="batchNo">
+ <a-input v-model="model.batchNo" placeholder="璇疯緭鍏ユ壒娆″彿" ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="24">
+ <a-form-model-item label="浠舵暟" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="qunatity">
+ <a-input-number v-model="model.qunatity" placeholder="璇疯緭鍏ヤ欢鏁�" style="width: 100%" />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="24">
+ <a-form-model-item label="纭棰嗗" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="leader">
+ <a-input v-model="model.leader" placeholder="璇疯緭鍏ョ‘璁ら瀵�" ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="24">
+ <a-form-model-item label="棰嗗纭鏃堕棿" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="confirmTime">
+ <j-date placeholder="璇烽�夋嫨棰嗗纭鏃堕棿" v-model="model.confirmTime" style="width: 100%" />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="24">
+ <a-form-model-item label="鏄惁宸茬‘璁�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="isConfirm">
+ <a-input v-model="model.isConfirm" placeholder="璇疯緭鍏ユ槸鍚﹀凡纭" ></a-input>
+ </a-form-model-item>
+ </a-col> -->
+ </a-row>
+ </a-form-model>
+ </j-form-container>
+ </a-spin>
+</template>
+
+<script>
+
+ import { httpAction, getAction } from '@/api/manage'
+ import { validateDuplicateValue } from '@/utils/util'
+
+ export default {
+ name: 'QuanlityConfirmForm',
+ components: {
+ },
+ props: {
+ //琛ㄥ崟绂佺敤
+ disabled: {
+ type: Boolean,
+ default: false,
+ required: false
+ }
+ },
+ data () {
+ return {
+ model:{
+ },
+ labelCol: {
+ xs: { span: 24 },
+ sm: { span: 5 },
+ },
+ wrapperCol: {
+ xs: { span: 24 },
+ sm: { span: 16 },
+ },
+ confirmLoading: false,
+ validatorRules: {
+ conditionAnalysis:[
+ { required: true, message: '璇疯緭鍏ユ崯澶辨儏鍐靛垎鏋�!' },
+ { min: 1, max: 1000, message: '闀垮害涓嶈秴杩� 1000 涓瓧绗�', trigger: 'blur' },
+ ],
+ condition:[
+ { required: true, message: '璇烽�夋嫨浜у搧鏄惁鏈夋崯澶�!' },
+ ]
+ },
+ url: {
+ add: "/li/quanlityConfirm/add",
+ edit: "/li/quanlityConfirm/edit",
+ queryById: "/li/quanlityConfirm/queryById"
+ }
+ }
+ },
+ computed: {
+ formDisabled(){
+ return this.disabled
+ },
+ },
+ created () {
+ //澶囦唤model鍘熷鍊�
+ this.modelDefault = JSON.parse(JSON.stringify(this.model));
+ },
+ methods: {
+ add () {
+ this.edit(this.modelDefault);
+ },
+ edit (record) {
+ this.model = Object.assign({}, record);
+ this.visible = true;
+ },
+ submitForm () {
+ const that = this;
+ // 瑙﹀彂琛ㄥ崟楠岃瘉
+ this.$refs.form.validate(valid => {
+ if (valid) {
+ that.confirmLoading = true;
+ let httpurl = '';
+ let method = '';
+ if(!this.model.id){
+ httpurl+=this.url.add;
+ method = 'post';
+ }else{
+ httpurl+=this.url.edit;
+ this.model.isConfirm = "yes";
+ method = 'put';
+ }
+ httpAction(httpurl,this.model,method).then((res)=>{
+ if(res.success){
+ that.$message.success(res.message);
+ that.$emit('ok');
+ }else{
+ that.$message.warning(res.message);
+ }
+ }).finally(() => {
+ that.confirmLoading = false;
+ })
+ }
+
+ })
+ },
+ }
+ }
+</script>
\ No newline at end of file
diff --git a/src/views/eam/modules/QuanlityConfirmModal.vue b/src/views/eam/modules/QuanlityConfirmModal.vue
new file mode 100644
index 0000000..6b178ca
--- /dev/null
+++ b/src/views/eam/modules/QuanlityConfirmModal.vue
@@ -0,0 +1,60 @@
+<template>
+ <j-modal
+ :title="title"
+ :width="width"
+ :visible="visible"
+ switchFullscreen
+ @ok="handleOk"
+ :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+ @cancel="handleCancel"
+ cancelText="鍏抽棴">
+ <quanlity-confirm-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></quanlity-confirm-form>
+ </j-modal>
+</template>
+
+<script>
+
+ import QuanlityConfirmForm from './QuanlityConfirmForm'
+ export default {
+ name: 'QuanlityConfirmModal',
+ components: {
+ QuanlityConfirmForm
+ },
+ data () {
+ return {
+ title:'',
+ width:800,
+ visible: false,
+ disableSubmit: false
+ }
+ },
+ methods: {
+ add () {
+ this.visible=true
+ this.$nextTick(()=>{
+ this.$refs.realForm.add();
+ })
+ },
+ edit (record) {
+ this.visible=true
+ this.$nextTick(()=>{
+ this.$refs.realForm.edit(record);
+ })
+ },
+ close () {
+ this.$emit('close');
+ this.visible = false;
+ },
+ handleOk () {
+ this.$refs.realForm.submitForm();
+ },
+ submitCallback(){
+ this.$emit('ok');
+ this.visible = false;
+ },
+ handleCancel () {
+ this.close()
+ }
+ }
+ }
+</script>
\ No newline at end of file
diff --git a/src/views/eam/modules/daily3MaintenanceOrder/DailyMaintenanceOrderExeDrawer.vue b/src/views/eam/modules/daily3MaintenanceOrder/DailyMaintenanceOrderExeDrawer.vue
index ec52559..b08f403 100644
--- a/src/views/eam/modules/daily3MaintenanceOrder/DailyMaintenanceOrderExeDrawer.vue
+++ b/src/views/eam/modules/daily3MaintenanceOrder/DailyMaintenanceOrderExeDrawer.vue
@@ -17,21 +17,21 @@
@click="handleSW"
:disabled=SWbuttonDistable
type="primary"
- v-has="'dailyMaintenanceOrder:SW'"
+ v-has="'daily3MaintenanceOrder:SW'"
>寮�宸�</a-button>
<a-button
:style="{marginRight: '8px'}"
@click="handleReport"
:disabled="buttonDistable"
type="primary"
- v-has="'dailyMaintenanceOrder:report'"
+ v-has="'daily3MaintenanceOrder:report'"
>鎶ュ伐</a-button>
<a-button
:style="{marginRight: '8px'}"
@click="handleReset"
:disabled="revocationDistable"
type="primary"
- v-has="'dailyMaintenanceOrder:reset'"
+ v-has="'daily3MaintenanceOrder:reset'"
>鎾ら攢</a-button>
</a-row>
</div>
@@ -156,11 +156,11 @@
>
<div :key="col.dataIndex">
<span
- v-if=" col.dataIndex == 'photo' && !text"
+ v-show=" col.dataIndex == 'photo' && !text"
style="font-size: 12px;font-style: italic;"
>鏃犲浘鐗�</span>
<img
- v-if="col.dataIndex == 'photo' && text"
+ v-show="col.dataIndex == 'photo' && text"
:src="getImgView(text)"
:preview="record.maintenanceStandardDetailId"
height="25px"
@@ -194,8 +194,9 @@
<a-input
:value="text"
- v-if="col.dataIndex == 'maintenanceOrderDetailUda1'"
+ v-show="col.dataIndex == 'maintenanceOrderDetailUda1'"
@change="(e)=>handleChange(e, record.key, col, index)"
+ :disabled="record.disabled"
/>
</div>
</template>
@@ -395,12 +396,12 @@
dataIndex: 'location',
},
// class: "notshow"
- {
- title: '绀烘剰鍥�',
- align: 'center',
- dataIndex: 'photo',
- scopedSlots: { customRender: 'photo' },
- },
+ // {
+ // title: '绀烘剰鍥�',
+ // align: 'center',
+ // dataIndex: 'photo',
+ // scopedSlots: { customRender: 'photo' },
+ // },
// class: "notshow"
{
title: '淇濆吇椤圭洰',
@@ -544,6 +545,7 @@
onOk() {
requestPut(that.url.editStatus, { id: that.model.id, status: '4' }).then((res) => {
if (res.success) {
+ that.loadData1(1)
that.model.status = '4'
that.$message.success("宸ュ崟寮�宸ユ垚鍔燂紒")
that.buttonDistable = false
@@ -606,6 +608,7 @@
that.buttonDistable = false
that.revocationDistable = true
that.SWbuttonDistable = true
+ that.loadData1(1)
} else {
that.$message.warning(res.message)
}
diff --git a/src/views/eam/modules/daily3MaintenanceOrder/EquipmentPrecisionCheckOrderModal.vue b/src/views/eam/modules/daily3MaintenanceOrder/EquipmentPrecisionCheckOrderModal.vue
index 9c2cf43..627783b 100644
--- a/src/views/eam/modules/daily3MaintenanceOrder/EquipmentPrecisionCheckOrderModal.vue
+++ b/src/views/eam/modules/daily3MaintenanceOrder/EquipmentPrecisionCheckOrderModal.vue
@@ -180,19 +180,30 @@
</a-col>
</a-row>
</div>
- <div :style="{height: '115px',float: 'left',width: '10%',border: '1px solid #e9e9e9',padding: '50px 20px',background: '#fff',}">
+ <div :style="{height: '175px',float: 'left',width: '10%',border: '1px solid #e9e9e9',padding: '50px 20px',background: '#fff',}">
<span
class="ant-descriptions-title"
style="font-size: large;font-style: normal;font-size: 15px;"
>闆朵欢鐘舵��</span>
</div>
- <div :style="{height: '115px',float: 'right',width: '90%',border: '1px solid #e9e9e9',padding: '10px 10px',background: '#fff',}">
+ <div :style="{height: '175px',float: 'right',width: '90%',border: '1px solid #e9e9e9',padding: '10px 10px',background: '#fff',}">
+ <a-row :gutter="24">
+ <a-col :span="12">
+ <a-form-item
+ :labelCol="{ span: 8 }"
+ :wrapperCol="{ span: 12 }"
+ label="妫�娴嬭皟璇曞悗璇曞姞宸ラ浂浠跺彿锛�"
+ >
+ <a-input v-model="model.sparePart" />
+ </a-form-item>
+ </a-col>
+ </a-row>
<a-row :gutter="24">
<a-col :span="12">
<a-form-item
:labelCol="{ span: 8 }"
:wrapperCol="{ span: 4 }"
- label="妫�娴嬭皟璇曞悗璇曞姞宸ラ浂浠跺彿锛�"
+ label="闆朵欢鍔犲伐锛�"
>
<a-switch
checked-children="鍚堟牸"
@@ -301,8 +312,9 @@
@click="handleOk()"
type="primary"
:loading="confirmLoading"
- :disabled="disableSubmit || confirmLoading"
+ :disabled="this.model.precisionInspectionStatus == '5'"
>纭畾</a-button>
+
</template>
</a-modal>
@@ -426,9 +438,19 @@
},
handleOk() {
-
+ // if (this.model.precisionInspectionStatus === '2') {
+ // if ((this.model.eachTolerance === "0" || this.model.eachTolerance === 0) && (this.model.partTolerance === "0" || this.model.partTolerance === 0)) {
+ // this.$message.warning("璇峰绮惧害鐘舵�佺粨鏋滃嬀閫夛紒");
+ // return
+ // }
+ // }
+ // if (this.model.precisionInspectionStatus === '3') {
+ // if ((this.model.processPass === "0" || this.model.processPass === 0) && (this.model.meetProcessRequire === "0" || this.model.meetProcessRequire === 0)) {
+ // this.$message.warning("璇峰闆朵欢鐘舵�佺粨鏋滃嬀閫夛紒");
+ // return
+ // }
+ // }
const that = this;
- // 瑙﹀彂琛ㄥ崟楠岃瘉
that.form.validateFields((err, values) => {
if (!err) {
this.$confirm({
@@ -508,6 +530,7 @@
onChangeJudgmentResult(e) {
this.model.judgmentResult = e.target.value
+ this.model = Object.assign({}, this.model);
},
handleChange(value, key, column, index) {
diff --git a/src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderExeDrawer.vue b/src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderExeDrawer.vue
index 5658db1..19dafbd 100644
--- a/src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderExeDrawer.vue
+++ b/src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderExeDrawer.vue
@@ -28,6 +28,13 @@
>鎶ュ伐</a-button>
<a-button
:style="{marginRight: '8px'}"
+ @click="handleNormalReport"
+ :disabled="buttonDistable"
+ type="primary"
+ v-has="'dailyInspectionOrder:normalReport'"
+ >缁撴灉姝ｅ父骞舵姤宸�</a-button>
+ <a-button
+ :style="{marginRight: '8px'}"
@click="handleReset"
:disabled="revocationDistable"
type="primary"
@@ -41,7 +48,7 @@
<a-form-item
:labelCol="labelCol"
:wrapperCol="wrapperCol"
- label="璁惧缂栫爜"
+ label="缁熶竴缂栫爜"
class="hightColor"
>
<span
@@ -129,8 +136,8 @@
:pagination="ipagination"
:loading="loading"
@change="handleTableChange"
- :scroll="{ x: 'calc(1000px + 50%)', y: 900 }"
>
+ <!-- :scroll="{ x: 'calc(1000px + 50%)', y: 900 }" -->
<template
v-for="col in columns"
:slot="col.dataIndex"
@@ -150,7 +157,7 @@
style="max-width:80px;font-size: 12px;font-style: italic;"
/>
<a-select
- v-if="col.dataIndex == 'inspectionProjectResult' && record.testValueType == '2'"
+ v-if="col.dataIndex == 'inspectionProjectResult' "
:value="text"
@change="(e) => handleChange(e, record.key, col, index)"
style="width: 100%"
@@ -162,7 +169,7 @@
<a-select-option value="3">鏁呴殰鍋滄満</a-select-option>
<a-select-option value="4">娌″紑鏈�</a-select-option>
</a-select>
- <a-input-number
+ <!-- <a-input-number
:value="text"
v-if="col.dataIndex == 'inspectionProjectResult' && record.testValueType == '1'"
:min="0"
@@ -170,7 +177,7 @@
@change="(e)=>handleChange(e, record.key, col, index,record)"
style="width: 100%"
:disabled="record.disabled"
- />
+ /> -->
<a-textarea
:value="text"
v-if="col.dataIndex == 'abnormalDesc'"
@@ -311,7 +318,7 @@
},
data() {
return {
- title: "鏃ュ父鐐规宸ュ崟鎵ц",
+ title: "鑷富缁存姢鐐规鎵ц",
visible: false,
maskClosable: true,
confirmLoading: false,
@@ -340,18 +347,18 @@
},
width: 50,
},
- {
- title: '閮ㄤ綅',
- align: 'center',
- dataIndex: 'location',
- },
- // class: "notshow"
- {
- title: '绀烘剰鍥�',
- align: 'center',
- dataIndex: 'photo',
- scopedSlots: { customRender: 'photo' },
- },
+ // {
+ // title: '閮ㄤ綅',
+ // align: 'center',
+ // dataIndex: 'location',
+ // },
+ // // class: "notshow"
+ // {
+ // title: '绀烘剰鍥�',
+ // align: 'center',
+ // dataIndex: 'photo',
+ // scopedSlots: { customRender: 'photo' },
+ // },
// class: "notshow"
{
title: '鐐规椤圭洰',
@@ -385,24 +392,25 @@
scopedSlots: { customRender: 'inspectionProjectResult' },
},
// className: 'red',
+ // {
+ // title: '鍒ゅ畾',
+ // align: 'center',
+ // dataIndex: 'judgmentResult',
+ // customRender: (text) => {
+ // if (text == 'pass') {
+ // return "姝ｅ父";
+ // } else if (text == 'fail') {
+ // return "寮傚父";
+ // }
+ // },
+ // },
{
- title: '鍒ゅ畾',
- align: 'center',
- dataIndex: 'judgmentResult',
- customRender: (text) => {
- if (text == 'pass') {
- return "姝ｅ父";
- } else if (text == 'fail') {
- return "寮傚父";
- }
- },
- },
- {
- title: '寮傚父鎻忚堪',
+ title: '*寮傚父鎻忚堪',
align: 'center',
dataIndex: 'abnormalDesc',
scopedSlots: { customRender: 'abnormalDesc' },
},
+ // className: 'red',
// {
// title: '寮傚父鎷嶇収',
// align: 'center',
@@ -426,6 +434,7 @@
editStatus: "/eam/inspectionOrder/editStatus",
revocation: "/eam/inspectionOrder/revocation",
report: "/eam/inspectionOrder/report",
+ normalReport: "/eam/inspectionOrder/normalReport",
},
}
},
@@ -561,14 +570,21 @@
for (let i = 0; i < that.dataSource.length; i++) {
let o = this.dataSource[i]
if (o.inspectionProjectResult == null || o.inspectionProjectResult == '') {
- that.$message.warning('璇疯緭鍏ョ偣妫�缁撴灉锛�')
+ that.$message.warning("璇峰～鍐欑" + (i + 1) + "鐐规缁撴灉锛�");
that.confirmLoading = false;
return
}
- if (o.treatmentMeasure == null || o.treatmentMeasure == '') {
- that.$message.warning('璇烽�夋嫨寮傚父澶勭疆锛�')
- that.confirmLoading = false;
- return
+ if (o.inspectionProjectResult == '2' || o.inspectionProjectResult == '3') {
+ if (o.abnormalDesc == null || o.abnormalDesc == '') {
+ that.$message.warning("璇峰～鍐欑" + (i + 1) + "寮傚父鎻忚堪锛�");
+ that.confirmLoading = false;
+ return
+ }
+ if (o.treatmentMeasure == null || o.treatmentMeasure == '') {
+ that.$message.warning("璇峰～鍐欑" + (i + 1) + "寮傚父澶勭疆锛�");
+ that.confirmLoading = false;
+ return
+ }
}
}
formData.inspectionOrderDetailList = that.dataSource;
@@ -602,6 +618,43 @@
})
},
+ //鎶ュ伐
+ handleNormalReport() {
+ const that = this;
+ that.confirmLoading = true;
+ let formData = Object.assign(this.model);
+ formData.inspectionOrderDetailList = that.dataSource;
+ formData.id = that.model.id;
+ formData.status = "5";
+ formData.equipmentId = that.model.equipmentId;
+ this.$confirm({
+ title: '鐐规宸ュ崟鎶ュ伐',
+ content: '鎻愮ず锛氱偣妫�缁撴灉鍏ㄩ儴姝ｅ父锛屾姤宸ュ悗鐐规宸ュ崟瀹屽伐锛岃璋ㄦ厧鎿嶄綔锛�',
+ okText: '纭',
+ cancelText: '鍙栨秷',
+ onOk() {
+ requestPut(that.url.normalReport, formData).then((res) => {
+ if (res.success) {
+ that.model.status = '5'
+ that.$message.success(res.message)
+ that.buttonDistable = false
+ that.revocationDistable = true
+ that.SWbuttonDistable = true
+ that.$emit('ok');
+ that.alterFlag = new Date();
+ that.close();
+ } else {
+ that.$message.warning(res.message)
+ }
+ }).finally(() => {
+ that.confirmLoading = false;
+ //
+ })
+ },
+ })
+ },
+
+
//淇濆瓨
handleOk() {
const that = this;
@@ -610,14 +663,21 @@
for (let i = 0; i < that.dataSource.length; i++) {
let o = this.dataSource[i]
if (o.inspectionProjectResult == null || o.inspectionProjectResult == '') {
- that.$message.warning('璇疯緭鍏ョ偣妫�缁撴灉锛�')
+ that.$message.warning("璇峰～鍐欑" + (i + 1) + "鐐规缁撴灉锛�");
that.confirmLoading = false;
return
}
- if (o.treatmentMeasure == null || o.treatmentMeasure == '') {
- that.$message.warning('璇烽�夋嫨寮傚父澶勭疆锛�')
- that.confirmLoading = false;
- return
+ if (o.inspectionProjectResult == '2' || o.inspectionProjectResult == '3') {
+ if (o.abnormalDesc == null || o.abnormalDesc == '') {
+ that.$message.warning("璇峰～鍐欑" + (i + 1) + "寮傚父鎻忚堪锛�");
+ that.confirmLoading = false;
+ return
+ }
+ if (o.treatmentMeasure == null || o.treatmentMeasure == '') {
+ that.$message.warning("璇峰～鍐欑" + (i + 1) + "寮傚父澶勭疆锛�");
+ that.confirmLoading = false;
+ return
+ }
}
}
formData.inspectionOrderDetails = that.dataSource
@@ -671,29 +731,29 @@
if (target) {
if (column.dataIndex == 'inspectionProjectResult') {
- if (target.testValueType === "1") {
- target[column.dataIndex] = value;
- let maxValue = target.maxValue
- let minValue = target.minValue
- if (value > minValue && value < maxValue) {
- target['judgmentResult'] = "pass";
- } else {
- target['judgmentResult'] = "fail";
- }
- if (value == null || value == "") {
- target['judgmentResult'] = "";
- }
- } else {
- target[column.dataIndex] = value;
- if (value == "1") {
- target['judgmentResult'] = "pass";
- } else {
- target['judgmentResult'] = "fail";
- }
- if (value == null || value == "") {
- target['judgmentResult'] = "";
- }
- }
+ // if (target.testValueType === "1") {
+ // target[column.dataIndex] = value;
+ // let maxValue = target.maxValue
+ // let minValue = target.minValue
+ // if (value > minValue && value < maxValue) {
+ // target['judgmentResult'] = "pass";
+ // } else {
+ // target['judgmentResult'] = "fail";
+ // }
+ // if (value == null || value == "") {
+ // target['judgmentResult'] = "";
+ // }
+ // } else {
+ target[column.dataIndex] = value;
+ // if (value == "1") {
+ // target['judgmentResult'] = "pass";
+ // } else {
+ // target['judgmentResult'] = "fail";
+ // }
+ // if (value == null || value == "") {
+ // target['judgmentResult'] = "";
+ // }
+ // }
}
if (column.dataIndex == 'abnormalDesc') {
target[column.dataIndex] = value.target.value;
@@ -737,43 +797,7 @@
})
},
- getSrc(record) {
- if (!record.path) {
- return '';
- }
- //鏈湴锛歭ocal\Minio锛歮inio\闃块噷浜戯細alioss
- if (record.uploadType == 'local') {
- let ssoLoginFlag = Vue.ls.get("ssoLoginFlag");
- let deployMode = Vue.ls.get("deployMode");
-
- if (ssoLoginFlag && deployMode == "container") {
- var baseProject = Vue.ls.get("baseProject");
- console.log("baseProject==>" + baseProject)
-
- var hostname = window.location.protocol + "//" + window.location.host;
- var url = hostname + '/' + baseProject + '/sys/common/static';
- return getFileAccessHttpUrl(record.path + record.encodeName, url, window._CONFIG['hyperTextTransfer'])
- } else {
- //鏍规嵁鍙戝竷鐘舵�佷慨鏀筯ttps 鎴� http
- return getFileAccessHttpUrl(record.path + record.encodeName, this.url.urlDownload, window._CONFIG['hyperTextTransfer'])
- }
-
- } else if (record.uploadType == 'alioss') {
-
- const OSS = require('ali-oss')
- const client = new OSS({
- // region浠ユ澀宸炰负渚嬶紙oss-cn-hangzhou锛夛紝鍏朵粬region鎸夊疄闄呮儏鍐靛～鍐欍��
- region: window._CONFIG['region'],
- // 闃块噷浜戜富璐﹀彿AccessKey鎷ユ湁鎵�鏈堿PI鐨勮闂潈闄愶紝椋庨櫓寰堥珮銆傚己鐑堝缓璁偍鍒涘缓骞朵娇鐢≧AM璐﹀彿杩涜API璁块棶鎴栨棩甯歌繍缁达紝璇风櫥褰昍AM鎺у埗鍙板垱寤篟AM璐﹀彿銆�
- accessKeyId: window._CONFIG['accessKeyId'],
- accessKeySecret: window._CONFIG['accessKeySecret'],
- bucket: window._CONFIG['bucket'],
- })
- // object-key琛ㄧず浠嶰SS涓嬭浇鏂囦欢鏃堕渶瑕佹寚瀹氬寘鍚枃浠跺悗缂�鍦ㄥ唴鐨勫畬鏁磋矾寰勶紝渚嬪abc/efg/123.jpg銆�
- return client.signatureUrl(record.path)
- }
- },
},
}
@@ -796,7 +820,7 @@
.hight {
color: #f5222d;
}
-/deep/ .red {
+.red {
color: red;
}
</style>
\ No newline at end of file
diff --git a/src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderModal.vue b/src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderModal.vue
index ac7eaa1..c5a0bbc 100644
--- a/src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderModal.vue
+++ b/src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderModal.vue
@@ -378,11 +378,11 @@
},
width: 50,
},
- {
- title: '閮ㄤ綅',
- align: 'center',
- dataIndex: 'location'
- },
+ // {
+ // title: '閮ㄤ綅',
+ // align: 'center',
+ // dataIndex: 'location'
+ // },
{
title: '鐐规椤圭洰',
align: 'center',
@@ -408,12 +408,12 @@
// align: 'center',
// dataIndex: 'inspectionTool'
// },
- {
- title: '绀烘剰鍥�',
- align: "center",
- dataIndex: 'photo',
- scopedSlots: { customRender: 'photo' },
- },
+ // {
+ // title: '绀烘剰鍥�',
+ // align: "center",
+ // dataIndex: 'photo',
+ // scopedSlots: { customRender: 'photo' },
+ // },
],
title: "鎿嶄綔",
visible: false,
@@ -436,7 +436,7 @@
validatorRules: {
num: {
rules: [
- { required: true, message: '璇疯緭鍏ヨ澶囩紪鐮�!' },
+ { required: true, message: '璇疯緭鍏ョ粺涓�缂栫爜!' },
]
},
equipmentId: {
diff --git a/src/views/eam/modules/dailyInspectionOrder/DailyInspectionStandardList.vue b/src/views/eam/modules/dailyInspectionOrder/DailyInspectionStandardList.vue
index 71d9fd1..c013607 100644
--- a/src/views/eam/modules/dailyInspectionOrder/DailyInspectionStandardList.vue
+++ b/src/views/eam/modules/dailyInspectionOrder/DailyInspectionStandardList.vue
@@ -160,7 +160,7 @@
dataIndex: 'num',
},
{
- title: '璁惧缂栫爜',
+ title: '缁熶竴缂栫爜',
align: 'center',
dataIndex: 'equipmentNum',
},
@@ -180,7 +180,7 @@
dataIndex: 'equipmentSpecification'
},
{
- title: '瀵硅薄閮ㄩ棬',
+ title: '浣跨敤閮ㄩ棬',
align: "center",
dataIndex: 'useDepartName'
},
diff --git a/src/views/eam/modules/dailyInspectionStandard/AuditApprovalModal.vue b/src/views/eam/modules/dailyInspectionStandard/AuditApprovalModal.vue
new file mode 100644
index 0000000..8f89e78
--- /dev/null
+++ b/src/views/eam/modules/dailyInspectionStandard/AuditApprovalModal.vue
@@ -0,0 +1,260 @@
+<template>
+ <a-modal
+ :title='title'
+ :width="650"
+ :visible='visible'
+ :maskClosable='false'
+ cancelText='鍏抽棴'
+ @cancel='handleCancel'
+ :confirmLoading='confirmLoading'
+ >
+ <!-- @ok='handleOk' -->
+ <a-spin :spinning='confirmLoading'>
+ <a-form :form="form">
+ <a-row>
+ <a-col :span='24'>
+ <a-form-item
+ label='鏍囧噯缂栫爜'
+ :labelCol='labelCol'
+ :wrapperCol='wrapperCol'
+ >
+ <a-input
+ allow-clear
+ :disabled="true"
+ :placeholder="disableSubmit?'':'璇疯緭鍏ョ偣妫�鏍囧噯缂栫爜'"
+ v-decorator="['num', validatorRules.num ]"
+ />
+ </a-form-item>
+ </a-col>
+ <a-col
+ v-if="this.model.approvalStatus == '1' ||this.model.approvalStatus == '2'||this.model.approvalStatus == '4'"
+ :span='24'
+ >
+
+ <a-form-item
+ label="瀹℃牳鎰忚"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ >
+ <a-textarea
+ rows='3'
+ placeholder='璇疯緭鍏ュ鏍告剰瑙�'
+ v-decorator="['auditFeedback', validatorRules.auditFeedback ]"
+ ></a-textarea>
+ </a-form-item>
+ </a-col>
+ <a-col
+ v-if="this.model.approvalStatus == '3' "
+ :span='24'
+ >
+ <a-form-item
+ label="瀹℃壒鎰忚"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ >
+ <a-textarea
+ rows='3'
+ placeholder='璇疯緭鍏ュ鎵规剰瑙�'
+ v-decorator="['approvalFeedback', validatorRules.approvalFeedback ]"
+ ></a-textarea>
+ </a-form-item>
+ </a-col>
+ </a-row>
+ </a-form>
+ </a-spin>
+ <template slot='footer'>
+ <a-popconfirm
+ @confirm="() => handleReject()"
+ title="纭灏嗗綋鍓嶇偣妫�鏍囧噯椹冲洖锛�"
+ >
+ <a-button
+ :loading='confirmLoading'
+ :style="{marginRight: '8px'}"
+ >
+ 椹冲洖
+ </a-button>
+ </a-popconfirm>
+ <a-popconfirm
+ @confirm="() => handleOk()"
+ title="纭灏嗗綋鍓嶇偣妫�鏍囧噯瀹℃牳閫氳繃锛�"
+ >
+ <a-button
+ type='primary'
+ :loading='confirmLoading'
+ :style="{marginRight: '8px'}"
+ >
+ 閫氳繃
+ </a-button>
+ </a-popconfirm>
+ <!-- <a-button
+ @click='handleOk'
+ type='primary'
+ :loading='confirmLoading'
+ >閫氳繃
+ </a-button> -->
+ </template>
+ </a-modal>
+
+</template>
+
+<script>
+import { httpAction, requestPut, postAction } from '@/api/manage'
+import Tooltip from 'ant-design-vue/es/tooltip'
+import pick from 'lodash.pick'
+
+
+export default {
+ name: 'ApprovelModal',
+ components: {
+ Tooltip
+ },
+ data() {
+ return {
+ title: '鎿嶄綔',
+ visible: false,
+ disableSubmit: false,
+ model: {},
+ labelCol: {
+ xs: { span: 24 },
+ sm: { span: 5 }
+ },
+ wrapperCol: {
+ xs: { span: 24 },
+ sm: { span: 16 }
+ },
+ confirmLoading: false,
+ form: this.$form.createForm(this),
+ validatorRules: {
+ auditFeedback: {
+ rules: [
+ { required: true, message: '璇疯緭鍏ュ鏍告剰瑙�!' },
+ ]
+ },
+ approvalFeedback: {
+ rules: [
+ { required: true, message: '璇疯緭鍏ュ鎵规剰瑙�!' },
+ ]
+ },
+ },
+ url: {
+ auditApproval: "/eam/inspectionStandard/auditApproval",
+ },
+ }
+ },
+
+
+ methods: {
+ close() {
+ this.$emit('close')
+ this.visible = false
+ },
+
+ handleCancel() {
+ this.close()
+ },
+ showModals(record) {
+ this.form.resetFields();
+ this.model = Object.assign({}, record);
+ this.visible = true;
+ this.$nextTick(() => {
+ this.form.setFieldsValue(pick(this.model, 'num', 'auditFeedback', 'approvalFeedback'));
+ }, 200);
+ },
+
+
+
+ handleReject() {
+ const that = this;
+ this.form.validateFields((err, values) => {
+ if (!err) {
+ that.confirmLoading = true;
+ let formData = Object.assign(this.model, values);
+ if (this.model.approvalStatus == '1') {
+ formData.approvalStatus = '2'
+ } else if (this.model.approvalStatus == '3') {
+ formData.approvalStatus = '4'
+ } else if (this.model.approvalStatus == '4') {
+ formData.approvalStatus = '2'
+ }
+ requestPut(this.url.auditApproval, formData, { id: this.model.id }).then((res) => {
+ if (res.success) {
+ that.$message.success(res.message);
+ that.$emit('ok');
+ } else {
+ that.$message.warning(res.message);
+ }
+ }).finally(() => {
+ that.confirmLoading = false;
+ that.close();
+ })
+ }
+ })
+ },
+
+
+ handleOk() {
+ const that = this;
+ that.form.validateFields((err, values) => {
+ if (!err) {
+ this.confirmLoading = true;
+ let formData = Object.assign(this.model, values);
+ if (this.model.approvalStatus == '1') {
+ formData.approvalStatus = '3'
+ } else if (this.model.approvalStatus == '2') {
+ formData.approvalStatus = '3'
+ } else if (this.model.approvalStatus == '3') {
+ formData.approvalStatus = '5'
+ } else if (this.model.approvalStatus == '4') {
+ formData.approvalStatus = '3'
+ }
+ requestPut(this.url.auditApproval, formData, { id: this.model.id }).then((res) => {
+ if (res.success) {
+ that.$message.success(res.message);
+ that.$emit('ok');
+ } else {
+ that.$message.warning(res.message);
+ }
+ }).finally(() => {
+ that.confirmLoading = false;
+ that.close();
+ })
+ }
+ })
+ },
+ }
+
+}
+</script>
+
+<style lang='less' scoped>
+/deep/ .frozenRowClass {
+ color: #c9c9c9;
+}
+
+.fontweight {
+ font-weight: bold;
+}
+
+.ant-btn {
+ padding: 0 10px;
+ margin-left: 3px;
+}
+
+.ant-form-item-control {
+ line-height: 0px;
+}
+
+/** 涓昏〃鍗曡闂磋窛 */
+.ant-form .ant-form-item {
+ margin-bottom: 10px;
+}
+
+/** Tab椤甸潰琛岄棿璺� */
+.ant-tabs-content .ant-form-item {
+ margin-bottom: 0px;
+}
+
+/deep/ .ant-modal-title {
+ text-align: center;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/eam/modules/dailyInspectionStandard/DailylnspectionStandardModal.vue b/src/views/eam/modules/dailyInspectionStandard/DailylnspectionStandardModal.vue
index 991fb92..6126aad 100644
--- a/src/views/eam/modules/dailyInspectionStandard/DailylnspectionStandardModal.vue
+++ b/src/views/eam/modules/dailyInspectionStandard/DailylnspectionStandardModal.vue
@@ -37,7 +37,7 @@
>
<!-- <a-input-search
:disabled="disableSubmit"
- placeholder="璇烽�夋嫨瀵硅薄閮ㄩ棬"
+ placeholder="璇烽�夋嫨浣跨敤閮ㄩ棬"
enter-button
@search="onDepartList()"
:read-only="true"
@@ -108,21 +108,21 @@
<a-input
allow-clear
:disabled="true"
- :placeholder="disableSubmit?'':'璇疯緭鍏ヨ澶囩紪鐮�/鍚嶇О/鍨嬪彿'"
+ :placeholder="disableSubmit?'':'璇疯緭鍏ョ粺涓�缂栫爜/鍚嶇О/鍨嬪彿'"
v-decorator="['equipmentId', validatorRules.equipmentId ]"
/>
</a-form-item>
</a-col>
<!-- <a-col :span="12">
<a-form-item
- label="瀵硅薄閮ㄩ棬Id"
+ label="浣跨敤閮ㄩ棬Id"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
>
<a-input
allow-clear
:disabled="true"
- :placeholder="disableSubmit?'':'璇疯緭鍏ュ璞￠儴闂╥d'"
+ :placeholder="disableSubmit?'':'璇疯緭鍏ヤ娇鐢ㄩ儴闂╥d'"
v-decorator="['useId', validatorRules.useId ]"
/>
</a-form-item>
@@ -475,7 +475,7 @@
edit(record) {
let that = this;
that.getInspectionCycle()
- that.initOptions();
+ // that.initOptions();
that.dataSource = [];
that.form.resetFields();
that.model = Object.assign({}, record);
@@ -536,7 +536,7 @@
onDepartList() {
this.$refs.DepartList.list();
- this.$refs.DepartList.title = "閫夋嫨瀵硅薄閮ㄩ棬";
+ this.$refs.DepartList.title = "閫夋嫨浣跨敤閮ㄩ棬";
},
sendDepartRecord(data) {
this.dataSource = [];
@@ -563,10 +563,12 @@
let obj;
if (!this.model.id) {
formData.versionStatus = '1'
+ formData.approvalStatus = '1'
obj = postAction(this.url.add, formData);
} else {
if (this.isRevise) {
formData.versionStatus = '1'
+ formData.approvalStatus = '1'
obj = postAction(this.url.revise, formData);
} else {
obj = requestPut(this.url.edit, formData, { id: this.model.id });
diff --git a/src/views/eam/modules/dailyMaintenanceOrder/DailyMaintenanceOrderExeDrawer.vue b/src/views/eam/modules/dailyMaintenanceOrder/DailyMaintenanceOrderExeDrawer.vue
index bacf158..277863d 100644
--- a/src/views/eam/modules/dailyMaintenanceOrder/DailyMaintenanceOrderExeDrawer.vue
+++ b/src/views/eam/modules/dailyMaintenanceOrder/DailyMaintenanceOrderExeDrawer.vue
@@ -197,12 +197,22 @@
v-if="col.dataIndex == 'maintenanceOrderDetailUda1'"
@change="(e)=>handleChange(e, record.key, col, index)"
placeholder="璇疯緭鍏ヤ繚鍏讳汉"
+ :disabled="record.disabled"
/>
- <a-input
+ <!-- <a-input
:value="text"
v-if="col.dataIndex == 'maintenanceOrderDetailUda2'"
@change="(e)=>handleChange(e, record.key, col, index)"
placeholder="璇疯緭鍏ユ墽琛屾儏鍐�"
+ /> -->
+ <a-textarea
+ :value="text"
+ v-if="col.dataIndex == 'maintenanceOrderDetailUda2'"
+ :maxLength="500"
+ auto-size
+ placeholder="璇疯緭鍏ユ墽琛屾儏鍐�"
+ @change="(e)=>handleChange(e, record.key, col, index)"
+ :disabled="record.disabled"
/>
</div>
</template>
@@ -401,12 +411,12 @@
dataIndex: 'location',
},
// class: "notshow"
- {
- title: '绀烘剰鍥�',
- align: 'center',
- dataIndex: 'photo',
- scopedSlots: { customRender: 'photo' },
- },
+ // {
+ // title: '绀烘剰鍥�',
+ // align: 'center',
+ // dataIndex: 'photo',
+ // scopedSlots: { customRender: 'photo' },
+ // },
// class: "notshow"
{
title: '淇濆吇椤圭洰',
@@ -562,6 +572,7 @@
that.buttonDistable = false
that.revocationDistable = true
that.SWbuttonDistable = true
+ that.loadData1(1)
} else {
that.$message.warning("宸ュ崟寮�宸ュけ璐ワ紒")
}
@@ -619,6 +630,7 @@
that.buttonDistable = false
that.revocationDistable = true
that.SWbuttonDistable = true
+ that.loadData1(1)
} else {
that.$message.warning(res.message)
}
@@ -657,7 +669,6 @@
handleChange(value, key, column, index) {
- debugger
let that = this;
const temp = [...that.dataSource];
const target = temp[index];
diff --git a/src/views/eam/modules/dailyMaintenanceOrder/FinishDevolutionModal.vue b/src/views/eam/modules/dailyMaintenanceOrder/FinishDevolutionModal.vue
index fb46035..ecea2ac 100644
--- a/src/views/eam/modules/dailyMaintenanceOrder/FinishDevolutionModal.vue
+++ b/src/views/eam/modules/dailyMaintenanceOrder/FinishDevolutionModal.vue
@@ -152,12 +152,39 @@
鍏抽棴
</a-button>
- <a-button
+ <!-- <a-button
@click="handleOk()"
type="primary"
:loading="confirmLoading"
:disabled="disableSubmit || confirmLoading"
- >纭畾</a-button>
+ >纭畾</a-button> -->
+ <a-popconfirm
+ @confirm="() => handleReject()"
+ title="纭灏嗗綋鍓嶄簩淇濆畬宸ョЩ浜ゅ崟椹冲洖锛�"
+ :disabled="this.model.confirmStatus == '0' || this.model.confirmStatus == '2'|| this.model.confirmStatus == '7'"
+ >
+ <a-button
+ :loading='confirmLoading'
+ :style="{marginRight: '8px'}"
+ :disabled="this.model.confirmStatus == '0' || this.model.confirmStatus == '2'|| this.model.confirmStatus == '7'"
+ >
+ 椹冲洖
+ </a-button>
+ </a-popconfirm>
+ <a-popconfirm
+ @confirm="() => handleOk()"
+ title="纭灏嗗綋鍓嶄簩淇濆畬宸ョЩ浜ゅ崟瀹℃牳閫氳繃锛�"
+ :disabled="this.model.confirmStatus == '7'"
+ >
+ <a-button
+ type='primary'
+ :loading='confirmLoading'
+ :style="{marginRight: '8px'}"
+ :disabled="this.model.confirmStatus == '7'"
+ >
+ 閫氳繃
+ </a-button>
+ </a-popconfirm>
</template>
</a-modal>
@@ -294,12 +321,24 @@
this.close();
},
- handleOk() {
+
+ handleReject() {
const that = this;
this.form.validateFields((err, values) => {
if (!err) {
that.confirmLoading = true;
let formData = Object.assign(this.model, values);
+ if (this.model.confirmStatus == '1') {
+ formData.confirmStatus = '2'
+ } else if (this.model.confirmStatus == '3') {
+ formData.confirmStatus = '4'
+ } else if (this.model.confirmStatus == '5') {
+ formData.confirmStatus = '6'
+ } else if (this.model.confirmStatus == '6') {
+ formData.confirmStatus = '4'
+ } else if (this.model.confirmStatus == '4') {
+ formData.confirmStatus = '2'
+ }
requestPut(this.url.edit, formData, { id: this.model.id }).then((res) => {
if (res.success) {
that.$message.success(res.message);
@@ -315,6 +354,65 @@
})
},
+
+ handleOk() {
+ const that = this;
+ that.form.validateFields((err, values) => {
+ if (!err) {
+ this.confirmLoading = true;
+ let formData = Object.assign(this.model, values);
+ if (this.model.confirmStatus == '0') {
+ formData.confirmStatus = '1'
+ } else if (this.model.confirmStatus == '2') {
+ formData.confirmStatus = '1'
+ } else if (this.model.confirmStatus == '1') {
+ formData.confirmStatus = '3'
+ } else if (this.model.confirmStatus == '4') {
+ formData.confirmStatus = '3'
+ } else if (this.model.confirmStatus == '3') {
+ formData.confirmStatus = '5'
+ } else if (this.model.confirmStatus == '6') {
+ formData.confirmStatus = '5'
+ } else if (this.model.confirmStatus == '5') {
+ formData.confirmStatus = '7'
+ }
+ requestPut(this.url.edit, formData, { id: this.model.id }).then((res) => {
+ if (res.success) {
+ that.$message.success(res.message);
+ that.$emit('ok');
+ } else {
+ that.$message.warning(res.message);
+ }
+ }).finally(() => {
+ that.confirmLoading = false;
+ that.close();
+ })
+ }
+ })
+ },
+
+
+ // handleOk() {
+ // const that = this;
+ // this.form.validateFields((err, values) => {
+ // if (!err) {
+ // that.confirmLoading = true;
+ // let formData = Object.assign(this.model, values);
+ // requestPut(this.url.edit, formData, { id: this.model.id }).then((res) => {
+ // if (res.success) {
+ // that.$message.success(res.message);
+ // that.$emit('ok');
+ // } else {
+ // that.$message.warning(res.message);
+ // }
+ // }).finally(() => {
+ // that.confirmLoading = false;
+ // that.close();
+ // })
+ // }
+ // })
+ // },
+
handleDelete(text, record, index) {
this.dataSource.splice(index, 1);
},
diff --git a/src/views/eam/modules/dailyMaintenanceOrder/MaintenanceOrderAssignModal.vue b/src/views/eam/modules/dailyMaintenanceOrder/MaintenanceOrderAssignModal.vue
index d8bdcc7..fdca8ae 100644
--- a/src/views/eam/modules/dailyMaintenanceOrder/MaintenanceOrderAssignModal.vue
+++ b/src/views/eam/modules/dailyMaintenanceOrder/MaintenanceOrderAssignModal.vue
@@ -268,7 +268,7 @@
// dataIndex: 'num',
// },
// {
- // title: '瀵硅薄閮ㄩ棬',
+ // title: '浣跨敤閮ㄩ棬',
// align: 'center',
// dataIndex: 'departName',
// },
diff --git a/src/views/eam/modules/dailyMaintenanceOrder/MaintenanceOrderModal.vue b/src/views/eam/modules/dailyMaintenanceOrder/MaintenanceOrderModal.vue
index 59a3e8a..968d2a2 100644
--- a/src/views/eam/modules/dailyMaintenanceOrder/MaintenanceOrderModal.vue
+++ b/src/views/eam/modules/dailyMaintenanceOrder/MaintenanceOrderModal.vue
@@ -112,7 +112,7 @@
<a-input
allow-clear
:disabled="true"
- :placeholder="disableSubmit?'':'璇疯緭鍏ヨ澶囩紪鐮�/鍚嶇О/鍨嬪彿'"
+ :placeholder="disableSubmit?'':'璇疯緭鍏ョ粺涓�缂栫爜/鍚嶇О/鍨嬪彿'"
v-decorator="['equipmentId', validatorRules.equipmentId ]"
/>
</a-form-item>
@@ -449,12 +449,12 @@
// align: 'center',
// dataIndex: 'maintenanceTool'
// },
- {
- title: '绀烘剰鍥�',
- align: 'center',
- dataIndex: 'photo',
- scopedSlots: { customRender: 'photo' }
- },
+ // {
+ // title: '绀烘剰鍥�',
+ // align: 'center',
+ // dataIndex: 'photo',
+ // scopedSlots: { customRender: 'photo' }
+ // },
// {
// title: '缁翠繚涓撲笟',
// align: 'center',
@@ -488,7 +488,7 @@
},
useId: {
rules: [
- { required: true, message: '璇烽�夋嫨瀵硅薄閮ㄩ棬!' },
+ { required: true, message: '璇烽�夋嫨浣跨敤閮ㄩ棬!' },
]
},
maintenanceCycleId: {
@@ -637,7 +637,7 @@
onSearchMaintenanceStandard() {
let data = this.form.getFieldsValue(['useId']);
if (data.useId == null || data.useId == "") {
- this.$message.warning("璇峰厛閫夋嫨瀵硅薄閮ㄩ棬!");
+ this.$message.warning("璇峰厛閫夋嫨浣跨敤閮ㄩ棬!");
return
}
this.$refs.DailyMaintenanceStandardList.list(data.useId);
diff --git a/src/views/eam/modules/dailyMaintenanceStandard/AuditApprovalModal.vue b/src/views/eam/modules/dailyMaintenanceStandard/AuditApprovalModal.vue
new file mode 100644
index 0000000..e629313
--- /dev/null
+++ b/src/views/eam/modules/dailyMaintenanceStandard/AuditApprovalModal.vue
@@ -0,0 +1,254 @@
+<template>
+ <a-modal
+ :title='title'
+ :width="650"
+ :visible='visible'
+ :maskClosable='false'
+ cancelText='鍏抽棴'
+ @cancel='handleCancel'
+ :confirmLoading='confirmLoading'
+ >
+ <!-- @ok='handleOk' -->
+ <a-spin :spinning='confirmLoading'>
+ <a-form :form="form">
+ <a-row>
+ <a-col :span='24'>
+ <a-form-item
+ label='鏍囧噯缂栫爜'
+ :labelCol='labelCol'
+ :wrapperCol='wrapperCol'
+ >
+ <a-input
+ allow-clear
+ :disabled="true"
+ :placeholder="disableSubmit?'':'璇疯緭鍏ヤ繚鍏绘爣鍑嗙紪鐮�'"
+ v-decorator="['num', validatorRules.num ]"
+ />
+ </a-form-item>
+ </a-col>
+ <a-col
+ v-if="this.model.approvalStatus == '1' ||this.model.approvalStatus == '2'||this.model.approvalStatus == '4'"
+ :span='24'
+ >
+
+ <a-form-item
+ label="瀹℃牳鎰忚"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ >
+ <a-textarea
+ rows='3'
+ placeholder='璇疯緭鍏ュ鏍告剰瑙�'
+ v-decorator="['auditFeedback', validatorRules.auditFeedback ]"
+ ></a-textarea>
+ </a-form-item>
+ </a-col>
+ <a-col
+ v-if="this.model.approvalStatus == '3' "
+ :span='24'
+ >
+ <a-form-item
+ label="瀹℃壒鎰忚"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ >
+ <a-textarea
+ rows='3'
+ placeholder='璇疯緭鍏ュ鎵规剰瑙�'
+ v-decorator="['approvalFeedback', validatorRules.approvalFeedback ]"
+ ></a-textarea>
+ </a-form-item>
+ </a-col>
+ </a-row>
+ </a-form>
+ </a-spin>
+ <template slot='footer'>
+ <a-popconfirm
+ @confirm="() => handleReject()"
+ title="纭灏嗗綋鍓嶄繚鍏绘爣鍑嗛┏鍥烇紵"
+ >
+ <a-button
+ :loading='confirmLoading'
+ :style="{marginRight: '8px'}"
+ >
+ 椹冲洖
+ </a-button>
+ </a-popconfirm>
+ <a-popconfirm
+ @confirm="() => handleOk()"
+ title="纭灏嗗綋鍓嶄繚鍏绘爣鍑嗗鏍搁�氳繃锛�"
+ >
+ <a-button
+ type='primary'
+ :loading='confirmLoading'
+ :style="{marginRight: '8px'}"
+ >
+ 閫氳繃
+ </a-button>
+ </a-popconfirm>
+ </template>
+ </a-modal>
+
+</template>
+
+<script>
+import { httpAction, requestPut, postAction } from '@/api/manage'
+import Tooltip from 'ant-design-vue/es/tooltip'
+import pick from 'lodash.pick'
+
+
+export default {
+ name: 'ApprovelModal',
+ components: {
+ Tooltip
+ },
+ data() {
+ return {
+ title: '鎿嶄綔',
+ visible: false,
+ disableSubmit: false,
+ model: {},
+ labelCol: {
+ xs: { span: 24 },
+ sm: { span: 5 }
+ },
+ wrapperCol: {
+ xs: { span: 24 },
+ sm: { span: 16 }
+ },
+ confirmLoading: false,
+ form: this.$form.createForm(this),
+ validatorRules: {
+ auditFeedback: {
+ rules: [
+ { required: true, message: '璇疯緭鍏ュ鏍告剰瑙�!' },
+ ]
+ },
+ approvalFeedback: {
+ rules: [
+ { required: true, message: '璇疯緭鍏ュ鎵规剰瑙�!' },
+ ]
+ },
+ },
+ url: {
+ auditApproval: "/eam/maintenanceStandard/auditApproval",
+ },
+ }
+ },
+
+
+ methods: {
+ close() {
+ this.$emit('close')
+ this.visible = false
+ },
+
+ handleCancel() {
+ this.close()
+ },
+ showModals(record) {
+ this.form.resetFields();
+ this.model = Object.assign({}, record);
+ this.visible = true;
+ this.$nextTick(() => {
+ this.form.setFieldsValue(pick(this.model, 'num', 'auditFeedback', 'approvalFeedback'));
+ }, 200);
+ },
+
+
+
+ handleReject() {
+ const that = this;
+ this.form.validateFields((err, values) => {
+ if (!err) {
+ that.confirmLoading = true;
+ let formData = Object.assign(this.model, values);
+ if (this.model.approvalStatus == '1') {
+ formData.approvalStatus = '2'
+ } else if (this.model.approvalStatus == '3') {
+ formData.approvalStatus = '4'
+ } else if (this.model.approvalStatus == '4') {
+ formData.approvalStatus = '2'
+ }
+ requestPut(this.url.auditApproval, formData, { id: this.model.id }).then((res) => {
+ if (res.success) {
+ that.$message.success(res.message);
+ that.$emit('ok');
+ } else {
+ that.$message.warning(res.message);
+ }
+ }).finally(() => {
+ that.confirmLoading = false;
+ that.close();
+ })
+ }
+ })
+ },
+
+
+ handleOk() {
+ const that = this;
+ that.form.validateFields((err, values) => {
+ if (!err) {
+ this.confirmLoading = true;
+ let formData = Object.assign(this.model, values);
+ if (this.model.approvalStatus == '1') {
+ formData.approvalStatus = '3'
+ } else if (this.model.approvalStatus == '2') {
+ formData.approvalStatus = '3'
+ } else if (this.model.approvalStatus == '3') {
+ formData.approvalStatus = '5'
+ } else if (this.model.approvalStatus == '4') {
+ formData.approvalStatus = '3'
+ }
+ requestPut(this.url.auditApproval, formData, { id: this.model.id }).then((res) => {
+ if (res.success) {
+ that.$message.success(res.message);
+ that.$emit('ok');
+ } else {
+ that.$message.warning(res.message);
+ }
+ }).finally(() => {
+ that.confirmLoading = false;
+ that.close();
+ })
+ }
+ })
+ },
+ }
+
+}
+</script>
+
+<style lang='less' scoped>
+/deep/ .frozenRowClass {
+ color: #c9c9c9;
+}
+
+.fontweight {
+ font-weight: bold;
+}
+
+.ant-btn {
+ padding: 0 10px;
+ margin-left: 3px;
+}
+
+.ant-form-item-control {
+ line-height: 0px;
+}
+
+/** 涓昏〃鍗曡闂磋窛 */
+.ant-form .ant-form-item {
+ margin-bottom: 10px;
+}
+
+/** Tab椤甸潰琛岄棿璺� */
+.ant-tabs-content .ant-form-item {
+ margin-bottom: 0px;
+}
+
+/deep/ .ant-modal-title {
+ text-align: center;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/eam/modules/dailyMaintenanceStandard/DailyMaintenanceStandardDetail.vue b/src/views/eam/modules/dailyMaintenanceStandard/DailyMaintenanceStandardDetail.vue
index f1bdb59..7059019 100644
--- a/src/views/eam/modules/dailyMaintenanceStandard/DailyMaintenanceStandardDetail.vue
+++ b/src/views/eam/modules/dailyMaintenanceStandard/DailyMaintenanceStandardDetail.vue
@@ -129,17 +129,13 @@
return parseInt(index) + 1;
}
},
- {
- title: '閮ㄤ綅',
- align: "center",
- dataIndex: 'location',
- },
- {
- title: '绀烘剰鍥�',
- align: "center",
- dataIndex: 'photo',
- scopedSlots: { customRender: 'photo' },
- },
+
+ // {
+ // title: '绀烘剰鍥�',
+ // align: "center",
+ // dataIndex: 'photo',
+ // scopedSlots: { customRender: 'photo' },
+ // },
{
title: '淇濆吇椤圭洰',
align: "center",
@@ -152,6 +148,11 @@
dataIndex: 'standard',
},
+ {
+ title: '閮ㄤ綅',
+ align: "center",
+ dataIndex: 'location',
+ },
// {
// title: '鏂规硶',
// align: "center",
@@ -163,16 +164,16 @@
// align: "center",
// dataIndex: 'maintenanceTool',
// },
- {
- title: '瀹夊叏瑕佹眰',
- align: "center",
- dataIndex: 'maintenanceRequire',
- },
- {
- title: '宸ユ椂瀹氶',
- align: "center",
- dataIndex: 'workingHourQuota',
- },
+ // {
+ // title: '瀹夊叏瑕佹眰',
+ // align: "center",
+ // dataIndex: 'maintenanceRequire',
+ // },
+ // {
+ // title: '宸ユ椂瀹氶',
+ // align: "center",
+ // dataIndex: 'workingHourQuota',
+ // },
{
title: '淇濆吇鍛ㄦ湡',
align: "center",
@@ -219,10 +220,10 @@
getAction(this.url.list, params).then((res) => {
if (res.success) {
this.dataSource = res.result.records || res.result;
- for (let i = 0; i < this.dataSource.length; i++) {
- let r = this.dataSource[i].upload;
- r.src = this.getSrc(this.dataSource[i].upload);
- }
+ // for (let i = 0; i < this.dataSource.length; i++) {
+ // let r = this.dataSource[i].upload;
+ // r.src = this.getSrc(this.dataSource[i].upload);
+ // }
if (res.result.total) {
this.ipagination.total = res.result.total;
} else {
diff --git a/src/views/eam/modules/dailyMaintenanceStandard/DailyMaintenanceStandardModal.vue b/src/views/eam/modules/dailyMaintenanceStandard/DailyMaintenanceStandardModal.vue
index 9107a54..117a24a 100644
--- a/src/views/eam/modules/dailyMaintenanceStandard/DailyMaintenanceStandardModal.vue
+++ b/src/views/eam/modules/dailyMaintenanceStandard/DailyMaintenanceStandardModal.vue
@@ -35,7 +35,7 @@
>
<!-- <a-input-search
:disabled="disableSubmit"
- placeholder="璇烽�夋嫨瀵硅薄閮ㄩ棬"
+ placeholder="璇烽�夋嫨浣跨敤閮ㄩ棬"
enter-button
@search="onDepartList()"
:read-only="true"
@@ -123,21 +123,21 @@
<a-input
allow-clear
:disabled="true"
- :placeholder="disableSubmit?'':'璇疯緭鍏ヨ澶囩紪鐮�/鍚嶇О/鍨嬪彿'"
+ :placeholder="disableSubmit?'':'璇疯緭鍏ョ粺涓�缂栫爜/鍚嶇О/鍨嬪彿'"
v-decorator="['equipmentId', validatorRules.equipmentId ]"
/>
</a-form-item>
</a-col>
<!-- <a-col :span="12">
<a-form-item
- label="瀵硅薄閮ㄩ棬Id"
+ label="浣跨敤閮ㄩ棬Id"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
>
<a-input
allow-clear
:disabled="true"
- :placeholder="disableSubmit?'':'璇疯緭鍏ュ璞￠儴闂╥d'"
+ :placeholder="disableSubmit?'':'璇疯緭鍏ヤ娇鐢ㄩ儴闂╥d'"
v-decorator="['departId', validatorRules.useId ]"
/>
</a-form-item>
@@ -227,14 +227,14 @@
<!-- <a-row :gutter="24">
<a-col :span="12">
<a-form-item
- label="瀵硅薄閮ㄩ棬"
+ label="浣跨敤閮ㄩ棬"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
>
<j-dict-select-tag
allow-clear
:disabled="disableSubmit"
- :placeholder="disableSubmit?'':'璇峰璞￠儴闂�'"
+ :placeholder="disableSubmit?'':'璇蜂娇鐢ㄩ儴闂�'"
:triggerChange="true"
dictCode="sys_depart,depart_name,id,version = '7' and del_flag!='1'"
v-decorator="['departId', validatorRules.departId]"
@@ -339,43 +339,6 @@
<a>鍒犻櫎</a>
</a-popconfirm>
</span>
-
- <!-- <span
- slot="photo"
- slot-scope="text,record"
- >
- <Tooltip
- placement="top"
- title="棰勮鍥剧墖"
- >
- <img
- v-if=" record.upload.path && (record.upload.format.toLowerCase()=='jpg'||record.upload.format.toLowerCase()=='bmp'||record.upload.format.toLowerCase()=='png'||record.upload.format.toLowerCase()=='jpeg'||record.upload.format.toLowerCase()=='gif')"
- width="30"
- height="14"
- border="1"
- draggable="false"
- preview="1"
- :preview-text="''"
- :src="record.upload.src"
- />
- </Tooltip>
- <a
- v-if="record.upload.path && record.upload.format.toLowerCase()=='pdf'"
- href="javascript:;"
- @click="view(record.upload)"
- >
- 棰勮
- </a>
-
- <a-divider
- v-if="record.upload.path && (record.upload.format.toLowerCase()=='jpg'||record.upload.format.toLowerCase()=='bmp'||record.upload.format.toLowerCase()=='png'||record.upload.format.toLowerCase()=='jpeg'||record.upload.format.toLowerCase()=='gif'||record.upload.format.toLowerCase()=='pdf')"
- type="vertical"
- />
- <a
- href="javascript:;"
- @click="handleUpload(record)"
- >涓婁紶</a>
- </span> -->
</a-table>
<template slot="footer">
<a-button
@@ -486,31 +449,31 @@
// align: 'center',
// dataIndex: 'maintenanceSpecialtyName'
// },
- {
- title: '瀹夊叏瑕佹眰',
- align: 'center',
- dataIndex: 'maintenanceRequire',
- scopedSlots: { customRender: 'maintenanceRequire' },
- width: 150,
- },
- {
- title: '宸ユ椂瀹氶',
- align: 'center',
- dataIndex: 'workingHourQuota'
- },
- {
- title: '绀烘剰鍥�',
- align: 'center',
- dataIndex: 'photo',
- scopedSlots: { customRender: 'photo' },
- width: 150,
- },
+ // {
+ // title: '瀹夊叏瑕佹眰',
+ // align: 'center',
+ // dataIndex: 'maintenanceRequire',
+ // scopedSlots: { customRender: 'maintenanceRequire' },
+ // width: 150,
+ // },
+ // {
+ // title: '宸ユ椂瀹氶',
+ // align: 'center',
+ // dataIndex: 'workingHourQuota'
+ // },
+ // {
+ // title: '绀烘剰鍥�',
+ // align: 'center',
+ // dataIndex: 'photo',
+ // scopedSlots: { customRender: 'photo' },
+ // width: 150,
+ // },
{
title: '淇濆吇閮ㄤ綅',
align: 'center',
dataIndex: 'location',
- scopedSlots: { customRender: 'location' },
- width: 150,
+ // scopedSlots: { customRender: 'location' },
+ // width: 150,
},
{
title: '鍛ㄦ湡',
@@ -568,7 +531,7 @@
},
useDepartName: {
rules: [
- { required: true, message: '璇烽�夋嫨瀵硅薄閮ㄩ棬!' },
+ { required: true, message: '璇烽�夋嫨浣跨敤閮ㄩ棬!' },
]
},
equipmentName: {
@@ -596,7 +559,7 @@
list: "/eam/maintenanceStandardDetail/getMaintenanceStandardDetailListByIds",
add: "/eam/maintenanceStandard/add",
edit: "/eam/maintenanceStandard/edit",
- addDetail: "/eam/maintenanceStandardDetail/add",
+ // addDetail: "/eam/maintenanceStandardDetail/add",
getMaintenanceCycle: "/eam/maintenanceStandardDetail/getPeriodicMaintenanceCycle",
realDelete: "/eam/maintenanceStandardDetail/realDelete",
revise: '/eam/maintenanceStandard/revise',
@@ -676,7 +639,7 @@
edit(record) {
let that = this;
- this.initOptions();
+ // this.initOptions();
// this.getMaintenanceCycle()
this.dataSource = [];
this.form.resetFields();
@@ -731,7 +694,7 @@
onEquipmentList() {
let data = this.form.getFieldsValue(['departId']);
if (data.departId == null || data.departId == "") {
- this.$message.warning("璇峰厛閫夋嫨瀵硅薄閮ㄩ棬锛�");
+ this.$message.warning("璇峰厛閫夋嫨浣跨敤閮ㄩ棬锛�");
return
}
this.$refs.EquipmentList.list(data.departId);
@@ -747,7 +710,7 @@
onDepartList() {
this.$refs.DepartList.list();
- this.$refs.DepartList.title = "閫夋嫨瀵硅薄閮ㄩ棬";
+ this.$refs.DepartList.title = "閫夋嫨浣跨敤閮ㄩ棬";
},
sendDepartRecord(data) {
this.dataSource = [];
@@ -766,7 +729,6 @@
},
handleOk() {
- console.log("123")
const that = this;
this.form.validateFields((err, values) => {
if (!err) {
@@ -782,10 +744,12 @@
let obj;
if (!this.model.id) {
formData.versionStatus = '1'
+ formData.approvalStatus = '1'
obj = postAction(this.url.add, formData);
} else {
if (this.isRevise) {
formData.versionStatus = '1'
+ formData.approvalStatus = '1'
obj = postAction(this.url.revise, formData);
} else {
obj = requestPut(this.url.edit, formData, { id: this.model.id });
@@ -825,7 +789,6 @@
},
getMaintenanceCycle(equipmentId) {
- debugger
getAction(this.url.getMaintenanceCycle, { equipmentId: equipmentId }).then((res) => {
if (res.success) {
this.maintenanceCycles = res.result
diff --git a/src/views/eam/modules/dailyMaintenanceStandard/JSelectMaintenanceStandardModal.vue b/src/views/eam/modules/dailyMaintenanceStandard/JSelectMaintenanceStandardModal.vue
index fc2167c..0852dbe 100644
--- a/src/views/eam/modules/dailyMaintenanceStandard/JSelectMaintenanceStandardModal.vue
+++ b/src/views/eam/modules/dailyMaintenanceStandard/JSelectMaintenanceStandardModal.vue
@@ -122,16 +122,16 @@
align: 'center',
dataIndex: 'location'
},
- {
- title: '瀹夊叏瑕佹眰',
- align: 'center',
- dataIndex: 'maintenanceRequire'
- },
- {
- title: '宸ユ椂瀹氶',
- align: 'center',
- dataIndex: 'workingHourQuota'
- },
+ // {
+ // title: '瀹夊叏瑕佹眰',
+ // align: 'center',
+ // dataIndex: 'maintenanceRequire'
+ // },
+ // {
+ // title: '宸ユ椂瀹氶',
+ // align: 'center',
+ // dataIndex: 'workingHourQuota'
+ // },
],
selectedRowKeys: [],
oldSelectRows: [],
diff --git a/src/views/eam/modules/equipment/EquipmentModel.vue b/src/views/eam/modules/equipment/EquipmentModel.vue
index 50a1c72..cdf2ad2 100644
--- a/src/views/eam/modules/equipment/EquipmentModel.vue
+++ b/src/views/eam/modules/equipment/EquipmentModel.vue
@@ -20,7 +20,7 @@
<a-form-item
:labelCol="labelCol"
:wrapperCol="wrapperCol"
- label="璁惧缂栫爜"
+ label="缁熶竴缂栫爜"
>
<a-input
placeholder="灏嗙敱绯荤粺鐢熸垚"
diff --git a/src/views/eam/modules/equipment/EquipmentResume/EquipmentResumeDrawer.vue b/src/views/eam/modules/equipment/EquipmentResume/EquipmentResumeDrawer.vue
index c00c9ee..b38c884 100644
--- a/src/views/eam/modules/equipment/EquipmentResume/EquipmentResumeDrawer.vue
+++ b/src/views/eam/modules/equipment/EquipmentResume/EquipmentResumeDrawer.vue
@@ -16,7 +16,7 @@
<a-form-item
:labelCol="labelCol"
:wrapperCol="wrapperCol"
- label="璁惧缂栫爜"
+ label="缁熶竴缂栫爜"
class="hightColor"
>
<span
diff --git a/src/views/eam/modules/equipmentBorrow/EquipmentUnloadingBorrowDetail.vue b/src/views/eam/modules/equipmentBorrow/EquipmentUnloadingBorrowDetail.vue
index 480992e..3b252e7 100644
--- a/src/views/eam/modules/equipmentBorrow/EquipmentUnloadingBorrowDetail.vue
+++ b/src/views/eam/modules/equipmentBorrow/EquipmentUnloadingBorrowDetail.vue
@@ -87,7 +87,7 @@
dataIndex: 'equipmentStatusName'
},
{
- title: '璁惧缂栫爜',
+ title: '缁熶竴缂栫爜',
align: 'center',
dataIndex: 'equipmentNum'
},
diff --git a/src/views/eam/modules/equipmentBorrow/EquipmentUnloadingBorrowDetailModal.vue b/src/views/eam/modules/equipmentBorrow/EquipmentUnloadingBorrowDetailModal.vue
index c4c405b..2a84319 100644
--- a/src/views/eam/modules/equipmentBorrow/EquipmentUnloadingBorrowDetailModal.vue
+++ b/src/views/eam/modules/equipmentBorrow/EquipmentUnloadingBorrowDetailModal.vue
@@ -160,7 +160,7 @@
dataIndex: 'equipmentStatus'
},
{
- title: '璁惧缂栫爜',
+ title: '缁熶竴缂栫爜',
align: 'center',
width: 100,
dataIndex: 'equipmentNum'
diff --git a/src/views/eam/modules/equipmentCalibrationOrder/EquipmentCalibrationOrderModal.vue b/src/views/eam/modules/equipmentCalibrationOrder/EquipmentCalibrationOrderModal.vue
index 8580a18..8036c29 100644
--- a/src/views/eam/modules/equipmentCalibrationOrder/EquipmentCalibrationOrderModal.vue
+++ b/src/views/eam/modules/equipmentCalibrationOrder/EquipmentCalibrationOrderModal.vue
@@ -1,7 +1,7 @@
<template>
<a-modal
:title='title'
- :width='1250'
+ :width='650'
:visible='visible'
:maskClosable='false'
@ok='handleOk'
@@ -12,7 +12,7 @@
<a-spin :spinning='confirmLoading'>
<a-form :form='form'>
<a-row :gutter='24'>
- <a-col :span='12'>
+ <a-col :span='24'>
<a-form-item
label='宸ュ崟鍙�'
:labelCol='labelCol'
@@ -26,25 +26,7 @@
/>
</a-form-item>
</a-col>
- <a-col :span='12'>
- <a-form-item
- label='妫�瀹氭柟寮�'
- :labelCol='labelCol'
- :wrapperCol='wrapperCol'
- >
- <j-dict-select-tag
- allow-clear
- :disabled='disableSubmit'
- :placeholder="disableSubmit?'':'璇烽�夋嫨妫�瀹氭柟寮�'"
- :triggerChange='true'
- dictCode='calibration_type'
- v-decorator="['calibrationType', validatorRules.calibrationType]"
- />
- </a-form-item>
- </a-col>
- </a-row>
- <a-row :gutter='24'>
- <a-col :span='12'>
+ <a-col :span='24'>
<a-form-item
label='璁惧'
:labelCol='labelCol'
@@ -60,8 +42,24 @@
/>
</a-form-item>
</a-col>
+ <a-col :span='24'>
+ <a-form-item
+ label='妫�瀹氭柟寮�'
+ :labelCol='labelCol'
+ :wrapperCol='wrapperCol'
+ >
+ <j-dict-select-tag
+ allow-clear
+ :disabled='disableSubmit'
+ :placeholder="disableSubmit?'':'璇烽�夋嫨妫�瀹氭柟寮�'"
+ :triggerChange='true'
+ dictCode='calibration_type'
+ v-decorator="['calibrationType', validatorRules.calibrationType]"
+ />
+ </a-form-item>
+ </a-col>
- <a-col :span='12'>
+ <a-col :span='24'>
<a-form-item
label='鍒ゆ柇渚濇嵁'
:labelCol='labelCol'
@@ -83,7 +81,7 @@
hidden
:gutter='24'
>
- <a-col :span='12'>
+ <a-col :span='24'>
<a-form-item
label='璁惧Id'
:labelCol='labelCol'
@@ -92,14 +90,14 @@
<a-input
allow-clear
:disabled='true'
- :placeholder="disableSubmit?'':'璇疯緭鍏ヨ澶囩紪鐮�/鍚嶇О/鍨嬪彿'"
+ :placeholder="disableSubmit?'':'璇疯緭鍏ョ粺涓�缂栫爜/鍚嶇О/鍨嬪彿'"
v-decorator="['equipmentId', validatorRules.equipmentId ]"
/>
</a-form-item>
</a-col>
</a-row>
<a-row :gutter='24'>
- <a-col :span='24'>
+ <!-- <a-col :span='24'>
<a-form-item
:labelCol='{span:3}'
:wrapperCol='{span:21}'
@@ -112,7 +110,7 @@
v-decorator="['remark', validatorRules.remark]"
/>
</a-form-item>
- </a-col>
+ </a-col> -->
<a-col :span='24'>
<a-form-item
:labelCol='{span:3}'
@@ -131,16 +129,17 @@
</a-row>
</a-form>
</a-spin>
- <a-table v-show='false'
- ref='table'
- bordered
- size='middle'
- rowKey='id'
- :columns='columns'
- :pagination='ipagination'
- :loading='loading'
- :dataSource='dataSource'
- @change='handleTableChange'
+ <a-table
+ v-show='false'
+ ref='table'
+ bordered
+ size='middle'
+ rowKey='id'
+ :columns='columns'
+ :pagination='ipagination'
+ :loading='loading'
+ :dataSource='dataSource'
+ @change='handleTableChange'
>
</a-table>
@@ -221,7 +220,7 @@
disableSubmit: false,
codeDisable: true,
dataSource: [],
- num:"",
+ num: "",
model: { 'management_mode': 'report', 'calibration_type': 'self' },
labelCol: {
xs: { span: 24 },
@@ -281,11 +280,12 @@
this.precisionParametersTemplateId = '-1'
getAction(this.url.getNum, { type: 'CalibrationOrder', length: '4' }).then((res) => {
if (res.success) {
- this.num = res.message
+ // this.num = res.message
+ this.form.setFieldsValue({ "num": res.message })
}
})
// 鏂板鏃跺�欒缃壌瀹氱被鍨嬩负鑷銆� 鍒ゅ畾渚濇嵁涓烘姤鍛�
- this.edit({ "num":this.num,'calibrationType': 'self', 'managementMode': 'report' })
+ this.edit({ "num": this.num, 'calibrationType': 'self', 'managementMode': 'report' })
},
edit(record) {
let that = this
diff --git a/src/views/eam/modules/equipmentCalibrationOrder/EquipmentCalibrationOrderReportList.vue b/src/views/eam/modules/equipmentCalibrationOrder/EquipmentCalibrationOrderReportList.vue
index 35295a1..6b9272a 100644
--- a/src/views/eam/modules/equipmentCalibrationOrder/EquipmentCalibrationOrderReportList.vue
+++ b/src/views/eam/modules/equipmentCalibrationOrder/EquipmentCalibrationOrderReportList.vue
@@ -101,7 +101,7 @@
data() {
return {
description: '妫�瀹氭姤鍛�',
- disableMixinCreated:true,
+ disableMixinCreated: true,
columns: [
{
title: '#',
@@ -135,11 +135,11 @@
dataIndex: 'size',
scopedSlots: { customRender: 'size' },
},
- {
- title: '鍒ゅ畾缁撴灉',
- align: 'center',
- dataIndex: 'judgmentResultName'
- },
+ // {
+ // title: '鍒ゅ畾缁撴灉',
+ // align: 'center',
+ // dataIndex: 'judgmentResultName'
+ // },
{
title: '鎿嶄綔',
align: 'center',
@@ -156,27 +156,27 @@
},
}
},
- props:{
- calibrationOrderId:{
- type:String,
- default:'',
- required:false
+ props: {
+ calibrationOrderId: {
+ type: String,
+ default: '',
+ required: false
}
},
- watch:{
- calibrationOrderId:{
- immediate: true,
- handler(val) {
- if(!this.calibrationOrderId){
- this.clearList()
- }else{
- this.queryParam['calibrationOrderId'] = val;
- this.queryParam['delFlag'] = 0;
- this.loadData(1);
- }
+ watch: {
+ calibrationOrderId: {
+ immediate: true,
+ handler(val) {
+ if (!this.calibrationOrderId) {
+ // this.clearList()
+ } else {
+ this.queryParam['calibrationOrderId'] = val;
+ this.queryParam['delFlag'] = 0;
+ this.loadData(1);
}
}
- },
+ }
+ },
// mounted() {
// this.$bus.$on('equipmentSelectionRows', (data) => {
// this.equipmentSelectionRows = data
diff --git a/src/views/eam/modules/equipmentCalibrationOrder/EquipmentCalibrationOrderReportModal.vue b/src/views/eam/modules/equipmentCalibrationOrder/EquipmentCalibrationOrderReportModal.vue
index dc6f818..f50b36f 100644
--- a/src/views/eam/modules/equipmentCalibrationOrder/EquipmentCalibrationOrderReportModal.vue
+++ b/src/views/eam/modules/equipmentCalibrationOrder/EquipmentCalibrationOrderReportModal.vue
@@ -102,7 +102,7 @@
</a-form-item>
</a-col>
</a-row>
- <a-row :gutter="24">
+ <!-- <a-row :gutter="24">
<a-col :span="24">
<a-form-item
:labelCol="{span:4}"
@@ -120,7 +120,7 @@
</a-form-item>
</a-col>
- </a-row>
+ </a-row> -->
<a-row :gutter="24">
<a-col :span="24">
diff --git a/src/views/eam/modules/equipmentCalibrationOrder/EquipmentList.vue b/src/views/eam/modules/equipmentCalibrationOrder/EquipmentList.vue
index f3b89fa..494e2f2 100644
--- a/src/views/eam/modules/equipmentCalibrationOrder/EquipmentList.vue
+++ b/src/views/eam/modules/equipmentCalibrationOrder/EquipmentList.vue
@@ -144,7 +144,7 @@
}
},
{
- title: '璁惧缂栫爜',
+ title: '缁熶竴缂栫爜',
align: 'center',
dataIndex: 'num',
},
diff --git a/src/views/eam/modules/equipmentCalibrationOrder/EquipmentTechnologyStatusModal.vue b/src/views/eam/modules/equipmentCalibrationOrder/EquipmentTechnologyStatusModal.vue
new file mode 100644
index 0000000..98c2fdb
--- /dev/null
+++ b/src/views/eam/modules/equipmentCalibrationOrder/EquipmentTechnologyStatusModal.vue
@@ -0,0 +1,285 @@
+<template>
+ <a-modal
+ :title='title'
+ :width="650"
+ :visible='visible'
+ :maskClosable='false'
+ cancelText='鍏抽棴'
+ @cancel='handleCancel'
+ :confirmLoading='confirmLoading'
+ >
+ <!-- @ok='handleOk' -->
+ <a-spin :spinning='confirmLoading'>
+ <a-form :form="form">
+ <a-row :gutter="24">
+ <a-col :span="24">
+ <a-form-item
+ label="缁熶竴缂栧彿"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ >
+ <a-input
+ allow-clear
+ :disabled="true"
+ :placeholder="disableSubmit?'':'璇疯緭鍏ョ粺涓�缂栧彿'"
+ v-decorator="['equipmentNum', validatorRules.equipmentNum ]"
+ />
+ </a-form-item>
+ </a-col>
+ <a-col :span="24">
+ <a-form-item
+ label="璁惧鍚嶇О"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ >
+ <a-input
+ allow-clear
+ :disabled="true"
+ :placeholder="disableSubmit?'':'璇疯緭鍏ヨ澶囧悕绉�'"
+ v-decorator="['equipmentName', validatorRules.equipmentName ]"
+ />
+ </a-form-item>
+ </a-col>
+ <a-col :span="24">
+ <a-form-item
+ label="鍨嬪彿"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ >
+ <a-input
+ allow-clear
+ :disabled="true"
+ :placeholder="disableSubmit?'':'璇疯緭鍏ュ瀷鍙�'"
+ v-decorator="['equipmentModel', validatorRules.equipmentModel ]"
+ />
+ </a-form-item>
+ </a-col>
+ <a-col :span="24">
+ <a-form-item
+ label="瑙勬牸"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ >
+ <a-input
+ allow-clear
+ :disabled="true"
+ :placeholder="disableSubmit?'':'璇疯緭鍏ヨ鏍�'"
+ v-decorator="['equipmentSpecification', validatorRules.equipmentSpecification ]"
+ />
+ </a-form-item>
+ </a-col>
+ <a-col :span="24">
+ <a-form-model-item
+ label="鎶�鏈姸鎬�"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ >
+ <!-- prop="technologyStatus" -->
+ <j-dict-select-tag
+ allow-clear
+ placeholder="璇烽�夋嫨鎶�鏈姸鎬�"
+ :triggerChange="true"
+ dictCode="technology_status"
+ v-decorator="['judgmentResult', validatorRules.judgmentResult ]"
+ />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span='24'>
+ <a-form-item
+ label="瀹℃牳鎰忚"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ >
+ <a-textarea
+ rows='3'
+ placeholder='璇疯緭鍏ュ鏍告剰瑙�'
+ v-decorator="['remark', validatorRules.remark ]"
+ ></a-textarea>
+ </a-form-item>
+ </a-col>
+ </a-row>
+ </a-form>
+ </a-spin>
+ <template slot='footer'>
+ <a-popconfirm
+ @confirm="() => handleReject()"
+ title="纭灏嗗綋鍓嶇粨鏋滈┏鍥烇紵"
+ >
+ <a-button
+ :loading='confirmLoading'
+ :style="{marginRight: '8px'}"
+ >
+ 椹冲洖
+ </a-button>
+ </a-popconfirm>
+ <a-popconfirm
+ @confirm="() => handleOk()"
+ title="纭灏嗗綋鍓嶇粨鏋滃鏍搁�氳繃锛�"
+ >
+ <a-button
+ type='primary'
+ :loading='confirmLoading'
+ :style="{marginRight: '8px'}"
+ >
+ 閫氳繃
+ </a-button>
+ </a-popconfirm>
+ </template>
+ </a-modal>
+
+</template>
+
+<script>
+import { httpAction, requestPut, postAction } from '@/api/manage'
+import Tooltip from 'ant-design-vue/es/tooltip'
+import pick from 'lodash.pick'
+
+
+export default {
+ name: 'EquipmentTechnologyStatusModal',
+ components: {
+ Tooltip
+ },
+ data() {
+ return {
+ title: '鎿嶄綔',
+ visible: false,
+ disableSubmit: false,
+ model: {},
+ labelCol: {
+ xs: { span: 24 },
+ sm: { span: 5 }
+ },
+ wrapperCol: {
+ xs: { span: 24 },
+ sm: { span: 16 }
+ },
+ confirmLoading: false,
+ form: this.$form.createForm(this),
+ validatorRules: {
+ remark: {
+ rules: [
+ { required: true, message: '璇疯緭鍏ュ鏍告剰瑙�!' },
+ ]
+ },
+ judgmentResult: {
+ rules: [
+ { required: true, message: '璇烽�夋嫨鎶�鏈姸鎬�!' },
+ ]
+ },
+ },
+ url: {
+ auditApproval: "/eam/calibrationOrderReport/editEquipmentTechnologyStatus",
+ },
+ }
+ },
+
+
+ methods: {
+ close() {
+ this.$emit('close')
+ this.visible = false
+ },
+
+ handleCancel() {
+ this.close()
+ },
+
+ edit(record) {
+ this.form.resetFields();
+ this.model = Object.assign({}, record);
+ this.visible = true;
+ this.disableSubmit = false;
+ this.$nextTick(() => {
+ this.form.setFieldsValue(pick(this.model, 'equipmentNum', 'equipmentName', 'equipmentModel', 'equipmentSpecification', 'judgmentResult', 'remark'))
+ });
+ if (record.id) {
+ this.codeDisable = true;
+ } else {
+ this.codeDisable = false;
+ }
+ },
+
+
+
+ handleReject() {
+ const that = this;
+ this.form.validateFields((err, values) => {
+ if (!err) {
+ that.confirmLoading = true;
+ let formData = Object.assign(this.model, values);
+ formData.status = '3'
+ requestPut(this.url.auditApproval, formData, { id: this.model.id }).then((res) => {
+ if (res.success) {
+ that.$message.success(res.message);
+ that.$emit('ok');
+ } else {
+ that.$message.warning(res.message);
+ }
+ }).finally(() => {
+ that.confirmLoading = false;
+ that.close();
+ })
+ }
+ })
+ },
+
+
+ handleOk() {
+ const that = this;
+ that.form.validateFields((err, values) => {
+ if (!err) {
+ this.confirmLoading = true;
+ let formData = Object.assign(this.model, values);
+ formData.status = '4'
+ requestPut(this.url.auditApproval, formData, { id: this.model.id }).then((res) => {
+ if (res.success) {
+ that.$message.success(res.message);
+ that.$emit('ok');
+ } else {
+ that.$message.warning(res.message);
+ }
+ }).finally(() => {
+ that.confirmLoading = false;
+ that.close();
+ })
+ }
+ })
+ },
+ }
+
+}
+</script>
+
+<style lang='less' scoped>
+/deep/ .frozenRowClass {
+ color: #c9c9c9;
+}
+
+.fontweight {
+ font-weight: bold;
+}
+
+.ant-btn {
+ padding: 0 10px;
+ margin-left: 3px;
+}
+
+.ant-form-item-control {
+ line-height: 0px;
+}
+
+/** 涓昏〃鍗曡闂磋窛 */
+.ant-form .ant-form-item {
+ margin-bottom: 10px;
+}
+
+/** Tab椤甸潰琛岄棿璺� */
+.ant-tabs-content .ant-form-item {
+ margin-bottom: 0px;
+}
+
+/deep/ .ant-modal-title {
+ text-align: center;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/eam/modules/equipmentCalibrationOrder/FinalModal.vue b/src/views/eam/modules/equipmentCalibrationOrder/FinalModal.vue
index d97de05..a276643 100644
--- a/src/views/eam/modules/equipmentCalibrationOrder/FinalModal.vue
+++ b/src/views/eam/modules/equipmentCalibrationOrder/FinalModal.vue
@@ -90,7 +90,7 @@
<a-input
allow-clear
:disabled="true"
- :placeholder="disableSubmit?'':'璇疯緭鍏ヨ澶囩紪鐮�/鍚嶇О/鍨嬪彿'"
+ :placeholder="disableSubmit?'':'璇疯緭鍏ョ粺涓�缂栫爜/鍚嶇О/鍨嬪彿'"
v-decorator="['equipmentId', validatorRules.equipmentId ]"
/>
</a-form-item>
diff --git a/src/views/eam/modules/equipmentChange/EquipmentChangeDetail.vue b/src/views/eam/modules/equipmentChange/EquipmentChangeDetail.vue
index d3ffde9..9af5081 100644
--- a/src/views/eam/modules/equipmentChange/EquipmentChangeDetail.vue
+++ b/src/views/eam/modules/equipmentChange/EquipmentChangeDetail.vue
@@ -82,7 +82,7 @@
},
{
- title: '璁惧缂栫爜',
+ title: '缁熶竴缂栫爜',
align: 'center',
dataIndex: 'equipmentNum',
width: 170,
diff --git a/src/views/eam/modules/equipmentChange/EquipmentChangeDetailModal.vue b/src/views/eam/modules/equipmentChange/EquipmentChangeDetailModal.vue
index 3c5eb90..9a5e818 100644
--- a/src/views/eam/modules/equipmentChange/EquipmentChangeDetailModal.vue
+++ b/src/views/eam/modules/equipmentChange/EquipmentChangeDetailModal.vue
@@ -271,7 +271,7 @@
width: 50
},
{
- title: '璁惧缂栫爜',
+ title: '缁熶竴缂栫爜',
width: 150,
align: 'center',
dataIndex: 'equipmentNum'
diff --git a/src/views/eam/modules/equipmentDisposal/EquipmentDisposalDetailList.vue b/src/views/eam/modules/equipmentDisposal/EquipmentDisposalDetailList.vue
index 33e29f2..eac5e23 100644
--- a/src/views/eam/modules/equipmentDisposal/EquipmentDisposalDetailList.vue
+++ b/src/views/eam/modules/equipmentDisposal/EquipmentDisposalDetailList.vue
@@ -144,7 +144,7 @@
// dataIndex: 'equipmentId'
// },
{
- title:'璁惧缂栫爜',
+ title:'缁熶竴缂栫爜',
align:"center",
dataIndex: 'equipmentNum',
width:200
diff --git a/src/views/eam/modules/equipmentDisposal/EquipmentDisposalDetailModal.vue b/src/views/eam/modules/equipmentDisposal/EquipmentDisposalDetailModal.vue
index 94151d1..d2b918e 100644
--- a/src/views/eam/modules/equipmentDisposal/EquipmentDisposalDetailModal.vue
+++ b/src/views/eam/modules/equipmentDisposal/EquipmentDisposalDetailModal.vue
@@ -22,8 +22,8 @@
</a-form-model-item>
</a-col>
<a-col :span="24">
- <a-form-model-item label="璁惧缂栫爜" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentNum">
- <a-input v-model="model.equipmentNum"placeholder="璇疯緭鍏ヨ澶囩紪鐮�" disabled></a-input>
+ <a-form-model-item label="缁熶竴缂栫爜" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentNum">
+ <a-input v-model="model.equipmentNum"placeholder="璇疯緭鍏ョ粺涓�缂栫爜" disabled></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
diff --git a/src/views/eam/modules/equipmentDisposal/EquipmentDisposalForm.vue b/src/views/eam/modules/equipmentDisposal/EquipmentDisposalForm.vue
index 3397507..d02b29e 100644
--- a/src/views/eam/modules/equipmentDisposal/EquipmentDisposalForm.vue
+++ b/src/views/eam/modules/equipmentDisposal/EquipmentDisposalForm.vue
@@ -158,7 +158,7 @@
defaultValue: ''
},
{
- title: '璁惧缂栫爜',
+ title: '缁熶竴缂栫爜',
key: 'equipmentNum',
type: JVXETypes.normal,
disabled: true,
diff --git a/src/views/eam/modules/equipmentNew/EquipmentResume/EquipmentResumeDrawer.vue b/src/views/eam/modules/equipmentNew/EquipmentResume/EquipmentResumeDrawer.vue
index b90bd08..24095c1 100644
--- a/src/views/eam/modules/equipmentNew/EquipmentResume/EquipmentResumeDrawer.vue
+++ b/src/views/eam/modules/equipmentNew/EquipmentResume/EquipmentResumeDrawer.vue
@@ -16,7 +16,7 @@
<a-form-item
:labelCol="labelCol"
:wrapperCol="wrapperCol"
- label="璁惧缂栫爜"
+ label="缁熶竴缂栫爜"
class="hightColor"
>
<span
diff --git a/src/views/eam/modules/equipmentReturn/EquipmentUnloadingReturnDetail.vue b/src/views/eam/modules/equipmentReturn/EquipmentUnloadingReturnDetail.vue
index 23200cf..495fbef 100644
--- a/src/views/eam/modules/equipmentReturn/EquipmentUnloadingReturnDetail.vue
+++ b/src/views/eam/modules/equipmentReturn/EquipmentUnloadingReturnDetail.vue
@@ -82,7 +82,7 @@
}
},
{
- title: '璁惧缂栫爜',
+ title: '缁熶竴缂栫爜',
align: 'center',
dataIndex: 'equipmentNum'
},
diff --git a/src/views/eam/modules/equipmentReturn/EquipmentUnloadingReturnDetailModal.vue b/src/views/eam/modules/equipmentReturn/EquipmentUnloadingReturnDetailModal.vue
index 5916e5b..96d469c 100644
--- a/src/views/eam/modules/equipmentReturn/EquipmentUnloadingReturnDetailModal.vue
+++ b/src/views/eam/modules/equipmentReturn/EquipmentUnloadingReturnDetailModal.vue
@@ -154,7 +154,7 @@
width: 100
},
{
- title: '璁惧缂栫爜',
+ title: '缁熶竴缂栫爜',
align: 'center',
width: 100,
dataIndex: 'equipmentNum'
diff --git a/src/views/eam/modules/equipmentScrap/EquipmentScrapDetailList.vue b/src/views/eam/modules/equipmentScrap/EquipmentScrapDetailList.vue
index 417e423..c004bc9 100644
--- a/src/views/eam/modules/equipmentScrap/EquipmentScrapDetailList.vue
+++ b/src/views/eam/modules/equipmentScrap/EquipmentScrapDetailList.vue
@@ -10,8 +10,8 @@
<!--<!– </a-form-item>–>-->
<!--<!– </a-col>–>-->
<!-- <a-col :xl="6" :lg="7" :md="8" :sm="24">-->
-<!-- <a-form-item label="璁惧缂栫爜">-->
-<!-- <a-input placeholder="璇疯緭鍏ヨ澶囩紪鐮�" v-model="queryParam.equipmentNum"></a-input>-->
+<!-- <a-form-item label="缁熶竴缂栫爜">-->
+<!-- <a-input placeholder="璇疯緭鍏ョ粺涓�缂栫爜" v-model="queryParam.equipmentNum"></a-input>-->
<!-- </a-form-item>-->
<!-- </a-col>-->
<!-- <template v-if="toggleSearchStatus">-->
@@ -168,7 +168,7 @@
// dataIndex: 'equipmentId_dictText',
// },
{
- title:'璁惧缂栫爜',
+ title:'缁熶竴缂栫爜',
align:"center",
dataIndex: 'equipmentNum'
},
diff --git a/src/views/eam/modules/equipmentScrap/EquipmentScrapDetailModal.vue b/src/views/eam/modules/equipmentScrap/EquipmentScrapDetailModal.vue
index 3124a47..5679220 100644
--- a/src/views/eam/modules/equipmentScrap/EquipmentScrapDetailModal.vue
+++ b/src/views/eam/modules/equipmentScrap/EquipmentScrapDetailModal.vue
@@ -22,8 +22,8 @@
</a-form-model-item>
</a-col>
<a-col :span="24">
- <a-form-model-item label="璁惧缂栫爜" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentNum">
- <a-input v-model="model.equipmentNum"placeholder="璇疯緭鍏ヨ澶囩紪鐮�" disabled></a-input>
+ <a-form-model-item label="缁熶竴缂栫爜" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentNum">
+ <a-input v-model="model.equipmentNum"placeholder="璇疯緭鍏ョ粺涓�缂栫爜" disabled></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
diff --git a/src/views/eam/modules/equipmentScrap/EquipmentScrapForm-bak.vue b/src/views/eam/modules/equipmentScrap/EquipmentScrapForm-bak.vue
index 1620113..d1802b2 100644
--- a/src/views/eam/modules/equipmentScrap/EquipmentScrapForm-bak.vue
+++ b/src/views/eam/modules/equipmentScrap/EquipmentScrapForm-bak.vue
@@ -161,7 +161,7 @@
// defaultValue:'',
// },
// {
- // title: '璁惧缂栫爜',
+ // title: '缁熶竴缂栫爜',
// key: 'equipmentId',
// type: FormTypes.sel_search,
// dictCode:"mom_eam_equipment_account,num,id",
@@ -171,7 +171,7 @@
// validateRules: [{ required: true, message: '${title}涓嶈兘涓虹┖' }],
// },
// // {
- // // title: '璁惧缂栫爜',
+ // // title: '缁熶竴缂栫爜',
// // key: 'equipmentNum',
// // type: FormTypes.input,
// // disabled:true,
@@ -314,7 +314,7 @@
// dataIndex: 'equipmentId_dictText',
// },
{
- title:'璁惧缂栫爜',
+ title:'缁熶竴缂栫爜',
align:"center",
dataIndex: 'equipmentNum'
},
diff --git a/src/views/eam/modules/equipmentScrap/EquipmentScrapForm.vue b/src/views/eam/modules/equipmentScrap/EquipmentScrapForm.vue
index 72e15de..56a4156 100644
--- a/src/views/eam/modules/equipmentScrap/EquipmentScrapForm.vue
+++ b/src/views/eam/modules/equipmentScrap/EquipmentScrapForm.vue
@@ -229,7 +229,7 @@
align:'center',
},
{
- title: '璁惧缂栫爜',
+ title: '缁熶竴缂栫爜',
key: 'equipmentNum',
type: JVXETypes.normal,
disabled: true,
diff --git a/src/views/eam/modules/equipmentScrap/EquipmentSelectModal copy.vue b/src/views/eam/modules/equipmentScrap/EquipmentSelectModal copy.vue
index aa3c2a6..8598572 100644
--- a/src/views/eam/modules/equipmentScrap/EquipmentSelectModal copy.vue
+++ b/src/views/eam/modules/equipmentScrap/EquipmentSelectModal copy.vue
@@ -7,13 +7,13 @@
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :md="6" :sm="4">
- <a-form-item label="璁惧缂栫爜">
- <a-input placeholder="璇疯緭鍏ヨ澶囩紪鐮�" v-model="queryParam.num" />
+ <a-form-item label="缁熶竴缂栫爜">
+ <a-input placeholder="璇疯緭鍏ョ粺涓�缂栫爜" v-model="queryParam.num" />
</a-form-item>
</a-col>
<a-col :md="6" :sm="4">
- <a-form-item label="璁惧缂栫爜">
- <a-input placeholder="璇疯緭鍏ヨ澶囩紪鐮�" v-model="queryParam.num" />
+ <a-form-item label="缁熶竴缂栫爜">
+ <a-input placeholder="璇疯緭鍏ョ粺涓�缂栫爜" v-model="queryParam.num" />
</a-form-item>
</a-col>
<a-col :md="3">
@@ -61,7 +61,7 @@
queryParam: {},
columns: [
{
- title: '璁惧缂栫爜',
+ title: '缁熶竴缂栫爜',
align: 'center',
dataIndex: 'num',
width: 120,
@@ -140,7 +140,7 @@
],
selectColumns: [
{
- title: '璁惧缂栫爜',
+ title: '缁熶竴缂栫爜',
align: 'center',
dataIndex: 'num',
width: 120,
diff --git a/src/views/eam/modules/equipmentScrap/EquipmentSelectModal.vue b/src/views/eam/modules/equipmentScrap/EquipmentSelectModal.vue
index be79edf..2cf2f80 100644
--- a/src/views/eam/modules/equipmentScrap/EquipmentSelectModal.vue
+++ b/src/views/eam/modules/equipmentScrap/EquipmentSelectModal.vue
@@ -8,7 +8,7 @@
@cancel="close"
style="top:50px"
cancelText="鍏抽棴"
- :width="1200"
+ :width="1400"
>
<a-card :bordered="false">
<div class="table-page-search-wrapper">
@@ -21,9 +21,9 @@
:md="8"
:sm="6"
>
- <a-form-item label="璁惧缂栫爜">
+ <a-form-item label="缁熶竴缂栫爜">
<a-input
- placeholder="璇疯緭鍏ヨ澶囩紪鐮�"
+ placeholder="璇疯緭鍏ョ粺涓�缂栫爜"
v-model="queryParam.num"
/>
</a-form-item>
@@ -32,10 +32,10 @@
:md="8"
:sm="6"
>
- <a-form-item label="璁惧缂栫爜">
+ <a-form-item label="璁惧鍚嶇О">
<a-input
- placeholder="璇疯緭鍏ヨ澶囩紪鐮�"
- v-model="queryParam.num"
+ placeholder="璁惧鍚嶇О"
+ v-model="queryParam.name"
/>
</a-form-item>
</a-col>
@@ -106,71 +106,53 @@
}
},
{
- title: '璁惧缂栫爜',
+ title: '缁熶竴缂栫爜',
align: 'center',
- dataIndex: 'num'
- },
- {
- title: '璧勪骇缂栫爜',
- align: 'center',
- dataIndex: 'assetNumber'
- },
-
- {
- title: '鐗圭璁惧',
- align: 'center',
- dataIndex: 'specificEquipment_dictText'
+ dataIndex: 'num',
+ width:200
},
{
title: '璁惧鍚嶇О',
align: 'center',
- dataIndex: 'name'
+ dataIndex: 'name',
+ width:200
},
{
title: '璁惧鍨嬪彿',
align: 'center',
- dataIndex: 'model'
+ dataIndex: 'model',
+ width:200
},
{
title: '璁惧瑙勬牸',
align: 'center',
- dataIndex: 'specification'
+ dataIndex: 'specification',
+ width:200
+ },
+ {
+ title: 'ABC鏍囪瘑',
+ align: "center",
+ dataIndex: 'equipmentImportanceId',
+ width:100
+ },
+ {
+ title: '鍏抽敭璁惧鏍囪瘑',
+ align: "center",
+ dataIndex: 'specificEquipment_dictText',
+ width:100
},
{
title: '璁惧鐘舵��',
align: 'center',
- dataIndex: 'equipmentStatus_dictText'
+ dataIndex: 'equipmentStatus_dictText',
+ width:100
},
{
title: '鎶�鏈姸鎬�',
align: 'center',
- dataIndex: 'technologyStatus_dictText'
+ dataIndex: 'technologyStatus_dictText',
+ width:100
},
-
- {
- title: '璁惧鍥剧墖',
- align: 'center',
- dataIndex: 'equipmentPhoto',
- scopedSlots: { customRender: 'equipmentPhoto' }
- },
- // {
- // title:'璁惧鍥剧墖',
- // align:"center",
- // dataIndex: 'equipmentPhoto',
- // scopedSlots: {customRender: 'imgSlot'}
- // },
- {
- title: '浣嶇疆',
- align: 'center',
- dataIndex: 'location'
- },
-
- {
- title: '閲嶈搴�',
- align: 'center',
- dataIndex: 'equipmentImportanceId_dictText'
- }
-
],
selectedRowKeys: [],
oldSelectRows: [],
@@ -227,7 +209,7 @@
let that = this
this.loading = true
let params = this.getQueryParams()//鏌ヨ鏉′欢
- params.equipmentStatus = '1'
+ // params.equipmentStatus = '1'
await getAction(this.url.list, params).then((res) => {
if (res.success) {
for (let i = 0; i < res.result.records.length; i++) {
@@ -291,7 +273,7 @@
this.loadData()
},
handleSubmit() {
- this.$bus.$emit('selectionRows', this.selectionRows)
+ this.$emit('selectionRows', this.selectionRows)
this.searchReset(0)
this.close()
},
diff --git a/src/views/eam/modules/equipmentSeal/EquipmentSealDetailList.vue b/src/views/eam/modules/equipmentSeal/EquipmentSealDetailList.vue
index 6a74814..b47eea7 100644
--- a/src/views/eam/modules/equipmentSeal/EquipmentSealDetailList.vue
+++ b/src/views/eam/modules/equipmentSeal/EquipmentSealDetailList.vue
@@ -136,7 +136,7 @@
}
},
{
- title: '璁惧缂栫爜',
+ title: '缁熶竴缂栫爜',
align: "center",
dataIndex: 'equipmentNum'
},
diff --git a/src/views/eam/modules/equipmentSeal/EquipmentSealDetailModal.vue b/src/views/eam/modules/equipmentSeal/EquipmentSealDetailModal.vue
index 10e69ef..075ca89 100644
--- a/src/views/eam/modules/equipmentSeal/EquipmentSealDetailModal.vue
+++ b/src/views/eam/modules/equipmentSeal/EquipmentSealDetailModal.vue
@@ -12,8 +12,8 @@
<a-form-model ref="form" :model="model" :rules="validatorRules">
<a-row>
<a-col :span="24">
- <a-form-model-item label="璁惧缂栫爜" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentNum">
- <a-input v-model="model.equipmentNum"placeholder="璇疯緭鍏ヨ澶囩紪鐮�" disabled></a-input>
+ <a-form-model-item label="缁熶竴缂栫爜" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentNum">
+ <a-input v-model="model.equipmentNum"placeholder="璇疯緭鍏ョ粺涓�缂栫爜" disabled></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
diff --git a/src/views/eam/modules/equipmentSeal/EquipmentSealForm.vue b/src/views/eam/modules/equipmentSeal/EquipmentSealForm.vue
index 74abf77..1dafa9a 100644
--- a/src/views/eam/modules/equipmentSeal/EquipmentSealForm.vue
+++ b/src/views/eam/modules/equipmentSeal/EquipmentSealForm.vue
@@ -196,7 +196,7 @@
defaultValue: ''
},
{
- title: '璁惧缂栫爜',
+ title: '缁熶竴缂栫爜',
key: 'equipmentNum',
type: JVXETypes.normal,
width: '150px',
diff --git a/src/views/eam/modules/equipmentSeal/EquipmentSelectModal.vue b/src/views/eam/modules/equipmentSeal/EquipmentSelectModal.vue
index be79edf..fc3fb96 100644
--- a/src/views/eam/modules/equipmentSeal/EquipmentSelectModal.vue
+++ b/src/views/eam/modules/equipmentSeal/EquipmentSelectModal.vue
@@ -21,9 +21,9 @@
:md="8"
:sm="6"
>
- <a-form-item label="璁惧缂栫爜">
+ <a-form-item label="缁熶竴缂栫爜">
<a-input
- placeholder="璇疯緭鍏ヨ澶囩紪鐮�"
+ placeholder="璇疯緭鍏ョ粺涓�缂栫爜"
v-model="queryParam.num"
/>
</a-form-item>
@@ -32,9 +32,9 @@
:md="8"
:sm="6"
>
- <a-form-item label="璁惧缂栫爜">
+ <a-form-item label="缁熶竴缂栫爜">
<a-input
- placeholder="璇疯緭鍏ヨ澶囩紪鐮�"
+ placeholder="璇疯緭鍏ョ粺涓�缂栫爜"
v-model="queryParam.num"
/>
</a-form-item>
@@ -106,7 +106,7 @@
}
},
{
- title: '璁惧缂栫爜',
+ title: '缁熶竴缂栫爜',
align: 'center',
dataIndex: 'num'
},
diff --git a/src/views/eam/modules/equipmentTransfer/EquipmentTransferOutDetail.vue b/src/views/eam/modules/equipmentTransfer/EquipmentTransferOutDetail.vue
index aa1f74c..a0112fc 100644
--- a/src/views/eam/modules/equipmentTransfer/EquipmentTransferOutDetail.vue
+++ b/src/views/eam/modules/equipmentTransfer/EquipmentTransferOutDetail.vue
@@ -81,7 +81,7 @@
}
},
{
- title: '璁惧缂栫爜',
+ title: '缁熶竴缂栫爜',
align: 'center',
dataIndex: 'equipmentNum'
},
diff --git a/src/views/eam/modules/equipmentTransfer/EquipmentTransferOutDetailModal.vue b/src/views/eam/modules/equipmentTransfer/EquipmentTransferOutDetailModal.vue
index 7f649a3..5223d0b 100644
--- a/src/views/eam/modules/equipmentTransfer/EquipmentTransferOutDetailModal.vue
+++ b/src/views/eam/modules/equipmentTransfer/EquipmentTransferOutDetailModal.vue
@@ -204,7 +204,7 @@
width: 100
},
{
- title: '璁惧缂栫爜',
+ title: '缁熶竴缂栫爜',
align: 'center',
width: 100,
dataIndex: 'equipmentNum'
diff --git a/src/views/eam/modules/equipmentTransferIn/EquipmentTransferInDetail.vue b/src/views/eam/modules/equipmentTransferIn/EquipmentTransferInDetail.vue
index 03441e2..6c9de01 100644
--- a/src/views/eam/modules/equipmentTransferIn/EquipmentTransferInDetail.vue
+++ b/src/views/eam/modules/equipmentTransferIn/EquipmentTransferInDetail.vue
@@ -80,7 +80,7 @@
}
},
{
- title: '璁惧缂栫爜',
+ title: '缁熶竴缂栫爜',
align: 'center',
dataIndex: 'equipmentNum'
},
diff --git a/src/views/eam/modules/equipmentTransferIn/EquipmentTransferInDetailModal.vue b/src/views/eam/modules/equipmentTransferIn/EquipmentTransferInDetailModal.vue
index 60076dc..5c14137 100644
--- a/src/views/eam/modules/equipmentTransferIn/EquipmentTransferInDetailModal.vue
+++ b/src/views/eam/modules/equipmentTransferIn/EquipmentTransferInDetailModal.vue
@@ -243,7 +243,7 @@
width: 100
},
{
- title: '璁惧缂栫爜',
+ title: '缁熶竴缂栫爜',
align: 'center',
width: 100,
dataIndex: 'equipmentNum'
diff --git a/src/views/eam/modules/equipmentUnseal/EquipmentSelectModal.vue b/src/views/eam/modules/equipmentUnseal/EquipmentSelectModal.vue
index 97effbd..7c43fd9 100644
--- a/src/views/eam/modules/equipmentUnseal/EquipmentSelectModal.vue
+++ b/src/views/eam/modules/equipmentUnseal/EquipmentSelectModal.vue
@@ -21,9 +21,9 @@
:md="8"
:sm="6"
>
- <a-form-item label="璁惧缂栫爜">
+ <a-form-item label="缁熶竴缂栫爜">
<a-input
- placeholder="璇疯緭鍏ヨ澶囩紪鐮�"
+ placeholder="璇疯緭鍏ョ粺涓�缂栫爜"
v-model="queryParam.num"
/>
</a-form-item>
@@ -106,7 +106,7 @@
}
},
{
- title: '璁惧缂栫爜',
+ title: '缁熶竴缂栫爜',
align: 'center',
dataIndex: 'num'
},
diff --git a/src/views/eam/modules/equipmentUnseal/EquipmentUnsealDetailList.vue b/src/views/eam/modules/equipmentUnseal/EquipmentUnsealDetailList.vue
index aca3e99..00b1a09 100644
--- a/src/views/eam/modules/equipmentUnseal/EquipmentUnsealDetailList.vue
+++ b/src/views/eam/modules/equipmentUnseal/EquipmentUnsealDetailList.vue
@@ -153,7 +153,7 @@
// dataIndex: 'equipmentId'
// },
{
- title: '璁惧缂栫爜',
+ title: '缁熶竴缂栫爜',
align: "center",
dataIndex: 'equipmentNum'
},
diff --git a/src/views/eam/modules/equipmentUnseal/EquipmentUnsealDetailModal.vue b/src/views/eam/modules/equipmentUnseal/EquipmentUnsealDetailModal.vue
index 4d0e015..97c36d0 100644
--- a/src/views/eam/modules/equipmentUnseal/EquipmentUnsealDetailModal.vue
+++ b/src/views/eam/modules/equipmentUnseal/EquipmentUnsealDetailModal.vue
@@ -22,8 +22,8 @@
</a-form-model-item>
</a-col>
<a-col :span="24">
- <a-form-model-item label="璁惧缂栫爜" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentNum">
- <a-input v-model="model.equipmentNum"placeholder="璇疯緭鍏ヨ澶囩紪鐮�" disabled></a-input>
+ <a-form-model-item label="缁熶竴缂栫爜" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentNum">
+ <a-input v-model="model.equipmentNum"placeholder="璇疯緭鍏ョ粺涓�缂栫爜" disabled></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
diff --git a/src/views/eam/modules/equipmentUnseal/EquipmentUnsealForm.vue b/src/views/eam/modules/equipmentUnseal/EquipmentUnsealForm.vue
index cfad49b..398b08d 100644
--- a/src/views/eam/modules/equipmentUnseal/EquipmentUnsealForm.vue
+++ b/src/views/eam/modules/equipmentUnseal/EquipmentUnsealForm.vue
@@ -208,7 +208,7 @@
defaultValue: ''
},
{
- title: '璁惧缂栫爜',
+ title: '缁熶竴缂栫爜',
key: 'equipmentNum',
type: JVXETypes.normal,
width: '150px',
diff --git a/src/views/eam/modules/inspectionProject/InspectionProjectModel.vue b/src/views/eam/modules/inspectionProject/InspectionProjectModel.vue
index b78c688..196cf8c 100644
--- a/src/views/eam/modules/inspectionProject/InspectionProjectModel.vue
+++ b/src/views/eam/modules/inspectionProject/InspectionProjectModel.vue
@@ -62,7 +62,7 @@
</a-row>
<a-row :gutter="24">
- <a-col :span="12">
+ <!-- <a-col :span="12">
<a-form-item
label="妫�楠屽�肩被鍨�"
:labelCol="labelCol"
@@ -78,11 +78,9 @@
@change="(e)=>handleChange(e)"
/>
</a-form-item>
- </a-col>
- <a-col
- v-if="testValueType == '2'"
- :span="12"
- >
+ </a-col> -->
+ <a-col :span="12">
+ <!-- v-if="testValueType == '2'" -->
<a-form-item
label="妫�娴嬫爣鍑�"
:labelCol="labelCol"
@@ -116,7 +114,7 @@
</a-form-item>
</a-col> -->
- <a-col
+ <!-- <a-col
v-if="testValueType == '1'"
:span="12"
>
@@ -133,9 +131,9 @@
v-decorator="['surfaceValue', validatorRules.surfaceValue ]"
/>
</a-form-item>
- </a-col>
+ </a-col> -->
</a-row>
- <a-row
+ <!-- <a-row
v-if="testValueType == '1'"
:gutter="24"
>
@@ -169,8 +167,8 @@
/>
</a-form-item>
</a-col>
- </a-row>
- <a-row :gutter="24">
+ </a-row> -->
+ <!-- <a-row :gutter="24">
<a-col :span="12">
<a-form-item
label="鐐规鏂规硶"
@@ -202,8 +200,8 @@
v-decorator="['unitId', validatorRules.unitId]"
/>
</a-form-item>
- </a-col>
- <!-- <a-col :span="12">
+ </a-col> -->
+ <!-- <a-col :span="12">
<a-form-item
label="鐐规宸ュ叿"
:labelCol="labelCol"
@@ -217,7 +215,7 @@
/>
</a-form-item>
</a-col> -->
- </a-row>
+ <!-- </a-row> -->
<a-row :gutter="24">
<a-col :span="24">
@@ -246,13 +244,13 @@
>
鍏抽棴
</a-button>
- <a-button
+ <!-- <a-button
v-if="!this.model.id"
:disabled="disableSubmit || confirmLoading"
:loading="confirmLoading"
@click="handleOkAndAdd"
type="primary"
- >淇濆瓨骞剁户缁柊澧�</a-button>
+ >淇濆瓨骞剁户缁柊澧�</a-button> -->
<a-button
:disabled="disableSubmit || confirmLoading"
:loading="confirmLoading"
@@ -361,25 +359,24 @@
this.model = Object.assign({}, record);
this.visible = true;
this.disableSubmit = false;
- this.testValueType = record.testValueType
+ // this.testValueType = record.testValueType
this.$nextTick(() => {
this.form.setFieldsValue(pick(this.model, 'inspectionProjectCategoryNumName',
- 'num', 'name', 'unitId', 'detectionStandard', 'testValueType', 'inspectionMethod', 'inspectionTool', 'remark'))
+ 'name', 'detectionStandard', 'remark'))
});
- if (record.testValueType == '1') {
- this.$nextTick(() => {
- this.form.setFieldsValue(pick(this.model, 'surfaceValue', 'upValue', 'downValue'))
- });
- }
+ // if (record.testValueType == '1') {
+ // this.$nextTick(() => {
+ // this.form.setFieldsValue(pick(this.model, 'surfaceValue', 'upValue', 'downValue'))
+ // });
+ // }
if (record.id) {
this.codeDisable = true;
} else {
- debugger
this.codeDisable = false;
- this.$nextTick(() => {
- this.form.setFieldsValue({ "testValueType": '2' })
- this.testValueType = '2'
- });
+ // this.$nextTick(() => {
+ // this.form.setFieldsValue({ "testValueType": '2' })
+ // this.testValueType = '2'
+ // });
}
},
@@ -391,32 +388,32 @@
//淇濆瓨骞舵柊澧炴寜閽Е鍙�
- handleOkAndAdd() {
- const that = this
- // 瑙﹀彂琛ㄥ崟楠岃瘉
- this.form.validateFields((err, values) => {
- if (!err) {
- that.confirmLoading = true;
- let formData = Object.assign(this.model, values);
- formData.inspectionProjectCategoryId = this.inspectionProjectCategoryId
- postAction(this.url.add, formData).then((res) => {
- if (res.success) {
- that.$message.success(res.message);
- that.$emit('ok');
- that.alterFlag = new Date();
- } else {
- that.$message.warning(res.message);
- }
- }).finally(() => {
- this.confirmLoading = false
- this.form.setFieldsValue(pick(this.model, 'inspectionProjectCategoryNumName'))
- this.form.setFieldsValue({ "inspectionContent": null, "inspectionRequire": null, "inspectionMethod": null, "inspectionTool": null, "num": null, "name": null, "remark": null })
- })
- } else {
- return false
- }
- })
- },
+ // handleOkAndAdd() {
+ // const that = this
+ // // 瑙﹀彂琛ㄥ崟楠岃瘉
+ // this.form.validateFields((err, values) => {
+ // if (!err) {
+ // that.confirmLoading = true;
+ // let formData = Object.assign(this.model, values);
+ // formData.inspectionProjectCategoryId = this.inspectionProjectCategoryId
+ // postAction(this.url.add, formData).then((res) => {
+ // if (res.success) {
+ // that.$message.success(res.message);
+ // that.$emit('ok');
+ // that.alterFlag = new Date();
+ // } else {
+ // that.$message.warning(res.message);
+ // }
+ // }).finally(() => {
+ // this.confirmLoading = false
+ // this.form.setFieldsValue(pick(this.model, 'inspectionProjectCategoryNumName'))
+ // this.form.setFieldsValue({ "inspectionContent": null, "inspectionRequire": null, "inspectionMethod": null, "inspectionTool": null, "num": null, "name": null, "remark": null })
+ // })
+ // } else {
+ // return false
+ // }
+ // })
+ // },
handleOk() {
const that = this;
@@ -452,79 +449,79 @@
this.close()
},
- handleChange(val) {
- this.testValueType = val
- },
+ // handleChange(val) {
+ // this.testValueType = val
+ // },
- validateDownValue(rule, value, callback) {
- let data = this.form.getFieldsValue(['surfaceValue']);
- if (data.surfaceValue == null || data.surfaceValue == "") {
- callback('鍚嶄箟鍊间笉鑳戒负绌猴紒')
- } else {
- if (value > data.surfaceValue) {
- callback('涓嬪亸宸�间笉鑳藉ぇ浜庡悕涔夊�硷紒')
- } else {
- callback()
- }
- }
- },
+ // validateDownValue(rule, value, callback) {
+ // let data = this.form.getFieldsValue(['surfaceValue']);
+ // if (data.surfaceValue == null || data.surfaceValue == "") {
+ // callback('鍚嶄箟鍊间笉鑳戒负绌猴紒')
+ // } else {
+ // if (value > data.surfaceValue) {
+ // callback('涓嬪亸宸�间笉鑳藉ぇ浜庡悕涔夊�硷紒')
+ // } else {
+ // callback()
+ // }
+ // }
+ // },
- validateSurfaceValue(rule, value, callback) {
- this.form.setFieldsValue({ "upValue": null, "downValue": null })
- // let data = this.form.getFieldsValue(['surfaceValue']);
- // if (value > data.surfaceValue) {
- // callback('涓嶅悎鏍兼暟閲忓簲灏忎簬妫�楠屾暟閲忥紒')
- // } else {
- // callback()
- // }
- },
+ // validateSurfaceValue(rule, value, callback) {
+ // this.form.setFieldsValue({ "upValue": null, "downValue": null })
+ // // let data = this.form.getFieldsValue(['surfaceValue']);
+ // // if (value > data.surfaceValue) {
+ // // callback('涓嶅悎鏍兼暟閲忓簲灏忎簬妫�楠屾暟閲忥紒')
+ // // } else {
+ // // callback()
+ // // }
+ // },
- validateAnalysisMethod(rule, value, callback) {
- let data = this.form.getFieldsValue(['surfaceValue']);
- if (value > data.surfaceValue) {
- callback('涓嶅悎鏍兼暟閲忓簲灏忎簬妫�楠屾暟閲忥紒')
- } else {
- callback()
- }
- },
+ // validateAnalysisMethod(rule, value, callback) {
+ // let data = this.form.getFieldsValue(['surfaceValue']);
+ // if (value > data.surfaceValue) {
+ // callback('涓嶅悎鏍兼暟閲忓簲灏忎簬妫�楠屾暟閲忥紒')
+ // } else {
+ // callback()
+ // }
+ // },
//楠岃瘉 缂栧彿
- validateNum(rule, value, callback) {
- var params = {
- tableName: 'mom_eam_inspection_project',
- fieldName: 'num',
- fieldVal: value,
- dataId: this.model.id,
- //鏁版嵁搴撲腑瀛樺湪瀛楁del_flag骞朵娇鐢ㄨ瀛楁浣滀负鏈垹闄ょ瓥鐣ワ紝鐪熷垹闄わ細false 鍋囧垹闄わ細true
- delFlag: '0',
- };
- duplicateCheck(params).then((res) => {
- if (res.success) {
- callback();
- } else {
- callback("缂栧彿宸插瓨鍦�!");
- }
- })
- },
+ // validateNum(rule, value, callback) {
+ // var params = {
+ // tableName: 'mom_eam_inspection_project',
+ // fieldName: 'num',
+ // fieldVal: value,
+ // dataId: this.model.id,
+ // //鏁版嵁搴撲腑瀛樺湪瀛楁del_flag骞朵娇鐢ㄨ瀛楁浣滀负鏈垹闄ょ瓥鐣ワ紝鐪熷垹闄わ細false 鍋囧垹闄わ細true
+ // delFlag: '0',
+ // };
+ // duplicateCheck(params).then((res) => {
+ // if (res.success) {
+ // callback();
+ // } else {
+ // callback("缂栧彿宸插瓨鍦�!");
+ // }
+ // })
+ // },
- //楠岃瘉 鍚嶇О
- validateName(rule, value, callback) {
- var params = {
- tableName: 'mom_eam_inspection_project',
- fieldName: 'name',
- fieldVal: value,
- dataId: this.model.id,
- //鏁版嵁搴撲腑瀛樺湪瀛楁del_flag骞朵娇鐢ㄨ瀛楁浣滀负鏈垹闄ょ瓥鐣ワ紝鐪熷垹闄わ細false 鍋囧垹闄わ細true
- delFlag: '0',
- };
- duplicateCheck(params).then((res) => {
- if (res.success) {
- callback();
- } else {
- callback("鍚嶇О宸插瓨鍦�!");
- }
- })
- },
+ // //楠岃瘉 鍚嶇О
+ // validateName(rule, value, callback) {
+ // var params = {
+ // tableName: 'mom_eam_inspection_project',
+ // fieldName: 'name',
+ // fieldVal: value,
+ // dataId: this.model.id,
+ // //鏁版嵁搴撲腑瀛樺湪瀛楁del_flag骞朵娇鐢ㄨ瀛楁浣滀负鏈垹闄ょ瓥鐣ワ紝鐪熷垹闄わ細false 鍋囧垹闄わ細true
+ // delFlag: '0',
+ // };
+ // duplicateCheck(params).then((res) => {
+ // if (res.success) {
+ // callback();
+ // } else {
+ // callback("鍚嶇О宸插瓨鍦�!");
+ // }
+ // })
+ // },
},
watch: {
diff --git a/src/views/eam/modules/inspectionProject/InspectionProjectRight.vue b/src/views/eam/modules/inspectionProject/InspectionProjectRight.vue
index 98c902f..4a56fb1 100644
--- a/src/views/eam/modules/inspectionProject/InspectionProjectRight.vue
+++ b/src/views/eam/modules/inspectionProject/InspectionProjectRight.vue
@@ -56,8 +56,18 @@
icon="plus"
:hidden="disabled"
>鏂板</a-button>
- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
- <a-button type="primary" icon="import" >瀵煎叆</a-button>
+ <a-upload
+ name="file"
+ :showUploadList="false"
+ :multiple="false"
+ :headers="tokenHeader"
+ :action="importExcelUrl"
+ @change="handleImportExcel"
+ >
+ <a-button
+ type="primary"
+ icon="import"
+ >瀵煎叆</a-button>
</a-upload>
<a-button
type="primary"
@@ -91,7 +101,7 @@
:loading="loading"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@change="handleTableChange"
- :scroll="{ x: 'calc(1400px + 50%)', y: 900 }"
+ :scroll="{ x: 'calc(1000px + 50%)', y: 900 }"
>
<!--瀛楃涓茶秴闀挎埅鍙栫渷鐣ュ彿鏄剧ず-->
<span
@@ -274,26 +284,26 @@
align: "center",
dataIndex: 'detectionStandard',
},
- {
- title: '鍚堟牸鑼冨洿 ',
- align: "center",
- dataIndex: 'acceptabilityLimit',
- },
- {
- title: '鐐规鏂规硶',
- align: "center",
- dataIndex: 'inspectionMethod_dictText',
- },
- {
- title: '妫�楠屽�肩被鍨�',
- align: "center",
- dataIndex: 'testValueType_dictText',
- },
- {
- title: '璁￠噺鍗曚綅',
- align: 'center',
- dataIndex: 'unitId_dictText',
- },
+ // {
+ // title: '鍚堟牸鑼冨洿 ',
+ // align: "center",
+ // dataIndex: 'acceptabilityLimit',
+ // },
+ // {
+ // title: '鐐规鏂规硶',
+ // align: "center",
+ // dataIndex: 'inspectionMethod_dictText',
+ // },
+ // {
+ // title: '妫�楠屽�肩被鍨�',
+ // align: "center",
+ // dataIndex: 'testValueType_dictText',
+ // },
+ // {
+ // title: '璁￠噺鍗曚綅',
+ // align: 'center',
+ // dataIndex: 'unitId_dictText',
+ // },
// {
// title: '鐐规宸ュ叿',
// align: "center",
@@ -317,9 +327,9 @@
scopedSlots: {
customRender: 'action'
},
- width: 150,
fixed: 'right',
},
+ // width: 150,
],
url: {
list: '/eam/inspectionProject/list',
@@ -332,10 +342,10 @@
},
computed: {
- importExcelUrl: function(){
- return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
- }
- },
+ importExcelUrl: function () {
+ return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+ }
+ },
methods: {
handleAdd: function () {
this.$refs.modalForm.add({ inspectionProjectCategoryNumName: this.inspectionProjectCategoryNumName });
diff --git a/src/views/eam/modules/line/EquipmentListOfLine.vue b/src/views/eam/modules/line/EquipmentListOfLine.vue
new file mode 100644
index 0000000..b485b2f
--- /dev/null
+++ b/src/views/eam/modules/line/EquipmentListOfLine.vue
@@ -0,0 +1,200 @@
+<template>
+ <a-card :bordered="false" :class="'cust-erp-sub-tab'">
+ <!-- 鏌ヨ鍖哄煙 -->
+ <div class="table-page-search-wrapper">
+ <a-form layout="inline" @keyup.enter.native="searchQuery">
+ <a-row :gutter="24">
+ </a-row>
+ </a-form>
+ </div>
+ <div>
+ <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+ <i class="anticon anticon-info-circle ant-alert-icon"></i> 宸查�夋嫨 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>椤�
+ <a style="margin-left: 24px" @click="onClearSelected">娓呯┖</a>
+ </div>
+
+ <a-table
+ ref="table"
+ size="middle"
+ bordered
+ class="j-table-force-nowrap"
+ rowKey="id"
+ :scroll="{x:true}"
+ :columns="columns"
+ :dataSource="dataSource"
+ :pagination="ipagination"
+ :loading="loading"
+ :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+ :rowClassName="tableRowClass"
+ @change="handleTableChange">
+ <span
+ slot="specificEquipment"
+ slot-scope="text"
+ >
+ <a-icon type="check" style="color: rgb(0, 21, 255);" v-if="text==='鏄�'" />
+ <a-icon type="close" v-else style="color:red;"/>
+ </span>
+ <template slot="htmlSlot" slot-scope="text">
+ <div v-html="text"></div>
+ </template>
+ <template slot="imgSlot" slot-scope="text,record">
+ <span v-if="!text" style="font-size: 12px;font-style: italic;">鏃犲浘鐗�</span>
+ <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+ </template>
+ <template slot="fileSlot" slot-scope="text">
+ <span v-if="!text" style="font-size: 12px;font-style: italic;">鏃犳枃浠�</span>
+ <a-button
+ v-else
+ :ghost="true"
+ type="primary"
+ icon="download"
+ size="small"
+ @click="downloadFile(text)">
+ 涓嬭浇
+ </a-button>
+ </template>
+
+ <span slot="action" slot-scope="text, record">
+ <a @click="handleEdit(record)">缂栬緫</a>
+ <a-divider type="vertical" />
+ <a-popconfirm title="纭畾鍒犻櫎鍚�?" @confirm="() => handleDelete(record.id)">
+ <a>鍒犻櫎</a>
+ </a-popconfirm>
+ </span>
+
+ </a-table>
+ </div>
+ </a-card>
+</template>
+
+<script>
+
+ import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+ export default {
+ name: "EquipmentListOfLine",
+ disableMixinCreated:true,
+ mixins:[JeecgListMixin],
+ components: { },
+ props:{
+ mainId:{
+ type:String,
+ default:'',
+ required:false
+ }
+ },
+ watch:{
+ mainId:{
+ immediate: true,
+ handler(val) {
+ if(!this.mainId){
+ this.clearList()
+ }else{
+ this.queryParam['lineId'] = val
+ this.loadData(1);
+ }
+ }
+ }
+ },
+ data () {
+ return {
+ description: '璁惧',
+ disableMixinCreated:true,
+ // 琛ㄥご
+ columns: [
+ {
+ title: '涓昏澶�?',
+ align: "center",
+ dataIndex: 'isMeta_dictText',
+ width:50,
+ scopedSlots: { customRender: 'specificEquipment' }
+ },
+ {
+ title: '璁惧绫诲瀷',
+ align: "center",
+ dataIndex: 'equipmentCategoryId_dictText',
+ width:200
+ },
+ {
+ title: '缁熶竴缂栧彿',
+ align: "center",
+ dataIndex: 'num',
+ width:200
+ },
+ {
+ title: '璁惧鍚嶇О',
+ align: "center",
+ dataIndex: 'name',
+ width:200
+ },
+ {
+ title: '鍨嬪彿',
+ align: "center",
+ dataIndex: 'model',
+ width:200
+ },
+ {
+ title: '浣跨敤閮ㄩ棬',
+ align: "center",
+ dataIndex: 'useId_dictText',
+ width:200
+ },
+ {
+ title: 'ABC鏍囪瘑',
+ align: "center",
+ dataIndex: 'equipmentImportanceId',
+ width:100
+ },
+ {
+ title: '鍏抽敭璁惧',
+ align: "center",
+ dataIndex: 'specificEquipment_dictText',
+ width:100
+ },
+ {
+ title: '鎶�鏈姸鎬�',
+ align: "center",
+ dataIndex: 'technologyStatus_dictText',
+ width:100
+ },
+ ],
+ url: {
+ list: "/eam/equipment/getEquipmentList",
+ },
+ dictOptions:{
+ }
+ }
+ },
+ created() {
+ },
+ computed: {
+ importExcelUrl(){
+ return `${window._CONFIG['domianURL']}/${this.url.importUrl}/${this.mainId}`;
+ }
+ },
+ methods: {
+ clearList(){
+ this.dataSource=[]
+ this.selectedRowKeys=[]
+ this.ipagination.current = 1
+ },
+ tableRowClass(record, index) {
+ if (record.isMeta==='yes') {
+ return 'primary'
+ }
+ },
+
+ },
+ mounted(){
+ this.$bus.$on('loadData', (data) => {
+ this.loadData();
+ });
+ }
+ }
+</script>
+<style scoped>
+ @import '~@assets/less/common.less';
+ .primary {
+ color: red;
+ font-weight: bold;
+}
+</style>
diff --git a/src/views/eam/modules/line/EquipmentOfLineForm.vue b/src/views/eam/modules/line/EquipmentOfLineForm.vue
new file mode 100644
index 0000000..fcbd6a2
--- /dev/null
+++ b/src/views/eam/modules/line/EquipmentOfLineForm.vue
@@ -0,0 +1,363 @@
+<template>
+ <a-spin :spinning="confirmLoading">
+ <j-form-container :disabled="formDisabled">
+ <!-- 涓昏〃鍗曞尯鍩� -->
+ <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
+ <a-row>
+ <a-col :span="6">
+ <a-form-model-item
+ label="鐢熶骇绾挎墍灞炲垎绫�"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="equipmentCategoryId"
+ >
+ <j-dict-select-tag
+ allow-clear
+ placeholder="鐢熶骇绾挎墍灞炲垎绫�"
+ :disabled="formDisabled"
+ :triggerChange="true"
+ :dictCode="caytegoryParam==='all'?'mom_eam_equipment_category,name,id':'mom_eam_equipment_category,name,id,equipment_category_uda1 = '+'\''+caytegoryParam+'\''"
+ v-model="model.equipmentCategoryId"
+ />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="6">
+ <a-form-model-item
+ label="鐢熶骇绾跨紪鐮�"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="num"
+ >
+ <a-input
+ v-model="model.num"
+ placeholder="璇疯緭鍏ョ敓浜х嚎缂栧彿"
+ :disabled="formDisabled"
+ ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="6">
+ <a-form-model-item
+ label="鐢熶骇绾垮悕绉�"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="name"
+ >
+ <a-input
+ v-model="model.name"
+ placeholder="璇疯緭鍏ョ敓浜х嚎鍚嶇О"
+ :disabled="formDisabled"
+ ></a-input>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ </a-form-model>
+ </j-form-container>
+ <!-- 瀛愯〃鍗曞尯鍩� -->
+ <a-tabs v-model="activeKey" @change="handleChangeTabs">
+ <a-tab-pane tab="璁惧" :key="refKeys[0]" :forceRender="true">
+ <j-vxe-table
+ keep-source
+ :ref="refKeys[0]"
+ :loading="equipmentOfLineList.loading"
+ :columns="equipmentOfLineList.columns"
+ :dataSource="equipmentOfLineList.dataSource"
+ :maxHeight="600"
+ :disabled="formDisabled"
+ :rowNumber="true"
+ :rowSelection="true"
+ :bordered="true"
+ :alwaysEdit="true"
+ :toolbar="true"
+ @valueChange="changeDate"
+ :toolbarConfig="toolbarConfig"
+ >
+ <template slot="toolbarPrefix">
+ <a-button type="primary" @click="selectEquipmentList" :disabled="formDisabled">閫夋嫨璁惧
+ </a-button>
+ </template>
+ </j-vxe-table>
+ </a-tab-pane>
+ </a-tabs>
+ <equipment-select-modal ref="EquipmentSelectModal" @selectionRows="addSelectedEquipments"></equipment-select-modal>
+ </a-spin>
+</template>
+
+<script>
+
+ import { getAction } from '@/api/manage'
+ import { JVxeTableModelMixin } from '@/mixins/JVxeTableModelMixin.js'
+ import { duplicateCheck } from '@/api/api'
+ import { JVXETypes } from '@/components/jeecg/JVxeTable'
+ import { validateDuplicateValue } from '@/utils/util'
+ import { getRefPromise,VALIDATE_FAILED} from '@/components/jeecg/JVxeTable/utils/vxeUtils.js'
+ import JFormContainer from '@/components/jeecg/JFormContainer'
+ import EquipmentSelectModal from '../equipmentScrap/EquipmentSelectModal.vue'
+
+ import dayjs from 'dayjs'
+ export default {
+ name: 'EquipmentOfLineForm',
+ mixins: [JVxeTableModelMixin],
+ components: {
+ JFormContainer,
+ dayjs,
+ EquipmentSelectModal
+ },
+ props: {
+ //琛ㄥ崟绂佺敤
+ disabled: {
+ type: Boolean,
+ default: false,
+ required: false
+ },
+ caytegoryParam: {
+ type: String,
+ default: '',
+ required: false
+ }
+ },
+ data() {
+ return {
+ toolbarConfig: {
+ // prefix 鍓嶇紑锛泂uffix 鍚庣紑
+ slot: ['prefix', 'suffix'],
+ // add 鏂板鎸夐挳锛況emove 鍒犻櫎鎸夐挳锛沜learSelection 娓呯┖閫夋嫨鎸夐挳
+ btn: ['remove', 'clearSelection']
+ },
+ labelCol: {
+ xs: { span: 24 },
+ sm: { span: 5 },
+ },
+ wrapperCol: {
+ xs: { span: 24 },
+ sm: { span: 16 },
+ },
+ model:{
+ },
+ // 鏂板鏃跺瓙琛ㄩ粯璁ゆ坊鍔犲嚑琛岀┖鏁版嵁
+ addDefaultRowNum: 0,
+ validatorRules: {
+ num: [
+ { required: true, message: '璇疯緭鍏ョ紪鐮�!' },
+ { validator: (rule, value, callback) => validateDuplicateValue('mom_eam_equipment', 'num', value, this.model.id, callback) }
+ ],
+ name: [
+ { required: true, message: '璇疯緭鍏ュ悕绉�!' }
+ ],
+ equipmentCategoryId:[
+ { required: true, message: '璇疯緭鍏ュ垎绫�!' }
+ ]
+ },
+ refKeys: ['equipmentOfLineTable', ],
+ tableKeys:['equipmentOfLineTable', ],
+ activeKey: 'equipmentOfLineTable',
+ equipmentOfLineList: {
+ loading: false,
+ dataSource: [],
+ columns: [
+ {
+ title: 'id',
+ key: 'id',
+ type: JVXETypes.hidden,
+ disabled:true,
+ align:'center',
+ },
+ {
+ title: 'showId',
+ key: 'showId',
+ type: JVXETypes.hidden,
+ disabled:true,
+ align:'center',
+ },
+ {
+ title: '缁熶竴缂栫爜',
+ key: 'num',
+ type: JVXETypes.normal,
+ width:"300px",
+ placeholder: '璇疯緭鍏�${title}',
+ disabled:true,
+ align:'center',
+ defaultValue:'',
+ },
+ {
+ title: '璁惧鍚嶇О',
+ key: 'name',
+ type: JVXETypes.normal,
+ width:"300px",
+ placeholder: '璇疯緭鍏�${title}',
+ disabled:true,
+ align:'center',
+ defaultValue:'',
+ },
+ {
+ title: '璁惧鍨嬪彿',
+ key: 'model',
+ type: JVXETypes.normal,
+ width:"202px",
+ placeholder: '璇疯緭鍏�${title}',
+ disabled:true,
+ align:'center',
+ defaultValue:'',
+ },
+ {
+ title: '鍏抽敭璁惧鏍囪瘑',
+ key: 'specificEquipment_dictText',
+ type: JVXETypes.normal,
+ width:"202px",
+ placeholder: '璇疯緭鍏�${title}',
+ disabled:true,
+ align:'center',
+ defaultValue:'',
+ },
+ {
+ title: 'ABC鏍囪瘑',
+ key: 'equipmentImportanceId',
+ type: JVXETypes.normal,
+ width:"202px",
+ placeholder: '璇疯緭鍏�${title}',
+ disabled:true,
+ align:'center',
+ defaultValue:'',
+ },
+ {
+ title: '鎶�鏈姸鎬�',
+ key: 'technologyStatus_dictText',
+ type: JVXETypes.normal,
+ width:"202px",
+ placeholder: '璇疯緭鍏�${title}',
+ disabled:true,
+ align:'center',
+ defaultValue:'',
+ },
+ {
+ title: '鏄惁涓昏澶�',
+ key: 'isMeta',
+ type: JVXETypes.select,
+ width:"202px",
+ placeholder: '璇烽�夋嫨${title}',
+ dictCode:'is_product',
+ align:'center',
+ options:[],
+ validateRules: [
+ {
+ required: true, // 蹇呭～
+ message: '璇疯緭鍏�${title}' // 鏄剧ず鐨勬枃鏈�
+ },
+ ]
+ },
+ ]
+ },
+ url: {
+ add: "/eam/equipment/addLine",
+ edit:"/eam/equipment/editLine",
+ equipmentOfLineTable: {
+ list: "/eam/equipment/getEquipmentList",
+ },
+ }
+ }
+ },
+ computed: {
+ formDisabled(){
+ return this.disabled
+ },
+ },
+ created () {
+ },
+ methods: {
+ addBefore(){
+ this.equipmentOfLineList.dataSource=[];
+ },
+ getAllTable() {
+ let values = this.tableKeys.map(key => getRefPromise(this, key))
+ return Promise.all(values)
+ },
+ /** 璋冪敤瀹宔dit()鏂规硶涔嬪悗浼氳嚜鍔ㄨ皟鐢ㄦ鏂规硶 */
+ editAfter() {
+ this.$nextTick(() => {
+ })
+ // 鍔犺浇瀛愯〃鏁版嵁
+ if (this.model.id) {
+ let params = {lineId: this.model.id }
+ this.requestSubTableData(this.url.equipmentOfLineTable.list, params, this.equipmentOfLineList)
+ }
+ },
+ //鏍￠獙鎵�鏈変竴瀵逛竴瀛愯〃琛ㄥ崟
+ validateSubForm(allValues){
+ return new Promise((resolve,reject)=>{
+ Promise.all([
+ ]).then(() => {
+ resolve(allValues)
+ }).catch(e => {
+ if (e.error === VALIDATE_FAILED) {
+ // 濡傛灉鏈夋湭閫氳繃琛ㄥ崟楠岃瘉鐨勫瓙琛紝灏辫嚜鍔ㄨ烦杞埌瀹冩墍鍦ㄧ殑tab
+ this.activeKey = e.index == null ? this.activeKey : this.refKeys[e.index]
+ } else {
+ console.error(e)
+ }
+ })
+ })
+ },
+ /** 鏁寸悊鎴恌ormData */
+ classifyIntoFormData(allValues) {
+ let main = Object.assign(this.model, allValues.formValue)
+ return {
+ ...main, // 灞曞紑
+ equipmentOfLineTable: allValues.tablesValue[0].tableData,
+ }
+ },
+ validateError(msg){
+ this.$message.error(msg)
+ },
+ changeDate(target){
+ let tableData =this.$refs.equipmentOfLineTable.getTableData();
+ let id = target.row.id
+ if(target.column.key==='isMeta'){
+ for(var i = 0;i<tableData.length;i++){
+ if(id!==tableData[i].showId){
+ this.$refs.equipmentOfLineTable.getRowById(tableData[i].showId).isMeta='no'
+ }
+ }
+ }
+ },
+ //閫夋嫨璁惧
+ selectEquipmentList() {
+ let ids = []
+ let tableData = this.$refs.equipmentOfLineTable.getTableData()
+ let deleteData = this.$refs.equipmentOfLineTable.getDeleteData()
+ for (let i = 0; i < tableData.length; i++) {
+ ids.push(tableData[i].showId)
+ }
+ this.$refs.EquipmentSelectModal.showModals(ids)
+ this.$refs.EquipmentSelectModal.title = '閫夋嫨璁惧'
+ this.$refs.EquipmentSelectModal.disableSubmit = false
+ },
+ addSelectedEquipments(data) {
+ let tableData = this.$refs.equipmentOfLineTable.getTableData()
+ // const seletedEquipmentIds = tableData.
+ var tableStr = JSON.stringify(tableData)
+ const addRows = []
+ for (let i = 0; i < data.length; i++) {
+ var equipment = {}
+ if (tableStr.indexOf(data[i].id)==-1) {
+ equipment = {
+ id: data[i].id,
+ num: data[i].num,
+ name: data[i].name,
+ model:data[i].model,
+ showId:data[i].id,
+ specificEquipment_dictText:data[i].specificEquipment_dictText,
+ technologyStatus_dictText:data[i].technologyStatus_dictText,
+ equipmentImportanceId:data[i].equipmentImportanceId,
+ isMeta:'no'
+ }
+ }
+ addRows.push(equipment)
+ }
+ this.$refs.equipmentOfLineTable.pushRows(addRows)
+ },
+
+ }
+ }
+</script>
+
+<style scoped>
+</style>
\ No newline at end of file
diff --git a/src/views/eam/modules/line/EquipmentOfLineModal.vue b/src/views/eam/modules/line/EquipmentOfLineModal.vue
new file mode 100644
index 0000000..151d8c5
--- /dev/null
+++ b/src/views/eam/modules/line/EquipmentOfLineModal.vue
@@ -0,0 +1,75 @@
+<template>
+ <j-modal
+ :title="title"
+ :width="1520"
+ :height="600"
+ :visible="visible"
+ :maskClosable="true"
+ :fullscreen="true"
+ switchFullscreen
+ @ok="handleOk"
+ :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+ @cancel="handleCancel">
+ <equipment-of-line-form
+ :caytegoryParam="caytegoryParam"
+ ref="realForm"
+ @ok="submitCallback"
+ :disabled="disableSubmit"/>
+ </j-modal>
+</template>
+<script>
+import EquipmentOfLineForm from './EquipmentOfLineForm'
+ export default {
+ name: 'EquipmentOfLineModal',
+ components: {
+ EquipmentOfLineForm
+ },
+ props:{
+ caytegoryParam: {
+ type: String,
+ default: '',
+ required: false
+ }
+ },
+ data() {
+ return {
+ title:'',
+ width:1500,
+ visible: false,
+ disableSubmit: false
+ }
+ },
+ methods:{
+ add () {
+ this.visible=true
+ this.$nextTick(()=>{
+ this.$refs.realForm.addBefore();
+ })
+ },
+ edit (record) {
+ this.visible=true
+ this.$nextTick(()=>{
+ this.$refs.realForm.edit(record);
+ })
+ },
+ close () {
+ this.$emit('close');
+ this.visible = false;
+ },
+ handleOk () {
+ this.$refs.realForm.handleOk();
+ },
+ submitCallback(){
+ this.$emit('ok');
+ this.$bus.$emit('loadData')
+ this.visible = false;
+ },
+ handleCancel () {
+ this.close()
+ }
+ }
+ }
+</script>
+
+<style scoped>
+</style>
\ No newline at end of file
diff --git a/src/views/eam/modules/maintenanceProject/MaintenanceProjectModel.vue b/src/views/eam/modules/maintenanceProject/MaintenanceProjectModel.vue
index 083f2da..0096e25 100644
--- a/src/views/eam/modules/maintenanceProject/MaintenanceProjectModel.vue
+++ b/src/views/eam/modules/maintenanceProject/MaintenanceProjectModel.vue
@@ -47,15 +47,15 @@
</a-col> -->
<a-col :span="12">
<a-form-item
- label="瀹夊叏瑕佹眰"
+ label="淇濆吇閮ㄤ綅"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
>
<a-input
allow-clear
:disabled="disableSubmit"
- :placeholder="disableSubmit?'':'璇疯緭鍏ュ畨鍏ㄨ姹�'"
- v-decorator="['maintenanceRequire', validatorRules.maintenanceRequire ]"
+ :placeholder="disableSubmit?'':'璇疯緭鍏ヤ繚鍏婚儴浣�'"
+ v-decorator="['location', validatorRules.location ]"
/>
</a-form-item>
</a-col>
@@ -105,7 +105,7 @@
</a-form-item>
</a-col>
</a-row>
- <a-row :gutter="24">
+ <!-- <a-row :gutter="24">
<a-col :span="12">
<a-form-item
label="淇濆吇鏂规硶"
@@ -134,10 +134,9 @@
:placeholder="disableSubmit?'':'璇疯緭鍏ヤ繚鍏诲伐鍏�'"
v-decorator="['maintenanceTool', validatorRules.maintenanceTool ]"
/>
- <!-- dictCode="mom_eam_inspection_type,name,id,status!='0' and del_flag!='1'" -->
</a-form-item>
</a-col>
- </a-row>
+ </a-row> -->
<a-row :gutter="24">
<!-- <a-col :span="12">
@@ -157,7 +156,7 @@
</a-form-item>
</a-col> -->
</a-row>
- <a-row :gutter="24">
+ <!-- <a-row :gutter="24">
<a-col :span="12">
<a-form-item
label="宸ユ椂瀹氶"
@@ -174,7 +173,7 @@
</a-form-item>
</a-col>
- </a-row>
+ </a-row> -->
<a-row :gutter="24">
<a-col :span="24">
<a-form-item
diff --git a/src/views/eam/modules/maintenanceProject/MaintenanceProjectRight.vue b/src/views/eam/modules/maintenanceProject/MaintenanceProjectRight.vue
index 1957357..dfa22b7 100644
--- a/src/views/eam/modules/maintenanceProject/MaintenanceProjectRight.vue
+++ b/src/views/eam/modules/maintenanceProject/MaintenanceProjectRight.vue
@@ -88,8 +88,8 @@
:loading="loading"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@change="handleTableChange"
- :scroll="{ x: 'calc(1400px + 50%)', y: 900 }"
>
+ <!-- :scroll="{ x: 'calc(1400px + 50%)', y: 900 }" -->
<!--瀛楃涓茶秴闀挎埅鍙栫渷鐣ュ彿鏄剧ず-->
<span
slot="num"
@@ -120,28 +120,6 @@
:length="15"
/>
</span>
- <!-- <span
- slot="status"
- slot-scope="text,record"
- >
- <a-badge
- v-if="record.status==1"
- status="success"
- />
- <span
- v-if="record.status==1"
- class="success"
- >鍚敤</span>
- <a-badge
- v-if="record.status==0"
- status="error"
- />
- <span
- v-if="record.status==0"
- class="error"
- >绂佺敤</span>
- </span> -->
-
<span
slot="action"
slot-scope="text, record"
@@ -169,35 +147,12 @@
<a>鍒犻櫎</a>
</a-popconfirm>
</a-menu-item>
- <!-- <a-menu-item v-else>
- <a-popconfirm title="褰撳墠淇℃伅宸茶寮曠敤锛岃鍏堝垹闄ゅ叧鑱斾俊鎭悗鍐嶆墽琛屽垹闄ゆ搷浣�">
- <a class="frozenRowClass">鍒犻櫎</a>
- </a-popconfirm>
- </a-menu-item> -->
-
- <!-- <a-menu-item v-if="record.status==1">
- <a-popconfirm
- title="纭畾绂佺敤鍚�?"
- @confirm="() => handleActive(record.id)"
- >
- <a>绂佺敤</a>
- </a-popconfirm>
- </a-menu-item> -->
- <!-- <a-menu-item v-if="record.status==0">
- <a-popconfirm
- title="纭畾鍚敤鍚�?"
- @confirm="() => handleActive(record.id)"
- >
- <a>鍚敤</a>
- </a-popconfirm>
- </a-menu-item> -->
</a-menu>
</a-dropdown>
</span>
</a-table>
</div>
- <!-- table鍖哄煙-end -->
<maintenance-project-model
ref="modalForm"
@@ -265,14 +220,14 @@
align: 'center',
dataIndex: 'standard',
},
- {
- title: '淇濆吇椤圭洰鍒嗙被',
- align: 'center',
- dataIndex: 'maintenanceProjectCategoryNumName',
- scopedSlots: {
- customRender: 'maintenanceProjectCategoryNumName'
- },
- },
+ // {
+ // title: '淇濆吇椤圭洰鍒嗙被',
+ // align: 'center',
+ // dataIndex: 'maintenanceProjectCategoryNumName',
+ // scopedSlots: {
+ // customRender: 'maintenanceProjectCategoryNumName'
+ // },
+ // },
// {
// title: '缁翠繚绫诲瀷',
// align: 'center',
@@ -286,21 +241,21 @@
// align: "center",
// dataIndex: 'maintenanceSpecialtyId_dictText',
// },
- {
- title: '瀹夊叏瑕佹眰',
- align: "center",
- dataIndex: 'maintenanceRequire',
- },
- {
- title: '缁翠繚鏂规硶',
- align: "center",
- dataIndex: 'maintenanceMethod_dictText',
- },
- {
- title: '缁翠繚宸ュ叿',
- align: "center",
- dataIndex: 'maintenanceTool',
- },
+ // {
+ // title: '瀹夊叏瑕佹眰',
+ // align: "center",
+ // dataIndex: 'maintenanceRequire',
+ // },
+ // {
+ // title: '缁翠繚鏂规硶',
+ // align: "center",
+ // dataIndex: 'maintenanceMethod_dictText',
+ // },
+ // {
+ // title: '缁翠繚宸ュ叿',
+ // align: "center",
+ // dataIndex: 'maintenanceTool',
+ // },
{
title: '淇濆吇閮ㄤ綅',
align: "center",
@@ -316,16 +271,16 @@
align: "center",
dataIndex: 'createTime',
},
- {
- title: '淇敼浜�',
- align: "center",
- dataIndex: 'updateBy',
- },
- {
- title: '淇敼鏃堕棿',
- align: "center",
- dataIndex: 'updateTime',
- },
+ // {
+ // title: '淇敼浜�',
+ // align: "center",
+ // dataIndex: 'updateBy',
+ // },
+ // {
+ // title: '淇敼鏃堕棿',
+ // align: "center",
+ // dataIndex: 'updateTime',
+ // },
{
title: '鎿嶄綔',
diff --git a/src/views/eam/modules/malfunctionRepair/EquipmentList.vue b/src/views/eam/modules/malfunctionRepair/EquipmentList.vue
index 73a3350..9cec28a 100644
--- a/src/views/eam/modules/malfunctionRepair/EquipmentList.vue
+++ b/src/views/eam/modules/malfunctionRepair/EquipmentList.vue
@@ -11,6 +11,53 @@
>
<a-spin :spinning="confirmLoading">
<a-form :form="form">
+ <div class="table-page-search-wrapper">
+ <a-form
+ layout="inline"
+ @keyup.enter.native="searchQuery"
+ >
+ <a-row :gutter="24">
+ <a-col
+ :md="6"
+ :sm="8"
+ >
+ <a-form-item label="鍗曟嵁鍙�">
+ <a-input
+ placeholder="璇疯緭鍏ュ崟鎹彿妫�绱�"
+ v-model="queryParam.num"
+ ></a-input>
+ </a-form-item>
+ </a-col>
+
+ <a-col
+ :md="6"
+ :sm="8"
+ >
+ <a-form-item label="璁惧鍚嶇О">
+ <a-input
+ placeholder="璇疯緭鍏ヨ澶囧悕绉版绱�"
+ v-model="queryParam.name"
+ ></a-input>
+ </a-form-item>
+ </a-col>
+ <a-col
+ :md="6"
+ :sm="8"
+ >
+ <a-button
+ type="primary"
+ @click="searchQuery"
+ icon="search"
+ >鏌ヨ</a-button>
+ <a-button
+ @click="searchReset"
+ icon="reload"
+ style="margin-left:8px;"
+ >閲嶇疆</a-button>
+ </a-col>
+ </a-row>
+ </a-form>
+ </div>
<a-table
ref="table"
size="middle"
@@ -90,7 +137,7 @@
}
},
{
- title: '璁惧缂栫爜',
+ title: '缁熶竴缂栫爜',
align: 'center',
dataIndex: 'num',
},
@@ -123,13 +170,6 @@
methods: {
-
- searchQuery() {
- this.loadData(1);
- },
- searchReset() {
- this.loadData(1)
- },
list() {
this.selectedRowKeys = [];
this.selectedRowRecord = [];
diff --git a/src/views/eam/modules/malfunctionRepair/MalfunctionRepaireForm.vue b/src/views/eam/modules/malfunctionRepair/MalfunctionRepaireForm.vue
index c36671c..48dcb34 100644
--- a/src/views/eam/modules/malfunctionRepair/MalfunctionRepaireForm.vue
+++ b/src/views/eam/modules/malfunctionRepair/MalfunctionRepaireForm.vue
@@ -42,14 +42,14 @@
<a-row :gutter="24">
<a-col :span="12">
<a-form-model-item
- label="璁惧缂栫爜/鍚嶇О/鍨嬪彿"
+ label="缁熶竴缂栫爜/鍚嶇О/鍨嬪彿"
:labelCol="{span:6}"
:wrapperCol="{span:15}"
prop="equipmentId"
>
<a-select
v-model="equipmentId"
- :placeholder="disableSubmit ? '' : '璇烽�夋嫨璁惧缂栫爜 / 鍚嶇О / 鍨嬪彿'"
+ :placeholder="disableSubmit ? '' : '璇烽�夋嫨缁熶竴缂栫爜 / 鍚嶇О / 鍨嬪彿'"
:options="equipmentList"
@change="(e) => handleChange(e, 2)"
:disabled="disableSubmit"
diff --git a/src/views/eam/modules/malfunctionRepair/MalfunctionRepaireModal.vue b/src/views/eam/modules/malfunctionRepair/MalfunctionRepaireModal.vue
index 5394b39..99252ff 100644
--- a/src/views/eam/modules/malfunctionRepair/MalfunctionRepaireModal.vue
+++ b/src/views/eam/modules/malfunctionRepair/MalfunctionRepaireModal.vue
@@ -39,25 +39,21 @@
v-decorator="['isStop', validatorRules.isStop]"
/>
</a-form-item>
-
</a-col>
</a-row>
<a-row :gutter="24">
- <a-col :span="24/2">
- <a-form-item
- label="璁惧缂栫爜"
+ <a-col :span="12">
+ <a-form-model-item
+ label="鎶ヤ慨浜�"
+ prop="name"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
>
- <a-input-search
- :disabled="disableSubmit"
- placeholder="璇烽�夋嫨璁惧锛�"
- enter-button
- @search="onSearchEquipmentList()"
- :read-only="true"
- v-decorator="['equipmentNum', validatorRules.equipmentNum]"
- />
- </a-form-item>
+ <a-input
+ v-decorator="['errUda2', validatorRules.errUda2]"
+ placeholder="璇疯緭鍏ユ姤淇汉"
+ ></a-input>
+ </a-form-model-item>
</a-col>
<a-col :span="24/2">
<a-form-item
@@ -79,6 +75,22 @@
<a-row :gutter="24">
<a-col :span="24/2">
<a-form-item
+ label="缁熶竴缂栧彿"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ >
+ <a-input-search
+ :disabled="disableSubmit"
+ placeholder="璇烽�夋嫨璁惧锛�"
+ enter-button
+ @search="onSearchEquipmentList()"
+ :read-only="true"
+ v-decorator="['equipmentNum', validatorRules.equipmentNum]"
+ />
+ </a-form-item>
+ </a-col>
+ <a-col :span="24/2">
+ <a-form-item
label="璁惧鍚嶇О"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
@@ -91,6 +103,8 @@
/>
</a-form-item>
</a-col>
+ </a-row>
+ <a-row :gutter="24">
<a-col :span="24/2">
<a-form-item
label="璁惧瑙勬牸"
@@ -105,6 +119,21 @@
/>
</a-form-item>
</a-col>
+ <a-col :span="24/2">
+ <a-form-item
+ label="璁惧鍨嬪彿"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ >
+ <a-input
+ :disabled="true"
+ enter-button
+ :read-only="true"
+ v-decorator="['equipmentModel', validatorRules.equipmentModel]"
+ />
+ </a-form-item>
+ </a-col>
+ </a-row>
<a-row
hidden
:gutter="24"
@@ -117,7 +146,7 @@
>
<a-input
:disabled="true"
- :placeholder="disableSubmit?'':'璇疯緭鍏ヨ澶囩紪鐮�/鍚嶇О/鍨嬪彿'"
+ :placeholder="disableSubmit?'':'璇疯緭鍏ョ粺涓�缂栧彿/鍚嶇О/鍨嬪彿'"
v-decorator="['equipmentId', validatorRules.equipmentId ]"
/>
</a-form-item>
@@ -135,23 +164,8 @@
/>
</a-form-item>
</a-col>
- </a-row>
</a-row>
<a-row :gutter="24">
- <a-col :span="24/2">
- <a-form-item
- label="璁惧鍨嬪彿"
- :labelCol="labelCol"
- :wrapperCol="wrapperCol"
- >
- <a-input
- :disabled="true"
- enter-button
- :read-only="true"
- v-decorator="['equipmentModel', validatorRules.equipmentModel]"
- />
- </a-form-item>
- </a-col>
<a-col :span="24/2">
<a-form-item
label="浣跨敤閮ㄩ棬"
@@ -174,37 +188,6 @@
</a-form-item>
</a-col>
</a-row>
- <!-- <a-row :gutter="24">
- <a-col :span="24/2">
- <a-form-item
- label="绱ф�ョ▼搴�"
- :labelCol="labelCol"
- :wrapperCol="wrapperCol"
- >
- <j-dict-select-tag
- allow-clear
- :disabled="disableSubmit"
- :placeholder="disableSubmit?'':'璇烽�夋嫨绱ф�ョ▼搴�'"
- :triggerChange="true"
- dictCode="urgency"
- v-decorator="['urgency', validatorRules.urgency]"
- />
- </a-form-item>
- </a-col> -->
- <!-- <a-col :span="24/2" v-show="false">
- <a-form-item
- label="鏁呴殰鍘熷洜"
- :labelCol="labelCol"
- :wrapperCol="wrapperCol"
- >
- <a-input
- :disabled="disableSubmit"
- enter-button
- v-decorator="['faultReason', validatorRules.faultReason]"
- />
- </a-form-item>
- </a-col> -->
- <!-- </a-row> -->
<a-row :gutter="24">
<a-col :span="24/2">
<a-form-item
@@ -237,22 +220,67 @@
</a-form-item>
</a-col>
</a-row>
- <!-- <a-row :gutter="24">
- <a-col :span="24/2">
+ <a-row :gutter="24">
+ <a-col :span="24/2">
<a-form-item
- label="鏁呴殰鐓х墖"
+ label="鏄惁鍦ㄥ姞宸ラ浂浠�"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
>
- <j-image-upload
- :disabled="disableSubmit"
- :isMultiple="true"
- v-decorator="['photo', {}]"
- ></j-image-upload>
-
+ <j-dict-select-tag
+ allow-clear
+ :placeholder="disableSubmit?'':'璇烽�夋嫨鏄惁鍦ㄥ姞宸ラ浂浠�'"
+ :triggerChange="true"
+ @change="(e) => statusChange(e)"
+ dictCode="is_product"
+ v-decorator="['errUda1', validatorRules.errUda1]"
+ />
</a-form-item>
</a-col>
- </a-row> -->
+ <a-col :span="24/2" v-if="workingStatus">
+ <a-form-item
+ label="鍔犲伐闆朵欢鍙�"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ >
+ <a-input
+ allow-clear
+ :placeholder="disableSubmit?'':'璇疯緭鍏ュ姞宸ラ浂浠跺彿'"
+ v-decorator="['partNumber', validatorRules.partNumber ]"
+ />
+ </a-form-item>
+ </a-col>
+ </a-row>
+ <a-row :gutter="24">
+ <a-col :span="24/2" v-if="workingStatus">
+ <a-form-item
+ label="鎵规鍙�"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ >
+ <a-input
+ allow-clear
+ :placeholder="disableSubmit?'':'璇疯緭鍏ユ壒娆″彿'"
+ v-decorator="['batchNo', validatorRules.batchNo ]"
+ />
+ </a-form-item>
+ </a-col>
+ <a-col :span="24/2" v-if="workingStatus">
+ <a-form-item
+ label="浠舵暟"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ >
+ <a-input-number
+ allow-clear
+ style="width: 100%;"
+ :placeholder="disableSubmit?'':'璇疯緭鍏ヤ欢鏁�'"
+ :min="1"
+ v-decorator="['quantity', validatorRules.quantity]"
+ />
+ </a-form-item>
+ </a-col>
+ </a-row>
</a-form>
</a-spin>
@@ -346,6 +374,32 @@
{ max: 1000, min:1,message: '鏈�澶氬彲鎻忚堪1000瀛�!' },
]
},
+ errUda1:{
+ rules: [
+ { required: true, message: '璇烽�夋嫨鏄惁鍦ㄥ姞宸ラ浂浠�!' },
+ ]
+ },
+ errUda2: {
+ rules: [
+ { required: true, message: '璇疯緭鍏ユ姤淇汉!' },
+ { min:1,max:10, message: '闀垮害涓嶈兘澶т簬10涓瓧绗�!' },
+ ]
+ },
+ partNumber:{
+ rules: [
+ { required: true, message: '璇疯緭鍏ラ浂浠跺浘鍙�!' },
+ ]
+ },
+ batchNo:{
+ rules: [
+ { required: true, message: '璇疯緭鍏ユ壒娆″彿!' },
+ ]
+ },
+ quantity:{
+ rules: [
+ { required: true, message: '璇疯緭鍏ヤ欢鏁�!' },
+ ]
+ }
},
url: {
add: "/eam/equipmentReportRepair/add",
@@ -354,6 +408,7 @@
getNum:'/eam/sysIdentity/getNumNew'
},
dataSource: [],
+ workingStatus:false
}
},
@@ -372,6 +427,7 @@
getAction(this.url.getNum,param).then(res=>{
if(res.success){
modelDefault.num = res.result;
+ this.workingStatus = false;
modelDefault.faultTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss');
that.edit(modelDefault);
}
@@ -384,7 +440,7 @@
that.model = Object.assign({}, record);
that.visible = true;
that.$nextTick(() => {
- that.form.setFieldsValue(pick(that.model, 'num', 'isStop', 'equipmentId', 'equipmentNum', 'equipmentName', 'equipmentModel', 'equipmentSpecification', 'urgency', 'useDepartId', 'departName', 'faultDescription', 'faultTime', 'remark', "photo"));
+ that.form.setFieldsValue(pick(that.model,'errUda1' ,'num', 'isStop', 'equipmentId', 'equipmentNum', 'equipmentName', 'equipmentModel', 'equipmentSpecification', 'urgency', 'useDepartId', 'departName', 'faultDescription', 'faultTime', 'remark', "photo"));
});
if (record.id) {
this.codeDisable = true;
@@ -445,7 +501,9 @@
let record = data.record;
this.form.setFieldsValue({ equipmentName: record.name, equipmentId: record.id, equipmentNum: record.num, equipmentModel: record.model, equipmentSpecification: record.specification, useDepartId: record.useId, departName: record.useId_dictText });
},
-
+ statusChange(val){
+ this.workingStatus=val==='no'?false:true;
+ }
},
}
</script>
diff --git a/src/views/eam/modules/operationCertificateApply/OperationCertificateApplyAudit.vue b/src/views/eam/modules/operationCertificateApply/OperationCertificateApplyAudit.vue
new file mode 100644
index 0000000..16b408d
--- /dev/null
+++ b/src/views/eam/modules/operationCertificateApply/OperationCertificateApplyAudit.vue
@@ -0,0 +1,137 @@
+<template>
+ <j-modal
+ :title="title"
+ :width="1400"
+ :visible="visible"
+ :maskClosable="false"
+ switchFullscreen
+ @ok="handleOk"
+ :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+ @cancel="handleCancel">
+ <operation-certificate-apply-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" :achievement="isAchievement"/>
+
+ <template slot="footer">
+ <a-button
+ :style="{marginRight: '8px'}"
+ @click="handleCancel()"
+ >
+ 鍏抽棴
+ </a-button>
+
+ <!-- <a-button
+ @click="handleOk()"
+ type="primary"
+ :loading="confirmLoading"
+ :disabled="disableSubmit || confirmLoading"
+ >纭畾</a-button> -->
+ <a-popconfirm
+ @confirm="() => handleReject()"
+ title="纭灏嗗綋鍓嶆搷浣滆瘉鐢宠椹冲洖锛�"
+ >
+ <a-button
+ :loading='confirmLoading'
+ :style="{marginRight: '8px'}"
+ :disabled="this.auditStatus == 'created' || this.auditStatus == 'audited'"
+ >
+ 椹冲洖
+ </a-button>
+ </a-popconfirm>
+ <a-popconfirm
+ @confirm="() => handlePass()"
+ title="纭灏嗗綋鍓嶆搷浣滆瘉鐢宠瀹℃牳閫氳繃锛�"
+ >
+ <a-button
+ type='primary'
+ :loading='confirmLoading'
+ :style="{marginRight: '8px'}"
+ :disabled="this.auditStatus == 'created' || this.auditStatus == 'audited'"
+ >
+ 閫氳繃
+ </a-button>
+ </a-popconfirm>
+ </template>
+ </j-modal>
+</template>
+
+<script>
+
+ import OperationCertificateApplyForm from './OperationCertificateApplyForm'
+
+ export default {
+ name: 'OperationCertificateApplyModal',
+ components: {
+ OperationCertificateApplyForm
+ },
+ data() {
+ return {
+ title:'',
+ width:800,
+ visible: false,
+ disableSubmit: false,
+ isAchievement: false,
+ record:{},
+ model:{},
+ url: {
+ edit: '/eam/operationCertificateApply/edit',
+ }
+ }
+ },
+ methods:{
+ add () {
+ this.visible=true
+ this.$nextTick(()=>{
+ this.$refs.realForm.add();
+ })
+ },
+ edit (record) {
+ this.record = record
+ this.visible=true
+ this.$nextTick(()=>{
+ this.$refs.realForm.edit(record);
+ })
+ },
+ close () {
+ this.$emit('close');
+ this.visible = false;
+ },
+ handlePass() {
+ if (this.record.auditStatus == 'submitted') {
+ this.record.auditStatus = 'approved'
+ } else if (this.record.auditStatus == 'approved') {
+ this.record.auditStatus = 'audited'
+ }
+ this.$nextTick(()=>{
+ this.$refs.realForm.edit(this.record);
+ })
+ this.handleOk();
+ },
+
+ handleReject() {
+ if (this.record.auditStatus == 'submitted') {
+ this.record.auditStatus = 'created'
+ } else if (this.record.auditStatus == 'approved') {
+ this.record.auditStatus = 'submitted'
+ }
+ this.$nextTick(()=>{
+ this.$refs.realForm.edit(this.record);
+ })
+ this.handleOk();
+ },
+
+ handleOk () {
+ this.$refs.realForm.handleOk();
+ },
+
+ submitCallback(){
+ this.$emit('ok');
+ this.visible = false;
+ },
+ handleCancel () {
+ this.close()
+ }
+ }
+ }
+</script>
+
+<style scoped>
+</style>
\ No newline at end of file
diff --git a/src/views/eam/modules/predictiveWorkOrder/PredictiveWorkPlanList.vue b/src/views/eam/modules/predictiveWorkOrder/PredictiveWorkPlanList.vue
index 50147d7..97102ba 100644
--- a/src/views/eam/modules/predictiveWorkOrder/PredictiveWorkPlanList.vue
+++ b/src/views/eam/modules/predictiveWorkOrder/PredictiveWorkPlanList.vue
@@ -183,7 +183,7 @@
dataIndex: 'monitorTypeName'
},
{
- title: '璁惧缂栫爜',
+ title: '缁熶竴缂栫爜',
align: 'center',
dataIndex: 'deviceNum'
},
diff --git a/src/views/eam/modules/predictiveWorkPlan/PredictiveWorkPlanModal.vue b/src/views/eam/modules/predictiveWorkPlan/PredictiveWorkPlanModal.vue
index fee1451..92635d6 100644
--- a/src/views/eam/modules/predictiveWorkPlan/PredictiveWorkPlanModal.vue
+++ b/src/views/eam/modules/predictiveWorkPlan/PredictiveWorkPlanModal.vue
@@ -239,7 +239,7 @@
},
useDepartName: {
rules: [
- { required: true, message: '璇烽�夋嫨瀵硅薄閮ㄩ棬!' }
+ { required: true, message: '璇烽�夋嫨浣跨敤閮ㄩ棬!' }
]
},
equipmentName: {
diff --git a/src/views/eam/modules/projectMaintenanceOrder/ProjectMaintenanceOrderDetailList.vue b/src/views/eam/modules/projectMaintenanceOrder/ProjectMaintenanceOrderDetailList.vue
index 63696d3..b0244c8 100644
--- a/src/views/eam/modules/projectMaintenanceOrder/ProjectMaintenanceOrderDetailList.vue
+++ b/src/views/eam/modules/projectMaintenanceOrder/ProjectMaintenanceOrderDetailList.vue
@@ -99,7 +99,7 @@
dataIndex: 'taskNum'
},
{
- title: '璁惧缂栫爜',
+ title: '缁熶竴缂栫爜',
align: "center",
dataIndex: 'equipmentNum'
},
diff --git a/src/views/eam/modules/projectMaintenanceOrder/ProjectMaintenanceOrderDetailModal.vue b/src/views/eam/modules/projectMaintenanceOrder/ProjectMaintenanceOrderDetailModal.vue
index df39988..ce4c68f 100644
--- a/src/views/eam/modules/projectMaintenanceOrder/ProjectMaintenanceOrderDetailModal.vue
+++ b/src/views/eam/modules/projectMaintenanceOrder/ProjectMaintenanceOrderDetailModal.vue
@@ -17,8 +17,8 @@
</a-form-model-item>
</a-col>
<a-col :span="12">
- <a-form-model-item label="璁惧缂栫爜" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentNum">
- <a-input v-model="model.equipmentNum"placeholder="璇疯緭鍏ヨ澶囩紪鐮�" disabled></a-input>
+ <a-form-model-item label="缁熶竴缂栫爜" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentNum">
+ <a-input v-model="model.equipmentNum"placeholder="璇疯緭鍏ョ粺涓�缂栫爜" disabled></a-input>
</a-form-model-item>
</a-col>
</a-row>
diff --git a/src/views/eam/modules/projectMaintenanceOrder/ProjectMaintenanceOrderForm.vue b/src/views/eam/modules/projectMaintenanceOrder/ProjectMaintenanceOrderForm.vue
index 193b79e..10c1d18 100644
--- a/src/views/eam/modules/projectMaintenanceOrder/ProjectMaintenanceOrderForm.vue
+++ b/src/views/eam/modules/projectMaintenanceOrder/ProjectMaintenanceOrderForm.vue
@@ -307,7 +307,7 @@
}]
},
{
- title: '璁惧缂栫爜',
+ title: '缁熶竴缂栫爜',
key: 'equipmentNum',
type: JVXETypes.normal,
width: '140px',
diff --git a/src/views/eam/modules/repairorder/RepairOrderAssignTask.vue b/src/views/eam/modules/repairorder/RepairOrderAssignTask.vue
index a1e926c..b511359 100644
--- a/src/views/eam/modules/repairorder/RepairOrderAssignTask.vue
+++ b/src/views/eam/modules/repairorder/RepairOrderAssignTask.vue
@@ -46,14 +46,14 @@
<a-row :gutter="24">
<a-col :span="12">
<a-form-item
- label="璁惧缂栫爜"
+ label="缁熶竴缂栫爜"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
>
<a-input
allow-clear
:disabled="true"
- :placeholder="disableSubmit?'':'璇烽�夋嫨璁惧缂栫爜'"
+ :placeholder="disableSubmit?'':'璇烽�夋嫨缁熶竴缂栫爜'"
v-decorator="['equipmentNum', {} ]"
/>
</a-form-item>
diff --git a/src/views/eam/modules/repairorder/RepairOrderModal copy.vue b/src/views/eam/modules/repairorder/RepairOrderModal copy.vue
index 227f646..ebc60aa 100644
--- a/src/views/eam/modules/repairorder/RepairOrderModal copy.vue
+++ b/src/views/eam/modules/repairorder/RepairOrderModal copy.vue
@@ -50,7 +50,7 @@
</a-form-model-item>
</a-col>
<a-col :span="24" >
- <a-form-model-item label="璁惧缂栫爜/鍚嶇О/鍨嬪彿" :labelCol="{span:5}" :wrapperCol="{span:19}" prop="equipmentId">
+ <a-form-model-item label="缁熶竴缂栫爜/鍚嶇О/鍨嬪彿" :labelCol="{span:5}" :wrapperCol="{span:19}" prop="equipmentId">
<a-select v-model="model.equipmentId" required placeholder="璇烽�夋嫨璁惧">
<a-select-option v-for="item of equipmentList" :value="item.id" :key="item.id">
{{(item.num+"/"+item.name+"/"+item.model)}}
diff --git a/src/views/eam/modules/repairorder/RepairOrderModal.vue b/src/views/eam/modules/repairorder/RepairOrderModal.vue
index f3b2030..2b6bfc3 100644
--- a/src/views/eam/modules/repairorder/RepairOrderModal.vue
+++ b/src/views/eam/modules/repairorder/RepairOrderModal.vue
@@ -86,7 +86,7 @@
</a-form-item>
</a-col>
<a-col :span="24" >
- <a-form-item label="璁惧缂栫爜" :labelCol="{span:3}" :wrapperCol="{span:21}">
+ <a-form-item label="缁熶竴缂栫爜" :labelCol="{span:3}" :wrapperCol="{span:21}">
<a-input-search
:disabled="disableSubmit"
placeholder="璇烽�夋嫨璁惧"
diff --git a/src/views/eam/modules/repairorder/moudles/RepairOrderActualHoursReportModel.vue b/src/views/eam/modules/repairorder/moudles/RepairOrderActualHoursReportModel.vue
index b67fe99..9d8532f 100644
--- a/src/views/eam/modules/repairorder/moudles/RepairOrderActualHoursReportModel.vue
+++ b/src/views/eam/modules/repairorder/moudles/RepairOrderActualHoursReportModel.vue
@@ -32,7 +32,7 @@
</a-col>
<a-col :span='12'>
<a-form-model-item
- label='璁惧缂栫爜/鍚嶇О/鍨嬪彿'
+ label='缁熶竴缂栫爜/鍚嶇О/鍨嬪彿'
:labelCol='labelCol'
:wrapperCol='wrapperCol'
prop='equipmentId'
diff --git a/src/views/eam/modules/repairorder/moudles/RepairOrderActualMaterialReportModel.vue b/src/views/eam/modules/repairorder/moudles/RepairOrderActualMaterialReportModel.vue
index 15c7aaf..c4ab61a 100644
--- a/src/views/eam/modules/repairorder/moudles/RepairOrderActualMaterialReportModel.vue
+++ b/src/views/eam/modules/repairorder/moudles/RepairOrderActualMaterialReportModel.vue
@@ -32,7 +32,7 @@
</a-col>
<a-col :span='12'>
<a-form-model-item
- label='璁惧缂栫爜/鍚嶇О/鍨嬪彿'
+ label='缁熶竴缂栫爜/鍚嶇О/鍨嬪彿'
:labelCol='labelCol'
:wrapperCol='wrapperCol'
prop='equipmentId'
diff --git a/src/views/eam/modules/repairorder/moudles/RepairOrderFaultAnalysisReport.vue b/src/views/eam/modules/repairorder/moudles/RepairOrderFaultAnalysisReport.vue
index d98a033..d9b8b61 100644
--- a/src/views/eam/modules/repairorder/moudles/RepairOrderFaultAnalysisReport.vue
+++ b/src/views/eam/modules/repairorder/moudles/RepairOrderFaultAnalysisReport.vue
@@ -11,30 +11,28 @@
:span='12'
>
<a-form-item
- label='鏁呴殰绫诲瀷'
- :labelCol='labelCol'
- :wrapperCol='wrapperCol'
- >
- <j-dict-select-tag
- allow-clear
- placeholder='璇烽�夋嫨鏁呴殰绫诲瀷'
- :triggerChange='true'
- :disabled="isEdit||repairOrder.status!=='3'"
- dictCode="mom_eam_fault_type,name,id,del_flag!='1'"
- v-decorator="['faultTypeId', validatorRules.faultTypeId ]"
- />
- </a-form-item>
- </a-col>
- <a-col :span='12'>
- <a-form-item
- label='鏁呴殰鍒嗘瀽'
+ label='鏁呴殰鐜拌薄'
:labelCol='labelCol'
:wrapperCol='wrapperCol'
>
<a-textarea
- placeholder='璇疯緭鍏ユ晠闅滃垎鏋�'
+ allow-clear
+ placeholder='璇疯緭鍏ユ晠闅滅幇璞�'
+ v-decorator="['repairOrderFaultAnalysisUda1', validatorRules.repairOrderFaultAnalysisUda1]"
+ :disabled="isEdit"
+ ></a-textarea>
+ </a-form-item>
+ </a-col>
+ <a-col :span='12'>
+ <a-form-item
+ label='鏁呴殰妫�鏌�'
+ :labelCol='labelCol'
+ :wrapperCol='wrapperCol'
+ >
+ <a-textarea
+ placeholder='璇疯緭鍏ユ晠闅滄鏌�'
v-decorator="['faultCause', validatorRules.faultCause]"
- :disabled="isEdit||repairOrder.status!=='3'"
+ :disabled="isEdit"
></a-textarea>
</a-form-item>
</a-col>
@@ -42,27 +40,27 @@
<a-row>
<a-col :span='12'>
<a-form-item
- label='缁翠慨鎺柦'
+ label='鏁呴殰缁翠慨'
:labelCol='labelCol'
:wrapperCol='wrapperCol'
>
<a-textarea
- placeholder='璇疯緭鍏ョ淮淇帾鏂�'
+ placeholder='璇疯緭鍏ユ晠闅滅淮淇�'
v-decorator="['maintenanceMeasures', validatorRules.maintenanceMeasures]"
- :disabled="isEdit||repairOrder.status!=='3'"
+ :disabled="isEdit"
></a-textarea>
</a-form-item>
</a-col>
<a-col :span='12'>
<a-form-item
- label='缁翠繚鎰忚'
+ label='鏁呴殰棰勯槻'
:labelCol='labelCol'
:wrapperCol='wrapperCol'
>
<a-textarea
v-decorator="['suggestion', validatorRules.suggestion]"
- placeholder='璇疯緭鍏ョ淮淇濇剰瑙�'
- :disabled="isEdit||repairOrder.status!=='3'"
+ placeholder='璇疯緭鍏ユ晠闅滈闃�'
+ :disabled="isEdit"
></a-textarea>
</a-form-item>
</a-col>
@@ -70,6 +68,8 @@
<a-button
:style="{marginRight: '8px'}"
@click='handleEdit2()'
+ :disabled="buttonStatus"
+ :loading='confirmLoading'
>
缂栬緫
</a-button>
@@ -78,6 +78,7 @@
@click='handleOk()'
type='primary'
:loading='confirmLoading'
+ :disabled="buttonStatus"
>淇濆瓨
</a-button>
</a-form>
@@ -93,24 +94,23 @@
name: 'RepairOrderFaultAnalysisList',
components: { },
props: {
- repairOrderId: {
- type: String,
- default:'',
- },
repairOrder:{
type: Object,
default:{},
}
},
watch:{
- repairOrderId:{
+ 'repairOrder.id':{
immediate: true,
handler(val) {
this.form.resetFields();
- if(!this.repairOrderId){
+ if(this.repairOrder.id!==undefined&&this.repairOrder.status==='3'){
this.isEdit = false;
}else{
this.loadData(val);
+ }
+ if(this.repairOrder.status!=='3'){
+ this.buttonStatus = true;
}
}
}
@@ -131,29 +131,24 @@
validatorRules: {
faultCause: {
rules: [
- { required: true, message: '璇疯緭鍏ユ晠闅滃垎鏋�!' },
+ { required: true, message: '璇疯緭鍏ユ晠闅滄鏌�!' },
{ min: 2, max: 1000, message: '闀垮害鍦� 2 鍒� 1000 涓瓧绗�', trigger: 'blur' },
]
},
- faultCauseId: {
+ repairOrderFaultAnalysisUda1: {
rules: [
- { required: true, message: '璇烽�夋嫨鏁呴殰鍘熷洜!' },
- ]
- },
- faultTypeId: {
- rules: [
- { required: true, message: '璇烽�夋嫨鏁呴殰绫诲瀷!' },
+ { required: true, message: '璇疯緭鍏ユ晠闅滅幇璞�!' },
]
},
suggestion:{
rules: [
- { required: true, message: '璇疯緭鍏ョ淮淇濇剰瑙�!' },
+ { required: true, message: '璇疯緭鍏ユ晠闅滈闃�!' },
{ min: 2, max: 1000, message: '闀垮害鍦� 2 鍒� 1000 涓瓧绗�', trigger: 'blur' },
]
},
maintenanceMeasures:{
rules: [
- { required: true, message: '璇疯緭鍏ョ淮淇帾鏂�!' },
+ { required: true, message: '璇疯緭鍏ユ晠闅滅淮淇�!' },
{ min: 2, max: 1000, message: '闀垮害鍦� 2 鍒� 1000 涓瓧绗�', trigger: 'blur' },
]
},
@@ -166,6 +161,7 @@
xs: { span: 24 },
sm: { span: 16 }
},
+ buttonStatus:false
}
},
methods: {
@@ -177,8 +173,8 @@
that.confirmLoading = true;
let formData = Object.assign(this.model, values);
let obj;
+ formData.repairOrderId = this.repairOrder.id;
if (!this.model.id) {
- formData.repairOrderId = this.repairOrderId;
obj = postAction(this.url.add, formData);
} else {
obj = requestPut(this.url.edit, formData, { id: this.model.id });
@@ -186,12 +182,12 @@
obj.then((res) => {
if (res.success) {
that.$message.success(res.message);
- that.$emit('ok');
+ that.isEdit = true;
} else {
that.$message.warning(res.message);
}
}).finally(() => {
- that.loadData(that.repairOrderId);
+ that.loadData(that.repairOrder.id);
that.confirmLoading = false;
})
}
@@ -203,11 +199,12 @@
if(res.success){
if(res.result.records.length!==0){
that.isEdit=true;
- that.form.setFieldsValue(pick(res.result.records[0], 'faultCause', 'faultTypeId', 'suggestion', 'maintenanceMeasures','id'))
+ that.form.setFieldsValue(pick(res.result.records[0], 'faultCause','repairOrderFaultAnalysisUda1', 'faultTypeId', 'suggestion', 'maintenanceMeasures','id'))
that.model = Object.assign({}, res.result.records[0]);
- that.isEdit=true;
+ }else if(this.repairOrder.status==='3'){
+ that.isEdit=false;
}else{
- that.isEdit=false;
+ that.isEdit=true;
}
}
})
diff --git a/src/views/eam/modules/repairorder/moudles/RepairOrderFaultAnalysisReportModel.vue b/src/views/eam/modules/repairorder/moudles/RepairOrderFaultAnalysisReportModel.vue
index a3985ac..a4a6ce4 100644
--- a/src/views/eam/modules/repairorder/moudles/RepairOrderFaultAnalysisReportModel.vue
+++ b/src/views/eam/modules/repairorder/moudles/RepairOrderFaultAnalysisReportModel.vue
@@ -32,7 +32,7 @@
</a-col>
<a-col :span='12'>
<a-form-model-item
- label='璁惧缂栫爜/鍚嶇О/鍨嬪彿'
+ label='缁熶竴缂栫爜/鍚嶇О/鍨嬪彿'
:labelCol='labelCol'
:wrapperCol='wrapperCol'
prop='equipmentId'
diff --git a/src/views/eam/modules/repairorder/moudles/select/EquipmentList.vue b/src/views/eam/modules/repairorder/moudles/select/EquipmentList.vue
index 227e097..aa8648a 100644
--- a/src/views/eam/modules/repairorder/moudles/select/EquipmentList.vue
+++ b/src/views/eam/modules/repairorder/moudles/select/EquipmentList.vue
@@ -144,7 +144,7 @@
}
},
{
- title: '璁惧缂栫爜',
+ title: '缁熶竴缂栫爜',
align: 'center',
dataIndex: 'num',
},
diff --git a/src/views/eam/modules/repairorder/moudles/select/FaultReportRepair.vue b/src/views/eam/modules/repairorder/moudles/select/FaultReportRepair.vue
index 3566cf3..078e810 100644
--- a/src/views/eam/modules/repairorder/moudles/select/FaultReportRepair.vue
+++ b/src/views/eam/modules/repairorder/moudles/select/FaultReportRepair.vue
@@ -168,7 +168,7 @@
dataIndex: 'num'
},
{
- title: '璁惧缂栫爜',
+ title: '缁熶竴缂栫爜',
align: "center",
dataIndex: 'equipmentNum'
},
@@ -237,7 +237,6 @@
}
},
-
methods: {
loadData(arg) {
@@ -295,6 +294,7 @@
close() {
this.queryParam = {};
this.$emit('close');
+ this.dataSource=[];
this.visible = false;
},
handleOk() {
diff --git a/src/views/eam/modules/repairorder/moudles/select/ProjectMaintenanceOrder.vue b/src/views/eam/modules/repairorder/moudles/select/ProjectMaintenanceOrder.vue
index ce9bb37..d588c20 100644
--- a/src/views/eam/modules/repairorder/moudles/select/ProjectMaintenanceOrder.vue
+++ b/src/views/eam/modules/repairorder/moudles/select/ProjectMaintenanceOrder.vue
@@ -149,7 +149,7 @@
dataIndex: 'taskNum',
},
{
- title: '璁惧缂栫爜',
+ title: '缁熶竴缂栫爜',
align: 'center',
dataIndex: 'equipmentNum',
},
diff --git a/src/views/eam/modules/repairorder/repairOrderExcuteDrawer.vue b/src/views/eam/modules/repairorder/repairOrderExcuteDrawer.vue
index 783a5d1..75e3de3 100644
--- a/src/views/eam/modules/repairorder/repairOrderExcuteDrawer.vue
+++ b/src/views/eam/modules/repairorder/repairOrderExcuteDrawer.vue
@@ -4,29 +4,64 @@
:width="drawerWidth"
:visible="visible"
@close="handleCancel"
- :confirmLoading="confirmLoading"
+ :loading="confirmLoading"
:maskClosable="maskClosable"
>
<a-card :style="getBackground()">
- <template>
- <a-card>
<div :style="{width: '100%',border: '1px solid #e9e9e9',padding: '10px 16px',background: '#fff',}">
<a-row :style="{textAlign:'left'}">
<a-button
:style="{marginRight: '8px'}"
@click="handleStart"
+ :loading="confirmLoading"
:disabled="repairOrder.status!='2'"
type="primary"
>寮�宸�</a-button>
<a-button
:style="{marginRight: '8px'}"
- @click="handleReport"
- :disabled="repairOrder.status!='3'"
+ @click="handleSpare"
+ :loading="confirmLoading"
+ :disabled="repairOrder.status!=='3'
+ ||repairOrder.repairOrderUda1==='needSpare'||repairOrder.repairOrderUda1==='needPart'
+ ||(repairOrder.repairOrderUda2!==null&&repairOrder.repairOrderUda3!==null)"
+ type="primary"
+ v-if="repairOrder.repairOrderUda1!=='needSpare'"
+ >绛夐噰璐欢</a-button>
+ <a-button
+ :style="{marginRight: '8px'}"
+ @click="handleSpareStop"
+ :loading="confirmLoading"
+ type="primary"
+ v-if="repairOrder.repairOrderUda1==='needSpare'"
+ >绛夐噰璐欢鍋滄</a-button>
+ <a-button
+ :style="{marginRight: '8px'}"
+ @click="handlePart"
+ :loading="confirmLoading"
+ :disabled="repairOrder.status!='3'
+ ||repairOrder.repairOrderUda1==='needPart'||repairOrder.repairOrderUda1==='needSpare'
+ ||(repairOrder.repairOrderUda4!==null&&repairOrder.repairOrderUda5!==null)"
+ type="primary"
+ v-if="repairOrder.repairOrderUda1!=='needPart'"
+ >绛夊姞宸ヤ欢</a-button>
+ <a-button
+ :style="{marginRight: '8px'}"
+ @click="handlePartStop"
+ :loading="confirmLoading"
+ type="primary"
+ v-if="repairOrder.repairOrderUda1==='needPart'"
+ >绛夊姞宸ヤ欢鍋滄</a-button>
+ <a-button
+ :style="{marginRight: '8px'}"
+ @click="handleReportPro"
+ :loading="confirmLoading"
+ :disabled="repairOrder.status!='3'||repairOrder.repairOrderUda1==='needPart'||repairOrder.repairOrderUda1==='needSpare'"
type="primary"
>鎶ュ伐</a-button>
<a-button
:style="{marginRight: '8px'}"
@click="handleRevoke"
+ :loading="confirmLoading"
:disabled="repairOrder.status!='4'"
type="primary"
>鎾ら攢</a-button>
@@ -45,6 +80,23 @@
v-if="this.repairOrder != null"
class="hightColor"
>{{this.repairOrder.status_dictText}}</span>
+ <span
+ v-else
+ class="frozenRowClass"
+ >-</span>
+ </a-form-item>
+ </a-col>
+ <a-col :span="6">
+ <a-form-item
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ label="缁翠慨鐘舵��"
+ class="hightColor"
+ >
+ <span
+ v-if="this.repairOrder != null"
+ class="hightColor"
+ >{{this.repairOrder.repairOrderUda1_dictText}}</span>
<span
v-else
class="frozenRowClass"
@@ -85,11 +137,13 @@
>-</span>
</a-form-item>
</a-col>
+ </a-row>
+ <a-row :gutter="24">
<a-col :span="6">
<a-form-item
:labelCol="labelCol"
:wrapperCol="wrapperCol"
- label="璁惧缂栫爜"
+ label="缁熶竴缂栫爜"
class="hightColor"
>
<span
@@ -102,8 +156,6 @@
>-</span>
</a-form-item>
</a-col>
- </a-row>
- <a-row :gutter="24">
<a-col :span="6">
<a-form-item
:labelCol="labelCol"
@@ -139,13 +191,29 @@
<a-form-item
:labelCol="labelCol"
:wrapperCol="wrapperCol"
- label="宸ユ椂瀹氶"
+ label="鍏抽敭璁惧?"
class="hightColor"
>
<span
v-if="this.repairOrder != null"
class="hightColor"
- >{{ this.repairOrder.workingHourQuota }}</span>
+ >{{ this.repairOrder.specificEquipment_dictText}}</span>
+ <span
+ v-else
+ class="frozenRowClass"
+ >-</span>
+ </a-form-item>
+ </a-col>
+ </a-row>
+ <a-row :gutter="24">
+ <a-col :span="6">
+ <a-form-item
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ label="鎶ヤ慨鏃堕棿"
+ class="hightColor"
+ >
+ <span v-if="this.repairOrder != null">{{ this.repairOrder.faultTime }}</span>
<span
v-else
class="frozenRowClass"
@@ -156,13 +224,38 @@
<a-form-item
:labelCol="labelCol"
:wrapperCol="wrapperCol"
- label="鎵ц浜�"
+ label="鎶ヤ慨浜�"
class="hightColor"
>
+ <span v-if="this.repairOrder != null">{{ this.repairOrder.errUda2 }}</span>
<span
- v-if="this.repairOrder != null"
- class="hightColor"
- >{{ this.repairOrder.recipientUserId_dictText}}</span>
+ v-else
+ class="frozenRowClass"
+ >-</span>
+ </a-form-item>
+ </a-col>
+ <a-col :span="6">
+ <a-form-item
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ label="棰嗗彇鏃堕棿"
+ class="hightColor"
+ >
+ <span v-if="this.repairOrder != null">{{ this.repairOrder.createTime }}</span>
+ <span
+ v-else
+ class="frozenRowClass"
+ >-</span>
+ </a-form-item>
+ </a-col>
+ <a-col :span="6">
+ <a-form-item
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ label="棰嗗彇浜�"
+ class="hightColor"
+ >
+ <span v-if="this.repairOrder != null">{{ this.repairOrder.responsibilityName }}</span>
<span
v-else
class="frozenRowClass"
@@ -171,17 +264,16 @@
</a-col>
</a-row>
<a-row
- hidden
:gutter="24"
>
- <a-col :span="6">
+ <a-col :span="6">
<a-form-item
:labelCol="labelCol"
:wrapperCol="wrapperCol"
- label="寮�濮嬫椂闂�"
+ label="寮�宸ユ椂闂�"
class="hightColor"
>
- <span v-if="this.repairOrder != null">{{ this.repairOrder.actualStartTime }}</span>
+ <span v-if="this.repairOrder != null">{{ this.repairOrder.actualStartTime}}</span>
<span
v-else
class="frozenRowClass"
@@ -192,13 +284,10 @@
<a-form-item
:labelCol="labelCol"
:wrapperCol="wrapperCol"
- label="鍒涘缓浜�"
+ label="瀹屽伐鏃堕棿"
class="hightColor"
>
- <span
- v-if="this.repairOrder != null"
- class="hightColor"
- >{{ this.repairOrder.createBy}}</span>
+ <span v-if="this.repairOrder != null">{{ this.repairOrder.actualEndTime }}</span>
<span
v-else
class="frozenRowClass"
@@ -209,13 +298,162 @@
<a-form-item
:labelCol="labelCol"
:wrapperCol="wrapperCol"
- label="鍒涘缓浜�"
+ label="缁翠慨鏃堕暱"
class="hightColor"
>
+ <span v-if="this.repairOrder != null">{{ this.repairOrder.actualHour }}</span>
<span
- v-if="this.repairOrder != null"
- class="hightColor"
- >{{ this.repairOrder.createTime}}</span>
+ v-else
+ class="frozenRowClass"
+ >-</span>
+ </a-form-item>
+ </a-col>
+ <a-col :span="6">
+ <a-form-item
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ label="瀹屾垚浜�"
+ class="hightColor"
+ >
+ <span v-if="this.repairOrder != null">{{ this.repairOrder.recipientUserId_dictText }}</span>
+ <span
+ v-else
+ class="frozenRowClass"
+ >-</span>
+ </a-form-item>
+ </a-col>
+ </a-row>
+ <a-row
+ :gutter="24"
+ >
+ <a-col :span="6">
+ <a-form-item
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ label="楠屾敹鏃堕棿"
+ class="hightColor"
+ >
+ <span v-if="this.repairOrder != null">{{ this.repairOrder.acceptTime }}</span>
+ <span
+ v-else
+ class="frozenRowClass"
+ >-</span>
+ </a-form-item>
+ </a-col>
+ <a-col :span="6">
+ <a-form-item
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ label="楠屾敹浜�"
+ class="hightColor"
+ >
+ <span v-if="this.repairOrder != null">{{ this.repairOrder.errUda3 }}</span>
+ <span
+ v-else
+ class="frozenRowClass"
+ >-</span>
+ </a-form-item>
+ </a-col>
+ <a-col :span="6">
+ <a-form-item
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ label="鏁呴殰鏃堕暱"
+ class="hightColor"
+ >
+ <span v-if="this.repairOrder != null">{{ this.repairOrder.faultHour }}</span>
+ <span
+ v-else
+ class="frozenRowClass"
+ >-</span>
+ </a-form-item>
+ </a-col>
+ </a-row>
+ <a-row
+ :gutter="24"
+ >
+ <a-col :span="6">
+ <a-form-item
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ label="绛夐噰璐欢寮�濮�"
+ class="hightColor"
+ >
+ <span v-if="this.repairOrder != null">{{ this.repairOrder.repairOrderUda2}}</span>
+ <span
+ v-else
+ class="frozenRowClass"
+ >-</span>
+ </a-form-item>
+ </a-col>
+ <a-col :span="6">
+ <a-form-item
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ label="绛夐噰璐欢缁撴潫"
+ class="hightColor"
+ >
+ <span v-if="this.repairOrder != null">{{ this.repairOrder.repairOrderUda3 }}</span>
+ <span
+ v-else
+ class="frozenRowClass"
+ >-</span>
+ </a-form-item>
+ </a-col>
+ <a-col :span="6">
+ <a-form-item
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ label="绱鏃堕棿"
+ class="hightColor"
+ >
+ <span v-if="this.repairOrder != null">{{ this.repairOrder.spareTime }}</span>
+ <span
+ v-else
+ class="frozenRowClass"
+ >-</span>
+ </a-form-item>
+ </a-col>
+ </a-row>
+ <a-row
+ :gutter="24"
+ >
+ <a-col :span="6">
+ <a-form-item
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ label="绛夊姞宸ヤ欢寮�濮�"
+ class="hightColor"
+ >
+ <span v-if="this.repairOrder != null">{{ this.repairOrder.repairOrderUda4 }}</span>
+ <span
+ v-else
+ class="frozenRowClass"
+ >-</span>
+ </a-form-item>
+ </a-col>
+ <a-col :span="6">
+ <a-form-item
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ label="绛夊姞宸ヤ欢缁撴潫"
+ class="hightColor"
+ >
+ <span v-if="this.repairOrder != null">{{ this.repairOrder.repairOrderUda5 }}</span>
+ <span
+ v-else
+ class="frozenRowClass"
+ >-</span>
+ </a-form-item>
+ </a-col>
+ <a-col :span="6">
+ <a-form-item
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ label="绱鏃堕棿"
+ class="hightColor"
+ >
+ <span v-if="this.repairOrder != null">{{ this.repairOrder.partTime }}</span>
<span
v-else
class="frozenRowClass"
@@ -224,6 +462,8 @@
</a-col>
</a-row>
</div>
+ </a-card>
+ <a-card :style="getBackground()">
<a-tabs
type="card"
defaultActiveKey="1"
@@ -233,11 +473,7 @@
key="1"
class="hightColor"
>
- <!-- <fault-analysis-edit-table
- :repairOrderId="repairOrder.id"
- :repairOrderStatus="repairOrder.status"
- ></fault-analysis-edit-table> -->
- <RepairOrderFaultAnalysisList :repairOrderId="repairOrderId" :repairOrder="repairOrder"/>
+ <RepairOrderFaultAnalysisList :repairOrder="repairOrder"/>
</a-tab-pane>
<a-tab-pane
tab='瀹為檯宸ユ椂'
@@ -255,16 +491,10 @@
key="2"
class="hightColor"
>
- <!-- <actual-material-edit-table
- :repairOrderId="repairOrder.id"
- :repairOrderStatus="repairOrder.status"
- ></actual-material-edit-table> -->
<RepairOrderActualMaterialList :mainId="repairOrder" />
</a-tab-pane>
</a-tabs>
</a-card>
- </template>
- </a-card>
<div :style="{width: '100%',border: '1px solid #e9e9e9',padding: '10px 16px',background: '#fff',}">
<a-row :style="{textAlign:'right'}">
<a-button
@@ -282,20 +512,15 @@
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { putAction } from '@/api/manage'
import Tooltip from 'ant-design-vue/es/tooltip'
-import ActualMaterialEditTable from './moudles/ActualMaterialEditTable.vue'
-import ActualWorkHoursEditTable from './moudles/ActualWorkHoursEditTable.vue'
-import FaultAnalysisEditTable from './moudles/FaultAnalysisEditTable'
import RepairOrderActualMaterialList from './moudles/RepairOrderActualMaterialReport'
import RepairOrderActualWorkHoursList from './moudles/RepairOrderActualHoursReport'
import RepairOrderFaultAnalysisList from './moudles/RepairOrderFaultAnalysisReport.vue'
+import { getAction } from '../../../../api/manage'
export default {
name: 'RepairOrderExcuteDrawer',
mixins: [JeecgListMixin],
components: {
Tooltip,
- ActualMaterialEditTable,
- ActualWorkHoursEditTable,
- FaultAnalysisEditTable,
RepairOrderActualMaterialList,
RepairOrderActualWorkHoursList,
RepairOrderFaultAnalysisList
@@ -336,7 +561,13 @@
url: {
orderStart: "eam/repairOrder/start",
orderReport: "eam/repairOrder/report",
- orderRevoke: "eam/repairOrder/revoke"
+ orderRevoke: "eam/repairOrder/revoke",
+ reload:"/eam/repairOrder/list",
+ handleSpare:"/eam/repairOrder/handleSpare",
+ handlePart:"/eam/repairOrder/handlePart",
+ handleSpareStop:"/eam/repairOrder/handleSpareStop",
+ handlePartStop:"/eam/repairOrder/handlePartStop",
+ getInfo:'/eam/repairOrderFaultAnalysis/list',
},
}
},
@@ -368,17 +599,6 @@
this.visible = false;
//this.repairOrder.id = "-1"
},
- // handleStart(record) {
- // putAction(this.url.orderStart, this.repairOrder).then(res => {
- // if (res.result) {
- // this.$message.success('寮�宸ユ垚鍔�');
- // this.repairOrder.status = '3'
- // this.$emit('loadData');
- // } else {
- // this.$message.error('寮�宸ュ嚭鐜板紓甯�')
- // }
- // })
- // },
//寮�宸�
handleStart() {
const that = this;
@@ -394,6 +614,7 @@
that.$message.success('寮�宸ユ垚鍔�');
that.repairOrder.status = '3'
that.$emit('loadData');
+ that.reload();
} else {
that.$message.error('寮�宸ュ嚭鐜板紓甯�')
}
@@ -404,20 +625,27 @@
},
})
},
-
- // handleReport() {
- // putAction(this.url.orderReport, this.repairOrder).then(res => {
- // if (res.result) {
- // this.$message.success('鎶ュ伐鎴愬姛');
- // this.repairOrder.status = '4'
- // this.$emit('loadData');
- // } else {
- // this.$message.error('鎶ュ伐鍑虹幇寮傚父')
- // }
- // })
- // },
-
//鎶ュ伐
+ handleReportPro(){
+ let that = this;
+ getAction(that.url.getInfo,{repairOrderId:this.repairOrder.id}).then(res=>{
+ if(res.success){
+ if(res.result.records.length===0){
+ that.$message.warning("鏁呴殰鍒嗘瀽灏氭湭濉啓锛岃濉啓鍚庡啀鎶ュ伐")
+ }else if(res.result.records[0].repairOrderFaultAnalysisUda1===null||res.result.records[0].repairOrderFaultAnalysisUda1===undefined||res.result.records[0].repairOrderFaultAnalysisUda1===''){
+ that.$message.warning("鏁呴殰鐜拌薄灏氭湭濉啓锛岃濉啓鍚庡啀鎶ュ伐")
+ }else if(res.result.records[0].faultCause===null||res.result.records[0].faultCause===undefined||res.result.records[0].faultCause===''){
+ that.$message.warning("鏁呴殰妫�鏌ュ皻鏈～鍐欙紝璇峰～鍐欏悗鍐嶆姤宸�")
+ }else if(res.result.records[0].maintenanceMeasures===null||res.result.records[0].maintenanceMeasures===undefined||res.result.records[0].maintenanceMeasures===''){
+ that.$message.warning("鏁呴殰缁翠慨灏氭湭濉啓锛岃濉啓鍚庡啀鎶ュ伐")
+ }else if(res.result.records[0].suggestion===null||res.result.records[0].suggestion===undefined||res.result.records[0].suggestion===''){
+ that.$message.warning("鏁呴殰棰勯槻灏氭湭濉啓锛岃濉啓鍚庡啀鎶ュ伐")
+ }else{
+ that.handleReport();
+ }
+ }
+ })
+ },
handleReport() {
const that = this;
that.confirmLoading = true;
@@ -431,6 +659,7 @@
if (res.result) {
that.$message.success('鎶ュ伐鎴愬姛');
that.repairOrder.status = '4'
+ that.reload();
that.$emit('loadData');
} else {
that.$message.error('鎶ュ伐鍑虹幇寮傚父')
@@ -442,18 +671,6 @@
},
})
},
- // handleRevoke() {
- // putAction(this.url.orderRevoke, this.repairOrder).then(res => {
- // if (res.result) {
- // this.$message.success('鎾ら攢鎴愬姛');
- // this.repairOrder.status = '3'
- // this.$emit('loadData');
- // } else {
- // this.$message.error('鎾ら攢鍑虹幇寮傚父')
- // }
- // })
- // },
-
//鎾ら攢
handleRevoke() {
const that = this;
@@ -479,6 +696,109 @@
},
})
},
+ handleSpare(){
+ const that = this;
+ that.confirmLoading = true;
+ this.$confirm({
+ title: '绛夐噰璐欢',
+ content: '鎻愮ず锛氳鎿嶄綔涓嶅彲鎾ら攢锛岀‘璁ゅ紑濮嬬瓑閲囪喘浠�?',
+ okText: '纭',
+ cancelText: '鍙栨秷',
+ onOk() {
+ putAction(that.url.handleSpare, that.repairOrder).then(res => {
+ if (res.result) {
+ that.$message.success('鎿嶄綔鎴愬姛');
+ that.reload();
+ that.$emit('loadData');
+ } else {
+ that.$message.error('鎿嶄綔鍑虹幇寮傚父')
+ }
+ }).finally(() => {
+ that.confirmLoading = false;
+ // that.close();
+ })
+ },
+ })
+ },
+ handleSpareStop(){
+ const that = this;
+ that.confirmLoading = true;
+ this.$confirm({
+ title: '鍋滄绛夐噰璐欢',
+ content: '鎻愮ず锛氳鎿嶄綔涓嶅彲鎾ら攢锛岀‘璁ゅ仠姝㈢瓑閲囪喘浠�?',
+ okText: '纭',
+ cancelText: '鍙栨秷',
+ onOk() {
+ putAction(that.url.handleSpareStop, that.repairOrder).then(res => {
+ if (res.result) {
+ that.$message.success('鎿嶄綔鎴愬姛');
+ that.reload();
+ that.$emit('loadData');
+ } else {
+ that.$message.error('鎿嶄綔鍑虹幇寮傚父')
+ }
+ }).finally(() => {
+ that.confirmLoading = false;
+ // that.close();
+ })
+ },
+ })
+ },
+ handlePart(){
+ const that = this;
+ that.confirmLoading = true;
+ this.$confirm({
+ title: '绛夐噰璐欢',
+ content: '鎻愮ず锛氳鎿嶄綔涓嶅彲鎾ら攢锛岀‘璁ょ瓑閲囪喘浠�?',
+ okText: '纭',
+ cancelText: '鍙栨秷',
+ onOk() {
+ putAction(that.url.handlePart, that.repairOrder).then(res => {
+ if (res.result) {
+ that.$message.success('鎿嶄綔鎴愬姛');
+ that.reload();
+ that.$emit('loadData');
+ } else {
+ that.$message.error('鎿嶄綔鍑虹幇寮傚父')
+ }
+ }).finally(() => {
+ that.confirmLoading = false;
+ // that.close();
+ })
+ },
+ })
+ },
+ handlePartStop(){
+ const that = this;
+ that.confirmLoading = true;
+ this.$confirm({
+ title: '鍋滄绛夐噰璐欢',
+ content: '鎻愮ず锛氳鎿嶄綔涓嶅彲鎾ら攢锛岀‘璁ゅ仠姝㈢瓑閲囪喘浠�?',
+ okText: '纭',
+ cancelText: '鍙栨秷',
+ onOk() {
+ putAction(that.url.handlePartStop, that.repairOrder).then(res => {
+ if (res.result) {
+ that.$message.success('鎿嶄綔鎴愬姛');
+ that.reload();
+ that.$emit('loadData');
+ } else {
+ that.$message.error('鎿嶄綔鍑虹幇寮傚父')
+ }
+ }).finally(() => {
+ that.confirmLoading = false;
+ // that.close();
+ })
+ },
+ })
+ },
+ reload(){
+ getAction(this.url.reload,{id:this.repairOrder.id}).then(res=>{
+ if( res.result.records.length!==0){
+ this.repairOrder = res.result.records[0];
+ }
+ })
+ }
},
}
diff --git a/src/views/eam/modules/repairorderfinished/RepairOrderFinishedReportModel copy.vue b/src/views/eam/modules/repairorderfinished/RepairOrderFinishedReportModel copy.vue
index 1ca9a4e..162a72e 100644
--- a/src/views/eam/modules/repairorderfinished/RepairOrderFinishedReportModel copy.vue
+++ b/src/views/eam/modules/repairorderfinished/RepairOrderFinishedReportModel copy.vue
@@ -56,7 +56,7 @@
v-if='isSelfCreate'
>
<a-form-model-item
- label='璁惧缂栫爜/鍚嶇О/鍨嬪彿'
+ label='缁熶竴缂栫爜/鍚嶇О/鍨嬪彿'
:labelCol='labelCol'
:wrapperCol='wrapperCol'
prop='equipmentId'
diff --git a/src/views/eam/modules/repairorderfinished/RepairOrderFinishedReportModel.vue b/src/views/eam/modules/repairorderfinished/RepairOrderFinishedReportModel.vue
index 631d58f..96dfe5b 100644
--- a/src/views/eam/modules/repairorderfinished/RepairOrderFinishedReportModel.vue
+++ b/src/views/eam/modules/repairorderfinished/RepairOrderFinishedReportModel.vue
@@ -27,7 +27,7 @@
</a-col>
<a-col :span="24/2">
<a-form-item
- label="璁惧缂栫爜"
+ label="缁熶竴缂栫爜"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
>
@@ -305,7 +305,7 @@
>
<a-input
:disabled="true"
- :placeholder="disableSubmit?'':'璇疯緭鍏ヨ澶囩紪鐮�/鍚嶇О/鍨嬪彿'"
+ :placeholder="disableSubmit?'':'璇疯緭鍏ョ粺涓�缂栫爜/鍚嶇О/鍨嬪彿'"
v-decorator="['equipmentId', validatorRules.equipmentId ]"
/>
</a-form-item>
diff --git a/src/views/eam/modules/specialtyInspectionOrder/SpecialtyInspectionOrderAssignModal.vue b/src/views/eam/modules/specialtyInspectionOrder/SpecialtyInspectionOrderAssignModal.vue
index 262a2fc..7414b13 100644
--- a/src/views/eam/modules/specialtyInspectionOrder/SpecialtyInspectionOrderAssignModal.vue
+++ b/src/views/eam/modules/specialtyInspectionOrder/SpecialtyInspectionOrderAssignModal.vue
@@ -238,7 +238,7 @@
validatorRules: {
num: {
rules: [
- { required: true, message: '璇疯緭鍏ヨ澶囩紪鐮�!' },
+ { required: true, message: '璇疯緭鍏ョ粺涓�缂栫爜!' },
]
},
specialtyInspectionPlanId: {
diff --git a/src/views/eam/modules/specialtyInspectionOrder/SpecialtyInspectionOrderModal.vue b/src/views/eam/modules/specialtyInspectionOrder/SpecialtyInspectionOrderModal.vue
index cdf324e..8a20bd7 100644
--- a/src/views/eam/modules/specialtyInspectionOrder/SpecialtyInspectionOrderModal.vue
+++ b/src/views/eam/modules/specialtyInspectionOrder/SpecialtyInspectionOrderModal.vue
@@ -243,7 +243,7 @@
validatorRules: {
num: {
rules: [
- { required: true, message: '璇疯緭鍏ヨ澶囩紪鐮�!' },
+ { required: true, message: '璇疯緭鍏ョ粺涓�缂栫爜!' },
]
},
specialtyInspectionPlanNum: {
diff --git a/src/views/eam/modules/specialtyInspectionOrder/SpecialtyInspectionPlanList.vue b/src/views/eam/modules/specialtyInspectionOrder/SpecialtyInspectionPlanList.vue
index e0a9e5d..f9514bd 100644
--- a/src/views/eam/modules/specialtyInspectionOrder/SpecialtyInspectionPlanList.vue
+++ b/src/views/eam/modules/specialtyInspectionOrder/SpecialtyInspectionPlanList.vue
@@ -166,7 +166,7 @@
dataIndex: 'inspectionCycleName',
},
{
- title: '瀵硅薄閮ㄩ棬',
+ title: '浣跨敤閮ㄩ棬',
align: 'center',
dataIndex: 'useDepartName',
},
diff --git a/src/views/eam/modules/specialtyInspectionOrder/SpecialyInspectionOrderExeDrawer.vue b/src/views/eam/modules/specialtyInspectionOrder/SpecialyInspectionOrderExeDrawer.vue
index a0ed799..9138629 100644
--- a/src/views/eam/modules/specialtyInspectionOrder/SpecialyInspectionOrderExeDrawer.vue
+++ b/src/views/eam/modules/specialtyInspectionOrder/SpecialyInspectionOrderExeDrawer.vue
@@ -72,7 +72,7 @@
<a-form-item
:labelCol="labelCol"
:wrapperCol="wrapperCol"
- label="瀵硅薄閮ㄩ棬"
+ label="浣跨敤閮ㄩ棬"
class="hightColor"
>
<span
diff --git a/src/views/eam/modules/specialtyInspectionPlan/JSelectSpecialtylnspectionStandardModal.vue b/src/views/eam/modules/specialtyInspectionPlan/JSelectSpecialtylnspectionStandardModal.vue
index ee6a564..8f66c13 100644
--- a/src/views/eam/modules/specialtyInspectionPlan/JSelectSpecialtylnspectionStandardModal.vue
+++ b/src/views/eam/modules/specialtyInspectionPlan/JSelectSpecialtylnspectionStandardModal.vue
@@ -102,7 +102,7 @@
dataIndex: 'version'
},
{
- title: '璁惧缂栫爜',
+ title: '缁熶竴缂栫爜',
align: 'center',
dataIndex: 'equipmentNum'
},
diff --git a/src/views/eam/modules/specialtyInspectionPlan/SpecialtyInspectionPlanDetail.vue b/src/views/eam/modules/specialtyInspectionPlan/SpecialtyInspectionPlanDetail.vue
index 3779eaf..dda5a74 100644
--- a/src/views/eam/modules/specialtyInspectionPlan/SpecialtyInspectionPlanDetail.vue
+++ b/src/views/eam/modules/specialtyInspectionPlan/SpecialtyInspectionPlanDetail.vue
@@ -96,7 +96,7 @@
dataIndex: 'version',
},
{
- title: '璁惧缂栫爜',
+ title: '缁熶竴缂栫爜',
align: 'center',
dataIndex: 'equipmentNum'
},
diff --git a/src/views/eam/modules/specialtyInspectionPlan/SpecialtyInspectionPlanModal.vue b/src/views/eam/modules/specialtyInspectionPlan/SpecialtyInspectionPlanModal.vue
index f22b2d8..84a7e25 100644
--- a/src/views/eam/modules/specialtyInspectionPlan/SpecialtyInspectionPlanModal.vue
+++ b/src/views/eam/modules/specialtyInspectionPlan/SpecialtyInspectionPlanModal.vue
@@ -29,13 +29,13 @@
</a-col>
<a-col :span="12">
<a-form-item
- label="瀵硅薄閮ㄩ棬"
+ label="浣跨敤閮ㄩ棬"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
>
<!-- <a-select
:disabled="disableSubmit"
- :placeholder="disableSubmit?'':'璇烽�夋嫨瀵硅薄閮ㄩ棬'"
+ :placeholder="disableSubmit?'':'璇烽�夋嫨浣跨敤閮ㄩ棬'"
:options="this.departs"
style="width: 100%"
v-decorator="['departId', validatorRules.departId]"
@@ -43,7 +43,7 @@
/> -->
<a-input-search
:disabled="disableSubmit"
- placeholder="璇烽�夋嫨瀵硅薄閮ㄩ棬"
+ placeholder="璇烽�夋嫨浣跨敤閮ㄩ棬"
enter-button
@search="onDepartList()"
:read-only="true"
@@ -107,14 +107,14 @@
>
<a-col :span="12">
<a-form-item
- label="瀵硅薄閮ㄩ棬Id"
+ label="浣跨敤閮ㄩ棬Id"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
>
<a-input
allow-clear
:disabled="true"
- :placeholder="disableSubmit?'':'璇疯緭鍏ュ璞￠儴闂╥d'"
+ :placeholder="disableSubmit?'':'璇疯緭鍏ヤ娇鐢ㄩ儴闂╥d'"
v-decorator="['departId', validatorRules.departId ]"
/>
</a-form-item>
@@ -298,7 +298,7 @@
dataIndex: 'version',
},
{
- title: '璁惧缂栫爜',
+ title: '缁熶竴缂栫爜',
align: 'center',
dataIndex: 'equipmentNum'
},
@@ -352,7 +352,7 @@
},
useDepartName: {
rules: [
- { required: true, message: '璇烽�夋嫨瀵硅薄閮ㄩ棬!' },
+ { required: true, message: '璇烽�夋嫨浣跨敤閮ㄩ棬!' },
]
},
assignMode: {
@@ -420,7 +420,7 @@
selectInspectionProjects: function () {
let dataDepartId = this.form.getFieldsValue(['departId']);
if (dataDepartId.departId == "" || dataDepartId.departId == null || dataDepartId.departId == undefined) {
- this.$message.warning("璇烽�夋嫨瀵硅薄閮ㄩ棬锛�");
+ this.$message.warning("璇烽�夋嫨浣跨敤閮ㄩ棬锛�");
return
}
let data = this.form.getFieldsValue(['inspectionCycleId']);
@@ -590,7 +590,7 @@
onDepartList() {
this.$refs.DepartList.list();
- this.$refs.DepartList.title = "閫夋嫨瀵硅薄閮ㄩ棬";
+ this.$refs.DepartList.title = "閫夋嫨浣跨敤閮ㄩ棬";
},
sendDepartRecord(data) {
this.dataSource = [];
diff --git a/src/views/eam/modules/specialtyInspectionStandard/EquipmentList.vue b/src/views/eam/modules/specialtyInspectionStandard/EquipmentList.vue
index 4c4573c..c60a1ce 100644
--- a/src/views/eam/modules/specialtyInspectionStandard/EquipmentList.vue
+++ b/src/views/eam/modules/specialtyInspectionStandard/EquipmentList.vue
@@ -144,7 +144,7 @@
}
},
{
- title: '璁惧缂栫爜',
+ title: '缁熶竴缂栫爜',
align: 'center',
dataIndex: 'num',
},
diff --git a/src/views/eam/modules/specialtyInspectionStandard/SpecialtylnspectionStandardModal.vue b/src/views/eam/modules/specialtyInspectionStandard/SpecialtylnspectionStandardModal.vue
index 2573712..943f10a 100644
--- a/src/views/eam/modules/specialtyInspectionStandard/SpecialtylnspectionStandardModal.vue
+++ b/src/views/eam/modules/specialtyInspectionStandard/SpecialtylnspectionStandardModal.vue
@@ -90,7 +90,7 @@
<a-input
allow-clear
:disabled="true"
- :placeholder="disableSubmit?'':'璇疯緭鍏ヨ澶囩紪鐮�/鍚嶇О/鍨嬪彿'"
+ :placeholder="disableSubmit?'':'璇疯緭鍏ョ粺涓�缂栫爜/鍚嶇О/鍨嬪彿'"
v-decorator="['equipmentId', validatorRules.equipmentId ]"
/>
</a-form-item>
diff --git a/src/views/eam/modules/specialtyMaintenanceOrder/InspectionOrderAssignModal.vue b/src/views/eam/modules/specialtyMaintenanceOrder/InspectionOrderAssignModal.vue
index 5930011..aa9a211 100644
--- a/src/views/eam/modules/specialtyMaintenanceOrder/InspectionOrderAssignModal.vue
+++ b/src/views/eam/modules/specialtyMaintenanceOrder/InspectionOrderAssignModal.vue
@@ -118,7 +118,7 @@
dataIndex: 'num',
},
{
- title: '瀵硅薄閮ㄩ棬',
+ title: '浣跨敤閮ㄩ棬',
align: 'center',
dataIndex: 'departName',
},
diff --git a/src/views/eam/modules/specialtyMaintenanceOrder/MaintenancePlanList.vue b/src/views/eam/modules/specialtyMaintenanceOrder/MaintenancePlanList.vue
index e0a9e5d..f9514bd 100644
--- a/src/views/eam/modules/specialtyMaintenanceOrder/MaintenancePlanList.vue
+++ b/src/views/eam/modules/specialtyMaintenanceOrder/MaintenancePlanList.vue
@@ -166,7 +166,7 @@
dataIndex: 'inspectionCycleName',
},
{
- title: '瀵硅薄閮ㄩ棬',
+ title: '浣跨敤閮ㄩ棬',
align: 'center',
dataIndex: 'useDepartName',
},
diff --git a/src/views/eam/modules/specialtyMaintenanceOrder/SpecialtyMaintenanceOrderAssignModal.vue b/src/views/eam/modules/specialtyMaintenanceOrder/SpecialtyMaintenanceOrderAssignModal.vue
index efce97b..456037c 100644
--- a/src/views/eam/modules/specialtyMaintenanceOrder/SpecialtyMaintenanceOrderAssignModal.vue
+++ b/src/views/eam/modules/specialtyMaintenanceOrder/SpecialtyMaintenanceOrderAssignModal.vue
@@ -239,7 +239,7 @@
validatorRules: {
num: {
rules: [
- { required: true, message: '璇疯緭鍏ヨ澶囩紪鐮�!' },
+ { required: true, message: '璇疯緭鍏ョ粺涓�缂栫爜!' },
]
},
specialtyMaintenancePlanId: {
diff --git a/src/views/eam/modules/specialtyMaintenanceOrder/SpecialtyMaintenancePlanList.vue b/src/views/eam/modules/specialtyMaintenanceOrder/SpecialtyMaintenancePlanList.vue
index a2fa70f..42f2568 100644
--- a/src/views/eam/modules/specialtyMaintenanceOrder/SpecialtyMaintenancePlanList.vue
+++ b/src/views/eam/modules/specialtyMaintenanceOrder/SpecialtyMaintenancePlanList.vue
@@ -166,7 +166,7 @@
dataIndex: 'maintenanceCycleName',
},
{
- title: '瀵硅薄閮ㄩ棬',
+ title: '浣跨敤閮ㄩ棬',
align: 'center',
dataIndex: 'departName',
},
diff --git a/src/views/eam/modules/specialtyMaintenanceOrder/SpecialyMaintenanceOrderExeDrawer.vue b/src/views/eam/modules/specialtyMaintenanceOrder/SpecialyMaintenanceOrderExeDrawer.vue
index 96b8538..9fab59e 100644
--- a/src/views/eam/modules/specialtyMaintenanceOrder/SpecialyMaintenanceOrderExeDrawer.vue
+++ b/src/views/eam/modules/specialtyMaintenanceOrder/SpecialyMaintenanceOrderExeDrawer.vue
@@ -94,7 +94,7 @@
<a-form-item
:labelCol="labelCol"
:wrapperCol="wrapperCol"
- label="瀵硅薄閮ㄩ棬"
+ label="浣跨敤閮ㄩ棬"
class="hightColor"
>
<span
diff --git a/src/views/eam/modules/specialtyMaintenancePlan/SpecialtyMaintenancePlanDetail.vue b/src/views/eam/modules/specialtyMaintenancePlan/SpecialtyMaintenancePlanDetail.vue
index 88898e3..b3b556a 100644
--- a/src/views/eam/modules/specialtyMaintenancePlan/SpecialtyMaintenancePlanDetail.vue
+++ b/src/views/eam/modules/specialtyMaintenancePlan/SpecialtyMaintenancePlanDetail.vue
@@ -135,7 +135,7 @@
dataIndex: 'versionStatusName'
},
{
- title: '璁惧缂栫爜',
+ title: '缁熶竴缂栫爜',
align: 'center',
dataIndex: 'equipmentNum'
},
diff --git a/src/views/eam/modules/specialtyMaintenancePlan/SpecialtyMaintenancePlanModal.vue b/src/views/eam/modules/specialtyMaintenancePlan/SpecialtyMaintenancePlanModal.vue
index 6116c44..036d907 100644
--- a/src/views/eam/modules/specialtyMaintenancePlan/SpecialtyMaintenancePlanModal.vue
+++ b/src/views/eam/modules/specialtyMaintenancePlan/SpecialtyMaintenancePlanModal.vue
@@ -34,7 +34,7 @@
:wrapperCol="wrapperCol"
>
<!-- <a-select
- :placeholder="disableSubmit?'':'璇烽�夋嫨瀵硅薄閮ㄩ棬'"
+ :placeholder="disableSubmit?'':'璇烽�夋嫨浣跨敤閮ㄩ棬'"
:options="this.departs"
style="width: 100%"
:disabled="disableSubmit"
@@ -346,7 +346,7 @@
},
departId: {
rules: [
- { required: true, message: '璇烽�夋嫨瀵硅薄閮ㄩ棬!' },
+ { required: true, message: '璇烽�夋嫨浣跨敤閮ㄩ棬!' },
]
},
teamId: {
diff --git a/src/views/eam/modules/specialtyMaintenanceStandard/SpecialtyMaintenanceStandardModal.vue b/src/views/eam/modules/specialtyMaintenanceStandard/SpecialtyMaintenanceStandardModal.vue
index 9ead2db..e4a5093 100644
--- a/src/views/eam/modules/specialtyMaintenanceStandard/SpecialtyMaintenanceStandardModal.vue
+++ b/src/views/eam/modules/specialtyMaintenanceStandard/SpecialtyMaintenanceStandardModal.vue
@@ -63,14 +63,14 @@
</a-col>
<!-- <a-col :span="12">
<a-form-item
- label="瀵硅薄閮ㄩ棬"
+ label="浣跨敤閮ㄩ棬"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
>
<j-dict-select-tag
allow-clear
:disabled="disableSubmit"
- :placeholder="disableSubmit?'':'璇峰璞￠儴闂�'"
+ :placeholder="disableSubmit?'':'璇蜂娇鐢ㄩ儴闂�'"
:triggerChange="true"
dictCode="sys_depart,depart_name,id,version = '7' and del_flag!='1'"
v-decorator="['departId', validatorRules.departId]"
@@ -454,7 +454,7 @@
},
departId: {
rules: [
- { required: true, message: '璇烽�夋嫨瀵硅薄閮ㄩ棬!' },
+ { required: true, message: '璇烽�夋嫨浣跨敤閮ㄩ棬!' },
]
},
equipmentId: {
diff --git a/src/views/eam/repairOrderFinishedReport/modules/RepairOrderActualHoursReportModel copy.vue b/src/views/eam/repairOrderFinishedReport/modules/RepairOrderActualHoursReportModel copy.vue
index 99ac12f..d7162b3 100644
--- a/src/views/eam/repairOrderFinishedReport/modules/RepairOrderActualHoursReportModel copy.vue
+++ b/src/views/eam/repairOrderFinishedReport/modules/RepairOrderActualHoursReportModel copy.vue
@@ -32,7 +32,7 @@
</a-col>
<a-col :span='12'>
<a-form-model-item
- label='璁惧缂栫爜/鍚嶇О/鍨嬪彿'
+ label='缁熶竴缂栫爜/鍚嶇О/鍨嬪彿'
:labelCol='labelCol'
:wrapperCol='wrapperCol'
prop='equipmentId'
diff --git a/src/views/eam/repairOrderFinishedReport/modules/RepairOrderFaultAnalysisReportModel.vue b/src/views/eam/repairOrderFinishedReport/modules/RepairOrderFaultAnalysisReportModel.vue
index fcb7bc7..1dca7a5 100644
--- a/src/views/eam/repairOrderFinishedReport/modules/RepairOrderFaultAnalysisReportModel.vue
+++ b/src/views/eam/repairOrderFinishedReport/modules/RepairOrderFaultAnalysisReportModel.vue
@@ -32,7 +32,7 @@
</a-col>
<a-col :span='12'>
<a-form-model-item
- label='璁惧缂栫爜/鍚嶇О/鍨嬪彿'
+ label='缁熶竴缂栫爜/鍚嶇О/鍨嬪彿'
:labelCol='labelCol'
:wrapperCol='wrapperCol'
prop='equipmentId'
diff --git a/src/views/mdc/base/modules/DepartList/DepartListContent/DepartList.vue b/src/views/mdc/base/modules/DepartList/DepartListContent/DepartList.vue
index 9aea25f..b35b021 100644
--- a/src/views/mdc/base/modules/DepartList/DepartListContent/DepartList.vue
+++ b/src/views/mdc/base/modules/DepartList/DepartListContent/DepartList.vue
@@ -183,7 +183,7 @@
}
},{
- title: '璁惧缂栫爜',
+ title: '缁熶竴缂栫爜',
align: 'center',
dataIndex: 'equipmentId',
},
diff --git a/src/views/mdc/base/modules/DepartList/DepartListContent/DepartListModel.vue b/src/views/mdc/base/modules/DepartList/DepartListContent/DepartListModel.vue
index f537841..462848b 100644
--- a/src/views/mdc/base/modules/DepartList/DepartListContent/DepartListModel.vue
+++ b/src/views/mdc/base/modules/DepartList/DepartListContent/DepartListModel.vue
@@ -7,8 +7,8 @@
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :md="6" :sm="6">
- <a-form-item label="璁惧缂栫爜">
- <a-input placeholder="璇疯緭鍏ヨ澶囩紪鐮佹绱�" v-model="queryParam.equipmentId"></a-input>
+ <a-form-item label="缁熶竴缂栫爜">
+ <a-input placeholder="璇疯緭鍏ョ粺涓�缂栫爜妫�绱�" v-model="queryParam.equipmentId"></a-input>
</a-form-item>
</a-col>
@@ -80,7 +80,7 @@
disableMixinCreated: true,
queryParam: {},
columns: [{
- title: '璁惧缂栫爜',
+ title: '缁熶竴缂栫爜',
align: 'center',
dataIndex: 'equipmentId',
},
diff --git a/src/views/mdc/base/modules/DepartList/DepartListContent/DepartListSeachList.vue b/src/views/mdc/base/modules/DepartList/DepartListContent/DepartListSeachList.vue
index 78adfee..391c857 100644
--- a/src/views/mdc/base/modules/DepartList/DepartListContent/DepartListSeachList.vue
+++ b/src/views/mdc/base/modules/DepartList/DepartListContent/DepartListSeachList.vue
@@ -17,8 +17,8 @@
</a-col>
<a-col :md="6" :sm="6">
- <a-form-item label="璁惧缂栫爜">
- <a-input placeholder="璇疯緭鍏ヨ澶囩紪鐮佹绱�" v-model="queryParam.equipmentId"></a-input>
+ <a-form-item label="缁熶竴缂栫爜">
+ <a-input placeholder="璇疯緭鍏ョ粺涓�缂栫爜妫�绱�" v-model="queryParam.equipmentId"></a-input>
</a-form-item>
</a-col>
@@ -106,7 +106,7 @@
}
},{
- title: '璁惧缂栫爜',
+ title: '缁熶竴缂栫爜',
align: 'center',
dataIndex: 'equipmentId',
},
diff --git a/src/views/mdc/base/modules/EquipmentList/DeviceListModal.vue b/src/views/mdc/base/modules/EquipmentList/DeviceListModal.vue
index 3f6b53b..ee4a1d5 100644
--- a/src/views/mdc/base/modules/EquipmentList/DeviceListModal.vue
+++ b/src/views/mdc/base/modules/EquipmentList/DeviceListModal.vue
@@ -7,8 +7,8 @@
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :md="6" :sm="6">
- <a-form-item label="璁惧缂栫爜">
- <a-input placeholder="璇疯緭鍏ヨ澶囩紪鐮佹绱�" v-model="queryParam.equipmentid"></a-input>
+ <a-form-item label="缁熶竴缂栫爜">
+ <a-input placeholder="璇疯緭鍏ョ粺涓�缂栫爜妫�绱�" v-model="queryParam.equipmentid"></a-input>
</a-form-item>
</a-col>
@@ -81,7 +81,7 @@
disableMixinCreated: true,
queryParam: {},
columns: [{
- title: '璁惧缂栫爜',
+ title: '缁熶竴缂栫爜',
align: 'center',
dataIndex: 'equipmentid',
},
diff --git a/src/views/mdc/base/modules/EquipmentList/UserModal.vue b/src/views/mdc/base/modules/EquipmentList/UserModal.vue
index a16aa3c..1ff4d17 100644
--- a/src/views/mdc/base/modules/EquipmentList/UserModal.vue
+++ b/src/views/mdc/base/modules/EquipmentList/UserModal.vue
@@ -22,10 +22,10 @@
<a-form-model ref="form" :form="form" :model="model" :rules="validatorRules">
<a-row :gutter="24">
<a-col :span="12">
- <a-form-model-item label="璁惧缂栫爜" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentId">
+ <a-form-model-item label="缁熶竴缂栫爜" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentId">
<a-input-search :readOnly="true"
v-model="model.equipmentId"
- :disabled="disSeach" @search="deviceSearch" enter-button placeholder='璇烽�夋嫨璁惧缂栫爜' />
+ :disabled="disSeach" @search="deviceSearch" enter-button placeholder='璇烽�夋嫨缁熶竴缂栫爜' />
</a-form-model-item>
</a-col>
<a-col :span="12">
diff --git a/src/views/mdc/base/modules/HolidayManagement/HolidayManagementModalList.vue b/src/views/mdc/base/modules/HolidayManagement/HolidayManagementModalList.vue
index 86d898c..3191785 100644
--- a/src/views/mdc/base/modules/HolidayManagement/HolidayManagementModalList.vue
+++ b/src/views/mdc/base/modules/HolidayManagement/HolidayManagementModalList.vue
@@ -44,8 +44,8 @@
</a-col>
<a-col :md="6" :sm="6">
- <a-form-item label="璁惧缂栫爜">
- <a-input placeholder="璇疯緭鍏ヨ澶囩紪鐮佹绱�" v-model="queryParam.equipmentId"></a-input>
+ <a-form-item label="缁熶竴缂栫爜">
+ <a-input placeholder="璇疯緭鍏ョ粺涓�缂栫爜妫�绱�" v-model="queryParam.equipmentId"></a-input>
</a-form-item>
</a-col>
@@ -134,7 +134,7 @@
}
},{
- title: '璁惧缂栫爜',
+ title: '缁熶竴缂栫爜',
align: 'center',
dataIndex: 'equipmentId',
},
diff --git a/src/views/mdc/base/modules/OvertimeManagement/OvertimeManagementModalList.vue b/src/views/mdc/base/modules/OvertimeManagement/OvertimeManagementModalList.vue
index 8339426..a4f4ca6 100644
--- a/src/views/mdc/base/modules/OvertimeManagement/OvertimeManagementModalList.vue
+++ b/src/views/mdc/base/modules/OvertimeManagement/OvertimeManagementModalList.vue
@@ -13,8 +13,8 @@
</a-form-item>
</a-col>
<a-col :md="6" :sm="6">
- <a-form-item label="璁惧缂栫爜">
- <a-input placeholder="璇疯緭鍏ヨ澶囩紪鐮佹绱�" v-model="queryParam.equipmentId"></a-input>
+ <a-form-item label="缁熶竴缂栫爜">
+ <a-input placeholder="璇疯緭鍏ョ粺涓�缂栫爜妫�绱�" v-model="queryParam.equipmentId"></a-input>
</a-form-item>
</a-col>
diff --git a/src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationModalList.vue b/src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationModalList.vue
index 86d898c..3191785 100644
--- a/src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationModalList.vue
+++ b/src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationModalList.vue
@@ -44,8 +44,8 @@
</a-col>
<a-col :md="6" :sm="6">
- <a-form-item label="璁惧缂栫爜">
- <a-input placeholder="璇疯緭鍏ヨ澶囩紪鐮佹绱�" v-model="queryParam.equipmentId"></a-input>
+ <a-form-item label="缁熶竴缂栫爜">
+ <a-input placeholder="璇疯緭鍏ョ粺涓�缂栫爜妫�绱�" v-model="queryParam.equipmentId"></a-input>
</a-form-item>
</a-col>
@@ -134,7 +134,7 @@
}
},{
- title: '璁惧缂栫爜',
+ title: '缁熶竴缂栫爜',
align: 'center',
dataIndex: 'equipmentId',
},
diff --git a/src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerModalList.vue b/src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerModalList.vue
index 86d898c..3191785 100644
--- a/src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerModalList.vue
+++ b/src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerModalList.vue
@@ -44,8 +44,8 @@
</a-col>
<a-col :md="6" :sm="6">
- <a-form-item label="璁惧缂栫爜">
- <a-input placeholder="璇疯緭鍏ヨ澶囩紪鐮佹绱�" v-model="queryParam.equipmentId"></a-input>
+ <a-form-item label="缁熶竴缂栫爜">
+ <a-input placeholder="璇疯緭鍏ョ粺涓�缂栫爜妫�绱�" v-model="queryParam.equipmentId"></a-input>
</a-form-item>
</a-col>
@@ -134,7 +134,7 @@
}
},{
- title: '璁惧缂栫爜',
+ title: '缁熶竴缂栫爜',
align: 'center',
dataIndex: 'equipmentId',
},
diff --git a/src/views/mdc/base/modules/alarmManager/alarmManangerEqupment.vue b/src/views/mdc/base/modules/alarmManager/alarmManangerEqupment.vue
index f7c53a9..b3001ba 100644
--- a/src/views/mdc/base/modules/alarmManager/alarmManangerEqupment.vue
+++ b/src/views/mdc/base/modules/alarmManager/alarmManangerEqupment.vue
@@ -19,8 +19,8 @@
</a-col>
<a-col :md="6" :sm="6">
- <a-form-item label="璁惧缂栫爜">
- <a-input placeholder="璇疯緭鍏ヨ澶囩紪鐮佹绱�" v-model="queryParam.equipmentId"></a-input>
+ <a-form-item label="缁熶竴缂栫爜">
+ <a-input placeholder="璇疯緭鍏ョ粺涓�缂栫爜妫�绱�" v-model="queryParam.equipmentId"></a-input>
</a-form-item>
</a-col>
@@ -106,7 +106,7 @@
}
},{
- title: '璁惧缂栫爜',
+ title: '缁熶竴缂栫爜',
align: 'center',
dataIndex: 'equipmentId',
},
diff --git a/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarListModel.vue b/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarListModel.vue
index f9fd2a5..d81e62c 100644
--- a/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarListModel.vue
+++ b/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarListModel.vue
@@ -44,8 +44,8 @@
</a-col>
<a-col :md="6" :sm="6">
- <a-form-item label="璁惧缂栫爜">
- <a-input placeholder="璇疯緭鍏ヨ澶囩紪鐮佹绱�" v-model="queryParam.equipmentId"></a-input>
+ <a-form-item label="缁熶竴缂栫爜">
+ <a-input placeholder="璇疯緭鍏ョ粺涓�缂栫爜妫�绱�" v-model="queryParam.equipmentId"></a-input>
</a-form-item>
</a-col>
@@ -134,7 +134,7 @@
}
},{
- title: '璁惧缂栫爜',
+ title: '缁熶竴缂栫爜',
align: 'center',
dataIndex: 'equipmentId',
},
diff --git a/src/views/mdc/base/modules/deviceManager/DeviceList.vue b/src/views/mdc/base/modules/deviceManager/DeviceList.vue
index 15ba2dc..964b767 100644
--- a/src/views/mdc/base/modules/deviceManager/DeviceList.vue
+++ b/src/views/mdc/base/modules/deviceManager/DeviceList.vue
@@ -93,7 +93,7 @@
],
columns2: [
{
- title: '璁惧缂栫爜',
+ title: '缁熶竴缂栫爜',
align: 'center',
dataIndex: 'equipmentId'
},
diff --git a/src/views/mdc/base/modules/deviceManager/DeviceListModel.vue b/src/views/mdc/base/modules/deviceManager/DeviceListModel.vue
index 7754f8a..ed27871 100644
--- a/src/views/mdc/base/modules/deviceManager/DeviceListModel.vue
+++ b/src/views/mdc/base/modules/deviceManager/DeviceListModel.vue
@@ -7,8 +7,8 @@
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :md="6" :sm="6">
- <a-form-item label="璁惧缂栫爜">
- <a-input placeholder="璇疯緭鍏ヨ澶囩紪鐮佹绱�" v-model="queryParam.equipmentId"></a-input>
+ <a-form-item label="缁熶竴缂栫爜">
+ <a-input placeholder="璇疯緭鍏ョ粺涓�缂栫爜妫�绱�" v-model="queryParam.equipmentId"></a-input>
</a-form-item>
</a-col>
@@ -80,7 +80,7 @@
disableMixinCreated: true,
queryParam: {},
columns: [{
- title: '璁惧缂栫爜',
+ title: '缁熶竴缂栫爜',
align: 'center',
dataIndex: 'equipmentId',
},
diff --git a/src/views/mdc/base/modules/deviceManager/DeviceModel.vue b/src/views/mdc/base/modules/deviceManager/DeviceModel.vue
index ceff71c..8a782c4 100644
--- a/src/views/mdc/base/modules/deviceManager/DeviceModel.vue
+++ b/src/views/mdc/base/modules/deviceManager/DeviceModel.vue
@@ -19,7 +19,7 @@
<a-row :gutter="24">
<a-col :span="12">
- <a-form-item label="璁惧缂栫爜" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <a-form-item label="缁熶竴缂栫爜" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input-search :readOnly="true" v-decorator="['equipmentId', validatorRules.equipmentId]"
@search="deviceSearch" enter-button/>
</a-form-item>
diff --git a/src/views/mdc/base/modules/deviceRepair/DeviceRepairEditListModel.vue b/src/views/mdc/base/modules/deviceRepair/DeviceRepairEditListModel.vue
index 4becb90..d765332 100644
--- a/src/views/mdc/base/modules/deviceRepair/DeviceRepairEditListModel.vue
+++ b/src/views/mdc/base/modules/deviceRepair/DeviceRepairEditListModel.vue
@@ -7,8 +7,8 @@
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :md="6" :sm="6">
- <a-form-item label="璁惧缂栫爜">
- <a-input placeholder="璇疯緭鍏ヨ澶囩紪鐮佹绱�" v-model="queryParam.equipmentId"></a-input>
+ <a-form-item label="缁熶竴缂栫爜">
+ <a-input placeholder="璇疯緭鍏ョ粺涓�缂栫爜妫�绱�" v-model="queryParam.equipmentId"></a-input>
</a-form-item>
</a-col>
@@ -82,7 +82,7 @@
disableMixinCreated: true,
queryParam: {},
columns: [{
- title: '璁惧缂栫爜',
+ title: '缁熶竴缂栫爜',
align: 'center',
dataIndex: 'equipmentId',
},
diff --git a/src/views/mdc/base/modules/deviceRepair/DeviceRepairListModel.vue b/src/views/mdc/base/modules/deviceRepair/DeviceRepairListModel.vue
index 672f956..ae7e3ec 100644
--- a/src/views/mdc/base/modules/deviceRepair/DeviceRepairListModel.vue
+++ b/src/views/mdc/base/modules/deviceRepair/DeviceRepairListModel.vue
@@ -44,8 +44,8 @@
</a-col>
<a-col :md="6" :sm="6">
- <a-form-item label="璁惧缂栫爜">
- <a-input placeholder="璇疯緭鍏ヨ澶囩紪鐮佹绱�" v-model="queryParam.equipmentId"></a-input>
+ <a-form-item label="缁熶竴缂栫爜">
+ <a-input placeholder="璇疯緭鍏ョ粺涓�缂栫爜妫�绱�" v-model="queryParam.equipmentId"></a-input>
</a-form-item>
</a-col>
@@ -137,7 +137,7 @@
}
},{
- title: '璁惧缂栫爜',
+ title: '缁熶竴缂栫爜',
align: 'center',
dataIndex: 'equipmentId',
},
diff --git a/src/views/mdc/base/modules/mdcPassRate/mdcPassRateModalList.vue b/src/views/mdc/base/modules/mdcPassRate/mdcPassRateModalList.vue
index 86d898c..3191785 100644
--- a/src/views/mdc/base/modules/mdcPassRate/mdcPassRateModalList.vue
+++ b/src/views/mdc/base/modules/mdcPassRate/mdcPassRateModalList.vue
@@ -44,8 +44,8 @@
</a-col>
<a-col :md="6" :sm="6">
- <a-form-item label="璁惧缂栫爜">
- <a-input placeholder="璇疯緭鍏ヨ澶囩紪鐮佹绱�" v-model="queryParam.equipmentId"></a-input>
+ <a-form-item label="缁熶竴缂栫爜">
+ <a-input placeholder="璇疯緭鍏ョ粺涓�缂栫爜妫�绱�" v-model="queryParam.equipmentId"></a-input>
</a-form-item>
</a-col>
@@ -134,7 +134,7 @@
}
},{
- title: '璁惧缂栫爜',
+ title: '缁熶竴缂栫爜',
align: 'center',
dataIndex: 'equipmentId',
},
diff --git a/src/views/mdc/base/modules/mdcProcessQuantity/mdcProcessQuantityModalList.vue b/src/views/mdc/base/modules/mdcProcessQuantity/mdcProcessQuantityModalList.vue
index 1e142d7..313de93 100644
--- a/src/views/mdc/base/modules/mdcProcessQuantity/mdcProcessQuantityModalList.vue
+++ b/src/views/mdc/base/modules/mdcProcessQuantity/mdcProcessQuantityModalList.vue
@@ -43,8 +43,8 @@
<!--</a-col>-->
<a-col :md="6" :sm="6">
- <a-form-item label="璁惧缂栫爜">
- <a-input placeholder="璇疯緭鍏ヨ澶囩紪鐮佹绱�" v-model="queryParam.equipmentId"></a-input>
+ <a-form-item label="缁熶竴缂栫爜">
+ <a-input placeholder="璇疯緭鍏ョ粺涓�缂栫爜妫�绱�" v-model="queryParam.equipmentId"></a-input>
</a-form-item>
</a-col>
@@ -119,7 +119,7 @@
disableMixinCreated: true,
queryParam: {},
columns: [{
- title: '璁惧缂栫爜',
+ title: '缁熶竴缂栫爜',
align: 'center',
dataIndex: 'equipmentId',
},
diff --git a/src/views/mdc/base/modules/mdcStandardProcessDuration/MdcStandardProcessDurationModalList.vue b/src/views/mdc/base/modules/mdcStandardProcessDuration/MdcStandardProcessDurationModalList.vue
index 86d898c..3191785 100644
--- a/src/views/mdc/base/modules/mdcStandardProcessDuration/MdcStandardProcessDurationModalList.vue
+++ b/src/views/mdc/base/modules/mdcStandardProcessDuration/MdcStandardProcessDurationModalList.vue
@@ -44,8 +44,8 @@
</a-col>
<a-col :md="6" :sm="6">
- <a-form-item label="璁惧缂栫爜">
- <a-input placeholder="璇疯緭鍏ヨ澶囩紪鐮佹绱�" v-model="queryParam.equipmentId"></a-input>
+ <a-form-item label="缁熶竴缂栫爜">
+ <a-input placeholder="璇疯緭鍏ョ粺涓�缂栫爜妫�绱�" v-model="queryParam.equipmentId"></a-input>
</a-form-item>
</a-col>
@@ -134,7 +134,7 @@
}
},{
- title: '璁惧缂栫爜',
+ title: '缁熶竴缂栫爜',
align: 'center',
dataIndex: 'equipmentId',
},
diff --git a/src/views/spare/modules/sparePart/EquipmentList.vue b/src/views/spare/modules/sparePart/EquipmentList.vue
index 9830afc..a47db0b 100644
--- a/src/views/spare/modules/sparePart/EquipmentList.vue
+++ b/src/views/spare/modules/sparePart/EquipmentList.vue
@@ -50,7 +50,7 @@
}
},
{
- title: '璁惧缂栫爜',
+ title: '缁熶竴缂栫爜',
align: "center",
dataIndex: 'num',
},
diff --git a/src/views/system/RoleUserList.vue b/src/views/system/RoleUserList.vue
index d6c78cb..1cdf9ee 100644
--- a/src/views/system/RoleUserList.vue
+++ b/src/views/system/RoleUserList.vue
@@ -152,8 +152,8 @@
</a-table>
</div>
<!-- 鍙充晶鐨勮鑹叉潈闄愰厤缃� -->
- <!-- <user-role-modal ref="modalUserRole"></user-role-modal> -->
- <user-role-modal-new ref="modalUserRole"></user-role-modal-new>
+ <user-role-modal ref="modalUserRole"></user-role-modal>
+ <!-- <user-role-modal-new ref="modalUserRole"></user-role-modal-new> -->
<role-modal
ref="modalForm"
@ok="modalFormOk"
diff --git a/src/views/system/WorkshopSignageManagement.vue b/src/views/system/WorkshopSignageManagement.vue
index 837a674..373697e 100644
--- a/src/views/system/WorkshopSignageManagement.vue
+++ b/src/views/system/WorkshopSignageManagement.vue
@@ -82,7 +82,7 @@
<a-form layout="inline">
<a-row :gutter="24">
<a-col :md="12" :sm="12">
- <a-form-item label="璁惧缂栫爜">
+ <a-form-item label="缁熶竴缂栫爜">
<a-input placeholder="" v-model="queryParam2.equipmentId"></a-input>
</a-form-item>
</a-col>
@@ -243,7 +243,7 @@
],
columns2: [
{
- title: '璁惧缂栫爜',
+ title: '缁熶竴缂栫爜',
align: 'center',
dataIndex: 'equipmentId',
width: 120,
--
Gitblit v1.9.3