From dc9f1a633caa2031873d9a1ed7d924c8a675d098 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期一, 20 十一月 2023 16:11:08 +0800
Subject: [PATCH] 自定义流水算法serialType类型
---
Source/UBCS-WEB/src/views/code/code.vue | 468 ++++++++++++++++++++++++++++++++++------------------------
1 files changed, 275 insertions(+), 193 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/code/code.vue b/Source/UBCS-WEB/src/views/code/code.vue
index c623dfc..1202340 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>
@@ -586,7 +587,7 @@
>
<!-- 绗竴灞傚璇濇,娣诲姞鐮佹淇℃伅瀵硅瘽妗嗕腑鐨勫唴瀹� -->
<div class="add-basicsec-total">
- <el-form :model="form" class="add-basicsec-form">
+ <el-form :model="form" class="add-basicsec-form" :rules="rules" >
<span class="left">
<el-form-item
:label-width="leftFormLabelWidth"
@@ -668,12 +669,12 @@
:disabled="basicSecOnlyRead"
style="margin-right: 20px"
></el-switch>
- <el-input-number
+ <!-- <el-input-number
v-show="form.serialDependFlag"
v-model="form.serialDependOrder"
:readonly="basicSecOnlyRead"
controls-position="right"
- ></el-input-number>
+ ></el-input-number> -->
</el-form-item>
<el-form-item :label-width="leftFormLabelWidth" label="鏄惁涓虹┖:">
@@ -879,10 +880,19 @@
: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.customCodeSerialClassText"
+ :serialType="form.serialType"
+ @setReferValue="setReferValue"
+ ></vciWebRefer>
+ </template>
+
+
</el-form-item>
</div>
<!-- 灞傜骇鐮佹 -->
@@ -1013,9 +1023,9 @@
<!-- 鏃ユ湡鐮佹 -->
<div v-show="form.secType === 'codedatesec' ? true : false">
<el-form-item
+ prop="Dateformat"
:label-width="rightFormLabelWidth"
label="鏃ユ湡鏍煎紡:"
- required
>
<el-input
ref="codeDateFormatStr"
@@ -1147,9 +1157,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 +1257,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 +1284,10 @@
>
</refer-config-dialog>
</el-dialog>
+
+ <!-- 鑷畾涔夋祦姘村弬鐓х粍浠�-->
+
+
</basic-container>
</template>
@@ -1295,7 +1312,7 @@
addSave,
refDataGridClassifySec,
} from "@/api/code/codebasic";
-import { listClassifyLinkAttr } from "@/api/code/codeclassify";
+import {listClassifyLinkAttr} from "@/api/code/codeclassify";
import {
gridCodeFixedValue,
addSaveCodeFixedValue,
@@ -1310,8 +1327,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 +1336,67 @@
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},
+ rules: {
+ Dateformat: [
+ {
+ required: true,
+ trigger: 'blur',
+ validator: (rule, value, callback) => {
+ const Formats = ['yy', 'yyyy', 'yyyy-MM', 'yy-MM', 'yyyy-MM-dd','yy-MM-dd', 'yyyy-MM-dd HH:mm:ss', 'yy-MM-dd HH:mm:ss', 'HH:mm:ss'];
+ if (!Formats.includes(this.form.codeDateFormatStr)) {
+ return callback(new Error('璇疯緭鍏ユ纭棩鏈熸牸寮忥紝渚嬪yyyy-MM-dd锛堝苟鍖哄垎澶у皬鍐欙級锛�'));
+ }
+ callback();
+ }
+ }
+ ]
+ },
+ referConfig:{
+ title: '鑷畾涔夋祦姘村弬鐓�',
+ showField: 'customCodeSerialClassText',
+ field: 'customCodeSerialClass',
+ fieldMap: {
+ serialType:"serialType"
+ },
+ placeholder:'璇烽�夋嫨鑷畾涔夋祦姘�',
+ options: {
+ // 璁剧疆榛樿鐨勫睘鎬�
+ url: 'api/ubcs-code/codeSerialAlgorithmController/gridCodeSerialAlgorithm',
+ textField:'name',
+ valueField:'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: 'serialType', width: 300},
+ {title: '鎻忚堪', field: 'description'}
+ ],
+ queryColumns: [
+ // {field: 'id', title: '绠楁硶缂栧彿'},
+ // {field: 'name', title: '绠楁硶鍚嶇О'}
+ ]
+ }
+ }
+ },
+ crudOption: {...optionRule},
ruleForm: {},
query: {},
loading: true,
@@ -1550,10 +1619,10 @@
secType: "codefixedsec", //鐮佹绫诲瀷
description: "", //鎻忚堪
serialDependFlag: false, //鏄惁娴佹按渚濊禆
- serialDependOrder: "", //娴佹按渚濊禆椤哄簭
+ //serialDependOrder: "", //娴佹按渚濊禆椤哄簭
nullableFlag: false, //鏄惁涓虹┖
- prefix: "", //鍓嶇紑
- suffix: "", //鍚庣紑
+ prefixCode: "", //鍓嶇紑
+ suffixCode: "", //鍚庣紑
displayFlag: false, //
componentCodeFlag: false, //鏄惁鍙備笌缂栫爜
pkCodeRule: "", //鎵�灞炵紪鐮佽鍒�
@@ -1599,7 +1668,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 +1679,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 +1714,15 @@
localStorage.removeItem('codeGetValueType');
},
methods: {
+ //鑷畾涔夋祦姘村け鐒�
+ setReferValue(data){
+ if(data.field){
+ this.form[data.field] = data.value || "";
+ this.form[data.showField] = data.text || "";
+ this.form.serialType = data.rawData[0].serialType || "";
+ }
+ },
/** 杞Щ瑙勫垯鎵�鏈夎�呭璇濇 */
escapeOwner() {
if (this.selectionList.length === 0) {
@@ -1704,7 +1781,7 @@
//杞崲鎴怞SON瀛楃涓茶繘琛岀埗缁勪欢鍥炴樉
let submitFormJson = JSON.stringify(content);
this.form.referConfig = submitFormJson || "";
- debugger;
+ // debugger;
},
/** 寮曠敤鐮佹涓恒�愬弬鐓у紩鐢ㄧ殑涓氬姟绫诲瀷銆戦�夊彇鍊间箣鍚庣殑鍐呭鍥炴樉鏃惰皟鐢� */
echoReferBtmType(content) {
@@ -1884,7 +1961,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 +2065,7 @@
description: this.codeFixdForm.description,
id: this.codeFixdForm.id,
codeFixedSecOid:
- this.selectedFixedOrCodeclassifyValue.codefixedsecoid,
+ this.selectedFixedOrCodeclassifyValue.codefixedsecoid,
};
editCodeFixedValue(editData).then(
() => {
@@ -2409,7 +2486,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 +2510,7 @@
//console.log(res)
if (res.data.data.success) {
this.updateStatus(oid, update);
- }else {
+ } else {
this.$confirm(res.data.data.msg, "鎻愮ず", {
distinguishCancelAndClose: true,
confirmButtonText: "缁х画鍙戝竷",
@@ -2449,8 +2526,7 @@
this.releadDisabled = false;
});
}
- })
- .catch((error) => {
+ }).catch((error) => {
this.releadDisabled = false;
});
this.releadDisabled = false;
@@ -2495,7 +2571,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 +2633,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 +2716,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;
@@ -2725,6 +2801,7 @@
type: "success",
message: "鎿嶄綔鎴愬姛!",
});
+ console.log(this.form)
// 鍏抽棴瀵硅瘽妗�
this.addBasicCodeSettingBox = false;
// 鐐瑰嚮鏂板鍩虹鐮佹,鍏抽棴绐楀彛涔嬪悗瑙﹀彂閲嶆柊鍔犺浇
@@ -2751,8 +2828,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 +3078,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 +3102,7 @@
//瀛樺偍褰撳墠鍏宠仈鐨勭紪鐮佽鍒欑浉鍏充俊鎭�
this.currentCodeRuleOid = row.oid;
this.currentRuleLcStatus = row.lcStatus;
- this.sendGridCodeBasicSec({ pkCodeRule: row.oid }, false);
+ this.sendGridCodeBasicSec({pkCodeRule: row.oid}, false);
}
},
/** 鍙戦�佸姞杞藉熀纭�鐮佹鐨勮姹�*/
@@ -3082,7 +3159,7 @@
},
basicSearchReset() {
this.sendGridCodeBasicSec(
- { pkCodeRule: this.selectionList[this.selectionList.length - 1].oid },
+ {pkCodeRule: this.selectionList[this.selectionList.length - 1].oid},
false
);
},
@@ -3126,7 +3203,7 @@
return;
}
downOrderNum(row.oid).then(() => {
- this.loadBasic({ oid: codeRuleOid });
+ this.loadBasic({oid: codeRuleOid});
this.$message({
type: "success",
message: "鎿嶄綔鎴愬姛!",
@@ -3211,6 +3288,7 @@
},
/** 鐮佹绫诲瀷鏀瑰彉鏃讹紝澧炲姞瀵瑰簲鐨刦orm琛ㄥ崟涓殑灞炴��*/
changeSectypeFormItems(row) {
+ console.log(row)
if (
func.isEmpty(this.enumParam.secTypeList) ||
this.enumParam.secTypeList.length == 0
@@ -3218,17 +3296,20 @@
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, //鎵�灞炵紪鐮佽鍒�
+ pkCodeRule: row != null ? row.pkCodeRule : this.form.pkCodeRule, //鎵�灞炵紪鐮佽鍒�
+ prefixCode: row != null ? row.prefixCode : this.form.prefixCode, //鍓嶇紑
+ suffixCode: row != null ? row.suffixCode : this.form.suffixCode, //鍚庣紑
+ // customCodeSerialClass: row != null ? row.customCodeSerialClass : this.form.customCodeSerialClass
};
if (this.form.secType === "codefixedsec") {
//鍥哄畾鐮佹
@@ -3272,8 +3353,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 != ""
@@ -3286,8 +3367,8 @@
codeFillFlag:
row != null && row.codeFillFlag != ""
? row.codeFillFlag == "true"
- ? true
- : false
+ ? true
+ : false
: false, //娴佹按鏄惁琛ョ爜
customCodeSerialClass:
row != null && row.customCodeSerialClass != ""
@@ -3350,8 +3431,8 @@
matchClassifyValueFlag:
row != null && row.matchClassifyValueFlag != ""
? row.matchClassifyValueFlag == "true"
- ? true
- : false
+ ? true
+ : false
: false, //鏄惁鑷姩鍖归厤鍊�
parentClassifySecOid:
row != null && row.parentClassifySecOid != ""
@@ -3383,19 +3464,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));
});
@@ -3426,7 +3507,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(
@@ -3451,7 +3532,7 @@
this.$message.warning("璇烽�夋嫨涓�鏉＄紪鐮佽鍒欙紒");
return;
}
- if(this.selectionList.length> 1){
+ if (this.selectionList.length > 1) {
this.$message.warning("鍙兘閫夋嫨涓�鏉＄紪鐮佽鍒欙紒");
return;
}
@@ -3534,11 +3615,11 @@
}
.left
- > .el-form-item
- > .el-form-item__content
- > .el-input-number
- > .el-input
- > .el-input__inner {
+> .el-form-item
+> .el-form-item__content
+> .el-input-number
+> .el-input
+> .el-input__inner {
width: 120px;
}
@@ -3595,7 +3676,7 @@
}
.add-basicsec-form > .left > .el-form-item,
-.add-basicsec-form > .right > div > .el-form-item{
+.add-basicsec-form > .right > div > .el-form-item {
margin-bottom: 12px;
}
@@ -3613,4 +3694,5 @@
/* .code-total > .basic-container__card {
height: 100%;
} */
+
</style>
--
Gitblit v1.9.3