From 6b60c2a64224b82846426520acc3119936fee721 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期六, 26 八月 2023 13:59:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/code/code.vue | 65 ++++++++++++++++----------------
1 files changed, 32 insertions(+), 33 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/code/code.vue b/Source/UBCS-WEB/src/views/code/code.vue
index 4b9fec7..6c67d5b 100644
--- a/Source/UBCS-WEB/src/views/code/code.vue
+++ b/Source/UBCS-WEB/src/views/code/code.vue
@@ -130,11 +130,13 @@
append-to-body
:visible.sync="codeRangeSettingBox"
width="800px"
- style="height: 116vh; margin-top: -10vh;">
+ class="avue-dialog avue-dialog--top"
+ style="height: 100vh;" top="-3%">
<avue-crud
:option="dialogeOption"
:table-loading="dialogLoading"
:data="useRangeData"
+ style="margin-top:-40px"
@refresh-change="refreshUseRangeChange">
</avue-crud>
</el-dialog>
@@ -144,8 +146,9 @@
append-to-body
:visible.sync="cloneSettingBox"
width="800px"
- style="height: 120vh; margin-top: -14vh; overflow: hidden;">
- <div style="overflow-y: auto; height: 78vh">
+ class="avue-dialog avue-dialog--top"
+ style="height: 100vh;" top="-3%">
+ <div>
<el-row>
<el-form ref="form" :model="form" label-width="80px" :inline="true">
<el-form-item label="缂栧彿" required>
@@ -160,7 +163,7 @@
</el-form>
</el-row>
<el-row>
- <p style="margin: -3vh 0px 16px 50%; font-weight: 500; font-size: 16px; color: #000;">鐮佹绠＄悊</p>
+ <p style="margin: 0 0px 16px 50%; font-weight: 500; font-size: 20px; color: #000;">鐮佹绠＄悊</p>
<avue-crud
class="clone-avue-crud"
:option="cloneOption"
@@ -187,7 +190,7 @@
</avue-crud>
</el-row>
</div>
- <div slot="footer" class="dialog-footer" style="height: 50px; margin-top: -4vh;">
+ <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="saveCloneCodeRule">淇� 瀛�</el-button>
<el-button @click="cloneSettingBox = false">鍙� 娑�</el-button>
</div>
@@ -196,13 +199,14 @@
<!-- 缂栫爜瑙勫垯,浠庡叾浠栬鍒欏厠闅嗗璇濇 -->
<el-dialog title="鍏嬮殕缂栫爜瑙勫垯鐨勫熀纭�淇℃伅"
append-to-body
+ class="avue-dialog avue-dialog--top"
:visible.sync="cloneOtherCodeRuleSettingBox"
width="800px"
- style="height: 150vh; margin-top: -14vh;"
+ style="height: 100vh;" top="-3%"
destroy-on-close>
<div>
<el-row>
- <p style="margin-top: -12px; margin-bottom: 4px; font-weight: 570; font-size: 19px; color: #0e2d5f;">缂栫爜瑙勫垯</p>
+ <p style="margin-top: -20px; margin-bottom: 4px; font-weight: 570; font-size: 19px; color: #0e2d5f;">缂栫爜瑙勫垯</p>
<avue-crud
class="other-clone-coderule-crud"
:option="cloneCodeRuleOption"
@@ -216,8 +220,8 @@
@on-load="onLoad">
</avue-crud>
</el-row>
- <el-row>
- <p style="margin-top: -12px; margin-bottom: 4px; font-weight: 570; font-size: 19px; color: #0e2d5f;">鐮佹淇℃伅</p>
+ <el-row style="margin-top:10px;border-top: 1px solid #EBEEF5;">
+ <p style="margin-top: 10px; margin-bottom: 4px; font-weight: 570; font-size: 19px; color: #0e2d5f;">鐮佹淇℃伅</p>
<avue-crud
class="other-clone-codebasic-crud"
:option="cloneBasicOption"
@@ -229,7 +233,7 @@
</avue-crud>
</el-row>
</div>
- <div slot="footer" class="dialog-footer" style="height: 50px; margin-top: -4vh;">
+ <div slot="footer" class="dialog-footer" style="height: 50px;">
<el-button type="primary" @click="saveOtherCodeBasic">淇� 瀛�</el-button>
<el-button @click="cloneOtherCodeRuleSettingBox = false">鍙� 娑�</el-button>
</div>
@@ -352,7 +356,8 @@
:visible.sync="isShowBasicSecCodeValueMgr"
:width="isShowFixedForm ? '69vw':'50vw'"
append-to-body
- style="height: 116vh; margin-top: -10vh;"
+ class="avue-dialog avue-dialog--top"
+ style="height: 100vh;" top="-3%"
@close="clearFixedOrClassifyForm('close')"
destroy-on-close>
<!-- 鍒嗙被鐮佹鐮佸�肩鐞� -->
@@ -366,7 +371,7 @@
:data="classifyValueTreeData"
:option="classisyValueTreeOption"
@node-click="classisyValueTreeOnodeClick"
- style="overflow-y: auto; height: 54vh"/>
+ style=""/>
</div>
</basic-container>
</div>
@@ -401,7 +406,7 @@
<el-row v-show="isShowFixedForm">
<el-col :span="15">
<basic-container>
- <div class="box fixedbox" style="height:65vh; margin-bottom:-40px">
+ <div class="box fixedbox" style="height:63vh; margin-bottom:-40px">
<avue-crud
class="fixed-avue-crud"
ref="crudFixedValue"
@@ -417,15 +422,15 @@
</template>
</avue-crud>
</div>
- <div style="margin-top:20px;">
+ <div style="margin-top:10px;">
<el-button size="mini" type="primary" icon="el-icon-success" class="button" @click="saveCodeFixedOrClassifyValueOption('fixedValue')">淇濆瓨</el-button>
</div>
</basic-container>
</el-col>
<el-col :span="9">
<basic-container>
- <div class="box" style="height: 65vh; margin-bottom:-40px; overflow:hidden;" >
- <div style="overflow-y:auto;height: 60vh;">
+ <div class="box" style="height: 63vh; margin-bottom:-40px; overflow:hidden;" >
+ <div style="overflow-y:auto;height: 58vh;">
<el-form>
<el-form-item label="鐮佸��:" label-width="54px" required>
<el-input style="width: 19.5vw" v-model="codeFixdForm.id"></el-input>
@@ -436,7 +441,7 @@
</el-form>
</div>
</div>
- <div style="margin-top:20px; display: flex; align-items:center; justify-content:center;">
+ <div style="margin-top:10px; display: flex; align-items:center; justify-content:center;">
<el-button :disabled="selectedFixedOrCodeclassifyValue!=''" size="mini" type="primary" icon="el-icon-circle-plus" class="button" @click="addCodeSecValue('codefixedsec')">娣诲姞</el-button>
<el-button :disabled="selectedFixedOrCodeclassifyValue==''" size="mini" type="success" plain icon="el-icon-edit-outline" class="button" @click="editCodeSecValue('codefixedsec')">淇敼</el-button>
<el-button :disabled="selectedFixedOrCodeclassifyValue==''" size="mini" type="danger" icon="el-icon-close" class="button" @click="delCodeSecValue('codefixedsec')">鍒犻櫎</el-button>
@@ -452,14 +457,15 @@
:visible.sync="addBasicCodeSettingBox"
width="60vw"
append-to-body
- style="height: 115vh; margin-top: -13vh; overflow: hidden"
+ class="avue-dialog avue-dialog--top"
+ style="height: 100vh;" top="-3%"
destroy-on-close
lock-scroll
:close-on-click-modal="false"
@close="clearBasicAddForm">
<!-- 绗竴灞傚璇濇,娣诲姞鐮佹淇℃伅瀵硅瘽妗嗕腑鐨勫唴瀹� -->
- <div class="add-basicsec-total" style="overflow-y: auto; height: 70vh">
+ <div class="add-basicsec-total" style="overflow-y: auto; height: 58vh">
<el-form :model="form" class="add-basicsec-form">
<span class="left">
<el-form-item label="鐮佹缂栧彿:" :label-width="leftFormLabelWidth" required>
@@ -731,7 +737,8 @@
append-to-body
:visible.sync="isShowSelectAttrOption"
width="78%"
- style="height: 100%; margin-top: -8vh; overflow: hidden">
+ class="avue-dialog avue-dialog--top" top="-3%"
+ style="height: 100%;">
<div style="overflow-y: auto; height: 60vh">
<el-row>
<!-- 宸︿晶涓婚搴撳垎绫绘爲 -->
@@ -898,13 +905,15 @@
/*浣跨敤鑼冨洿瀵硅瘽妗嗛厤缃�*/
dialogeOption: {
height: 'auto',
- calcHeight: 30,
+ calcHeight: 150,
tip: false,
searchShow: false,
searchMenuSpan: 6,
border: true,
index: true,
disablePage:false,
+ refreshBtn:false,
+ columnBtn:false,
viewBtn: false,
addBtn: false,
menu: false,
@@ -1903,7 +1912,7 @@
return;
}
if(this.selectionList[0].lcStatus != 'Editing'){
- this.$message.warning("缂栫爜瑙勫垯宸茶寮曠敤锛屼笉鍏佽缂栬緫鎴栧垹闄�!");
+ this.$message.warning("缂栫爜瑙勫垯宸茶寮曠敤锛屼笉鍏佽缂栬緫!");
return;
}
this.cloneOtherCodeRuleSettingBox = true;
@@ -1954,7 +1963,6 @@
this.$message.warning("闇�瑕佸厠闅嗙殑缂栫爜瑙勫垯涓庤鍏嬮殕鐨勭紪鐮佽鍒欑浉鍚�!");
return;
}
- //console.log(res);
let oidArr = [];
fromDialogPkCodebasic.forEach(ele => {
oidArr.push(ele.oid);
@@ -2421,7 +2429,7 @@
/** 鍒ゆ柇鏁版嵁鏄惁閫夋嫨浠ュ強鍙兘閫夋嫨鍗曟潯鏁版嵁*/
tipsMessage(list){
if(list.length != 1){
- this.$message.warning("璇烽�夋嫨涓�鏉＄紪鐮佽鍒欐暟鎹�!");
+ this.$message.warning("璇烽�夋嫨涓�鏉℃暟鎹�!");
return false;
}
return true;
@@ -2485,7 +2493,6 @@
const data = res.data.data;
if(this.cloneSettingBox){
this.cloneData = data.records;
- // console.log(tihs.cloneData);
this.cloneTableLoading = false;
}else {
this.basicData = data.records;
@@ -2498,7 +2505,6 @@
selectionBasicChange(list) {
this.selectionBasicList = list;
this.$refs.crudBasic.setCurrentRow(this.selectionBasicList[list.length-1]);
- //console.log(this.selectionBasicList);
},
/** 鍩虹鐮佹琚崟鍑昏〃鏍艰鏃惰Е鍙�*/
codeBasicSecRowClick(row){
@@ -2508,7 +2514,6 @@
this.$refs.crudBasic.toggleRowSelection(row); //閫変腑褰撳墠琛�
},
basicSearchChange(params, done){
- //console.log(this.$refs.crudBasic);
this.sendGridCodeBasicSec(Object.assign(params,{"pkCodeRule":this.selectionList[this.selectionList.length-1].oid}),false);
done();
},
@@ -2542,7 +2547,6 @@
return;
}
let codeRuleOid = this.selectionList[0].oid;
- //console.log(this.selectionList);
if (this.selectionList[0].lcStatus != 'Editing') {
this.$message.warning("鍙湁缂栫爜瑙勫垯鐨勭姸鎬佹槸 [缂栬緫涓璢 鐨勬椂鍊欙紝鎵嶈兘璋冩暣鐮佹椤哄簭!");
return;
@@ -2832,10 +2836,6 @@
margin-bottom: -15px;
}
- .code-rule-crud > .avue-crud__pagination {
- padding: 14px 0 2px 20px;
- }
-
.clone-input-textarea > .el-form-item__content {
width: 495px;
}
@@ -2907,7 +2907,6 @@
/** 鏂板鐮佹 */
.add-basicsec-total {
width: 100%;
- padding: 20px 0 0 0;
}
.add-basicsec-total .el-input__inner,.add-basicsec-total .el-textarea__inner {
--
Gitblit v1.9.3