From ad58a16c9d452c2e4d534e081ea3f84001a4595a Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期二, 15 八月 2023 09:26:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/flow-design/main.vue | 4 +-
Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue | 19 ++++++---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java | 4 +-
Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue | 5 ++
Source/UBCS-WEB/src/views/work/process/leave/handle.vue | 18 +++++----
Source/UBCS-WEB/src/components/work/BusinessWork.vue | 38 ++++++++++---------
Source/UBCS-WEB/src/views/system/user.vue | 13 +++++-
7 files changed, 61 insertions(+), 40 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
index 9ba08aa..ed137cd 100644
--- a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
@@ -242,7 +242,7 @@
datetime: "datetime",
},
tableData: [],
- tableHeight: 'calc(100vh - 330px)',
+ tableHeight: 'calc(100vh - 350px)',
DataVisible: false,
tableHeadData: [],
items: {},
@@ -770,6 +770,7 @@
this.addvisible = false;
addSaveCode(val).then(res => {
this.$nextTick(() => {
+ this.$message.warning("淇濆瓨鎴愬姛");
this.onLoad()
})
})
@@ -779,6 +780,7 @@
this.editvisible = false;
editSaveCode(val).then(res => {
this.$nextTick(() => {
+ this.$message.warning("淇濆瓨鎴愬姛");
this.onLoad()
})
})
@@ -792,6 +794,7 @@
upSaveCode(val).then(res => {
console.log(res)
this.$nextTick(() => {
+ this.$message.warning("淇濆瓨鎴愬姛");
this.onLoad()
})
})
diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue b/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
index ed0186c..df97fda 100644
--- a/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
+++ b/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
@@ -327,6 +327,7 @@
<template slot-scope="{ row }">
<el-input v-if="editingRows === row && editShows== item.prop && item.prop != 'codeDateFormat' && (item.edit == 'text' ||item.edit == 'refer' )"
ref="inputRef"
+ v-show="!AddCellFlag"
v-model="row[item.prop]"
autofocus @blur="saveRows"></el-input>
<el-input-number v-if="editingRows === row && editShows== item.prop && item.edit == 'number'" v-model="row[item.prop]"
@@ -481,6 +482,8 @@
},
data() {
return {
+ // 淇濆瓨鍗曞厓鏍肩姸鎬�
+ AddCellFlag:false,
//鍏ㄥ睆缂栬緫楂樺害鐘舵��
editStyleFlag: false,
loading: false,
@@ -1740,7 +1743,7 @@
addsHandler(event) {
this.$refs.referAttrCrud.sort("orderNum");
var ischeck = true;
- console.log(this.ProData)
+ console.log('ProData',this.ProData)
this.ProData.forEach((item, index) => {
if ((item.requireFlag && item.requireFlag.toString() == 'true') && (item.readOnlyFlag && item.readOnlyFlag.toString() == 'true')) {
this.$message.warning(item.name + "(" + item.id + ")蹇呰緭鐨勫睘鎬т笉鑳芥槸鍙");
@@ -1796,6 +1799,7 @@
this.editOpenFlag = false;
// 璋冪敤鐖剁粍浠朵慨鏀规寜閽姸鎬�
this.$emit('editCloseChildren')
+ this.AddCellFlag=true;
}).catch(() => {
this.$message.warning('淇濆瓨澶辫触锛岃鏌ョ湅鎺у埗鍙拌緭鍑猴紒')
});
@@ -1836,7 +1840,7 @@
}
} else if (column.property == 'componentRule') {
if (this.CurrentCell) {
- this.CurrentCell.componentRule = this.componentRuleText;
+ // this.CurrentCell.componentRule = this.componentRuleText;
}
this.isShowformulaEdit = true;
} else if (column.property == 'enumString') {
@@ -2026,12 +2030,11 @@
},
//鍒嗙被娉ㄥ叆娓呯┖
injectHandleReset() {
- // this.injectOption.classifyInvokeAttrName = "鍒嗙被鍚嶇О";
- // this.injectOption.classifyInvokeAttr = "name";
- // this.injectOption.classifyInvokeLevel = "min";
- // this.injectOption.classifyInvokeEditFlag = "true";
- // this.injectOption.classifyNumber = "0";
this.$set(this.CurrentCell, 'classifyInvokeText', '')
+ this.$set(this.CurrentCell, 'classifyInvokeAttr:', '')
+ this.$set(this.CurrentCell, 'classitwInvokeAttrName', '')
+ this.$set(this.CurrentCell, 'classifyInvokeEditFlag', 'false')
+ this.$set(this.CurrentCell, 'classifyInvokeLevel', 'none')
this.injectVisible = false;
},
// 鍒嗙被娉ㄥ叆鍙栨秷
@@ -2102,6 +2105,7 @@
updataFormlaContent(val) {
if (this.CurrentCell) {
this.$set(this.CurrentCell, 'componentRule', val.replace(/"/g, ''))
+ this.componentRuleText= this.CurrentCell.componentRule
} else {
this.$set(this.attrRow, 'componentRule', val.replace(/"/g, ''))
}
@@ -2123,6 +2127,7 @@
//寮�鍚紪杈�
editOpen() {
this.editOpenFlag = true;
+ this.AddCellFlag=false;
},
//瀹氫箟涓�涓叧闂紪杈戠殑鏂规硶渚涘瓙缁勪欢浣跨敤
editClose() {
diff --git a/Source/UBCS-WEB/src/components/flow-design/main.vue b/Source/UBCS-WEB/src/components/flow-design/main.vue
index 34560f8..b124cba 100644
--- a/Source/UBCS-WEB/src/components/flow-design/main.vue
+++ b/Source/UBCS-WEB/src/components/flow-design/main.vue
@@ -8,13 +8,13 @@
width="70%"
custom-class="flow-design-dialog">
<wf-design-base ref="bpmn"
- style="height: 60vh;"
+ style="height: 60vh;width:100%"
:options="option"></wf-design-base>
</el-dialog>
<div v-else>
<wf-design-base v-if="visible"
ref="bpmn"
- style="height: 60vh;"
+ style="height: 50vh;width:100%"
:options="option"></wf-design-base>
</div>
</div>
diff --git a/Source/UBCS-WEB/src/components/work/BusinessWork.vue b/Source/UBCS-WEB/src/components/work/BusinessWork.vue
index 503cf32..9e67e9b 100644
--- a/Source/UBCS-WEB/src/components/work/BusinessWork.vue
+++ b/Source/UBCS-WEB/src/components/work/BusinessWork.vue
@@ -104,24 +104,26 @@
},
methods:{
HandlerSave(){
- this.editingRow = null;
- //淇濆瓨
- let datas=this.tableData.map(item=> {
- let newitem = {
- codeClassifyOid: item.codeclsfid,
- templateOid: this.templateId,
- editInProcess: true,
- data: item,
- oid:item.oid,
- ts:item.ts
- }
- return newitem;
- })
- batchUpdateCode(datas).then(res => {
- if(res.data.data.success){
- this.$message.success("淇敼鎴愬姛");
- }
- })
+ if(!validatenull(this.editingRow)) {
+ this.editingRow = null;
+ //淇濆瓨
+ let datas = this.tableData.map(item => {
+ let newitem = {
+ codeClassifyOid: item.codeclsfid,
+ templateOid: this.templateId,
+ editInProcess: true,
+ data: item,
+ oid: item.oid,
+ ts: item.ts
+ }
+ return newitem;
+ })
+ batchUpdateCode(datas).then(res => {
+ if (res.data.data.success) {
+ this.$message.success("淇敼鎴愬姛");
+ }
+ })
+ }
},
//琛ㄦ牸澶存覆鏌�
CrudHeaderRend() {
diff --git a/Source/UBCS-WEB/src/views/system/user.vue b/Source/UBCS-WEB/src/views/system/user.vue
index 98810f9..10fa0a1 100644
--- a/Source/UBCS-WEB/src/views/system/user.vue
+++ b/Source/UBCS-WEB/src/views/system/user.vue
@@ -372,6 +372,7 @@
trigger: "click"
}],
span: 24,
+ // value:'986926'
},
{
label: "鐧诲綍璐﹀彿",
@@ -746,6 +747,9 @@
}
},
methods: {
+ beOpen(done,type){
+ console.log(done,type)
+ },
//esc鍙栨秷閿搷浣�
handleClose(done) {
this.$confirm('纭鍏抽棴锛�')
@@ -765,8 +769,6 @@
}else {
this.passVisible=true;
}
- //console.log("selectionList",this.selectionList)
- //console.log(this.UserPwdstrategyVO)
},
// 璁剧疆瀵嗙爜绛栫暐锛屼紶閫掍笅鎷夋鐨刬d鍜屽閫夋鐨刬d
passhandle(){
@@ -807,6 +809,7 @@
});
},
nodeClick(data) {
+ console.log(data)
this.treeDeptId = data.id;
this.page.currentPage = 1;
this.onLoad(this.page);
@@ -839,9 +842,12 @@
});
},
rowSave(row, done, loading) {
+ const prop = this.findObject(this.option.group, 'tenantId');
+ console.log('2',prop)
row.deptId = row.deptId.join(",");
row.roleId = row.roleId.join(",");
row.postId = row.postId.join(",");
+ console.log('3',row)
add(row).then(() => {
this.initFlag = false;
this.onLoad(this.page);
@@ -1025,6 +1031,7 @@
})
},
beforeOpen(done, type) {
+ console.log(type)
if (["edit", "view"].includes(type)) {
getUser(this.form.id).then(res => {
this.form = res.data.data;
@@ -1039,6 +1046,8 @@
}
});
}
+ const prop = this.findObject(this.option.group, 'tenantId');
+ console.log('1',prop)
this.initFlag = true;
done();
},
diff --git a/Source/UBCS-WEB/src/views/work/process/leave/handle.vue b/Source/UBCS-WEB/src/views/work/process/leave/handle.vue
index 1d81c3e..813cc12 100644
--- a/Source/UBCS-WEB/src/views/work/process/leave/handle.vue
+++ b/Source/UBCS-WEB/src/views/work/process/leave/handle.vue
@@ -10,14 +10,9 @@
<el-tab-pane label="娴佺▼璺熻釜" name="second">
<avue-crud :data="flowList" :option="option" ref="crud">
</avue-crud>
- <el-card shadow="hover">
- <div slot="header">
- <span>娴佺▼璺熻釜</span>
- </div>
- <el-row class="row-bg">
- <flow-design :is-display="true" :process-instance-id="processInstanceId"></flow-design>
- </el-row>
- </el-card>
+ <el-row class="row-bg" style="margin-top: 20px">
+ <flow-design :is-display="true" :process-instance-id="processInstanceId"></flow-design>
+ </el-row>
</el-tab-pane>
</el-tabs>
</el-card>
@@ -233,4 +228,11 @@
::v-deep(.el-upload-dragger .el-icon-upload) {
margin: 15px 0 16px;
}
+.el-tab-pane{
+ height: 75vh;
+ overflow: auto;
+}
+.el-button{
+ margin:0 10px 10px 0;
+}
</style>
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
index da89285..e883ff3 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
@@ -2448,8 +2448,8 @@
if (conditionMap == null) {
conditionMap = new HashMap<>();
}
- //pageHelper.addDefaultDesc("createTime");
- pageHelper.addDefaultDesc("id");
+ pageHelper.addDefaultDesc("createTime");
+// pageHelper.addDefaultDesc("id");
if (!classifyService.checkHasChild(codeClassifyOid)) {
conditionMap.put("t." + CODE_CLASSIFY_OID_FIELD, codeClassifyOid);
} else {
--
Gitblit v1.9.3