From f00e6f6f26d6dc6fc8f606de01f37ec643daa383 Mon Sep 17 00:00:00 2001 From: 田源 <lastanimals@163.com> Date: 星期五, 10 十一月 2023 14:17:16 +0800 Subject: [PATCH] 编码规则自定义流水算法 --- Source/UBCS-WEB/src/views/code/code.vue | 674 ++++++++++++++++++++++++++++++------------------------- 1 files changed, 366 insertions(+), 308 deletions(-) diff --git a/Source/UBCS-WEB/src/views/code/code.vue b/Source/UBCS-WEB/src/views/code/code.vue index 5210e2d..5487e28 100644 --- a/Source/UBCS-WEB/src/views/code/code.vue +++ b/Source/UBCS-WEB/src/views/code/code.vue @@ -37,104 +37,104 @@ <!-- 琛ㄦ牸鍐呮搷浣滄寜閽� --> <template slot="menu" slot-scope="scope"> <el-button v-if="permissionList.editBtn && (scope.row.lcStatus == 'Editing' ? true : false)" - icon="el-icon-edit" - plain - size="small" - type="text" - @click="openEdit(scope.row)" - >缂� 杈� + icon="el-icon-edit" + plain + size="small" + type="text" + @click="openEdit(scope.row)" + >缂� 杈� </el-button> <el-button v-if="permissionList.releaseBtn && (scope.row.lcStatus == 'Editing' ? true : false)" - :loading="releadDisabled" - icon="el-icon-position" - plain - size="small" - type="text" - @click="enableOrDeactivatse(scope.row.oid, 'release')" - >鍙� 甯� + :loading="releadDisabled" + icon="el-icon-position" + plain + size="small" + type="text" + @click="enableOrDeactivatse(scope.row.oid, 'release')" + >鍙� 甯� </el-button> <el-button v-if="permissionList.deactivateBtn && (scope.row.lcStatus == 'Released' ? true : false)" - icon="el-icon-video-pause" - plain - size="small" - type="text" - @click="enableOrDeactivatse(scope.row.oid, 'disable')" - >鍋� 鐢� + icon="el-icon-video-pause" + plain + size="small" + type="text" + @click="enableOrDeactivatse(scope.row.oid, 'disable')" + >鍋� 鐢� </el-button> <el-button v-if="permissionList.enableBtn && (scope.row.lcStatus == 'Disabled' ? true : false)" - icon="el-icon-video-play" - plain - size="small" - type="text" - @click="enableOrDeactivatse(scope.row.oid, 'enable')" - >鍚� 鐢� + icon="el-icon-video-play" + plain + size="small" + type="text" + @click="enableOrDeactivatse(scope.row.oid, 'enable')" + >鍚� 鐢� </el-button> </template> <!-- 琛ㄦ牸涓婃柟鎸夐挳鍖哄煙 --> <template slot="menuLeft" slot-scope="scope"> <el-button v-if="permissionList.rulDelBtn" - icon="el-icon-delete" - plain - size="small" - type="danger" - @click="handleDelete" + icon="el-icon-delete" + plain + size="small" + type="danger" + @click="handleDelete" > 鍒� 闄� </el-button> <el-button v-if="permissionList.advancedQueryBtn" - icon="el-icon-search" - plain - size="small" - type="primary" - @click="openAdvancedQuery('codeRule')"> + icon="el-icon-search" + plain + size="small" + type="primary" + @click="openAdvancedQuery('codeRule')"> 楂樼骇鏌ヨ </el-button> <el-button v-if="permissionList.cloneBtn" - icon="icon-kelong" - plain - size="small" - @click="openCodeRuleDialog" + icon="icon-kelong" + plain + size="small" + @click="openCodeRuleDialog" > 鍏� 闅� </el-button> <el-button v-if="permissionList.otherCloneBtn" - icon="icon-lianjiekelong" - plain - size="small" - style="font-size: 12px" - @click="openOtherCodeRuleDialog" + icon="icon-lianjiekelong" + plain + size="small" + style="font-size: 12px" + @click="openOtherCodeRuleDialog" > 浠庡叾浠栬鍒欎腑鍏嬮殕鐮佹 </el-button> <el-button v-if="permissionList.usescopeBtn" - icon="el-icon-s-help" - plain - size="small" - @click="handleRange" + icon="el-icon-s-help" + plain + size="small" + @click="handleRange" > 浣跨敤鑼冨洿 </el-button> <el-button v-if="permissionList.clearBtn" - icon="icon-qingkong" - plain - size="small" - @click="clearAllCodeSec" + icon="icon-qingkong" + plain + size="small" + @click="clearAllCodeSec" > 娓呯┖鐮佸�� </el-button> - <el-button v-if="permissionList.escapeOwnerBtn" - icon="el-icon-guide" - plain - size="small" - @click="escapeOwner" + <el-button v-if="permissionList.escapeOwnerBtn" + icon="el-icon-guide" + plain + size="small" + @click="escapeOwner" > 杞Щ鎵�鏈夎�� </el-button> - <el-button v-if="permissionList.maxSerialnumBtn" - icon="el-icon-data-analysis" - plain - size="small" - @click="maxSerialNum" + <el-button v-if="permissionList.maxSerialnumBtn" + icon="el-icon-data-analysis" + plain + size="small" + @click="maxSerialNum" > 鏈�澶ф祦姘村彿 </el-button> @@ -173,15 +173,15 @@ <!-- 缂栫爜瑙勫垯,鍏嬮殕瀵硅瘽妗� --> <clone-rule-dialog - :visible.sync="cloneSettingBox" :ruleData="selectionList[0]" + :visible.sync="cloneSettingBox" @refreshRuleTable="onLoad"> </clone-rule-dialog> <!-- 缂栫爜瑙勫垯,浠庡叾浠栬鍒欏厠闅嗗璇濇 --> <clone-other-basic-sec-dialog - :visible.sync="cloneOtherCodeRuleSettingBox" :quiltCloneCodeRule="selectionList[0]" + :visible.sync="cloneOtherCodeRuleSettingBox" @refreshRuleTable="onLoad"> </clone-other-basic-sec-dialog> @@ -189,9 +189,9 @@ <el-dialog :visible.sync="escapeOwnerVisible" append-to-body + class="avue-dialog avue-dialog--top" title="杞Щ鎵�鏈夎��" width="30%" - class= "avue-dialog avue-dialog--top" > <el-select v-model="ruleOwner" class="selects" placeholder="璇烽�夋嫨"> <el-option @@ -241,75 +241,76 @@ <!-- 鍩虹鐮佹琛ㄦ牸鍐呮搷浣滄寜閽� --> <template slot="menu" slot-scope="scope"> <el-button v-if="basicPermissionList.viewBtn && currentRuleLcStatus != 'Editing'" - icon="el-icon-view" - plain - size="small" - type="text" - @click="openBasicDialog('view', scope.row)" - >鏌ョ湅 + icon="el-icon-view" + plain + size="small" + type="text" + @click="openBasicDialog('view', scope.row)" + >鏌ョ湅 </el-button> <el-button v-if="basicPermissionList.editBtn && currentRuleLcStatus === 'Editing'" - icon="el-icon-edit" - plain - size="small" - type="text" - @click="openBasicDialog('edit', scope.row)" - >缂栬緫 + icon="el-icon-edit" + plain + size="small" + type="text" + @click="openBasicDialog('edit', scope.row)" + >缂栬緫 </el-button> - <el-button v-if="basicPermissionList.basicMgrBtn && (scope.row.secType === 'codeclassifysec' || scope.row.secType == 'codefixedsec')" + <el-button + v-if="basicPermissionList.basicMgrBtn && (scope.row.secType === 'codeclassifysec' || scope.row.secType == 'codefixedsec')" icon="el-icon-setting" plain size="small" type="text" @click="openBasicSecCodeValueMgr(scope.row)" - >鐮佸�肩鐞� + >鐮佸�肩鐞� </el-button> <el-button v-if="basicPermissionList.basicMoveupBtn && scope.row.orderNum > 1" - icon="el-icon-arrow-up" - plain - size="small" - type="text" - @click="upOrderNum(scope.row)" - >涓婄Щ + icon="el-icon-arrow-up" + plain + size="small" + type="text" + @click="upOrderNum(scope.row)" + >涓婄Щ </el-button> <el-button v-if="basicPermissionList.basicDownBtn" - icon="el-icon-arrow-down" - plain - size="small" - type="text" - @click="downOrderNum(scope.row)" - >涓嬬Щ + icon="el-icon-arrow-down" + plain + size="small" + type="text" + @click="downOrderNum(scope.row)" + >涓嬬Щ </el-button> </template> <!-- 鍩虹鐮佹琛ㄦ牸宸︿笂鏂规寜閽尯鍩� --> <template slot="menuLeft" slot-scope="scope"> <el-button v-if="basicPermissionList.addBtn" - :disabled="selectionList.length <= 0" - icon="el-icon-plus" - size="small" - type="primary" - @click="openAddBasicCodeSec" + :disabled="selectionList.length <= 0" + icon="el-icon-plus" + size="small" + type="primary" + @click="openAddBasicCodeSec" > 鏂� 澧� </el-button> <el-button v-if="basicPermissionList.basicDelBtn" - :disabled="selectionList.length <= 0" - icon="el-icon-delete" - plain - size="small" - type="danger" - @click="deleteBasicCode(scope.row)" + :disabled="selectionList.length <= 0" + icon="el-icon-delete" + plain + size="small" + type="danger" + @click="deleteBasicCode(scope.row)" > 鍒� 闄� </el-button> - <el-button v-if="basicPermissionList.basicAdvancedQueryBtn" - :disabled="selectionList.length <= 0" - icon="el-icon-search" - plain - size="small" - type="primary" - @click="openAdvancedQuery('codeBasicSec')" + <el-button v-if="basicPermissionList.basicAdvancedQueryBtn" + :disabled="selectionList.length <= 0" + icon="el-icon-search" + plain + size="small" + type="primary" + @click="openAdvancedQuery('codeBasicSec')" > 楂樼骇鏌ヨ </el-button> @@ -362,7 +363,7 @@ size="mini" type="primary" @click="codeClassifyValueOpetion('up')" - >涓婄Щ + >涓婄Щ </el-button> <el-button class="button" @@ -370,7 +371,7 @@ size="mini" type="primary" @click="codeClassifyValueOpetion('down')" - >涓嬬Щ + >涓嬬Щ </el-button> </div> </basic-container> @@ -407,7 +408,7 @@ size="mini" type="primary" @click="addCodeSecValue('codeclassifyvaluesec')" - >娣诲姞 + >娣诲姞 </el-button> <el-button :disabled="selectedFixedOrCodeclassifyValue == ''" @@ -417,7 +418,7 @@ size="mini" type="success" @click="editCodeSecValue('codeclassifyvaluesec')" - >淇敼 + >淇敼 </el-button> <el-button :disabled="selectedFixedOrCodeclassifyValue == ''" @@ -426,7 +427,7 @@ size="mini" type="danger" @click="delCodeSecValue('codeclassifyvaluesec')" - >鍒犻櫎 + >鍒犻櫎 </el-button> <el-button class="button" @@ -435,7 +436,7 @@ size="mini" type="warning" @click="clearFixedOrClassifyForm('codeclassifyvaluesec')" - >鍙栨秷 + >鍙栨秷 </el-button> </div> </basic-container> @@ -464,21 +465,21 @@ size="mini" type="text" @click="codeFixedValueOpetion('up', scope.row)" - >涓婄Щ + >涓婄Щ </el-button> <el-button icon="el-icon-arrow-down" size="mini" type="text" @click="codeFixedValueOpetion('down', scope.row)" - >涓嬬Щ + >涓嬬Щ </el-button> <el-button icon="el-icon-minus" size="mini" type="text" @click="codeFixedValueOpetion('remove', scope.row)" - >绉婚櫎 + >绉婚櫎 </el-button> </template> </avue-crud> @@ -490,7 +491,7 @@ size="mini" type="primary" @click="saveCodeFixedOrClassifyValueOption('fixedValue')" - >淇濆瓨 + >淇濆瓨 </el-button> </div> </basic-container> @@ -534,7 +535,7 @@ size="mini" type="primary" @click="addCodeSecValue('codefixedsec')" - >娣诲姞 + >娣诲姞 </el-button> <el-button :disabled="selectedFixedOrCodeclassifyValue == ''" @@ -544,7 +545,7 @@ size="mini" type="success" @click="editCodeSecValue('codefixedsec')" - >淇敼 + >淇敼 </el-button> <el-button :disabled="selectedFixedOrCodeclassifyValue == ''" @@ -553,7 +554,7 @@ size="mini" type="danger" @click="delCodeSecValue('codefixedsec')" - >鍒犻櫎 + >鍒犻櫎 </el-button> <el-button class="button" @@ -562,7 +563,7 @@ size="mini" type="warning" @click="clearFixedOrClassifyForm('codefixedsec')" - >鍙栨秷 + >鍙栨秷 </el-button> </div> </basic-container> @@ -879,10 +880,23 @@ :label-width="rightFormLabelWidth" label="鑷畾涔夌殑娴佹按绠楁硶:" > - <el-input - v-model="form.customCodeSerialClass" - :readonly="basicSecOnlyRead" - ></el-input> + <template> + <vciWebRefer + ref="refer" + :referConfig="this.referConfig || {}" + :display="true" + :value="form.customCodeSerialClass" + :text="form.customCodeSerialClass" + @setReferValue="setReferValue" + ></vciWebRefer> +<!-- <el-input--> +<!-- v-model="form.customCodeSerialClass"--> +<!-- :readonly="basicSecOnlyRead"--> +<!-- @focus="streamFocusHandler"--> +<!-- ></el-input>--> + </template> + + </el-form-item> </div> <!-- 灞傜骇鐮佹 --> @@ -1147,9 +1161,10 @@ <div slot="footer" class="dialog-footer"> <el-button :disabled="!showbtn" - type="primary" :loading="isLoadingSecCodeAddBtn" - @click="saveOrEditBasicCode">淇� 瀛�</el-button> + type="primary" + @click="saveOrEditBasicCode">淇� 瀛� + </el-button> <el-button @click="addBasicCodeSettingBox = false">鍙� 娑�</el-button> </div> @@ -1246,11 +1261,13 @@ </avue-crud> <div slot="footer" class="dialog-footer"> <el-button type="primary" @click="saveSelectedParentClassify" - >淇� 瀛�</el-button + >淇� 瀛� + </el-button > <el-button @click="parentClsfyParams.isShowParentClassifySettingBox = false" - >鍙� 娑�</el-button + >鍙� 娑� + </el-button > </div> </el-dialog> @@ -1271,6 +1288,10 @@ > </refer-config-dialog> </el-dialog> + + <!-- 鑷畾涔夋祦姘村弬鐓х粍浠�--> + + </basic-container> </template> @@ -1295,7 +1316,7 @@ addSave, refDataGridClassifySec, } from "@/api/code/codebasic"; -import { listClassifyLinkAttr } from "@/api/code/codeclassify"; +import {listClassifyLinkAttr} from "@/api/code/codeclassify"; import { gridCodeFixedValue, addSaveCodeFixedValue, @@ -1310,8 +1331,8 @@ deleteCodeClassifyValue, saveCodeClassifyValueOrder, } from "@/api/code/codeClassifyValue"; -import { getDictionary } from "@/api/omd/enum"; -import { getDictionaryBiz } from "@/api/system/dictbiz"; +import {getDictionary} from "@/api/omd/enum"; +import {getDictionaryBiz} from "@/api/system/dictbiz"; import optionBasic from "@/const/code/codebasic"; import optionRule from "@/const/code/mdmrule"; import attrOption from "@/const/code/selectAttrOptionDialog"; @@ -1319,15 +1340,49 @@ import classisyValueTreeOption from "@/const/code/classisyValueTreeDialog"; import parentClassifyParentOption from "@/const/code/parentClassifyParentOptionDialog"; import fixedValueOption from "@/const/code/fixedValueMgrDialog"; -import { mapGetters } from "vuex"; -import { getByRoleUserList } from "@/api/system/user"; +import {mapGetters} from "vuex"; +import {getByRoleUserList} from "@/api/system/user"; import func from "@/util/func"; import secTypeEnum from '@/enumpack/CodeSecTypeEnum'; +import vciWebRefer from "../../components/refer/vciWebRefer"; export default { + components: { vciWebRefer }, data() { return { - crudOption:{...optionRule}, + referConfig:{ + title: '鑷畾涔夋祦姘村弬鐓�', + showField: 'customCodeSerialClass', + field: 'customCodeSerialClass', + fieldMap: {}, + placeholder:'璇烽�夋嫨鑷畾涔夋祦姘�', + options: { + // 璁剧疆榛樿鐨勫睘鎬� + url: 'api/ubcs-code/codeSerialAlgorithmController/gridCodeSerialAlgorithm', + valueField:'classFullName', + textField:'classFullName', + isMuti: false, + type: "grid", + method: 'get', + tableConfig: { + page: { + limit: 15, + page: 1 + }, + cols: [ + {title: '绠楁硶缂栧彿', field: 'id', width: 200}, + {title: '绠楁硶鍚嶇О', field: 'name', width: 150}, + {title: '绫诲叏璺緞', field: 'classFullName', width: 300}, + {title: '鎻忚堪', field: 'description'} + ], + queryColumns: [ + {field: 'id', title: '绠楁硶缂栧彿'}, + {field: 'name', title: '绠楁硶鍚嶇О'} + ] + } + } + }, + crudOption: {...optionRule}, ruleForm: {}, query: {}, loading: true, @@ -1599,7 +1654,7 @@ editBtn: this.vaildData(this.permission.code_rule.code_rule_edit, false), deactivateBtn: this.vaildData(this.permission.code_rule.code_rule_deactivate, false), enableBtn: this.vaildData(this.permission.code_rule.code_rule_enable, false), - releaseBtn: this.vaildData(this.permission.code_rule. code_rule_release, false), + releaseBtn: this.vaildData(this.permission.code_rule.code_rule_release, false), advancedQueryBtn: this.vaildData(this.permission.code_rule.code_rule_advanced_query, false), cloneBtn: this.vaildData(this.permission.code_rule.code_rule_clone, false), otherCloneBtn: this.vaildData(this.permission.code_rule.code_rule_other_clone, false), @@ -1610,11 +1665,11 @@ }; }, basicPermissionList() { - return{ + return { // 鍩虹鐮佹鐩稿叧鎸夐挳 addBtn: this.vaildData(this.permission.code_rule.code_basic_add, false), editBtn: this.vaildData(this.permission.code_rule.code_basic_edit, false), - viewBtn: this.vaildData(this.permission.code_rule. code_basic_view, false), + viewBtn: this.vaildData(this.permission.code_rule.code_basic_view, false), basicDelBtn: this.vaildData(this.permission.code_rule.code_basic_delete, false), basicAdvancedQueryBtn: this.vaildData(this.permission.code_rule.code_basic_advanced_query, false), basicMgrBtn: this.vaildData(this.permission.code_rule.code_basic_mgr, false), @@ -1645,7 +1700,10 @@ localStorage.removeItem('codeGetValueType'); }, methods: { - + //鑷畾涔夋祦姘村け鐒� + setReferValue(data){ + console.log(data) + }, /** 杞Щ瑙勫垯鎵�鏈夎�呭璇濇 */ escapeOwner() { if (this.selectionList.length === 0) { @@ -1884,7 +1942,7 @@ /** 鍔犺浇鍥哄畾鐮佹鐮佸�艰〃鏁版嵁*/ loadFixedValueTableData(row) { this.fixedValueOptionLoading = true; - gridCodeFixedValue(1, -1, { codeFixedSecOid: row.oid }).then((res) => { + gridCodeFixedValue(1, -1, {codeFixedSecOid: row.oid}).then((res) => { this.fixedValueData = res.data.data.records; this.fixedValueOptionLoading = false; }); @@ -1988,7 +2046,7 @@ description: this.codeFixdForm.description, id: this.codeFixdForm.id, codeFixedSecOid: - this.selectedFixedOrCodeclassifyValue.codefixedsecoid, + this.selectedFixedOrCodeclassifyValue.codefixedsecoid, }; editCodeFixedValue(editData).then( () => { @@ -2409,7 +2467,7 @@ }, /** 淇敼瑙勫垯鐘舵��:鍚敤銆佸仠鐢ㄣ�佸彂甯� */ updateStatus(oid, update) { - updateStatus({ oid: oid, ts: new Date().getTime, update: update }).then( + updateStatus({oid: oid, ts: new Date().getTime, update: update}).then( () => { this.releadDisabled = false; this.onLoad(this.page); @@ -2433,7 +2491,7 @@ //console.log(res) if (res.data.data.success) { this.updateStatus(oid, update); - }else { + } else { this.$confirm(res.data.data.msg, "鎻愮ず", { distinguishCancelAndClose: true, confirmButtonText: "缁х画鍙戝竷", @@ -2495,7 +2553,7 @@ }) .then(() => { let ts = new Date(currentData.ts).getTime(); - return clearAllCode({ oid: currentData.oid, ts: ts }); + return clearAllCode({oid: currentData.oid, ts: ts}); }) .then(() => { this.this.onLoad(this.page); @@ -2557,7 +2615,7 @@ // 鍙敮鎸佹瘡娆″崟鏉¤褰曞垹闄� let oid = this.selectionList[0].oid; let ts = new Date(this.selectionList[0].ts).getTime(); - return remove({ oid: oid, ts: ts }); + return remove({oid: oid, ts: ts}); }) .then(() => { this.onLoad(this.page); @@ -2640,7 +2698,7 @@ gridCodeRule( page.currentPage, page.pageSize, - Object.assign({},params,this.query), + Object.assign({}, params, this.query), ).then((res) => { //console.log(res.data); const data = res.data.data; @@ -2751,8 +2809,8 @@ let oldBasicSec = this.selectionBasicList.at(-1); let secType = this.form.secType; Vue.set(this.form, 'isClearValue', false); - if((oldBasicSec.secType == "codefixedsec" || oldBasicSec.secType === "codeclassifysec") && oldBasicSec.secType != secType){ - await this.$confirm("鐮佹绫诲瀷鐢便��"+oldBasicSec.secTypeText+"銆戯紝淇敼涓�"+"銆�"+secTypeEnum.getTextByValue(secType)+"銆戯紝璇烽棶鏄惁闇�瑕佹竻绌哄叧鑱旂殑鐮佸�硷紵", "鎻愮ず", { + if ((oldBasicSec.secType == "codefixedsec" || oldBasicSec.secType === "codeclassifysec") && oldBasicSec.secType != secType) { + await this.$confirm("鐮佹绫诲瀷鐢便��" + oldBasicSec.secTypeText + "銆戯紝淇敼涓�" + "銆�" + secTypeEnum.getTextByValue(secType) + "銆戯紝璇烽棶鏄惁闇�瑕佹竻绌哄叧鑱旂殑鐮佸�硷紵", "鎻愮ず", { distinguishCancelAndClose: true, closeOnClickModal: false, confirmButtonText: "娓呯┖鐮佸��", @@ -3001,7 +3059,7 @@ }) .then(() => { let ts = new Date(this.selectionBasicList[0].ts).getTime(); - return deleteData({ oid: oid, ts: ts }); + return deleteData({oid: oid, ts: ts}); }) .then(() => { this.loadBasic({ @@ -3025,7 +3083,7 @@ //瀛樺偍褰撳墠鍏宠仈鐨勭紪鐮佽鍒欑浉鍏充俊鎭� this.currentCodeRuleOid = row.oid; this.currentRuleLcStatus = row.lcStatus; - this.sendGridCodeBasicSec({ pkCodeRule: row.oid }, false); + this.sendGridCodeBasicSec({pkCodeRule: row.oid}, false); } }, /** 鍙戦�佸姞杞藉熀纭�鐮佹鐨勮姹�*/ @@ -3082,7 +3140,7 @@ }, basicSearchReset() { this.sendGridCodeBasicSec( - { pkCodeRule: this.selectionList[this.selectionList.length - 1].oid }, + {pkCodeRule: this.selectionList[this.selectionList.length - 1].oid}, false ); }, @@ -3126,7 +3184,7 @@ return; } downOrderNum(row.oid).then(() => { - this.loadBasic({ oid: codeRuleOid }); + this.loadBasic({oid: codeRuleOid}); this.$message({ type: "success", message: "鎿嶄綔鎴愬姛!", @@ -3218,19 +3276,19 @@ this.loadCodeSecType(); } this.form = { - oid: row !=null ? row.oid:this.form.oid, - id: row != null ? row.id:this.form.id, //缂栧彿, - name: row != null ? row.name:this.form.name, //鍚嶇О - secType: row != null ? row.secType:this.form.secType, //鐮佹绫诲瀷 - description: row != null ? row.description:this.form.description, //鎻忚堪 - serialDependFlag: this.isNullJsonBoolean(row,this.form, 'serialDependFlag'), //鏄惁娴佹按渚濊禆 - serialDependOrder: row !=null ? row.serialDependOrder:this.form.serialDependOrder, //娴佹按渚濊禆椤哄簭 + oid: row != null ? row.oid : this.form.oid, + id: row != null ? row.id : this.form.id, //缂栧彿, + name: row != null ? row.name : this.form.name, //鍚嶇О + secType: row != null ? row.secType : this.form.secType, //鐮佹绫诲瀷 + description: row != null ? row.description : this.form.description, //鎻忚堪 + serialDependFlag: this.isNullJsonBoolean(row, this.form, 'serialDependFlag'), //鏄惁娴佹按渚濊禆 + serialDependOrder: row != null ? row.serialDependOrder : this.form.serialDependOrder, //娴佹按渚濊禆椤哄簭 nullableFlag: this.isNullJsonBoolean(row, this.form, 'nullableFlag'), //鏄惁涓虹┖ displayFlag: this.isNullJsonBoolean(row, this.form, 'displayFlag'), componentCodeFlag: this.isNullJsonBoolean(row, this.form, 'componentCodeFlag'), //鏄惁鍙備笌缂栫爜 - pkCodeRule: row != null ? row.pkCodeRule:this.form.pkCodeRule, //鎵�灞炵紪鐮佽鍒� - prefixCode: row != null ? row.prefixCode:this.form.prefixCode, //鍓嶇紑 - suffixCode: row!= null ? row.suffixCode:this.form.suffixCode, //鍚庣紑 + pkCodeRule: row != null ? row.pkCodeRule : this.form.pkCodeRule, //鎵�灞炵紪鐮佽鍒� + prefixCode: row != null ? row.prefixCode : this.form.prefixCode, //鍓嶇紑 + suffixCode: row != null ? row.suffixCode : this.form.suffixCode, //鍚庣紑 }; if (this.form.secType === "codefixedsec") { //鍥哄畾鐮佹 @@ -3274,8 +3332,8 @@ row != null && row.serialStart != "" ? row.serialStart : 1, //娴佹按鍙疯捣濮嬪�� serialStep: row != null && row.serialStep != "" ? row.serialStep : 1, //娴佹按鐨勬闀� codeFillType: row != null && row.codeFillType != "" - ? row.codeFillType - : "code_fill_left", //缂栫爜琛ヤ綅鏂瑰紡 + ? row.codeFillType + : "code_fill_left", //缂栫爜琛ヤ綅鏂瑰紡 // codeFillSeparatorSelect: row!=null&&row.codeFillSeparatorSelect != '' ? row.codeFillSeparatorSelect:0, //琛ヤ綅鏃剁殑瀛楃锛岄�変腑鐨勪笅鎷夋鐨勪笅鏍� codeFillSeparator: row != null && row.codeFillSeparator != "" @@ -3288,8 +3346,8 @@ codeFillFlag: row != null && row.codeFillFlag != "" ? row.codeFillFlag == "true" - ? true - : false + ? true + : false : false, //娴佹按鏄惁琛ョ爜 customCodeSerialClass: row != null && row.customCodeSerialClass != "" @@ -3352,8 +3410,8 @@ matchClassifyValueFlag: row != null && row.matchClassifyValueFlag != "" ? row.matchClassifyValueFlag == "true" - ? true - : false + ? true + : false : false, //鏄惁鑷姩鍖归厤鍊� parentClassifySecOid: row != null && row.parentClassifySecOid != "" @@ -3385,19 +3443,19 @@ } }, // 鍒ゆ柇Boolean鍊兼槸鍚︿负绌猴紝骞朵笖瀵箂tr绫诲瀷甯冨皵鍊艰繘琛岃浆鎹� - isNullJsonBoolean(row,form,attr) { - //console.log(row[attr],form[attr]); - if(row != null){ - return JSON.parse(row[attr]); - }else { - return form[attr]; - } + isNullJsonBoolean(row, form, attr) { + //console.log(row[attr],form[attr]); + if (row != null) { + return JSON.parse(row[attr]); + } else { + return form[attr]; + } }, /** 绗竴娆¤姹傜殑鏋氫妇鏁版嵁鏀剧紦瀛�*/ getLocalStorageEnum(enumKey) { let enumCach = JSON.parse(localStorage.getItem(enumKey)); if (enumCach == null) { - getDictionary({ code: enumKey }).then((res) => { + getDictionary({code: enumKey}).then((res) => { enumCach = res.data.data; localStorage.setItem(enumKey, JSON.stringify(res.data.data)); }); @@ -3428,7 +3486,7 @@ loadCodeFillSeparator() { //let enumCach = JSON.parse(localStorage.getItem("codeFillSeparator")); //if (enumCach == null) { - getDictionaryBiz({code:"codeFillSeparator"}).then((res) => { + getDictionaryBiz({code: "codeFillSeparator"}).then((res) => { this.enumParam.codeFillSeparator = res.data.data; //console.log(this.enumParam.codeFillSeparator); localStorage.setItem( @@ -3453,7 +3511,7 @@ this.$message.warning("璇烽�夋嫨涓�鏉$紪鐮佽鍒欙紒"); return; } - if(this.selectionList.length> 1){ + if (this.selectionList.length > 1) { this.$message.warning("鍙兘閫夋嫨涓�鏉$紪鐮佽鍒欙紒"); return; } @@ -3465,155 +3523,155 @@ </script> <style> - [class^="icon-"] { - font-size: 12px !important; - } +[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__search, +.code-basic-crud > .avue-crud__search { + margin-bottom: -15px; +} - .clone-input-textarea > .el-form-item__content { - width: 495px; - } +.clone-input-textarea > .el-form-item__content { + width: 495px; +} - .clone-avue-crud > .el-card > .el-card__body > .avue-crud__menu { - display: none !important; - } +.clone-avue-crud > .el-card > .el-card__body > .avue-crud__menu { + display: none !important; +} - .fixed-avue-crud > .el-card > .el-card__body > .avue-crud__menu { - display: none !important; - } +.fixed-avue-crud > .el-card > .el-card__body > .avue-crud__menu { + display: none !important; +} - .other-clone-codebasic-crud > .el-card > .el-card__body > .avue-crud__menu { - display: none !important; - } +.other-clone-codebasic-crud > .el-card > .el-card__body > .avue-crud__menu { + display: none !important; +} - .other-clone-coderule-crud > .el-card > .el-card__body > .avue-crud__menu { - display: none !important; - } +.other-clone-coderule-crud > .el-card > .el-card__body > .avue-crud__menu { + display: none !important; +} - .el-table--small .el-table__cell { - padding: 3px 0; - } +.el-table--small .el-table__cell { + padding: 3px 0; +} - .classify_value_box > .el-scrollbar { - height: 95%; - } +.classify_value_box > .el-scrollbar { + height: 95%; +} - .basic-container > .el-card > .el-card__body { - margin: -10px 0; - } +.basic-container > .el-card > .el-card__body { + margin: -10px 0; +} - .code-basicsec-container { - padding: 1px 6px; - } +.code-basicsec-container { + padding: 1px 6px; +} - .horizontal-line { - /* margin-top: 19px !important; */ - margin-bottom: -20px !important; - width: 100%; - height: 2px; - } +.horizontal-line { + /* margin-top: 19px !important; */ + margin-bottom: -20px !important; + width: 100%; + height: 2px; +} - .el-card__body > .treeBox { - height: 56vh; - } +.el-card__body > .treeBox { + height: 56vh; +} - .el-col-5 > .box { - height: 56vh; - } +.el-col-5 > .box { + height: 56vh; +} - .operator_, - filter, - .layui-btn { - width: 60px; - } +.operator_, +filter, +.layui-btn { + width: 60px; +} - .left > .el-form-item > .el-form-item__content > .el-input-number { - width: 120px; - } +.left > .el-form-item > .el-form-item__content > .el-input-number { + width: 120px; +} - .left - > .el-form-item - > .el-form-item__content - > .el-input-number - > .el-input - > .el-input__inner { - width: 120px; - } +.left +> .el-form-item +> .el-form-item__content +> .el-input-number +> .el-input +> .el-input__inner { + width: 120px; +} - .el-col > .el-card > .el-card__header { - background: rgb(213 231 239); - border-radius: inherit; - } +.el-col > .el-card > .el-card__header { + background: rgb(213 231 239); + border-radius: inherit; +} - /** 鏂板鐮佹 */ - .add-basicsec-dialog > .el-dialog > .el-dialog__body { - padding: 20px 20px 4px; - margin-bottom: 30px; - } +/** 鏂板鐮佹 */ +.add-basicsec-dialog > .el-dialog > .el-dialog__body { + padding: 20px 20px 4px; + margin-bottom: 30px; +} - .add-basicsec-total { - width: 100%; - height: 500px; - } +.add-basicsec-total { + width: 100%; + height: 500px; +} - .add-basicsec-total .el-input__inner, - .add-basicsec-total .el-textarea__inner { - width: 220px; - } +.add-basicsec-total .el-input__inner, +.add-basicsec-total .el-textarea__inner { + width: 220px; +} - .add-basicsec-total > .add-basicsec-form { - display: flex; - flex-direction: row; - width: 100%; +.add-basicsec-total > .add-basicsec-form { + display: flex; + flex-direction: row; + width: 100%; + height: 100%; + align-items: center; + justify-content: space-around; +} + +.add-basicsec-form > .el-divider--vertical { + width: 2px; + height: 78%; + position: absolute; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); +} + +.left { + /* float: left; */ + width: 45%; + height: 100%; +} + +.right { + /* float: right; */ + margin-right: 2vw; + height: 100%; + width: auto; +} + +.add-basicsec-form > .left > .el-form-item, +.add-basicsec-form > .right > div > .el-form-item { + margin-bottom: 12px; +} + +/* 瀵硅瘽妗嗗簳閮ㄦ寜閽竟妗嗘牱寮� */ +.el-dialog__footer { + /* width: 100%; */ + border-top: 1px solid #e9e7e7; + padding: 5px 10px 10px; +} + +.seloption { + margin-left: 10px; +} + +/* .code-total > .basic-container__card { height: 100%; - align-items: center; - justify-content: space-around; - } - - .add-basicsec-form > .el-divider--vertical { - width: 2px; - height: 78%; - position: absolute; - top: 50%; - left: 50%; - transform: translate(-50%, -50%); - } - - .left { - /* float: left; */ - width: 45%; - height: 100%; - } - - .right { - /* float: right; */ - margin-right: 2vw; - height: 100%; - width: auto; - } - - .add-basicsec-form > .left > .el-form-item, - .add-basicsec-form > .right > div > .el-form-item{ - margin-bottom: 12px; - } - - /* 瀵硅瘽妗嗗簳閮ㄦ寜閽竟妗嗘牱寮� */ - .el-dialog__footer { - /* width: 100%; */ - border-top: 1px solid #e9e7e7; - padding: 5px 10px 10px; - } - - .seloption { - margin-left: 10px; - } - - /* .code-total > .basic-container__card { - height: 100%; - } */ + } */ </style> -- Gitblit v1.9.3