From b3200f2284692b1c5cad8847243a76770400b7c1 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期五, 25 八月 2023 22:41:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/code/code.vue | 192 ++++++++++++++++++++++++++++-------------------
1 files changed, 115 insertions(+), 77 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/code/code.vue b/Source/UBCS-WEB/src/views/code/code.vue
index b7734a3..6c67d5b 100644
--- a/Source/UBCS-WEB/src/views/code/code.vue
+++ b/Source/UBCS-WEB/src/views/code/code.vue
@@ -106,6 +106,13 @@
@click="escapeOwner">
杞Щ鎵�鏈夎��
</el-button>
+ <el-button
+ size="small"
+ icon="el-icon-guide"
+ plain
+ @click="maxSerialNum">
+ 鏈�澶ф祦姘村彿
+ </el-button>
</template>
</avue-crud>
</basic-container>
@@ -123,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>
@@ -137,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>
@@ -153,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"
@@ -180,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>
@@ -189,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"
@@ -209,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"
@@ -222,12 +233,12 @@
</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>
</el-dialog>
-
+
<!-- 缂栫爜瑙勫垯,杞Щ鎵�鏈夎�呭璇濇 -->
<el-dialog
:visible.sync="escapeOwnerVisible"
@@ -248,6 +259,9 @@
<el-button type="primary" @click="escapeOwnerConfirm">纭� 瀹�</el-button>
</span>
</el-dialog>
+
+ <!-- 鏈�澶ф祦姘村彿瀵硅瘽妗� -->
+ <max-serialnum-dialog :visible.sync="maxSerial.visible" :ruleOid="maxSerial.ruleOid"></max-serialnum-dialog>
<!-- 鍩虹鐮佹灞曠ず鍖哄煙 -->
<basic-container class="code-basicsec-container">
@@ -340,27 +354,26 @@
<!-- 鐮佹鐮佸�肩鐞嗗璇濇 -->
<el-dialog title="鐮佹鐮佸�肩鐞�"
:visible.sync="isShowBasicSecCodeValueMgr"
- :width="isShowFixedForm ? '68vw':'50vw'"
+ :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>
<!-- 鍒嗙被鐮佹鐮佸�肩鐞� -->
<el-row v-show="!isShowFixedForm">
<el-col :span="11">
<basic-container>
- <div class="box classify_value_box" style="height:65vh; margin-bottom:-40px">
- <el-scrollbar style="border-bottom-right-radius:8px ">
+ <div class="box classify_value_box" style="height:60vh; margin-bottom:-40px">
<basic-container>
<div class="abox" style="height:54vh">
<avue-tree
:data="classifyValueTreeData"
:option="classisyValueTreeOption"
@node-click="classisyValueTreeOnodeClick"
- style="overflow-y: auto; height: 54vh"/>
+ style=""/>
</div>
</basic-container>
- </el-scrollbar>
</div>
<div style="margin-top:20px; display: flex; align-items:center; justify-content:center;">
<el-button size="mini" type="primary" icon="el-icon-arrow-up" class="button" @click="codeClassifyValueOpetion('up')">涓婄Щ</el-button>
@@ -370,7 +383,7 @@
</el-col>
<el-col :span="13">
<basic-container>
- <div class="box" style="height:65vh; margin-bottom:-40px">
+ <div class="box" style="height:60vh; margin-bottom:-40px">
<el-form>
<el-form-item label="鐮佸��:" :label-width="50" required>
<el-input style="width: 18vw" v-model="codeClassifyForm.id"></el-input>
@@ -393,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"
@@ -409,26 +422,26 @@
</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>
</el-form-item >
- <el-form-item label="鎻忚堪:">
- <el-input type="textarea" style="width: 20vw;" v-model="codeFixdForm.description"></el-input>
+ <el-form-item label="鎻忚堪:" label-width="54px">
+ <el-input type="textarea" style="width: 19.5vw;" v-model="codeFixdForm.description"></el-input>
</el-form-item>
</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>
@@ -444,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>
@@ -723,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>
<!-- 宸︿晶涓婚搴撳垎绫绘爲 -->
@@ -767,7 +782,6 @@
<formula-editor
ref="formulaEditor"
@updateFormulaContent="updateFormulaContent"
- :componentRuleText="form.getValueClass"
:visible.sync="formulaEditorParams.formulaEditorSettingBox"
:thisSceneTableData="formulaEditorParams.thisSceneTableData"
:systemVariableTableData="formulaEditorParams.systemVariableTableData">
@@ -838,6 +852,7 @@
import fixedValueOption from "@/const/code/fixedValueMgrDialog";
import {mapGetters} from "vuex";
import {getByRoleUserList} from "@/api/system/user";
+ import func from "@/util/func";
export default {
data() {
@@ -876,7 +891,13 @@
ruleAdminUserList: [], //瑙勫垯绠＄悊鍛樺垪琛�
ruleOwner: '', // 褰撳墠瑕佽浆绉荤粰鍝釜瑙勫垯绠＄悊鍛樼殑ID
releadDisabled: false, // 閬垮厤瑙勫垯鍙戝竷閲嶅鎻愪氦
-
+
+ /*鏈�澶ф祦姘村彿*/
+ maxSerial:{
+ visible:false,
+
+ },
+
/*浣跨敤鑼冨洿瀵硅瘽妗嗘樉绀烘帶鍒�*/
codeRangeSettingBox: false,
useRangeData: [],
@@ -884,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,
@@ -1245,7 +1268,7 @@
parentClsParam.classifyDialogLoading = true;
let oid = this.selectionList.length==0 ? this.form.pkCodeRule:this.selectionList[0].oid;
let conditionMaps = {};
-
+
conditionMaps['conditionMap[pkCodeRule]'] = oid;
conditionMaps['conditionMap[oid_notequal]'] = this.form.oid;
refDataGridClassifySec(
@@ -1505,7 +1528,7 @@
}else{
if(this.checkClassUpdate(this.codefixedsecOrCodeclassifysec.oid,this.codeClassifyForm.codeClassifySecOid)){
return;
- }
+ }
//鍒嗙被鐮佹鐮佸�煎垹闄�
this.$confirm("鏄惁鍒犻櫎杩欐潯鏁版嵁锛熷鏋滆寮曠敤灏嗕笉鑳借鍒犻櫎锛�", {
confirmButtonText: "纭畾",
@@ -1567,7 +1590,7 @@
codeClassifyValueOpetion(condition){
if(this.checkClassUpdate(this.codefixedsecOrCodeclassifysec.oid,this.codeClassifyForm.codeClassifySecOid)){
return;
- }
+ }
//姝ゅ娑夊強鍒版繁娴呮嫹璐濋棶棰橈紝浣嗘槸鎵ц涓婁笅绉讳繚瀛樻搷浣滀箣鍚庝細閲嶆柊鍔犺浇treedata锛屾墍浠ュ奖鍝嶄笉澶�
let currentTreeList = this.getCodeClassifyValueTreeData();
let saveData = [];
@@ -1813,28 +1836,33 @@
},
/** 鍙戝竷缂栫爜瑙勫垯 */
async enableOrDeactivatse(oid,update){
- // 閬垮厤鐢ㄦ埛閲嶅鐐瑰嚮鎸夐挳
- this.releadDisabled = true;
- await checkLikeCodeRule(oid).then(res => {
- if(res.data.success){
- this.updateStatus(oid,update);
- }else{
- this.$confirm('test', '鎻愮ず', {
- distinguishCancelAndClose: true,
- confirmButtonText: '缁х画鍙戝竷',
- cancelButtonText: '鍙栨秷'
- }).then(() => {
- //this.updateStatus();
- })
- .catch(action => {
- this.$message({
- type: 'info',
- message: '鍙栨秷鍙戝竷!',
+ if(update==="release"){
+ // 閬垮厤鐢ㄦ埛閲嶅鐐瑰嚮鎸夐挳
+ this.releadDisabled = true;
+ await checkLikeCodeRule(oid).then(res => {
+ //console.log(res)
+ if(res.data.success){
+ this.updateStatus(oid,update);
+ }else{
+ this.$confirm(res.data.msg, '鎻愮ず', {
+ distinguishCancelAndClose: true,
+ confirmButtonText: '缁х画鍙戝竷',
+ cancelButtonText: '鍙栨秷'
+ }).then(() => {
+ this.updateStatus(oid,update);
})
- });
- }
- })
- this.releadDisabled = false;
+ .catch(action => {
+ this.$message({
+ type: 'info',
+ message: '鍙栨秷鍙戝竷!',
+ })
+ });
+ }
+ })
+ this.releadDisabled = false;
+ }else {
+ this.updateStatus(oid,update);
+ }
},
/** 鎵撳紑缂栫爜瑙勫垯鍏嬮殕瀵硅瘽妗�*/
openCodeRuleDialog() {
@@ -1884,7 +1912,7 @@
return;
}
if(this.selectionList[0].lcStatus != 'Editing'){
- this.$message.warning("缂栫爜瑙勫垯宸茶寮曠敤锛屼笉鍏佽缂栬緫鎴栧垹闄�!");
+ this.$message.warning("缂栫爜瑙勫垯宸茶寮曠敤锛屼笉鍏佽缂栬緫!");
return;
}
this.cloneOtherCodeRuleSettingBox = true;
@@ -1935,7 +1963,6 @@
this.$message.warning("闇�瑕佸厠闅嗙殑缂栫爜瑙勫垯涓庤鍏嬮殕鐨勭紪鐮佽鍒欑浉鍚�!");
return;
}
- //console.log(res);
let oidArr = [];
fromDialogPkCodebasic.forEach(ele => {
oidArr.push(ele.oid);
@@ -2402,7 +2429,7 @@
/** 鍒ゆ柇鏁版嵁鏄惁閫夋嫨浠ュ強鍙兘閫夋嫨鍗曟潯鏁版嵁*/
tipsMessage(list){
if(list.length != 1){
- this.$message.warning("璇烽�夋嫨涓�鏉＄紪鐮佽鍒欐暟鎹�!");
+ this.$message.warning("璇烽�夋嫨涓�鏉℃暟鎹�!");
return false;
}
return true;
@@ -2466,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;
@@ -2479,7 +2505,6 @@
selectionBasicChange(list) {
this.selectionBasicList = list;
this.$refs.crudBasic.setCurrentRow(this.selectionBasicList[list.length-1]);
- //console.log(this.selectionBasicList);
},
/** 鍩虹鐮佹琚崟鍑昏〃鏍艰鏃惰Е鍙�*/
codeBasicSecRowClick(row){
@@ -2489,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();
},
@@ -2523,7 +2547,6 @@
return;
}
let codeRuleOid = this.selectionList[0].oid;
- //console.log(this.selectionList);
if (this.selectionList[0].lcStatus != 'Editing') {
this.$message.warning("鍙湁缂栫爜瑙勫垯鐨勭姸鎬佹槸 [缂栬緫涓璢 鐨勬椂鍊欙紝鎵嶈兘璋冩暣鐮佹椤哄簭!");
return;
@@ -2572,6 +2595,7 @@
this.loadlistClassifyLinkAttr();
}else if(condition === 'value'){
//鎵撳紑鍏紡缂栬緫妗嗭紝绗簩灞傚祵濂楀璇濇
+ //this.$refs.formulaEditor.isShowformulaEdit = true;
this.formulaEditorParams.formulaEditorSettingBox = true;
}else if(condition === 'parentClassifySecOid'){
this.parentClsfyParams.isShowParentClassifySettingBox = true;
@@ -2618,7 +2642,7 @@
/** 鐮佹绫诲瀷鏀瑰彉鏃讹紝澧炲姞瀵瑰簲鐨刦orm琛ㄥ崟涓殑灞炴��*/
changeSectypeFormItems(row){
//console.log(row);
- if(this.enumParam.secTypeList.length==0){
+ if(func.isEmpty(this.enumParam.secTypeList) || this.enumParam.secTypeList.length==0){
this.loadCodeSecType();
}
if(row != null){
@@ -2754,47 +2778,62 @@
},
/** 鏋氫妇鍜屽彲杈撳彲閫夊唴瀹规煡璇� */
loadCodeSecType(){
- this.enumParam.secTypeList = this.getLocalStorageEnum("codeSecType");
+ let enumList = this.getLocalStorageEnum("codeSecType");
+ this.enumParam.secTypeList = enumList.length>0 ? enumList:[];
+ console.log(this.enumParam.secTypeList);
this.loadCodeSecLength();
},
loadCodeSecLength(){
- this.enumParam.codeSecLengthType = this.getLocalStorageEnum("codeSecLength");
+ let enumList = this.getLocalStorageEnum("codeSecLength");
+ this.enumParam.codeSecLengthType = enumList.length>0 ? enumList:[];
},
loadCodeFillType(){
- this.enumParam.codeFillType = this.getLocalStorageEnum("codeFillType");
+ let enumList = this.getLocalStorageEnum("codeFillType");
+ this.enumParam.codeFillType = enumList.length>0 ? enumList:[];
},
loadCodeFillSeparator(){
let enumCach = JSON.parse(localStorage.getItem("codeFillSeparator"));
if(enumCach == null) {
getDictionary("codeFillSeparator").then(res=>{
this.enumParam.codeFillSeparator = res.data.data;
- localStorage.setItem("codeFillSeparator",JSON.stringify(res.data.data));
+ localStorage.setItem('codeFillSeparator',JSON.stringify(res.data.data));
})
}
},
loadCodeLevelType(){
- this.enumParam.codeLevelType = this.getLocalStorageEnum("codeLevelType");
+ let enumList = this.getLocalStorageEnum("codeLevelType");
+ this.enumParam.codeLevelType = enumList.length>0 ? enumList:[];
},
loadCodeCutType(){
- this.enumParam.codeCutType = this.getLocalStorageEnum("codeCutType");
+ let enumList = this.getLocalStorageEnum("codeCutType");
+ this.enumParam.codeCutType = enumList.length>0 ? enumList:[];
},
loadCodeGetValueType(){
- this.enumParam.codeGetValueType = this.getLocalStorageEnum("codeGetValueType");
+ let enumList = this.getLocalStorageEnum("codeGetValueType");
+ this.enumParam.codeGetValueType = enumList.length>0 ? enumList:[];
},
-
+ // 鏈�澶ф祦姘村彿
+ maxSerialNum(){
+ console.log(this.selectionList)
+ if (this.selectionList.length === 0) {
+ this.$message.warning("璇烽�夋嫨涓�鏉＄紪鐮佽鍒欙紒");
+ return;
+ }
+ this.maxSerial.visible = true
+ this.maxSerial.ruleOid = this.selectionList[0]['oid']
+ }
+
}
};
</script>
<style>
-
+[class^="icon-"]{
+ font-size: 12px !important;
+}
.code-rule-crud > .avue-crud__search ,.code-basic-crud > .avue-crud__search {
margin-bottom: -15px;
- }
-
- .code-rule-crud > .avue-crud__pagination {
- padding: 14px 0 2px 20px;
}
.clone-input-textarea > .el-form-item__content {
@@ -2868,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