From 2353af8edf94434cd571100bb16ed9fe9f12819d Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 16 四月 2024 20:15:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/integration/integrationIndex.vue | 52 ++++++++++++++++++++++++++++++----------------------
1 files changed, 30 insertions(+), 22 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/integration/integrationIndex.vue b/Source/UBCS-WEB/src/views/integration/integrationIndex.vue
index b0de958..9e77493 100644
--- a/Source/UBCS-WEB/src/views/integration/integrationIndex.vue
+++ b/Source/UBCS-WEB/src/views/integration/integrationIndex.vue
@@ -51,9 +51,9 @@
@selection-change="selectionChange"
@select-all="handleSelectAll">
<template slot="menuLeft">
-<!-- <el-button :disabled="disabledPush" icon="el-icon-plus" size="small" type="primary"-->
-<!-- @click="dialogPush = true">鏂� 澧�-->
-<!-- </el-button>-->
+ <!-- <el-button :disabled="disabledPush" icon="el-icon-plus" size="small" type="primary"-->
+ <!-- @click="dialogPush = true">鏂� 澧�-->
+ <!-- </el-button>-->
<el-button icon="el-icon-check" size="small" type="primary" @click="handleSave">淇� 瀛�
</el-button>
<el-button icon="el-icon-connection" size="small" type="primary"
@@ -62,6 +62,9 @@
<el-button icon="el-icon-connection" size="small" type="primary"
@click="handleSync('one')">鍚屾璇︾粏妯″瀷
</el-button>
+ <el-button icon="el-icon-coordinate" size="small" type="primary"
+ @click="handlerAuto">鑷姩濉厖
+ </el-button>
</template>
</avue-crud>
</el-card>
@@ -69,6 +72,11 @@
<avue-crud ref="crudRange" :data="rangeData" :option="optinoRange" :style="{ marginTop: '-20px'}"
@row-update="handleUpdate"
@row-dblclick="handleRowClick">
+ <template slot="menuLeft">
+ <el-button icon="el-icon-coordinate" size="small" type="primary"
+ @click="handlerAuto">鑷姩濉厖
+ </el-button>
+ </template>
</avue-crud>
</el-card>
</el-card>
@@ -140,8 +148,8 @@
optinoRange: {
title: '灞炴�ф槧灏勫彇鍊艰寖鍥�',
maxHeight: '280px',
- header: false,
rowKey: 'oid',
+ refreshBtn: false,
column: [
{label: '灞炴�ч泦鍥㈡灇涓惧��', prop: 'numTextValue', minWidth: 80},
{label: '闆嗗洟灞炴�ф灇涓炬樉绀哄悕绉�', prop: 'numText', minWidth: 80},
@@ -181,7 +189,7 @@
border: true,
searchMenuSpan: 8,
highlightCurrentRow: true,
- $cellEdit:true,
+ $cellEdit: true,
column: [
{label: '闆嗗洟鍒嗙被', prop: 'sourceClassifyName', minWidth: 80},
{label: '鎵�灞炶鍥�', prop: 'viewName', minWidth: 80},
@@ -192,14 +200,13 @@
prop: 'targetAttrName',
type: 'select',
cell: true,
- allowCreate: true,
filterable: true,
minWidth: 80,
- props:{
- label:'targetAttrName',
- value:'targetAttrName'
+ props: {
+ label: 'targetAttrName',
+ value: 'targetAttrName'
},
- dicData: this.targetNameList,
+ dicData: [],
},
// {
// label: '榛樿鍊�',
@@ -277,7 +284,7 @@
targetAttrId: item.oid,
targetAttrKey: item.id,
targetAttrName: item.name,
- disabled:false
+ disabled: false
}
});
},
@@ -305,8 +312,8 @@
this.loading = false
this.mappingData = response.data.data
- for (const item of this.mappingData){
- if(item.targetAttrName && item.targetAttrId && item.targetAttrKey){
+ for (const item of this.mappingData) {
+ if (item.targetAttrName && item.targetAttrId && item.targetAttrKey) {
const targetObject = this.targetColumn.dicData.find(obj => obj.targetAttrName === item.targetAttrName);
targetObject.disabled = true;
}
@@ -417,14 +424,14 @@
},
// 淇濆瓨鎸夐挳
async handleSave() {
- const getTargetCorresponding = (row) =>{
+ const getTargetCorresponding = (row) => {
return this.targetColumn.dicData.find(column => column.targetAttrName === row.targetAttrName);
}
for (const item of this.mappingData) {
item.$cellEdit = false;
- if(item.targetAttrName){
- const { targetAttrId, targetAttrKey, targetAttrName } = await getTargetCorresponding(item);
- Object.assign(item, { targetAttrId, targetAttrKey, targetAttrName });
+ if (item.targetAttrName) {
+ const {targetAttrId, targetAttrKey, targetAttrName} = await getTargetCorresponding(item);
+ Object.assign(item, {targetAttrId, targetAttrKey, targetAttrName});
}
}
const response = await batchAddSave({dockingPreAttrMappingVOList: this.mappingData})
@@ -547,12 +554,12 @@
}
// 鑾峰彇鐩爣灞炴�т俊鎭�
- const { targetAttrId, targetAttrKey, targetAttrName } = await getTargetCorresponding(row);
+ const {targetAttrId, targetAttrKey, targetAttrName} = await getTargetCorresponding(row);
// 鏇存柊琛屾暟鎹�
- Object.assign(row, { targetAttrId, targetAttrKey, targetAttrName });
+ Object.assign(row, {targetAttrId, targetAttrKey, targetAttrName});
- const response = await batchAddSave({ dockingPreAttrMappingVOList: this.mappingData });
+ const response = await batchAddSave({dockingPreAttrMappingVOList: this.mappingData});
if (response.status === 200) {
this.$message({
@@ -613,8 +620,9 @@
.el-transfer-panel {
width: 270px;
}
- .el-scrollbar__view {
- height: 100px ;
+
+ .el-scrollbar__view {
+ height: 100px;
}
}
--
Gitblit v1.9.3