From a19d26e88360c9760b2286bac4dfb1710fd2fa21 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期六, 12 八月 2023 13:33:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue | 1060 +++++++++++++++++++++++++++++++++-------------------------
1 files changed, 594 insertions(+), 466 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
index e8d5379..afdf3a2 100644
--- a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
+++ b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
@@ -2,71 +2,81 @@
<template>
<el-container>
<!-- 宸︿晶鑿滃崟-->
- <el-aside >
+ <el-aside>
<basic-container style="overflow:hidden;">
<div>
- <div>
- <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; 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.native="ImportExcel">瀵煎叆</el-button>
+ <el-button plain size="small" type="primary" @click="ExportExcel">瀵煎嚭</el-button>
+ </div>
</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.native="ImportExcel">瀵煎叆</el-button>
- <el-button plain size="small" type="primary" @click="ExportExcel">瀵煎嚭</el-button>
+ <div style="display: flex;justify-content: space-around;margin-top: 5px;margin-bottom: 5px">
</div>
</div>
- <div style="display: flex;justify-content: space-around;margin-top: 5px;margin-bottom: 5px">
- </div>
- </div>
- <!-- 鏍戣妭鐐规坊鍔犲璇濇-->
- <el-dialog :title="this.TreeFlag ? '娣诲姞鍒嗙被' :'娣诲姞涓婚搴�'" :visible.sync="TreeAddFormVisible" v-loading="AddLoading" append-to-body
- style="width: 1700px;margin: auto">
- <el-form :model="TreeAddform" :rules="rules">
- <el-form-item :label="this.TreeFlag ? '鍒嗙被缂栧彿锛�' :'涓婚搴撶紪鍙凤細'" label-width="150px" style="display: inline-block" prop="id">
- <el-input v-model="TreeAddform.id" autocomplete="off" style="width: 170px"></el-input>
- </el-form-item>
- <el-form-item :label="this.TreeFlag ? '鍒嗙被鍚嶇О锛�' :'涓婚搴撳悕绉帮細'" label-width="110px" style="display: inline-block" prop="name">
- <el-input v-model="TreeAddform.name" autocomplete="off" style="width: 170px"></el-input>
- </el-form-item>
- <el-form-item label="瀛樺偍鐨勪笟鍔＄被鍨嬶細" label-width="150px" v-if="TreeFlagCode" prop="btmTypeName">
- <el-input v-model="TreeAddform.btmTypeName" autocomplete="off" style="width: 585px" @focus="btmFoucus"></el-input>
- </el-form-item>
- <el-form-item label="鎻忚堪锛�" label-width="150px">
- <el-input v-model="TreeAddform.description" autocomplete="off" style="width: 585px"></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-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-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-form-item>
- </el-form>
- <div slot="footer" class="dialog-footer">
- <el-button @click="TreeAddFormVisible = false">鍙� 娑�</el-button>
- <el-button type="primary" @click="TreeAddHandler">纭� 瀹�</el-button>
- </div>
- </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="editTreeFLagCode" :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"
- style="height: calc(100vh - 230px);"
- @node-click="nodeClick"
- class="classifyTree"
- >
- </avue-tree>
+ <!-- 鏍戣妭鐐规坊鍔犲璇濇-->
+ <el-dialog v-loading="AddLoading" :before-close="TreeEscHandler"
+ :title="this.TreeFlag ? '娣诲姞鍒嗙被' :'娣诲姞涓婚搴�'" :visible.sync="TreeAddFormVisible" append-to-body
+ style="width: 1700px;margin: auto">
+ <el-form ref="myForm" :model="TreeAddform" :rules="rules">
+ <el-form-item :label="this.TreeFlag ? '鍒嗙被缂栧彿锛�' :'涓婚搴撶紪鍙凤細'" label-width="150px" prop="id"
+ style="display: inline-block">
+ <el-input v-model="TreeAddform.id" autocomplete="off" style="width: 170px"></el-input>
+ </el-form-item>
+ <el-form-item :label="this.TreeFlag ? '鍒嗙被鍚嶇О锛�' :'涓婚搴撳悕绉帮細'" label-width="110px" prop="name"
+ style="display: inline-block">
+ <el-input v-model="TreeAddform.name" autocomplete="off" style="width: 170px"></el-input>
+ </el-form-item>
+ <el-form-item v-if="TreeFlagCode" label="瀛樺偍鐨勪笟鍔＄被鍨嬶細" label-width="150px" prop="btmTypeName">
+ <el-input v-model="TreeAddform.btmTypeName" autocomplete="off" style="width: 585px"
+ @focus="btmFoucus"></el-input>
+ </el-form-item>
+ <el-form-item label="鎻忚堪锛�" label-width="150px">
+ <el-input v-model="TreeAddform.description" autocomplete="off" style="width: 585px"></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-form-item>
+ <el-form-item label="鍏抽敭灞炴�ф煡璇㈣鍒欙細" label-width="150px">
+ <el-input v-model="TreeAddform.codeKeyAttrRepeatOidName" autocomplete="off" style="width: 585px"
+ @focus="Keyfouce"></el-input>
+ </el-form-item>
+ <el-form-item label="鐩镐技鏌ヨ瑙勫垯锛�" label-width="150px">
+ <el-input v-model="TreeAddform.codeResembleRuleOidName" autocomplete="off" style="width: 585px"
+ @focus="simFouce"></el-input>
+ </el-form-item>
+ </el-form>
+ <div slot="footer" class="dialog-footer">
+ <el-button @click="TreeEscHandler">鍙� 娑�</el-button>
+ <el-button type="primary" @click="TreeAddHandler">纭� 瀹�</el-button>
+ </div>
+ </el-dialog>
+ <!-- 淇敼瀵硅瘽妗�-->
+ <el-dialog :visible.sync="TreeEditFormVisible" append-to-body title="淇敼鍒嗙被">
+ <classifyTreeform ref="childForm" :Editclose=" ()=>{TreeEditFormVisible=false}" :TreeFlag="editTreeFLagCode"
+ :flag="'edit'"
+ :loneTreeNewForm="TreeList" :nodeClickList="nodeClickList"
+ :nodeList="nodeList" @MasterHandler="MasterHandler" @flushed="flushed"
+ @referTreeForm="referTreeForm"></classifyTreeform>
+ </el-dialog>
+ <avue-tree ref="tree" v-model="CloneTreeAvueform" v-loading="loading" :data="CloneTreedata"
+ :defaultExpandAll="false"
+ :option="Treeoption"
+ class="classifyTree"
+ style="height: calc(100vh - 230px);"
+ @node-click="nodeClick"
+ >
+ </avue-tree>
</div>
</basic-container>
</el-aside>
@@ -75,18 +85,21 @@
<!-- 鍙充晶琛ㄦ牸-->
<avue-tabs :option="tabOption" @change="handleChange"></avue-tabs>
<span v-if="type.prop==='tab1'">
- <classifyTreeform ref="childForm" :loneTreeNewForm="TreeList" :nodeList="nodeList" :flag="'renonly'" ></classifyTreeform>
+ <classifyTreeform ref="childForm" :flag="'renonly'" :loneTreeNewForm="TreeList"
+ :nodeList="nodeList"></classifyTreeform>
</span>
<span v-else-if="type.prop==='tab2'">
<basic-container>
- <avue-crud ref="textCrud" 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"
@row-click="rowHandle"
>
<template slot="radio" slot-scope="{row}">
- <el-radio v-model="selectRow" :label="row.$index" style="padding-left: 10px !important;">{{''}}</el-radio>
+ <el-radio v-model="selectRow" :label="row.$index"
+ style="padding-left: 10px !important;">{{ '' }}</el-radio>
</template>
<template slot="menuLeft">
@@ -121,16 +134,16 @@
</div>
</el-dialog>
<!-- 妯℃澘鍏嬮殕 -->
- <el-dialog :visible.sync="CloneVisible" append-to-body title="鍏嬮殕妯℃澘">
+ <el-dialog :before-close="cloneClose" :visible.sync="CloneVisible" append-to-body title="鍏嬮殕妯℃澘">
<el-container>
<el-aside width="300px">
<div style="margin-bottom: 5px"><el-tag>涓婚搴撳垎绫�</el-tag></div>
<!-- 鍏嬮殕妯℃澘鐨勬爲 娌跨敤棣栭〉鏍戠殑loading鍜宱ption锛屼絾鏄痙ata鍜寁-model缁戝畾鐨勬暟鎹垱寤轰竴涓柊鐨勫彉閲忥紝鍙﹀鐐瑰嚮鏂规硶涔熸槸閲嶆柊鑾峰彇鏉ユ搷浣滃厠闅嗘ā鏉跨殑鏁版嵁-->
- <avue-tree v-model="TreeAvueform" v-loading="loading" :data="Treedata"
- :defaultExpandAll="false"
- :option="Treeoption"
- style="height: 50.5vh;margin-right: 10px"
- @node-click="ClonenodeClick"
+ <avue-tree ref="cloneTree" v-model="TreeAvueform" v-loading="loading" :data="Treedata"
+ :defaultExpandAll="false"
+ :option="Treeoption"
+ style="height: 50.5vh;margin-right: 10px"
+ @node-click="ClonenodeClick"
>
</avue-tree>
</el-aside>
@@ -146,8 +159,10 @@
:value="item.value">
</el-option>
</el-select>
- <el-input v-model="CloneFind" size="small" style="width: 40%;margin-left: 15px" placeholder="杈撳叆鍊煎悗鎸夊洖杞﹁繘琛屾ā绯婃煡璇�"></el-input>
- <el-button size="small" type="primary" plain style="margin-left: 10px" @click="CloneEnterFind" @keyup.enter.native="CloneEnterFind">鏌ヨ</el-button>
+ <el-input v-model="CloneFind" placeholder="杈撳叆鍊煎悗鎸夊洖杞﹁繘琛屾ā绯婃煡璇�" size="small"
+ style="width: 40%;margin-left: 15px"></el-input>
+ <el-button plain size="small" style="margin-left: 10px" type="primary"
+ @click="CloneEnterFind" @keyup.enter.native="CloneEnterFind">鏌ヨ</el-button>
</div>
<avue-crud v-model="ClonecrudForm" v-loading="FormLoing" :data="this.CloneFormlist"
:option="this.ClonecrudTreeOption"
@@ -157,67 +172,70 @@
</div>
</el-main>
</el-container>
- </el-container >
- <div style="display: flex; justify-content: flex-end; align-items: center;margin-top: 10px" >
+ </el-container>
+ <div style="display: flex; justify-content: flex-end; align-items: center;margin-top: 10px">
<el-button size="small " type="primary" @click="Clonehandler">纭畾</el-button>
- <el-button size="small" @click="CloneVisible=false" >鍙栨秷</el-button>
+ <el-button size="small" @click="cloneClose">鍙栨秷</el-button>
</div>
<el-dialog
- width="30%"
- title="鍏嬮殕妯℃澘"
:visible.sync="CloneinnerVisible"
- append-to-body>
+ append-to-body
+ title="鍏嬮殕妯℃澘"
+ width="30%">
<div>
- <avue-form :option="CloneOption" @submit="Clonesubmit" v-model="CloneModel"></avue-form>
+ <avue-form v-model="CloneModel" :option="CloneOption" @submit="Clonesubmit"></avue-form>
</div>
</el-dialog>
</el-dialog>
</template>
<template #menu="{ size, row ,index}">
- <el-button type="text"
- v-if="row.lcStatus == 'Editing'"
+ <el-button v-if="row.lcStatus == 'Editing'"
+ :size="size"
icon="el-icon-edit-outline "
- :size="size"
+ type="text"
@click="$refs.textCrud.rowEdit(row)">缂栬緫</el-button>
- <el-button type="text"
- v-if="row.lcStatus == 'Editing'"
- icon="el-icon-delete"
+ <el-button v-if="row.lcStatus == 'Editing'"
:size="size"
+ icon="el-icon-delete"
+ type="text"
@click="$refs.textCrud.rowDel(row,index)">鍒犻櫎</el-button>
<el-button
v-show="row.lcStatus === 'Released'"
- @click="upAndStopAndStart(row, 'upVersion')"
:loading="row.upVersionLoad"
+ :size="size"
icon="el-icon-upload2"
type="text"
- :size="size"
+ @click="upAndStopAndStart(row, 'upVersion')"
>鍗囩増</el-button
>
<el-button
v-show="row.lcStatus === 'Released'"
- @click="upAndStopAndStart(row, 'stopLose')"
:loading="row.stopLoseLoad"
+ :size="size"
icon="el-icon-circle-close"
type="text"
- :size="size"
+ @click="upAndStopAndStart(row, 'stopLose')"
>鍋滅敤/澶辨晥</el-button
>
<el-button
v-show="['Disabled', 'Editing'].includes(row.lcStatus)"
- @click="upAndStopAndStart(row, 'startRelease')"
:loading="row.startReleaseLoad"
+ :size="size"
icon="el-icon-circle-check"
type="text"
- :size="size"
+ @click="upAndStopAndStart(row, 'startRelease')"
>鍚敤/鍙戝竷</el-button
>
</template>
</avue-crud>
</basic-container>
- <templatePro :ProData="this.ProData" :rowIndex="this.selectRow" :crudOid="this.crudOid" :crudLCStatus="this.crudLCStatus" :crudArray="this.crudArray" :Formlist="this.Formlist" :codeClassifyOid="this.codeClassifyOid"></templatePro>
+ <templatePro :Formlist="this.Formlist" :ProData="this.ProData" :codeClassifyOid="this.codeClassifyOid"
+ :crudArray="this.crudArray" :crudLCStatus="this.crudLCStatus" :crudOid="this.crudOid"
+ :rowIndex="this.selectRow"></templatePro>
</span>
<!-- 缂栫爜瑙勫垯-->
- <el-dialog :visible.sync="MasterdialogVisible" title="涓恒�愮紪鐮佽鍒欍�戦�夊彇鍊�" append-to-body>
+ <el-dialog :before-close="masterEscHandler" :visible.sync="MasterdialogVisible" append-to-body
+ title="涓恒�愮紪鐮佽鍒欍�戦�夊彇鍊�">
<template>
<el-select v-model="SelectValue" placeholder="璇烽�夋嫨" style="width: 135px">
<el-option
@@ -228,20 +246,29 @@
style="width: 150px">
</el-option>
</el-select>
- <el-input style="width: 260px;margin-left: 15px" placeholder="杈撳叆鍊煎悗杩涜妯＄硦鏌ヨ" v-model="SelectFInd"></el-input>
- <el-button size="small" type="primary" plain @click="SelectFindeHandler" style="margin-left: 20px">鏌ヨ</el-button>
+ <el-input v-model="SelectFInd" placeholder="杈撳叆鍊煎悗杩涜妯＄硦鏌ヨ" style="width: 260px;margin-left: 15px"></el-input>
+ <el-button plain size="small" style="margin-left: 20px" type="primary" @click="SelectFindeHandler">鏌ヨ
+ </el-button>
</template>
- <avue-crud :data="masterData" :option="masterOption" @select="masterSelect"></avue-crud>
+ <avue-crud :data="masterData" :option="Option" @row-click="masterSelect">
+ <template slot="radio" slot-scope="{row}">
+ <el-radio v-model="masterRow" :label="row.$index" style="padding-left: 10px !important;">{{ '' }}
+ </el-radio>
+ </template>
+ </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.TreeAddform.coderuleoidName ==''?'鏈缃��':this.TreeAddform.coderuleoidName}}]</div>
- <div style="padding-top: 10px;display: flex; justify-content: flex-end;float: right;overflow: hidden" >
- <el-button type="primary" size="small" @click="MasterHandlerClick">纭畾</el-button>
- <el-button size="small" @click="MasterdialogVisible=false">鍙栨秷</el-button>
+ <div
+ style="display: inline-block;float: left;border: 1px solid #eeeeee;padding: 5px;margin-top: 5px;font-size: 14px ">
+ 宸茶缃殑鍊间负:[{{ this.TreeAddform.coderuleoidName == '' ? '鏈缃��' : this.TreeAddform.coderuleoidName }}]
+ </div>
+ <div style="padding-top: 10px;display: flex; justify-content: flex-end;float: right;overflow: hidden">
+ <el-button size="small" type="primary" @click="MasterHandlerClick">纭畾</el-button>
+ <el-button size="small" @click="masterEscHandler">鍙栨秷</el-button>
</div>
</div>
</el-dialog>
<!-- 鍏抽敭灞炴�ф煡璇㈣鍒�-->
- <el-dialog :visible.sync="KeydialogVisible" title="涓恒�愬叧閿睘鎬ф煡璇㈣鍒欍�戦�夊彇鍊�" append-to-body>
+ <el-dialog :before-close="KeyEscHandler" :visible.sync="KeydialogVisible" append-to-body title="涓恒�愬叧閿睘鎬ф煡璇㈣鍒欍�戦�夊彇鍊�">
<template>
<el-select v-model="SelectValue" placeholder="璇烽�夋嫨" style="width: 135px">
<el-option
@@ -252,20 +279,31 @@
style="width: 150px">
</el-option>
</el-select>
- <el-input style="width: 260px;margin-left: 15px" placeholder="杈撳叆鍊煎悗杩涜妯＄硦鏌ヨ" v-model="SelectFInd"></el-input>
- <el-button size="small" type="primary" plain @click="KeySelectFindeHandler" style="margin-left: 20px">鏌ヨ</el-button>
+ <el-input v-model="SelectFInd" placeholder="杈撳叆鍊煎悗杩涜妯＄硦鏌ヨ" style="width: 260px;margin-left: 15px"></el-input>
+ <el-button plain size="small" style="margin-left: 20px" type="primary" @click="KeySelectFindeHandler">鏌ヨ
+ </el-button>
</template>
- <avue-crud :data="KeyData" :option="masterOption" @select="KeySelect"></avue-crud>
+ <avue-crud :data="KeyData" :option="Option" @row-click="KeySelect">
+ <template slot="radio" slot-scope="{row}">
+ <el-radio v-model="masterRow" :label="row.$index" style="padding-left: 10px !important;">{{ '' }}
+ </el-radio>
+ </template>
+ </avue-crud>
<div style="height: 30px">
- <div style="display: inline-block;float: left;border: 1px solid #eeeeee;padding: 5px;margin-top: 5px;font-size: 14px " >宸茶缃殑鍊间负:[{{this.TreeAddform.codeKeyAttrRepeatOidName ==''?'鏈缃��':this.TreeAddform.codekeyattrrepeatoidName}}]</div>
- <div style="padding-top: 10px;display: flex; justify-content: flex-end;float: right;overflow: hidden" >
- <el-button type="primary" size="small" @click="KeyHandlerClick">纭畾</el-button>
- <el-button size="small" @click="KeydialogVisible=false">鍙栨秷</el-button>
+ <div
+ style="display: inline-block;float: left;border: 1px solid #eeeeee;padding: 5px;margin-top: 5px;font-size: 14px ">
+ 宸茶缃殑鍊间负:[{{
+ this.TreeAddform.codeKeyAttrRepeatOidName == '' ? '鏈缃��' : this.TreeAddform.codekeyattrrepeatoidName
+ }}]
+ </div>
+ <div style="padding-top: 10px;display: flex; justify-content: flex-end;float: right;overflow: hidden">
+ <el-button size="small" type="primary" @click="KeyHandlerClick">纭畾</el-button>
+ <el-button size="small" @click="KeyEscHandler">鍙栨秷</el-button>
</div>
</div>
</el-dialog>
<!-- 鐩镐技椤规煡璇㈣鍒�-->
- <el-dialog :visible.sync="SimidialogVisible" title="涓恒�愮浉浼奸」鏌ヨ瑙勫垯銆戦�夊彇鍊�" append-to-body>
+ <el-dialog :before-close="simEscHandler" :visible.sync="SimidialogVisible" append-to-body title="涓恒�愮浉浼奸」鏌ヨ瑙勫垯銆戦�夊彇鍊�">
<template>
<el-select v-model="SelectValue" placeholder="璇烽�夋嫨" style="width: 135px">
<el-option
@@ -276,44 +314,64 @@
style="width: 150px">
</el-option>
</el-select>
- <el-input style="width: 260px;margin-left: 15px" placeholder="杈撳叆鍊煎悗杩涜妯＄硦鏌ヨ" v-model="SelectFInd"></el-input>
- <el-button size="small" type="primary" plain @click="SimSelectFindeHandler" style="margin-left: 20px">鏌ヨ</el-button>
+ <el-input v-model="SelectFInd" placeholder="杈撳叆鍊煎悗杩涜妯＄硦鏌ヨ" style="width: 260px;margin-left: 15px"></el-input>
+ <el-button plain size="small" style="margin-left: 20px" type="primary" @click="SimSelectFindeHandler">鏌ヨ
+ </el-button>
</template>
- <avue-crud :data="simData" :option="masterOption" @select="simSelect"></avue-crud>
+ <avue-crud :data="simData" :option="Option" @row-click="simSelect">
+ <template slot="radio" slot-scope="{row}">
+ <el-radio v-model="masterRow" :label="row.$index" style="padding-left: 10px !important;">{{ '' }}
+ </el-radio>
+ </template>
+ </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.TreeAddform.codeResembleRuleOidName ==''?'鏈缃��':this.TreeAddform.codeResembleRuleOidName}}]</div>
- <div style="padding-top: 10px;display: flex; justify-content: flex-end;float: right;overflow: hidden" >
- <el-button type="primary" size="small" @click="simHandlerClick">纭畾</el-button>
- <el-button size="small" @click="SimidialogVisible=false">鍙栨秷</el-button>
+ <div
+ style="display: inline-block;float: left;border: 1px solid #eee;padding: 5px;margin-top: 5px;font-size: 14px ">
+ 宸茶缃殑鍊间负:[{{
+ this.TreeAddform.codeResembleRuleOidName == '' ? '鏈缃��' : this.TreeAddform.codeResembleRuleOidName
+ }}]
+ </div>
+ <div style="padding-top: 10px;display: flex; justify-content: flex-end;float: right;overflow: hidden">
+ <el-button size="small" type="primary" @click="simHandlerClick">纭畾</el-button>
+ <el-button size="small" @click="simEscHandler">鍙栨秷</el-button>
</div>
</div>
</el-dialog>
-<!-- 涓氬姟绫诲瀷-->
- <el-dialog :visible.sync="BtmdialogVisible" title="涓恒�愪笟鍔＄被鍨嬭鍒欍�戦�夊彇鍊�" append-to-body>
+ <!-- 涓氬姟绫诲瀷-->
+ <el-dialog :before-close="BtmEscHandler" :visible.sync="BtmdialogVisible" append-to-body title="涓恒�愪笟鍔＄被鍨嬭鍒欍�戦�夊彇鍊�">
<template>
<el-select v-model="SelectValue" placeholder="璇烽�夋嫨" style="width: 135px !important;">
<el-option
- v-for="item in SelectOption"
+ v-for="item in masterSelectOption"
:key="item.value"
:label="item.label"
:value="item.value"
style="width: 130px">
</el-option>
</el-select>
- <el-input style="width: 260px;margin-left: 15px" placeholder="杈撳叆鍊煎悗杩涜妯＄硦鏌ヨ" v-model="SelectFInd"></el-input>
- <el-button size="small" type="primary" plain @click="BtmSelectFindeHandler" style="margin-left: 20px">鏌ヨ</el-button>
+ <el-input v-model="SelectFInd" placeholder="杈撳叆鍊煎悗杩涜妯＄硦鏌ヨ" style="width: 260px;margin-left: 15px"></el-input>
+ <el-button plain size="small" style="margin-left: 20px" type="primary" @click="BtmSelectFindeHandler">鏌ヨ
+ </el-button>
</template>
- <avue-crud :data="BtmData" :option="masterOption" @select="btmSelect"></avue-crud>
+ <avue-crud :data="BtmData" :option="masterOption" @row-click="btmSelect">
+ <template slot="radio" slot-scope="{row}">
+ <el-radio v-model="masterRow" :label="row.$index" style="padding-left: 10px !important;">{{ '' }}
+ </el-radio>
+ </template>
+ </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.TreeAddform.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>
+ <div
+ style="display: inline-block;float: left;border: 1px solid #eee;padding: 5px;margin-top: 5px;font-size: 14px ">
+ 宸茶缃殑鍊间负:[{{ this.TreeAddform.btmTypeName }}]
+ </div>
+ <div style="padding-top: 10px;display: flex; justify-content: flex-end;float: right;overflow: hidden">
+ <el-button size="small" type="primary" @click="btmHandlerClick">纭畾</el-button>
+ <el-button size="small" @click="BtmEscHandler">鍙栨秷</el-button>
</div>
</div>
</el-dialog>
-<!-- 瀵煎嚭-->
- <ThemeImport :visible.sync="ThemeImportVisible" :codeClassifyOid="this.codeClassifyOid"></ThemeImport>
+ <!-- 瀵煎嚭-->
+ <ThemeImport :codeClassifyOid="this.codeClassifyOid" :visible.sync="ThemeImportVisible"></ThemeImport>
</basic-container>
</el-main>
</el-container>
@@ -340,8 +398,9 @@
startRelease,
exportClassify
} from "@/api/template/templateAttr";
-import {defaultReferDataGrid,referDataGrid} from '@/api/MasterData/master'
+import {defaultReferDataGrid, referDataGrid} from '@/api/MasterData/master'
import func from "@/util/func";
+
export default {
name: "classifyTrees.vue",
//浣跨敤inject鎺ユ敹鍙傛暟
@@ -350,64 +409,97 @@
inject: ["crudTreeData"],
data() {
return {
- AddLoading:false,
+ masterRow: null,
+ AddLoading: false,
// 瀹氫箟涓�涓彉閲忔潵淇濆瓨鏍戣姹傜殑鏁伴噺
- requestCount:0,
+ requestCount: null,
//瀵煎叆鐘舵�佹
- ThemeImportVisible:false,
- selectRow:'',
- selectList:[],
+ ThemeImportVisible: false,
+ selectRow: '',
+ selectList: [],
//鏍戣妭鐐规樉绀洪殣钘�
- TreeFlagCode:true,
+ TreeFlagCode: true,
//淇敼鑺傜偣鏄剧ず闅愯棌
- editTreeFLagCode:false,
+ editTreeFLagCode: false,
//缂栫爜瑙勫垯
- MasterdialogVisible:false,
- masterData:[],
- masterSelectList:[],
- masterName:"",
- masterOid:"",
+ MasterdialogVisible: false,
+ masterData: [],
+ masterSelectList: [],
+ masterName: "",
+ masterOid: "",
//鍏抽敭灞炴�tmTypeId
- KeydialogVisible:false,
- KeyName:"",
- KeyOid:"",
- KeyData:[],
- KeySelectLIst:[],
+ KeydialogVisible: false,
+ KeyName: "",
+ KeyOid: "",
+ KeyData: [],
+ KeySelectLIst: [],
//鐩镐技椤�
- simName:"",
- simOid:"",
- simData:[],
- SimidialogVisible:false,
- simSelectList:[],
+ simName: "",
+ simOid: "",
+ simData: [],
+ SimidialogVisible: false,
+ simSelectList: [],
//涓氬姟绫诲瀷
- btmName:"",
- btmOid:"",
- BtmData:[],
- BtmdialogVisible:false,
- btmSelectList:[],
- masterOption:{
- addBtn:false,
- index:true,
- border:true,
- selection:true,
- menu:false,
- height:380,
- column:[
+ btmName: "",
+ btmOid: "",
+ BtmData: [],
+ BtmdialogVisible: false,
+ btmSelectList: [],
+ masterOption: {
+ addBtn: false,
+ index: true,
+ border: true,
+ menu: false,
+ height: 380,
+ column: [
{
- label:'鑻辨枃鍚嶇О',
- prop:'id'
+ label: '',
+ prop: 'radio',
+ width: 60,
+ display: false
},
{
- label:'涓枃鍚嶇О',
- prop:'name'
+ label: '涓氬姟绫诲瀷缂栧彿',
+ prop: 'id'
},
{
- label:'鎻忚堪',
- prop:'description'
+ label: '涓氬姟绫诲瀷鍚嶇О',
+ prop: 'name'
+ },
+ {
+ label: '鎻忚堪',
+ prop: 'description'
}
]
},
- SelectOption:[
+ Option: {
+ addBtn: false,
+ index: true,
+ border: true,
+ menu: false,
+ height: 380,
+ column: [
+ {
+ label: '',
+ prop: 'radio',
+ width: 60,
+ display: false
+ },
+ {
+ label: '鑻辨枃鍚嶇О',
+ prop: 'id'
+ },
+ {
+ label: '涓枃鍚嶇О',
+ prop: 'name'
+ },
+ {
+ label: '鎻忚堪',
+ prop: 'description'
+ }
+ ]
+ },
+ SelectOption: [
{
value: 'name',
label: '涓枃鍚嶇О'
@@ -417,15 +509,25 @@
label: '鑻辨枃鍚嶇О'
}
],
- SelectValue:"",
- SelectFInd:"",
- addFlag:false,
+ masterSelectOption: [
+ {
+ value: 'id',
+ label: '涓氬姟绫诲瀷缂栧彿'
+ },
+ {
+ value: 'name',
+ label: '涓氬姟绫诲瀷鍚嶇О'
+ },
+ ],
+ SelectValue: "id",
+ SelectFInd: "",
+ addFlag: false,
// 琛ㄦ牸褰撳墠琛宨d
- crudOid:"",
+ crudOid: "",
//褰撳墠閫変腑妯℃澘鐘舵��
- crudLCStatus:'',
+ crudLCStatus: '',
//琛ㄦ牸褰撳墠閫夋嫨鏁扮粍
- crudArray:[],
+ crudArray: [],
//妯℃澘灞炴�у睍绀哄唴瀹�
ProData: [],
//鍥炶溅閿悳绱㈢粦瀹氬��
@@ -433,12 +535,11 @@
searchCondition: 'id',
findText: "",
},
-
//楂樼骇鏌ヨ瀵硅瘽妗�
FindFormVisible: false,
//鍏嬮殕妯℃澘瀵硅瘽妗�
CloneVisible: false,
- CloneinnerVisible:false,
+ CloneinnerVisible: false,
//楂樼骇鏌ヨ涓嬫媺妗�
FindSelect: {
id: "0",
@@ -467,7 +568,7 @@
TreeAddFormVisible: false,
//褰撳墠鐐瑰嚮椤�
nodeClickList: "",
- ClonenodeClickList:"",
+ ClonenodeClickList: "",
//鍒嗙被鍜屼富棰樺簱鐘舵��
TreeFlag: false,
//鏍戝姞杞�
@@ -488,29 +589,27 @@
},
rules: {
id: [
- { required: true, message: '璇疯緭鍏ュ悕绉�', trigger: 'blur' },
+ {required: true, message: '璇疯緭鍏ョ紪鍙�', trigger: 'blur'},
],
- name:[
- { required: true, message: '璇疯緭鍏ョ紪鍙�', trigger: 'blur' },
+ name: [
+ {required: true, message: '璇疯緭鍏ュ悕绉�', trigger: 'blur'},
],
- btmTypeName:[
- { required: true, message: '璇烽�夋嫨涓氬姟绫诲瀷', trigger: 'blur' },
+ btmTypeName: [
+ {required: true, message: '璇烽�夋嫨涓氬姟绫诲瀷', trigger: 'blur'},
]
},
//avue-tree鏁版嵁锛屾殏鏃舵病鏈変綔鐢紝閲岄潰鍔熻兘鐢╡lement鍐欎簡锛屽彧鐢╝vue鐨勪竴涓爲缁勪欢涓嶇敤鍐呯疆琛ㄥ崟浜嗐��
TreeAvueform: {},
//鍏嬮殕鏍�
- CloneTreeAvueform:{},
+ CloneTreeAvueform: {},
Treedata: [],
- CloneTreedata:[],
+ CloneTreedata: [],
Treeoption: {
addBtn: false,
editBtn: false,
delBtn: false,
defaultExpandAll: false,
menu: false,
- // //杩欎釜鏄閫�
- // multiple: true,
},
//妯℃澘绠＄悊form
crudForm: "",
@@ -523,7 +622,7 @@
//鍏嬮殕妯℃澘涓嬫媺妗唙alue
Clonevalue: "0",
//鍏嬮殕妯℃澘鎼滅储杈撳叆妗�
- CloneFind:"",
+ CloneFind: "",
//鍏嬮殕妯℃澘涓嬫媺妗嗘暟鎹�
CloneSelectOptions: [{
value: '0',
@@ -535,19 +634,19 @@
},
],
//鍏嬮殕妯℃澘纭琛ㄥ崟鏁版嵁
- CloneOption:{
- column:[
+ CloneOption: {
+ column: [
{
- label:'妯℃澘缂栧彿',
- prop:'id',
+ label: '妯℃澘缂栧彿',
+ prop: 'id',
rules: [{
required: true,
message: "璇疯緭鍏ユā鏉跨紪鍙�",
trigger: "blur"
}]
}, {
- label:'妯℃澘鍚嶇О',
- prop:'name',
+ label: '妯℃澘鍚嶇О',
+ prop: 'name',
rules: [{
required: true,
message: "璇疯緭鍏ユā鏉垮悕绉�",
@@ -555,16 +654,16 @@
}]
},
{
- label:'鎻忚堪',
- prop:'desc',
- type:'textarea',
- span:24
+ label: '鎻忚堪',
+ prop: 'desc',
+ type: 'textarea',
+ span: 24
}
]
},
//鍏嬮殕妯℃澘鍙屽悜缁戝畾鏁版嵁
- CloneModel:[],
- CloneSelect:[],
+ CloneModel: [],
+ CloneSelect: [],
//鍏嬮殕妯℃澘option
ClonecrudTreeOption: {
index: true,
@@ -658,16 +757,10 @@
}
},
//妯℃澘绠＄悊缂栬緫
- showEditBtn:false,
+ showEditBtn: false,
}
},
- watch:{
- TreeFlagCode:{
- handler(newval,oldval){
- console.log('TreeFlagCode',newval)
- }
- }
- },
+ watch: {},
//tab鏍忛粯璁ゆ槸琛ㄦ牸
mounted() {
this.type = this.tabOption.column[0];
@@ -677,20 +770,20 @@
if (e.target.nodeName !== 'SPAN') {
this.$refs.tree.setCurrentKey(null)
this.nodeClickList = {}
- this.TreeList=[]
- this.TreeFlagCode=true;
+ this.TreeList = []
+ this.TreeFlagCode = true;
}
}, true)
},
- computed:{
- crudTreeOption(){
- return{
+ computed: {
+ crudTreeOption() {
+ return {
index: true,
border: true,
- height:180,
- addBtn:this.Formlist.length<=0 && this.nodeClickList != "",
- editBtn:false,
- delBtn:false,
+ height: 180,
+ addBtn: this.Formlist.length <= 0 && this.nodeClickList != "",
+ editBtn: false,
+ delBtn: false,
column: [
{
label: '',
@@ -718,17 +811,17 @@
},
{
label: "妯℃澘鎻忚堪",
- prop:"description"
+ prop: "description"
},
{
- label:"鐗堟湰鍙�",
- prop:"revisionSeq",
- display:false
+ label: "鐗堟湰鍙�",
+ prop: "revisionSeq",
+ display: false
},
{
- label:"鐘舵��",
- prop:"lcStatusText",
- display:false
+ label: "鐘舵��",
+ prop: "lcStatusText",
+ display: false
}
],
batchImportData: {
@@ -743,236 +836,227 @@
},
methods: {
+ //瀛樺偍鐨勪笟鍔＄被鍨嬪叧闂�
+ BtmEscHandler() {
+ this.SelectFInd = '';
+ this.SelectValue = 'id';
+ this.masterRow = null;
+ this.BtmdialogVisible = false;
+ },
+ //鐩镐技椤瑰叧闂�
+ simEscHandler() {
+ this.SelectFInd = '';
+ this.SelectValue = 'id';
+ this.masterRow = null;
+ this.SimidialogVisible = false;
+ },
+ //鍏抽敭灞炴�у叧闂�
+ KeyEscHandler() {
+ this.SelectFInd = '';
+ this.SelectValue = 'id';
+ this.masterRow = null;
+ this.KeydialogVisible = false;
+ },
+ //缂栫爜瑙勫垯鍏抽棴
+ masterEscHandler() {
+ this.SelectFInd = '';
+ this.SelectValue = 'id';
+ this.masterRow = null;
+ this.MasterdialogVisible = false;
+ },
+ // 鍏抽棴寮圭獥
/** 瀵煎叆 */
- ImportExcel(){
- this.ThemeImportVisible=true;
+ ImportExcel() {
+ this.ThemeImportVisible = true;
},
/** 瀵煎嚭 */
- ExportExcel(){
- if(this.nodeClickList){
- exportClassify({oid:this.nodeClickList.oid}).then(res=>{
+ ExportExcel() {
+ if (this.nodeClickList) {
+ exportClassify({oid: this.nodeClickList.oid}).then(res => {
func.downloadFileByBlobHandler(res);
})
- }else {
+ } else {
this.$message.warning('璇峰厛閫夋嫨瑕佸鍑虹殑涓婚搴撳垎绫�')
}
},
//缂栫爜瑙勫垯澶辩劍
- CodeFoucus(){
- this.MasterdialogVisible=true;
+ CodeFoucus() {
+ this.MasterdialogVisible = true;
this.MasterdefaultRend()
},
//缂栫爜澶氶��
- masterSelect(row){
- if(row.length>0){
- this.masterSelectList=row;
- this.masterName=row[0].name;
- this.masterOid=row[0].oid;
- }
+ masterSelect(row) {
+ this.masterRow = row.$index;
+ this.masterSelectList = row;
+ this.masterName = row.name;
+ this.masterOid = row.oid;
+
},
//缂栫爜瑙勫垯鏌ヨ
- SelectFindeHandler(){
- if(this.SelectValue == 'id'){
- const masterParameter={
- 'conditionMap[id]':this.SelectFInd
- }
- this.MasterdefaultRend(masterParameter);
- this.SelectValue=""
- this.SelectFInd=""
- }else if(this.SelectValue == 'name'){
- const masterParameter={
- 'conditionMap[name]':this.SelectFInd
- }
- this.MasterdefaultRend(masterParameter)
- this.SelectValue=""
- this.SelectFInd=""
- }
+ SelectFindeHandler() {
+ const masterParameter = {};
+ masterParameter[`conditionMap['${this.SelectValue}']`] = `*${this.SelectFInd}*`;
+ this.MasterdefaultRend(masterParameter)
},
//缂栫爜瑙勫垯纭畾
- MasterHandlerClick(){
- if(this.masterSelectList.length>1){
+ MasterHandlerClick() {
+ if (this.masterSelectList.length > 1) {
this.$message.warning('鍙兘閫夋嫨涓�鏉℃暟鎹�')
- }else if(this.masterSelectList.length<=0){
+ } else if (this.masterSelectList.length <= 0) {
this.$message.warning('璇烽�夋嫨涓�鏉℃暟鎹�')
- }else {
- this.MasterdialogVisible=false;
- this.masterSelectList=[]
- this.$set(this.TreeAddform,'codeRuleOidName',this.masterName)
- this.$set(this.TreeAddform,'codeRuleOid',this.masterOid)
- this.$emit('MasterHandler',this.loneTreeNewForm)
+ } else {
+ this.MasterdialogVisible = false;
+ this.masterSelectList = []
+ this.$set(this.TreeAddform, 'codeRuleOidName', this.masterName)
+ this.$set(this.TreeAddform, 'codeRuleOid', this.masterOid)
+ this.$emit('MasterHandler', this.loneTreeNewForm)
}
},
//缂栫爜鎺ュ彛
- MasterdefaultRend(){
+ MasterdefaultRend(masterParameter) {
defaultReferDataGrid({
- referType:'coderule',
- isMuti:'false',
- 'conditionMap["lcstatus"]':'Released'
- }).then(res=>{
- this.masterData=res.data.records;
+ referType: 'coderule',
+ isMuti: 'false',
+ 'conditionMap["lcstatus"]': 'Released',
+ 'limit':'-1',
+ ...masterParameter
+ }).then(res => {
+ this.masterData = res.data.records;
})
},
- Keyfouce(){
- this.KeydialogVisible=true;
+ Keyfouce() {
+ this.KeydialogVisible = true;
this.KeydefaultRend()
},
//鍏抽敭灞炴�х‘瀹�
- KeyHandlerClick(){
- if(this.KeySelectLIst.length>1){
+ KeyHandlerClick() {
+ if (this.KeySelectLIst.length > 1) {
this.$message.warning('鍙兘閫夋嫨涓�鏉℃暟鎹�')
- }else if(this.KeySelectLIst.length<=0){
+ } else if (this.KeySelectLIst.length <= 0) {
this.$message.warning('璇烽�夋嫨涓�鏉℃暟鎹�')
- }else {
- this.KeydialogVisible=false;
- this.KeySelectLIst=[]
- this.$set(this.TreeAddform,'codeKeyAttrRepeatOidName',this.KeyName)
- this.$set(this.TreeAddform,'codeKeyAttrRepeatOid',this.KeyOid)
+ } else {
+ this.KeydialogVisible = false;
+ this.KeySelectLIst = []
+ this.$set(this.TreeAddform, 'codeKeyAttrRepeatOidName', this.KeyName)
+ this.$set(this.TreeAddform, 'codeKeyAttrRepeatOid', this.KeyOid)
}
},
//鍏抽敭灞炴�ф煡璇�
- KeySelectFindeHandler(){
- if(this.SelectValue == 'id'){
- const masterParameter={
- 'conditionMap[id]':this.SelectFInd
- }
- this.KeydefaultRend(masterParameter);
- this.SelectValue="";
- this.SelectFInd="";
- }else if(this.SelectValue == 'name'){
- const masterParameter={
- 'conditionMap[name]':this.SelectFInd
- }
- this.KeydefaultRend(masterParameter)
- this.SelectValue=""
- this.SelectFInd=""
- }
+ KeySelectFindeHandler() {
+ const masterParameter = {};
+ masterParameter[`conditionMap['${this.SelectValue}']`] = `*${this.SelectFInd}*`;
+ this.KeydefaultRend(masterParameter)
},
//鍏抽敭灞炴�ф帴鍙�
- KeydefaultRend(){
+ KeydefaultRend(masterParameter) {
defaultReferDataGrid({
- referType:'codekeyattrrepeat',
- isMuti:'false',
- 'conditionMap["lcstatus"]':'Enabled'
- }).then(res=>{
- this.KeyData=res.data.records;
+ referType: 'codekeyattrrepeat',
+ isMuti: 'false',
+ 'conditionMap["lcstatus"]': 'Enabled',
+ 'limit':'-1',
+ ...masterParameter
+ }).then(res => {
+ this.KeyData = res.data.records;
})
},
// 鍏抽敭澶氶��
- KeySelect(row){
- this.KeySelectLIst=row;
- this.KeyName=row[0].name;
- this.KeyOid=row[0].oid;
+ KeySelect(row) {
+ this.masterRow = row.$index;
+ this.KeySelectLIst = row;
+ this.KeyName = row.name;
+ this.KeyOid = row.oid;
},
//鍏抽敭澶辩劍
- simFouce(){
- this.SimidialogVisible=true;
+ simFouce() {
+ this.SimidialogVisible = true;
this.simdefaultRend()
},
//鐩镐技椤圭‘瀹�
- simHandlerClick(){
- if(this.simSelectList.length>1){
+ simHandlerClick() {
+ if (this.simSelectList.length > 1) {
this.$message.warning('鍙兘閫夋嫨涓�鏉℃暟鎹�')
- }else if(this.simSelectList.length<=0){
+ } else if (this.simSelectList.length <= 0) {
this.$message.warning('璇烽�夋嫨涓�鏉℃暟鎹�')
- }else {
- this.SimidialogVisible=false;
- this.simSelectList=[]
- this.$set(this.TreeAddform,'codeResembleRuleOidName',this.simName)
- this.$set(this.TreeAddform,'codeResembleRuleOid',this.simOid)
- this.$emit('MasterHandler',this.loneTreeNewForm)
+ } else {
+ this.SimidialogVisible = false;
+ this.simSelectList = []
+ this.$set(this.TreeAddform, 'codeResembleRuleOidName', this.simName)
+ this.$set(this.TreeAddform, 'codeResembleRuleOid', this.simOid)
+ this.$emit('MasterHandler', this.loneTreeNewForm)
}
},
//鐩镐技椤规煡璇�
- SimSelectFindeHandler(){
- if(this.SelectValue == 'id'){
- const masterParameter={
- 'conditionMap[id]':this.SelectFInd
- }
- this.simdefaultRend(masterParameter);
- this.SelectValue=""
- this.SelectFInd=""
- }else if(this.SelectValue == 'name'){
- const masterParameter={
- 'conditionMap[name]':this.SelectFInd
- }
- this.simdefaultRend(masterParameter)
- this.SelectValue=""
- this.SelectFInd=""
- }
+ SimSelectFindeHandler() {
+ const masterParameter = {};
+ masterParameter[`conditionMap['${this.SelectValue}']`] = `*${this.SelectFInd}*`;
+ this.simdefaultRend(masterParameter)
},
// 鐩镐技椤瑰閫�
- simSelect(row){
- this.simSelectList=row;
- this.simName=row[0].name;
- this.simOid=row[0].oid;
+ simSelect(row) {
+ this.masterRow = row.$index;
+ this.simSelectList = row;
+ this.simName = row.name;
+ this.simOid = row.oid;
},
//鐩镐技椤归」鎺ュ彛
- simdefaultRend(){
+ simdefaultRend(masterParameter) {
defaultReferDataGrid({
- referType:'coderesemblerule',
- isMuti:'false',
- 'conditionMap["lcstatus"]':'Enabled'
- }).then(res=>{
- this.simData=res.data.records;
+ referType: 'coderesemblerule',
+ isMuti: 'false',
+ 'conditionMap["lcstatus"]': 'Enabled',
+ 'limit':'-1',
+ ...masterParameter
+ }).then(res => {
+ this.simData = res.data.records;
})
},
//涓氬姟绫诲瀷澶辩劍
- btmFoucus(){
- this.BtmdialogVisible=true;
+ btmFoucus() {
+ this.BtmdialogVisible = true;
this.btmdefaultRend()
},
//涓氬姟绫诲瀷纭畾
- btmHandlerClick(){
- if(this.btmSelectList.length>1){
+ btmHandlerClick() {
+ if (this.btmSelectList.length > 1) {
this.$message.warning('鍙兘閫夋嫨涓�鏉℃暟鎹�')
- }else if(this.btmSelectList.length<=0){
+ } else if (this.btmSelectList.length <= 0) {
this.$message.warning('璇烽�夋嫨涓�鏉℃暟鎹�')
- }else {
- this.BtmdialogVisible=false;
- this.btmSelectList=[]
- this.$set(this.TreeAddform,'btmTypeName',this.btmName)
- this.$set(this.TreeAddform,'btmTypeId',this.btmOid)
- this.$emit('MasterHandler',this.loneTreeNewForm)
+ } else {
+ this.$refs.myForm.clearValidate();
+ this.BtmdialogVisible = false;
+ this.btmSelectList = []
+ this.$set(this.TreeAddform, 'btmTypeName', this.btmName)
+ this.$set(this.TreeAddform, 'btmTypeId', this.btmOid)
+ this.$emit('MasterHandler', this.loneTreeNewForm)
}
},
//涓氬姟绫诲瀷鏌ヨ
- BtmSelectFindeHandler(){
- if(this.SelectValue == 'id'){
- const masterParameter={
- 'conditionMap[id]':this.SelectFInd
- }
- this.btmdefaultRend(masterParameter);
- this.SelectValue=""
- this.SelectFInd=""
- }else if(this.SelectValue == 'name'){
- const masterParameter={
- 'conditionMap[name]':this.SelectFInd
- }
- this.btmdefaultRend(masterParameter);
- this.SelectValue="";
- this.SelectFInd="";
- }
+ BtmSelectFindeHandler() {
+ const masterParameter = {};
+ masterParameter[`conditionMap['${this.SelectValue}']`] = `*${this.SelectFInd}*`;
+ this.btmdefaultRend(masterParameter);
},
//涓氬姟绫诲瀷澶氶��
- btmSelect(row){
- this.btmSelectList=row;
- this.btmName=row[0].name;
- this.btmOid=row[0].id;
+ btmSelect(row) {
+ this.masterRow = row.$index;
+ this.btmSelectList = row;
+ this.btmName = row.name;
+ this.btmOid = row.id;
},
//涓氬姟绫诲瀷鎺ュ彛
- btmdefaultRend(masterParameter){
- referDataGrid({valueField:'id',isMuti:'false',...masterParameter}).then(res=>{
- this.BtmData=res.data.data.records
+ btmdefaultRend(masterParameter) {
+ referDataGrid({valueField: 'id', isMuti: 'false','limit':'-1', ...masterParameter}).then(res => {
+ this.BtmData = res.data.data.records
})
},
//瀛愪紶鐖�
- MasterHandler(val){
- this.TreeList=val;
+ MasterHandler(val) {
+ this.TreeList = val;
},
- rowHandle(row, column){
- this.selectRow=row.$index;
- this.crudOid=row.oid;
- this.crudLCStatus=row.lcStatus;
+ rowHandle(row, column) {
+ this.selectRow = row.$index;
+ this.crudOid = row.oid;
+ this.crudLCStatus = row.lcStatus;
this.crudArray.push(row);
this.gridCode()
},
@@ -988,8 +1072,16 @@
})
//璋冪敤淇敼灞炴�у悕鏂规硶
this.ModifyProperties(this.CloneTreedata, 'name', 'label');
+ console.log(this.CloneTreedata)
+ this.CloneTreedata = this.CloneTreedata.map(item => {
+ if (item.attributes.lcStatus === "Disabled") {
+ item.label += '銆愬仠鐢ㄣ��';
+ }
+ return item;
+ });
}).catch(res => {
this.$message.error(res)
+
})
},
//瀹氫箟涓�涓慨鏀规暟鎹睘鎬у悕鐨勬柟娉�
@@ -1014,7 +1106,7 @@
});
try {
//鏂板琛ㄥご鍚嶇О
- this.TreeFlag=!this.nodeClickList
+ this.TreeFlag = !this.nodeClickList
await new Promise(resolve => setTimeout(resolve, 500));
this.TreeAddFormVisible = true;
loading.close();
@@ -1023,29 +1115,42 @@
loading.close();
}
},
+ //鏍戣妭鐐瑰彇娑堜簨浠�
+ TreeEscHandler() {
+ this.TreeAddform = {};
+ this.TreeAddFormVisible = false;
+ // 鍏抽棴寮圭獥娓呯┖鏍￠獙
+ this.$refs.myForm.clearValidate();
+ },
//鏍戣妭鐐规坊鍔犱簨浠�
TreeAddHandler() {
- const data = this.TreeAddform;
- // data.btmtypename= this.TreeList.btmtypename
- this.$set(data, "parentCodeClassifyOid", this.nodeClickList.oid);
- TreeSave(data)
- .then(() => {
- this.$message({
- type: "success",
- message: "娣诲姞鎴愬姛!",
+ if ((!this.TreeAddform.id || !this.TreeAddform.name) || (this.TreeFlagCode && !this.TreeAddform.btmTypeName)) {
+ this.$message.warning('璇疯緭鍏ュ唴瀹癸紒');
+ } else {
+ const data = this.TreeAddform;
+ this.$set(data, "parentCodeClassifyOid", this.nodeClickList.oid);
+ TreeSave(data)
+ .then(() => {
+ this.$message({
+ type: "success",
+ message: "娣诲姞鎴愬姛!",
+ });
+ Object.keys(this.TreeAddform).forEach(key => {
+ this.TreeAddform[key] = "";
+ });
+ this.getAttr();
+ this.TreeAddFormVisible = false;
+ //娣诲姞瀹屾垚鍚庡彸渚ф竻绌�
+ this.ProData = [];
+ this.Formlist = [];
+ })
+ .catch((res) => {
+ this.$message({
+ type: "warning",
+ message: res,
+ });
});
- Object.keys(this.TreeAddform).forEach(key => {
- this.TreeAddform[key] = "";
- });
- this.getAttr();
- this.TreeAddFormVisible = false;
- })
- .catch((res) => {
- this.$message({
- type: "warning",
- message: res,
- });
- });
+ }
},
//鏍戣妭鐐瑰垹闄ゆ寜閽�
TreeDel() {
@@ -1105,7 +1210,7 @@
},
//淇敼鍥炲～
TreeEdit() {
- if ( Object.keys(this.nodeClickList).length<1) {
+ if (Object.keys(this.nodeClickList).length < 1) {
this.$message({
type: 'warning',
message: '璇峰厛浠庢爲涓婇�夋嫨涓�鏉℃暟鎹�!'
@@ -1126,9 +1231,9 @@
//鍚敤鍜屽仠鐢ㄩ兘鍏堝垽鏂姸鎬�
//鍚敤
Enable() {
- if(Object.keys(this.nodeClickList).length<1){
+ if (Object.keys(this.nodeClickList).length < 1) {
this.$message.warning('璇峰厛浠庢爲涓婇�夋嫨涓�鏉℃暟鎹�')
- }else {
+ } else {
if (this.FlagObj.lcStatus == "Enabled") {
this.$message({
type: 'warning',
@@ -1159,9 +1264,9 @@
},
//鍋滅敤
Deactivate() {
- if(Object.keys(this.nodeClickList).length<1){
+ if (Object.keys(this.nodeClickList).length < 1) {
this.$message.warning('璇峰厛浠庢爲涓婇�夋嫨涓�鏉℃暟鎹�')
- }else {
+ } else {
if (this.FlagObj.lcStatus === "Disabled") {
this.$message({
type: 'warning',
@@ -1189,7 +1294,6 @@
});
}
}
-
},
//鏍戠偣鍑讳簨浠�
async nodeClick(data) {
@@ -1199,11 +1303,12 @@
this.editTreeFLagCode = !data.parentId;
this.nodeClickList = data;
this.selectRow = 0;
+ this.crudArray = []
try {
this.requestCount += 1;
const [res1, res2, res3] = await Promise.all([
TreeObjcet(data.oid),
- gridCodeClassifyTemplate({ 'conditionMap[codeclassifyoid]': data.oid }),
+ gridCodeClassifyTemplate({'conditionMap[codeclassifyoid]': data.oid}),
getObjectByOid(data.oid)
]);
this.FlagObj = res1.data.data;
@@ -1220,6 +1325,7 @@
await this.gridCode();
} else {
this.ProData = [];
+ this.crudOid = ''
}
this.TreeList = res3.data.data;
} catch (error) {
@@ -1229,7 +1335,10 @@
async gridCode() {
try {
- const res = await gridCodeClassifyTemplateAttr({ 'conditionMap[classifyTemplateOid]': this.Formlist[this.selectRow].oid, limit: -1 });
+ const res = await gridCodeClassifyTemplateAttr({
+ 'conditionMap[classifyTemplateOid]': this.Formlist[this.selectRow].oid,
+ limit: -1
+ });
this.ProData = res.data.data.map(item => {
if (item.classifyInvokeAttr !== '') {
if (!item.hasOwnProperty('classifyInvokeText')) {
@@ -1251,17 +1360,17 @@
console.log(e);
},
//鍩烘湰淇℃伅琛ㄥ崟鍒锋柊
- referTreeForm(){
- getObjectByOid(this.nodeClickList.oid).then(res => {
+ referTreeForm() {
+ getObjectByOid(this.nodeClickList.oid).then(res => {
this.TreeList = res.data.data;
}).catch(res => {
this.$message.error(res)
})
},
//鍏嬮殕妯℃澘鏍戠殑鐐瑰嚮鍒囨崲鏁版嵁
- async ClonenodeClick(data){
- this.ClonenodeClickList=data;
- await gridCodeClassifyTemplate({'conditionMap[codeclassifyoid]': data.oid}).then(res=>{
+ async ClonenodeClick(data) {
+ this.ClonenodeClickList = data;
+ await gridCodeClassifyTemplate({'conditionMap[codeclassifyoid]': data.oid}).then(res => {
this.CloneFormlist = res.data.data.filter(item => {
if (item.codeclassifyoid != "") {
this.codeClassifyOid = item.codeclassifyoid
@@ -1303,7 +1412,7 @@
},
//妯℃澘绠＄悊琛ㄦ牸娣诲姞
- CrudRowSave(row,done) {
+ CrudRowSave(row, done) {
if (this.nodeClickList.length <= 0) {
this.$message({
type: 'warning',
@@ -1317,7 +1426,7 @@
message: "娣诲姞鎴愬姛!"
});
done(row)
- this.CrudRend()
+ this.TemRefresh();
}).catch(res => {
this.$message({
type: 'info',
@@ -1327,9 +1436,9 @@
}
},
//妯℃澘绠＄悊淇敼
- CrudRowUpdata(row,index,done) {
+ CrudRowUpdata(row, index, done) {
editSave(row).then(() => {
- this.CrudRend()
+ this.TemRefresh();
this.$message({
type: "success",
message: "鎿嶄綔鎴愬姛!"
@@ -1341,8 +1450,8 @@
},
//妯℃澘绠＄悊鍒犻櫎
CrudRowDel(row) {
- deleteData(row).then(()=> {
- this.CrudRend()
+ deleteData(row).then(() => {
+ this.TemRefresh();
}).catch(res => {
this.$message({
type: 'info',
@@ -1350,77 +1459,87 @@
});
})
},
+ //鍏嬮殕鍙栨秷
+ cloneClose() {
+ this.$refs.cloneTree.setCurrentKey(null)
+ this.ClonenodeClickList = {}
+ this.CloneFormlist = []
+ this.CloneVisible = false;
+ },
//鍏嬮殕妯℃澘鏌ヨ
- CloneEnterFind(){
+ CloneEnterFind() {
gridCodeClassifyTemplate().then(res => {
this.CloneFormlist = res.data.data.filter(item => {
- if(this.Clonevalue == 0){
+ if (this.Clonevalue == 0) {
return item.id.includes(this.CloneFind)
- }else if(this.Clonevalue == 1){
+ } else if (this.Clonevalue == 1) {
return item.name.includes(this.CloneFind)
}
})
})
},
// 鏌ヨ
- FindeHanler(){
- if(this.nodeClickList != ""){
- this.FindFormVisible=true
- }else {
+ FindeHanler() {
+ if (this.nodeClickList != "") {
+ this.FindFormVisible = true
+ } else {
this.$message.warning('璇蜂粠鏍戜笂閫夋嫨涓�鏉℃暟鎹�')
}
},
//鍏嬮殕妯℃澘閫夋嫨纭畾
- Clonehandler(){
- if(this.CloneSelect.length <= 0){
+ Clonehandler() {
+ if (this.CloneSelect.length <= 0) {
this.$message({
type: 'warning',
message: '璇烽�夋嫨瑕佸厠闅嗙殑妯℃澘!'
});
- }else if(this.CloneSelect.length >1){
+ } else if (this.CloneSelect.length > 1) {
this.$message({
type: 'warning',
message: '鍙兘閫夋嫨涓�鏉℃暟鎹�!'
});
} else {
- this.CloneinnerVisible=true;
+ this.CloneinnerVisible = true;
}
},
//鐐瑰嚮浠庡叾瀹冩ā鏉垮厠闅�
- CloneBtn(){
- if(this.nodeClickList.length <= 0){
+ CloneBtn() {
+ if (this.nodeClickList.length <= 0) {
this.$message({
type: 'warning',
message: '璇峰厛浠嶽涓婚搴撳垎绫汇�戞爲涓婇�夋嫨涓�鏉℃暟鎹�!'
});
- }else {
- this.CloneVisible=true;
+ } else {
+ this.CloneVisible = true;
}
},
//鍏嬮殕妯℃澘鍗曢�夋鏀瑰彉
- selectionChange(row){
- this.CloneSelect=row;
- //鍙屽悜缁戝畾锛屾彁浜よ〃鍗曡緭鍏ユ鍥炲～涓婂綋鍓嶉�夋嫨鐨勬暟鎹�
- this.CloneModel.id=row[0].id;
- this.CloneModel.name=row[0].name;
- //杩欓噷鏈夌偣缁曪紝CloneSelect鏄垜閫夋嫨妗嗛�夋嫨鐨勬暟鎹�傜瓑浜巘his.nodeClickList.oid鏄洜涓猴紝鍏嬮殕妯℃澘浼犻�掓暟鎹鎶婂綋鍓嶉�夋嫨鏍戠殑oid浼犻�掔粰鍚庣銆傝�屼笉鏄綋鍓嶈鍏嬮殕妯℃澘鐨刼id
- this.CloneSelect[0].codeclassifyoid=this.nodeClickList.oid
+ selectionChange(row) {
+ this.CloneSelect = row;
+ const {id, name} = row[0];
+ this.CloneModel = {id, name};
+ this.CloneSelect[0].codeclassifyoid = this.nodeClickList.oid;
+ console.log('row', row)
+ console.log('CloneSelect', this.CloneSelect)
+ console.log('CloneModel', this.CloneModel)
},
//鍏嬮殕琛ㄥ崟鎻愪氦
- Clonesubmit(row,done){
- //閲嶆柊璧嬪�糃loneSelect浼犻�掔殑鏁版嵁涓鸿緭鍏ユ鍙互淇敼鐨勬暟鎹紝CloneModel鎻愪氦琛ㄥ崟杈撳叆妗嗗弻鍚戠粦瀹氭暟鎹�
- this.CloneSelect[0].id=this.CloneModel.id;
- this.CloneSelect[0].name=this.CloneModel.name;
- copy(this.CloneSelect[0]).then(()=>{
- //鍥犱负鏄祵濂楀脊绐楁墍浠ユ墜鍔ㄥ叧闂瑿loneinnerVisible锛孋loneVisible涓や釜寮圭獥銆�
- this.CloneinnerVisible=false
- this.CloneVisible=false
- this.$message.success("澶嶅埗鎴愬姛")
- this.CrudRend()
- done(row)
- }).catch(res=>{
- done(res)
- })
+ Clonesubmit(row, done) {
+ // 閲嶆柊璧嬪�糃loneSelect浼犻�掔殑鏁版嵁涓鸿緭鍏ユ鍙互淇敼鐨勬暟鎹紝CloneModel鎻愪氦琛ㄥ崟杈撳叆妗嗗弻鍚戠粦瀹氭暟鎹�
+ Object.assign(this.CloneSelect[0], this.CloneModel);
+ // CloneSelect鏁扮粍绗竴椤� 鍖归厤CloneModel瀵硅薄
+ copy(this.CloneSelect[0])
+ .then(() => {
+ // 鍥犱负鏄祵濂楀脊绐楁墍浠ユ墜鍔ㄥ叧闂瑿loneinnerVisible锛孋loneVisible涓や釜寮圭獥銆�
+ this.CloneinnerVisible = false;
+ this.CloneVisible = false;
+ this.$message.success("澶嶅埗鎴愬姛");
+ this.TemRefresh();
+ done(row);
+ })
+ .catch((error) => {
+ done(error);
+ });
},
//鍒锋柊
TemRefresh() {
@@ -1430,14 +1549,17 @@
this.Formlist = res.data.data.filter(item => {
return item.codeclassifyoid == this.nodeClickList.oid
})
- this.crudLCStatus=this.Formlist[this.selectRow].lcStatus;
+ this.crudLCStatus = this.Formlist[this.selectRow].lcStatus;
this.crudArray.push(this.Formlist[this.selectRow]);
- gridCodeClassifyTemplateAttr({'conditionMap[classifyTemplateOid]': res.data.data[this.selectRow].oid,limit:-1}).then(res => {
+ gridCodeClassifyTemplateAttr({
+ 'conditionMap[classifyTemplateOid]': res.data.data[this.selectRow].oid,
+ limit: -1
+ }).then(res => {
this.ProData = res.data.data;
//鍒嗙被娉ㄥ叆鏁版嵁鏍煎紡
- this.ProData = res.data.data.map((item) => {
+ this.ProData = res.data.data.map((item) => {
//濡傛灉鍒嗙被娉ㄥ叆classifyInvokeAttr涓虹┖璇存槑鏄垵濮嬬姸鎬�
- if(item.classifyInvokeAttr !== ''){
+ if (item.classifyInvokeAttr !== '') {
if (!item.hasOwnProperty('classifyInvokeText')) { // 妫�鏌lassifyInvokeText灞炴�ф槸鍚﹀瓨鍦�
item = {
...item,
@@ -1470,8 +1592,8 @@
type: "warning",
}).then(() => {
this.$set(row, this.upAndStopAndStartData[type]["load"], true)
- const { ts, oid } = row;
- this.upAndStopAndStartData[type]['funAPi']({ ts, oid }).then((res) => {
+ const {ts, oid} = row;
+ this.upAndStopAndStartData[type]['funAPi']({ts, oid}).then((res) => {
if (res.data.code === 200) {
this.$set(row, this.upAndStopAndStartData[type]["load"], false)
this.TemRefresh();
@@ -1489,15 +1611,18 @@
</script>
<style lang="scss" scoped>
-.el-container{
+.el-container {
height: 100%;
}
+
.el-aside {
height: calc(100% - 30px);
}
+
.el-main {
height: calc(100% - 30px);
}
+
.el-form {
display: flex;
flex-wrap: wrap; /* 璁剧疆鍙崲琛岋紝浠ヤ究鍦ㄥ皬灞忓箷璁惧涓婁娇鐢ㄥ琛屽竷灞� */
@@ -1517,3 +1642,6 @@
}
</style>
+/sa[pr
+[
+syulep
--
Gitblit v1.9.3