From eab19be5f39c7fb5f528be1340206fe789426552 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期五, 08 九月 2023 16:57:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/code/code.vue | 23 +++++++++++------------
1 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/code/code.vue b/Source/UBCS-WEB/src/views/code/code.vue
index fdf2ce5..f69b252 100644
--- a/Source/UBCS-WEB/src/views/code/code.vue
+++ b/Source/UBCS-WEB/src/views/code/code.vue
@@ -476,17 +476,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>
@@ -944,8 +944,6 @@
:key="item.itemValue"
:label="item.itemName"
:value="item.itemValue"
- label="宸﹁ˉ浣�"
- value="codeattrsec"
>
</el-option>
</el-select>
@@ -1230,8 +1228,7 @@
<el-form-item
:label-width="rightFormLabelWidth"
label="缂栫爜琛ヤ綅鏂瑰紡:"
- required
- >
+ required>
<el-select
v-model="form.codeFillType"
:disabled="basicSecOnlyRead"
@@ -1405,7 +1402,7 @@
</el-dialog>
</basic-container>
</template>
-
+
<script>
import {
gridCodeRule,
@@ -1458,6 +1455,7 @@
import { mapGetters } from "vuex";
import { getByRoleUserList } from "@/api/system/user";
import func from "@/util/func";
+import logeVue from '../docking/loge.vue';
export default {
data() {
@@ -3481,8 +3479,7 @@
serialStart:
row != null && row.serialStart != "" ? row.serialStart : 1, //娴佹按鍙疯捣濮嬪��
serialStep: row != null && row.serialStep != "" ? row.serialStep : 1, //娴佹按鐨勬闀�
- codeFillType:
- row != null && row.codeFillType != ""
+ codeFillType: row != null && row.codeFillType != ""
? row.codeFillType
: "code_fill_left", //缂栫爜琛ヤ綅鏂瑰紡
// codeFillSeparatorSelect: row!=null&&row.codeFillSeparatorSelect != '' ? row.codeFillSeparatorSelect:0, //琛ヤ綅鏃剁殑瀛楃锛岄�変腑鐨勪笅鎷夋鐨勪笅鏍�
@@ -3505,6 +3502,8 @@
? row.customCodeSerialClass
: "", //鑷畾涔夋祦姘寸畻娉�
});
+ console.log(this.form);
+ console.log(this.enumParam.codeFillType);
this.loadCodeFillType();
this.loadCodeFillSeparator();
} else if (this.form.secType === "codelevelsec") {
@@ -3661,7 +3660,7 @@
},
};
</script>
-
+
<style>
[class^="icon-"] {
font-size: 12px !important;
@@ -3804,4 +3803,4 @@
/* .code-total > .basic-container__card {
height: 100%;
} */
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.3