From 13b22edeb1c60505be93e7af1903f7c5e00bbc6d Mon Sep 17 00:00:00 2001 From: yuxc <653031404@qq.com> Date: 星期一, 22 五月 2023 18:08:30 +0800 Subject: [PATCH] 对使用分类的主键获取表单的定义、根据模板的主键获取表格的定义、标记流程中业务数据是否通过、使用分类的主键获取业务数据等接口的移植工作,其中对以前查询平台数据的方式使用的QueryWrapper实现数据的查询 --- Source/UBCS-WEB/src/views/code/code.vue | 57 +++++++++++++++++++++++++++++++++------------------------ 1 files changed, 33 insertions(+), 24 deletions(-) diff --git a/Source/UBCS-WEB/src/views/code/code.vue b/Source/UBCS-WEB/src/views/code/code.vue index b30a4e4..059b848 100644 --- a/Source/UBCS-WEB/src/views/code/code.vue +++ b/Source/UBCS-WEB/src/views/code/code.vue @@ -1,5 +1,5 @@ <template> - <basic-container style="height: 350px;"> + <basic-container style="height: 100%;"> <!-- 缂栫爜瑙勫垯淇℃伅灞曠ず鍖哄煙 --> <basic-container class="code-rule-container"> @@ -149,8 +149,8 @@ </el-row> </div> <div slot="footer" class="dialog-footer" style="height: 50px; margin-top: -4vh;"> - <el-button @click="cloneSettingBox = false">鍙� 娑�</el-button> <el-button type="primary" @click="saveCloneCodeRule">淇� 瀛�</el-button> + <el-button @click="cloneSettingBox = false">鍙� 娑�</el-button> </div> </el-dialog> <!-- 缂栫爜瑙勫垯,浠庡叾浠栬鍒欏厠闅嗗璇濇 --> @@ -190,8 +190,8 @@ </el-row> </div> <div slot="footer" class="dialog-footer" style="height: 50px; margin-top: -4vh;"> - <el-button @click="cloneOtherCodeRuleSettingBox = false">鍙� 娑�</el-button> <el-button type="primary" @click="saveOtherCodeBasic">淇� 瀛�</el-button> + <el-button @click="cloneOtherCodeRuleSettingBox = false">鍙� 娑�</el-button> </div> </el-dialog> @@ -645,10 +645,10 @@ </el-form> </div> <!-- 绗竴灞傚璇濇鐨勬寜閽拰锛岀嚎鏉� --> - <el-divider direction="horizontal"></el-divider> + <el-divider class="horizontal-line" direction="horizontal"></el-divider> <div slot="footer" class="dialog-footer"> - <el-button @click="addBasicCodeSettingBox = false" v-show="showbtn">鍙� 娑�</el-button> <el-button type="primary" @click="saveOrEditBasicCode" v-show="showbtn">淇� 瀛�</el-button> + <el-button @click="addBasicCodeSettingBox = false" v-show="showbtn">鍙� 娑�</el-button> </div> <!-- 绗簩灞傚璇濇,灞炴�х爜娈碉紝灞炴�ч�夋嫨瀵硅瘽妗� --> @@ -664,7 +664,7 @@ <div class="box"> <el-scrollbar style="height: auto; border-bottom-right-radius:8px "> <basic-container> - <div class="abox"> + <div class="treeBox"> <avue-tree :data="attrClassifyTreeData" :option="treeOption" @node-click="nodeClick"/> </div> </basic-container> @@ -691,10 +691,9 @@ </el-row> </div> <div slot="footer" class="dialog-footer"> - <el-button @click="isShowSelectAttrOption = false">鍙� 娑�</el-button> <el-button type="primary" @click="selectedListClassifyLinkAttr">纭� 瀹�</el-button> + <el-button @click="isShowSelectAttrOption = false">鍙� 娑�</el-button> </div> - </el-dialog> <!-- 绗簩灞傚璇濇,灞炴�х爜娈碉紝鍏紡缂栬緫妗嗗璇濇缁勪欢 --> @@ -727,8 +726,8 @@ @on-load="parentClassifyOnLoad"> </avue-crud> <div slot="footer" class="dialog-footer"> - <el-button @click="isShowParentClassifyOption = false">鍙� 娑�</el-button> <el-button type="primary" @click="saveSelectedParentClassify">淇� 瀛�</el-button> + <el-button @click="isShowParentClassifyOption = false">鍙� 娑�</el-button> </div> </el-dialog> @@ -753,8 +752,8 @@ @row-click="referBtmRowClick"> </avue-crud> <div slot="footer" class="dialog-footer"> - <el-button @click="isShowSelectReferBtmOption = false">鍙� 娑�</el-button> <el-button type="primary" @click="saveSelectedreferBtm">淇� 瀛�</el-button> + <el-button @click="isShowSelectReferBtmOption = false">鍙� 娑�</el-button> </div> </el-dialog> @@ -797,7 +796,7 @@ import referBtmOption from "@/const/code/referBtmDialog"; import fixedValueOption from "@/const/code/fixedValueMgrDialog"; import {mapGetters} from "vuex"; - + import func from "@/util/func"; export default { data() { return { @@ -1116,9 +1115,14 @@ this.form.getValueClass = content; }, - /* 鍙傜収閰嶇疆,瀛愮粍浠跺~瀹屽弬鐓ч厤缃箣鍚庡唴瀹瑰洖鏄炬椂璋冪敤 */ + /* 寮曠敤鐮佹鍙傜収閰嶇疆,瀛愮粍浠跺~瀹屽弬鐓ч厤缃箣鍚庡唴瀹瑰洖鏄炬椂璋冪敤 */ echoReferConfig(content){ - this.form.referConfig = content; + this.form.referBtmId = content.referType; + this.form.referBtmName = content.referTypeName; + //console.log(content); + //杞崲鎴怞SON瀛楃涓茶繘琛岀埗缁勪欢鍥炴樉 + let submitFormJson = JSON.stringify(content); + this.form.referConfig = submitFormJson; }, /** 涓哄弬鐓у紩鐢ㄧ殑涓氬姟绫诲瀷閫夊彇鍊硷紝绗簩灞傚祵濂楀璇濇锛屽強鍏剁浉鍏虫柟娉� */ @@ -2075,6 +2079,7 @@ }, // 鍗曞嚮缂栫爜瑙勫垯瀹炵幇琛岄�夋嫨 codeRuleRowClick (row) { + // 杩欏効搴旇鍙互涓嶈锛屽洜涓簍oggleRowSelection涔熶細瑙﹀彂琛岄�夋嫨鏃堕棿 this.selectionList = row; this.$refs.crud.toggleSelection(); this.$refs.crud.setCurrentRow(row); @@ -2381,6 +2386,9 @@ this.refreshReferBtmDataChange(); }else if(condition === 'referConfig'){ this.$refs.referConfigDialog.isShowReferConfig = true; + if(func.notEmpty(this.form.referConfig)){ + this.$refs.referConfigDialog.initPageData(this.form.referConfig); + } //琛ㄦ牸閿欒鐨勯棶棰樻墍 this.$refs.referConfigDialog.onloadAttrData(); } @@ -2398,8 +2406,9 @@ this.form.parentClassifySecOid = ''; }else if(condition === 'referBtmId'){ this.form.referBtmId = ''; + this.form.referConfig = ''; }else if(condition === 'referConfig'){ - this.form.referBtmId = ''; + this.form.referConfig = ''; } }, // 琛ヤ綅鏃剁殑瀛楃锛屽疄鐜板彲杈撳彲閫� @@ -2566,7 +2575,7 @@ </script> -<style scope> +<style> .code-rule-crud > .avue-crud__search ,.code-basic-crud > .avue-crud__search { margin-bottom: -15px; @@ -2612,14 +2621,14 @@ padding: 1px 6px; } - .el-divider--horizontal { + .horizontal-line { /* margin-top: 19px !important; */ margin-bottom: -20px !important; width: 100%; height: 2px; } - .el-card__body > .abox { + .el-card__body > .treeBox { height: 50vh; } @@ -2631,11 +2640,11 @@ width:60px; } - .el-input-number { + .left > .el-form-item > .el-form-item__content > .el-input-number { width: 120px; } - .el-input-number >.el-input > .el-input__inner { + .left > .el-form-item > .el-form-item__content > .el-input-number > .el-input > .el-input__inner { width:120px; } @@ -2662,16 +2671,16 @@ justify-content: space-around; } - .el-divider--vertical { + .add-basicsec-form > .el-divider--vertical { width: 2px; - height: 72%; + height: 100%; margin: 0 auto; - position: fixed; + /* position: fixed; */ } .left { /* float: left; */ - width: 49%; + width: 45%; height: 100%; } @@ -2690,6 +2699,6 @@ /* width: 100%; */ border-top: 1px solid #E9E7E7; padding: 5px 10px 10px; - } + } </style> \ No newline at end of file -- Gitblit v1.9.3