From 6a5d1fda15176a5866eaccb31f0e78ef65dd1461 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 07 十一月 2023 17:33:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/code/code.vue | 676 ++++++++++++++++++++------------------------------------
1 files changed, 244 insertions(+), 432 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/code/code.vue b/Source/UBCS-WEB/src/views/code/code.vue
index a3de81c..c9e7ac1 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,9 +44,8 @@
@click="openEdit(scope.row)"
>缂� 杈�
</el-button>
- <el-button
- v-show="scope.row.lcStatus == 'Editing' ? true : false"
- :disabled="releadDisabled"
+ <el-button v-if="permissionList.releaseBtn && (scope.row.lcStatus == 'Editing' ? true : false)"
+ :loading="releadDisabled"
icon="el-icon-position"
plain
size="small"
@@ -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"
@@ -156,7 +151,7 @@
>
</advanced-query>
- <!-- 缂栫爜瑙勫垯鐩稿叧瀵硅瘽妗� -->
+ <!-- 浠ヤ笅鏄紪鐮佽鍒欑浉鍏冲璇濇 -->
<el-dialog
:visible.sync="codeRangeSettingBox"
append-to-body
@@ -177,148 +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"
- @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
@@ -326,6 +191,7 @@
append-to-body
title="杞Щ鎵�鏈夎��"
width="30%"
+ class= "avue-dialog avue-dialog--top"
>
<el-select v-model="ruleOwner" class="selects" placeholder="璇烽�夋嫨">
<el-option
@@ -352,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"
@@ -377,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"
@@ -386,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"
@@ -395,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"
@@ -407,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"
@@ -416,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"
@@ -428,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"
@@ -437,7 +293,7 @@
>
鏂� 澧�
</el-button>
- <el-button
+ <el-button v-if="basicPermissionList.basicDelBtn"
:disabled="selectionList.length <= 0"
icon="el-icon-delete"
plain
@@ -447,7 +303,7 @@
>
鍒� 闄�
</el-button>
- <el-button
+ <el-button v-if="basicPermissionList.basicAdvancedQueryBtn"
:disabled="selectionList.length <= 0"
icon="el-icon-search"
plain
@@ -468,7 +324,7 @@
append-to-body
class="avue-dialog avue-dialog--top"
destroy-on-close
- style="height: 100vh"
+ style="height: 110vh"
title="鐮佹鐮佸�肩鐞�"
top="-3%"
@close="clearFixedOrClassifyForm('close')"
@@ -476,17 +332,17 @@
<!-- 鍒嗙被鐮佹鐮佸�肩鐞� -->
<el-row v-show="!isShowFixedForm">
<el-col :span="11">
- <basic-container>
+ <basic-container style="overflow:hidden">
<div
class="box classify_value_box"
style="height: 60vh; margin-bottom: -40px"
>
<basic-container>
- <div class="abox" style="height: 54vh">
+ <div class="abox">
<avue-tree
:data="classifyValueTreeData"
:option="classisyValueTreeOption"
- style=""
+ style="height: calc(60vh - 100px);"
@node-click="classisyValueTreeOnodeClick"
/>
</div>
@@ -720,16 +576,16 @@
:title="basicSecDialogTitle"
:visible.sync="addBasicCodeSettingBox"
append-to-body
- class="avue-dialog avue-dialog--top"
+ class="avue-dialog avue-dialog--top add-basicsec-dialog"
destroy-on-close
lock-scroll
- style="height: 100vh"
+ style="height: 105vh"
top="-3%"
width="900px"
@close="clearBasicAddForm"
>
<!-- 绗竴灞傚璇濇,娣诲姞鐮佹淇℃伅瀵硅瘽妗嗕腑鐨勫唴瀹� -->
- <div class="add-basicsec-total" style="overflow-y: auto; height: 58vh">
+ <div class="add-basicsec-total">
<el-form :model="form" class="add-basicsec-form">
<span class="left">
<el-form-item
@@ -758,7 +614,7 @@
<el-form-item
:label-width="leftFormLabelWidth"
- label="鐮佹绫诲瀷"
+ label="鐮佹绫诲瀷:"
required
>
<el-select
@@ -775,6 +631,24 @@
>
</el-option>
</el-select>
+ </el-form-item>
+
+ <el-form-item
+ :label-width="leftFormLabelWidth"
+ label="鍓嶇紑:">
+ <el-input
+ v-model="form.prefixCode"
+ :readonly="basicSecOnlyRead"
+ ></el-input>
+ </el-form-item>
+
+ <el-form-item
+ :label-width="leftFormLabelWidth"
+ label="鍚庣紑:">
+ <el-input
+ v-model="form.suffixCode"
+ :readonly="basicSecOnlyRead">
+ </el-input>
</el-form-item>
<el-form-item :label-width="leftFormLabelWidth" label="鎻忚堪:">
@@ -962,9 +836,9 @@
>
<el-option
v-for="item in enumParam.codeFillSeparator"
- :key="item.itemValue"
- :label="item.itemName"
- :value="item.itemValue"
+ :key="item.dictKey"
+ :label="item.dictValue"
+ :value="item.dictValue"
>
</el-option>
</el-select>
@@ -1257,9 +1131,9 @@
>
<el-option
v-for="item in enumParam.codeFillSeparator"
- :key="item.itemValue"
- :label="item.itemName"
- :value="item.itemValue"
+ :key="item.dictKey"
+ :label="item.dictValue"
+ :value="item.dictValue"
>
</el-option>
</el-select>
@@ -1269,14 +1143,13 @@
</el-form>
</div>
<!-- 绗竴灞傚璇濇鐨勬寜閽拰鍒嗛殧绾挎潯 -->
- <el-divider class="horizontal-line" direction="horizontal"></el-divider>
+ <!-- <el-divider class="horizontal-line" direction="horizontal"></el-divider> -->
<div slot="footer" class="dialog-footer">
<el-button
:disabled="!showbtn"
type="primary"
- @click="saveOrEditBasicCode"
- >淇� 瀛�</el-button
- >
+ :loading="isLoadingSecCodeAddBtn"
+ @click="saveOrEditBasicCode">淇� 瀛�</el-button>
<el-button @click="addBasicCodeSettingBox = false">鍙� 娑�</el-button>
</div>
@@ -1331,9 +1204,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>
@@ -1412,7 +1283,6 @@
remove,
listUseRange,
updateStatus,
- clone,
clearAllCode,
checkLikeCodeRule,
} from "@/api/code/mdmrule";
@@ -1422,7 +1292,6 @@
upOrderNum,
deleteData,
editSave,
- cloneCodeBasic,
addSave,
refDataGridClassifySec,
} from "@/api/code/codebasic";
@@ -1442,10 +1311,8 @@
saveCodeClassifyValueOrder,
} from "@/api/code/codeClassifyValue";
import { getDictionary } from "@/api/omd/enum";
+import { getDictionaryBiz } from "@/api/system/dictbiz";
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";
@@ -1455,11 +1322,12 @@
import { mapGetters } from "vuex";
import { getByRoleUserList } from "@/api/system/user";
import func from "@/util/func";
-import logeVue from '../docking/loge.vue';
+import secTypeEnum from '@/enumpack/CodeSecTypeEnum';
export default {
data() {
return {
+ crudOption:{...optionRule},
ruleForm: {},
query: {},
loading: true,
@@ -1474,21 +1342,13 @@
optionRule: optionRule,
data: [],
currentRuleLcStatus: "",
- /*鍏嬮殕瀵硅瘽妗嗘帶鍒跺彉閲�*/
+
+ /*鍏嬮殕缂栫爜瑙勫垯瀵硅瘽妗嗘帶鍒跺彉閲�*/
cloneSettingBox: false,
- cloneTableLoading: false,
- cloneOption: cloneOption,
- cloneData: [],
- cloneCodeRuleForm: {
- id: "",
- name: "",
- description: "",
- },
+
/*浠庡叾浠栬鍒欏厠闅嗙爜娈�*/
cloneOtherCodeRuleSettingBox: false,
- cloneBasicOption: cloneBasicOption,
- cloneCodeRuleOption: cloneCodeRuleOption,
- selectionOtherCloneCodeBasicList: [], // 褰撳墠閫変腑鐨勫熀纭�鐮佹
+
/** 杞Щ鎵�鏈夎�呭璇濇 */
escapeOwnerVisible: false,
ruleAdminUserList: [], //瑙勫垯绠＄悊鍛樺垪琛�
@@ -1543,7 +1403,8 @@
loadingBasic: false,
selectionBasicList: [],
addBasicCodeSettingBox: false,
- showbtn: false, //鍩虹鐮佹鏂板鏄惁鏄剧ず鍩虹鐮佹
+ showbtn: false, //鍩虹鐮佹鏂板鎸夐挳鏄惁绂佺敤
+ isLoadingSecCodeAddBtn: false,
basicSecDialogTitle: "", //鍩虹鐮佹绗竴灞傚璇濇鏍囬
basicSecOnlyRead: false, //鏂板鍩虹鐮佹琛ㄥ崟鏄惁鍙
@@ -1691,6 +1552,8 @@
serialDependFlag: false, //鏄惁娴佹按渚濊禆
serialDependOrder: "", //娴佹按渚濊禆椤哄簭
nullableFlag: false, //鏄惁涓虹┖
+ prefixCode: "", //鍓嶇紑
+ suffixCode: "", //鍚庣紑
displayFlag: false, //
componentCodeFlag: false, //鏄惁鍙備笌缂栫爜
pkCodeRule: "", //鎵�灞炵紪鐮佽鍒�
@@ -1729,11 +1592,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: {},
@@ -1747,7 +1634,18 @@
this.$refs.crudBasic.doLayout();
});
},
+ // 鐢熷懡閽╁瓙鍑芥暟
+ beforeDestroy() {
+ // 娓呴櫎鎸囧畾缂撳瓨
+ localStorage.removeItem('codeSecType');
+ localStorage.removeItem('codeSecLength');
+ localStorage.removeItem('codeFillType');
+ localStorage.removeItem('codeLevelType');
+ localStorage.removeItem('codeCutType');
+ localStorage.removeItem('codeGetValueType');
+ },
methods: {
+
/** 杞Щ瑙勫垯鎵�鏈夎�呭璇濇 */
escapeOwner() {
if (this.selectionList.length === 0) {
@@ -1788,11 +1686,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);
}
},
/* 鍏紡缂栬緫妗嗗唴瀹规敼鍙�,瀛愮粍浠剁紪杈戝畬鍏紡涔嬪悗鍐呭鍥炴樉鏃惰皟鐢� */
@@ -1801,12 +1699,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) {
@@ -1818,7 +1716,6 @@
/** 鐖跺垎绫婚�夋嫨瀵硅瘽妗嗭紝绗簩灞傚祵濂楀璇濇锛屽強鍏剁浉鍏虫柟娉� */
/** 淇濆瓨褰撳墠鐖跺垎绫荤爜娈电殑閫変腑琛岋紝骞惰繘琛屽洖鏄� */
saveSelectedParentClassify() {
- //console.log(this.parentClsfyParams.parentClassifySelectionList.length);
if (this.parentClsfyParams.parentClassifySelectionList.length != 1) {
this.$message.warning("璇烽�夋嫨涓�鏉℃暟鎹�!");
return false;
@@ -1886,7 +1783,6 @@
page.pageSize,
conditionMaps
).then((res) => {
- //console.log(res.data);
const data = res.data.data;
parentClsParam.parentClassifyDataPage.total = data.total;
parentClsParam.parentClassifyData = data.records;
@@ -1904,7 +1800,6 @@
/** 鍔犺浇鍒嗙被杩炴帴灞炴�ц〃鏍兼暟鎹� */
loadlistClassifyLinkAttr() {
let attrParam = this.selectAttrParams;
- //console.log(this.currentSelectTreeData);
this.selectAttrParams.selectAttrOptionLoading = true;
let conditionMaps = {};
if (attrParam.selectAttrQeury) {
@@ -1922,7 +1817,6 @@
this.$nextTick(() => {
this.$refs[attrParam.ref].doLayout();
});
- //console.log(data.data);
this.selectAttrParams.selectAttrData = data.data;
this.selectAttrParams.selectAttrOptionLoading = false;
// 灏嗘悳绱㈡鍐呭缃┖
@@ -1992,13 +1886,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;
@@ -2010,14 +1902,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: "鎿嶄綔鎴愬姛!",
@@ -2033,7 +1926,6 @@
}
this.codeClassifyForm.codeClassifySecOid =
this.codefixedsecOrCodeclassifysec.oid;
- // console.log(this.codeClassifyForm);
addSaveCodeClassifyValue(this.codeClassifyForm).then(
() => {
this.loadClassifyValueData({
@@ -2058,7 +1950,6 @@
clearFixedOrClassifyForm(condition) {
//鐐瑰嚮鍙栨秷鏃舵竻绌鸿〃鍗曚笌褰撳墠閫変腑鐨勭爜鍊硷紝骞剁鐢ㄦ寜閽�
this.selectedFixedOrCodeclassifyValue = "";
- //console.log(condition);
if (condition === "close") {
this.codeFixdForm = this.$options.data().codeFixdForm;
this.codeClassifyForm = this.$options.data().codeClassifyForm;
@@ -2452,6 +2343,12 @@
queryField: "lcStatus",
comboxKey: "codeSearchLCStatus",
},
+ {
+ data: [],
+ title: "鎵�鏈夎��",
+ fieldType: "text",
+ queryField: "ownerText",
+ },
];
} else {
this.advancedQueryParam.options = [
@@ -2514,6 +2411,7 @@
updateStatus(oid, update) {
updateStatus({ oid: oid, ts: new Date().getTime, update: update }).then(
() => {
+ this.releadDisabled = false;
this.onLoad(this.page);
this.$message({
type: "success",
@@ -2528,8 +2426,8 @@
/** 鍙戝竷缂栫爜瑙勫垯 */
async enableOrDeactivatse(oid, update) {
if (update === "release") {
- // 閬垮厤鐢ㄦ埛閲嶅鐐瑰嚮鎸夐挳
this.releadDisabled = true;
+ // 閬垮厤鐢ㄦ埛閲嶅鐐瑰嚮鎸夐挳
await checkLikeCodeRule(oid)
.then((res) => {
//console.log(res)
@@ -2540,23 +2438,22 @@
distinguishCancelAndClose: true,
confirmButtonText: "缁х画鍙戝竷",
cancelButtonText: "鍙栨秷",
- })
- .then(() => {
+ }).then(() => {
this.updateStatus(oid, update);
this.releadDisabled = false;
- })
- .catch((action) => {
- this.releadDisabled = false;
+ }).catch((action) => {
this.$message({
type: "info",
message: "鍙栨秷鍙戝竷!",
});
+ this.releadDisabled = false;
});
}
})
.catch((error) => {
this.releadDisabled = false;
});
+ this.releadDisabled = false;
} else {
this.updateStatus(oid, update);
}
@@ -2567,46 +2464,6 @@
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);
},
/** 鎵撳紑浠庡叾浠栫紪鐮佽鍒欎腑鍏嬮殕鐮佹瀵硅瘽妗�*/
openOtherCodeRuleDialog() {
@@ -2619,79 +2476,7 @@
}
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]
- );
- },
- /** 浠庡叾浠栫紪鐮佽鍒欎腑鍏嬮殕鐮佹淇℃伅*/
- 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);
- }
- );
- },
+
/** 娓呯┖鐮佸��*/
clearAllCodeSec() {
if (this.selectionList.length == 0) {
@@ -2722,7 +2507,6 @@
},
/** 娣诲姞*/
rowSave(row, done, loading) {
- console.log(row);
add(row).then(
() => {
this.onLoad(this.page);
@@ -2793,10 +2577,12 @@
}
done();
},
+ // 缂栫爜瑙勫垯蹇�熸煡璇㈤噸缃�
searchReset() {
this.query = {};
this.onLoad(this.page);
},
+ // 缂栫爜瑙勫垯蹇�熸煡璇earchChange
searchChange(params, done) {
this.page.currentPage = 1;
// 澶氫釜conditionMap杩欐牱浼犲弬锛屽揩閫熸煡璇㈤粯璁ら噰鐢ㄦā绯婃煡璇�
@@ -2808,7 +2594,12 @@
});
}
this.query = requestData;
- this.onLoad(this.page);
+ 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();
},
/** 缂栫爜瑙勫垯褰撳墠閫変腑琛屽彉鍖栫殑鏃跺�欒Е鍙�*/
@@ -2846,7 +2637,11 @@
},
onLoad(page, params = {}) {
this.loading = true;
- gridCodeRule(page.currentPage, page.pageSize, this.query).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;
@@ -2871,6 +2666,7 @@
/** 闃叉鎵撳紑杩囩紪杈戠獥鍙ｄ箣鍚庤〃鍗曚腑瀛樺湪鍊硷紝鎵�浠ラ渶瑕佹竻绌�,骞跺垵濮嬪寲form琛ㄥ崟灞炴��*/
clearBasicAddForm() {
this.form = this.$options.data().form;
+ //this.isLoadingSecCodeAddBtn = false;
// this.changeSectypeFormItems(null);
},
/** 鎵撳紑鏂板绐楀彛*/
@@ -2900,18 +2696,19 @@
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;
},
/** 鏂板鍩虹鐮佹*/
async saveOrEditBasicCode() {
+ this.isLoadingSecCodeAddBtn = true;
if (
this.selectionList[0].oid == null ||
this.selectionList[0].oid == ""
@@ -2928,16 +2725,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 (
@@ -2951,21 +2748,39 @@
// 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鐨勮〃鍗曟牎楠岃缃笉涓婃墍浠ラ噰鐢ㄥ垽鏂殑鏂瑰紡鏉ュ仛琛ㄥ崟妫�楠屾柟寮�*/
checkForm() {
@@ -3174,6 +2989,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: "纭畾",
@@ -3200,14 +3019,10 @@
},
/** 鐐瑰嚮瑙﹀彂鍔犺浇鍩虹鐮佹淇℃伅*/
loadBasic(row) {
- if (this.cloneSettingBox) {
- this.cloneTableLoading = true;
- } else {
- this.loadingBasic = true;
- }
+ this.loadingBasic = true;
// console.log(row.oid);
- //瀛樺偍褰撳墠鍏宠仈鐨勭紪鐮佽鍒欑浉鍏充俊鎭�
if (row != "" || row != null) {
+ //瀛樺偍褰撳墠鍏宠仈鐨勭紪鐮佽鍒欑浉鍏充俊鎭�
this.currentCodeRuleOid = row.oid;
this.currentRuleLcStatus = row.lcStatus;
this.sendGridCodeBasicSec({ pkCodeRule: row.oid }, false);
@@ -3237,14 +3052,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;
}
);
},
@@ -3402,42 +3211,27 @@
},
/** 鐮佹绫诲瀷鏀瑰彉鏃讹紝澧炲姞瀵瑰簲鐨刦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, //鎵�灞炵紪鐮佽鍒�
+ prefixCode: row != null ? row.prefixCode:this.form.prefixCode, //鍓嶇紑
+ suffixCode: row!= null ? row.suffixCode:this.form.suffixCode, //鍚庣紑
+ };
if (this.form.secType === "codefixedsec") {
//鍥哄畾鐮佹
this.form = Object.assign({}, this.form, {
@@ -3502,8 +3296,6 @@
? row.customCodeSerialClass
: "", //鑷畾涔夋祦姘寸畻娉�
});
- console.log(this.form);
- console.log(this.enumParam.codeFillType);
this.loadCodeFillType();
this.loadCodeFillSeparator();
} else if (this.form.secType === "codelevelsec") {
@@ -3549,7 +3341,6 @@
: "", //鏃ユ湡鏍煎紡
});
} else if (this.form.secType === "codeclassifysec") {
- //console.log(this.form);
//鍒嗙被鐮佹
this.form = Object.assign({}, this.form, {
codeSecLengthType:
@@ -3592,7 +3383,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) {
@@ -3627,16 +3426,17 @@
this.enumParam.codeFillType = this.getLocalStorageEnum("codeFillType") || [];
},
loadCodeFillSeparator() {
- let enumCach = JSON.parse(localStorage.getItem("codeFillSeparator"));
- if (enumCach == null) {
- getDictionary("codeFillSeparator").then((res) => {
- this.enumParam.codeFillSeparator = res.data.data;
- localStorage.setItem(
- "codeFillSeparator",
- JSON.stringify(res.data.data)
- );
- });
- }
+ //let enumCach = JSON.parse(localStorage.getItem("codeFillSeparator"));
+ //if (enumCach == null) {
+ getDictionaryBiz({code:"codeFillSeparator"}).then((res) => {
+ this.enumParam.codeFillSeparator = res.data.data;
+ //console.log(this.enumParam.codeFillSeparator);
+ localStorage.setItem(
+ "codeFillSeparator",
+ JSON.stringify(res.data.data)
+ );
+ });
+ //}
},
loadCodeLevelType() {
this.enumParam.codeLevelType = this.getLocalStorageEnum("codeLevelType") || [];
@@ -3649,9 +3449,12 @@
},
// 鏈�澶ф祦姘村彿
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;
@@ -3747,8 +3550,14 @@
}
/** 鏂板鐮佹 */
+.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 .el-input__inner,
@@ -3767,9 +3576,11 @@
.add-basicsec-form > .el-divider--vertical {
width: 2px;
- height: 100%;
- margin: 0 auto;
- /* position: fixed; */
+ height: 78%;
+ position: absolute;
+ top: 50%;
+ left: 50%;
+ transform: translate(-50%, -50%);
}
.left {
@@ -3785,8 +3596,9 @@
width: auto;
}
-.right > .el-form > .el-form-item {
- margin-bottom: 8px;
+.add-basicsec-form > .left > .el-form-item,
+.add-basicsec-form > .right > div > .el-form-item{
+ margin-bottom: 12px;
}
/* 瀵硅瘽妗嗗簳閮ㄦ寜閽竟妗嗘牱寮� */
--
Gitblit v1.9.3