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/faultType/FaultTypeModel.vue | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/src/views/eam/modules/faultType/FaultTypeModel.vue b/src/views/eam/modules/faultType/FaultTypeModel.vue
index 3d1a287..df553a1 100644
--- a/src/views/eam/modules/faultType/FaultTypeModel.vue
+++ b/src/views/eam/modules/faultType/FaultTypeModel.vue
@@ -14,7 +14,7 @@
<a-spin :spinning="confirmLoading">
<a-form :form="form">
- <a-row :gutter="24">
+<!-- <a-row :gutter="24">
<a-col :span="12">
<a-form-item
label="涓婄骇鏁呴殰绫诲瀷缂栧彿锛�"
@@ -43,7 +43,7 @@
/>
</a-form-item>
</a-col>
- </a-row>
+ </a-row>-->
<a-row :gutter="24">
<a-col :span="12">
@@ -54,8 +54,8 @@
>
<a-input
allow-clear
- :disabled="codeDisable"
- :placeholder="disableSubmit?'':'璇疯緭鍏ユ晠闅滅被鍨嬬紪鍙�'"
+ :disabled="true"
+ :placeholder="disableSubmit?'':'灏嗙敱绯荤粺鑷姩鐢熸垚'"
v-decorator="['num', validatorRules.num ]"
/>
</a-form-item>
@@ -103,13 +103,13 @@
>
鍏抽棴
</a-button>
- <a-button
+<!-- <a-button
v-if="!this.model.id"
:disabled="disableSubmit || confirmLoading"
:loading="confirmLoading"
@click="handleOk"
type="primary"
- >淇濆瓨骞剁户缁柊澧�</a-button>
+ >淇濆瓨骞剁户缁柊澧�</a-button>-->
<a-button
:disabled="disableSubmit || confirmLoading"
:loading="confirmLoading"
@@ -124,7 +124,7 @@
<script>
import pick from 'lodash.pick'
-import { postAction, requestPut } from '@/api/manage'
+import { getAction,postAction, requestPut } from '@/api/manage'
import { duplicateCheck } from '@/api/api'
export default {
@@ -170,7 +170,8 @@
},
url: {
add: "/eam/faultType/add",
- edit: "/eam/faultType/edit"
+ edit: "/eam/faultType/edit",
+ getNum: '/eam/sysIdentity/getNumNew',
},
//鏂板銆佺紪杈戙�佸垹闄ゃ�佹壒閲忓垹闄ゆ搷浣滄敼鍙樻暟鎹悗鍒锋柊鍏宠仈鐨勭粍浠剁殑鐩戝惉灞炴��
alterFlag: ""
@@ -196,6 +197,13 @@
this.codeDisable = true;
} else {
this.codeDisable = false;
+ this.$nextTick(() => {
+ getAction(this.url.getNum, { type: 'FaultType', length: '4' }).then((res) => {
+ if (res.success) {
+ this.form.setFieldsValue({ num: res.message });
+ }
+ })
+ });
}
},
--
Gitblit v1.9.3