From fffb0389bbc255a6a7fe4282471f86fd95bee49d Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期三, 23 八月 2023 10:00:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/code/code.vue | 45 +++++++++++++++++++++++++++++++++++++++------
1 files changed, 39 insertions(+), 6 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/code/code.vue b/Source/UBCS-WEB/src/views/code/code.vue
index e354964..4b4fadd 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>
@@ -248,6 +255,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">
@@ -875,6 +885,12 @@
ruleOwner: '', // 褰撳墠瑕佽浆绉荤粰鍝釜瑙勫垯绠＄悊鍛樼殑ID
releadDisabled: false, // 閬垮厤瑙勫垯鍙戝竷閲嶅鎻愪氦
+ /*鏈�澶ф祦姘村彿*/
+ maxSerial:{
+ visible:false,
+
+ },
+
/*浣跨敤鑼冨洿瀵硅瘽妗嗘樉绀烘帶鍒�*/
codeRangeSettingBox: false,
useRangeData: [],
@@ -2753,14 +2769,18 @@
},
/** 鏋氫妇鍜屽彲杈撳彲閫夊唴瀹规煡璇� */
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"));
@@ -2772,14 +2792,27 @@
}
},
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']
+ }
}
};
--
Gitblit v1.9.3