From e3410e9cdb22cfea4e46537d34db303612411e93 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期日, 21 五月 2023 23:22:45 +0800
Subject: [PATCH] 代码整合
---
Source/UBCS-WEB/src/views/code/code.vue | 34 ++++++++++++++++++++++------------
1 files changed, 22 insertions(+), 12 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/code/code.vue b/Source/UBCS-WEB/src/views/code/code.vue
index 3b01571..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>
@@ -647,8 +647,8 @@
<!-- 绗竴灞傚璇濇鐨勬寜閽拰锛岀嚎鏉� -->
<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>
<!-- 绗簩灞傚璇濇,灞炴�х爜娈碉紝灞炴�ч�夋嫨瀵硅瘽妗� -->
@@ -691,8 +691,8 @@
</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>
@@ -726,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>
@@ -752,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>
@@ -796,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 {
@@ -1117,7 +1117,12 @@
/* 寮曠敤鐮佹鍙傜収閰嶇疆,瀛愮粍浠跺～瀹屽弬鐓ч厤缃箣鍚庡唴瀹瑰洖鏄炬椂璋冪敤 */
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;
},
/** 涓哄弬鐓у紩鐢ㄧ殑涓氬姟绫诲瀷閫夊彇鍊硷紝绗簩灞傚祵濂楀璇濇锛屽強鍏剁浉鍏虫柟娉� */
@@ -2074,6 +2079,7 @@
},
// 鍗曞嚮缂栫爜瑙勫垯瀹炵幇琛岄�夋嫨
codeRuleRowClick (row) {
+ // 杩欏効搴旇鍙互涓嶈锛屽洜涓簍oggleRowSelection涔熶細瑙﹀彂琛岄�夋嫨鏃堕棿
this.selectionList = row;
this.$refs.crud.toggleSelection();
this.$refs.crud.setCurrentRow(row);
@@ -2380,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();
}
@@ -2397,6 +2406,7 @@
this.form.parentClassifySecOid = '';
}else if(condition === 'referBtmId'){
this.form.referBtmId = '';
+ this.form.referConfig = '';
}else if(condition === 'referConfig'){
this.form.referConfig = '';
}
@@ -2663,14 +2673,14 @@
.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%;
}
--
Gitblit v1.9.3