From 5a8861736eb17fe27a4ac49cc8ebaa6f3ade2e71 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 07 七月 2023 17:08:35 +0800
Subject: [PATCH] 前端代码提交
---
Source/UBCS-WEB/src/components/Tree/classifyTrees.vue | 26 ++++---------
Source/UBCS-WEB/src/api/refer/table.js | 4 +-
Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue | 3 +
Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue | 54 ++++++++++++++------------
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/MdmEngineController.java | 10 ++--
Source/UBCS-WEB/vue.config.js | 4 +-
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeClassifyService.java | 1
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java | 4 --
8 files changed, 48 insertions(+), 58 deletions(-)
diff --git a/Source/UBCS-WEB/src/api/refer/table.js b/Source/UBCS-WEB/src/api/refer/table.js
index e05299b..268bdcd 100644
--- a/Source/UBCS-WEB/src/api/refer/table.js
+++ b/Source/UBCS-WEB/src/api/refer/table.js
@@ -1,9 +1,9 @@
import request from "@/router/axios";
-export const getList = (params,page, limit, url) => {
+export const getList = (params,page, limit, url, method) => {
return request({
url: url,
- method: 'get',
+ method: method,
params: {
...params,
page,
diff --git a/Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue b/Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue
index faae3ef..c64b81b 100644
--- a/Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue
+++ b/Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue
@@ -198,9 +198,9 @@
column: [
{
label: '涓婚搴�/鍒嗙被缂栧彿',
- prop: 'btmtypeid',
+ prop: 'id',
labelWidth:135,
- readonly: true,
+ disabled: true,
rules: [{
required: true,
message: "涓婚搴�/鍒嗙被缂栧彿",
@@ -210,7 +210,7 @@
{
label: '涓婚搴�/鍒嗙被鍚嶇О',
prop: 'name',
- readonly: true,
+ disabled: true,
labelWidth:135,
rules: [{
required: true,
@@ -222,13 +222,13 @@
label:"鎻忚堪",
prop:"description",
labelWidth:128,
- readonly: true,
+ disabled: true,
},
{
label: '瀛樺偍鐨勪笟鍔＄被鍨�',
- prop: 'btmtypename',
+ prop: 'btmTypeName',
labelWidth:128,
- readonly: true,
+ disabled: true,
rules: [{
required: true,
message: "瀛樺偍鐨勪笟鍔＄被鍨�",
@@ -237,21 +237,21 @@
},
{
label:"缂栫爜瑙勫垯",
- prop:"coderuleoidName",
+ prop:"coderuleOidName",
labelWidth:128,
- readonly: true,
+ disabled: true,
},
{
label:"鍏抽敭灞炴�ф煡璇㈣鍒�",
- prop:"codekeyattrrepeatoidName",
+ prop:"codeKeyAttrRepeatOidName",
labelWidth:128,
- readonly: true,
+ disabled: true,
},
{
label:"鐩镐技鏌ヨ瑙勫垯",
prop:"codeResembleRuleOidName",
labelWidth:128,
- readonly: true,
+ disabled: true,
},
]
},
@@ -259,7 +259,7 @@
column: [
{
label: '涓婚搴�/鍒嗙被缂栧彿',
- prop: 'btmtypeid',
+ prop: 'id',
labelWidth:128,
rules: [{
required: true,
@@ -284,9 +284,10 @@
},
{
label: '瀛樺偍鐨勪笟鍔＄被鍨�',
- prop: 'btmtypename',
+ prop: 'btmTypeName',
labelWidth:128,
focus:this.btmFoucus,
+ readonly: true,
rules: [{
required: true,
message: "瀛樺偍鐨勪笟鍔＄被鍨�",
@@ -295,21 +296,24 @@
},
{
label:"缂栫爜瑙勫垯",
- prop:"coderuleoidName",
+ prop:"coderuleOidName",
labelWidth:128,
- focus:this.CodeFoucus
+ focus:this.CodeFoucus,
+ readonly: true,
},
{
label:"鍏抽敭灞炴�ф煡璇㈣鍒�",
- prop:"codekeyattrrepeatoidName",
+ prop:"codeKeyAttrRepeatOidName",
labelWidth:128,
- focus:this.Keyfouce
+ focus:this.Keyfouce,
+ readonly: true,
},
{
label:"鐩镐技鏌ヨ瑙勫垯",
prop:"codeResembleRuleOidName",
labelWidth:128,
- focus: this.simFouce
+ focus: this.simFouce,
+ readonly: true,
},
]
@@ -370,7 +374,7 @@
this.$set(this.loneTreeNewForm,'coderuleoidName',this.masterName)
this.$set(this.loneTreeNewForm,'coderuleOid',this.masterOid)
this.$emit('MasterHandler',this.loneTreeNewForm)
- console.log(this.loneTreeNewForm)
+ // console.log(this.loneTreeNewForm)
}
},
//缂栫爜澶氶��
@@ -378,7 +382,7 @@
this.masterSelectList=row;
this.masterName=row[0].name;
this.masterOid=row[0].oid;
- console.log('oid',this.oid)
+ // console.log('oid',this.oid)
},
//缂栫爜鎺ュ彛
MasterdefaultRend(masterParameter){
@@ -510,10 +514,10 @@
}else if(this.btmSelectList.length<=0){
this.$message.warning('璇烽�夋嫨涓�鏉℃暟鎹�')
}else {
- this.SimidialogVisible=false;
- this.simSelectList=[]
- this.$set(this.loneTreeNewForm,'btmtypename',this.btmName)
- this.$set(this.loneTreeNewForm,'btmtypeoid',this.btmOid)
+ this.BtmdialogVisible=false;
+ this.btmSelectList=[]
+ this.$set(this.loneTreeNewForm,'btmTypeName',this.btmName)
+ this.$set(this.loneTreeNewForm,'btmTypeOid',this.btmOid)
this.$emit('MasterHandler',this.loneTreeNewForm)
}
},
@@ -544,7 +548,7 @@
//涓氬姟绫诲瀷鎺ュ彛
btmdefaultRend(masterParameter){
referDataGrid({valueField:'id',isMuti:'false',...masterParameter}).then(res=>{
- console.log(res)
+ // console.log(res)
this.BtmData=res.data.data.records
})
}
diff --git a/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue b/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue
index 5090b8c..e9bffc4 100644
--- a/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue
+++ b/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue
@@ -30,15 +30,18 @@
<el-input v-model="TreeAddform.description" autocomplete="off" style="width: 585px"></el-input>
</el-form-item>
<el-form-item label="缂栫爜瑙勫垯锛�" label-width="150px">
- <el-input v-model="TreeAddform.coderuleoidName" autocomplete="off" style="width: 585px" @focus="CodeFoucus"></el-input>
+ <el-input v-model="TreeAddform.coderuleoidName" readonly autocomplete="off" style="width: 585px" @focus="CodeFoucus"></el-input>
</el-form-item>
<el-form-item label="鍏抽敭灞炴�ф煡璇㈣鍒欙細" label-width="150px">
- <el-input v-model="TreeAddform.codekeyattrrepeatoidName" autocomplete="off" @focus="Keyfouce"
+ <el-input v-model="TreeAddform.codekeyattrrepeatoidName" readonly autocomplete="off" @focus="Keyfouce"
style="width: 585px"></el-input>
</el-form-item>
<el-form-item label="鐩镐技鏌ヨ瑙勫垯锛�" label-width="150px">
- <el-input v-model="TreeAddform.codeResembleRuleOidName" autocomplete="off" @focus="simFouce"
- style="width: 585px"></el-input>
+ <el-input v-model="TreeAddform.codeResembleRuleOidName"
+ autocomplete="off"
+ readonly
+ @focus="simFouce"
+ style="width: 585px"></el-input>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -507,19 +510,6 @@
prop: 'tab2',
}]
},
- //妯℃嫙琛ㄥ崟鍋囨暟鎹�
- Treeform: [
- {
- name: "娴嬭瘯1",
- sex: "鐢�",
- value: 0
- },
- {
- name: "娴嬭瘯2",
- sex: "濂�",
- value: 1
- }
- ],
//浼犻�掔粰瀛愮粍浠跺姩鎬佹覆鏌撶殑鏁版嵁
TreeList: {},
codeClassifyOid: ""
@@ -782,7 +772,7 @@
TreeAddHandler() {
const data = this.TreeAddform
this.$set(data, "parentCodeClassifyOid", this.nodeClickList.oid)
- console.log('data',data)
+ // console.log('data',data)
TreeSave(data).then(() => {
this.$message({
type: 'success',
diff --git a/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue b/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue
index 18bf484..e518e8d 100644
--- a/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue
+++ b/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue
@@ -50,6 +50,7 @@
label: this.referConfig.textField || this.referConfig.options.textField || "name"
},
url: this.referConfig.options.url || '/api/ubcs-code/mdmEngineController/defaultReferDataGrid',
+ method: this.referConfig.options.method || 'GET',
tableDefinedUrl:'',//骞冲彴琛ㄦ牸鍦板潃
copyParam: ['referBo', 'textField', 'valueField', 'displayTable', 'whereSql', 'queryScheme'],
query: {},
@@ -275,7 +276,7 @@
query['conditionMap["' + key + '"]'] = this.query[key];
}
}
- getList(Object.assign(params,this.params,this.query, query),page.currentPage, page.pageSize, this.url).then(res => {
+ getList(Object.assign(params,this.params,this.query, query),page.currentPage, page.pageSize, this.url, this.method).then(res => {
this.data = res.data.records;
this.page.total=res.data.total
this.loading = false;
diff --git a/Source/UBCS-WEB/vue.config.js b/Source/UBCS-WEB/vue.config.js
index 0991057..ad43a75 100644
--- a/Source/UBCS-WEB/vue.config.js
+++ b/Source/UBCS-WEB/vue.config.js
@@ -26,10 +26,10 @@
proxy: {
'/api': {
//鏈湴鏈嶅姟鎺ュ彛鍦板潃
- // target: 'http://localhost:37000',
+ target: 'http://localhost:37000',
// target: 'http://192.168.1.51:37000',
// target: 'http://192.168.1.46: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.104:37000',
// target: 'http://192.168.1.63:37000',
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/MdmEngineController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/MdmEngineController.java
index 62f129c..74ad9a4 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/MdmEngineController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/MdmEngineController.java
@@ -510,12 +510,12 @@
* @return 鍒嗙被鐮佸�肩殑鍐呭
*/
@GetMapping("/listCodeClassifyValueBySecOid")
- public DataGrid<CodeClassifyValueVO> listCodeClassifyValueBySecOid(String classifySecOid, String parentClassifyValueOid){
+ public IPage<CodeClassifyValueVO> listCodeClassifyValueBySecOid(String classifySecOid, String parentClassifyValueOid){
List<CodeClassifyValueVO> valueVOS = engineService.listCodeClassifyValueBySecOid(classifySecOid, parentClassifyValueOid);
- DataGrid<CodeClassifyValueVO> dataGrid = new DataGrid<>();
- dataGrid.setData(valueVOS);
- dataGrid.setTotal(valueVOS==null?0:valueVOS.size());
- return dataGrid;
+ IPage<CodeClassifyValueVO> valueVOIPage = new Page<>();
+ valueVOIPage.setRecords(valueVOS);
+ valueVOIPage.setTotal(valueVOS==null?0:valueVOS.size());
+ return valueVOIPage;
}
/**
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeClassifyService.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeClassifyService.java
index 1bf0758..b19bd72 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeClassifyService.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeClassifyService.java
@@ -241,7 +241,6 @@
*/
CodeClassifyFullInfoBO getClassifyFullInfo(String codeClassifyOid);
-
/**
* 浣跨敤缂栧彿鐨勮矾寰勮幏鍙栧璞�
* @param clsfNamePath 鍒嗙被鍚嶇О鐨勮矾寰勶紝涓�瀹氳浠庢渶椤跺眰鑺傜偣寮�濮嬶紝鏍煎紡涓簒xx/yyy/zz 杩欐牱
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java
index cc29bf0..4328924 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java
@@ -117,9 +117,6 @@
return codeClassifyMapper.selectObjs(wrapper);
}
-
-
-
@Override
public IPage<CodeClassifyVO> selectPlCodeClassifyPage(IPage<CodeClassifyVO> page, CodeClassifyVO plCodeClassify) {
return page.setRecords(codeClassifyMapper.selectPlCodeClassifyPage(page, plCodeClassify));
@@ -200,7 +197,6 @@
* @return 鏁版嵁瀵硅薄
*/
private CodeClassify selectByOid(String oid){
-
CodeClassify codeClassifyEntity = codeClassifyMapper.selectClassifyByKeyAndReseRel("'"+oid.trim()+"'").get(0);
if(codeClassifyEntity == null || StringUtils.isBlank(codeClassifyEntity.getOid())){
throw new ServiceException("dataOidNotExist");//鏍规嵁涓婚敭id鏈煡鍒扮浉鍏虫暟鎹�
--
Gitblit v1.9.3