From 96795a58eb5bb4941b4b02ab27b68dfdcbb6d82b Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 31 十月 2023 11:31:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/integration/applicationForm.vue | 4 ++--
Source/UBCS-WEB/src/components/Master/MasterTransfer.vue | 3 +--
Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue | 12 +++++++++---
Source/UBCS-WEB/src/components/Master/MasterTree.vue | 9 ++++++++-
4 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Master/MasterTransfer.vue b/Source/UBCS-WEB/src/components/Master/MasterTransfer.vue
index 97a96c6..b7da7aa 100644
--- a/Source/UBCS-WEB/src/components/Master/MasterTransfer.vue
+++ b/Source/UBCS-WEB/src/components/Master/MasterTransfer.vue
@@ -10,8 +10,7 @@
<el-radio :label="1">鍏ㄩ儴</el-radio>
<el-radio :label="2">椤电爜</el-radio>
</el-radio-group>
- <span v-if="radio === 2" style="margin-left: 20px;"><el-input v-model="pageExport"
- style="width: 150px"></el-input> 锛堣緭鍏ラ〉鐮佹垨鑰呴〉闈㈣寖鍥达紝濡傦細1-10)锛�</span>
+ <span v-if="radio === 2" style="margin-left: 20px;"><el-input v-model="pageExport" style="width: 150px"></el-input> 锛堣緭鍏ラ〉鐮佹垨鑰呴〉闈㈣寖鍥达紝濡傦細1-10锛�</span>
</div>
</div>
<div style="text-align: center">
diff --git a/Source/UBCS-WEB/src/components/Master/MasterTree.vue b/Source/UBCS-WEB/src/components/Master/MasterTree.vue
index f24b41c..a14ba8d 100644
--- a/Source/UBCS-WEB/src/components/Master/MasterTree.vue
+++ b/Source/UBCS-WEB/src/components/Master/MasterTree.vue
@@ -1,10 +1,11 @@
<template>
- <div class="app">
+ <div class="app" style="display: flex;">
<avue-tree ref="tree" v-model="CloneTreeAvueform" v-loading="loading" :data="Treedata" :defaultExpandAll="false" :option="Treeoption" @node-click="nodeClick" style="width: fit-content;">
<template slot-scope="{ node }">
<span style="display: inline-block;">{{ node.label }}</span>
</template>
</avue-tree>
+ <div style="display: inline-block;"><i class="el-icon-refresh refresh-icon" @click="getTreeLists"></i></div>
</div>
</template>
@@ -206,4 +207,10 @@
border-radius: 20px;
border: #ececec;
}
+.refresh-icon {
+ color: #409EFF;
+ margin-top: 8px;
+ margin-left: 6px;
+ font-size: 18px;
+}
</style>
diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
index 0658b01..f98ce0f 100644
--- a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
@@ -11,7 +11,7 @@
v-if="!['PREVIEW', 'DELETEFILE', 'revisefile', 'DOWNLOADFILE', 'UPLOADFILE'].includes(item.uniqueFlag)"
:key="index" plain size="small"
type="primary"
- @click="handelBtnClick(item)">{{
+ @click="handleBtnClick(item)">{{
item.name
}}
</el-button>
@@ -470,10 +470,10 @@
openVis(visible) {
this[visible] = true
},
- handelBtnClick(event) {
+ handleBtnClick(event) {
const {uniqueFlag} = event
this.$nextTick(() => {
- if (uniqueFlag === 'CODEADD') return this.addvisible = true
+ if (uniqueFlag === 'CODEADD') return this.addSaveHandler()
if (uniqueFlag === 'CODEEDIT') return this.editHandler()
if (uniqueFlag === 'CODEBATCHADD') return this.openBatchImport('batchImportApply')
if (uniqueFlag === 'CODEIMPORTHISTORY') return this.openBatchImport('historyImport')
@@ -500,6 +500,12 @@
// if(uniqueFlag === 'CODEEDIT') return this.similarHandler()
});
},
+ addSaveHandler(){
+
+ this.$nextTick(() => {
+ this.addvisible = true;
+ });
+ },
//鐢宠闆嗗洟鐮佹暟鎹�
applyGroupCode() {
if (this.selectRow.length <= 0) {
diff --git a/Source/UBCS-WEB/src/views/integration/applicationForm.vue b/Source/UBCS-WEB/src/views/integration/applicationForm.vue
index 4c11990..9e2db4f 100644
--- a/Source/UBCS-WEB/src/views/integration/applicationForm.vue
+++ b/Source/UBCS-WEB/src/views/integration/applicationForm.vue
@@ -73,10 +73,10 @@
search: true,
dicData: [{
label: '鐢宠',
- value: 1
+ value: '1'
}, {
label: '鏇存敼',
- value: 2
+ value: '2'
}]
}, {
label: '鐢宠鍗曟暟鎹俊鎭�',
--
Gitblit v1.9.3