From 05d45bd440ffc92e14e6c8728ac8956a0488c0ab Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期四, 07 十二月 2023 17:20:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/code/code.vue | 495 +++++++++++++++++++++++++++---------------------------
1 files changed, 248 insertions(+), 247 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/code/code.vue b/Source/UBCS-WEB/src/views/code/code.vue
index 9455958..03b6b62 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,105 +220,107 @@
<!-- 鍩虹鐮佹灞曠ず鍖哄煙 -->
<basic-container class="code-basicsec-container">
- <p
- style="margin-top: -5px;
+ <div style="height: 38.5vh;overflow: auto">
+ <p
+ style="margin-top: -5px;
margin-bottom: 4px;
font-weight: 570;
font-size: 19px;
color: #0e2d5f;">
- 鐮佹绠＄悊
- </p>
- <avue-crud
- ref="crudBasic"
- :data="basicData"
- :option="optionBasic"
- :permission="basicPermissionList"
- :table-loading="loadingBasic"
- class="code-basic-crud"
- @row-click="codeBasicSecRowClick"
- @search-change="basicSearchChange"
- @search-reset="basicSearchReset"
- @selection-change="selectionBasicChange"
- @refresh-change="refreshChangeBasicSec"
- >
- <!-- 鍩虹鐮佹琛ㄦ牸鍐呮搷浣滄寜閽� -->
- <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)"
- >鏌ョ湅
- </el-button>
- <el-button v-if="basicPermissionList.editBtn && currentRuleLcStatus === 'Editing'"
- 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')"
- 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)"
- >涓婄Щ
- </el-button>
- <el-button v-if="basicPermissionList.basicDownBtn"
- icon="el-icon-arrow-down"
- plain
- size="small"
- type="text"
- @click="downOrderNum(scope.row)"
- >涓嬬Щ
- </el-button>
- </template>
+ 鐮佹绠＄悊
+ </p>
+ <avue-crud
+ ref="crudBasic"
+ :data="basicData"
+ :option="optionBasic"
+ :permission="basicPermissionList"
+ :table-loading="loadingBasic"
+ class="code-basic-crud"
+ @row-click="codeBasicSecRowClick"
+ @search-change="basicSearchChange"
+ @search-reset="basicSearchReset"
+ @selection-change="selectionBasicChange"
+ @refresh-change="refreshChangeBasicSec"
+ >
+ <!-- 鍩虹鐮佹琛ㄦ牸鍐呮搷浣滄寜閽� -->
+ <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)"
+ >鏌ョ湅
+ </el-button>
+ <el-button v-if="basicPermissionList.editBtn && currentRuleLcStatus === 'Editing'"
+ 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')"
+ 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)"
+ >涓婄Щ
+ </el-button>
+ <el-button v-if="basicPermissionList.basicDownBtn"
+ 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"
- >
- 鏂� 澧�
- </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)"
- >
- 鍒� 闄�
- </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>
- </template>
- </avue-crud>
+ <!-- 鍩虹鐮佹琛ㄦ牸宸︿笂鏂规寜閽尯鍩� -->
+ <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"
+ >
+ 鏂� 澧�
+ </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)"
+ >
+ 鍒� 闄�
+ </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>
+ </template>
+ </avue-crud>
+ </div>
</basic-container>
<!-- 鐮佹鐮佸�肩鐞嗗璇濇 -->
@@ -587,7 +592,7 @@
>
<!-- 绗竴灞傚璇濇,娣诲姞鐮佹淇℃伅瀵硅瘽妗嗕腑鐨勫唴瀹� -->
<div class="add-basicsec-total">
- <el-form :model="form" class="add-basicsec-form" :rules="rules" >
+ <el-form :model="form" :rules="rules" class="add-basicsec-form">
<span class="left">
<el-form-item
:label-width="leftFormLabelWidth"
@@ -883,11 +888,11 @@
<template>
<vciWebRefer
ref="refer"
- :referConfig="this.referConfig || {}"
:display="true"
- :value="form.customCodeSerialClass"
- :text="form.customCodeSerialClassText"
+ :referConfig="this.referConfig || {}"
:serialType="form.serialType"
+ :text="form.customCodeSerialClassText"
+ :value="form.customCodeSerialClass"
@setReferValue="setReferValue"
></vciWebRefer>
</template>
@@ -1023,9 +1028,9 @@
<!-- 鏃ユ湡鐮佹 -->
<div v-show="form.secType === 'codedatesec' ? true : false">
<el-form-item
- prop="Dateformat"
:label-width="rightFormLabelWidth"
label="鏃ユ湡鏍煎紡:"
+ prop="Dateformat"
>
<el-input
ref="codeDateFormatStr"
@@ -1343,7 +1348,7 @@
import vciWebRefer from "../../components/refer/vciWebRefer";
export default {
- components: { vciWebRefer },
+ components: {vciWebRefer},
data() {
return {
rules: {
@@ -1352,7 +1357,7 @@
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'];
+ 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锛堝苟鍖哄垎澶у皬鍐欙級锛�'));
}
@@ -1361,19 +1366,19 @@
}
]
},
- referConfig:{
+ referConfig: {
title: '鑷畾涔夋祦姘村弬鐓�',
showField: 'customCodeSerialClassText',
field: 'customCodeSerialClass',
- fieldMap: {
- serialType:"serialType"
+ fieldMap: {
+ serialType: "serialType"
},
- placeholder:'璇烽�夋嫨鑷畾涔夋祦姘�',
- options: {
+ placeholder: '璇烽�夋嫨鑷畾涔夋祦姘�',
+ options: {
// 璁剧疆榛樿鐨勫睘鎬�
url: 'api/ubcs-code/codeSerialAlgorithmController/gridCodeSerialAlgorithm',
- textField:'name',
- valueField:'classFullName',
+ textField: 'name',
+ valueField: 'classFullName',
isMuti: false,
type: "grid",
method: 'get',
@@ -1715,8 +1720,8 @@
},
methods: {
//鑷畾涔夋祦姘村け鐒�
- setReferValue(data){
- if(data.field){
+ setReferValue(data) {
+ if (data.field) {
this.form[data.field] = data.value || "";
this.form[data.showField] = data.text || "";
this.form.serialType = data.rawData[0].serialType || "";
@@ -2779,7 +2784,7 @@
}
//console.log(this.form);
//涓篺orm缁戝畾鍊�
- this.changeSectypeFormItems(condition == "add" ? null:row);
+ this.changeSectypeFormItems(condition == "add" ? null : row);
this.addBasicCodeSettingBox = true;
},
/** 鏂板鍩虹鐮佹*/
@@ -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