From 2719424e8639a508f716dca2aaa05c340778dff1 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 07 七月 2023 17:12:06 +0800
Subject: [PATCH] 解决冲突
---
Source/UBCS-WEB/src/components/Tree/classifyTrees.vue | 52 ++++++++++++++++++++--------------------------------
1 files changed, 20 insertions(+), 32 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue b/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue
index 7889814..3e8995d 100644
--- a/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue
+++ b/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue
@@ -72,28 +72,29 @@
></el-input>
</el-form-item>
<el-form-item label="缂栫爜瑙勫垯锛�" label-width="150px">
- <el-input
- v-model="TreeAddform.coderuleoidName"
- autocomplete="off"
- style="width: 585px"
- @focus="CodeFoucus"
- ></el-input>
+ <el-input
+ v-model="TreeAddform.coderuleoidName"
+ readonly
+ autocomplete="off"
+ style="width: 585px"
+ @focus="CodeFoucus">
+ </el-input>
</el-form-item>
<el-form-item label="鍏抽敭灞炴�ф煡璇㈣鍒欙細" label-width="150px">
- <el-input
- v-model="TreeAddform.codekeyattrrepeatoidName"
- autocomplete="off"
- @focus="Keyfouce"
- style="width: 585px"
- ></el-input>
+ <el-input
+ v-model="TreeAddform.codekeyattrrepeatoidName"
+ readonly
+ autocomplete="off"
+ @focus="Keyfouce"
+ style="width: 585px">
+ </el-input>
</el-form-item>
<el-form-item label="鐩镐技鏌ヨ瑙勫垯锛�" label-width="150px">
- <el-input
- v-model="TreeAddform.codeResembleRuleOidName"
- autocomplete="off"
- @focus="simFouce"
- style="width: 585px"
- ></el-input>
+ <el-input v-model="TreeAddform.codeResembleRuleOidName"
+ autocomplete="off"
+ readonly
+ @focus="simFouce"
+ style="width: 585px"></el-input>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -882,19 +883,6 @@
},
],
},
- //妯℃嫙琛ㄥ崟鍋囨暟鎹�
- Treeform: [
- {
- name: "娴嬭瘯1",
- sex: "鐢�",
- value: 0,
- },
- {
- name: "娴嬭瘯2",
- sex: "濂�",
- value: 1,
- },
- ],
//浼犻�掔粰瀛愮粍浠跺姩鎬佹覆鏌撶殑鏁版嵁
TreeList: {},
codeClassifyOid: "",
@@ -1183,7 +1171,7 @@
TreeAddHandler() {
const data = this.TreeAddform;
this.$set(data, "parentCodeClassifyOid", this.nodeClickList.oid);
- console.log("data", data);
+ // console.log("data", data);
TreeSave(data)
.then(() => {
this.$message({
--
Gitblit v1.9.3