From 10c2ee4be4508c62b5980cc7059b1e8e95f7a3cc Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 04 七月 2023 17:22:11 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
---
Source/UBCS-WEB/src/views/system/tenant.vue | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/system/tenant.vue b/Source/UBCS-WEB/src/views/system/tenant.vue
index be50ba3..96ce15c 100644
--- a/Source/UBCS-WEB/src/views/system/tenant.vue
+++ b/Source/UBCS-WEB/src/views/system/tenant.vue
@@ -13,6 +13,7 @@
@row-save="rowSave"
@search-change="searchChange"
@search-reset="searchReset"
+ @row-click="clickRowChange"
@selection-change="selectionChange"
@current-change="currentChange"
@size-change="sizeChange"
@@ -26,14 +27,6 @@
plain
@click="handleDelete">鍒� 闄�
</el-button>
- <el-tooltip class="item" effect="dark" content="缁欑鎴烽厤缃处鍙烽搴︺�佽繃鏈熸椂闂寸瓑鎺堟潈淇℃伅" placement="top">
- <el-button size="small"
- plain
- v-if="userInfo.role_name.includes('administrator')"
- icon="el-icon-setting"
- @click="handleSetting">鎺堟潈閰嶇疆
- </el-button>
- </el-tooltip>
<el-tooltip class="item" effect="dark" content="缁欑鎴烽厤缃嫭绔嬫暟鎹簮浠ュ疄鐜版暟鎹簱闅旂" placement="top">
<el-button size="small"
plain
@@ -68,7 +61,7 @@
<el-tag>{{ row.expireTime ? row.expireTime : '涓嶉檺鍒�' }}</el-tag>
</template>
</avue-crud>
-
+
<el-dialog title="绉熸埛鏁版嵁婧愰厤缃�"
append-to-body
:visible.sync="datasourceBox"
@@ -135,8 +128,8 @@
viewBtn: true,
dialogWidth: 900,
dialogClickModal: false,
+ highlightCurrentRow: true, //琛岄�変腑鏃堕珮浜�
column: [
-
{
label: "绉熸埛ID",
prop: "tenantId",
@@ -224,7 +217,7 @@
type: 'upload',
listType: 'picture-img',
dataType: 'string',
- action: '/api/blade-resource/oss/endpoint/put-file',
+ action: '/api/ubcs-resource/oss/endpoint/put-file',
propsHttp: {
res: 'data',
url: 'link',
@@ -263,7 +256,7 @@
search: true,
span: 24,
type: "select",
- dicUrl: "/api/blade-develop/datasource/select",
+ dicUrl: "/api/ubcs-develop/datasource/select",
props: {
label: "name",
value: "id"
@@ -285,7 +278,7 @@
search: true,
span: 24,
type: "select",
- dicUrl: "/api/blade-system/tenant-package/select",
+ dicUrl: "/api/ubcs-system/tenant-package/select",
props: {
label: "packageName",
value: "id"
@@ -310,7 +303,7 @@
created() {
// 鑾峰彇鍒皌rue杩樻槸false鐩存帴璧嬪�硷紝瀹氫箟鏂规硶浼氬氨鏄幏鍙栦笉鍒帮紝涓嶇煡閬撲粈涔堥棶棰橈紝寮哄埗鐢↗SON.parse浼氬湪鍚庨潰杩藉姞涓�涓猟isabled锛屾墍浠ョ洿鎺ヨ幏鍙栥�傚悗鏈熷鏋滄坊鍔燾loumn浼氬嚭鐜癰ug锛岀敤foreach寰幆鍑篶olumn鍦ㄥ垽鏂璽ype鏄惁绛変簬radio锛岀劧鍚庡皢鍗曠嫭radio鐨刣isabled鏀逛负res.data.data
- this.$axios.get('/api/blade-system/tenant/find-ssa-enable').then(res => {
+ this.$axios.get('/api/ubcs-system/tenant/find-ssa-enable').then(res => {
this.option.column[6].disabled= res.data.data
});
},
@@ -360,7 +353,7 @@
message: "鎿嶄綔鎴愬姛!"
});
done();
- console.log(done)
+ // console.log(done)
}, error => {
window.console.log(error);
loading();
@@ -421,8 +414,15 @@
this.onLoad(this.page, params);
done();
},
+ clickRowChange(row){
+ this.$refs.crud.toggleSelection();
+ this.selectionList = row;
+ this.$refs.crud.setCurrentRow(row);
+ this.$refs.crud.toggleRowSelection(row); //閫変腑褰撳墠琛�
+ },
selectionChange(list) {
this.selectionList = list;
+ this.$refs.crud.setCurrentRow(this.selectionList[list.length-1]);
},
selectionClear() {
this.selectionList = [];
--
Gitblit v1.9.3