From cc3d9886a0b6e6f5e7f834045b10735e3197bb7b Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 09 十一月 2023 19:44:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/code/code.vue | 273 +++++++++++++++++++++++++++---------------------------
1 files changed, 138 insertions(+), 135 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/code/code.vue b/Source/UBCS-WEB/src/views/code/code.vue
index c623dfc..5210e2d 100644
--- a/Source/UBCS-WEB/src/views/code/code.vue
+++ b/Source/UBCS-WEB/src/views/code/code.vue
@@ -1552,8 +1552,8 @@
serialDependFlag: false, //鏄惁娴佹按渚濊禆
serialDependOrder: "", //娴佹按渚濊禆椤哄簭
nullableFlag: false, //鏄惁涓虹┖
- prefix: "", //鍓嶇紑
- suffix: "", //鍚庣紑
+ prefixCode: "", //鍓嶇紑
+ suffixCode: "", //鍚庣紑
displayFlag: false, //
componentCodeFlag: false, //鏄惁鍙備笌缂栫爜
pkCodeRule: "", //鎵�灞炵紪鐮佽鍒�
@@ -3219,16 +3219,18 @@
}
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, //鎻忚堪
+ 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, //鍚庣紑
};
if (this.form.secType === "codefixedsec") {
//鍥哄畾鐮佹
@@ -3463,154 +3465,155 @@
</script>
<style>
-[class^="icon-"] {
- font-size: 12px !important;
-}
+ [class^="icon-"] {
+ font-size: 12px !important;
+ }
-.code-rule-crud > .avue-crud__search,
-.code-basic-crud > .avue-crud__search {
- margin-bottom: -15px;
-}
+ .code-rule-crud > .avue-crud__search,
+ .code-basic-crud > .avue-crud__search {
+ margin-bottom: -15px;
+ }
-.clone-input-textarea > .el-form-item__content {
- width: 495px;
-}
+ .clone-input-textarea > .el-form-item__content {
+ width: 495px;
+ }
-.clone-avue-crud > .el-card > .el-card__body > .avue-crud__menu {
- display: none !important;
-}
+ .clone-avue-crud > .el-card > .el-card__body > .avue-crud__menu {
+ display: none !important;
+ }
-.fixed-avue-crud > .el-card > .el-card__body > .avue-crud__menu {
- display: none !important;
-}
+ .fixed-avue-crud > .el-card > .el-card__body > .avue-crud__menu {
+ display: none !important;
+ }
-.other-clone-codebasic-crud > .el-card > .el-card__body > .avue-crud__menu {
- display: none !important;
-}
+ .other-clone-codebasic-crud > .el-card > .el-card__body > .avue-crud__menu {
+ display: none !important;
+ }
-.other-clone-coderule-crud > .el-card > .el-card__body > .avue-crud__menu {
- display: none !important;
-}
+ .other-clone-coderule-crud > .el-card > .el-card__body > .avue-crud__menu {
+ display: none !important;
+ }
-.el-table--small .el-table__cell {
- padding: 3px 0;
-}
+ .el-table--small .el-table__cell {
+ padding: 3px 0;
+ }
-.classify_value_box > .el-scrollbar {
- height: 95%;
-}
+ .classify_value_box > .el-scrollbar {
+ height: 95%;
+ }
-.basic-container > .el-card > .el-card__body {
- margin: -10px 0;
-}
+ .basic-container > .el-card > .el-card__body {
+ margin: -10px 0;
+ }
-.code-basicsec-container {
- padding: 1px 6px;
-}
+ .code-basicsec-container {
+ padding: 1px 6px;
+ }
-.horizontal-line {
- /* margin-top: 19px !important; */
- margin-bottom: -20px !important;
- width: 100%;
- height: 2px;
-}
+ .horizontal-line {
+ /* margin-top: 19px !important; */
+ margin-bottom: -20px !important;
+ width: 100%;
+ height: 2px;
+ }
-.el-card__body > .treeBox {
- height: 56vh;
-}
+ .el-card__body > .treeBox {
+ height: 56vh;
+ }
-.el-col-5 > .box {
- height: 56vh;
-}
+ .el-col-5 > .box {
+ height: 56vh;
+ }
-.operator_,
-filter,
-.layui-btn {
- width: 60px;
-}
+ .operator_,
+ filter,
+ .layui-btn {
+ width: 60px;
+ }
-.left > .el-form-item > .el-form-item__content > .el-input-number {
- width: 120px;
-}
+ .left > .el-form-item > .el-form-item__content > .el-input-number {
+ width: 120px;
+ }
-.left
- > .el-form-item
- > .el-form-item__content
- > .el-input-number
- > .el-input
- > .el-input__inner {
- width: 120px;
-}
+ .left
+ > .el-form-item
+ > .el-form-item__content
+ > .el-input-number
+ > .el-input
+ > .el-input__inner {
+ width: 120px;
+ }
-.el-col > .el-card > .el-card__header {
- background: rgb(213 231 239);
- border-radius: inherit;
-}
+ .el-col > .el-card > .el-card__header {
+ background: rgb(213 231 239);
+ border-radius: inherit;
+ }
-/** 鏂板鐮佹 */
-.add-basicsec-dialog > .el-dialog > .el-dialog__body {
- padding: 20px 20px 4px;
- margin-bottom: 30px;
-}
+ /** 鏂板鐮佹 */
+ .add-basicsec-dialog > .el-dialog > .el-dialog__body {
+ padding: 20px 20px 4px;
+ margin-bottom: 30px;
+ }
-.add-basicsec-total {
- width: 100%;
- height: 500px;
-}
+ .add-basicsec-total {
+ width: 100%;
+ height: 500px;
+ }
-.add-basicsec-total .el-input__inner,
-.add-basicsec-total .el-textarea__inner {
- width: 220px;
-}
+ .add-basicsec-total .el-input__inner,
+ .add-basicsec-total .el-textarea__inner {
+ width: 220px;
+ }
-.add-basicsec-total > .add-basicsec-form {
- display: flex;
- flex-direction: row;
- width: 100%;
- height: 100%;
- align-items: center;
- justify-content: space-around;
-}
-
-.add-basicsec-form > .el-divider--vertical {
- width: 2px;
- height: 78%;
- position: absolute;
- top: 50%;
- left: 50%;
- transform: translate(-50%, -50%);
-}
-
-.left {
- /* float: left; */
- width: 45%;
- height: 100%;
-}
-
-.right {
- /* float: right; */
- margin-right: 2vw;
- height: 100%;
- width: auto;
-}
-
-.add-basicsec-form > .left > .el-form-item,
-.add-basicsec-form > .right > div > .el-form-item{
- margin-bottom: 12px;
-}
-
-/* 瀵硅瘽妗嗗簳閮ㄦ寜閽竟妗嗘牱寮� */
-.el-dialog__footer {
- /* width: 100%; */
- border-top: 1px solid #e9e7e7;
- padding: 5px 10px 10px;
-}
-
-.seloption {
- margin-left: 10px;
-}
-
-/* .code-total > .basic-container__card {
+ .add-basicsec-total > .add-basicsec-form {
+ display: flex;
+ flex-direction: row;
+ width: 100%;
height: 100%;
- } */
+ align-items: center;
+ justify-content: space-around;
+ }
+
+ .add-basicsec-form > .el-divider--vertical {
+ width: 2px;
+ height: 78%;
+ position: absolute;
+ top: 50%;
+ left: 50%;
+ transform: translate(-50%, -50%);
+ }
+
+ .left {
+ /* float: left; */
+ width: 45%;
+ height: 100%;
+ }
+
+ .right {
+ /* float: right; */
+ margin-right: 2vw;
+ height: 100%;
+ width: auto;
+ }
+
+ .add-basicsec-form > .left > .el-form-item,
+ .add-basicsec-form > .right > div > .el-form-item{
+ margin-bottom: 12px;
+ }
+
+ /* 瀵硅瘽妗嗗簳閮ㄦ寜閽竟妗嗘牱寮� */
+ .el-dialog__footer {
+ /* width: 100%; */
+ border-top: 1px solid #e9e7e7;
+ padding: 5px 10px 10px;
+ }
+
+ .seloption {
+ margin-left: 10px;
+ }
+
+ /* .code-total > .basic-container__card {
+ height: 100%;
+ } */
+
</style>
--
Gitblit v1.9.3