From 39967909b38575d2325b6f51b4d7721e4dd7a12d Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期四, 06 七月 2023 10:33:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/Tree/attrCrud.vue | 32 +++++++++++++++++++++++++-------
1 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Tree/attrCrud.vue b/Source/UBCS-WEB/src/components/Tree/attrCrud.vue
index 57cc374..b09eecf 100644
--- a/Source/UBCS-WEB/src/components/Tree/attrCrud.vue
+++ b/Source/UBCS-WEB/src/components/Tree/attrCrud.vue
@@ -12,6 +12,18 @@
<el-button icon="el-icon-menu" size="small" @click="attrVisibleHandle">灞炴�у垎缁�</el-button>
</el-button-group>
<el-button-group>
+<<<<<<< HEAD
+ <!-- 鍒嗙被娉ㄥ叆-->
+ <el-button icon="el-icon-magic-stick" size="small" @click="injectBtn">鍒嗙被娉ㄥ叆</el-button>
+ <!-- 缁勫悎瑙勫垯-->
+ <el-button size="small" @click="isShowHandler">缁勫悎瑙勫垯</el-button>
+ <!-- 鏋氫妇娉ㄥ叆-->
+ <el-button size="small" @click="enmuVisHandle">鏋氫妇娉ㄥ叆</el-button>
+ <!-- 绾ц仈灞炴��-->
+ <el-button size="small" @click="CascadeHandle">绾ц仈灞炴��</el-button>
+ <!-- 棰勮鎺掑簭-->
+ <el-button size="small" icon="el-icon-arrow-down">棰勮鎺掑簭</el-button>
+=======
<!-- 鍒嗙被娉ㄥ叆-->
<el-button icon="el-icon-magic-stick" size="small" @click="injectBtn">鍒嗙被娉ㄥ叆</el-button>
<!-- 缁勫悎瑙勫垯-->
@@ -22,8 +34,8 @@
<el-button size="small" @click="CascadeHandle">绾ц仈灞炴��</el-button>
<!-- 棰勮鎺掑簭-->
<el-button size="small" @click="orderHandle" icon="el-icon-arrow-down">棰勮鎺掑簭</el-button>
+>>>>>>> 92e7dde00a56aff46e01efe72e1f7ab9b76dcf69
</el-button-group>
- <el-button-group>
<!-- 淇濆瓨-->
<el-button size="small" @click="addsHandler" icon="el-icon-check">淇濆瓨</el-button>
<!-- 鍒犻櫎-->
@@ -31,8 +43,7 @@
<!-- 閲嶇疆-->
<el-button size="small" @click="reset" icon="el-icon-refresh-right">閲嶇疆</el-button>
<!-- 鍚屾鍒板叾浠栨ā鏉�-->
- <el-button size="small"@click="syncHandle" icon="el-icon-share">鍚屾鍒板叾浠栨ā鏉�</el-button>
- </el-button-group>
+ <el-button size="small" @click="syncHandle">鍚屾鍒板叾浠栨ā鏉�</el-button>
<!-- 缂栫爜鐢宠棰勮-->
<el-button size="small" @click="applicationHandle" style="">缂栫爜鐢宠棰勮</el-button>
<!-- 楠岃瘉瑙勫垯-->
@@ -255,10 +266,10 @@
<template slot-scope="{ row }">
<el-input v-if="editingRows === row && editShows== item.prop && item.prop != 'codeDateFormat' && (item.edit == 'text' || item.edit == 'select' ||item.edit == 'refer' )" v-model="row[item.prop]"
@blur="saveRows"></el-input>
- <el-input-number controls-position="right" v-if="editingRows === row && editShows== item.prop && item.edit == 'number'" v-model="row[item.prop]"
- @blur="saveRows"></el-input-number>
+ <el-input-number size="small" controls-position="right" v-if="editingRows === row && editShows== item.prop && item.edit == 'number'" v-model="row[item.prop]"
+ @blur="saveRows" :style="{width:(item.width-10)+'px'}"></el-input-number>
<el-switch
- v-if="item.edit === 'switch'" v-model="row[item.sortableprop]" active-value="true"
+ v-if="item.edit === 'switch'" v-model="row[item.prop]" active-value="true"
inactive-value="false">
</el-switch>
<span v-else>{{ row[item.prop] }}</span>
@@ -1510,7 +1521,14 @@
},
//鍒嗙被娉ㄥ叆淇濆瓨
injectAddHandle() {
- this.$set(this.attrRow, 'classifyInvokeLevel', this.injectOption);
+ let data = {
+ "娉ㄥ叆绫诲瀷": this.injectOption.type,
+ "娉ㄥ叆绫诲瀷鍚嶇О": this.injectOption.set,
+ "灞傜骇璁剧疆": this.injectOption.injectNum,
+ "鏄惁鍙慨鏀�": this.injectOption.change
+ }
+ console.log(this.injectOption)
+ this.$set(this.attrRow, 'classifyInvokeLevel', data);
this.injectVisible = false
},
//鍒嗙被娉ㄥ叆娓呯┖
--
Gitblit v1.9.3