From f716ce30de91dbcbf55ce5e3c658e7a165b7ee81 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期五, 14 七月 2023 15:45:43 +0800
Subject: [PATCH] 主数据按钮
---
Source/UBCS-WEB/src/components/FormTemplate/index.vue | 14 +++++++-------
Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue | 13 ++++++++++++-
Source/UBCS-WEB/vue.config.js | 4 ++--
Source/UBCS-WEB/src/components/Master/MasterTree.vue | 13 ++++++++++---
Source/UBCS-WEB/public/public/index.html | 2 ++
Source/UBCS-WEB/src/components/Tree/attrCrud.vue | 2 ++
6 files changed, 35 insertions(+), 13 deletions(-)
diff --git a/Source/UBCS-WEB/public/public/index.html b/Source/UBCS-WEB/public/public/index.html
index 97e0df0..a43a165 100644
--- a/Source/UBCS-WEB/public/public/index.html
+++ b/Source/UBCS-WEB/public/public/index.html
@@ -19,6 +19,8 @@
<script src="<%= BASE_URL %>cdn/xlsx/FileSaver.min.js"></script>
<script src="<%= BASE_URL %>cdn/xlsx/xlsx.full.min.js"></script>
<link rel="icon" href="<%= BASE_URL %>favicon.png">
+ <script src="https://cdn.staticfile.org/FileSaver.js/2014-11-29/FileSaver.min.js"></script>
+ <script src="https://cdn.staticfile.org/xlsx/0.18.2/xlsx.full.min.js"></script>
<title>ubcs浼佷笟骞冲彴</title>
<style>
html,
diff --git a/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
index 1c5e011..9f94211 100644
--- a/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
@@ -29,7 +29,8 @@
</div>
<el-row style="width: 100%;margin-bottom: 20px">
<div>
- <el-button v-for="(item, index) in masterVrBtnList" :key="index" plain size="small" type="primary" v-if="!['PREVIEW', 'DELETEFILE', 'revisefile', 'DOWNLOADFILE', 'UPLOADFILE'].includes(item.uniqueFlag)"
+ <el-button v-for="(item, index) in masterVrBtnList" :key="index" plain size="small" type="primary"
+ v-if="!['PREVIEW', 'DELETEFILE', 'revisefile', 'DOWNLOADFILE', 'UPLOADFILE'].includes(item.uniqueFlag)"
@click="handelBtnClick(item)">{{
item.name
}}
@@ -50,20 +51,26 @@
</el-table-column>
</el-table>
</el-row>
+<!-- 鏂板-->
<FormTemplateDialog :codeClassifyOid="this.codeClassifyOid" :codeRuleOid="this.codeRuleOid"
:disabledProp="disabledProp" :templateOid="templateOid" :visible.sync="addvisible" type="add"
@submit="AddSumbit">
</FormTemplateDialog>
+<!-- 淇敼-->
<FormTemplateDialog :codeClassifyOid="this.codeClassifyOid" :codeRuleOid="this.codeRuleOid"
:disabledProp="disabledProp" :rowOid="rowOid" :templateOid="templateOid" :title="'淇敼缂栫爜淇℃伅'"
:visible.sync="editvisible"
type="edit" @submit="EditSumbit"></FormTemplateDialog>
+<!-- 宸插彂甯冩暟鎹慨鏀�-->
<FormTemplateDialog :codeClassifyOid="this.codeClassifyOid" :codeRuleOid="this.codeRuleOid"
:disabledProp="disabledProp" :rowOid="rowOid" :templateOid="templateOid" :title="'宸插彂甯冩暟鎹洿鏀�'"
:type="edit"
:visible.sync="DataVisible"></FormTemplateDialog>
+<!-- 鍙戝竷-->
<set-personnel :parameter="this.parameter" :visible.sync="visibleFlow"></set-personnel>
+<!-- 楂樼骇鏌ヨ-->
<advanced-query :options="this.options" :visible.sync="findvisible" @echoContion="echoContion"></advanced-query>
+
<integration-transfer :data="transferData" :props="transferProps" :visible.sync="dialogPush"
@save="handelTransferSave"></integration-transfer>
<ResembleQueryDialog :codeClassifyOid="codeClassifyOid" :codeRuleOid="this.codeRuleOid" :rowOid="rowOid"
@@ -338,6 +345,7 @@
this.getListCodeByClassId();
},
async getListCodeByClassId() {
+ this.dialogPush=true;
this.transferData = [];
const response = await listCodeAttributeByClassId({
codeClassifyId: this.codeClassifyOid,
@@ -347,6 +355,9 @@
this.transferData = data;
}
},
+ handelTransferSave(val){
+ console.log('鍙戝竷',val)
+ },
rend() {
this.tableData = this.tableHeadData;
},
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/index.vue b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
index bd8484d..e1d75ee 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/index.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
@@ -313,13 +313,13 @@
if (!formValidate) return;
let codeValidate = true;
// 杩涜鐮佸�肩敵璇锋牎楠�
- if (this.showCodeApply) {
- codeValidate = await this.$refs.CodeApply.validate();
- if (!codeValidate) {
- this.activeName = "codeApply";
- return false;
- }
- }
+ // if (this.showCodeApply) {
+ // codeValidate = await this.$refs.CodeApply.validate();
+ // if (!codeValidate) {
+ // this.activeName = "codeApply";
+ // return false;
+ // }
+ // }
let resembleQueryList = [];
if (this.$refs.resembleQueryRef) {
// 杩涜鐩镐技椤规煡璇�
diff --git a/Source/UBCS-WEB/src/components/Master/MasterTree.vue b/Source/UBCS-WEB/src/components/Master/MasterTree.vue
index 9c1c430..d5923e6 100644
--- a/Source/UBCS-WEB/src/components/Master/MasterTree.vue
+++ b/Source/UBCS-WEB/src/components/Master/MasterTree.vue
@@ -121,8 +121,15 @@
codeClassifyOid: this.nodeClickList.oid,
functionId: 5,
}).then(res => {
- console.log(res.data.buttons)
- this.masterVrBtnList = res.data.buttons
+ console.log('1-',res.data)
+ console.log('123-',res.data.buttons)
+ const flagsToDeleteBtn = ["CODEIMPORTHISTORY", "CODEBATCHADD","CODESTARTPROCESS","CODEEXPORT","CODEQUERY"];
+ //涓嶅悓鑺傜偣鏄剧ず涓嶅悓鎸夐挳
+ if(!res.data.leaf){
+ this.masterVrBtnList=res.data.buttons.filter(obj =>flagsToDeleteBtn.includes(obj.uniqueFlag));
+ }else {
+ this.masterVrBtnList = res.data.buttons
+ }
this.tableHeadDataFateher = res.data;
this.templateOids = res.data.tableDefineVO.oid;
let List = res.data.tableDefineVO.cols[0];
@@ -156,7 +163,7 @@
this.TableRend(); // TableHeadRend() 鏂规硶瀹屾垚鍚庡啀鎵ц TableRend()
this.$emit('nodeClick',this.templateOids)
this.$emit("codeClassifyOid", this.nodeClickList.oid )
- console.log('鏍�',this.nodeClickList.oid)
+ console.log('鏍�',this.nodeClickList)
} catch (error) {
// 澶勭悊閿欒
this.$message.error(error)
diff --git a/Source/UBCS-WEB/src/components/Tree/attrCrud.vue b/Source/UBCS-WEB/src/components/Tree/attrCrud.vue
index 5e22116..7c68f93 100644
--- a/Source/UBCS-WEB/src/components/Tree/attrCrud.vue
+++ b/Source/UBCS-WEB/src/components/Tree/attrCrud.vue
@@ -374,6 +374,7 @@
editingRows: null,
editShows:"",
attrFlag: false,
+ referObject:{},
//缂栫爜鐢宠棰勮option
applicationoption: {
column: []
@@ -1391,6 +1392,7 @@
//鍙傜収閰嶇疆瀛愮粍浠�
echoReferConfig(val){
console.log('val--',val)
+ this.referObject=val
this.$set(this.CurrentCell,'referConfig',JSON.stringify(val))
},
diff --git a/Source/UBCS-WEB/vue.config.js b/Source/UBCS-WEB/vue.config.js
index ad43a75..63a88c9 100644
--- a/Source/UBCS-WEB/vue.config.js
+++ b/Source/UBCS-WEB/vue.config.js
@@ -26,9 +26,9 @@
proxy: {
'/api': {
//鏈湴鏈嶅姟鎺ュ彛鍦板潃
- target: 'http://localhost:37000',
+ // target: 'http://localhost:37000',
// target: 'http://192.168.1.51:37000',
- // target: 'http://192.168.1.46:37000',
+ target: 'http://192.168.1.46:37000',
// target: 'http://dev.vci-tech.com:37000',
// target: 'http://192.168.1.51:37000/',
// target: 'http://192.168.1.104:37000',
--
Gitblit v1.9.3