From c5badac7106d4ec7f419283b39b435a92f275fbd Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 30 十月 2023 09:10:18 +0800
Subject: [PATCH] 前端增加码段类型枚举类，实现修改码段类型时提供是否清空码值对话框功能
---
Source/UBCS-WEB/src/views/code/code.vue | 240 +++++++++++++++++++++++++++++++++--------------------------
1 files changed, 133 insertions(+), 107 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/code/code.vue b/Source/UBCS-WEB/src/views/code/code.vue
index dbc4044..da43e4a 100644
--- a/Source/UBCS-WEB/src/views/code/code.vue
+++ b/Source/UBCS-WEB/src/views/code/code.vue
@@ -1,5 +1,5 @@
<template>
- <basic-container class="code-total" style="height: 100%">
+ <basic-container class="code-total" style=" height: 100%">
<!-- 缂栫爜瑙勫垯淇℃伅灞曠ず鍖哄煙 -->
<basic-container class="code-rule-container">
<p
@@ -36,8 +36,7 @@
>
<!-- 琛ㄦ牸鍐呮搷浣滄寜閽� -->
<template slot="menu" slot-scope="scope">
- <el-button
- v-show="scope.row.lcStatus == 'Editing' ? true : false"
+ <el-button v-if="permissionList.editBtn && (scope.row.lcStatus == 'Editing' ? true : false)"
icon="el-icon-edit"
plain
size="small"
@@ -45,8 +44,7 @@
@click="openEdit(scope.row)"
>缂� 杈�
</el-button>
- <el-button
- v-show="scope.row.lcStatus == 'Editing' ? true : false"
+ <el-button v-if="permissionList.releaseBtn && (scope.row.lcStatus == 'Editing' ? true : false)"
:loading="releadDisabled"
icon="el-icon-position"
plain
@@ -55,8 +53,7 @@
@click="enableOrDeactivatse(scope.row.oid, 'release')"
>鍙� 甯�
</el-button>
- <el-button
- v-show="scope.row.lcStatus == 'Released' ? true : false"
+ <el-button v-if="permissionList.deactivateBtn && (scope.row.lcStatus == 'Released' ? true : false)"
icon="el-icon-video-pause"
plain
size="small"
@@ -64,8 +61,7 @@
@click="enableOrDeactivatse(scope.row.oid, 'disable')"
>鍋� 鐢�
</el-button>
- <el-button
- v-show="scope.row.lcStatus == 'Disabled' ? true : false"
+ <el-button v-if="permissionList.enableBtn && (scope.row.lcStatus == 'Disabled' ? true : false)"
icon="el-icon-video-play"
plain
size="small"
@@ -76,7 +72,7 @@
</template>
<!-- 琛ㄦ牸涓婃柟鎸夐挳鍖哄煙 -->
<template slot="menuLeft" slot-scope="scope">
- <el-button
+ <el-button v-if="permissionList.rulDelBtn"
icon="el-icon-delete"
plain
size="small"
@@ -85,16 +81,15 @@
>
鍒� 闄�
</el-button>
- <el-button
+ <el-button v-if="permissionList.advancedQueryBtn"
icon="el-icon-search"
plain
size="small"
type="primary"
- @click="openAdvancedQuery('codeRule')"
- >
+ @click="openAdvancedQuery('codeRule')">
楂樼骇鏌ヨ
</el-button>
- <el-button
+ <el-button v-if="permissionList.cloneBtn"
icon="icon-kelong"
plain
size="small"
@@ -102,7 +97,7 @@
>
鍏� 闅�
</el-button>
- <el-button
+ <el-button v-if="permissionList.otherCloneBtn"
icon="icon-lianjiekelong"
plain
size="small"
@@ -111,7 +106,7 @@
>
浠庡叾浠栬鍒欎腑鍏嬮殕鐮佹
</el-button>
- <el-button
+ <el-button v-if="permissionList.usescopeBtn"
icon="el-icon-s-help"
plain
size="small"
@@ -119,7 +114,7 @@
>
浣跨敤鑼冨洿
</el-button>
- <el-button
+ <el-button v-if="permissionList.clearBtn"
icon="icon-qingkong"
plain
size="small"
@@ -127,7 +122,7 @@
>
娓呯┖鐮佸��
</el-button>
- <el-button
+ <el-button v-if="permissionList.escapeOwnerBtn"
icon="el-icon-guide"
plain
size="small"
@@ -135,7 +130,7 @@
>
杞Щ鎵�鏈夎��
</el-button>
- <el-button
+ <el-button v-if="permissionList.maxSerialnumBtn"
icon="el-icon-data-analysis"
plain
size="small"
@@ -223,21 +218,18 @@
<!-- 鍩虹鐮佹灞曠ず鍖哄煙 -->
<basic-container class="code-basicsec-container">
<p
- style="
- margin-top: -5px;
+ style="margin-top: -5px;
margin-bottom: 4px;
font-weight: 570;
font-size: 19px;
- color: #0e2d5f;
- "
- >
+ color: #0e2d5f;">
鐮佹绠＄悊
</p>
<avue-crud
ref="crudBasic"
:data="basicData"
:option="optionBasic"
- :permission="permissionList"
+ :permission="basicPermissionList"
:table-loading="loadingBasic"
class="code-basic-crud"
@row-click="codeBasicSecRowClick"
@@ -248,8 +240,7 @@
>
<!-- 鍩虹鐮佹琛ㄦ牸鍐呮搷浣滄寜閽� -->
<template slot="menu" slot-scope="scope">
- <el-button
- v-show="currentRuleLcStatus != 'Editing'"
+ <el-button v-if="basicPermissionList.viewBtn && currentRuleLcStatus != 'Editing'"
icon="el-icon-view"
plain
size="small"
@@ -257,8 +248,7 @@
@click="openBasicDialog('view', scope.row)"
>鏌ョ湅
</el-button>
- <el-button
- v-show="currentRuleLcStatus === 'Editing'"
+ <el-button v-if="basicPermissionList.editBtn && currentRuleLcStatus === 'Editing'"
icon="el-icon-edit"
plain
size="small"
@@ -266,11 +256,7 @@
@click="openBasicDialog('edit', scope.row)"
>缂栬緫
</el-button>
- <el-button
- v-show="
- 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"
@@ -278,8 +264,7 @@
@click="openBasicSecCodeValueMgr(scope.row)"
>鐮佸�肩鐞�
</el-button>
- <el-button
- v-show="scope.row.orderNum > 1"
+ <el-button v-if="basicPermissionList.basicMoveupBtn && scope.row.orderNum > 1"
icon="el-icon-arrow-up"
plain
size="small"
@@ -287,7 +272,7 @@
@click="upOrderNum(scope.row)"
>涓婄Щ
</el-button>
- <el-button
+ <el-button v-if="basicPermissionList.basicDownBtn"
icon="el-icon-arrow-down"
plain
size="small"
@@ -299,7 +284,7 @@
<!-- 鍩虹鐮佹琛ㄦ牸宸︿笂鏂规寜閽尯鍩� -->
<template slot="menuLeft" slot-scope="scope">
- <el-button
+ <el-button v-if="basicPermissionList.addBtn"
:disabled="selectionList.length <= 0"
icon="el-icon-plus"
size="small"
@@ -308,7 +293,7 @@
>
鏂� 澧�
</el-button>
- <el-button
+ <el-button v-if="basicPermissionList.basicDelBtn"
:disabled="selectionList.length <= 0"
icon="el-icon-delete"
plain
@@ -318,7 +303,7 @@
>
鍒� 闄�
</el-button>
- <el-button
+ <el-button v-if="basicPermissionList.basicAdvancedQueryBtn"
:disabled="selectionList.length <= 0"
icon="el-icon-search"
plain
@@ -1201,9 +1186,7 @@
</el-row>
</div>
<div slot="footer" class="dialog-footer">
- <el-button type="primary" @click="selectedListClassifyLinkAttr"
- >纭� 瀹�</el-button
- >
+ <el-button type="primary" @click="selectedListClassifyLinkAttr">纭� 瀹�</el-button>
<el-button @click="isShowSelectAttrOption = false">鍙� 娑�</el-button>
</div>
</el-dialog>
@@ -1320,10 +1303,12 @@
import { mapGetters } from "vuex";
import { getByRoleUserList } from "@/api/system/user";
import func from "@/util/func";
+import secTypeEnum from '@/enumpack/CodeSecTypeEnum';
export default {
data() {
return {
+ crudOption:{...optionRule},
ruleForm: {},
query: {},
loading: true,
@@ -1586,11 +1571,35 @@
...mapGetters(["permission"]),
permissionList() {
return {
- addBtn: this.vaildData(this.permission.codeRule_add, true),
- viewBtn: this.vaildData(this.permission.codeRule_view, false),
- delBtn: this.vaildData(this.permission.plCodeRule_delete, false),
- editBtn: this.vaildData(this.permission.codeRule_edit, true),
+ // 缂栫爜瑙勫垯鐩稿叧鎸夐挳
+ addBtn: this.vaildData(this.permission.code_rule.code_rule_add, false),
+ //viewBtn: this.vaildData(this.permission.code_rule.code_rule_view, false),
+ rulDelBtn: this.vaildData(this.permission.code_rule.code_rule_delete, false),
+ 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),
+ 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),
+ usescopeBtn: this.vaildData(this.permission.code_rule.code_rule_usescope, false),
+ clearBtn: this.vaildData(this.permission.code_rule.code_rule_clear, false),
+ escapeOwnerBtn: this.vaildData(this.permission.code_rule.code_rule_escape_owner, false),
+ maxSerialnumBtn: this.vaildData(this.permission.code_rule.code_rule_max_serialnum, false),
};
+ },
+ basicPermissionList() {
+ 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),
+ 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),
+ basicMoveupBtn: this.vaildData(this.permission.code_rule.code_basic_moveup, false),
+ basicDownBtn: this.vaildData(this.permission.code_rule.code_basic_down, false),
+ }
},
},
watch: {},
@@ -1646,11 +1655,11 @@
if (JSON.stringify(conditionMaps) != "{}") {
if (this.advancedQueryParam.currentOpen == "codeRule") {
this.query = conditionMaps;
+ // console.log(this.query);
this.onLoad(this.page);
} else {
this.sendGridCodeBasicSec(conditionMaps, true);
}
- //console.log(conditionMaps);
}
},
/* 鍏紡缂栬緫妗嗗唴瀹规敼鍙�,瀛愮粍浠剁紪杈戝畬鍏紡涔嬪悗鍐呭鍥炴樉鏃惰皟鐢� */
@@ -1659,12 +1668,12 @@
},
/* 寮曠敤鐮佹鍙傜収閰嶇疆,瀛愮粍浠跺～瀹屽弬鐓ч厤缃箣鍚庡唴瀹瑰洖鏄炬椂璋冪敤 */
setReferConfigValue(content) {
- // console.log(content.referTypeName);
this.form.referBtmId = content.referType || "";
this.form.referBtmName = content.referTypeName || content.referType;
//杞崲鎴怞SON瀛楃涓茶繘琛岀埗缁勪欢鍥炴樉
let submitFormJson = JSON.stringify(content);
this.form.referConfig = submitFormJson || "";
+ debugger;
},
/** 寮曠敤鐮佹涓恒�愬弬鐓у紩鐢ㄧ殑涓氬姟绫诲瀷銆戦�夊彇鍊间箣鍚庣殑鍐呭鍥炴樉鏃惰皟鐢� */
echoReferBtmType(content) {
@@ -1676,7 +1685,6 @@
/** 鐖跺垎绫婚�夋嫨瀵硅瘽妗嗭紝绗簩灞傚祵濂楀璇濇锛屽強鍏剁浉鍏虫柟娉� */
/** 淇濆瓨褰撳墠鐖跺垎绫荤爜娈电殑閫変腑琛岋紝骞惰繘琛屽洖鏄� */
saveSelectedParentClassify() {
- //console.log(this.parentClsfyParams.parentClassifySelectionList.length);
if (this.parentClsfyParams.parentClassifySelectionList.length != 1) {
this.$message.warning("璇烽�夋嫨涓�鏉℃暟鎹�!");
return false;
@@ -1744,7 +1752,6 @@
page.pageSize,
conditionMaps
).then((res) => {
- //console.log(res.data);
const data = res.data.data;
parentClsParam.parentClassifyDataPage.total = data.total;
parentClsParam.parentClassifyData = data.records;
@@ -1762,7 +1769,6 @@
/** 鍔犺浇鍒嗙被杩炴帴灞炴�ц〃鏍兼暟鎹� */
loadlistClassifyLinkAttr() {
let attrParam = this.selectAttrParams;
- //console.log(this.currentSelectTreeData);
this.selectAttrParams.selectAttrOptionLoading = true;
let conditionMaps = {};
if (attrParam.selectAttrQeury) {
@@ -1780,7 +1786,6 @@
this.$nextTick(() => {
this.$refs[attrParam.ref].doLayout();
});
- //console.log(data.data);
this.selectAttrParams.selectAttrData = data.data;
this.selectAttrParams.selectAttrOptionLoading = false;
// 灏嗘悳绱㈡鍐呭缃┖
@@ -1850,13 +1855,11 @@
this.fixedValueOptionLoading = true;
gridCodeFixedValue(1, -1, { codeFixedSecOid: row.oid }).then((res) => {
this.fixedValueData = res.data.data.records;
- //console.log(this.fixedValueData);
this.fixedValueOptionLoading = false;
});
},
/** 鍗曞嚮鍥哄畾鐮佹鐨勭爜鍊艰〃涓鏃惰Е鍙戠殑浜嬩欢*/
selectedCodeValueRow(row) {
- //console.log(row);
this.selectedFixedOrCodeclassifyValue = row;
this.codeFixdForm.id = row.id;
this.codeFixdForm.description = row.description;
@@ -1868,8 +1871,7 @@
if (!this.tipsCodeSecValueMessage(this.codeFixdForm.id)) {
return;
}
- this.codeFixdForm.codeFixedSecOid =
- this.codefixedsecOrCodeclassifysec.oid;
+ this.codeFixdForm.codeFixedSecOid = this.codefixedsecOrCodeclassifysec.oid;
addSaveCodeFixedValue(this.codeFixdForm).then(
() => {
this.loadFixedValueTableData({
@@ -1893,7 +1895,6 @@
}
this.codeClassifyForm.codeClassifySecOid =
this.codefixedsecOrCodeclassifysec.oid;
- // console.log(this.codeClassifyForm);
addSaveCodeClassifyValue(this.codeClassifyForm).then(
() => {
this.loadClassifyValueData({
@@ -1918,7 +1919,6 @@
clearFixedOrClassifyForm(condition) {
//鐐瑰嚮鍙栨秷鏃舵竻绌鸿〃鍗曚笌褰撳墠閫変腑鐨勭爜鍊硷紝骞剁鐢ㄦ寜閽�
this.selectedFixedOrCodeclassifyValue = "";
- //console.log(condition);
if (condition === "close") {
this.codeFixdForm = this.$options.data().codeFixdForm;
this.codeClassifyForm = this.$options.data().codeClassifyForm;
@@ -2312,6 +2312,12 @@
queryField: "lcStatus",
comboxKey: "codeSearchLCStatus",
},
+ {
+ data: [],
+ title: "鎵�鏈夎��",
+ fieldType: "text",
+ queryField: "ownerText",
+ },
];
} else {
this.advancedQueryParam.options = [
@@ -2471,7 +2477,6 @@
},
/** 娣诲姞*/
rowSave(row, done, loading) {
- console.log(row);
add(row).then(
() => {
this.onLoad(this.page);
@@ -2547,7 +2552,7 @@
this.query = {};
this.onLoad(this.page);
},
- // 缂栫爜瑙勫垯蹇�熸煡璇�
+ // 缂栫爜瑙勫垯蹇�熸煡璇earchChange
searchChange(params, done) {
this.page.currentPage = 1;
// 澶氫釜conditionMap杩欐牱浼犲弬锛屽揩閫熸煡璇㈤粯璁ら噰鐢ㄦā绯婃煡璇�
@@ -2560,6 +2565,11 @@
}
this.query = requestData;
this.onLoad(this.page, this.query);
+ // console.log( this.findObject(this.optionRule.column,'id'))
+ // console.log(this.crudOption.column[0])
+ // this.crudOption.column && this.crudOption.column.length > 0
+ // ? (this.crudOption.column[0].value = '')
+ // : null;
done();
},
/** 缂栫爜瑙勫垯褰撳墠閫変腑琛屽彉鍖栫殑鏃跺�欒Е鍙�*/
@@ -2597,7 +2607,11 @@
},
onLoad(page, params = {}) {
this.loading = true;
- gridCodeRule(page.currentPage, page.pageSize, params).then((res) => {
+ gridCodeRule(
+ page.currentPage,
+ page.pageSize,
+ Object.assign({},params,this.query),
+ ).then((res) => {
//console.log(res.data);
const data = res.data.data;
this.page.total = data.total;
@@ -2652,13 +2666,13 @@
this.basicSecDialogTitle = "淇敼鐮佹淇℃伅";
this.showbtn = true;
this.basicSecOnlyRead = false;
- //涓篺orm缁戝畾鍊�
} else {
this.basicSecDialogTitle = "鏌ョ湅鐮佹淇℃伅";
this.showbtn = false;
this.basicSecOnlyRead = true;
}
//console.log(this.form);
+ //涓篺orm缁戝畾鍊�
this.changeSectypeFormItems(condition == "add" ? null : row);
this.addBasicCodeSettingBox = true;
},
@@ -2681,16 +2695,16 @@
type: "success",
message: "鎿嶄綔鎴愬姛!",
});
+ // 鍏抽棴瀵硅瘽妗�
+ this.addBasicCodeSettingBox = false;
+ // 鐐瑰嚮鏂板鍩虹鐮佹,鍏抽棴绐楀彛涔嬪悗瑙﹀彂閲嶆柊鍔犺浇
+ this.loadBasic(this.selectionList[0]);
},
(error) => {
window.console.log(error);
}
);
- // 鍏抽棴瀵硅瘽妗�
- this.addBasicCodeSettingBox = false;
}
- // 鐐瑰嚮鏂板鍩虹鐮佹,鍏抽棴绐楀彛涔嬪悗瑙﹀彂閲嶆柊鍔犺浇
- this.loadBasic(this.selectionList[0]);
} else {
// 鍙兘鍙傜収寮曠敤鐨勪笟鍔＄被鍨嬩細鍙戠敓鏀瑰彉鎵�浠ヨ繖鍎跨洿鎺ュreferConfig鐨刯son杩涜鏀瑰彉
if (
@@ -2704,21 +2718,38 @@
// let referValueInfo = JSON.parse(this.form.referValueInfo);
// referValueInfo.referType = this.form.referBtmId;
}
- editSave(this.form).then(
+ 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)+"銆戯紝璇烽棶鏄惁闇�瑕佹竻绌哄叧鑱旂殑鐮佸�硷紵", "鎻愮ず", {
+ distinguishCancelAndClose: true,
+ closeOnClickModal: false,
+ confirmButtonText: "娓呯┖鐮佸��",
+ cancelButtonText: "淇濈暀鐮佸��",
+ }).then(() => {
+ // 娓呯┖鐮佸��
+ this.form.isClearValue = true;
+ }).catch(action => {
+ this.form.isClearValue = false;
+ });
+ }
+ await editSave(this.form).then(
() => {
this.$message({
type: "success",
message: "鎿嶄綔鎴愬姛!",
});
+ this.loadBasic(this.selectionList[0]);
+ // 鍏抽棴瀵硅瘽妗�
+ this.addBasicCodeSettingBox = false;
},
(error) => {
window.console.log(error);
}
);
- this.loadBasic(this.selectionList[0]);
- // 鍏抽棴瀵硅瘽妗�
- this.addBasicCodeSettingBox = false;
}
+ // 鍙栨秷淇濆瓨鎸夐挳鍔犺浇鏁堟灉
this.isLoadingSecCodeAddBtn = false;
},
/** 鍥犱负elementui鐨勮〃鍗曟牎楠岃缃笉涓婃墍浠ラ噰鐢ㄥ垽鏂殑鏂瑰紡鏉ュ仛琛ㄥ崟妫�楠屾柟寮�*/
@@ -2926,6 +2957,10 @@
/** 鍩虹鐮佹鍒犻櫎*/
deleteBasicCode() {
if (!this.tipsMessage(this.selectionBasicList)) {
+ return;
+ }
+ if (this.selectionList.at(-1).lcStatus != "Editing") {
+ this.$message.warning('缂栫爜瑙勫垯鐘舵�佷笉鏄�"缂栬緫涓�"锛屼笉鍏佽鍒犻櫎鐮佹!');
return;
}
let oid = this.selectionBasicList[0].oid;
@@ -3146,42 +3181,25 @@
},
/** 鐮佹绫诲瀷鏀瑰彉鏃讹紝澧炲姞瀵瑰簲鐨刦orm琛ㄥ崟涓殑灞炴��*/
changeSectypeFormItems(row) {
- //console.log(row);
if (
func.isEmpty(this.enumParam.secTypeList) ||
this.enumParam.secTypeList.length == 0
) {
this.loadCodeSecType();
}
- if (row != null) {
- this.form = {
- oid: row.oid,
- id: row.id, //缂栧彿,
- name: row.name, //鍚嶇О
- secType: row.secType, //鐮佹绫诲瀷
- description: row.description, //鎻忚堪
- serialDependFlag: row.serialDependFlag == "true" ? true : false, //鏄惁娴佹按渚濊禆
- serialDependOrder: row.serialDependOrder, //娴佹按渚濊禆椤哄簭
- nullableFlag: row.nullableFlag == "true" ? true : false, //鏄惁涓虹┖
- displayFlag: row.displayFlag == "true" ? true : false,
- componentCodeFlag: row.componentCodeFlag == "true" ? true : false, //鏄惁鍙備笌缂栫爜
- pkCodeRule: row.pkCodeRule, //鎵�灞炵紪鐮佽鍒�
- };
- } else {
- this.form = {
- id: this.form.id, //缂栧彿
- name: this.form.name, //鍚嶇О
- secType: this.form.secType, //鐮佹绫诲瀷
- description: this.form.description, //鎻忚堪
- serialDependFlag: this.form.serialDependFlag, //鏄惁娴佹按渚濊禆
- serialDependOrder: this.form.serialDependOrder, //娴佹按渚濊禆椤哄簭
- nullableFlag: this.form.nullableFlag, //鏄惁涓虹┖
- displayFlag: this.form.displayFlag, //
- componentCodeFlag: this.form.componentCodeFlag, //鏄惁鍙備笌缂栫爜
- pkCodeRule: this.form.pkCodeRule, //鎵�灞炵紪鐮佽鍒�
- };
- //console.log(this.form);
- }
+ 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, //娴佹按渚濊禆椤哄簭
+ 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, //鎵�灞炵紪鐮佽鍒�
+ };
if (this.form.secType === "codefixedsec") {
//鍥哄畾鐮佹
this.form = Object.assign({}, this.form, {
@@ -3246,8 +3264,6 @@
? row.customCodeSerialClass
: "", //鑷畾涔夋祦姘寸畻娉�
});
- console.log(this.form);
- console.log(this.enumParam.codeFillType);
this.loadCodeFillType();
this.loadCodeFillSeparator();
} else if (this.form.secType === "codelevelsec") {
@@ -3293,7 +3309,6 @@
: "", //鏃ユ湡鏍煎紡
});
} else if (this.form.secType === "codeclassifysec") {
- //console.log(this.form);
//鍒嗙被鐮佹
this.form = Object.assign({}, this.form, {
codeSecLengthType:
@@ -3336,7 +3351,15 @@
this.loadCodeFillType();
this.loadCodeFillSeparator();
}
- // console.log(this.form);
+ },
+ // 鍒ゆ柇Boolean鍊兼槸鍚︿负绌猴紝骞朵笖瀵箂tr绫诲瀷甯冨皵鍊艰繘琛岃浆鎹�
+ isNullJsonBoolean(row,form,attr) {
+ //console.log(row[attr],form[attr]);
+ if(row != null){
+ return JSON.parse(row[attr]);
+ }else {
+ return form[attr];
+ }
},
/** 绗竴娆¤姹傜殑鏋氫妇鏁版嵁鏀剧紦瀛�*/
getLocalStorageEnum(enumKey) {
@@ -3393,11 +3416,14 @@
},
// 鏈�澶ф祦姘村彿
maxSerialNum() {
- console.log(this.selectionList);
- if (this.selectionList.length === 0) {
+ if (this.selectionList.length <= 0) {
this.$message.warning("璇烽�夋嫨涓�鏉＄紪鐮佽鍒欙紒");
return;
}
+ if(this.selectionList.length> 1){
+ this.$message.warning("鍙兘閫夋嫨涓�鏉＄紪鐮佽鍒欙紒");
+ return;
+ }
this.maxSerial.visible = true;
this.maxSerial.ruleOid = this.selectionList[0]["oid"];
},
--
Gitblit v1.9.3