From 5c487e8208311bfd93a904bfdae2cfab0e9b2cd7 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期三, 07 六月 2023 18:10:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/transfer/index.vue | 2
Source/UBCS-WEB/src/views/integration/applicationForm.vue | 146 ++++++++++++++++
Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/impl/GroupMdmInterServiceImpl.java | 71 +++++++
Source/UBCS-WEB/src/components/refer/vciWebRefer.vue | 46 +++--
Source/UBCS-WEB/src/api/integration/application.js | 10 +
Source/UBCS/ubcs-service/ubcs-webservice/src/main/resources/mapper/DockingPreAttrMappingMapper.xml | 2
Source/UBCS-WEB/vue.config.js | 9
Source/UBCS-WEB/src/views/integration/integrationIndex.vue | 78 +++++---
Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/IGroupMdmInterService.java | 8
Source/UBCS-WEB/src/views/integration/integrationTransfer.vue | 27 ++
Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingApplyFormQueryStatusVO.java | 51 +++++
Source/UBCS-WEB/src/components/FormTemplate/FormTempalte.vue | 19 +
Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/feign/MdmApplyGroupCodeProvider.java | 2
Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/controller/DockingPreApplyCodeController.java | 15 +
Source/UBCS-WEB/src/api/integration/integration.js | 4
Source/UBCS-WEB/src/components/refer/vciWebReferTree.vue | 20 +
16 files changed, 425 insertions(+), 85 deletions(-)
diff --git a/Source/UBCS-WEB/src/api/integration/application.js b/Source/UBCS-WEB/src/api/integration/application.js
new file mode 100644
index 0000000..d95b8a2
--- /dev/null
+++ b/Source/UBCS-WEB/src/api/integration/application.js
@@ -0,0 +1,10 @@
+import request from '@/router/axios';
+
+// 鐢抽鍗曟暟鎹�
+export const getList = (params) => {
+ return request({
+ url: '/api/ubcs-applyjtcodeservice/DockingPreApplyCode/page',
+ method: 'get',
+ params: params
+ })
+ }
\ No newline at end of file
diff --git a/Source/UBCS-WEB/src/api/integration/integration.js b/Source/UBCS-WEB/src/api/integration/integration.js
index 64339d1..5700480 100644
--- a/Source/UBCS-WEB/src/api/integration/integration.js
+++ b/Source/UBCS-WEB/src/api/integration/integration.js
@@ -35,7 +35,7 @@
// 灞炴�ф槧灏�
export const gridAttrMapping = (params) => {
return request({
- url: '/api//ubcs-applyjtcodeservice/DockingPreApplyCode/gridAttrMapping',
+ url: '/api/ubcs-applyjtcodeservice/DockingPreApplyCode/gridAttrMapping',
method: 'get',
params: params
})
@@ -63,6 +63,6 @@
return request({
url: '/api/ubcs-applyjtcodeservice/DockingPreApplyCode/syncClassifyModel',
method: 'post',
- data: params
+ params: params
})
}
\ No newline at end of file
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/FormTempalte.vue b/Source/UBCS-WEB/src/components/FormTemplate/FormTempalte.vue
index 396fd4d..6afac39 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/FormTempalte.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/FormTempalte.vue
@@ -27,6 +27,9 @@
<vciWebRefer
v-if="item.type == 'refer'"
:referConfig="item.referConfig || {}"
+ :value="form[item.referConfig.field] || item.value"
+ :text="form[item.referConfig.showField]"
+ @setReferValue="setReferValue"
></vciWebRefer>
</template>
</avue-form>
@@ -559,9 +562,7 @@
showField:formItem.showField || formItem.field,
field: formItem.field,
placeholder: formItem.inputTip,
- options:formItem.referConfig,
- value:'',
- text:''
+ options:formItem.referConfig
}:{},
change: () => {
this.changeFun(formItem.displayExtension, formItem.prop);
@@ -645,6 +646,11 @@
return val;
}
},
+ changeFun(displayExtension, prop) {
+ // executeCode({displayExtension, data: this.form}).then(res => {
+ // this.form[prop] = res.data.data
+ // })
+ },
// 鑾峰彇swich鍜屽凡鎷垮埌鐨勪笅鎷夋暟鎹�
getDataList(type, dicData) {
if (type === "truefalse") {
@@ -708,6 +714,13 @@
}
);
},
+ setReferValue(data){
+ if(data.field){
+ this.form[data.field]=data.value || '';
+ this.form[data.showField]=data.text || '';
+ this.$emit("getFormData", this.form);
+ }
+ }
},
watch: {
// 琛ㄥ崟鏁版嵁淇敼鍙嶉鍒扮埗缁勪欢
diff --git a/Source/UBCS-WEB/src/components/refer/vciWebRefer.vue b/Source/UBCS-WEB/src/components/refer/vciWebRefer.vue
index 8049591..27f49f0 100644
--- a/Source/UBCS-WEB/src/components/refer/vciWebRefer.vue
+++ b/Source/UBCS-WEB/src/components/refer/vciWebRefer.vue
@@ -1,7 +1,7 @@
<template>
- <vciWebReferTree v-if="refertype=='tree'" :value="value" :referConfig="referConfig"></vciWebReferTree>
- <vciWebReferTable v-else-if="refertype=='table'" :value="value" :referConfig="referConfig"></vciWebReferTable>
- <vciWebReferDefalut v-else :value="value" :referConfig="referConfig"></vciWebReferDefalut>
+ <vciWebReferTree v-if="refertype=='tree'" @setValue="setValue" :value="value" :text="text" :referConfig="referConfig"></vciWebReferTree>
+ <vciWebReferTable v-else-if="refertype=='table'" @setValue="setValue" :value="value" :text="text" :referConfig="referConfig"></vciWebReferTable>
+ <vciWebReferDefalut v-else @setValue="setValue" :value="value" :text="text" :referConfig="referConfig"></vciWebReferDefalut>
</template>
<script>
@@ -11,30 +11,40 @@
import {validatenull} from "@/util/validate";
export default {
name: "vciWebRefer",
- props:["referConfig"],
- components: { vciWebReferTree,vciWebReferTable,vciWebReferDefalut},
+ props: ["referConfig","value","text"],
+ components: {vciWebReferTree, vciWebReferTable, vciWebReferDefalut},
data() {
return {
refertype: this.referConfig.options.type,
isMuti: ("true" == this.referConfig.options.isMuti || this.referConfig.options.isMuti == true || this.referConfig.options.muti == true) ? true : false,
- value: this.referConfig.value
+ emitData:{}
};
},
created() {
- var title =this.referConfig.title || '';
- title = title.replace(":","");
- if(title){
- title = validatenull(this.referConfig.title)?('涓恒��' + title + '銆戦�夊彇鍊�'):this.referConfig.title;
- }else{
- title = validatenull(this.referConfig.title)?('涓恒��' + this.referConfig.showField + '銆戦�夊彇鍊�'):this.referConfig.title;
+ var title = this.referConfig.title || '';
+ title = title.replace(":", "");
+ if (title) {
+ title = validatenull(this.referConfig.title) ? ('涓恒��' + title + '銆戦�夊彇鍊�') : this.referConfig.title;
+ } else {
+ title = validatenull(this.referConfig.title) ? ('涓恒��' + this.referConfig.showField + '銆戦�夊彇鍊�') : this.referConfig.title;
}
- this.referConfig.title= title;
- this.referConfig.isMuti=this.isMuti
- if(this.refertype=='tree'){
- console.log('referConfig:')
- console.log(this.referConfig)
+ this.referConfig.title = title;
+ this.referConfig.isMuti = this.isMuti;
+ },
+ methods: {
+ setValue(value) {
+ this.emitData = value;
}
-
+ },
+ watch:{
+ // 淇敼鍙嶉鍒扮埗缁勪欢
+ emitData: {
+ deep: true,
+ immediate: true,
+ handler(newV) {
+ this.$emit("setReferValue", newV);
+ },
+ }
},
mounted() {
diff --git a/Source/UBCS-WEB/src/components/refer/vciWebReferTree.vue b/Source/UBCS-WEB/src/components/refer/vciWebReferTree.vue
index fb1830b..4180372 100644
--- a/Source/UBCS-WEB/src/components/refer/vciWebReferTree.vue
+++ b/Source/UBCS-WEB/src/components/refer/vciWebReferTree.vue
@@ -1,5 +1,5 @@
<template>
- <avue-input-tree :props="props" :lazy="lazy" :tree-load="treeLoad" :leaf-only="!referConfig.onlyLeaf" :multiple="isMuti" v-model="value" :placeholder="placeholder" :dic="treeData"></avue-input-tree>
+ <avue-input-tree ref="referTree" :props="props" :lazy="lazy" :tree-load="treeLoad" :node-click="nodeClick" :leaf-only="!referConfig.onlyLeaf" :multiple="isMuti" v-model="value" :placeholder="placeholder" :dic="treeData"></avue-input-tree>
</template>
<script>
@@ -7,7 +7,7 @@
export default {
name: "vciWebReferTree",
- props:["referConfig","value"],
+ props:["referConfig","value","text"],
data() {
return {
options: this.referConfig.options,
@@ -20,8 +20,9 @@
//value:"value",
//label:"title"
},
- treeUrl: this.referConfig.options.url || '',//'/api/ubcs-code/codeClassify/treeCodeClassify',
+ treeUrl: this.referConfig.options.url || '/api/ubcs-code/codeClassify/treeCodeClassify',
treeData: [],
+ currentNode:{},
params: {},
loadType: {'all': 'all', 'node': 'node'},
copyParam: ['btmType', 'lnType', 'toBtmType', 'textField', 'valueField', 'parentFieldName', 'parentValue', 'sort', 'order', 'isDirection', 'whereSql', 'isMuti', 'queryScheme', 'isQueryAllColumn', 'queryColumn', 'split', 'loadType', 'onlyLeaf', 'onlyLeafText', 'parentUsedField']
@@ -29,6 +30,8 @@
},
created() {
this.getParams();
+ console.log('referConfig:')
+ console.log(this.referConfig)
},
mounted() {
if(!this.lazy){
@@ -42,7 +45,6 @@
methods: {
getParams:function (){
var queryParams = {};
- debugger;
if(this.options.extraParams){
queryParams = this.options.extraParams;
}
@@ -140,8 +142,16 @@
}
}))
});
+ },
+ nodeClick(data){
+ //涓嶈鐢╳atch鐩戝惉value鍊硷紝浼氭壘涓嶅埌text
+ this.value=data[this.props.value];
+ this.text=data[this.props.label];
+ this.currentNode=data;
+ this.$emit("setValue", {field:this.referConfig.field,showField:this.referConfig.showField,value:this.value,text:this.text,rawData:this.currentNode});
}
-
+ },
+ watch:{
}
}
</script>
diff --git a/Source/UBCS-WEB/src/components/transfer/index.vue b/Source/UBCS-WEB/src/components/transfer/index.vue
index 99639fd..cb2c5cc 100644
--- a/Source/UBCS-WEB/src/components/transfer/index.vue
+++ b/Source/UBCS-WEB/src/components/transfer/index.vue
@@ -128,11 +128,9 @@
targetData() {
if (this.targetOrder === 'original') {
- console.log('11111')
return this.data.filter(item => this.value.indexOf(item) > -1
);
} else {
- console.log('22222')
return this.value.reduce((arr, cur) => {
const val = this.dataObj[cur];
if (val) {
diff --git a/Source/UBCS-WEB/src/views/integration/applicationForm.vue b/Source/UBCS-WEB/src/views/integration/applicationForm.vue
index e69de29..7a3c48b 100644
--- a/Source/UBCS-WEB/src/views/integration/applicationForm.vue
+++ b/Source/UBCS-WEB/src/views/integration/applicationForm.vue
@@ -0,0 +1,146 @@
+<template>
+ <basic-container>
+ <avue-crud :table-loading="loading" :data="data" :option="option" :search.sync="searchParam" :page.sync="page"
+ ref="crud" @refresh-change="getDataList" @search-change="handleSearch" @search-reset="handleReset"
+ @size-change="handleSizePage" @current-change="handleCurrentPage" @on-load="getDataList">
+ <template slot="menuLeft">
+ <el-button icon="el-icon-document" size="small" type="primary" @click="handleStatus">闆嗗洟鐢宠鐘舵��
+ </el-button>
+ </template>
+ </avue-crud>
+ </basic-container>
+</template>
+
+<script>
+import { getList } from '@/api/integration/application.js'
+import { dateFormat } from '@/util/date.js'
+export default {
+ data() {
+ return {
+ loading: false,
+ data: [],
+ page: {
+ pageSize: 10,
+ currentPage: 1,
+ total: 0
+ },
+ searchParam: {},
+ option: {
+ height: "auto",
+ index: true,
+ border: true,
+ addBtn: false,
+ columnBtn: false,
+ searchMenuSpan: 8,
+ highlightCurrentRow: true,
+ menu:false,
+ 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,
+ formatter: () => {
+
+ }
+ }, {
+ label: '杩斿洖鏍囪瘑',
+ width: 100,
+ prop: 'code'
+ },
+ {
+ label: '杩斿洖淇℃伅',
+ width: 300,
+ prop: 'content'
+ },
+ {
+ label: '娑堟伅淇℃伅',
+ width: 300,
+ prop: 'msg'
+ }
+ ]
+ }
+ }
+ },
+ methods: {
+ handleStatus() {
+
+ },
+ async getDataList() {
+ this.loading = true
+ console.log(this.searchParam)
+ const { pageSize, currentPage, total } = this.page
+ let param = { size: pageSize, current: currentPage }
+ const response = await getList({ ...param, ...this.searchParam })
+ if (response.status === 200) {
+ this.loading = false
+ console.log(response)
+ const data = response.data.data
+ this.data = data.records
+ this.page.total = data.total
+ } else this.loading = false
+ },
+ handleSizePage(event) {
+ this.page.pageSize = event
+ },
+ handleCurrentPage(event) {
+ this.page.currentPage = event
+ },
+ handleReset() {
+ this.searchParam = {}
+ },
+ handleSearch(form, done) {
+ const { id, groupCode, operationType } = form
+ let dataTime = { id, groupCode, operationType }
+ if (form.hasOwnProperty('createTime')) {
+ dataTime = { createTime: dateFormat(form.createTime), ...dataTime }
+ }
+ if (form.hasOwnProperty('lastModifyTime')) {
+ dataTime = { lastModifyTime: dateFormat(form.lastModifyTime), ...dataTime }
+ }
+ console.log(dataTime)
+ this.searchParam = dataTime
+ this.page.currentPage = 1
+ this.getDataList()
+ done()
+ }
+ }
+}
+</script>
\ No newline at end of file
diff --git a/Source/UBCS-WEB/src/views/integration/integrationIndex.vue b/Source/UBCS-WEB/src/views/integration/integrationIndex.vue
index b3ae9fc..1c3a45a 100644
--- a/Source/UBCS-WEB/src/views/integration/integrationIndex.vue
+++ b/Source/UBCS-WEB/src/views/integration/integrationIndex.vue
@@ -16,7 +16,7 @@
<el-card>
<el-form :model="form">
<el-form-item label="闆嗗洟鍒嗙被" label-width="70px" size="small">
- <el-select clearable ref="selectTree" v-model="form.groupValue" placeholder="璇烽�夋嫨"
+ <el-select clearable ref="selectTree" v-model="groupVal" placeholder="璇烽�夋嫨"
popper-class="popperTreeSelect">
<el-option :value="groupVal" :label="groupVal">
<el-tree ref="groupTree" :data="groupTreeData" empty-text="鏆傛棤鏁版嵁" :props="defaultProps"
@@ -33,11 +33,16 @@
@row-dblclick="handleMapingRowClick" @selection-change="selectionChange" @select="setCurrentRow"
@select-all="handleSelectAll">
<template slot="menuLeft">
- <el-button icon="el-icon-plus" size="small" type="primary" :disabled="disabledPush" @click="dialogPush = true">鏂� 澧�
+ <el-button icon="el-icon-plus" size="small" type="primary" :disabled="disabledPush"
+ @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 icon="el-icon-connection" size="small" type="primary"
+ @click="handleSync('all')">鍚屾涓绘ā鍨�
+ </el-button>
+ <el-button icon="el-icon-connection" size="small" type="primary"
+ @click="handleSync('one')">鍚屾璇︾粏妯″瀷
</el-button>
</template>
</avue-crud>
@@ -50,23 +55,8 @@
</el-card>
</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="璇疯緭鍏ユ嫾闊冲叏鎷兼垨鑰呮嫾闊崇缉鍐�" :props="transferProps"></transfer>
- <span slot="footer" class="dialog-footer">
- <el-button @click="dialogPush = false">鍙� 娑�</el-button>
- <el-button type="primary" @click="handelTransferSave">淇� 瀛�</el-button>
- </span>
- </el-dialog> -->
- <integration-transfer :visible.sync="dialogPush" :data="transferData" :props="transferProps"
- @save="handelTransferSave"></integration-transfer>
+ <integration-transfer :visible.sync="dialogPush" :data="transferData" :disabledData="filtermapping"
+ :props="transferProps" @save="handelTransferSave"></integration-transfer>
</div>
</template>
<script>
@@ -196,6 +186,17 @@
window.handleBlur = that.handleBlur
},
+ computed: {
+ filtermapping() {
+ const data = this.mappingData.filter(item => {
+ return !(Object.prototype.hasOwnProperty.call(item, 'targetAttrName') && (item.targetAttrName === null || item.targetAttrName === undefined || item.targetAttrName === ""))
+ })
+ const transfer = data.map(obj => {
+ return obj.targetAttrName
+ })
+ return transfer
+ }
+ },
methods: {
// 鎺ュ彛宸︿晶鏍�
async getReferCodeClassifyTree() {
@@ -220,6 +221,7 @@
if (response.status === 200) {
this.loading = false
this.mappingData = response.data.data
+ console.log(this.filtermapping)
}
},
// 鎺ュ彛鑾峰彇灞炴�ф槧灏勫彇鍊艰寖鍥�
@@ -276,11 +278,25 @@
message: "淇濆瓨鎴愬姛!"
});
}
-
},
// 鍚屾鏁版嵁
- async handleSync() {
- const response = await syncClassifyModel({ dockingPreAttrMappingVOList: this.tableData })
+ async handleSync(type = 'all') {
+ let param = { operationType: type }
+ if (type === 'one') {
+ param.classifyId = this.form.groupValue
+ }
+ if (this.form.groupValue === '' && type === 'one') {
+ this.$message({
+ type: "error",
+ message: "璇烽�夋嫨涓�鏉￠泦鍥㈠垎绫�"
+ });
+ } else {
+ console.log(param)
+ const response = await syncClassifyModel(param)
+ if (response.status === 200) {
+ console.log(response)
+ }
+ }
},
handelTransferSave(event) {
let that = this
@@ -295,7 +311,7 @@
const findRow = that.mappingData.findIndex(item => item.metaListId === that.mappingForm.metaListId)
that.mappingData[findRow].targetAttrName = transferValue[0].name
that.mappingData[findRow].targetAttrId = transferValue[0].oid
- this.dialogPush =false
+ this.dialogPush = false
}
},
@@ -312,7 +328,7 @@
},
// 闆嗗洟鍒嗙被鏍戠偣鍑�
handleNodeClick(data) {
- this.form.groupValue = data.name
+ this.form.groupValue = data.oid
this.groupVal = data.name
this.$refs.selectTree.blur()
this.getGridAttrMapping(data.oid)
@@ -328,14 +344,13 @@
if (event === 'mapping') this.$refs.crudMapping.rowCell(this.mappingForm, this.mappingForm.$index)
},
// 闆嗗洟鏄犲皠灞炴�ц閫夋嫨鍗曞厓鏍肩紪杈戯紙鍙屽嚮锛�
- handleMapingRowClick(row, column, cell, event) {
- console.log(row)
+ handleMapingRowClick(row, column) {
clearTimeout(this.times)
this.mappingForm = row
if (column.label === '榛樿鍊�' || column.label === '灞炴�у悕绉�') this.$refs.crudMapping.rowCell(row, row.$index)
},
// 闆嗗洟鏄犲皠灞炴�ц閫夋嫨锛堝崟鍑伙級
- handleMapingClick(row, column, cell, event) {
+ handleMapingClick(row) {
clearTimeout(this.times)
this.mappingForm = row
this.times = setTimeout(() => {
@@ -343,15 +358,14 @@
}, 300)
},
// 灞炴�у彇鍊艰寖鍥村崟鍏冩牸缂栬緫锛堝弻鍑伙級
- handleRowClick(row, column, cell, event) {
+ handleRowClick(row) {
this.rangeForm = row
this.$refs.crudRange.rowCell(row, row.$index)
},
// 灞炴�у彇鍊艰寖鍥村崟鍏冩牸缂栬緫鍚�
- handleUpdate(row, index, done, loading) {
+ handleUpdate(row, index, done) {
console.log(row)
console.log(index)
- let data = []
const findRow = this.mappingData.findIndex(item => item.metaListId === row.metaListId)
this.rangeData[index] = row
console.log(this.rangeData)
@@ -365,7 +379,7 @@
done();
},
// 灞炴�у彇鍊艰寖鍥村崟鍏冩牸缂栬緫鍚�
- handleMapingUpdate(row, index, done, loading) {
+ handleMapingUpdate(row, index, done) {
console.log(row)
console.log('淇敼鍚�', row)
this.$message({
diff --git a/Source/UBCS-WEB/src/views/integration/integrationTransfer.vue b/Source/UBCS-WEB/src/views/integration/integrationTransfer.vue
index 6b311ce..892bd7a 100644
--- a/Source/UBCS-WEB/src/views/integration/integrationTransfer.vue
+++ b/Source/UBCS-WEB/src/views/integration/integrationTransfer.vue
@@ -22,13 +22,14 @@
components: {
transfer
},
- name: 'Integration',
+ name: 'IntegrationTransfer',
props: {
// 鏄惁鎵撳紑
visible: {
typeof: Boolean,
default: false
},
+ // 寮圭獥鏍囬
title: {
typeof: String,
default: '缂栫爜灞炴��'
@@ -48,6 +49,11 @@
disabled: 'disabled'
};
}
+ },
+ // 濡傛灉鏈夌壒娈婃搷浣滐紝涓�鏉℃暟鎹彧鑳界敤涓�娆＄殑鎿嶄綔锛屽氨闇�瑕佹妸绂佺敤鐨勬暟鎹瓧娈电敤lebel瀵瑰簲鐨勫�间紶閫掕繃鏉�
+ disabledData: {
+ typeof: Array,
+ default: () => []
},
// 鏌ヨ鏂囨湰妗嗙殑placeholder
filterPlaceholder: {
@@ -75,14 +81,21 @@
pinyin.setOptions({ checkPolyphone: false, charCase: 1 });
let name = this.props.label
let key = this.props.key
- let objs = this.data.map(item => {
+ 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 data.map(item => {
let pinYin = pinyin.getFullChars(item[this.props.label])
let renPing = pinyin.getCamelChars(item[this.props.label])
- const obj = { pinyins: pinYin, renPing: renPing, disabled: false, [name]: item[this.props.label], [key]: item[this.props.key] }
+ const obj = { pinyins: pinYin, renPing: renPing, [name]: item[this.props.label], [key]: item[this.props.key], disabled: item.disabled }
return obj
})
- console.log(objs)
- return objs
}
},
methods: {
@@ -102,8 +115,8 @@
},
// 纭畾鎸夐挳锛岃繑鍥炲綋鍓嶆暟鎹拰淇敼鍚庣殑鏁版嵁
handelTransferSave() {
- let that =this
- let datas= that.newdata
+ let that = this
+ let datas = that.newdata
const findtra = datas.findIndex(item => item.oid === that.transferValue[0].oid)
datas[findtra].disabled = true
const obj = {
diff --git a/Source/UBCS-WEB/vue.config.js b/Source/UBCS-WEB/vue.config.js
index 70c8ff6..9beaffe 100644
--- a/Source/UBCS-WEB/vue.config.js
+++ b/Source/UBCS-WEB/vue.config.js
@@ -27,16 +27,11 @@
'/api': {
//鏈湴鏈嶅姟鎺ュ彛鍦板潃
// target: 'http://localhost:37000',
- // target: 'http://localhost:37000',
- // target: 'http://192.168.1.51:37000',
- //target: 'http://192.168.3.7:37000',
- // target: 'http://dev.vci-tech.com:37000',
- // target: 'http://192.168.1.51:37000/',
- // target: 'http://localhost:37000',
// target: 'http://192.168.1.63:37000',
//target: 'http://192.168.3.7:37000',
+ // target: 'http://dev.vci-tech.com:37000',
target: 'http://dev.vci-tech.com:37000',
- //target: 'http://192.168.1.51:37000/',
+ // target: 'http://192.168.1.51:37000/',
//杩滅▼婕旂ず鏈嶅姟鍦板潃,鍙敤浜庣洿鎺ュ惎鍔ㄩ」鐩�
// target: 'https://saber.bladex.vip/api',
ws: true,
diff --git a/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/feign/MdmApplyGroupCodeProvider.java b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/feign/MdmApplyGroupCodeProvider.java
index c8283d5..87be398 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/feign/MdmApplyGroupCodeProvider.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/feign/MdmApplyGroupCodeProvider.java
@@ -60,6 +60,6 @@
* @return 鎵ц缁撴灉
*/
@PostMapping("/externalMainData/queryApplyState")
- DockingApplyFormStatusVO queryApplyState(@NotNull @RequestBody DockingModelQueryVO dockingModelQueryVO);
+ DockingApplyFormQueryStatusVO queryApplyState(@NotNull @RequestBody DockingModelQueryVO dockingModelQueryVO);
}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingApplyFormQueryStatusVO.java b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingApplyFormQueryStatusVO.java
new file mode 100644
index 0000000..4a2f180
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingApplyFormQueryStatusVO.java
@@ -0,0 +1,51 @@
+package com.vci.ubcs.code.webservice.vo;
+
+import java.util.List;
+
+public class DockingApplyFormQueryStatusVO {
+ /***
+ * 鎺ュ彛缂栫爜
+ */
+ private int code;
+ /***
+ * 杩斿洖娑堟伅
+ */
+ private String msg;
+ /****
+ * 杩斿洖鐢宠鍗曠姸鎬�
+ */
+ private List<DockingApplyFormStatusVO> data;
+
+ public int getCode() {
+ return code;
+ }
+
+ public void setCode(int code) {
+ this.code = code;
+ }
+
+ public String getMsg() {
+ return msg;
+ }
+
+ public void setMsg(String msg) {
+ this.msg = msg;
+ }
+
+ public List<DockingApplyFormStatusVO> getData() {
+ return data;
+ }
+
+ public void setData(List<DockingApplyFormStatusVO> data) {
+ this.data = data;
+ }
+
+ @Override
+ public String toString() {
+ return "DockingApplyFormQueryStatusVO{" +
+ "code=" + code +
+ ", msg='" + msg + '\'' +
+ ", data=" + data +
+ '}';
+ }
+}
diff --git a/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/controller/DockingPreApplyCodeController.java b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/controller/DockingPreApplyCodeController.java
index d530041..aa011c3 100644
--- a/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/controller/DockingPreApplyCodeController.java
+++ b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/controller/DockingPreApplyCodeController.java
@@ -206,4 +206,19 @@
}
+/***
+ * 鏌ヨ鐢宠鍗曠姸鎬�
+ * oids:涓氬姟鏁版嵁oid
+ * @return 杩斿洖鎵ц缁撴灉淇℃伅
+ */
+ @GetMapping( "/queryApplyState")
+ @ApiOperationSupport(order = 2)
+ @ApiOperation(value = "鏌ョ湅鐢宠鍗曠姸鎬�", notes = "鏌ョ湅鐢宠鍗曠姸鎬�")
+ public R queryApplyState(String oids){
+ try {
+ return groupMdmInterService.queryApplyState(oids);
+ }catch (VciBaseException e){
+ return R.fail("鏌ョ湅鐢宠鍗曠姸鎬佸け璐ワ細"+e.getMessage());
+ }
+ }
}
diff --git a/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/IGroupMdmInterService.java b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/IGroupMdmInterService.java
index 257c2c6..987c524 100644
--- a/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/IGroupMdmInterService.java
+++ b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/IGroupMdmInterService.java
@@ -50,4 +50,12 @@
* @return
*/
R syncClassifyModel(String classifyId, String operationType)throws VciBaseException;
+
+ /***
+ * 鏌ヨ鐘舵��
+ * @param oids
+ * @return
+ * @throws VciBaseException
+ */
+ R queryApplyState(String oids)throws VciBaseException;
}
diff --git a/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/impl/GroupMdmInterServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/impl/GroupMdmInterServiceImpl.java
index 0770e17..f48bdac 100644
--- a/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/impl/GroupMdmInterServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/impl/GroupMdmInterServiceImpl.java
@@ -438,7 +438,7 @@
throw new Throwable(message);
}
}else{
- message="鏈幏浠庨泦鍥㈣幏鍙栧埌浠讳綍妯″瀷淇℃伅";
+ message="鏈粠闆嗗洟鑾峰彇鍒颁换浣曟ā鍨嬩俊鎭�";
log.info(message);
throw new Throwable(message);
}
@@ -459,24 +459,57 @@
* @param dataOids
* @return 鎵ц缁撴灉
*/
- public R queryApplyState(String dataOids) {
+ @Override
+ public R queryApplyState(String dataOids) throws VciBaseException {
String message="鎵ц鎴愬姛锛�";
log.info("鏌ヨ鐢宠鍗曠姸鎬佹帴鍙tatr");
try {
VciBaseUtil.alertNotNull(dataOids,"鎵�鏌ョ敵璇峰崟鏁版嵁涓婚敭");
VciBaseUtil.alertNotNull(dockingApplySysName,"绯荤粺鏍囪瘑閰嶇疆锛歞ocking.apply.unitCode");
-
+ List<String> applyIdList=new ArrayList<>();
List<DockingPreApplyForm> dockingPreApplyFormList= this.dockingPreApplyFormService.list(Wrappers.<DockingPreApplyForm>query().lambda().in(DockingPreApplyForm::getDataOid, VciBaseUtil.str2List(dataOids)));
+ Map<String,DockingPreApplyForm> dockingPreApplyFormMap=new HashMap<>();
dockingPreApplyFormList.stream().forEach(dockingPreApplyForm -> {
- dockingPreApplyForm.getId();
-
+ applyIdList.add(dockingPreApplyForm.getId());
+ dockingPreApplyFormMap.put(dockingPreApplyForm.getId(),dockingPreApplyForm);
});
+
+ DockingModelQueryVO dockingModelQueryVO=new DockingModelQueryVO();
+ dockingModelQueryVO.setApplyNums(VciBaseUtil.array2String(applyIdList.toArray(new String[]{})));
+ dockingModelQueryVO.setSysName(dockingApplySysName);
+ DockingApplyFormQueryStatusVO dockingApplyFormQueryStatusVO=mdmApplyGroupCodeProvider.queryApplyState(dockingModelQueryVO);
+
+ int code=dockingApplyFormQueryStatusVO.getCode();
+ String mesg=dockingApplyFormQueryStatusVO.getMsg();
+ if(code==1){
+ List<DockingApplyFormStatusVO> dockingApplyFormStatusVOList=dockingApplyFormQueryStatusVO.getData();
+ if(CollectionUtils.isEmpty(dockingApplyFormStatusVOList)){
+ for (DockingApplyFormStatusVO applyFormDataState : dockingApplyFormStatusVOList) {
+ String applyId=applyFormDataState.getApplyNum();
+ String state= applyFormDataState.getFormState();
+ String examineOpinion=applyFormDataState.getExamineOpinion();
+ String jmsg=getCodeState(state)+"锛屾剰瑙侊細"+examineOpinion;
+ if(dockingPreApplyFormMap.containsKey(applyId)){
+ DockingPreApplyForm applyFormObject=dockingPreApplyFormMap.get(applyId);
+ applyFormObject.setMsg(jmsg);
+ }
+ }
+ boolean res=this.dockingPreApplyFormService.saveOrUpdateBatch(dockingPreApplyFormList);
+ if(res){
+ R.success("鐢宠闆嗗洟鐮佺姸鎬佹煡璇㈡垚鍔�:"+mesg);
+ }
+ }else{
+ throw new Throwable("娌℃湁鑾峰彇鍒扮浉鍏虫暟鎹俊鎭�");
+ }
+ }else{
+ throw new Throwable(mesg);
+ }
}catch (Throwable e){
e.printStackTrace();;
- log.error("鑾峰彇鏁版嵁妯″瀷澶辫触"+e);
- R.fail(message);
+ log.error("鑾峰彇鐢宠鍗曠姸鎬佸け璐�"+e);
+ throw new VciBaseException(message);
}
log.info("鏌ヨ鐢宠鍗曠姸鎬佹帴鍙nd");
return R.success(message);
@@ -968,4 +1001,28 @@
}
return value;
}
+
+ private String getCodeState(String formState){
+ String msg="";
+ if("1".equals(formState)){
+ msg="闆嗗洟瀹℃牳涓�";
+ }else if("2".equals(formState)){
+ msg="椹冲洖";
+ }else if("3".equals(formState)){
+ msg="闆嗗洟瀹℃牳涓�";
+ }else if("4".equals(formState)){
+ msg="瀹℃牳缁撴潫锛岃祴鐮佸け璐�";
+ }else if("5".equals(formState)){
+ msg="瀹℃牳缁撴潫锛岃祴鐮佹垚鍔�";
+ }else if("6".equals(formState)){
+ msg="寰�301璧嬬爜";
+ }else if("7".equals(formState)){
+ msg="宸茶祴鐮�";
+ }else if("8".equals(formState)){
+ msg="宸茶祴鐮侊紙娌跨敤锛�";
+ }else if("9".equals(formState)){
+ msg="瀹℃牳涓�";
+ }
+ return msg;
+ }
}
diff --git a/Source/UBCS/ubcs-service/ubcs-webservice/src/main/resources/mapper/DockingPreAttrMappingMapper.xml b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/resources/mapper/DockingPreAttrMappingMapper.xml
index e07dcc1..dd2ee92 100644
--- a/Source/UBCS/ubcs-service/ubcs-webservice/src/main/resources/mapper/DockingPreAttrMappingMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/resources/mapper/DockingPreAttrMappingMapper.xml
@@ -35,7 +35,7 @@
<result column="SOURCECLSFNAME" property="sourceClassifyName"/>
<result column="TARGETATTRID" property="targetAttrId"/>
<result column="TARGETCLSFID" property="targetClassifyId"/>
- <result column="VIEWMODEID" property="viewModeId"/>
+ <!-- <result column="VIEWMODEID" property="viewModeId"/>-->
<result column="VIEWMODENAME" property="viewModelName"/>
<result column="TARGETATTRKEY" property="targetAttrKey"/>
<result column="TARGETATTRNAME" property="targetAttrName"/>
--
Gitblit v1.9.3