From 035317b63479c6a1ce12f0e5c911d5d0e7a99e9b Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 25 十月 2023 22:44:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/code/codeKeyAttrRepeat.vue | 12 +
Source/UBCS-WEB/src/views/integration/applicationForm.vue | 161 ++++++++++++----------
Source/UBCS-WEB/src/views/docking/info.vue | 30 +++-
Source/UBCS-WEB/src/views/integration/systemInfo.vue | 122 +++++++++--------
Source/UBCS-WEB/src/views/code/Match.vue | 19 ++
Source/UBCS-WEB/src/views/docking/task.vue | 8
Source/UBCS-WEB/src/views/integration/integrationTransfer.vue | 21 +-
7 files changed, 216 insertions(+), 157 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/code/Match.vue b/Source/UBCS-WEB/src/views/code/Match.vue
index 9a98bd2..1713b75 100644
--- a/Source/UBCS-WEB/src/views/code/Match.vue
+++ b/Source/UBCS-WEB/src/views/code/Match.vue
@@ -6,6 +6,7 @@
:option="option"
:page.sync="page"
:table-loading="loading"
+ :permission="permissionList"
@row-del="rowDel"
@row-update="rowUpdate"
@row-save="rowSave"
@@ -18,6 +19,7 @@
<el-button icon="el-icon-search"
plain
size="small"
+ v-if="permissionList.search"
type="primary" @click="searchHandler">鏌� 璇�
</el-button>
<advanced-query :options="options" :visible.sync="findvisible"
@@ -25,16 +27,19 @@
<el-button icon="el-icon-delete"
plain
size="small"
+ v-if="permissionList.delBtn"
type="danger" @click="deleteHandler">鍒� 闄�
</el-button>
<el-button icon="el-icon-edit"
plain
size="small"
+ v-if="permissionList.editBtn"
type="success" @click="editHandler">淇� 鏀�
</el-button>
<el-button icon="el-icon-refresh-right"
plain
size="small"
+ v-if="permissionList.breakBtn"
type="primary" @click="onLoad">鍒� 鏂�
</el-button>
</template>
@@ -44,7 +49,7 @@
<script>
import {getList, add, editSave, deleteData} from "@/api/code/codeMatch";
-
+import {mapGetters} from "vuex";
export default {
name: "Match",
data() {
@@ -212,6 +217,18 @@
created() {
this.onLoad()
},
+ computed:{
+ ...mapGetters(["permission"]),
+ permissionList(){
+ return{
+ search:this.vaildData(this.permission.match.math_search,false),
+ delBtn:this.vaildData(this.permission.match.math_delete,false),
+ addBtn:this.vaildData(this.permission.match.math_add,false),
+ editBtn:this.vaildData(this.permission.match.math_edit,false),
+ breakBtn:this.vaildData(this.permission.match.math_break,false),
+ }
+ },
+ },
methods: {
searchHandler() {
this.findvisible = true;
diff --git a/Source/UBCS-WEB/src/views/code/codeKeyAttrRepeat.vue b/Source/UBCS-WEB/src/views/code/codeKeyAttrRepeat.vue
index e661759..490300f 100644
--- a/Source/UBCS-WEB/src/views/code/codeKeyAttrRepeat.vue
+++ b/Source/UBCS-WEB/src/views/code/codeKeyAttrRepeat.vue
@@ -23,7 +23,7 @@
size="small"
icon="el-icon-delete"
plain
- v-if="permission.plCodeKeyattrrepeat_delete"
+ v-if="permissionList.delBtn"
@click="handleDelete">鍒� 闄�
</el-button>
</template>
@@ -56,10 +56,12 @@
...mapGetters(["permission"]),
permissionList() {
return {
- // addBtn: this.vaildData(this.permission.plCodeKeyattrrepeat_add, false),
- // viewBtn: this.vaildData(this.permission.plCodeKeyattrrepeat_view, false),
- // delBtn: this.vaildData(this.permission.plCodeKeyattrrepeat_delete, false),
- // editBtn: this.vaildData(this.permission.plCodeKeyattrrepeat_edit, false)
+ addBtn: this.vaildData(this.permission.codeKeyAttrRepeat.plCodeKeyattrrepeat_add, false),
+ viewBtn: this.vaildData(this.permission.codeKeyAttrRepeat.plCodeKeyattrrepeat_view, false),
+ delBtn: this.vaildData(this.permission.codeKeyAttrRepeat.plCodeKeyattrrepeat_delete, false),
+ editBtn: this.vaildData(this.permission.codeKeyAttrRepeat.plCodeKeyattrrepeat_edit, false),
+ searchBtn: this.vaildData(this.permission.codeKeyAttrRepeat.plCodeKeyattrrepeat_search, false),
+ emptyBtn: this.vaildData(this.permission.codeKeyAttrRepeat.plCodeKeyattrrepeat_search, false),
};
},
ids() {
diff --git a/Source/UBCS-WEB/src/views/docking/info.vue b/Source/UBCS-WEB/src/views/docking/info.vue
index a05840a..973fcd7 100644
--- a/Source/UBCS-WEB/src/views/docking/info.vue
+++ b/Source/UBCS-WEB/src/views/docking/info.vue
@@ -3,6 +3,7 @@
<el-main>
<basic-container>
<avue-crud ref="crud" v-model="form" :cell-style="cellStyle" :data="data" :option="option" :page.sync="page"
+ :permission="permissionList"
@on-load="onLoad"
@search-change="searchChange"
@search-reset="searchReset"
@@ -10,21 +11,21 @@
@current-change="currentChange"
@size-change="sizeChange" @refresh-change="refreshChange" @row-click="rowClick">
<template slot="menu" slot-scope="{row,index}">
- <el-button v-if="permission.info.info_edit" :disabled="row.usedFlag === 'true' ? false :true"
+ <el-button v-if="permissionList.edit" :disabled="row.usedFlag === 'true' ? false :true"
icon="el-icon-edit" size="small"
type="text"
@click="updateSave(row,index)">缂栬緫
</el-button>
- <el-button v-if="permission.info.info_delete" icon="el-icon-delete" size="small" type="text"
+ <el-button v-if="permissionList.delete" icon="el-icon-delete" size="small" type="text"
@click="deleteSave(row,index)">鍒犻櫎
</el-button>
- <span v-if="permission.info.info_enable">
+ <span v-if="permissionList.enable">
<el-button v-if="row.usedFlag=='false' || row.usedFlag==''" icon="el-icon-position" size="small"
type="text" @click="ENABLE(row,index)">鍚敤
</el-button>
</span>
- <span v-if="permission.info.info_stop">
+ <span v-if="permissionList.stop">
<el-button v-if="row.usedFlag !== 'false' && row.usedFlag !== ''" icon="el-icon-finished"
size="small"
type="text" @click="DISABLE(row, index)">鍋滅敤
@@ -32,12 +33,14 @@
</span>
</template>
<template slot="menuLeft">
- <el-button v-if="permission.info.info_add" icon="el-icon-plus" size="small" type="primary" @click="addSave">
+ <el-button v-if="permissionList.add" icon="el-icon-plus" size="small" type="primary"
+ @click="addSave">
鏂� 澧�
</el-button>
- <el-button v-if="permission.info.info_sync" icon="el-icon-share" size="small" @click="PUSH">鍚� 姝�
+ <el-button v-if="permissionList.sync" icon="el-icon-share" size="small" @click="PUSH">鍚� 姝�
</el-button>
- <el-button v-if="permission.info.info_query" icon="el-icon-search" size="small" @click="openAdvancedQuery">鏌�
+ <el-button v-if="permissionList.query" icon="el-icon-search" size="small"
+ @click="openAdvancedQuery">鏌�
璇�
</el-button>
</template>
@@ -66,6 +69,7 @@
export default {
name: "info",
components: {infoForm},
+
data() {
return {
//鎺ュ彛绫诲瀷涓嬫媺
@@ -262,7 +266,17 @@
},
computed: {
...mapGetters(["permission"]),
-
+ permissionList(){
+ return{
+ sync:this.vaildData(this.permission.info.info_sync,false),
+ add:this.vaildData(this.permission.info.info_add,false),
+ query:this.vaildData(this.permission.info.info_query,false),
+ edit:this.vaildData(this.permission.info.info_edit,false),
+ delete:this.vaildData(this.permission.info.info_delete,false),
+ enable:this.vaildData(this.permission.info.info_enable,false),
+ stop:this.vaildData(this.permission.info.info_stop,false),
+ }
+ },
oids() {
let oids = [];
this.selectionList.forEach(ele => {
diff --git a/Source/UBCS-WEB/src/views/docking/task.vue b/Source/UBCS-WEB/src/views/docking/task.vue
index 51132be..916feda 100644
--- a/Source/UBCS-WEB/src/views/docking/task.vue
+++ b/Source/UBCS-WEB/src/views/docking/task.vue
@@ -20,7 +20,7 @@
size="small"
plain
icon="el-icon-refresh-right"
- v-if="permission.task.task_sendPush"
+ v-if="permissionList.sendPush"
@click="handleSend" >鎵嬪姩鎺ㄩ��
</el-button>
<div style="float: right;margin-left: 10px">
@@ -123,6 +123,7 @@
calcHeight: 0,
columnBtn:false,
tip: false,
+ addBtn:false,
searchShow: false,
searchShowBtn:false,
// searchMenuSpan: 6,
@@ -230,10 +231,7 @@
...mapGetters([ "permission"]),
permissionList() {
return {
- addBtn: false,
- viewBtn: false,
- delBtn: false,
- editBtn: false
+ sendPush: this.vaildData(this.permission.task.task_sendPush, false),
};
},
oids() {
diff --git a/Source/UBCS-WEB/src/views/integration/applicationForm.vue b/Source/UBCS-WEB/src/views/integration/applicationForm.vue
index 4aa0f2e..4c11990 100644
--- a/Source/UBCS-WEB/src/views/integration/applicationForm.vue
+++ b/Source/UBCS-WEB/src/views/integration/applicationForm.vue
@@ -1,11 +1,11 @@
<template>
<basic-container>
- <avue-crud :table-loading="loading" :data="data" :option="option" :search.sync="searchParam" :page.sync="page"
+ <avue-crud :table-loading="loading" :data="data" :option="option" :search.sync="searchParam" :page.sync="page" :permission="permissionList"
ref="crud" @refresh-change="getDataList" @search-change="handleSearch" @search-reset="handleReset"
@size-change="handleSizePage" @current-change="handleCurrentPage" @on-load="getDataList"
@selection-change="selectionChange" @row-click="handleRowClick">
<template slot="menuLeft">
- <el-button icon="el-icon-document" size="small" type="primary" @click="handleStatus">闆嗗洟鐢宠鐘舵��
+ <el-button icon="el-icon-document" size="small" type="primary" @click="handleStatus" v-if="permissionList.status">闆嗗洟鐢宠鐘舵��
</el-button>
</template>
</avue-crud>
@@ -15,6 +15,7 @@
<script>
import { getList, queryApplyStat } from '@/api/integration/application.js'
import { dateFormat } from '@/util/date.js'
+import {mapGetters} from 'vuex'
export default {
data() {
return {
@@ -27,79 +28,93 @@
},
searchParam: {},
stateParam: {},
- option: {
- height: "auto",
- tip:false,
- index: true,
- border: true,
- addBtn: false,
- columnBtn: false,
- searchMenuSpan: 8,
- highlightCurrentRow: true,
- menu: false,
- selection: true,
- column: [
- {
- label: '鐢宠鍗曞彿',
- prop: 'id',
- width: 300,
- fixed: true,
- search: true,
- }, {
- label: '闆嗗洟鐮�',
- width: 200,
- prop: 'groupCode',
- search: true,
- }, {
- label: '鎿嶄綔绫诲瀷',
- width: 200,
- prop: 'operationType',
- type: 'select',
- search: true,
- dicData: [{
- label: '鐢宠',
- value: 1
- }, {
- label: '鏇存敼',
- value: 2
- }]
- }, {
- label: '鐢宠鍗曟暟鎹俊鎭�',
- width: 300,
- prop: 'description'
- },
- {
- label: '鍒涘缓鏃堕棿',
- width: 200,
- prop: 'createTime',
- type: 'datetime',
- search: true,
- },
- {
- label: '鏇存敼鏃堕棿',
- width: 200,
- prop: 'lastModifyTime',
- type: 'datetime',
- search: true,
- }, {
- label: '杩斿洖鏍囪瘑',
- width: 100,
- prop: 'code'
- },
- {
- label: '杩斿洖淇℃伅',
- width: 300,
- prop: 'content'
- },
- {
- label: '娑堟伅淇℃伅',
- width: 300,
- prop: 'msg'
- }
- ]
- }
}
},
+ computed:{
+ ...mapGetters(["permission"]),
+ permissionList(){
+ return{
+ searchBtn:this.vaildData(this.permission.applicationForm.applicationForm_search,false),
+ emptyBtn:this.vaildData(this.permission.applicationForm.applicationForm_search,false),
+ status:this.vaildData(this.permission.applicationForm.applicationForm_status,false)
+ }
+ },
+ option(){
+ return{
+ height: "auto",
+ tip:false,
+ index: true,
+ border: true,
+ addBtn: false,
+ columnBtn: false,
+ searchBtn:this.permissionList.searchBtn,
+ emptyBtn:this.permissionList.emptyBtn,
+ searchMenuSpan: 8,
+ highlightCurrentRow: true,
+ menu: false,
+ selection: true,
+ column: [
+ {
+ label: '鐢宠鍗曞彿',
+ prop: 'id',
+ width: 300,
+ fixed: true,
+ search: true,
+ }, {
+ label: '闆嗗洟鐮�',
+ width: 200,
+ prop: 'groupCode',
+ search: true,
+ }, {
+ label: '鎿嶄綔绫诲瀷',
+ width: 200,
+ prop: 'operationType',
+ type: 'select',
+ search: true,
+ dicData: [{
+ label: '鐢宠',
+ value: 1
+ }, {
+ label: '鏇存敼',
+ value: 2
+ }]
+ }, {
+ label: '鐢宠鍗曟暟鎹俊鎭�',
+ width: 300,
+ prop: 'description'
+ },
+ {
+ label: '鍒涘缓鏃堕棿',
+ width: 200,
+ prop: 'createTime',
+ type: 'datetime',
+ search: true,
+ },
+ {
+ label: '鏇存敼鏃堕棿',
+ width: 200,
+ prop: 'lastModifyTime',
+ type: 'datetime',
+ search: true,
+ }, {
+ label: '杩斿洖鏍囪瘑',
+ width: 100,
+ prop: 'code'
+ },
+ {
+ label: '杩斿洖淇℃伅',
+ width: 300,
+ prop: 'content'
+ },
+ {
+ label: '娑堟伅淇℃伅',
+ width: 300,
+ prop: 'msg'
+ }
+ ]
+ }
+ }
+ },
methods: {
async handleStatus() {
const { oids } = this.stateParam
diff --git a/Source/UBCS-WEB/src/views/integration/integrationTransfer.vue b/Source/UBCS-WEB/src/views/integration/integrationTransfer.vue
index 4bd65f3..e070be9 100644
--- a/Source/UBCS-WEB/src/views/integration/integrationTransfer.vue
+++ b/Source/UBCS-WEB/src/views/integration/integrationTransfer.vue
@@ -81,15 +81,18 @@
pinyin.setOptions({ checkPolyphone: false, charCase: 1 });
let name = this.props.label
let key = this.props.key
- let data = this.data.map(item => {
- let objitem = { disabled: false, ...item }
- if (this.disabledData.length !== 0) {
- this.disabledData.forEach(element => {
- if (objitem[name] === element) objitem.disabled = true
- });
- }
- return objitem
- })
+ if(this.data){
+ let data = this.data.map(item => {
+ let objitem = { disabled: false, ...item }
+ if (this.disabledData.length !== 0) {
+ this.disabledData.forEach(element => {
+ if (objitem[name] === element) objitem.disabled = true
+ });
+ }
+ return objitem
+ })
+ return
+ }
return data.map(item => {
let pinYin = pinyin.getFullChars(item[this.props.label])
let renPing = pinyin.getCamelChars(item[this.props.label])
diff --git a/Source/UBCS-WEB/src/views/integration/systemInfo.vue b/Source/UBCS-WEB/src/views/integration/systemInfo.vue
index f4978de..ebe2dfd 100644
--- a/Source/UBCS-WEB/src/views/integration/systemInfo.vue
+++ b/Source/UBCS-WEB/src/views/integration/systemInfo.vue
@@ -1,13 +1,15 @@
<template>
<basic-container>
- <avue-crud ref="crud" :data="data" :option="option" :page.sync="page" :search.sync="search" :table-loading="loading"
+ <avue-crud ref="crud" :data="data" :option="option" :page.sync="page" :permission="permissionList" :search.sync="search"
+ :table-loading="loading"
@on-load="getDataList" @row-save="handleSave" @row-del="handleDelete" @row-update="handleEdit"
@refresh-change="handleRefresh" @size-change="handleSizePage" @current-change="handleCurrentPage"
@selection-change="selectionChange" @row-click="handleRowClick">
<template slot="menuLeft">
<!-- <el-button icon="el-icon-search" size="small" type="primary" @click="handleStatus">鏌� 璇�
</el-button> -->
- <el-button icon="el-icon-delete" size="small" type="danger" @click="handleDeleteByIds" v-if="this.permission.systemInfo.systemInfo_remove">鍒� 闄�
+ <el-button v-if="permissionList.delBtn" icon="el-icon-delete" size="small" type="danger"
+ @click="handleDeleteByIds">鍒� 闄�
</el-button>
</template>
<template slot="search" slot-scope="{row,size}">
@@ -19,7 +21,7 @@
:size="size" clearable style="width:300px;margin-left: 10px;"
@clear="handleClear" @keyup.enter.native="handleEnter"></el-input>
</template>
- <template #menu="{row,index,size}" v-if="this.permission.systemInfo.systemInfo_empower">
+ <template v-if="permissionList.empower" #menu="{row,index,size}">
<el-button icon="el-icon-menu" size="small" type="text" @click="classifyHandler(row)">鍒嗙被鎺堟潈</el-button>
</template>
@@ -56,6 +58,7 @@
batchAddSave
} from '@/api/integration/sysInfo.js'
import {mapGetters} from "vuex";
+
export default {
data() {
return {
@@ -98,69 +101,74 @@
},
computed: {
...mapGetters(["permission"]),
- option(){
- return{
- height: "auto",
- tip: false,
- border: true,
- align: 'center',
- menuAlign: 'center',
- index: true,
- searchMenuSpan: 8,
- addBtn:this.permission.systemInfo.systemInfo_add,
- editBtn:this.permission.systemInfo.systemInfo_edit,
- delBtn:this.permission.systemInfo.systemInfo_remove,
- searchBtn: false,
- emptyBtn: false,
- columnBtn: false,
- defaultSort: {
- prop: 'id,name',
- order: 'descending'
+ permissionList() {
+ return {
+ addBtn: this.vaildData(this.permission.systemInfo.systemInfo_add, false),
+ editBtn: this.vaildData(this.permission.systemInfo.systemInfo_edit, false),
+ delBtn: this.vaildData(this.permission.systemInfo.systemInfo_remove, false),
+ empower: this.vaildData(this.permission.systemInfo.systemInfo_empower, false),
+ }
+ },
+ option() {
+ return {
+ height: "auto",
+ tip: false,
+ border: true,
+ align: 'center',
+ menuAlign: 'center',
+ index: true,
+ searchMenuSpan: 8,
+ searchBtn: false,
+ emptyBtn: false,
+ columnBtn: false,
+ defaultSort: {
+ prop: 'id,name',
+ order: 'descending'
+ },
+ selection: true,
+ column: [
+ {
+ label: '绯荤粺缂栧彿',
+ prop: 'id',
+ sortable: true,
+ rules: [{
+ required: true,
+ message: '绯荤粺缂栧彿涓嶈兘涓虹┖',
+ trigger: 'blur'
+ }],
+ // maxlength: 30, //瀛楁暟闄愬埗
+ }, {
+ label: '绯荤粺鍚嶇О',
+ prop: 'name',
+ sortable: true,
+ rules: [{
+ required: true,
+ message: '绯荤粺鍚嶇О涓嶈兘涓虹┖',
+ trigger: 'blur'
+ }],
+ // maxlength: 30, //瀛楁暟闄愬埗
},
- selection: true,
- column: [
- {
- label: '绯荤粺缂栧彿',
- prop: 'id',
- sortable: true,
- rules: [{
- required: true,
- message: '绯荤粺缂栧彿涓嶈兘涓虹┖',
- trigger: 'blur'
- }],
- // maxlength: 30, //瀛楁暟闄愬埗
- }, {
- label: '绯荤粺鍚嶇О',
- prop: 'name',
- sortable: true,
- rules: [{
- required: true,
- message: '绯荤粺鍚嶇О涓嶈兘涓虹┖',
- trigger: 'blur'
- }],
- // maxlength: 30, //瀛楁暟闄愬埗
- },
- {
- label: '绯荤粺鎻忚堪',
- prop: 'description',
- type: 'textarea'
- }
- ]
+ {
+ label: '绯荤粺鎻忚堪',
+ prop: 'description',
+ type: 'textarea'
+ }
+ ]
}
}
},
methods: {
//閲嶇疆
- resetting(){
+ resetting() {
this.$refs.tree.setCheckedKeys([])
// console.log(this.ParentList)
},
empower() {
batchAddSave(this.checkAll.oid, this.checkAll.id, this.ParentList).then(res => {
// console.log(res.data)
- if(res.data.code === 200){
+ if (res.data.code === 200) {
this.$message.success(res.data.msg)
- this.dialogVisible=false;
+ this.dialogVisible = false;
}
})
},
@@ -234,16 +242,17 @@
sysInfoTree({systemOid: row.oid, systemId: row.id}).then(res => {
let List = [];
let value = 0;
- let NumberList= [];
+ let NumberList = [];
+
function traverse(obj, parent) {
//閲嶆柊鏋勫缓涓�娆￠�変腑褰撳墠row鐨勬暟鎹�
const record = {
label: obj.text,
oid: obj.oid,
- attributes:{
+ attributes: {
classifyId: obj.attributes.classifyId,
classifyOid: obj.attributes.classifyOid,
- selected:obj.attributes.selected
+ selected: obj.attributes.selected
},
classParentOid: obj.parentId,
value: value,
@@ -276,6 +285,7 @@
}
}
}
+
for (let item of res.data) {
traverse(item, null);
}
--
Gitblit v1.9.3