From ec7f3f3675efc96b59caa40c5ada96600eb60650 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 26 十月 2023 17:17:01 +0800
Subject: [PATCH] 前端按钮权限功能增加： 接口权限界面、应用管理界面、编码规则管理界面、数据权限界面、菜单权限界面、岗位管理界面、角色权限管理界面、租户管理界面、顶部菜单界面
---
Source/UBCS-WEB/src/views/code/code.vue | 469 +++++++++++----------------------------------------------
1 files changed, 95 insertions(+), 374 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/code/code.vue b/Source/UBCS-WEB/src/views/code/code.vue
index cdbc7b8..2c81867 100644
--- a/Source/UBCS-WEB/src/views/code/code.vue
+++ b/Source/UBCS-WEB/src/views/code/code.vue
@@ -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.delBtn"
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"
@@ -156,7 +151,7 @@
>
</advanced-query>
- <!-- 缂栫爜瑙勫垯鐩稿叧瀵硅瘽妗� -->
+ <!-- 浠ヤ笅鏄紪鐮佽鍒欑浉鍏冲璇濇 -->
<el-dialog
:visible.sync="codeRangeSettingBox"
append-to-body
@@ -177,150 +172,18 @@
</el-dialog>
<!-- 缂栫爜瑙勫垯,鍏嬮殕瀵硅瘽妗� -->
- <el-dialog
+ <clone-rule-dialog
:visible.sync="cloneSettingBox"
- append-to-body
- class="avue-dialog avue-dialog--top"
- style="height: 100vh"
- title="鍏嬮殕缂栫爜瑙勫垯"
- top="-3%"
- width="800px"
- >
- <div>
- <el-row>
- <el-form ref="form" :inline="true" :model="form" label-width="80px">
- <el-form-item label="缂栧彿" required>
- <el-input v-model="cloneCodeRuleForm.id"></el-input>
- </el-form-item>
- <el-form-item label="鍚嶇О" required>
- <el-input v-model="cloneCodeRuleForm.name"></el-input>
- </el-form-item>
- <el-form-item class="clone-input-textarea" label="鎻忚堪">
- <el-input
- v-model="cloneCodeRuleForm.description"
- :autosize="{ minRows: 3, maxRows: 5 }"
- type="textarea"
- ></el-input>
- </el-form-item>
- </el-form>
- </el-row>
- <el-row>
- <p
- style="
- margin: 0 0px 16px 50%;
- font-weight: 500;
- font-size: 20px;
- color: #000;
- "
- >
- 鐮佹绠＄悊
- </p>
- <avue-crud
- :data="cloneData"
- :option="cloneOption"
- :table-loading="cloneTableLoading"
- class="clone-avue-crud"
- @on-load="cloneDataOnLoad"
- >
- <template slot="menu" slot-scope="scope">
- <el-button
- v-show="scope.row.orderNum > 1"
- icon="el-icon-arrow-up"
- plain
- size="small"
- type="text"
- @click="upOrderNum(scope.row)"
- >涓婄Щ
- </el-button>
- <el-button
- icon="el-icon-arrow-down"
- plain
- size="small"
- type="text"
- @click="downOrderNum(scope.row)"
- >涓嬬Щ
- </el-button>
- </template>
- </avue-crud>
- </el-row>
- </div>
- <div slot="footer" class="dialog-footer">
- <el-button type="primary" @click="saveCloneCodeRule">淇� 瀛�</el-button>
- <el-button @click="cloneSettingBox = false">鍙� 娑�</el-button>
- </div>
- </el-dialog>
+ :ruleData="selectionList[0]"
+ @refreshRuleTable="onLoad">
+ </clone-rule-dialog>
<!-- 缂栫爜瑙勫垯,浠庡叾浠栬鍒欏厠闅嗗璇濇 -->
- <el-dialog
+ <clone-other-basic-sec-dialog
:visible.sync="cloneOtherCodeRuleSettingBox"
- append-to-body
- class="avue-dialog avue-dialog--top"
- destroy-on-close
- style="height: 100vh"
- title="鍏嬮殕缂栫爜瑙勫垯鐨勫熀纭�淇℃伅"
- top="-3%"
- width="800px"
- >
- <div>
- <el-row>
- <p
- style="
- margin-top: -20px;
- margin-bottom: 4px;
- font-weight: 570;
- font-size: 19px;
- color: #0e2d5f;
- "
- >
- 缂栫爜瑙勫垯
- </p>
- <avue-crud
- ref="crudCloneCodeRuleOther"
- :data="data"
- :option="cloneCodeRuleOption"
- :page.sync="page"
- :table-loading="loading"
- class="other-clone-coderule-crud"
- @row-click="codeOtherCloneRuleRowClick"
- @size-change="sizeChange"
- @selection-change="selectionOtherCloneCodeRuleChange"
- @search-change="searchOtherCloneChange"
- @search-reset="searchOtherCloneReset"
- @on-load="onLoad"
- >
- </avue-crud>
- </el-row>
- <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
- ref="crudCloneCodeBasicOther"
- :data="basicData"
- :option="cloneBasicOption"
- :table-loading="loadingBasic"
- class="other-clone-codebasic-crud"
- @row-click="codeOtherCloneBasicRowClick"
- @selection-change="selectionOtherCloneCodeBasicChange"
- >
- </avue-crud>
- </el-row>
- </div>
- <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>
+ :quiltCloneCodeRule="selectionList[0]"
+ @refreshRuleTable="onLoad">
+ </clone-other-basic-sec-dialog>
<!-- 缂栫爜瑙勫垯,杞Щ鎵�鏈夎�呭璇濇 -->
<el-dialog
@@ -355,14 +218,11 @@
<!-- 鍩虹鐮佹灞曠ず鍖哄煙 -->
<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
@@ -380,8 +240,7 @@
>
<!-- 鍩虹鐮佹琛ㄦ牸鍐呮搷浣滄寜閽� -->
<template slot="menu" slot-scope="scope">
- <el-button
- v-show="currentRuleLcStatus != 'Editing'"
+ <el-button v-if="permissionList.basicViewBtn && (currentRuleLcStatus != 'Editing')"
icon="el-icon-view"
plain
size="small"
@@ -389,8 +248,7 @@
@click="openBasicDialog('view', scope.row)"
>鏌ョ湅
</el-button>
- <el-button
- v-show="currentRuleLcStatus === 'Editing'"
+ <el-button v-if="permissionList.basicEditBtn && (currentRuleLcStatus === 'Editing')"
icon="el-icon-edit"
plain
size="small"
@@ -398,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="permissionList.basicMgrBtn && (scope.row.secType === 'codeclassifysec' || scope.row.secType == 'codefixedsec')"
icon="el-icon-setting"
plain
size="small"
@@ -410,8 +264,7 @@
@click="openBasicSecCodeValueMgr(scope.row)"
>鐮佸�肩鐞�
</el-button>
- <el-button
- v-show="scope.row.orderNum > 1"
+ <el-button v-if="permissionList.basicMoveupBtn && (scope.row.orderNum > 1)"
icon="el-icon-arrow-up"
plain
size="small"
@@ -419,7 +272,7 @@
@click="upOrderNum(scope.row)"
>涓婄Щ
</el-button>
- <el-button
+ <el-button v-if="permissionList.basicDownBtn"
icon="el-icon-arrow-down"
plain
size="small"
@@ -431,7 +284,7 @@
<!-- 鍩虹鐮佹琛ㄦ牸宸︿笂鏂规寜閽尯鍩� -->
<template slot="menuLeft" slot-scope="scope">
- <el-button
+ <el-button v-if="permissionList.basicAddBtn"
:disabled="selectionList.length <= 0"
icon="el-icon-plus"
size="small"
@@ -440,7 +293,7 @@
>
鏂� 澧�
</el-button>
- <el-button
+ <el-button v-if="permissionList.basicDeleteBtn"
:disabled="selectionList.length <= 0"
icon="el-icon-delete"
plain
@@ -450,7 +303,7 @@
>
鍒� 闄�
</el-button>
- <el-button
+ <el-button v-if="permissionList.basicAdvancedQueryBtn"
:disabled="selectionList.length <= 0"
icon="el-icon-search"
plain
@@ -1414,7 +1267,6 @@
remove,
listUseRange,
updateStatus,
- clone,
clearAllCode,
checkLikeCodeRule,
} from "@/api/code/mdmrule";
@@ -1424,7 +1276,6 @@
upOrderNum,
deleteData,
editSave,
- cloneCodeBasic,
addSave,
refDataGridClassifySec,
} from "@/api/code/codebasic";
@@ -1445,9 +1296,6 @@
} from "@/api/code/codeClassifyValue";
import { getDictionary } from "@/api/omd/enum";
import optionBasic from "@/const/code/codebasic";
-import cloneOption from "@/const/code/cloneOption";
-import cloneBasicOption from "@/const/code/cloneBasicDialogOption";
-import cloneCodeRuleOption from "@/const/code/cloneCodeRuleDialogOption";
import optionRule from "@/const/code/mdmrule";
import attrOption from "@/const/code/selectAttrOptionDialog";
import treeOption from "@/const/code/classifyTreeOptionDialog";
@@ -1461,6 +1309,7 @@
export default {
data() {
return {
+ crudOption:{...optionRule},
ruleForm: {},
query: {},
loading: true,
@@ -1476,24 +1325,11 @@
data: [],
currentRuleLcStatus: "",
- /*鍏嬮殕瀵硅瘽妗嗘帶鍒跺彉閲�*/
+ /*鍏嬮殕缂栫爜瑙勫垯瀵硅瘽妗嗘帶鍒跺彉閲�*/
cloneSettingBox: false,
- cloneTableLoading: false,
- cloneOption: cloneOption,
- cloneData: [],
- cloneCodeRuleForm: {
- id: "",
- name: "",
- description: "",
- },
-
+
/*浠庡叾浠栬鍒欏厠闅嗙爜娈�*/
cloneOtherCodeRuleSettingBox: false,
- cloneBasicOption: cloneBasicOption,
- cloneCodeRuleOption: cloneCodeRuleOption,
- selectionOtherCloneCodeBasicList: [], // 姝ょ晫闈㈠唴褰撳墠閫変腑鐨勫熀纭�鐮佹
- selectionOtherCloneCodeRuleList: [], // 姝ょ晫闈㈠唴褰撳墠閫変腑鐨勭紪鐮佽鍒�
- otherCloneQuery: {}, // 鏌ヨ鏉′欢瀵硅薄
/** 杞Щ鎵�鏈夎�呭璇濇 */
escapeOwnerVisible: false,
@@ -1549,7 +1385,7 @@
loadingBasic: false,
selectionBasicList: [],
addBasicCodeSettingBox: false,
- showbtn: false, //鍩虹鐮佹鏂板鏄惁鏄剧ず鍩虹鐮佹
+ showbtn: false, //鍩虹鐮佹鏂板鎸夐挳鏄惁绂佺敤
isLoadingSecCodeAddBtn: false,
basicSecDialogTitle: "", //鍩虹鐮佹绗竴灞傚璇濇鏍囬
basicSecOnlyRead: false, //鏂板鍩虹鐮佹琛ㄥ崟鏄惁鍙
@@ -1736,10 +1572,30 @@
...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),
+ delBtn: 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),
+ // 鍩虹鐮佹鐩稿叧鎸夐挳
+ basicAddBtn: this.vaildData(this.permission.code_rule.code_basic_add, false),
+ basicDeleteBtn: 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),
+ basicEditBtn: this.vaildData(this.permission.code_rule.code_basic_edit, false),
+ basicViewBtn: this.vaildData(this.permission.code_rule. code_basic_view, false),
+ basicMoveupBtn: this.vaildData(this.permission.code_rule.code_basic_moveup, false),
+ basicDownBtn: this.vaildData(this.permission.code_rule.code_basic_down, false),
};
},
},
@@ -1796,11 +1652,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);
}
},
/* 鍏紡缂栬緫妗嗗唴瀹规敼鍙�,瀛愮粍浠剁紪杈戝畬鍏紡涔嬪悗鍐呭鍥炴樉鏃惰皟鐢� */
@@ -1809,12 +1665,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) {
@@ -1826,7 +1682,6 @@
/** 鐖跺垎绫婚�夋嫨瀵硅瘽妗嗭紝绗簩灞傚祵濂楀璇濇锛屽強鍏剁浉鍏虫柟娉� */
/** 淇濆瓨褰撳墠鐖跺垎绫荤爜娈电殑閫変腑琛岋紝骞惰繘琛屽洖鏄� */
saveSelectedParentClassify() {
- //console.log(this.parentClsfyParams.parentClassifySelectionList.length);
if (this.parentClsfyParams.parentClassifySelectionList.length != 1) {
this.$message.warning("璇烽�夋嫨涓�鏉℃暟鎹�!");
return false;
@@ -1894,7 +1749,6 @@
page.pageSize,
conditionMaps
).then((res) => {
- //console.log(res.data);
const data = res.data.data;
parentClsParam.parentClassifyDataPage.total = data.total;
parentClsParam.parentClassifyData = data.records;
@@ -1912,7 +1766,6 @@
/** 鍔犺浇鍒嗙被杩炴帴灞炴�ц〃鏍兼暟鎹� */
loadlistClassifyLinkAttr() {
let attrParam = this.selectAttrParams;
- //console.log(this.currentSelectTreeData);
this.selectAttrParams.selectAttrOptionLoading = true;
let conditionMaps = {};
if (attrParam.selectAttrQeury) {
@@ -1930,7 +1783,6 @@
this.$nextTick(() => {
this.$refs[attrParam.ref].doLayout();
});
- //console.log(data.data);
this.selectAttrParams.selectAttrData = data.data;
this.selectAttrParams.selectAttrOptionLoading = false;
// 灏嗘悳绱㈡鍐呭缃┖
@@ -2000,13 +1852,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;
@@ -2018,14 +1868,15 @@
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({
oid: this.codefixedsecOrCodeclassifysec.oid,
});
this.clearFixedOrClassifyForm("codefixedsec");
+ this.$refs.crudFixedValue.refreshTable();
+ this.$refs.crudFixedValue.doLayout();
this.$message({
type: "success",
message: "鎿嶄綔鎴愬姛!",
@@ -2041,7 +1892,6 @@
}
this.codeClassifyForm.codeClassifySecOid =
this.codefixedsecOrCodeclassifysec.oid;
- // console.log(this.codeClassifyForm);
addSaveCodeClassifyValue(this.codeClassifyForm).then(
() => {
this.loadClassifyValueData({
@@ -2066,7 +1916,6 @@
clearFixedOrClassifyForm(condition) {
//鐐瑰嚮鍙栨秷鏃舵竻绌鸿〃鍗曚笌褰撳墠閫変腑鐨勭爜鍊硷紝骞剁鐢ㄦ寜閽�
this.selectedFixedOrCodeclassifyValue = "";
- //console.log(condition);
if (condition === "close") {
this.codeFixdForm = this.$options.data().codeFixdForm;
this.codeClassifyForm = this.$options.data().codeClassifyForm;
@@ -2460,6 +2309,12 @@
queryField: "lcStatus",
comboxKey: "codeSearchLCStatus",
},
+ {
+ data: [],
+ title: "鎵�鏈夎��",
+ fieldType: "text",
+ queryField: "ownerText",
+ },
];
} else {
this.advancedQueryParam.options = [
@@ -2568,53 +2423,13 @@
this.updateStatus(oid, update);
}
},
-
+
/** 鎵撳紑缂栫爜瑙勫垯鍏嬮殕瀵硅瘽妗�*/
openCodeRuleDialog() {
if (!this.tipsMessage(this.selectionList)) {
return;
}
this.cloneSettingBox = true;
- this.cloneCodeRuleForm.id = this.selectionList[0].id;
- this.cloneCodeRuleForm.name = this.selectionList[0].name;
- this.cloneCodeRuleForm.description = this.selectionList[0].description;
- this.loadBasic({ oid: this.selectionList[0].oid });
- },
- /** 鍏嬮殕缂栫爜瑙勫垯淇濆瓨鍔熻兘*/
- saveCloneCodeRule() {
- let form = this.cloneCodeRuleForm;
- if (form.id.trim() == "") {
- this.$message.warning("缂栧彿涓嶈兘涓虹┖!");
- return;
- }
- if (form.name.trim() == "") {
- this.$message.warning("鐮佸�间笉鑳戒负绌�!");
- return;
- }
- this.selectionList[0].oid = "";
- this.selectionList[0].id = form.id;
- this.selectionList[0].name = form.name;
- this.selectionList[0].description = form.description;
- this.selectionList[0].createTime = new Date().getTime();
- this.selectionList[0].ts = new Date(this.selectionList[0].ts).getTime();
- this.selectionList[0].lcStatus = "Editing";
- let data = Object.assign({}, this.selectionList[0], {
- elements: this.cloneData,
- });
- clone(data).then(
- () => {
- this.cloneSettingBox = false;
- this.onLoad(this.page);
- this.$message({
- type: "success",
- message: "鎿嶄綔鎴愬姛!",
- });
- },
- (error) => {
- window.console.log(error);
- }
- );
- //console.log(data);
},
/** 鎵撳紑浠庡叾浠栫紪鐮佽鍒欎腑鍏嬮殕鐮佹瀵硅瘽妗�*/
@@ -2627,99 +2442,6 @@
return;
}
this.cloneOtherCodeRuleSettingBox = true;
- },
- /** 浠庡叾浠栫紪鐮佽鍒欎腑鍏嬮殕鐮佹瀵硅瘽妗�-鍗曞嚮缂栫爜瑙勫垯瀹炵幇琛岄�夋嫨*/
- codeOtherCloneRuleRowClick(row) {
- this.$refs.crudCloneCodeRuleOther.toggleSelection();
- this.selectionOtherCloneCodeRuleList = row;
- this.$refs.crudCloneCodeRuleOther.setCurrentRow(row);
- this.$refs.crudCloneCodeRuleOther.toggleRowSelection(row); //閫変腑褰撳墠琛�
- this.loadBasic(row);
- },
- /** 浠庡叾浠栫紪鐮佽鍒欎腑鍏嬮殕鐮佹瀵硅瘽妗�-鍗曞嚮鍩虹鐮佹瀹炵幇琛岄�夋嫨*/
- codeOtherCloneBasicRowClick(row) {
- this.$refs.crudCloneCodeBasicOther.toggleSelection();
- this.selectionOtherCloneCodeBasicList = row;
- this.$refs.crudCloneCodeBasicOther.setCurrentRow(row);
- this.$refs.crudCloneCodeBasicOther.toggleRowSelection(row); //閫変腑褰撳墠琛�
- },
- /** 浠庡叾浠栬鍒欏厠闅嗙爜娈电晫闈腑缂栫爜瑙勫垯褰撳墠閫変腑琛屽彉鍖栫殑鏃跺�欒Е鍙�*/
- selectionOtherCloneCodeRuleChange(list) {
- //console.log(list);
- this.selectionOtherCloneCodeRuleList = list;
- this.$refs.crudBasic.setCurrentRow(
- this.selectionBasicList[list.length - 1]
- );
- if (list == "") {
- this.basicData = [];
- }
- if (this.selectionOtherCloneCodeRuleList.length > 0) {
- this.loadBasic(this.selectionOtherCloneCodeRuleList[list.length - 1]);
- }
- },
- selectionOtherCloneCodeBasicChange(list) {
- this.selectionOtherCloneCodeBasicList = list;
- this.$refs.crudCloneCodeBasicOther.setCurrentRow(
- this.selectionOtherCloneCodeBasicList[list.length - 1]
- );
- },
- /** 浠庡叾浠栬鍒欏厠闅嗙爜娈电晫闈㈤噸缃悳绱㈠姛鑳� */
- searchOtherCloneReset() {
- this.otherCloneQuery = {};
- this.onLoad(this.page);
- },
- /** 浠庡叾浠栬鍒欏厠闅嗙爜娈电晫闈㈡悳绱㈠姛鑳�*/
- searchOtherCloneChange(params, done) {
- this.page.currentPage = 1;
- // 澶氫釜conditionMap杩欐牱浼犲弬锛屽揩閫熸煡璇㈤粯璁ら噰鐢ㄦā绯婃煡璇�
- let requestData = {};
- if (params) {
- Object.keys(params).forEach((key) => {
- requestData["conditionMap" + "[" + key + "_like]"] =
- params[key].trim();
- });
- }
- this.otherCloneQuery = requestData;
- this.onLoad(this.page,requestData);
- done();
- },
- /** 淇濆瓨浠庡叾浠栫紪鐮佽鍒欎腑鍏嬮殕鐮佹淇℃伅*/
- saveOtherCodeBasic() {
- let oid = this.selectionList[0].oid;
- let fromDialogPkCodebasic = this.selectionOtherCloneCodeBasicList;
- if (fromDialogPkCodebasic.length <= 0) {
- this.$message.warning("璇烽�夋嫨鐮佹鏁版嵁!");
- return;
- }
- let res = fromDialogPkCodebasic.filter((item) => {
- return item.pkCodeRule == oid;
- });
- if (res != "") {
- this.$message.warning("闇�瑕佸厠闅嗙殑缂栫爜瑙勫垯涓庤鍏嬮殕鐨勭紪鐮佽鍒欑浉鍚�!");
- return;
- }
- let oidArr = [];
- fromDialogPkCodebasic.forEach((ele) => {
- oidArr.push(ele.oid);
- });
- let data = {
- pkCodeRule: oid,
- oidArr: oidArr.join(","),
- };
- //console.log(data);
- cloneCodeBasic(data).then(
- () => {
- this.cloneOtherCodeRuleSettingBox = false;
- this.onLoad(this.page);
- this.$message({
- type: "success",
- message: "鎿嶄綔鎴愬姛!",
- });
- },
- (error) => {
- window.console.log(error);
- }
- );
},
/** 娓呯┖鐮佸��*/
@@ -2752,7 +2474,6 @@
},
/** 娣诲姞*/
rowSave(row, done, loading) {
- console.log(row);
add(row).then(
() => {
this.onLoad(this.page);
@@ -2828,7 +2549,7 @@
this.query = {};
this.onLoad(this.page);
},
- // 缂栫爜瑙勫垯蹇�熸煡璇�
+ // 缂栫爜瑙勫垯蹇�熸煡璇earchChange
searchChange(params, done) {
this.page.currentPage = 1;
// 澶氫釜conditionMap杩欐牱浼犲弬锛屽揩閫熸煡璇㈤粯璁ら噰鐢ㄦā绯婃煡璇�
@@ -2841,6 +2562,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();
},
/** 缂栫爜瑙勫垯褰撳墠閫変腑琛屽彉鍖栫殑鏃跺�欒Е鍙�*/
@@ -2878,7 +2604,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;
@@ -3209,6 +2939,10 @@
if (!this.tipsMessage(this.selectionBasicList)) {
return;
}
+ if (this.selectionList.at(-1).lcStatus != "Editing") {
+ this.$message.warning('缂栫爜瑙勫垯鐘舵�佷笉鏄�"缂栬緫涓�"锛屼笉鍏佽鍒犻櫎鐮佹!');
+ return;
+ }
let oid = this.selectionBasicList[0].oid;
this.$confirm("鏄惁鍒犻櫎杩欐潯鏁版嵁锛熷鏋滆寮曠敤灏嗕笉鑳借鍒犻櫎锛�", {
confirmButtonText: "纭畾",
@@ -3235,11 +2969,7 @@
},
/** 鐐瑰嚮瑙﹀彂鍔犺浇鍩虹鐮佹淇℃伅*/
loadBasic(row) {
- if (this.cloneSettingBox) {
- this.cloneTableLoading = true;
- } else {
- this.loadingBasic = true;
- }
+ this.loadingBasic = true;
// console.log(row.oid);
if (row != "" || row != null) {
//瀛樺偍褰撳墠鍏宠仈鐨勭紪鐮佽鍒欑浉鍏充俊鎭�
@@ -3272,14 +3002,8 @@
gridCodeBasicSec(1, -1, isAdancedQuery ? condition : conditionMaps).then(
(res) => {
const data = res.data.data;
- if (this.cloneSettingBox) {
- this.cloneData = data.records;
- this.cloneTableLoading = false;
- } else {
- this.basicData = data.records;
- // console.log(this.basicData);
- this.loadingBasic = false;
- }
+ this.basicData = data.records;
+ this.loadingBasic = false;
}
);
},
@@ -3437,7 +3161,6 @@
},
/** 鐮佹绫诲瀷鏀瑰彉鏃讹紝澧炲姞瀵瑰簲鐨刦orm琛ㄥ崟涓殑灞炴��*/
changeSectypeFormItems(row) {
- //console.log(row);
if (
func.isEmpty(this.enumParam.secTypeList) ||
this.enumParam.secTypeList.length == 0
@@ -3471,7 +3194,6 @@
componentCodeFlag: this.form.componentCodeFlag, //鏄惁鍙備笌缂栫爜
pkCodeRule: this.form.pkCodeRule, //鎵�灞炵紪鐮佽鍒�
};
- //console.log(this.form);
}
if (this.form.secType === "codefixedsec") {
//鍥哄畾鐮佹
@@ -3537,8 +3259,6 @@
? row.customCodeSerialClass
: "", //鑷畾涔夋祦姘寸畻娉�
});
- console.log(this.form);
- console.log(this.enumParam.codeFillType);
this.loadCodeFillType();
this.loadCodeFillSeparator();
} else if (this.form.secType === "codelevelsec") {
@@ -3584,7 +3304,6 @@
: "", //鏃ユ湡鏍煎紡
});
} else if (this.form.secType === "codeclassifysec") {
- //console.log(this.form);
//鍒嗙被鐮佹
this.form = Object.assign({}, this.form, {
codeSecLengthType:
@@ -3627,7 +3346,6 @@
this.loadCodeFillType();
this.loadCodeFillSeparator();
}
- // console.log(this.form);
},
/** 绗竴娆¤姹傜殑鏋氫妇鏁版嵁鏀剧紦瀛�*/
getLocalStorageEnum(enumKey) {
@@ -3684,11 +3402,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