From bbfec1dce46556faae84e2f2aa5b4d85b1293d76 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 07 十二月 2023 15:48:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/code/code.vue | 273 +++++++++++++++++++++++++++---------------------------
1 files changed, 137 insertions(+), 136 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/code/code.vue b/Source/UBCS-WEB/src/views/code/code.vue
index 9455958..e5f4d23 100644
--- a/Source/UBCS-WEB/src/views/code/code.vue
+++ b/Source/UBCS-WEB/src/views/code/code.vue
@@ -2,144 +2,147 @@
<basic-container class="code-total" style=" height: 100%">
<!-- 缂栫爜瑙勫垯淇℃伅灞曠ず鍖哄煙 -->
<basic-container class="code-rule-container">
- <p
- style="
+ <div style="height: 40vh;overflow: auto;">
+ <p
+ style="
margin-top: -5px;
margin-bottom: 4px;
font-weight: 570;
font-size: 19px;
color: #0e2d5f;
"
- >
- 缂栫爜瑙勫垯
- </p>
- <avue-crud
- ref="crud"
- v-model="ruleForm"
- :before-open="beforeOpen"
- :data="data"
- :option="optionRule"
- :page.sync="page"
- :permission="permissionList"
- :table-loading="loading"
- class="code-rule-crud"
- @row-click="codeRuleRowClick"
- @row-update="rowUpdate"
- @row-save="rowSave"
- @search-change="searchChange"
- @search-reset="searchReset"
- @selection-change="selectionChange"
- @current-change="currentChange"
- @size-change="sizeChange"
- @refresh-change="refreshChange"
- @on-load="onLoad"
- >
- <!-- 琛ㄦ牸鍐呮搷浣滄寜閽� -->
- <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)"
- >缂� 杈�
- </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')"
- >鍙� 甯�
- </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')"
- >鍋� 鐢�
- </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')"
- >鍚� 鐢�
- </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"
- >
- 鍒� 闄�
- </el-button>
- <el-button v-if="permissionList.advancedQueryBtn"
- 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"
- >
- 鍏� 闅�
- </el-button>
- <el-button v-if="permissionList.otherCloneBtn"
- 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"
- >
- 浣跨敤鑼冨洿
- </el-button>
- <el-button v-if="permissionList.clearBtn"
- 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>
- <el-button v-if="permissionList.maxSerialnumBtn"
- icon="el-icon-data-analysis"
- plain
- size="small"
- @click="maxSerialNum"
- >
- 鏈�澶ф祦姘村彿
- </el-button>
- </template>
- </avue-crud>
+ >
+ 缂栫爜瑙勫垯
+ </p>
+ <avue-crud
+ ref="crud"
+ v-model="ruleForm"
+ :before-open="beforeOpen"
+ :data="data"
+ :option="optionRule"
+ :page.sync="page"
+ :permission="permissionList"
+ :table-loading="loading"
+ class="code-rule-crud"
+ @row-click="codeRuleRowClick"
+ @row-update="rowUpdate"
+ @row-save="rowSave"
+ @search-change="searchChange"
+ @search-reset="searchReset"
+ @selection-change="selectionChange"
+ @current-change="currentChange"
+ @size-change="sizeChange"
+ @refresh-change="refreshChange"
+ @on-load="onLoad"
+ >
+ <!-- 琛ㄦ牸鍐呮搷浣滄寜閽� -->
+ <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)"
+ >缂� 杈�
+ </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')"
+ >鍙� 甯�
+ </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')"
+ >鍋� 鐢�
+ </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')"
+ >鍚� 鐢�
+ </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"
+ >
+ 鍒� 闄�
+ </el-button>
+ <el-button v-if="permissionList.advancedQueryBtn"
+ 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"
+ >
+ 鍏� 闅�
+ </el-button>
+ <el-button v-if="permissionList.otherCloneBtn"
+ 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"
+ >
+ 浣跨敤鑼冨洿
+ </el-button>
+ <el-button v-if="permissionList.clearBtn"
+ 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>
+ <el-button v-if="permissionList.maxSerialnumBtn"
+ icon="el-icon-data-analysis"
+ plain
+ size="small"
+ @click="maxSerialNum"
+ >
+ 鏈�澶ф祦姘村彿
+ </el-button>
+ </template>
+ </avue-crud>
+ </div>
+
</basic-container>
<!-- 楂樼骇鏌ヨ瀵硅瘽妗� -->
@@ -217,6 +220,7 @@
<!-- 鍩虹鐮佹灞曠ず鍖哄煙 -->
<basic-container class="code-basicsec-container">
+ <div style="height: 38.5vh;overflow: auto">
<p
style="margin-top: -5px;
margin-bottom: 4px;
@@ -316,6 +320,7 @@
</el-button>
</template>
</avue-crud>
+ </div>
</basic-container>
<!-- 鐮佹鐮佸�肩鐞嗗璇濇 -->
@@ -3549,10 +3554,6 @@
font-size: 12px !important;
}
-.code-rule-crud > .avue-crud__search,
-.code-basic-crud > .avue-crud__search {
- margin-bottom: -15px;
-}
.clone-input-textarea > .el-form-item__content {
width: 495px;
--
Gitblit v1.9.3