From c98617764afe0ee4e64ebb7b3af6845aeaeeea12 Mon Sep 17 00:00:00 2001 From: wangting <675591594@qq.com> Date: 星期一, 28 八月 2023 15:15:10 +0800 Subject: [PATCH] 最大流水号 --- Source/UBCS-WEB/src/views/code/code.vue | 161 +++++++++++++++++++++++++++++++++-------------------- 1 files changed, 99 insertions(+), 62 deletions(-) diff --git a/Source/UBCS-WEB/src/views/code/code.vue b/Source/UBCS-WEB/src/views/code/code.vue index 24c2921..301befd 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,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> @@ -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"> @@ -342,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> <!-- 鍒嗙被鐮佹鐮佸�肩鐞� --> @@ -356,7 +371,7 @@ :data="classifyValueTreeData" :option="classisyValueTreeOption" @node-click="classisyValueTreeOnodeClick" - style="overflow-y: auto; height: 54vh"/> + style=""/> </div> </basic-container> </div> @@ -391,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" @@ -407,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> @@ -426,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> @@ -440,16 +455,17 @@ <!-- 鍩虹鐮佹鏂板鐩稿叧瀵硅瘽妗� --> <el-dialog :title="basicSecDialogTitle" :visible.sync="addBasicCodeSettingBox" - width="60vw" + width="900px" 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> @@ -476,7 +492,7 @@ </el-form-item> <el-form-item label="鏄惁娴佹按渚濊禆:" :label-width="leftFormLabelWidth"> - <el-switch v-model="form.serialDependFlag" :disabled="basicSecOnlyRead"></el-switch> + <el-switch v-model="form.serialDependFlag" :disabled="basicSecOnlyRead" style="margin-right: 20px"></el-switch> <el-input-number v-show="form.serialDependFlag" v-model="form.serialDependOrder" controls-position="right" :readonly="basicSecOnlyRead"></el-input-number> </el-form-item> @@ -721,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> <!-- 宸︿晶涓婚搴撳垎绫绘爲 --> @@ -875,6 +892,12 @@ ruleOwner: '', // 褰撳墠瑕佽浆绉荤粰鍝釜瑙勫垯绠$悊鍛樼殑ID releadDisabled: false, // 閬垮厤瑙勫垯鍙戝竷閲嶅鎻愪氦 + /*鏈�澶ф祦姘村彿*/ + maxSerial:{ + visible:false, + + }, + /*浣跨敤鑼冨洿瀵硅瘽妗嗘樉绀烘帶鍒�*/ codeRangeSettingBox: false, useRangeData: [], @@ -882,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, @@ -1811,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() { @@ -1882,7 +1912,7 @@ return; } if(this.selectionList[0].lcStatus != 'Editing'){ - this.$message.warning("缂栫爜瑙勫垯宸茶寮曠敤锛屼笉鍏佽缂栬緫鎴栧垹闄�!"); + this.$message.warning("缂栫爜瑙勫垯宸茶寮曠敤锛屼笉鍏佽缂栬緫!"); return; } this.cloneOtherCodeRuleSettingBox = true; @@ -1933,7 +1963,6 @@ this.$message.warning("闇�瑕佸厠闅嗙殑缂栫爜瑙勫垯涓庤鍏嬮殕鐨勭紪鐮佽鍒欑浉鍚�!"); return; } - //console.log(res); let oidArr = []; fromDialogPkCodebasic.forEach(ele => { oidArr.push(ele.oid); @@ -2400,7 +2429,7 @@ /** 鍒ゆ柇鏁版嵁鏄惁閫夋嫨浠ュ強鍙兘閫夋嫨鍗曟潯鏁版嵁*/ tipsMessage(list){ if(list.length != 1){ - this.$message.warning("璇烽�夋嫨涓�鏉$紪鐮佽鍒欐暟鎹�!"); + this.$message.warning("璇烽�夋嫨涓�鏉℃暟鎹�!"); return false; } return true; @@ -2464,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; @@ -2477,7 +2505,6 @@ selectionBasicChange(list) { this.selectionBasicList = list; this.$refs.crudBasic.setCurrentRow(this.selectionBasicList[list.length-1]); - //console.log(this.selectionBasicList); }, /** 鍩虹鐮佹琚崟鍑昏〃鏍艰鏃惰Е鍙�*/ codeBasicSecRowClick(row){ @@ -2487,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(); }, @@ -2521,7 +2547,6 @@ return; } let codeRuleOid = this.selectionList[0].oid; - //console.log(this.selectionList); if (this.selectionList[0].lcStatus != 'Editing') { this.$message.warning("鍙湁缂栫爜瑙勫垯鐨勭姸鎬佹槸 [缂栬緫涓璢 鐨勬椂鍊欙紝鎵嶈兘璋冩暣鐮佹椤哄簭!"); return; @@ -2753,14 +2778,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 +2801,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'] + } } }; @@ -2792,10 +2834,6 @@ } .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 { @@ -2869,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