From 99a6eb4e06c930f00bbf05348e53f38b65969ecd Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期三, 12 七月 2023 18:41:52 +0800
Subject: [PATCH] 整合7-12代码
---
Source/UBCS-WEB/src/components/Tree/classifyTrees.vue | 73 ++++++++++----
Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue | 176 +++++++++++++++++------------------
Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue | 12 +-
Source/UBCS-WEB/vue.config.js | 4
Source/UBCS-WEB/src/components/Tree/attrCrud.vue | 12 +-
5 files changed, 152 insertions(+), 125 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
index 7459149..a7b9b6f 100644
--- a/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
@@ -1,103 +1,91 @@
<template>
<basic-container>
- <div class="main">
- <div class="top">
- <div class="testbox">
- <div>
- <!-- <el-button plain size="small" type="primary" @click="addvisible = true">澧炲姞
- </el-button>
- <el-button plain size="small" type="primary" @click="editHandler">缂栬緫
- </el-button>
- <el-button plain size="small" type="primary" @click="openBatchImport('batchImportApply')">鎵归噺瀵煎叆鐢宠</el-button>
- <el-button plain size="small" type="primary" @click="openBatchImport('historyImport')">鍘嗗彶鏁版嵁瀵煎叆</el-button>
- <el-button plain size="small" type="primary" @click="openBatchImport('batchApplyCode')">鎵归噺鐢宠缂栫爜</el-button>
- <el-button plain size="small" type="primary">鎵归噺鍙戝竷</el-button>
- <el-button plain size="small" type="primary">鏌ョ湅娴佺▼鍘嗗彶</el-button>
- <el-button plain size="small" type="primary">鍒犻櫎</el-button>
- <el-button plain size="small" type="primary" @click="setHandler">鍙戝竷</el-button>
- <el-button plain size="small" type="primary" @click="DataChange">鏁版嵁鏇存敼</el-button>
- <el-button plain size="small" type="primary" @click="huishouHandler">鍥炴敹</el-button>
- <el-button plain size="small" type="primary" @click="openD">瀵煎嚭
- </el-button>
- <el-button plain size="small" type="primary" @click="findHandler">鏌ヨ
- </el-button>
- <el-button plain size="small" type="primary" @click="similarHandler">鐩镐技椤规煡璇�</el-button>
- <el-button plain size="small" type="primary">鍒锋柊</el-button>
- <el-input placeholder="璇疯緭鍏ュ叧閿瓧鎸夊洖杞︽煡璇�" size="small"
- style="width: 180px; margin-left: 5px; margin-top: 10px"></el-input> -->
+ <div class="testbox">
+ <div>
+ <!-- <el-button plain size="small" type="primary" @click="addvisible = true">澧炲姞
+ </el-button>
+ <el-button plain size="small" type="primary" @click="editHandler">缂栬緫
+ </el-button>
+ <el-button plain size="small" type="primary" @click="openBatchImport('batchImportApply')">鎵归噺瀵煎叆鐢宠</el-button>
+ <el-button plain size="small" type="primary" @click="openBatchImport('historyImport')">鍘嗗彶鏁版嵁瀵煎叆</el-button>
+ <el-button plain size="small" type="primary" @click="openBatchImport('batchApplyCode')">鎵归噺鐢宠缂栫爜</el-button>
+ <el-button plain size="small" type="primary">鎵归噺鍙戝竷</el-button>
+ <el-button plain size="small" type="primary">鏌ョ湅娴佺▼鍘嗗彶</el-button>
+ <el-button plain size="small" type="primary">鍒犻櫎</el-button>
+ <el-button plain size="small" type="primary" @click="setHandler">鍙戝竷</el-button>
+ <el-button plain size="small" type="primary" @click="DataChange">鏁版嵁鏇存敼</el-button>
+ <el-button plain size="small" type="primary" @click="huishouHandler">鍥炴敹</el-button>
+ <el-button plain size="small" type="primary" @click="openD">瀵煎嚭
+ </el-button>
+ <el-button plain size="small" type="primary" @click="findHandler">鏌ヨ
+ </el-button>
+ <el-button plain size="small" type="primary" @click="similarHandler">鐩镐技椤规煡璇�</el-button>
+ <el-button plain size="small" type="primary">鍒锋柊</el-button>
+ <el-input placeholder="璇疯緭鍏ュ叧閿瓧鎸夊洖杞︽煡璇�" size="small"
+ style="width: 180px; margin-left: 5px; margin-top: 10px"></el-input> -->
+ </div>
+ <el-row style="height: 700px; width: 100%">
+ <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)"
+ @click="handelBtnClick(item)">{{
+ item.name
+ }}
+ </el-button>
+ <el-input v-model="WupinFindValue" placeholder="璇疯緭鍏ュ叧閿瓧鎸夊洖杞︽煡璇�"
+ size="small" style="width: 180px; margin-left: 5px; margin-top: 10px"></el-input>
</div>
- <el-row style="height: 700px; width: 100%">
- <div>
- <el-button v-for="(item, index) in masterVrBtnList" :key="index" plain size="small" type="primary"
- @click="handelBtnClick(item)">{{
- item.name
- }}
- </el-button>
- <el-input v-model="WupinFindValue" placeholder="璇疯緭鍏ュ叧閿瓧鎸夊洖杞︽煡璇�"
- size="small" style="width: 180px; margin-left: 5px; margin-top: 10px"></el-input>
- </div>
- <el-table v-if="tableData.length != 0" v-loading="isLoading" :data="tableData" max-height="700" style=""
- @cell-click="handleCellClick" @row-click="handleRowClick" @selection-change="handleSelectionChange" @select="handleSelection" @sort-change="sortChange">
- <el-table-column fixed type="selection" width="55"></el-table-column>
- <el-table-column fixed label="搴忓彿" type="index" width="55">
- </el-table-column>
- <el-table-column v-for="item in this.tableHeadFindData" :key="item.id" :formatter="item.formatter" :label="item.label"
- :prop="item.prop" :show-overflow-tooltip="true"
- :sortable="item.sortable"
- :width="item.label.length >= 4 ? '150' : item.label.length == 3 ? '120' : '90'"
- align="center">
- </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"
- :templateOid="templateOid" :visible.sync="similarVisible"></ResembleQueryDialog>
- </div>
- <div class="block" style="display: flex; justify-content: flex-end">
- <el-pagination :current-page="page.currentPage" :page-size="page.pageSizes" :page-sizes="page.pageSizes"
- :total="page.total" layout="total, sizes, prev, pager, next, jumper"
- @size-change="handleSizeChange"
- @current-change="handleCurrentChange">
- </el-pagination>
- </div>
- <BatchImport v-if="batchImportData.visible" v-bind="batchImportData" :visible.sync="batchImportData.visible">
- </BatchImport>
+ <el-table v-if="tableData.length != 0" v-loading="isLoading" :data="tableData" max-height="700" style=""
+ @cell-click="handleCellClick" @selection-change="handleSelectionChange" @sort-change="sortChange">
+ <el-table-column fixed type="selection" width="55"></el-table-column>
+ <el-table-column fixed label="搴忓彿" type="index" width="55">
+ </el-table-column>
+ <el-table-column v-for="item in this.tableHeadFindData" :key="item.id" :formatter="item.formatter" :label="item.label"
+ :prop="item.prop" :show-overflow-tooltip="true"
+ :sortable="item.sortable"
+ :width="item.label.length >= 4 ? '150' : item.label.length == 3 ? '120' : '90'"
+ align="center">
+ </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"
+ :templateOid="templateOid" :visible.sync="similarVisible"></ResembleQueryDialog>
</div>
- <div class="bottom">
- <el-collapse v-model="visibleNames" accordion>
- <el-collapse-item title="闄勪欢鍒楄〃" name="1">
- <fileInHtml :options="fileOptions"></fileInHtml>
- </el-collapse-item>
- </el-collapse>
+ <div class="block" style="display: flex; justify-content: flex-end">
+ <el-pagination :current-page="page.currentPage" :page-size="page.pageSizes" :page-sizes="page.pageSizes"
+ :total="page.total" layout="total, sizes, prev, pager, next, jumper"
+ @size-change="handleSizeChange"
+ @current-change="handleCurrentChange">
+ </el-pagination>
</div>
- </div>
+ <BatchImport v-if="batchImportData.visible" v-bind="batchImportData" :visible.sync="batchImportData.visible">
+ </BatchImport>
</basic-container>
</template>
<script>
-import {MasterTable, TableData, FindData} from "@/api/GetItem";
+import {MasterTable, TableData, FindData,addSaveCode,editSaveCode} from "@/api/GetItem";
import {listCodeAttributeByClassId} from "@/api/integration/integration.js";
import integrationTransfer from "@/views/integration/integrationTransfer";
import SetPersonnel from "@/components/template/SetPersonnel";
import ResembleQueryDialog from "@/components/FormTemplate/ResembleQueryDialog.vue";
import BatchImport from '@/components/BatchImport'
import {validatenull} from "@/util/validate";
-import fileInHtml from "@/components/file/inHtml.vue";
export default {
components: {
@@ -105,7 +93,7 @@
SetPersonnel,
ResembleQueryDialog,
BatchImport,
- fileInHtml
+ // fileInHtml
},
name: "Crud.vue",
props: {
@@ -166,7 +154,6 @@
}
},
visibleNames:[],
- visibleFile:false,
visibleFlow: false,
transferData: [],
transferProps: {
@@ -220,8 +207,7 @@
}
};
},
- computed: {
- },
+ computed: {},
created() {
},
mounted() {
@@ -515,11 +501,21 @@
}
},
//澧炲姞淇濆瓨
- AddSumbit() {
+ AddSumbit(val) {
this.addvisible = false;
+ console.log(val)
+ addSaveCode(val).then(res=>{
+ console.log(res)
+ this.onLoad()
+ })
},
EditSumbit(val) {
this.editvisible = false;
+ console.log(val)
+ editSaveCode(val).then(res=>{
+ console.log(res)
+ this.onLoad()
+ })
},
openBatchImport(type) {
this.batchImportData.visible = true
diff --git a/Source/UBCS-WEB/src/components/Tree/attrCrud.vue b/Source/UBCS-WEB/src/components/Tree/attrCrud.vue
index 7cd78ef..5e22116 100644
--- a/Source/UBCS-WEB/src/components/Tree/attrCrud.vue
+++ b/Source/UBCS-WEB/src/components/Tree/attrCrud.vue
@@ -1,7 +1,7 @@
<template>
<div>
<div style="display: flex;flex-wrap: wrap;" v-if="this.crudArrayFlag">
- <el-button-group>
+
<!--鏂板-->
<el-button v-if="attrEditVisible == false && attrFlagChiledren==false" size="small" type="primary" icon="el-icon-plus" @click="busineHandle">娣诲姞 {{ msg }}</el-button>
<!-- 鍏ㄥ睆缂栬緫-->
@@ -10,8 +10,8 @@
<el-button icon="el-icon-info" size="small" @click="ruleAddHandler">楠岃瘉瑙勫垯</el-button>
<!-- 灞炴�у垎缁�-->
<el-button icon="el-icon-menu" size="small" @click="attrVisibleHandle">灞炴�у垎缁�</el-button>
- </el-button-group>
- <el-button-group>
+
+
<!-- 鍒嗙被娉ㄥ叆-->
<el-button icon="el-icon-magic-stick" size="small" @click="injectBtn">鍒嗙被娉ㄥ叆</el-button>
<!-- 缁勫悎瑙勫垯-->
@@ -22,8 +22,8 @@
<el-button size="small" @click="CascadeHandle">绾ц仈灞炴��</el-button>
<!-- 棰勮鎺掑簭-->
<el-button size="small" @click="orderHandle" icon="el-icon-arrow-down">棰勮鎺掑簭</el-button>
- </el-button-group>
- <el-button-group>
+
+
<!-- 淇濆瓨-->
<el-button size="small" @click="addsHandler" icon="el-icon-check">淇濆瓨</el-button>
<!-- 鍒犻櫎-->
@@ -32,7 +32,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="applicationHandle" style="">缂栫爜鐢宠棰勮</el-button>
<!-- 楠岃瘉瑙勫垯-->
diff --git a/Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue b/Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue
index 9a71b38..236d931 100644
--- a/Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue
+++ b/Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue
@@ -94,7 +94,7 @@
</template>
<avue-crud :data="BtmData" :option="masterOption" @select="btmSelect"></avue-crud>
<div style="height: 30px">
- <div style="display: inline-block;float: left;border: 1px solid #eee;padding: 5px;margin-top: 5px;font-size: 14px " >宸茶缃殑鍊间负:[{{this.loneTreeNewForm.btmtypename}}]</div>
+ <div style="display: inline-block;float: left;border: 1px solid #eee;padding: 5px;margin-top: 5px;font-size: 14px " >宸茶缃殑鍊间负:[{{this.loneTreeNewForm.btmTypeName}}]</div>
<div style="padding-top: 10px;display: flex; justify-content: flex-end;float: right;overflow: hidden" >
<el-button type="primary" size="small" @click="btmHandlerClick">纭畾</el-button>
<el-button size="small" @click="BtmdialogVisible=false">鍙栨秷</el-button>
@@ -226,7 +226,7 @@
},
{
label: '瀛樺偍鐨勪笟鍔＄被鍨�',
- prop: 'btmtypename',
+ prop: 'btmTypeName',
labelWidth:128,
disabled: true,
rules: [{
@@ -294,7 +294,7 @@
},
{
label: '瀛樺偍鐨勪笟鍔＄被鍨�',
- prop: 'btmtypename',
+ prop: 'btmTypeName',
labelWidth:128,
focus:this.btmFoucus,
// readonly: true,
@@ -355,6 +355,8 @@
TreeEditSave(this.loneTreeNewForm).then(res=>{
this.$message.success('淇敼鎴愬姛');
this.Editclose()
+ this.$emit('referTreeForm');
+ this.$emit('flushed');
done()
})
},
@@ -540,8 +542,8 @@
}else {
this.BtmdialogVisible=false;
this.btmSelectList=[]
- this.$set(this.loneTreeNewForm,'btmtypename',this.btmName ||this.btmOid)
- this.$set(this.loneTreeNewForm,'btmtypeid',this.btmOid)
+ this.$set(this.loneTreeNewForm,'btmTypeName',this.btmName ||this.btmOid)
+ this.$set(this.loneTreeNewForm,'btmTypeid',this.btmOid)
this.$emit('MasterHandler',this.loneTreeNewForm)
}
},
diff --git a/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue b/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue
index c659dfa..b1ed81c 100644
--- a/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue
+++ b/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue
@@ -6,13 +6,19 @@
<basic-container style="height: 85vh; max-height: 155vh; overflow-y: scroll;">
<div>
<div>
- <div style="display: flex;justify-content: space-around">
- <el-button plain size="small" type="primary" @click="TreeAdd">娣诲姞</el-button>
- <el-button plain size="small" type="primary" @click="TreeEdit">淇敼</el-button>
- <el-button plain size="small" type="primary" @click="TreeDel">鍒犻櫎</el-button>
-<!-- <el-button plain size="small" type="primary" @click="ExportExcel">瀵煎嚭</el-button>-->
-<!-- <el-button plain size="small" type="primary" @click="ImportExcel">瀵煎叆</el-button>-->
- <el-button plain size="small" type="primary" @click="flushed">鍒锋柊</el-button>
+ <div style="display: flex; flex-direction: column;">
+ <div style="display: flex;">
+ <el-button plain size="small" type="primary" @click="TreeAdd">娣诲姞</el-button>
+ <el-button plain size="small" type="primary" @click="TreeEdit">淇敼</el-button>
+ <el-button plain size="small" type="primary" @click="TreeDel">鍒犻櫎</el-button>
+ <el-button plain size="small" type="primary" @click="flushed">鍒锋柊</el-button>
+ </div>
+ <div style="display: flex; margin-top: 10px">
+ <el-button plain size="small" type="primary" @click="Enable">鍚敤</el-button>
+ <el-button plain size="small" type="primary" @click="Deactivate">鍋滅敤</el-button>
+ <el-button plain size="small" type="primary" @click="ImportExcel">瀵煎叆</el-button>
+ <el-button plain size="small" type="primary" @click="ExportExcel">瀵煎嚭</el-button>
+ </div>
</div>
<div style="display: flex;justify-content: space-around;margin-top: 5px;margin-bottom: 5px">
</div>
@@ -52,7 +58,7 @@
</el-dialog>
<!-- 淇敼瀵硅瘽妗�-->
<el-dialog :visible.sync="TreeEditFormVisible" append-to-body title="淇敼鍒嗙被">
- <classifyTreeform ref="childForm" :loneTreeNewForm="TreeList" :nodeList="nodeList" :flag="'edit'" @MasterHandler="MasterHandler" :Editclose=" ()=>{TreeEditFormVisible=false}" :TreeFlag="TreeFlagCode" ::nodeClickList="nodeClickList"></classifyTreeform>
+ <classifyTreeform ref="childForm" :loneTreeNewForm="TreeList" :nodeList="nodeList" :flag="'edit'" @MasterHandler="MasterHandler" :Editclose=" ()=>{TreeEditFormVisible=false}" :TreeFlag="TreeFlagCode" ::nodeClickList="nodeClickList" @referTreeForm="referTreeForm" @flushed="flushed"></classifyTreeform>
</el-dialog>
<avue-tree ref="tree" v-model="CloneTreeAvueform" v-loading="loading" :data="CloneTreedata" :defaultExpandAll="false"
:option="Treeoption"
@@ -73,7 +79,7 @@
</span>
<span v-else-if="type.prop==='tab2'">
<basic-container>
- <avue-crud v-model="crudForm" v-loading="FormLoing" :data="this.Formlist" :option="this.crudTreeOption"
+ <avue-crud ref="textCrud" v-model="crudForm" v-loading="FormLoing" :data="this.Formlist" :option="this.crudTreeOption"
@row-save="CrudRowSave"
@row-del="CrudRowDel"
@row-update="CrudRowUpdata"
@@ -83,8 +89,6 @@
<template slot="menuLeft">
<el-button plain size="small" type="primary" @click="FindeHanler">鏌ヨ</el-button>
<el-button plain size="small" type="primary" @click="TemRefresh">鍒锋柊</el-button>
- <el-button plain size="small" type="primary" @click="Enable">鍚敤</el-button>
- <el-button plain size="small" type="primary" @click="Deactivate">鍋滅敤</el-button>
<el-button plain size="small" type="primary" @click="CloneBtn">浠庡叾瀹冩ā鏉垮厠闅�</el-button>
<!-- 鏌ヨ瀵硅瘽妗�-->
<el-dialog :visible.sync="FindFormVisible" append-to-body title="楂樼骇鏌ヨ">
@@ -145,6 +149,7 @@
<avue-crud v-model="ClonecrudForm" v-loading="FormLoing" :data="this.CloneFormlist"
:option="this.ClonecrudTreeOption"
@selection-change="selectionChange"
+
></avue-crud>
</div>
</el-main>
@@ -165,7 +170,16 @@
</el-dialog>
</el-dialog>
</template>
- <template #menu="{ size, row }">
+ <template #menu="{ size, row ,index}">
+ <el-button type="text"
+ v-if="row.lcStatus != 'Released'"
+ icon="el-icon-edit-outline "
+ :size="size"
+ @click="$refs.textCrud.rowEdit(row)">缂栬緫</el-button>
+ <el-button type="text"
+ icon="el-icon-delete"
+ :size="size"
+ @click="$refs.textCrud.rowDel(row,index)">鍒犻櫎</el-button>
<el-button
v-show="row.lcStatus === 'Released'"
@click="upAndStopAndStart(row, 'upVersion')"
@@ -326,7 +340,7 @@
//浣跨敤inject鎺ユ敹鍙傛暟
//Treeoption宸︿晶鏍戞柊澧炶〃鍗曢」 Treedata宸︿晶鏍戣妭鐐� 閰嶇疆椤� crudTreeOption鍙充晶琛ㄦ牸閰嶇疆椤� crudTreeData鍙充晶琛ㄦ牸鏄剧ず鍐呭
//Treeform鍙充晶琛ㄥ崟閰嶇疆椤�
- inject: [, "crudTreeData"],
+ inject: ["crudTreeData"],
data() {
return {
//鏍戣妭鐐规樉绀洪殣钘�
@@ -621,7 +635,9 @@
funAPi: startRelease,
load: 'startReleaseLoad'
}
- }
+ },
+ //妯℃澘绠＄悊缂栬緫
+ showEditBtn:false,
}
},
//tab鏍忛粯璁ゆ槸琛ㄦ牸
@@ -634,9 +650,7 @@
this.$refs.tree.setCurrentKey(null)
this.nodeClickList = {}
this.TreeList=[]
- this.TreeFlagCode=false
- console.log('鍚嶵reeList',this.TreeList)
- console.log('鍚巒odeClickList',this.nodeClickList)
+ this.TreeFlagCode=false;
}
}, true)
},
@@ -648,6 +662,8 @@
height:180,
selection:true,
addBtn:this.Formlist.length<=0 && this.nodeClickList != "",
+ editBtn:false,
+ delBtn:false,
column: [
{
label: "妯℃澘缂栧彿",
@@ -686,6 +702,10 @@
}
},
methods: {
+ //妯℃澘绠＄悊宸插彂甯冪紪杈�
+ // checkShowEditBtn() {
+ // this.showEditBtn = this.Formlist.some(item => item.lcStatus === 'Released');
+ // },
//缂栫爜瑙勫垯澶辩劍
CodeFoucus(){
this.MasterdialogVisible=true;
@@ -1129,16 +1149,17 @@
this.codeClassifyOid = item.codeclassifyoid
return item.codeclassifyoid == this.nodeClickList.oid
}
+ console.log('Formlist',this.Formlist)
})
}).catch(res => {
this.$message.error(res)
})
// 鍩烘湰淇℃伅琛ㄥ崟鏁版嵁
- await getObjectByOid(this.nodeClickList.oid).then(res => {
- this.TreeList = res.data.data;
- }).catch(res => {
- this.$message.error(res)
- })
+ await getObjectByOid(this.nodeClickList.oid).then(res => {
+ this.TreeList = res.data.data;
+ }).catch(res => {
+ this.$message.error(res)
+ })
} catch (error) {
this.$message.error(error)
}
@@ -1146,6 +1167,14 @@
treeClick(e) {
console.log(e);
},
+ //鍩烘湰淇℃伅琛ㄥ崟鍒锋柊
+ referTreeForm(){
+ getObjectByOid(this.nodeClickList.oid).then(res => {
+ this.TreeList = res.data.data;
+ }).catch(res => {
+ this.$message.error(res)
+ })
+ },
//鍏嬮殕妯℃澘鏍戠殑鐐瑰嚮鍒囨崲鏁版嵁
async ClonenodeClick(data){
this.ClonenodeClickList=data;
diff --git a/Source/UBCS-WEB/vue.config.js b/Source/UBCS-WEB/vue.config.js
index ad43a75..0991057 100644
--- a/Source/UBCS-WEB/vue.config.js
+++ b/Source/UBCS-WEB/vue.config.js
@@ -26,10 +26,10 @@
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://dev.vci-tech.com:37000',
+ target: 'http://dev.vci-tech.com:37000',
// target: 'http://192.168.1.51:37000/',
// target: 'http://192.168.1.104:37000',
// target: 'http://192.168.1.63:37000',
--
Gitblit v1.9.3