From d1b82bdc296e7bf882f50015a56c99b05b5ff9fd Mon Sep 17 00:00:00 2001 From: ludc Date: 星期一, 25 三月 2024 18:31:16 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue | 1483 ++++++++++++++++++++++++++++++----------------------------- 1 files changed, 754 insertions(+), 729 deletions(-) diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue index 581c486..fd939dc 100644 --- a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue +++ b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue @@ -2,53 +2,110 @@ <template> <el-container> <!-- 宸︿晶鑿滃崟--> - <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; 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> + <el-aside> + <basic-container> + <div ref="TreeBox" style="height: calc(100vh - 144px);!important;"> + <div class="headerCon" style="display: flex; flex-wrap: wrap;margin-bottom: 5px"> + <el-button v-if="permissionList.TreeAddStatus" plain size="small" type="primary" @click="TreeAdd">娣诲姞 + </el-button> + <el-button v-if="permissionList.TreeEditStatus" v-show="allButtons" plain size="small" type="primary" + @click="TreeEdit">淇敼 + </el-button> + <el-button v-if="permissionList.TreeDelStatus" v-show="allButtons" plain size="small" type="primary" + @click="TreeDel">鍒犻櫎 + </el-button> + <el-button v-if="permissionList.flushedStatus" v-show="allButtons" plain size="small" type="primary" + @click="flushed">鍒锋柊 + </el-button> + <el-button v-if="permissionList.EnableStatus" v-show="allButtons" plain size="small" type="primary" + @click="Enable">鍚敤 + </el-button> + <el-button v-if="permissionList.DeactivateStatus" v-show="allButtons" plain size="small" type="primary" + @click="Deactivate">鍋滅敤 + </el-button> + <el-button v-if="permissionList.ImportExcelStatus" v-show="allButtons" plain size="small" type="primary" + @click.native="ImportExcel">瀵煎叆 + </el-button> + <el-button v-if="permissionList.ExportExcelStatus" v-show="allButtons" plain size="small" type="primary" + @click="ExportExcel"> + 瀵煎嚭 + </el-button> + <el-button v-if="permissionList.flowingBtnStuatus" v-show="allButtons" plain + size="small" style="width: 56px;text-align: center;padding-left: 3px" type="primary" + @click="flowingDependHandler">娴佹按澶勭悊 + </el-button> + <el-button v-if="permissionList.classifyAuth" v-show="allButtons" plain size="small" + style="width: 56px;text-align: center;padding-left: 3px" type="primary" + @click="classifyAuthHandler">鍒嗙被鎺堟潈 + </el-button> + <el-button v-if="permissionList.classifyAuth" v-show="allButtons" plain size="small" + style="width: 56px;text-align: center;padding-left: 3px" type="primary" + @click="dataAuthHandler">鏁版嵁鎺堟潈 + </el-button> </div> - <div style="display: flex;justify-content: space-around;margin-top: 5px;margin-bottom: 5px"> + <!-- 宸︿晶鏍�--> + <div style="height: calc(100vh - 242px);overflow: auto"> + <avue-tree ref="tree" v-model="CloneTreeAvueform" v-loading="loading" :data="CloneTreedata" + :defaultExpandAll="false" + :option="Treeoption" + class="classifyTree" + @node-click="nodeClick" + > + <template slot-scope="{ node, data }" class="el-tree-node__label"> + <el-tooltip :content="$createElement('div', { domProps: { innerHTML: node.label } })" class="item" + effect="dark" + open-delay="500" + placement="right-start"> + <span style="font-size: 14px;"> + {{ (node || {}).label }} + </span> + </el-tooltip> + </template> + </avue-tree> </div> + </div> - <!-- 鏍戣妭鐐规坊鍔犲璇濇--> - <el-dialog :title="this.TreeFlag ? '娣诲姞鍒嗙被' :'娣诲姞涓婚搴�'" :before-close="TreeEscHandler" :visible.sync="TreeAddFormVisible" v-loading="AddLoading" append-to-body + <!-- 鏍戣妭鐐规坊鍔犲璇濇--> + <el-dialog v-loading="AddLoading" :before-close="TreeEscHandler" + :title="this.TreeFlag ? '娣诲姞鍒嗙被' :'娣诲姞涓婚搴�'" :visible.sync="TreeAddFormVisible" 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-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" style="display: inline-block" prop="name"> + <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 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 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-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-input v-model="TreeAddform.codeKeyAttrRepeatOidName" autocomplete="off" style="width: 585px" + @focus="Keyfouce"></el-input> + </el-form-item> + <el-form-item label="鏄惁鍙備笌鍏抽敭灞炴�ф牎楠岋細" label-width="170px"> + <el-switch + v-model="TreeAddform.codeKeyAttrValue" + active-color="#13ce66" + active-text="鏄�" + inactive-color="#ff4949" + inactive-text="鍚�" + @change="switchChange"> + </el-switch> </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-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"> @@ -56,81 +113,82 @@ <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> + <classifyTreeform ref="childForm" :Editclose=" ()=>{TreeEditFormVisible=false}" :TreeFlag="editTreeFLagCode" + :flag="'edit'" + :loneTreeNewForm="TreeEditObj" :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" - style="height: calc(100vh - 230px);" - @node-click="nodeClick" - class="classifyTree" - > - </avue-tree> - </div> + <!-- 鍒嗙被鎺堟潈瀵硅瘽妗�--> + <classify-auth-dialog + :TreeNode="TreeEditObj" + :classifyData="classifyData" + :visible.sync="classifyAuthVisible" + ></classify-auth-dialog> + <!-- 鏁版嵁鎺堟潈瀵硅瘽妗� --> + <data-auth-dialog + :TreeNode="TreeEditObj" + :classifyData="classifyData" + :visible.sync="dataAuthVisible" + ></data-auth-dialog> </basic-container> </el-aside> <el-main> - <basic-container style="height: calc(100vh - 150px);"> + <basic-container> <!-- 鍙充晶琛ㄦ牸--> <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="TreeEditObj" + :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"> - <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="CloneBtn">浠庡叾瀹冩ā鏉垮厠闅�</el-button> + <el-button v-if="permissionList.FindStatus" plain size="small" type="primary" + @click="FindeHanler">鏌ヨ</el-button> + <el-button v-if="permissionList.TemRefreshStatus" plain size="small" type="primary" + @click="TemRefresh">鍒锋柊</el-button> + <el-button v-if="permissionList.CloneBtnStuatus" plain size="small" type="primary" @click="CloneBtn">浠庡叾瀹冩ā鏉垮厠闅�</el-button> <!-- 鏌ヨ瀵硅瘽妗�--> - <el-dialog :visible.sync="FindFormVisible" append-to-body title="楂樼骇鏌ヨ"> - <div> - <el-button size="small" type="primary" @click="AdvQueries">鏌ヨ</el-button> - <el-button size="small" type="primary">閲嶇疆</el-button> - </div> - <div style="padding-left: 80px;margin-top: 15px;"> - <template v-for="(value, key) in FindSelect"> - <div style="display: flex; justify-content: space-around; width: 85%; margin-bottom: 15px"> - <el-select v-model="FindSelect[key]" placeholder="璇烽�夋嫨" style="width: 28%" - @change="handleSelectChange(key)"> - <el-option label="妯℃澘缂栧彿" value="0"></el-option> - <el-option label="妯℃澘鍚嶇О" value="1"></el-option> - <el-option label="妯℃澘鎻忚堪" value="2"></el-option> - <el-option label="鐗堟湰鍙�" value="3"></el-option> - <el-option label="鐘舵��" value="4"></el-option> - </el-select> - <el-select v-model="condition[0]" placeholder="璇烽�夋嫨" style="width: 15%"> - <el-option label="鍖呭惈" value="0"></el-option> - <el-option label="绛変簬" value="1"></el-option> - </el-select> - <el-input v-model="QueryArray[key]" style="width: 49%"></el-input> - <span> <i class="el-icon-delete" style="font-size: 22px;margin-top:8px;margin-left: 10px"/></span> + <el-dialog :visible.sync="FindFormVisible" append-to-body title="楂樼骇鏌ヨ" width="30%" @close="searchReset"> + <div style="text-align: center; margin-top: 5px;"> + <el-select v-model="searchSelect" style="width: 35%"> + <el-option v-for="item in crudFindTreeArray" :key="item.field" :label="item.title" + :value="item.queryField"></el-option> + </el-select> + <el-input v-model="SearchValue" + placeholder="璇疯緭鍏ュ叧閿瓧杩涜鏌ヨ" style="width: 45%; margin-left: 5px;"></el-input> </div> - </template> - </div> + <span slot="footer" class="dialog-footer"> + <el-button type="primary" @click="advQueries">鏌ヨ</el-button> + <el-button type="danger" @click="searchReset">閲嶇疆</el-button> + </span> </el-dialog> <!-- 妯℃澘鍏嬮殕 --> - <el-dialog :visible.sync="CloneVisible" append-to-body title="鍏嬮殕妯℃澘" :before-close="cloneClose"> + <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 ref="cloneTree" v-model="TreeAvueform" v-loading="loading" :data="Treedata" - :defaultExpandAll="false" - :option="Treeoption" - style="height: 50.5vh;margin-right: 10px" - @node-click="ClonenodeClick" + :defaultExpandAll="false" + :option="Treeoption" + style="height: 50.5vh;margin-right: 10px;width: 300px" + @node-click="ClonenodeClick" > </avue-tree> </el-aside> @@ -146,8 +204,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,179 +217,117 @@ </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="cloneClose" >鍙栨秷</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" :btnAuthList="btnAuthList" + :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> - <template> - <el-select v-model="SelectValue" placeholder="璇烽�夋嫨" style="width: 135px"> - <el-option - v-for="item in SelectOption" - :key="item.value" - :label="item.label" - :value="item.value" - 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> - </template> - <avue-crud :data="masterData" :option="masterOption" @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> - </div> - </el-dialog> + <ThemeChildren + ref="ThemeMasterChildren" + :SelectOption="SelectOption" + :TreeAddform="TreeAddform" + :visible.sync="MasterdialogVisible" + code-lcstatus="Released" + codeName="codeRuleOidName" + codeType="coderule" + dialogTitle="缂栫爜瑙勫垯" + @defineHandler="handlerDefine" + ></ThemeChildren> <!-- 鍏抽敭灞炴�ф煡璇㈣鍒�--> - <el-dialog :visible.sync="KeydialogVisible" title="涓恒�愬叧閿睘鎬ф煡璇㈣鍒欍�戦�夊彇鍊�" append-to-body> - <template> - <el-select v-model="SelectValue" placeholder="璇烽�夋嫨" style="width: 135px"> - <el-option - v-for="item in SelectOption" - :key="item.value" - :label="item.label" - :value="item.value" - 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> - </template> - <avue-crud :data="KeyData" :option="masterOption" @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> - </div> - </el-dialog> - <!-- 鐩镐技椤规煡璇㈣鍒�--> - <el-dialog :visible.sync="SimidialogVisible" title="涓恒�愮浉浼奸」鏌ヨ瑙勫垯銆戦�夊彇鍊�" append-to-body> - <template> - <el-select v-model="SelectValue" placeholder="璇烽�夋嫨" style="width: 135px"> - <el-option - v-for="item in SelectOption" - :key="item.value" - :label="item.label" - :value="item.value" - 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> - </template> - <avue-crud :data="simData" :option="masterOption" @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> - </div> - </el-dialog> -<!-- 涓氬姟绫诲瀷--> - <el-dialog :visible.sync="BtmdialogVisible" title="涓恒�愪笟鍔$被鍨嬭鍒欍�戦�夊彇鍊�" append-to-body> - <template> - <el-select v-model="SelectValue" placeholder="璇烽�夋嫨" style="width: 135px !important;"> - <el-option - v-for="item in SelectOption" - :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> - </template> - <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> - </div> - </el-dialog> -<!-- 瀵煎嚭--> - <ThemeImport :visible.sync="ThemeImportVisible" :codeClassifyOid="this.codeClassifyOid"></ThemeImport> + <ThemeChildren + ref="ThemeKeyChildren" + :SelectOption="SelectOption" + :TreeAddform="TreeAddform" + :visible.sync="KeydialogVisible" + code-lcstatus="Enabled" + codeName="codeKeyAttrRepeatOidName" + codeType="codekeyattrrepeat" + dialogTitle="鍏抽敭灞炴�ф煡璇㈣鍒�" + @defineHandler="handlerDefine" + ></ThemeChildren> + <!-- 鐩镐技椤规煡璇㈣鍒� --> + <ThemeChildren + ref="ThemeSimChildren" + :SelectOption="SelectOption" + :TreeAddform="TreeAddform" + :visible.sync="SimidialogVisible" + code-lcstatus="Enabled" + codeName="codeResembleRuleOidName" + codeType="coderesemblerule" + dialogTitle="鐩镐技椤规煡璇㈣鍒�" + @defineHandler="handlerDefine" + ></ThemeChildren> + <!-- 涓氬姟绫诲瀷 --> + <ThemeChildren + ref="ThemeBtmChildren" + :SelectOption="btmSelectOption" + :TreeAddform="TreeAddform" + :visible.sync="BtmdialogVisible" + codeName="btmTypeName" + codeType="btmCode" + dialogTitle="涓氬姟绫诲瀷" + @defineHandler="handlerDefine" + ></ThemeChildren> + <!-- 瀵煎嚭--> + <ThemeImport :codeClassifyOid="this.codeClassifyOid" :visible.sync="ThemeImportVisible"></ThemeImport> </basic-container> </el-main> </el-container> @@ -340,7 +338,6 @@ TreeSave, TreeDel, TreeCheckDel, - TreeObjcet, TreeEnable, TreeDeactivate, gridCodeClassifyTemplate, @@ -354,100 +351,106 @@ upVersion, stopLose, startRelease, - exportClassify + exportClassify, + flowingDependencyGen } from "@/api/template/templateAttr"; -import {defaultReferDataGrid,referDataGrid} from '@/api/MasterData/master' +import {defaultReferDataGrid, referDataGrid} from '@/api/MasterData/master' import func from "@/util/func"; +import {mapGetters} from "vuex"; +import ClassifyAuth from './ClassifyAuthDialog.vue'; +import {getAuthButtonList} from '@/api/system/classifyAuth' +import ThemeChildren from '@/components/FormTemplate/ThemeChildren' + export default { + components: {ClassifyAuth, ThemeChildren}, name: "classifyTrees.vue", - //浣跨敤inject鎺ユ敹鍙傛暟 - //Treeoption宸︿晶鏍戞柊澧炶〃鍗曢」 Treedata宸︿晶鏍戣妭鐐� 閰嶇疆椤� crudTreeOption鍙充晶琛ㄦ牸閰嶇疆椤� crudTreeData鍙充晶琛ㄦ牸鏄剧ず鍐呭 - //Treeform鍙充晶琛ㄥ崟閰嶇疆椤� - inject: ["crudTreeData"], data() { return { - masterRow:null, - AddLoading:false, + crudFindTreeArray: [ + { + title: '妯℃澘缂栧彿', + field: 'id', + fieldType: 'text', + queryField: 'id' + }, + { + title: '妯℃澘鍚嶇О', + field: 'name', + fieldType: 'text', + queryField: 'name' + }, + { + title: '妯℃澘鎻忚堪', + field: 'description', + fieldType: 'text', + queryField: 'description' + }, + { + title: '鐗堟湰鍙�', + field: 'revisionSeq', + fieldType: 'text', + queryField: 'revisionSeq' + }, + { + title: '鐘舵��', + field: 'lcStatusText', + fieldType: 'text', + queryField: 'lcStatusText' + }, + ], + searchSelect: 'id', + SearchValue: '', + allButtons: Boolean, + btnAuthList: [], + activeName: 'first', + masterRow: null, + AddLoading: false, // 瀹氫箟涓�涓彉閲忔潵淇濆瓨鏍戣姹傜殑鏁伴噺 - requestCount:null, + requestCount: null, //瀵煎叆鐘舵�佹 - ThemeImportVisible:false, - selectRow:'', - selectList:[], + ThemeImportVisible: false, + selectRow: '', + selectList: [], //鏍戣妭鐐规樉绀洪殣钘� - TreeFlagCode:true, + TreeFlagCode: true, //淇敼鑺傜偣鏄剧ず闅愯棌 - editTreeFLagCode:false, + editTreeFLagCode: false, //缂栫爜瑙勫垯 - MasterdialogVisible:false, - masterData:[], - masterSelectList:[], - masterName:"", - masterOid:"", - //鍏抽敭灞炴�tmTypeId - KeydialogVisible:false, - KeyName:"", - KeyOid:"", - KeyData:[], - KeySelectLIst:[], + MasterdialogVisible: false, + //鍏抽敭灞炴�� + KeydialogVisible: false, //鐩镐技椤� - simName:"", - simOid:"", - simData:[], - SimidialogVisible:false, - simSelectList:[], + SimidialogVisible: false, //涓氬姟绫诲瀷 - btmName:"", - btmOid:"", - BtmData:[], - BtmdialogVisible:false, - btmSelectList:[], - masterOption:{ - 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:[ + BtmdialogVisible: false, + SelectOption: [ + { + value: 'id', + label: '鑻辨枃鍚嶇О', + }, { value: 'name', label: '涓枃鍚嶇О' - }, + } + + ], + btmSelectOption: [ { value: 'id', - label: '鑻辨枃鍚嶇О' - } + label: '涓氬姟绫诲瀷缂栧彿' + }, + { + value: 'name', + label: '涓氬姟绫诲瀷鍚嶇О' + }, ], - SelectValue:"id", - SelectFInd:"", - addFlag:false, + addFlag: false, // 琛ㄦ牸褰撳墠琛宨d - crudOid:"", + crudOid: "", //褰撳墠閫変腑妯℃澘鐘舵�� - crudLCStatus:'', + crudLCStatus: '', //琛ㄦ牸褰撳墠閫夋嫨鏁扮粍 - crudArray:[], + crudArray: [], //妯℃澘灞炴�у睍绀哄唴瀹� ProData: [], //鍥炶溅閿悳绱㈢粦瀹氬�� @@ -455,12 +458,11 @@ searchCondition: 'id', findText: "", }, - //楂樼骇鏌ヨ瀵硅瘽妗� FindFormVisible: false, //鍏嬮殕妯℃澘瀵硅瘽妗� CloneVisible: false, - CloneinnerVisible:false, + CloneinnerVisible: false, //楂樼骇鏌ヨ涓嬫媺妗� FindSelect: { id: "0", @@ -487,9 +489,13 @@ TreeEditFormVisible: false, //娣诲姞瀵硅瘽妗� TreeAddFormVisible: false, + //鍒嗙被鎺堟潈瀵硅瘽妗� + classifyAuthVisible: false, + //鏁版嵁鎺堟潈瀵硅瘽妗� + dataAuthVisible: false, //褰撳墠鐐瑰嚮椤� nodeClickList: "", - ClonenodeClickList:"", + ClonenodeClickList: "", //鍒嗙被鍜屼富棰樺簱鐘舵�� TreeFlag: false, //鏍戝姞杞� @@ -506,33 +512,34 @@ //缂栫爜瑙勫垯 codeRuleOidName: "", //瀛樺偍鐨勪笟鍔$被鍨� - btmTypeName: "" + btmTypeName: "", + codeKeyAttrValue: true, + isParticipateCheck: 1 }, 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: { + height: 'auto', addBtn: false, editBtn: false, delBtn: false, defaultExpandAll: false, menu: false, - // //杩欎釜鏄閫� - // multiple: true, }, //妯℃澘绠$悊form crudForm: "", @@ -545,7 +552,7 @@ //鍏嬮殕妯℃澘涓嬫媺妗唙alue Clonevalue: "0", //鍏嬮殕妯℃澘鎼滅储杈撳叆妗� - CloneFind:"", + CloneFind: "", //鍏嬮殕妯℃澘涓嬫媺妗嗘暟鎹� CloneSelectOptions: [{ value: '0', @@ -557,19 +564,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: "璇疯緭鍏ユā鏉垮悕绉�", @@ -577,18 +584,19 @@ }] }, { - label:'鎻忚堪', - prop:'desc', - type:'textarea', - span:24 + label: '鎻忚堪', + prop: 'description', + type: 'textarea', + span: 24 } ] }, //鍏嬮殕妯℃澘鍙屽悜缁戝畾鏁版嵁 - CloneModel:[], - CloneSelect:[], + CloneModel: [], + CloneSelect: [], //鍏嬮殕妯℃澘option ClonecrudTreeOption: { + columnBtn: false, index: true, border: true, menu: false, @@ -657,7 +665,7 @@ } ], //浼犻�掔粰瀛愮粍浠跺姩鎬佹覆鏌撶殑鏁版嵁 - TreeList: {}, + TreeEditObj: {}, codeClassifyOid: "", upAndStopAndStartData: { upVersion: { @@ -680,35 +688,71 @@ } }, //妯℃澘绠$悊缂栬緫 - showEditBtn:false, + showEditBtn: false, + //浼犻�掔粰鍒嗙被鎺堟潈瀛愮粍浠跺璇濇鐨勫綋鍓嶉�変腑鐨勫垎绫昏妭鐐逛俊鎭� + classifyData: "", + } }, - watch:{ - - }, - //tab鏍忛粯璁ゆ槸琛ㄦ牸 + watch: {}, mounted() { - this.type = this.tabOption.column[0]; + this.type = this.tabOption.column[0] || {label: '鍩烘湰淇℃伅', prop: 'tab1'}; this.getAttr(); - const treeEle = this.$refs.tree.$el - treeEle.addEventListener('click', (e) => { - if (e.target.nodeName !== 'SPAN') { - this.$refs.tree.setCurrentKey(null) - this.nodeClickList = {} - this.TreeList=[] - this.TreeFlagCode=true; + // const treeEle = this.$refs.tree.$el; + const TreeBox = this.$refs.TreeBox; + // console.log(this.$refs.TreeBox) + // treeEle.addEventListener('click', (e) => { + // console.log('2') + // if (e.target.nodeName !== 'SPAN') { + // this.$refs.tree.setCurrentKey(null); + // this.nodeClickList = {}; + // this.TreeFlagCode = true; + // this.allButtons = false; + // } + // }, true) + TreeBox.addEventListener('click', (e) => { + if (e.target.nodeName !== 'SPAN' && e.target.nodeName !== 'BUTTON') { + this.$refs.tree.setCurrentKey(null); + this.nodeClickList = {}; + this.TreeFlagCode = true; + this.allButtons = false; } }, true) }, - computed:{ - crudTreeOption(){ - return{ + computed: { + ...mapGetters(["permission"]), + permissionList() { + return { + TreeAddStatus: this.vaildData(this.permission.classifyTree.tree_add, false), + TreeEditStatus: this.vaildData(this.btnAuthList.tree_edit, false), + TreeDelStatus: this.vaildData(this.btnAuthList.tree_delete, false), + flushedStatus: this.vaildData(this.btnAuthList.tree_break, false), + EnableStatus: this.vaildData(this.btnAuthList.tree_enable, false), + DeactivateStatus: this.vaildData(this.btnAuthList.tree_stop, false), + ImportExcelStatus: this.vaildData(this.btnAuthList.tree_import, false), + ExportExcelStatus: this.vaildData(this.btnAuthList.tree_export, false), + FindStatus: this.vaildData(this.btnAuthList.manage_search, false), + TemRefreshStatus: this.vaildData(this.btnAuthList.manage_break, false), + CloneBtnStuatus: this.vaildData(this.btnAuthList.manage_clone, false), + flowingBtnStuatus: this.vaildData(this.btnAuthList.tree_flowing, false), + classifyAuth: this.vaildData(this.btnAuthList.classify_auth, false), + } + }, + treeStyle() { + return { + height: this.allButtons ? '610px' : '690px', + }; + }, + crudTreeOption() { + return { index: true, border: true, - height:180, - addBtn:this.Formlist.length<=0 && this.nodeClickList != "", - editBtn:false, - delBtn:false, + columnBtn: false, + height: 150, + refreshBtn: false, + addBtn: this.Formlist.length <= 0 && this.nodeClickList != "", + editBtn: false, + delBtn: false, column: [ { label: '', @@ -736,17 +780,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: { @@ -755,257 +799,155 @@ codeClassifyOid: '' } } - } + }, }, created() { - }, methods: { + // 鍒嗙被鎺堟潈瀵硅瘽妗嗘墦寮� + classifyAuthHandler() { + if (this.nodeClickList.oid === '' || this.nodeClickList.oid === undefined) { + this.$message.warning('璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹紒') + return; + } + // this.classifyData = this.nodeClickList; + this.classifyAuthVisible = true; + }, + // 鏁版嵁鎺堟潈瀵硅瘽妗嗘墦寮� + dataAuthHandler() { + if (this.nodeClickList.oid === '' || this.nodeClickList.oid === undefined) { + this.$message.warning('璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹紒') + return; + } + // this.classifyData = this.nodeClickList; + this.dataAuthVisible = true; + }, + flowingDependHandler() { + if (this.nodeClickList.length <= 0) { + this.$message.warning('璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹紒') + return; + } + flowingDependencyGen(this.nodeClickList.oid).then(res => { + this.$message.success('鎿嶄綔鎴愬姛') + }).catch(res => { + this.$message.error(res) + }) + }, + // switch + switchChange() { + this.TreeAddform.isParticipateCheck = this.TreeAddform.codeKeyAttrValue === true ? 1 : 0; + }, // 鍏抽棴寮圭獥 - /** 瀵煎叆 */ - 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; - this.MasterdefaultRend() - }, - //缂栫爜澶氶�� - masterSelect(row){ - this.masterRow=row.$index; - this.masterSelectList=row; - this.masterName=row.name; - this.masterOid=row.oid; + //鏍戞柊澧炲弬鐓у瓙缁勪欢浜嬩欢 + handlerDefine(val) { + const codeTypeMap = { + coderule: { + nameKey: 'codeRuleOidName', + oidKey: 'codeRuleOid' + }, + codekeyattrrepeat: { + nameKey: 'codeKeyAttrRepeatOidName', + oidKey: 'codeKeyAttrRepeatOid' + }, + coderesemblerule: { + nameKey: 'codeResembleRuleOidName', + oidKey: 'codeResembleRuleOid' + }, + btmCode: { + nameKey: 'btmTypeName', + oidKey: 'btmTypeId', + clearValidate: true + } + }; - }, - //缂栫爜瑙勫垯鏌ヨ - SelectFindeHandler(){ - if(this.SelectValue == 'id'){ - const masterParameter={ - 'conditionMap[id]':this.SelectFInd + const codeType = codeTypeMap[val.codeType]; + if (codeType) { + if (codeType.clearValidate) { + this.$refs.myForm.clearValidate(); } - this.MasterdefaultRend(masterParameter); - }else if(this.SelectValue == 'name'){ - const masterParameter={ - 'conditionMap[name]':this.SelectFInd - } - this.MasterdefaultRend(masterParameter) + this.$set(this.TreeAddform, codeType.nameKey, val.crudName); + this.$set(this.TreeAddform, codeType.oidKey, val.crudOid); } }, - //缂栫爜瑙勫垯纭畾 - MasterHandlerClick(){ - if(this.masterSelectList.length>1){ - this.$message.warning('鍙兘閫夋嫨涓�鏉℃暟鎹�') - }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) - } + //缂栫爜瑙勫垯澶辩劍 + CodeFoucus() { + this.MasterdialogVisible = true; + this.$refs.ThemeMasterChildren.defaultSearchRend() }, - //缂栫爜鎺ュ彛 - MasterdefaultRend(){ - defaultReferDataGrid({ - referType:'coderule', - isMuti:'false', - 'conditionMap["lcstatus"]':'Released' - }).then(res=>{ - this.masterData=res.data.records; - }) + //鍏抽敭灞炴�уけ鐒� + Keyfouce() { + this.KeydialogVisible = true; + this.$refs.ThemeKeyChildren.defaultSearchRend(); }, - Keyfouce(){ - this.KeydialogVisible=true; - this.KeydefaultRend() - }, - //鍏抽敭灞炴�х‘瀹� - KeyHandlerClick(){ - if(this.KeySelectLIst.length>1){ - this.$message.warning('鍙兘閫夋嫨涓�鏉℃暟鎹�') - }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) - } - }, - //鍏抽敭灞炴�ф煡璇� - KeySelectFindeHandler(){ - if(this.SelectValue == 'id'){ - const masterParameter={ - 'conditionMap[id]':this.SelectFInd - } - this.KeydefaultRend(masterParameter); - }else if(this.SelectValue == 'name'){ - const masterParameter={ - 'conditionMap[name]':this.SelectFInd - } - this.KeydefaultRend(masterParameter) - } - }, - //鍏抽敭灞炴�ф帴鍙� - KeydefaultRend(){ - defaultReferDataGrid({ - referType:'codekeyattrrepeat', - isMuti:'false', - 'conditionMap["lcstatus"]':'Enabled' - }).then(res=>{ - this.KeyData=res.data.records; - }) - }, - // 鍏抽敭澶氶�� - KeySelect(row){ - this.masterRow=row.$index; - this.KeySelectLIst=row; - this.KeyName=row.name; - this.KeyOid=row.oid; - }, - //鍏抽敭澶辩劍 - simFouce(){ - this.SimidialogVisible=true; - this.simdefaultRend() - }, - //鐩镐技椤圭‘瀹� - simHandlerClick(){ - if(this.simSelectList.length>1){ - this.$message.warning('鍙兘閫夋嫨涓�鏉℃暟鎹�') - }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) - } - }, - //鐩镐技椤规煡璇� - SimSelectFindeHandler(){ - if(this.SelectValue == 'id'){ - const masterParameter={ - 'conditionMap[id]':this.SelectFInd - } - this.simdefaultRend(masterParameter); - }else if(this.SelectValue == 'name'){ - const masterParameter={ - 'conditionMap[name]':this.SelectFInd - } - this.simdefaultRend(masterParameter) - } - }, - // 鐩镐技椤瑰閫� - simSelect(row){ - this.masterRow=row.$index; - this.simSelectList=row; - this.simName=row.name; - this.simOid=row.oid; - }, - //鐩镐技椤归」鎺ュ彛 - simdefaultRend(){ - defaultReferDataGrid({ - referType:'coderesemblerule', - isMuti:'false', - 'conditionMap["lcstatus"]':'Enabled' - }).then(res=>{ - this.simData=res.data.records; - }) + //鐩镐技椤瑰け鐒� + simFouce() { + this.SimidialogVisible = true; + this.$refs.ThemeSimChildren.defaultSearchRend(); }, //涓氬姟绫诲瀷澶辩劍 - btmFoucus(){ - this.BtmdialogVisible=true; - this.btmdefaultRend() - }, - //涓氬姟绫诲瀷纭畾 - btmHandlerClick(){ - if(this.btmSelectList.length>1){ - this.$message.warning('鍙兘閫夋嫨涓�鏉℃暟鎹�') - }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) - } - }, - //涓氬姟绫诲瀷鏌ヨ - BtmSelectFindeHandler(){ - if(this.SelectValue == 'id'){ - const masterParameter={ - 'conditionMap[id]':this.SelectFInd - } - this.btmdefaultRend(masterParameter); - }else if(this.SelectValue == 'name'){ - const masterParameter={ - 'conditionMap[name]':this.SelectFInd - } - this.btmdefaultRend(masterParameter); - } - }, - //涓氬姟绫诲瀷澶氶�� - 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 - }) + btmFoucus() { + this.BtmdialogVisible = true; + this.$refs.ThemeBtmChildren.btmDefaultRend(); }, //瀛愪紶鐖� - MasterHandler(val){ - this.TreeList=val; + MasterHandler(val) { + this.TreeEditObj = 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() }, //鍒嗙被鏍戞暟鎹鐞� getAttr() { - getAtrrList().then(res => { - this.Treedata = res.data; - this.CloneTreedata = res.data; - this.Treedata.forEach(() => { - for (let i = 0; i < this.Treedata.length; i++) { - this.Treedata[i].value = i; - } - }) - //璋冪敤淇敼灞炴�у悕鏂规硶 - 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) - - }) + this.loading = true; + return new Promise((resolve, reject) => { + let conditionMaps = {}; + conditionMaps["conditionMap[authType]"] = "classify_auth"; + conditionMaps["conditionMap[buttonCode]"] = "classifyTree"; + // 鍒嗙被鎺堟潈涓槸鍚﹀叿澶囨煡鐪嬫潈闄� + conditionMaps["conditionMap[menuCode]"] = "classify_view"; + getAtrrList(conditionMaps) + .then(res => { + this.Treedata = res.data; + this.CloneTreedata = res.data; + this.Treedata.forEach(() => { + for (let i = 0; i < this.Treedata.length; i++) { + this.Treedata[i].value = i; + } + }) + //璋冪敤淇敼灞炴�у悕鏂规硶 + this.ModifyProperties(this.CloneTreedata, 'name', 'label'); + this.CloneTreedata = this.CloneTreedata.map(item => { + if (item.attributes.lcStatus === "Disabled") { + item.label += '銆愬仠鐢ㄣ��'; + } + return item; + }); + this.loading = false; + resolve(); // 瀹屾垚璇锋眰锛岃皟鐢╮esolve鏂规硶 + }) + .catch(error => { + this.$message.error(error) + reject(error); // 璇锋眰鍑洪敊锛岃皟鐢╮eject鏂规硶 + }); + }); }, //瀹氫箟涓�涓慨鏀规暟鎹睘鎬у悕鐨勬柟娉� ModifyProperties(obj, oldName, newName) { @@ -1029,7 +971,7 @@ }); try { //鏂板琛ㄥご鍚嶇О - this.TreeFlag=!this.nodeClickList + this.TreeFlag = !this.nodeClickList await new Promise(resolve => setTimeout(resolve, 500)); this.TreeAddFormVisible = true; loading.close(); @@ -1039,36 +981,45 @@ } }, //鏍戣妭鐐瑰彇娑堜簨浠� - TreeEscHandler(){ - this.TreeAddform={}; - this.TreeAddFormVisible=false + TreeEscHandler() { + for (let key in this.TreeAddform) { + if (key !== 'codeKeyAttrValue' && key !== 'isParticipateCheck') { + this.TreeAddform[key] = ""; + } + } + this.TreeAddform.codeKeyAttrValue = true; + this.TreeAddform.isParticipateCheck = 1; + 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: "娣诲姞鎴愬姛!", - }); - 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, - }); + async TreeAddHandler() { + if ((!this.TreeAddform.id || !this.TreeAddform.name) || (this.TreeFlagCode && !this.TreeAddform.btmTypeName)) { + this.$message.warning('璇疯緭鍏ュ唴瀹癸紒'); + return; + } + try { + const data = this.TreeAddform; + this.$set(data, "parentCodeClassifyOid", this.nodeClickList.oid); + await TreeSave(data) + this.$message.success("娣诲姞鎴愬姛!"); + Object.keys(this.TreeAddform).forEach(key => { + this.TreeAddform[key] = ""; }); + this.TreeAddform.codeKeyAttrValue = true; + this.TreeAddform.isParticipateCheck = 1; + this.getAttr(); + this.TreeAddFormVisible = false; + //娣诲姞瀹屾垚鍚庡彸渚ф竻绌� + this.ProData = []; + this.Formlist = []; + } catch (res) { + this.$message({ + type: "warning", + message: res, + }); + } }, //鏍戣妭鐐瑰垹闄ゆ寜閽� TreeDel() { @@ -1128,7 +1079,7 @@ }, //淇敼鍥炲~ TreeEdit() { - if ( Object.keys(this.nodeClickList).length<1) { + if (Object.keys(this.nodeClickList).length < 1) { this.$message({ type: 'warning', message: '璇峰厛浠庢爲涓婇�夋嫨涓�鏉℃暟鎹�!' @@ -1138,97 +1089,120 @@ } }, //鏍戝埛鏂� - flushed() { - this.loading = true - this.getAttr() - setTimeout(() => { - this.loading = false; - this.nodeClickList = "" - }, 600); + async flushed() { + await this.getAttr() + this.$refs.tree.setCurrentKey(null); + this.nodeClickList = {}; + this.TreeEditObj = {}; + this.TreeFlagCode = true; }, //鍚敤鍜屽仠鐢ㄩ兘鍏堝垽鏂姸鎬� //鍚敤 - Enable() { - if(Object.keys(this.nodeClickList).length<1){ - this.$message.warning('璇峰厛浠庢爲涓婇�夋嫨涓�鏉℃暟鎹�') - }else { - if (this.FlagObj.lcStatus == "Enabled") { - this.$message({ - type: 'warning', - message: '褰撳墠鍒嗙被涓嶆槸鍋滅敤鐘舵��' - }); - } else { - this.$confirm('鏄惁灏嗗瓙鍒嗙被涓�骞跺惎鐢紵', '鎻愮ず', { - confirmButtonText: '鏄�', - cancelButtonText: '鍙栨秷', - type: 'warning' - }).then(() => { - TreeEnable(this.nodeClickList).then(() => { - this.$message({ - type: 'success', - message: '鍚敤鎴愬姛!' - }); - this.getAttr() - }) - }).catch(() => { + async Enable() { + if (Object.keys(this.nodeClickList).length < 1) { + this.$message.warning('璇峰厛浠庢爲涓婇�夋嫨涓�鏉℃暟鎹�'); + return; + } + if (this.FlagObj.lcStatus == "Enabled") { + this.$message({ + type: 'warning', + message: '褰撳墠鍒嗙被涓嶆槸鍋滅敤鐘舵��' + }); + return; + } + this.loading = true; + try { + const confirmResult = await this.$confirm('鏄惁灏嗗瓙鍒嗙被涓�骞跺惎鐢紵', '鎻愮ず', { + confirmButtonText: '鏄�', + cancelButtonText: '鍙栨秷', + type: 'warning' + }); + if (confirmResult) { + await TreeEnable(this.nodeClickList).then(res => { this.$message({ - type: 'info', - message: '宸插彇娑堝惎鐢�' + type: 'success', + message: '鍚敤鎴愬姛!' }); + }) + await this.getAttr(); + + } else { + this.$message({ + type: 'info', + message: '宸插彇娑堝惎鐢�' }); } + } catch (error) { + // console.error(error); + } finally { + this.loading = false; } - }, - //鍋滅敤 - Deactivate() { - if(Object.keys(this.nodeClickList).length<1){ - this.$message.warning('璇峰厛浠庢爲涓婇�夋嫨涓�鏉℃暟鎹�') - }else { - if (this.FlagObj.lcStatus === "Disabled") { - this.$message({ - type: 'warning', - message: '褰撳墠鍒嗙被涓嶆槸鍚敤鐘舵��!' - }); - } else { - this.$confirm('鏄惁鍋滅敤褰撳墠鍒嗙被锛屽仠鐢ㄥ悗锛屽瓙鍒嗙被涔熷皢涓嶈兘琚娇鐢紝鏄惁缁х画锛�', '鎻愮ず', { - confirmButtonText: '纭畾', - cancelButtonText: '鍙栨秷', - type: 'warning' - }).then(() => { - TreeDeactivate(this.nodeClickList).then(() => { - this.$message({ - type: 'success', - message: '鍋滅敤鎴愬姛!' - }); - this.nodeClickList['flag'] = true; - this.getAttr() - }) - }).catch(() => { - this.$message({ - type: 'info', - message: '宸插彇娑堝仠鐢�' - }); - }); - } + async Deactivate() { + if (Object.keys(this.nodeClickList).length < 1) { + this.$message.warning('璇峰厛浠庢爲涓婇�夋嫨涓�鏉℃暟鎹�'); + return; } + if (this.FlagObj.lcStatus === "Disabled") { + this.$message({ + type: 'warning', + message: '褰撳墠鍒嗙被涓嶆槸鍚敤鐘舵��!' + }); + return; + } + + this.loading = true; + try { + const confirmResult = await this.$confirm('鏄惁鍋滅敤褰撳墠鍒嗙被锛屽仠鐢ㄥ悗锛屽瓙鍒嗙被涔熷皢涓嶈兘琚娇鐢紝鏄惁缁х画锛�', '鎻愮ず', { + confirmButtonText: '纭畾', + cancelButtonText: '鍙栨秷', + type: 'warning' + }); + if (confirmResult) { + await TreeDeactivate(this.nodeClickList).then(res => { + this.$message({ + type: 'success', + message: '鍋滅敤鎴愬姛!' + }); + }) + this.nodeClickList['flag'] = true; + await this.getAttr(); + } else { + this.$message({ + type: 'info', + message: '宸插彇娑堝仠鐢�' + }); + } + } catch (error) { + // console.error(error); + } finally { + this.loading = false; + } }, //鏍戠偣鍑讳簨浠� async nodeClick(data) { - console.log(data); + const response = this.findTheTopLevelNode(data, this.Treedata) + this.classifyData = response; + // console.log(response) + // console.log('response',response.attributes.id) + this.allButtons = true; + getAuthButtonList({classifyId: data.oid, code: "classifyTree", authType: "classify_auth"}).then(res => { + this.btnAuthList = res.data.data; + }).catch(error => { + console.log(error) + }) //鎿嶄綔鏂板鍜屼慨鏀圭殑涓氬姟绫诲瀷闅愯棌 this.TreeFlagCode = !data; this.editTreeFLagCode = !data.parentId; this.nodeClickList = data; this.selectRow = 0; - this.crudArray=[] + this.crudArray = [] try { this.requestCount += 1; - const [res1, res2, res3] = await Promise.all([ - TreeObjcet(data.oid), - gridCodeClassifyTemplate({ 'conditionMap[codeclassifyoid]': data.oid }), - getObjectByOid(data.oid) + const [res1, res2] = await Promise.all([ + getObjectByOid(data.oid), + gridCodeClassifyTemplate({'conditionMap[codeclassifyoid]': data.oid}), ]); this.FlagObj = res1.data.data; this.Formlist = res2.data.data.filter(item => { @@ -1244,17 +1218,49 @@ await this.gridCode(); } else { this.ProData = []; - this.crudOid='' + this.crudOid = '' } - this.TreeList = res3.data.data; + this.TreeEditObj = res1.data.data; + if (this.TreeEditObj.isParticipateCheck === null || this.TreeEditObj.isParticipateCheck === undefined || this.TreeEditObj.isParticipateCheck === "") { + this.$set(this.TreeEditObj, "isParticipateCheck", 1) + return + } } catch (error) { this.$message.error(error); } }, - + // 閫掑綊鏌ユ壘椤跺眰鑺傜偣Id + findTheTopLevelNode(data, TreeData) { + if (data.parentId === "") { + return data; + } + const parentNode = this.findParentNode(data.parentId, TreeData); + if (parentNode) { + return this.findTheTopLevelNode(parentNode, TreeData); // 缁х画鏌ユ壘鐖惰妭鐐� + } + }, + // 閫掑綊鏌ユ壘鍑烘潵澶氬眰鑺傜偣鐨勭埗鑺傜偣 + findParentNode(parentId, TreeData) { + for (const node of TreeData) { + if (node.oid === parentId) { + return node; + } + // 濡傛灉褰撳墠鑺傜偣杩樻湁瀛愯妭鐐癸紝缁х画鍘绘煡瀛愯妭鐐圭殑鐖惰妭鐐� + if (node.children) { + const parentNode = this.findParentNode(parentId, node.children); + if (parentNode) { + return parentNode; + } + } + } + return null; + }, 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')) { @@ -1273,20 +1279,20 @@ } }, treeClick(e) { - console.log(e); + // console.log(e); }, //鍩烘湰淇℃伅琛ㄥ崟鍒锋柊 - referTreeForm(){ - getObjectByOid(this.nodeClickList.oid).then(res => { - this.TreeList = res.data.data; + referTreeForm() { + getObjectByOid(this.nodeClickList.oid).then(res => { + this.TreeEditObj = 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 @@ -1299,36 +1305,30 @@ handleChange(column) { this.type = column; }, - AdvQueries() { - this.FindFormVisible = false - //濡傛灉鍏ㄩ儴涓虹┖ allEmpty涓簍rue - const allEmpty = Object.values(this.QueryArray).every(value => !value); - //濡傛灉鍏ㄩ儴涓虹┖锛岀偣鍑绘煡璇㈠嚭鐜版墍鏈夋暟鎹� - if (allEmpty) { - gridCodeClassifyTemplate().then(res => { - this.Formlist = res.data.data - }) + advQueries() { + if (this.SearchValue === "") { + this.$message.warning('璇疯緭鍏ヨ鏌ヨ鐨勫唴瀹癸紒'); } else { - //榛樿鏄瓑浜� - gridCodeClassifyFindTemplate({'conditionMap[id]': this.QueryArray.id}, - {'conditionMap[name]': this.QueryArray.name}, - {'conditionMap[description]': this.QueryArray.description}, - {'conditionMap[revisionValue]': this.QueryArray.revisionValue}, - {'conditionMap[lcStatus]': this.QueryArray.lcStatus} - ).then(res => { - this.Formlist = res.data.data - }) + const condition = { + 'conditionMap[codeclassifyoid]': this.nodeClickList.oid, + [`conditionMap[${this.searchSelect}]`]: this.SearchValue + }; + gridCodeClassifyFindTemplate(condition).then(res => { + if (res.data.data.length > 0) { + this.Formlist = res.data.data; + } else { + this.$message.error('鏆傛湭鏌ヨ鍒扮浉鍏虫ā鏉匡紒') + } + this.FindFormVisible = false; + }); } }, - //妯℃澘绠$悊娓叉煋 - CrudRend() { - gridCodeClassifyTemplate({'conditionMap[codeclassifyoid]': this.nodeClickList.oid}).then(res => { - this.Formlist = res.data.data - }) + searchReset() { + this.SearchValue = ""; + this.searchSelect = 'id' }, - //妯℃澘绠$悊琛ㄦ牸娣诲姞 - CrudRowSave(row,done) { + CrudRowSave(row, done) { if (this.nodeClickList.length <= 0) { this.$message({ type: 'warning', @@ -1352,7 +1352,7 @@ } }, //妯℃澘绠$悊淇敼 - CrudRowUpdata(row,index,done) { + CrudRowUpdata(row, index, done) { editSave(row).then(() => { this.TemRefresh(); this.$message({ @@ -1366,7 +1366,7 @@ }, //妯℃澘绠$悊鍒犻櫎 CrudRowDel(row) { - deleteData(row).then(()=> { + deleteData(row).then(() => { this.TemRefresh(); }).catch(res => { this.$message({ @@ -1376,68 +1376,65 @@ }) }, //鍏嬮殕鍙栨秷 - cloneClose(){ + cloneClose() { this.$refs.cloneTree.setCurrentKey(null) this.ClonenodeClickList = {} - this.CloneFormlist=[] - this.CloneVisible=false; + 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; - const { id, name } = row[0]; - this.CloneModel = { id, name }; + 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) { @@ -1465,14 +1462,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, @@ -1505,8 +1505,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(); @@ -1524,15 +1524,18 @@ </script> <style lang="scss" scoped> -.el-container{ - height: 100%; -} +//.el-container { +// height: 100%; +//} + .el-aside { - height: calc(100% - 30px); + //height: calc(100% - 30px); } + .el-main { height: calc(100% - 30px); } + .el-form { display: flex; flex-wrap: wrap; /* 璁剧疆鍙崲琛岋紝浠ヤ究鍦ㄥ皬灞忓箷璁惧涓婁娇鐢ㄥ琛屽竷灞� */ @@ -1551,4 +1554,26 @@ width: 500px; } +.headerCon { + .el-button + .el-button { + margin-left: 5px; + } + + .el-button { + margin-top: 5px; + } +} + +.headerCon > .el-button:nth-child(5) { + margin-left: 0; +} + +.headerCon > .el-button:nth-child(9) { + margin-left: 0; +} + +///deep/.el-scrollbar__bar.is-vertical{ +// width: 8px; +//} + </style> -- Gitblit v1.9.3