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/dailyMaintenanceOrder/FinishDevolutionModal.vue | 25 ++++++++++++++++---------
1 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/src/views/eam/modules/dailyMaintenanceOrder/FinishDevolutionModal.vue b/src/views/eam/modules/dailyMaintenanceOrder/FinishDevolutionModal.vue
index ae05671..fb46035 100644
--- a/src/views/eam/modules/dailyMaintenanceOrder/FinishDevolutionModal.vue
+++ b/src/views/eam/modules/dailyMaintenanceOrder/FinishDevolutionModal.vue
@@ -7,14 +7,19 @@
cancelText="鍏抽棴"
@cancel="handleCancel"
:confirmLoading="confirmLoading"
+ title="闄勫綍2"
>
- <!-- :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.receiptsNum}}</span>
<a-divider
orientation="center"
style="font-size: large;font-style: normal;font-size: 30px;color: #66aeed;"
- > 鐢熶骇璁惧浜岀骇淇濆吇瀹屽伐绉讳氦鍗� </a-divider>
+ > {{this.model.receiptsName}} </a-divider>
+ <!-- 鐢熶骇璁惧浜岀骇淇濆吇瀹屽伐绉讳氦鍗� -->
<a-row :gutter="24">
<a-col :span="8">
<a-form-item
@@ -227,7 +232,7 @@
codeDisable: true,
dataSource: [],
model: {},
- departs: [],
+ // departs: [],
labelCol: {
xs: { span: 24 },
sm: { span: 6 },
@@ -246,9 +251,9 @@
},
},
url: {
- add: "/eam/dailyMaintenanceOrder/add",
+ // add: "/eam/dailyMaintenanceOrder/add",
edit: "/eam/dailyMaintenanceOrder/approve",
- getSysDeparts: "/eam/dailyMaintenanceOrder/getSysDeparts",
+ getSysFileName: "/eam/sysFileName/getSysFileName",
list: "/eam/dailyMaintenanceOrder/getMaintenanceCycleByStandardId",
},
@@ -259,7 +264,9 @@
edit(record) {
let that = this;
- this.getSysDeparts()
+ if (record.receipts == "" || record.receipts == null) {
+ this.getSysFileName()
+ }
this.form.resetFields();
this.model = Object.assign({}, record);
this.visible = true;
@@ -313,10 +320,10 @@
},
- getSysDeparts() {
- getAction(this.url.getSysDeparts).then((res) => {
+ getSysFileName() {
+ getAction(this.url.getSysFileName, { name: '15' }).then((res) => {
if (res.success) {
- this.departs = res.result
+ this.model = Object.assign(this.model, res.result[0]);
}
})
},
--
Gitblit v1.9.3