From f2e8b17c7df35a8efb3b32d821bea54775b253ab Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 15 六月 2023 21:22:40 +0800
Subject: [PATCH] 解决冲突
---
Source/UBCS-WEB/src/views/MasterData/FormTempalteTest.vue | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/MasterData/FormTempalteTest.vue b/Source/UBCS-WEB/src/views/MasterData/FormTempalteTest.vue
index c63bafa..a0521bf 100644
--- a/Source/UBCS-WEB/src/views/MasterData/FormTempalteTest.vue
+++ b/Source/UBCS-WEB/src/views/MasterData/FormTempalteTest.vue
@@ -32,11 +32,11 @@
visible: false,
visible1: false,
// 榛樿绂佺敤鐨勮〃鍏冪礌
- disabledProp: ["id"],
+ disabledProp: ["id", 'lcstatus'],
// 琛ㄥ崟绫诲瀷
type: "add",
- templateOid: "78B8C7C5-A042-0B96-FE6D-65421451782A",
- codeClassifyOid: "4524E801-6CC6-92E8-1AC3-2AB9604E8F96",
+ templateOid: "A12826E4-2B66-6D56-DE30-92BB1D7F607F",
+ codeClassifyOid: "D9CF223F-317D-71EB-BD11-433A94CAD9F3",
codeRuleOid: "B95872A6-9CEA-D490-8F1B-9D26548CAF96",
rowOid: '6EF696C3-CD87-0E7C-1EA1-8DE3913A95C9'
};
--
Gitblit v1.9.3