From f1163944a755f3b06ba3698459629c082c32ccf4 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 02 六月 2023 22:20:23 +0800
Subject: [PATCH] 修改GroupCodeApplyApplication启动类路径错误
---
Source/UBCS-WEB/src/views/integration/integrationIndex.vue | 469 ++++++++++++++++++++++++++++++----------------------------
1 files changed, 244 insertions(+), 225 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/integration/integrationIndex.vue b/Source/UBCS-WEB/src/views/integration/integrationIndex.vue
index 37dd110..9e65713 100644
--- a/Source/UBCS-WEB/src/views/integration/integrationIndex.vue
+++ b/Source/UBCS-WEB/src/views/integration/integrationIndex.vue
@@ -6,53 +6,69 @@
<el-input placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�" v-model="filterText">
</el-input>
<el-menu :default-openeds="['1', '3']">
- <el-tree class="filter-tree" :data="treeData" :props="defaultProps" default-expand-all
- :filter-node-method="filterNode" ref="tree">
+ <el-tree class="filter-tree" :data="treeData" accordion :props="defaultProps"
+ :filter-node-method="filterNode" empty-text="鏆傛棤鏁版嵁" ref="tree" @node-click="handelTreeCell">
</el-tree>
</el-menu>
</el-aside>
</el-card>
<el-main>
<el-card>
- <avue-crud :data="tableData" :option="option" ref="crud" @row-update="addUpdate" @row-save="rowSave"
- @row-click="handleRowClick">
- <template slot="menuLeft">
- <el-button 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" @click="handleSync">鍚屾妯″瀷
- </el-button>
- </template>
- </avue-crud>
+ <el-form :model="form">
+ <el-form-item label="闆嗗洟鍒嗙被" label-width="70px" size="small">
+ <el-select clearable ref="selectTree" v-model="form.groupValue" placeholder="璇烽�夋嫨"
+ popper-class="popperTreeSelect">
+ <el-option :value="groupVal" :label="groupVal">
+ <el-tree ref="groupTree" :data="groupTreeData" empty-text="鏆傛棤鏁版嵁" :props="defaultProps"
+ @node-click="handleNodeClick">
+ </el-tree>
+ </el-option>
+ </el-select>
+
+ </el-form-item>
+ </el-form>
+ <el-card>
+ <avue-crud :table-loading="loading" :data="mappingData" :option="optionMapping" ref="crudMapping"
+ @row-update="handleUpdate" @row-click="handleMapingRowClick">
+ <template slot="menuLeft">
+ <el-button 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" @click="handleSync">鍚屾妯″瀷
+ </el-button>
+ </template>
+ </avue-crud>
+ </el-card>
<el-card :style="{ marginTop: '20px' }">
- <avue-crud :data="tableData" :option="optinos" ref="crud" @row-update="addUpdate"
- @row-save="rowSave" @row-click="handleRowClick">
+ <avue-crud :data="rangeData" :option="optinoRange" ref="crudRange" @row-update="handleUpdate"
+ @row-dblclick="handleRowClick">
</avue-crud>
</el-card>
</el-card>
- <el-dialog title="缂栫爜灞炴��" :visible.sync="dialogPush" destroy-on-close append-to-body="true" width="30%"
- :before-close="handleClose">
- <el-form :model="form">
- <el-form-item label="鏌ヨ鏉′欢" label-width="70px" size="small">
- <el-input v-model="form.name" autocomplete="off" @change="handleQuery"></el-input>
- </el-form-item>
- </el-form>
- <p class="text_tip">*閫夋嫨鍒嗙被杩涜灞炴�ц繃婊�, 鎴栬�呰緭鍏ュ睘鎬х殑鍏ㄦ嫾鎴栬�呯畝鎷艰繘琛屾煡璇�! 濡�: 濮撳悕 (鍙緭鍏m鎴杧inming )</p>
- <transfer v-model="transferValue" :data="transferData" :filter-method="filterMethod"
- filter-placeholder="璇疯緭鍏ュ睘鎬ф嫾闊冲叏鎷兼垨鑰呮嫾闊崇缉鍐�" @left-check-change="handelLeftCheck"></transfer>
- <span slot="footer" class="dialog-footer">
- <el-button @click="dialogPush = false">鍙� 娑�</el-button>
- <el-button type="primary" @click="dialogVisible = false">淇� 瀛�</el-button>
- </span>
- </el-dialog>
</el-main>
</el-container>
+ <el-dialog title="缂栫爜灞炴��" :visible.sync="dialogPush" append-to-body="true" destroy-on-close width="30%"
+ :before-close="handleClose">
+ <el-form :model="form">
+ <el-form-item label="鏌ヨ鏉′欢" label-width="70px" size="small">
+ <el-input v-model="form.name" autocomplete="off" @change="handleQuery"></el-input>
+ </el-form-item>
+ </el-form>
+ <p class="text_tip">*閫夋嫨鍒嗙被杩涜灞炴�ц繃婊�, 鎴栬�呰緭鍏ュ睘鎬х殑鍏ㄦ嫾鎴栬�呯畝鎷艰繘琛屾煡璇�! 濡�: 濮撳悕 (鍙緭鍏m鎴杧inming )</p>
+ <transfer v-model="transferValue" :data="transferData" :filter-method="filterMethod"
+ filter-placeholder="璇疯緭鍏ユ嫾闊冲叏鎷兼垨鑰呮嫾闊崇缉鍐�" @left-check-change="handelLeftCheck"></transfer>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="dialogPush = false">鍙� 娑�</el-button>
+ <el-button type="primary" @click="dialogPush = false">淇� 瀛�</el-button>
+ </span>
+ </el-dialog>
</div>
</template>
<script>
import transfer from '@/components/transfer/index'
import pinyin from 'js-pinyin'
+import { referCodeClassifyTree, referTree, gridAttrMapping, gridAttrRanges, batchAddSave, listCodeAttributeByClassId, syncClassifyModel } from '@/api/integration/integration.js'
export default {
components: {
transfer
@@ -72,245 +88,240 @@
});
return data;
};
+ const options = {
+ menu: false,
+ delBtn: false,
+ addBtn: false,
+ index: true,
+ columnBtn: false,
+ searchShow: true,
+ emptyBtn: false,
+ searchBtn: false,
+ searchShowBtn: false,
+ cellBtn: true,
+ border: true,
+ searchMenuSpan: 8,
+ }
return {
form: {
name: '',
+ groupValue: ''
},
+ loading: false,
+ ishowTree: false,
+ search: '',
transferData: generateData(),
transferValue: [],
dialogPush: false,
- tableData: [
- {
- id: 1,
- groupTypeName: '浜哄憳',
- codeView: '缂栫爜瑙嗗浘',
- sex: '鎬у埆',
- typeName: '铻烘爴',
- attributeName: '',
- defaultValue: '',
- },
- {
- id: 2,
- groupTypeName: '浜哄憳',
- codeView: '缂栫爜瑙嗗浘',
- sex: '鎬у埆',
- typeName: '铻烘爴',
- attributeName: '',
- defaultValue: '',
- },
- {
- id: 3,
- groupTypeName: '浜哄憳',
- codeView: '缂栫爜瑙嗗浘',
- sex: '鎬у埆',
- typeName: '铻烘爴',
- attributeName: '',
- defaultValue: '',
- },
- {
- id: 3,
- groupTypeName: '浜哄憳',
- codeView: '缂栫爜瑙嗗浘',
- sex: '鎬у埆',
- typeName: '铻烘爴',
- attributeName: '',
- defaultValue: '',
- },
- {
- id: 3,
- groupTypeName: '浜哄憳',
- codeView: '缂栫爜瑙嗗浘',
- sex: '鎬у埆',
- typeName: '铻烘爴',
- attributeName: '',
- defaultValue: '',
- },
- {
- id: 3,
- groupTypeName: '浜哄憳',
- codeView: '缂栫爜瑙嗗浘',
- sex: '鎬у埆',
- typeName: '铻烘爴',
- attributeName: '',
- defaultValue: '',
- },
- {
- id: 3,
- groupTypeName: '浜哄憳',
- codeView: '缂栫爜瑙嗗浘',
- sex: '鎬у埆',
- typeName: '铻烘爴',
- attributeName: '',
- defaultValue: '',
- },
- {
- id: 3,
- groupTypeName: '浜哄憳',
- codeView: '缂栫爜瑙嗗浘',
- sex: '鎬у埆',
- typeName: '铻烘爴',
- attributeName: '',
- defaultValue: '',
- },
- {
- id: 3,
- groupTypeName: '浜哄憳',
- codeView: '缂栫爜瑙嗗浘',
- sex: '鎬у埆',
- typeName: '铻烘爴',
- attributeName: '',
- defaultValue: '',
- }
- ],
+ mappingData: [],
+ rangeData: [],
filterText: '',
- optinos: {
+ tableRowIndex: null,
+ tableColumnIndex: null,
+ optinoRange: {
title: '闆嗗洟灞炴��',
maxHeight: '300px',
- menu: true,
- delBtn: false,
- addBtn: false,
- index: true,
header: false,
- columnBtn: false,
- searchShow: true,
- emptyBtn: false,
- searchBtn: false,
- searchShowBtn: false,
- cellBtn: true,
- border: true,
- searchMenuSpan: 8,
+ rowKey: 'oid',
column: [
- { label: '灞炴�ч泦鍥㈡灇涓惧��', prop: 'groupTypeName', minWidth: 80, },
- { label: '闆嗗洟灞炴�ф灇涓炬樉绀哄悕绉�', prop: 'codeView', minWidth: 80 },
- { label: 'MDM鏋氫妇鍊�', prop: 'sex', minWidth: 80 },
- { label: 'MDM鏋氫妇鏄剧ず鍚嶇О', prop: 'typeName', minWidth: 80, overHidden: true },
- ]
+ { label: '灞炴�ч泦鍥㈡灇涓惧��', prop: 'numTextValue', minWidth: 80 },
+ { label: '闆嗗洟灞炴�ф灇涓炬樉绀哄悕绉�', prop: 'numText', minWidth: 80 },
+ { label: 'MDM鏋氫妇鍊�', prop: 'targetNumTextValue', minWidth: 80, cell: true, blur: (value) => window.handleBlur(value, 'range') },
+ { label: 'MDM鏋氫妇鏄剧ず鍚嶇О', prop: 'targetNumText', minWidth: 80, cell: true, blur: (value) => window.handleBlur(value, 'range') },
+ ],
+ ...options
},
- option: {
+ optionMapping: {
maxHeight: '500px',
- menu: true,
- delBtn: false,
- addBtn: false,
- index: true,
header: true,
- columnBtn: false,
- searchShow: true,
- emptyBtn: false,
- searchBtn: false,
- searchShowBtn: false,
- cellBtn: true,
- border: true,
- searchMenuSpan: 8,
+ rowKey: 'oid',
column: [
- {
- label: '闆嗗洟鍒嗙被',
- prop: 'groupTypeName',
- minWidth: 80,
- type: "select",
- dicUrl: "/api/ubcs-system/dict/dictionary?code=org_category",
- props: {
- label: "dictValue",
- value: "dictKey"
- },
- slot: true,
- search: true,
- rules: [{
- message: "璇疯緭鍏ラ泦鍥㈠垎绫诲悕绉�"
- }]
- },
- { label: '鎵�灞炶鍥�', prop: 'codeView', minWidth: 80 },
- { label: '闆嗗洟灞炴��', prop: 'sex', minWidth: 80 },
- { label: '鍒嗙被鍚嶇О', prop: 'typeName', minWidth: 80, overHidden: true },
- { label: '灞炴�у悕绉�', prop: 'attributeName', minWidth: 80, cell: true },
- { label: '榛樿鍊�', prop: 'defaultValue', minWidth: 140, cell: true },
- ]
+ { label: '闆嗗洟鍒嗙被', prop: 'sourceClassifyName', minWidth: 80 },
+ { label: '鎵�灞炶鍥�', prop: 'viewName', minWidth: 80 },
+ { label: '闆嗗洟灞炴��', prop: 'sourceAttrName', minWidth: 80 },
+ { label: '鍒嗙被鍚嶇О', prop: 'targetClassifyName', minWidth: 80 },
+ { label: '灞炴�у悕绉�', prop: 'targetAttrName', minWidth: 80 },
+ { label: '榛樿鍊�', prop: 'defaultValue', minWidth: 140, cell: true, blur: (value) => window.handleBlur(value, 'mapping') },
+ ],
+ ...options
},
- treeData: [{
- id: 1,
- label: '涓�绾� 1',
- children: [{
- id: 4,
- label: '浜岀骇 1-1',
- children: [{
- id: 9,
- label: '涓夌骇 1-1-1'
- }, {
- id: 10,
- label: '涓夌骇 1-1-2'
- }]
- }]
- }, {
- id: 2,
- label: '涓�绾� 2',
- children: [{
- id: 5,
- label: '浜岀骇 2-1'
- }, {
- id: 6,
- label: '浜岀骇 2-2'
- }]
- }, {
- id: 3,
- label: '涓�绾� 3',
- children: [{
- id: 7,
- label: '浜岀骇 3-1'
- }, {
- id: 8,
- label: '浜岀骇 3-2'
- }]
- }],
+ treeData: [],
+ groupTreeData: [],
defaultProps: {
children: 'children',
- label: 'label'
- }
+ label: 'name',
+ id: 'oid',
+ isLeaf: ''
+ },
+ groupVal: '',
+ treeParam: {},
+ rangeForm: {},
+ mappingForm: {},
}
},
watch: {
filterText(val) {
+ console.log(this.$refs.tree)
this.$refs.tree.filter(val);
}
},
created() {
+ this.getReferCodeClassifyTree()
pinyin.setOptions({ checkPolyphone: false, charCase: 1 });
- console.log(pinyin.getFullChars('绠＄悊鍛�'))
- console.log(pinyin.getCamelChars('绠＄悊鍛�'))
-
+ },
+ mounted() {
+ window.handleBlur = this.handleBlur
},
methods: {
+ // 鎺ュ彛宸︿晶鏍�
+ async getReferCodeClassifyTree() {
+ const param = {
+ parentBtmName: "jclass",
+ valueField: "oid",
+ textField: "name",
+ parentFieldName: "id"
+ }
+ const response = await referCodeClassifyTree(param)
+ console.log(response)
+ if (response.status === 200) {
+ let data = response.data;
+ this.treeData = data.map(item => item.children ? { ...item, ...{ isLeaf: false } } : { ...item, ...{ isLeaf: true } })
+ }
+ },
+ // 鎺ュ彛鑾峰彇灞炴�ф槧灏�
+ async getGridAttrMapping(oid) {
+ this.loading = true
+ console.log(this.treeParam)
+ const response = await gridAttrMapping({ sourceClassifyId: oid, ...this.treeParam })
+ console.log(response)
+ if (response.status === 200) {
+ this.loading = false
+ this.mappingData = response.data.data
+ }
+ },
+ // 鎺ュ彛鑾峰彇灞炴�ф槧灏勫彇鍊艰寖鍥�
+ async getGridAttrRanges(oid) {
+ this.tablesData = []
+ const response = await gridAttrRanges({ meatId: oid })
+ console.log(response)
+ if (response.status === 200) {
+ this.rangeData = response.data
+ }
+ },
+ // 鎺ュ彛鑾峰彇涓绘暟鎹垎绫诲睘鎬т俊鎭�
+ async getListCodeByClassId(oid) {
+ // this.tablesData = []
+ const response = await listCodeAttributeByClassId({ codeClassifyId: oid })
+ console.log(response)
+ },
+ // 鎺ュ彛鑾峰彇闆嗗洟鍒嗙被鏍�
+ async referTree(oid, checked) {
+ this.groupTreeData = []
+ const response = await referTree({ 'conditionMap[codeclsfid]': oid, parentOid: null })
+ console.log(response)
+ if (response.status === 200) {
+ if (checked) {
+ let items = response.data.map(item => {
+ let obj = {}
+ if (item.checked) obj = { ...item }
+ else obj = null
+ return obj
+ })
+ var r = items.filter(s => { return s && s.trim() });
+ this.groupTreeData = r
+ } else {
+ this.groupTreeData = response.data
+ }
+ }
+ },
+ // 宸︿晶鏍戣繃婊ゆ悳绱�
filterNode(value, data) {
if (!value) return true;
- return data.label.indexOf(value) !== -1;
+ return data.name.indexOf(value) !== -1;
},
- handleSave() {
-
+ // 淇濆瓨鎸夐挳
+ async handleSave() {
+ console.log(this.mappingData)
+ // const response = await batchAddSave({ dockingPreAttrMappingVOList: this.tableData })
+ // console.log(response)
},
- handlePush() {
-
+ // 鍚屾鏁版嵁
+ async handleSync() {
+ const response = await syncClassifyModel({ dockingPreAttrMappingVOList: this.tableData })
+ console.log(response)
},
handelLeftCheck(event) {
console.log(event)
},
- addUpdate(event, done) {
- console.log(event)
- done()
- },
- rowSave(event, done) {
- console.log(event)
- done()
- },
- handleRowClick(row, event, column) {
- console.log(row)
- console.log(event)
- console.log(column)
- },
+ // 鏂板寮圭獥鏌ヨ鎸夐挳
handleQuery(event) {
console.log(event)
this.form.name = event
},
- filterMethod(query, item) {
+ filterMethod(item) {
return item.pinyins.indexOf(this.form.name) > -1;
},
+ // 宸︿晶鏍戠偣鍑�
+ handelTreeCell(event) {
+ if (event.leaf) {
+ this.treeParam.codeClassifyId = event.oid
+ this.form.groupValue = ''
+ this.groupVal = ''
+ this.tableData = []
+ this.referTree(event.oid, event.checked)
+ this.getListCodeByClassId(event.oid)
+ }
+ },
+ // 闆嗗洟鍒嗙被鏍戠偣鍑�
+ handleNodeClick(data) {
+ console.log(data)
+ this.form.groupValue = data.name
+ this.groupVal = data.name
+ this.$refs.selectTree.blur()
+ this.getGridAttrMapping(data.oid)
+ },
+ inputBlur() {
+ this.tableColumnIndex = ''
+ this.tableRowIndex = null
+ },
+ // 灞炴�ф槧灏勭偣鍑绘瘡琛�
+ handleCellClick(event) {
+ console.log('鍗曞嚮', event)
+ // this.tableRowIndex = row.index
+ // this.tableColumnIndex = column.index
+ // this.getGridAttrRanges(event.metaListId)
+ },
+ handleBlur(value, event) {
+ console.log(value)
+ if (event === 'range') this.$refs.crudRange.rowCell(this.rangeForm, this.rangeForm.$index)
+ if (event === 'mapping') this.$refs.crudMapping.rowCell(this.mappingForm, this.mappingForm.$index)
+ },
+ // 灞炴�у彇鍊艰寖鍥村崟鍏冩牸缂栬緫
+ handleMapingRowClick(row, column, cell, event) {
+ this.mappingForm = row
+ if (column.label === '榛樿鍊�') this.$refs.crudMapping.rowCell(row, row.$index)
+ else this.getGridAttrRanges(row.metaListId)
+
+ },
+ // 灞炴�у彇鍊艰寖鍥村崟鍏冩牸缂栬緫
+ handleRowClick(row, column, cell, event) {
+ this.rangeForm = row
+ console.log('鍗曞嚮', row)
+ this.$refs.crudRange.rowCell(row, row.$index)
+ },
+ // 灞炴�у彇鍊艰寖鍥村崟鍏冩牸缂栬緫
+ handleUpdate(row, index, done, loading) {
+ const findRow = this.mappingData.findIndex(item => item.metaListId === row.metaListId)
+ console.log(findRow)
+ this.mappingData[0].dockingPreAttrRangeVoList = [row]
+ console.log('淇敼鍚�', row)
+ this.$message({
+ showClose: true,
+ message: "淇敼鎴愬姛",
+ type: "success",
+ });
+ done();
+ }
}
}
</script>
@@ -320,6 +331,14 @@
color: #F56C6C;
}
+.setstyle {
+ min-height: 200px;
+ padding: 0 !important;
+ margin: 0;
+ overflow: auto;
+ cursor: default !important;
+}
+
/deep/ .el-transfer-panel__list {
width: 100%;
}
--
Gitblit v1.10.0