From 3a8223b71d18205d40b894fd0b4c0fa1ca773e86 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期一, 13 十一月 2023 10:44:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdc-test' into mdc-test
---
src/views/eam/modules/daily3MaintenanceOrder/EquipmentPrecisionCheckOrderModal.vue | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/src/views/eam/modules/daily3MaintenanceOrder/EquipmentPrecisionCheckOrderModal.vue b/src/views/eam/modules/daily3MaintenanceOrder/EquipmentPrecisionCheckOrderModal.vue
index 35c64b4..9c2cf43 100644
--- a/src/views/eam/modules/daily3MaintenanceOrder/EquipmentPrecisionCheckOrderModal.vue
+++ b/src/views/eam/modules/daily3MaintenanceOrder/EquipmentPrecisionCheckOrderModal.vue
@@ -7,14 +7,20 @@
cancelText="鍏抽棴"
@cancel="handleCancel"
:confirmLoading="confirmLoading"
+ title="闄勫綍6"
>
<!-- :title="title" -->
<a-spin :spinning="confirmLoading">
<a-form :form="form">
+ <span
+ class="ant-descriptions-title"
+ style="font-size: large;font-size: 15px;float: right;"
+ >{{this.model.receiptsNum2}}</span>
<a-divider
orientation="center"
style="font-size: large;font-style: normal;font-size: 30px;color: #66aeed;"
- > 鐢熶骇璁惧绮惧害妫�楠屽崟 </a-divider>
+ > {{this.model.receiptsName2}} </a-divider>
+ <!-- 鐢熶骇璁惧绮惧害妫�楠屽崟 -->
<a-row :gutter="24">
<a-col :span="8">
<a-form-item
@@ -380,6 +386,7 @@
add: "/eam/precisionInspection/precisionInspection",
getPrecisionInspection: "/eam/precisionInspection/getPrecisionInspectionList",
list: "/eam/dailyMaintenanceOrder/getMaintenanceCycleByStandardId",
+ getSysFileName: "/eam/sysFileName/getSysFileName",
},
}
@@ -389,7 +396,9 @@
edit(record) {
let that = this;
-
+ if (record.receipts2 == "" || record.receipts2 == null) {
+ this.getSysFileName()
+ }
this.form.resetFields();
// record.eachTolerance = '0'
// record.partTolerance = '0'
@@ -456,8 +465,7 @@
getAction(this.url.getPrecisionInspection, { maintenanceOrderId: this.model.id }).then((res) => {
if (res.success) {
this.dataSource = res.result[0].precisionInspectionDetails
- this.model = Object.assign({}, res.result[0]);
- debugger
+ this.model = Object.assign(this.model, res.result[0]);
}
})
},
@@ -515,6 +523,14 @@
}
},
+ getSysFileName() {
+ getAction(this.url.getSysFileName, { name: '16' }).then((res) => {
+ if (res.success) {
+ this.model = Object.assign(this.model, res.result[0]);
+ }
+ })
+ },
+
},
}
</script>
--
Gitblit v1.9.3