From 2771237a6ea07eb1b7be389034b4dc2981b0cffd Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期五, 11 七月 2025 21:10:14 +0800
Subject: [PATCH] 1、设备台账新增和编辑增加技术状态字段 2、二保编辑功能 3、二保以及点检自动带入保养周期默认值而不是从设备处带出
---
src/views/eam/maintenance/EamInspectionOrderList.vue | 145 +++++++++--------------
src/views/eam/equipment/modules/EamEquipmentModal.vue | 60 +++++----
src/views/eam/maintenance/modules/EamSecondMaintenanceOrderModal.vue | 54 ++++----
src/views/eam/equipment/EamEquipmentLedger.vue | 62 +---------
src/views/eam/maintenance/modules/EamInspectionOrderModal.vue | 21 +-
src/views/eam/base/EamMaintenanceStandardList.vue | 2
src/views/eam/maintenance/EamSecondMaintenanceOrderList.vue | 13 -
7 files changed, 142 insertions(+), 215 deletions(-)
diff --git a/src/views/eam/base/EamMaintenanceStandardList.vue b/src/views/eam/base/EamMaintenanceStandardList.vue
index b786d51..a41ed60 100644
--- a/src/views/eam/base/EamMaintenanceStandardList.vue
+++ b/src/views/eam/base/EamMaintenanceStandardList.vue
@@ -115,7 +115,7 @@
</template>
<template v-if="record.standardStatus != 'WAIT_SUBMIT'">
- <a-divider type="vertical"/>
+ <a-divider type="vertical" v-if="record.standardStatus=='START'"/>
<a-popconfirm title="纭畾鍒犻櫎鍚�?" @confirm="() => handleDelete(record.id)">
<a @click.stop="event=>event.stopPropagation()">鍒犻櫎</a>
diff --git a/src/views/eam/equipment/EamEquipmentLedger.vue b/src/views/eam/equipment/EamEquipmentLedger.vue
index 6fa5133..4564585 100644
--- a/src/views/eam/equipment/EamEquipmentLedger.vue
+++ b/src/views/eam/equipment/EamEquipmentLedger.vue
@@ -151,34 +151,6 @@
</a-table>
</div>
<!-- table鍖哄煙-end -->
-
- <!--<a-tabs v-model="activeTabKey" @change="handleTabChange">-->
- <!--<a-tab-pane tab="璁惧鏂囨。" :key="1">-->
- <!--<eam-equipment-attachment-list ref="tabPaneTableListRef1"/>-->
- <!--</a-tab-pane>-->
- <!--<a-tab-pane tab="鐐规宸ュ崟" :key="2">-->
- <!--<eam-inspection-order-list ref="tabPaneTableListRef2" :isDisplayOperation="false"/>-->
- <!--</a-tab-pane>-->
- <!--<a-tab-pane tab="浜屼繚宸ュ崟" :key="3">-->
- <!--<eam-second-maintenance-order-list ref="tabPaneTableListRef3" :isDisplayOperation="false"/>-->
- <!--</a-tab-pane>-->
- <!--<a-tab-pane tab="涓変繚宸ュ崟" :key="4">-->
- <!--<eam-third-maintenance-order-list ref="tabPaneTableListRef4" :isDisplayOperation="false"/>-->
- <!--</a-tab-pane>-->
- <!--<a-tab-pane tab="缁翠慨宸ュ崟" :key="5">-->
- <!--<eam-repair-order-list ref="tabPaneTableListRef5" :isDisplayOperation="false"/>-->
- <!--</a-tab-pane>-->
- <!--<a-tab-pane tab="淇濆吇鏍囧噯" :key="6">-->
- <!--<eam-maintenance-standard-list ref="tabPaneTableListRef6" :isDisplayOperation="false"/>-->
- <!--</a-tab-pane>-->
- <!--<a-tab-pane tab="宸ヨ壓鍙傛暟" :key="7" v-if="isOpenProcess">-->
- <!--<eam-equipment-process-list ref="tabPaneTableListRef7" :isDisplayOperation="false"/>-->
- <!--</a-tab-pane>-->
- <!--<a-tab-pane tab="璁惧绮惧害" :key="8" v-if="isOpenPrecision">-->
- <!--<eam-equipment-precision-list ref="tabPaneTableListRef8" :isDisplayOperation="false"/>-->
- <!--</a-tab-pane>-->
- <!--</a-tabs>-->
-
<!-- 琛ㄥ崟鍖哄煙 -->
<eamEquipment-modal ref="modalForm" @ok="modalFormOk" :productionTreeData="productionTreeData"
:repairDepartTreeData="repairDepartTreeData"/>
@@ -191,31 +163,14 @@
import EamEquipmentModal from './modules/EamEquipmentModal.vue'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { getAction, templateXlsDownload } from '@api/manage'
- import { getSystemConfigValue } from '@api/api'
import ResumeDrawer from '@views/eam/equipment/modules/ResumeDrawer.vue'
- import EamMaintenanceStandardList from '@views/eam/base/EamMaintenanceStandardList.vue'
- import EamRepairOrderList from '../repair/EamRepairOrderList'
- import EamInspectionOrderList from '../maintenance/EamInspectionOrderList'
- import EamEquipmentAttachmentList from '@views/eam/equipment/EamEquipmentAttachmentList.vue'
- import EamEquipmentProcessList from '@views/eam/equipment/modules/EamEquipmentProcessList.vue'
- import EamEquipmentPrecisionList from '@views/eam/equipment/modules/EamEquipmentPrecisionList.vue'
- import EamSecondMaintenanceOrderList from '@views/eam/maintenance/EamSecondMaintenanceOrderList.vue'
- import EamThirdMaintenanceOrderList from '@views/eam/maintenance/EamThirdMaintenanceOrderList.vue'
export default {
name: 'EquipmentLedger',
mixins: [JeecgListMixin],
components: {
- EamInspectionOrderList,
- EamRepairOrderList,
- EamMaintenanceStandardList,
ResumeDrawer,
EamEquipmentModal,
- EamEquipmentAttachmentList,
- EamEquipmentProcessList,
- EamEquipmentPrecisionList,
- EamSecondMaintenanceOrderList,
- EamThirdMaintenanceOrderList
},
data() {
return {
@@ -244,15 +199,18 @@
align: 'center',
dataIndex: 'equipmentCode',
scopedSlots: { customRender: 'equipmentCode' },
- ellipsis: true,
- fixed: 'left',
- sorter: true
+ fixed: 'left'
},
{
title: '璁惧鍚嶇О',
align: 'center',
dataIndex: 'equipmentName',
- ellipsis: true,
+ fixed: 'left'
+ },
+ {
+ title: '鍨嬪彿',
+ align: 'center',
+ dataIndex: 'equipmentModel',
fixed: 'left'
},
{
@@ -384,17 +342,11 @@
align: 'center',
dataIndex: 'manufacturingEnterprise',
scopedSlots: { customRender: 'manufacturingEnterprise' },
- ellipsis: true
},
{
title: '璧勪骇鏉ユ簮鍥藉',
align: 'center',
dataIndex: 'originCountry'
- },
- {
- title: '鍨嬪彿',
- align: 'center',
- dataIndex: 'equipmentModel'
},
{
title: '璁惧瑙勬牸',
diff --git a/src/views/eam/equipment/modules/EamEquipmentModal.vue b/src/views/eam/equipment/modules/EamEquipmentModal.vue
index f1ebd75..8df1c99 100644
--- a/src/views/eam/equipment/modules/EamEquipmentModal.vue
+++ b/src/views/eam/equipment/modules/EamEquipmentModal.vue
@@ -33,6 +33,14 @@
</a-form-model-item>
</a-col>
<a-col :span="customSpan">
+ <a-form-model-item label="鍨嬪彿">
+ <a-input placeholder="璇疯緭鍏ュ瀷鍙�" v-model="model.equipmentModel"/>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+
+ <a-row>
+ <a-col :span="customSpan">
<a-form-model-item prop="factoryOrgCode" label="浣跨敤閮ㄩ棬">
<a-tree-select v-model="model.factoryOrgCode" style="width: 100%" show-search
:tree-data="productionTreeData" :disabled="!editable"
@@ -42,9 +50,6 @@
searchPlaceholder="璇疯緭鍏ュ叧閿瓧鎼滅储" tree-default-expand-all/>
</a-form-model-item>
</a-col>
- </a-row>
-
- <a-row>
<a-col :span="customSpan">
<a-form-model-item prop="equipmentCategory" label="鎵�灞炲垎绫�">
<j-dict-select-tag dict-code="equipment_category" placeholder="璇烽�夋嫨鎵�灞炲垎绫�" :disabled="!editable"
@@ -65,14 +70,14 @@
allow-clear tree-default-expand-all/>
</a-form-model-item>
</a-col>
+ </a-row>
+
+ <a-row>
<a-col :span="customSpan">
<a-form-model-item label="瀹夊叏閰嶇疆">
<a-input placeholder="璇疯緭鍏ュ畨鍏ㄩ厤缃�" v-model="model.securityConfiguration"/>
</a-form-model-item>
</a-col>
- </a-row>
-
- <a-row>
<a-col :span="customSpan">
<a-form-model-item label="鍐峰嵈绯荤粺">
<j-dict-select-tag dict-code="cooling_system" placeholder="璇烽�夋嫨鍐峰嵈绯荤粺" v-model="model.coolSystem"/>
@@ -89,14 +94,15 @@
v-model="model.fireExtinguisherExpirationDate" placeholder="璇疯緭鍏ョ伃鐏櫒鏈夋晥鏈�"/>
</a-form-model-item>
</a-col>
+
+ </a-row>
+
+ <a-row>
<a-col :span="customSpan">
<a-form-model-item label="鎿嶄綔绯荤粺">
<j-dict-select-tag dict-code="yn " type="radio" v-model="model.operationSystem"/>
</a-form-model-item>
</a-col>
- </a-row>
-
- <a-row>
<a-col :span="customSpan">
<a-form-model-item label="绯荤粺">
<a-input placeholder="璇疯緭鍏ョ郴缁�" :disabled="!Boolean(+model.operationSystem)" v-model="model.system"/>
@@ -113,14 +119,15 @@
style="width: 100%"/>
</a-form-model-item>
</a-col>
+
+ </a-row>
+
+ <a-row>
<a-col :span="customSpan">
<a-form-model-item label="閲嶉噺">
<a-input-number placeholder="璇疯緭鍏ラ噸閲�" v-model="model.equipmentWeight" :min="0" style="width: 100%"/>
</a-form-model-item>
</a-col>
- </a-row>
-
- <a-row>
<a-col :span="customSpan">
<a-form-model-item label="閲嶉噺璁￠噺鍗曚綅">
<a-input placeholder="璇疯緭鍏ラ噸閲忚閲忓崟浣�" v-model="model.weightUnit"/>
@@ -136,14 +143,14 @@
<a-input placeholder="璇疯緭鍏ュ畨瑁呬綅缃�" v-model="model.installationPosition"/>
</a-form-model-item>
</a-col>
+ </a-row>
+
+ <a-row>
<a-col :span="customSpan">
<a-form-model-item label="鍑哄巶鏃ユ湡">
<a-date-picker v-model="model.leaveFactoryDate" value-format="YYYY-MM-DD" style="width:100%"/>
</a-form-model-item>
</a-col>
- </a-row>
-
- <a-row>
<a-col :span="customSpan">
<a-form-model-item label="绔嬮」鍗″彿">
<a-input placeholder="璇疯緭鍏ョ珛椤瑰崱鍙�" v-model="model.cardNumber"/>
@@ -159,14 +166,14 @@
<a-date-picker v-model="model.acceptanceCheckDate" value-format="YYYY-MM-DD" style="width:100%"/>
</a-form-model-item>
</a-col>
+ </a-row>
+
+ <a-row>
<a-col :span="customSpan">
<a-form-model-item label="鍑哄巶缂栧彿">
<a-input placeholder="璇疯緭鍏ュ嚭鍘傜紪鍙�" v-model="model.factoryNumber"/>
</a-form-model-item>
</a-col>
- </a-row>
-
- <a-row>
<a-col :span="customSpan">
<a-form-model-item label="璧勪骇鍒堕�犲晢">
<a-input placeholder="璇疯緭鍏ヨ祫浜у埗閫犲晢" v-model="model.manufacturingEnterprise"/>
@@ -175,11 +182,6 @@
<a-col :span="customSpan">
<a-form-model-item label="璧勪骇鏉ユ簮鍥藉">
<a-input placeholder="璇疯緭鍏ヨ祫浜ф潵婧愬浗瀹�" v-model="model.originCountry"/>
- </a-form-model-item>
- </a-col>
- <a-col :span="customSpan">
- <a-form-model-item label="鍨嬪彿">
- <a-input placeholder="璇疯緭鍏ュ瀷鍙�" v-model="model.equipmentModel"/>
</a-form-model-item>
</a-col>
<a-col :span="customSpan">
@@ -232,15 +234,21 @@
</a-form-model-item>
</a-col>
<a-col :span="customSpan">
- <a-form-model-item label="鏈鎶�鏈壌瀹氭棩鏈�">
- <a-date-picker v-model="model.latestTechnologyCheck" value-format="YYYY-MM-DD"
- :disabled="!editable" style="width:100%"/>
+ <a-form-model-item label="鎶�鏈姸鎬�">
+ <j-dict-select-tag placeholder="璇烽�夋嫨鎶�鏈姸鎬�" dict-code="equipment_technology_status"
+ v-model="model.technologyStatus"/>
</a-form-model-item>
</a-col>
</a-row>
<a-row>
<a-col :span="customSpan">
+ <a-form-model-item label="鏈鎶�鏈壌瀹氭棩鏈�">
+ <a-date-picker v-model="model.latestTechnologyCheck" value-format="YYYY-MM-DD"
+ :disabled="!editable" style="width:100%"/>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="customSpan">
<a-form-model-item label="涓嬫鎶�鏈壌瀹氭棩鏈�">
<a-date-picker v-model="model.nextTechnologyCheck" value-format="YYYY-MM-DD" style="width:100%"/>
</a-form-model-item>
diff --git a/src/views/eam/maintenance/EamInspectionOrderList.vue b/src/views/eam/maintenance/EamInspectionOrderList.vue
index 39c7c2b..be8ef7d 100644
--- a/src/views/eam/maintenance/EamInspectionOrderList.vue
+++ b/src/views/eam/maintenance/EamInspectionOrderList.vue
@@ -1,26 +1,17 @@
<template>
<a-card :bordered="false">
<!-- 鏌ヨ鍖哄煙 -->
- <div
- class="table-page-search-wrapper"
- v-if="isDisplayOperation"
- >
- <a-form
- layout="inline"
- @keyup.enter.native="searchQuery"
- >
+ <div class="table-page-search-wrapper" v-if="isDisplayOperation">
+ <a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
- <a-col :xl="4" :lg="7" :md="8" :sm="24">
- <a-form-item label="宸ュ崟鍙�">
- <a-input
- placeholder="璇疯緭鍏ュ伐鍗曞彿"
- v-model="queryParam.orderNum"
- ></a-input>
- </a-form-item>
- </a-col>
<a-col :xl="5" :lg="7" :md="8" :sm="24">
<a-form-item label="缁熶竴缂栫爜">
<lx-search-equipment-select placeholder="璇疯緭鍏ョ粺涓�缂栫爜鎴栧悕绉版悳绱�" v-model="queryParam.equipmentId"/>
+ </a-form-item>
+ </a-col>
+ <a-col :xl="4" :lg="7" :md="8" :sm="24">
+ <a-form-item label="宸ュ崟鍙�">
+ <a-input placeholder="璇疯緭鍏ュ伐鍗曞彿" v-model="queryParam.orderNum"/>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -118,22 +109,19 @@
</template>
<script>
-
- import '@/assets/less/TableExpand.less'
- import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import EamInspectionOrderModal from './modules/EamInspectionOrderModal'
import { deleteAction, getAction } from '@api/manage'
import InspectionOrderHandle from '../../flowable/workflow/InspectionOrder/InspectionOrderHandle'
- import LxSearchEquipmentSelect from '@views/eam/equipment/modules/LxSearchEquipmentSelect.vue'
+ import LxSearchEquipmentSelect from '../equipment/modules/LxSearchEquipmentSelect'
export default {
name: 'EamInspectionOrderList',
- mixins: [JeecgListMixin, mixinDevice],
+ mixins: [JeecgListMixin],
components: {
+ LxSearchEquipmentSelect,
InspectionOrderHandle,
- EamInspectionOrderModal,
- LxSearchEquipmentSelect
+ EamInspectionOrderModal
},
props: {
isDisplayOperation: {
@@ -143,7 +131,7 @@
},
data() {
return {
- description: 'eam_inspection_order绠＄悊椤甸潰',
+ description: '鐐规宸ュ崟椤甸潰',
disableMixinCreated: true,
// 琛ㄥご
columns: [
@@ -291,7 +279,6 @@
})
that.loadData()
} else {
- // that.$message.warning(res.message);
that.$notification.warning({
message: '娑堟伅',
description: res.message
@@ -311,7 +298,6 @@
})
that.loadData()
} else {
- // that.$message.warning(res.message);
that.$notification.warning({
message: '娑堟伅',
description: res.message
@@ -320,62 +306,50 @@
})
},
batchZf(type) {
- if (this.selectedRowKeys.length <= 0) {
- this.$notification.warning({
- message: '娑堟伅',
- description: '璇烽�夋嫨涓�鏉¤褰�'
- })
- } else {
- var ids = ''
- for (var a = 0; a < this.selectedRowKeys.length; a++) {
- ids += this.selectedRowKeys[a] + ','
- }
- var that = this
- this.$confirm({
- title: '纭浣滃簾',
- content: '鏄惁浣滃簾閫変腑鏁版嵁锛屽彧鏈夊緟鐐规鐘舵�佺殑鏁版嵁鎵嶅彲浣滃簾鎴愬姛?',
- onOk: function() {
- that.loading = true
- getAction(that.url.cancelOrReceive, { ids: ids, type: type }).then((res) => {
- if (res.success) {
- that.$notification.success({
- message: '娑堟伅',
- description: res.message
- })
- that.loadData()
- that.onClearSelected()
- } else {
- // that.$message.warning(res.message);
- that.$notification.warning({
- message: '娑堟伅',
- description: res.message
- })
- }
- }).finally(() => {
- that.loading = false
- })
- }
- })
+ var ids = ''
+ for (var a = 0; a < this.selectedRowKeys.length; a++) {
+ ids += this.selectedRowKeys[a] + ','
}
+ var that = this
+ this.$confirm({
+ title: '纭浣滃簾',
+ content: '鏄惁浣滃簾閫変腑鏁版嵁锛屽彧鏈夊緟鐐规鐘舵�佺殑鏁版嵁鎵嶅彲浣滃簾鎴愬姛?',
+ onOk: function() {
+ that.loading = true
+ getAction(that.url.cancelOrReceive, { ids, type }).then((res) => {
+ if (res.success) {
+ that.$notification.success({
+ message: '娑堟伅',
+ description: res.message
+ })
+ that.loadData()
+ that.onClearSelected()
+ } else {
+ // that.$message.warning(res.message);
+ that.$notification.warning({
+ message: '娑堟伅',
+ description: res.message
+ })
+ }
+ }).finally(() => {
+ that.loading = false
+ })
+ }
+ })
},
batchLq(type) {
- if (this.selectedRowKeys.length <= 0) {
- this.$notification.warning({
- message: '娑堟伅',
- description: '璇烽�夋嫨涓�鏉¤褰�'
- })
- } else {
- var ids = ''
- for (var a = 0; a < this.selectedRowKeys.length; a++) {
- ids += this.selectedRowKeys[a] + ','
- }
- var that = this
- this.$confirm({
- title: '纭棰嗗彇',
- content: '鏄惁棰嗗彇閫変腑鏁版嵁锛屽彧鏈夊緟鐐规鐘舵�佺殑鏁版嵁鎵嶅彲棰嗗彇鎴愬姛?',
- onOk: function() {
- that.loading = true
- getAction(that.url.cancelOrReceive, { ids: ids, type: type }).then((res) => {
+ var ids = ''
+ for (var a = 0; a < this.selectedRowKeys.length; a++) {
+ ids += this.selectedRowKeys[a] + ','
+ }
+ var that = this
+ this.$confirm({
+ title: '纭棰嗗彇',
+ content: '鏄惁棰嗗彇閫変腑鏁版嵁锛屽彧鏈夊緟鐐规鐘舵�佺殑鏁版嵁鎵嶅彲棰嗗彇鎴愬姛?',
+ onOk: function() {
+ that.loading = true
+ getAction(that.url.cancelOrReceive, { ids, type })
+ .then((res) => {
if (res.success) {
that.$notification.success({
message: '娑堟伅',
@@ -389,12 +363,12 @@
description: res.message
})
}
- }).finally(() => {
+ })
+ .finally(() => {
that.loading = false
})
- }
- })
- }
+ }
+ })
},
onInspectionDateChange: function(value, dateString) {
this.queryParam.inspectionDateBegin = dateString[0]
@@ -402,7 +376,4 @@
}
}
}
-</script>
-<style scoped>
- @import '~@assets/less/common.less';
-</style>
\ No newline at end of file
+</script>
\ No newline at end of file
diff --git a/src/views/eam/maintenance/EamSecondMaintenanceOrderList.vue b/src/views/eam/maintenance/EamSecondMaintenanceOrderList.vue
index b91805c..fd0fd74 100644
--- a/src/views/eam/maintenance/EamSecondMaintenanceOrderList.vue
+++ b/src/views/eam/maintenance/EamSecondMaintenanceOrderList.vue
@@ -65,7 +65,6 @@
<a-divider type="vertical" v-if="record.maintenanceStatus === 'COMPLETE'"/>
<a v-if="record.maintenanceStatus === 'COMPLETE'" @click="handlePrint(record)">鎵撳嵃</a>
</template>
-
</span>
</a-table>
</div>
@@ -74,8 +73,7 @@
<!-- 琛ㄥ崟鍖哄煙 -->
<eamSecondMaintenanceOrder-modal ref="modalForm" @ok="modalFormOk"/>
- <second-maintenance-approval-modal ref="secondMaintenanceApprovalModal"
- :selectShenpiData="selectSecondMaintenanceData"/>
+ <second-maintenance-approval-modal ref="secondMaintenanceApprovalModal" :selectShenpiData="selectSecondMaintenanceData"/>
</a-card>
</template>
@@ -83,8 +81,7 @@
import EamSecondMaintenanceOrderModal from './modules/EamSecondMaintenanceOrderModal'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { deleteAction, getAction } from '@api/manage'
- import SecondMaintenanceApprovalModal
- from '@views/flowable/workflow/secondMaintenance/SecondMaintenanceApprovalModal.vue'
+ import SecondMaintenanceApprovalModal from '@views/flowable/workflow/secondMaintenance/SecondMaintenanceApprovalModal.vue'
import LxSearchEquipmentSelect from '../equipment/modules/LxSearchEquipmentSelect'
export default {
@@ -166,7 +163,7 @@
{
title: '缁翠慨宸�',
align: 'center',
- dataIndex: 'operator_dictText'
+ dataIndex: 'repairer_dictText'
},
{
title: '淇濆吇鐘舵��',
@@ -191,12 +188,12 @@
{
title: '妫�鏌ヤ汉纭',
align: 'center',
- dataIndex: 'confirmLeader_dictText'
+ dataIndex: 'inspector_dictText'
},
{
title: '妫�鏌ヤ汉纭鏃堕棿',
align: 'center',
- dataIndex: 'leaderConfirmTime'
+ dataIndex: 'inspectConfirmTime'
},
{
title: 'HF缂栫爜',
diff --git a/src/views/eam/maintenance/modules/EamInspectionOrderModal.vue b/src/views/eam/maintenance/modules/EamInspectionOrderModal.vue
index 8361c6c..45fdba0 100644
--- a/src/views/eam/maintenance/modules/EamInspectionOrderModal.vue
+++ b/src/views/eam/maintenance/modules/EamInspectionOrderModal.vue
@@ -33,7 +33,7 @@
</a-col>
<a-col :span="8">
<a-form-model-item label="淇濆吇鍛ㄦ湡">
- <a-input placeholder="閫夋嫨璁惧鍚庤嚜鍔ㄥ甫鍑�" v-model="model.maintenancePeriod" disabled/>
+ <a-input v-model="model.maintenancePeriod" disabled/>
</a-form-model-item>
</a-col>
<a-col :span="8">
@@ -130,19 +130,19 @@
key: 'itemCode',
type: JVXETypes.normal,
width: 100,
- align: 'center',
+ align: 'center'
},
{
title: '淇濆吇椤�',
key: 'itemName',
type: JVXETypes.normal,
- align: 'center',
+ align: 'center'
},
{
title: '淇濆吇瑙勮寖鎴栬姹�',
key: 'itemDemand',
type: JVXETypes.normal,
- align: 'center',
+ align: 'center'
}
],
weekInspectionColumns: [],
@@ -152,19 +152,19 @@
key: 'itemCode',
type: JVXETypes.normal,
width: 60,
- align: 'center',
+ align: 'center'
},
{
title: '淇濆吇椤�',
key: 'itemName',
type: JVXETypes.normal,
- align: 'center',
+ align: 'center'
},
{
title: '淇濆吇瑕佹眰',
key: 'itemDemand',
type: JVXETypes.normal,
- align: 'center',
+ align: 'center'
},
{
title: '鐐规缁撴灉',
@@ -178,7 +178,7 @@
title: '寮傚父鎻忚堪',
key: 'exceptionDescription',
type: JVXETypes.normal,
- align: 'center',
+ align: 'center'
},
{
title: '寮傚父鏄惁鎶ヤ慨',
@@ -194,7 +194,7 @@
},
methods: {
add() {
- this.model = {}
+ this.model = { maintenancePeriod: 1 }
this.visible = true
this.editable = true
this.detail.dayInspectionList = []
@@ -202,7 +202,7 @@
},
edit(record) {
- this.model = Object.assign({}, record)
+ this.model = Object.assign({ maintenancePeriod: 1 }, record)
this.editable = false
this.visible = true
this.spinning = true
@@ -249,7 +249,6 @@
autocompleteForm(selectObj) {
this.model.standardName = selectObj.standardName
- this.model.maintenancePeriod = selectObj.maintenancePeriod
this.model.standardCode = selectObj.standardCode
this.standardId = selectObj.id
this.detail.dayInspectionList = []
diff --git a/src/views/eam/maintenance/modules/EamSecondMaintenanceOrderModal.vue b/src/views/eam/maintenance/modules/EamSecondMaintenanceOrderModal.vue
index 46cd6fd..c0a5293 100644
--- a/src/views/eam/maintenance/modules/EamSecondMaintenanceOrderModal.vue
+++ b/src/views/eam/maintenance/modules/EamSecondMaintenanceOrderModal.vue
@@ -1,7 +1,6 @@
<template>
<j-modal :title="title" :width="1200" :visible="visible" :confirmLoading="confirmLoading" switchFullscreen
:mask-closable="false" @ok="handleOk" @cancel="handleCancel" cancelText="鍏抽棴">
-
<a-spin :spinning="spinning">
<a-form-model ref="form" :model="model" :rules="validatorRules" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-row>
@@ -26,12 +25,13 @@
<a-row>
<a-col :span="8">
<a-form-model-item prop="maintenanceDate" label="淇濆吇鏃ユ湡">
- <a-date-picker v-model="model.maintenanceDate" value-format="YYYY-MM-DD" style="width: 100%"/>
+ <a-date-picker v-model="model.maintenanceDate" value-format="YYYY-MM-DD" :allowClear="false"
+ style="width: 100%"/>
</a-form-model-item>
</a-col>
<a-col :span="8">
<a-form-model-item label="淇濆吇鍛ㄦ湡">
- <a-input placeholder="閫夋嫨璁惧鍚庤嚜鍔ㄥ甫鍑�" v-model="model.maintenancePeriod" disabled/>
+ <a-input v-model="model.maintenancePeriod" disabled/>
</a-form-model-item>
</a-col>
</a-row>
@@ -68,7 +68,7 @@
return {
title: '鎿嶄綔',
visible: false,
- editable: false,
+ editable: true,
model: {},
labelCol: {
xs: { span: 24 },
@@ -105,7 +105,6 @@
detail: {
operatorMaintenanceList: [],
repairerMaintenanceList: [],
- dataSource: [],
columns: [
{
title: 'ID',
@@ -144,7 +143,7 @@
},
edit(record) {
- this.model = Object.assign({}, record)
+ this.model = Object.assign({ maintenancePeriod: 6 }, record)
this.visible = true
this.editable = false
this.detail.operatorMaintenanceList = this.detail.repairerMaintenanceList = []
@@ -163,19 +162,17 @@
* @param standardId 瑙勮寖Id
*/
loadStandardDetail(standardId) {
- if (standardId) {
- this.spinning = true
- getAction(this.url.standardDetail, { standardId })
- .then(res => {
- if (res.success) {
- this.detail.operatorMaintenanceList = res.result.filter(item => item.itemCategory == 'OPERATOR_MAINTENANCE')
- this.detail.repairerMaintenanceList = res.result.filter(item => item.itemCategory == 'REPAIRER_MAINTENANCE')
- }
- })
- .finally(() => {
- this.spinning = false
- })
- }
+ this.spinning = true
+ getAction(this.url.standardDetail, { standardId })
+ .then(res => {
+ if (res.success) {
+ this.detail.operatorMaintenanceList = res.result.filter(item => item.itemCategory == 'OPERATOR_MAINTENANCE')
+ this.detail.repairerMaintenanceList = res.result.filter(item => item.itemCategory == 'REPAIRER_MAINTENANCE')
+ }
+ })
+ .finally(() => {
+ this.spinning = false
+ })
},
/**
@@ -183,14 +180,17 @@
* @param orderId 宸ュ崟Id
*/
loadDetail(orderId) {
- if (orderId) {
- getAction(this.url.detail, { orderId })
- .then(res => {
- if (res.success) {
- this.detail.dataSource = [...res.result]
- }
- })
- }
+ this.spinning = true
+ getAction(this.url.detail, { orderId })
+ .then(res => {
+ if (res.success) {
+ this.detail.operatorMaintenanceList = res.result.filter(item => item.itemCategory == 'OPERATOR_MAINTENANCE')
+ this.detail.repairerMaintenanceList = res.result.filter(item => item.itemCategory == 'REPAIRER_MAINTENANCE')
+ }
+ })
+ .finally(() => {
+ this.spinning = false
+ })
},
async handleOk() {
--
Gitblit v1.9.3