From a406e7a96f60592b30100cc2a29bb9a2da0fcf0f Mon Sep 17 00:00:00 2001
From: dangsn <dangsn@chicecm.com>
Date: 星期五, 04 八月 2023 15:21:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/work/todo.vue | 71 +++---
Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue | 14 +
Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue | 23 +-
Source/UBCS-WEB/src/views/wel/index.vue | 25 +
Source/UBCS-WEB/src/components/template/SetPersonnel.vue | 124 +++++-------
Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/service/impl/ProcessTemplateServiceImpl.java | 2
Source/UBCS-WEB/src/components/template/FlowPath.vue | 6
Source/UBCS-WEB/src/components/template/Stage.vue | 2
Source/UBCS-WEB/src/views/work/send.vue | 78 +++----
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java | 10
Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue | 67 ++----
Source/UBCS-WEB/src/components/transfer/transfer-panel.vue | 7
Source/UBCS-WEB/src/views/work/done.vue | 75 +++---
Source/UBCS-WEB/src/components/Theme/ThemeTemplatePro.vue | 4
Source/UBCS-WEB/src/views/work/claim.vue | 74 +++---
15 files changed, 275 insertions(+), 307 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
index 0b8e3cd..cc7c67f 100644
--- a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
@@ -66,7 +66,7 @@
<FormTemplateDialog :codeClassifyOid="this.codeClassifyOid" :codeRuleOid="this.codeRuleOid"
:disabledProp="disabledProp" :rowOid="rowOid" :templateOid="templateOid"
:title="'宸插彂甯冩暟鎹洿鏀�'"
- :type="edit"
+ type="edit"
:visible.sync="DataVisible"></FormTemplateDialog>
<!-- 鍙戝竷-->
<set-personnel :parameter="this.parameter" :title="title" :visible.sync="visibleFlow"
@@ -125,6 +125,7 @@
import BatchImport from '@/components/BatchImport'
import {validatenull} from "@/util/validate";
import fileInHtml from "@/components/file/inHtml.vue";
+import {getUserInfo} from "@/api/system/user";
export default {
components: {
@@ -269,8 +270,12 @@
},
computed: {},
created() {
- const index = this.$route.query.id.indexOf('@name=') + '@name='.length;
- this.result = this.$route.query.id.substring(index);
+ // const index = this.$route.query.id.indexOf('@name=') + '@name='.length;
+ // this.result = this.$route.query.id.substring(index);
+ getUserInfo().then(res=>{
+ console.log(res.data.data)
+ this.result=res.data.data.realName
+ })
},
mounted() {
},
@@ -440,8 +445,7 @@
} else if (showMessage) {
processTS({templateId: this.templateOid, buttonTypeKey: 'PUBLIC'}).then(res => {
if (res.data.data.records && res.data.data.records.length != 0) {
- this.userName = localStorage.getItem("username");
- this.parameter.template = this.userName + '-鐢宠[' + this.Treedata[0].name + '-' + this.selectRow[0].name + ']';
+ this.parameter.processName = this.result + '-鐢宠[' + this.Treedata[0].name + '-' + this.selectRow[0].name + ']';
this.parameter.type = 'PUBLIC';
this.parameter.code = this.templateOid;
this.parameter.btmtype=this.selectRow[0].btmname || this.selectRow[0].btmtype;
@@ -491,8 +495,7 @@
} else if (this.selectRow.length >= 1 && hasEditing && showMessage) {
processTS({templateId: this.templateOid, buttonTypeKey: 'DISABLE'}).then(res => {
if (res.data.records != [] && res.data.data.records.length != 0) {
- this.userName = localStorage.getItem("username");
- this.parameter.template = this.userName + '-鍋滅敤[' + this.Treedata[0].name + '-' + this.selectRow[0].name + ']';
+ this.parameter.processName = this.result + '-鍋滅敤[' + this.Treedata[0].name + '-' + this.selectRow[0].name + ']';
this.parameter.type = 'DISABLE';
this.parameter.code = this.templateOid
this.parameter.btmtype=this.selectRow[0].btmname || this.selectRow[0].btmtype;
@@ -543,8 +546,7 @@
processTS({templateId: this.templateOid, buttonTypeKey: 'ENABLE'}).then(res => {
if (res.data.data.records && res.data.data.records.length != 0) {
this.parameter = res.data.data.records[0]
- this.userName = localStorage.getItem("username");
- this.parameter.template = this.userName + '-鍚敤[' + this.Treedata[0].name + '-' + this.selectRow[0].name + ']';
+ this.parameter.processName = this.result + '-鍚敤[' + this.Treedata[0].name + '-' + this.selectRow[0].name + ']';
this.parameter.type = 'Released';
this.parameter.code = this.templateOid
this.parameter.btmtype=this.selectRow[0].btmname || this.selectRow[0].btmtype;
@@ -601,8 +603,7 @@
//disabledCount 鍜� releasedCount 涓换鎰忎竴涓瓑浜� this.selectRow 鏁扮粍鐨勯暱搴﹀垯琛ㄧず鍏ㄩ儴鏄悓涓�绉嶇姸鎬侊紝杩斿洖 true 濡傛灉disabledCount 鍜� releasedCount 閮藉ぇ浜�0锛屽垯琛ㄧず鏃㈡湁Disabled涔熸湁Released杩斿洖 true
processTS({templateId: this.templateOid, buttonTypeKey: 'ROLLBACK'}).then(res => {
if (res.data.records != [] && res.data.data.records.length != 0) {
- this.userName = localStorage.getItem("username");
- this.parameter.template = this.userName + '-鍥炴敹[' + this.selectRow[0].btmname + '-' + this.selectRow[0].name + ']';
+ this.parameter.processName = this.result + '-鍥炴敹[' + this.selectRow[0].btmname + '-' + this.selectRow[0].name + ']';
this.parameter.type = 'TakeBack';
this.parameter.code = this.templateOid
this.parameter.btmtype=this.selectRow[0].btmname || this.selectRow[0].btmtype;
diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue b/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
index b18084c..39bad89 100644
--- a/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
+++ b/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
@@ -388,6 +388,11 @@
}
}
},
+ crudArrayFlag:{
+ handler(newval,olaval){
+ console.log('crudArrayFlag',newval)
+ }
+ },
crudArray:{
handler(newval,oldval){
if(newval != undefined){
@@ -1701,22 +1706,29 @@
if(item.componentRule){
//缁勫悎瑙勫垯
num++
+ console.log('componentRule',num)
}
if(item.enumString || item.enumId){
//鏋氫妇
num++
+ console.log('enumString',num)
}
if(item.referConfig || item.referBtmId){
//鍙傜収
num++
+ console.log('referConfig',num)
}
if(item.codeDateFormat){
//鏃堕棿鏍煎紡
num++
+ console.log('codeDateFormat',num)
}
- if(item.classifyInvokeLevel){
+ //濡傛灉绌哄悗鍙拌繑鍥瀗one
+ if(item.classifyInvokeLevel && item.classifyInvokeLevel != 'none'){
//鍒嗙被娉ㄥ叆
num++
+ console.log('classifyInvokeLevel',num)
+ console.log(item.classifyInvokeLevel)
}
if(num>1 && ischeck){
this.$message({
diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
index 54d9a47..3e6f995 100644
--- a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
+++ b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
@@ -427,7 +427,7 @@
label: '鑻辨枃鍚嶇О'
}
],
- SelectValue:"",
+ SelectValue:"id",
SelectFInd:"",
addFlag:false,
// 琛ㄦ牸褰撳墠琛宨d
@@ -672,11 +672,7 @@
}
},
watch:{
- TreeFlagCode:{
- handler(newval,oldval){
- console.log('TreeFlagCode',newval)
- }
- }
+
},
//tab鏍忛粯璁ゆ槸琛ㄦ牸
mounted() {
@@ -753,6 +749,8 @@
},
methods: {
+ // 鍏抽棴寮圭獥
+
/** 瀵煎叆 */
ImportExcel(){
this.ThemeImportVisible=true;
@@ -787,15 +785,11 @@
'conditionMap[id]':this.SelectFInd
}
this.MasterdefaultRend(masterParameter);
- this.SelectValue=""
- this.SelectFInd=""
}else if(this.SelectValue == 'name'){
const masterParameter={
'conditionMap[name]':this.SelectFInd
}
this.MasterdefaultRend(masterParameter)
- this.SelectValue=""
- this.SelectFInd=""
}
},
//缂栫爜瑙勫垯纭畾
@@ -846,15 +840,11 @@
'conditionMap[id]':this.SelectFInd
}
this.KeydefaultRend(masterParameter);
- this.SelectValue="";
- this.SelectFInd="";
}else if(this.SelectValue == 'name'){
const masterParameter={
'conditionMap[name]':this.SelectFInd
}
this.KeydefaultRend(masterParameter)
- this.SelectValue=""
- this.SelectFInd=""
}
},
//鍏抽敭灞炴�ф帴鍙�
@@ -899,15 +889,11 @@
'conditionMap[id]':this.SelectFInd
}
this.simdefaultRend(masterParameter);
- this.SelectValue=""
- this.SelectFInd=""
}else if(this.SelectValue == 'name'){
const masterParameter={
'conditionMap[name]':this.SelectFInd
}
this.simdefaultRend(masterParameter)
- this.SelectValue=""
- this.SelectFInd=""
}
},
// 鐩镐技椤瑰閫�
@@ -952,15 +938,11 @@
'conditionMap[id]':this.SelectFInd
}
this.btmdefaultRend(masterParameter);
- this.SelectValue=""
- this.SelectFInd=""
}else if(this.SelectValue == 'name'){
const masterParameter={
'conditionMap[name]':this.SelectFInd
}
this.btmdefaultRend(masterParameter);
- this.SelectValue="";
- this.SelectFInd="";
}
},
//涓氬姟绫诲瀷澶氶��
@@ -1226,6 +1208,7 @@
this.editTreeFLagCode = !data.parentId;
this.nodeClickList = data;
this.selectRow = 0;
+ this.crudArray=[]
try {
this.requestCount += 1;
const [res1, res2, res3] = await Promise.all([
@@ -1426,29 +1409,27 @@
}
},
//鍏嬮殕妯℃澘鍗曢�夋鏀瑰彉
- selectionChange(row){
- this.CloneSelect=row;
- //鍙屽悜缁戝畾锛屾彁浜よ〃鍗曡緭鍏ユ鍥炲～涓婂綋鍓嶉�夋嫨鐨勬暟鎹�
- this.CloneModel.id=row[0].id;
- this.CloneModel.name=row[0].name;
- //杩欓噷鏈夌偣缁曪紝CloneSelect鏄垜閫夋嫨妗嗛�夋嫨鐨勬暟鎹�傜瓑浜巘his.nodeClickList.oid鏄洜涓猴紝鍏嬮殕妯℃澘浼犻�掓暟鎹鎶婂綋鍓嶉�夋嫨鏍戠殑oid浼犻�掔粰鍚庣銆傝�屼笉鏄綋鍓嶈鍏嬮殕妯℃澘鐨刼id
- this.CloneSelect[0].codeclassifyoid=this.nodeClickList.oid
+ selectionChange(row) {
+ Object.assign(this.CloneModel, row[0]);
+ this.CloneSelect = [row[0]];
+ this.CloneSelect[0].codeclassifyoid = this.nodeClickList.oid;
},
//鍏嬮殕琛ㄥ崟鎻愪氦
- Clonesubmit(row,done){
- //閲嶆柊璧嬪�糃loneSelect浼犻�掔殑鏁版嵁涓鸿緭鍏ユ鍙互淇敼鐨勬暟鎹紝CloneModel鎻愪氦琛ㄥ崟杈撳叆妗嗗弻鍚戠粦瀹氭暟鎹�
- this.CloneSelect[0].id=this.CloneModel.id;
- this.CloneSelect[0].name=this.CloneModel.name;
- copy(this.CloneSelect[0]).then(()=>{
- //鍥犱负鏄祵濂楀脊绐楁墍浠ユ墜鍔ㄥ叧闂瑿loneinnerVisible锛孋loneVisible涓や釜寮圭獥銆�
- this.CloneinnerVisible=false
- this.CloneVisible=false
- this.$message.success("澶嶅埗鎴愬姛")
- this.CrudRend()
- done(row)
- }).catch(res=>{
- done(res)
- })
+ Clonesubmit(row, done) {
+ // 閲嶆柊璧嬪�糃loneSelect浼犻�掔殑鏁版嵁涓鸿緭鍏ユ鍙互淇敼鐨勬暟鎹紝CloneModel鎻愪氦琛ㄥ崟杈撳叆妗嗗弻鍚戠粦瀹氭暟鎹�
+ Object.assign(this.CloneSelect[0], this.CloneModel);
+ copy(this.CloneSelect[0])
+ .then(() => {
+ // 鍥犱负鏄祵濂楀脊绐楁墍浠ユ墜鍔ㄥ叧闂瑿loneinnerVisible锛孋loneVisible涓や釜寮圭獥銆�
+ this.CloneinnerVisible = false;
+ this.CloneVisible = false;
+ this.$message.success("澶嶅埗鎴愬姛");
+ this.TemRefresh();
+ done(row);
+ })
+ .catch((error) => {
+ done(error);
+ });
},
//鍒锋柊
TemRefresh() {
diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeTemplatePro.vue b/Source/UBCS-WEB/src/components/Theme/ThemeTemplatePro.vue
index 88da25c..160c034 100644
--- a/Source/UBCS-WEB/src/components/Theme/ThemeTemplatePro.vue
+++ b/Source/UBCS-WEB/src/components/Theme/ThemeTemplatePro.vue
@@ -5,10 +5,10 @@
<attrCrud :ProData="ProData" :crudOid="crudOid" :checkStatus="checkStatus" :crudLCStatus="crudLCStatus" :crudArray="crudArray" :Formlist="Formlist" :codeClassifyOid="codeClassifyOid"></attrCrud>
</span>
<span v-else-if="type.prop==='tab2'">
- <FlowPath :code="this.crudOid" :checkStatus="checkStatus" :crudLCStatus="crudLCStatus"></FlowPath>
+ <FlowPath ref="FlowPath" :code="this.crudOid" :checkStatus="checkStatus" :crudLCStatus="crudLCStatus" :Formlist="Formlist"></FlowPath>
</span>
<span v-else-if="type.prop==='tab3'">
- <stage :code="this.crudOid"></stage>
+ <stage ref="stage" :code="this.crudOid" :Formlist="Formlist"></stage>
</span>
</basic-container>
diff --git a/Source/UBCS-WEB/src/components/template/FlowPath.vue b/Source/UBCS-WEB/src/components/template/FlowPath.vue
index 83f36ba..b1e37dd 100644
--- a/Source/UBCS-WEB/src/components/template/FlowPath.vue
+++ b/Source/UBCS-WEB/src/components/template/FlowPath.vue
@@ -23,6 +23,10 @@
typeof: String,
required: true,
default: ""
+ },
+ Formlist:{
+ type:Array,
+ default:[]
}
},
data() {
@@ -159,6 +163,8 @@
this.data = data.records
this.page.total = data.total
} else this.loading = false
+ }else {
+ this.data=[]
}
},
diff --git a/Source/UBCS-WEB/src/components/template/SetPersonnel.vue b/Source/UBCS-WEB/src/components/template/SetPersonnel.vue
index c208c2b..7ec8388 100644
--- a/Source/UBCS-WEB/src/components/template/SetPersonnel.vue
+++ b/Source/UBCS-WEB/src/components/template/SetPersonnel.vue
@@ -10,7 +10,7 @@
<el-input placeholder="娴佺▼妯℃澘" v-model="saveParam.modelName" disabled></el-input>
</el-form-item>
<el-form-item label="娴佺▼鍚嶇О" prop="processName">
- <el-input placeholder="娴佺▼鍚嶇О" v-model="saveParam.template">
+ <el-input placeholder="娴佺▼鍚嶇О" v-model="saveParam.processName">
</el-input>
</el-form-item>
<el-form-item label="娴佺▼鎻忚堪">
@@ -24,7 +24,7 @@
</div>
<el-form :model="collectParam" class="demo-form-inline" label-position="left" label-width="auto">
<el-form-item :label="item.taskName" v-for="(item, index) in initFrom" :key="index">
- <el-select style="width: 80%;" filterable v-model="collectParam.flowTaskUsers[index]['userId']"
+ <el-select style="width: 100%;" filterable v-model="collectParam.flowTaskUsers[index]['userId']"
:placeholder="item.taskName" @change="handleSelect($event, index)">
<el-option :label="key.userNames" :value="key.userId" v-for="(key, keyi) in typeName"
:key="keyi"></el-option>
@@ -42,61 +42,61 @@
export default {
name: 'SetPersonnel',
props: {
- // 鏄惁鎵撳紑
- visible: {
- typeof: Boolean,
- default: false
- },
- // 鏍囬
- title: {
- typeof: String,
- default: '娴佺▼瀹℃壒'
- },
- // 鍙傛暟锛氶�夋嫨鐨刬d锛屽涓互鏁扮粍鏂瑰紡浼犻�掞細['id','id']锛屾ā鏉縤d锛屾ā鏉跨敤閫旓紝娴佺▼鍚嶅瓧锛屾祦绋嬫ā鏉�,
- // flowTemplate锛�
- // vars锛歰bject鏍煎紡锛屽悕瀛椾负vars锛岄噷闈ey閿�硷紝鑷繁闅忔剰
- parameter: {
- typeof: Object,
- default: () => { }
- },
- parameterKeys: {
- typeof: Object,
- default: () => {
- return {
- ids: 'ids',
- flowTemplate: 'flowTemplate',
- code: 'code',
- type: 'type',
- btmtype:'btmtype'
- }
- }
+ // 鏄惁鎵撳紑
+ visible: {
+ typeof: Boolean,
+ default: false
+ },
+ // 鏍囬
+ title: {
+ typeof: String,
+ default: '娴佺▼瀹℃壒'
+ },
+ // 鍙傛暟锛氶�夋嫨鐨刬d锛屽涓互鏁扮粍鏂瑰紡浼犻�掞細['id','id']锛屾ā鏉縤d锛屾ā鏉跨敤閫旓紝娴佺▼鍚嶅瓧锛屾祦绋嬫ā鏉�,
+ // flowTemplate锛�
+ // vars锛歰bject鏍煎紡锛屽悕瀛椾负vars锛岄噷闈ey閿�硷紝鑷繁闅忔剰
+ parameter: {
+ typeof: Object,
+ default: () => {
}
-
+ },
+ parameterKeys: {
+ typeof: Object,
+ default: () => {
+ return {
+ ids: 'ids',
+ processName: 'processName',
+ code: 'code',
+ type: 'type',
+ btmtype: 'btmtype'
+ }
+ }
+ }
},
watch: {
- visible(n) {
- this.dialogVisible = n;
- if (n) {
- this.apiInit()
- this.apiDict()
- }
+ visible(n) {
+ this.dialogVisible = n;
+ if (n) {
+ this.apiInit()
+ this.apiDict()
+ }
+ },
+ dialogVisible(n) {
+ this.$emit('update:visible', n)
+ },
+ users: {
+ handler(val) {
+ this.collectParam.flowTaskUsers = val
},
- dialogVisible(n) {
- this.$emit('update:visible', n)
+ deep: true,
+ immediate: true
+ },
+ parameter: {
+ handler(newval, oldval) {
+ this.saveParam = Object.assign({processName:'',processDesc: ''},newval) ;
},
- users:{
- handler(val){
- this.collectParam.flowTaskUsers = val
- },
- deep:true,
- immediate:true
- },
- parameter:{
- handler(newval,oldval){
- this.saveParam=newval;
- },
- deep:true,
- immediate:true
+ deep: true,
+ immediate: true
}
},
data() {
@@ -111,8 +111,8 @@
users: [],
rules: {
processName: [
- { required: true, message: '妯℃澘鍚嶇О涓嶈兘涓虹┖', trigger: 'blur' },
- { min: 1, max: 20, message: '闀垮害鍦� 3 鍒� 20 涓瓧绗�', trigger: 'blur' }
+ { required: true, message: '娴佺▼鍚嶇О涓嶈兘涓虹┖', trigger: 'blur' },
+ { min: 3, max: 50, message: '闀垮害鍦� 3 鍒� 50 涓瓧绗�', trigger: 'blur' }
]
}
}
@@ -123,16 +123,6 @@
created() {
},
methods: {
- setSaveParam() {
- return {
- processName: this.parameter[this.parameterKeys.flowTemplate],
- topName: this.title,
- ids: this.parameter[this.parameterKeys.ids],
- oids: this.parameter[this.parameterKeys.ids],
- btmtype:this.parameter[this.parameterKeys.btmtype],
- vars:this.parameter['vars']
- }
- },
userIndex(arr1) {
return this.initFrom.findIndex(i => i.taskId === arr1)
},
@@ -145,10 +135,7 @@
let flowTaskUsers = response.data.data.user
this.collectParam = { modelKey, templateId, flowTaskUsers: flowTaskUsers }
this.users = response.data.data.user
- console.log(this.collectParam)
- console.log('this.saveParam.before',this.saveParam)
this.saveParam = { ...this.saveParam, modelKey, templateId, modelName }
- console.log('this.saveParam',this.saveParam)
if (this.tags.length !== 0) this.handleClickTag(this.tags[0])
}
},
@@ -171,12 +158,9 @@
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
}).then(async ({ value }) => {
- console.log(this.users)
this.collectParam.flowTaskUsers = this.users
this.collectParam = { ...this.collectParam, name: value }
- console.log(this.collectParam)
const response = await personnelCollect(this.collectParam)
- console.log(response)
if (response.status === 200) {
this.$nextTick(() => {
this.apiInit()
diff --git a/Source/UBCS-WEB/src/components/template/Stage.vue b/Source/UBCS-WEB/src/components/template/Stage.vue
index cce53f2..e440f54 100644
--- a/Source/UBCS-WEB/src/components/template/Stage.vue
+++ b/Source/UBCS-WEB/src/components/template/Stage.vue
@@ -144,6 +144,8 @@
this.data = data.records
this.page.total = data.total
} else this.loading = false
+ }else {
+ this.data=[]
}
},
// 鑾峰彇闃舵鍒楄〃
diff --git a/Source/UBCS-WEB/src/components/transfer/transfer-panel.vue b/Source/UBCS-WEB/src/components/transfer/transfer-panel.vue
index 232be18..3f1910d 100644
--- a/Source/UBCS-WEB/src/components/transfer/transfer-panel.vue
+++ b/Source/UBCS-WEB/src/components/transfer/transfer-panel.vue
@@ -24,7 +24,7 @@
</p>
</div>
</template>
-
+
<script>
import ElCheckboxGroup from 'element-ui/packages/checkbox-group';
import ElCheckbox from 'element-ui/packages/checkbox';
@@ -207,9 +207,9 @@
methods: {
updateAllChecked() {
-
+
const checkableDataKeys = this.checkableData.map(item => item[this.keyProp]);
-
+
this.allChecked = checkableDataKeys.length > 0 &&
checkableDataKeys.every(item => this.checked===item);
},
@@ -228,4 +228,3 @@
}
};
</script>
-
\ No newline at end of file
diff --git a/Source/UBCS-WEB/src/views/wel/index.vue b/Source/UBCS-WEB/src/views/wel/index.vue
index 863ede5..d7ffd1a 100644
--- a/Source/UBCS-WEB/src/views/wel/index.vue
+++ b/Source/UBCS-WEB/src/views/wel/index.vue
@@ -95,26 +95,35 @@
delBtn: false,
column: [{
label: '浠诲姟鍚嶇О',
- prop: 'name',
+ prop: 'taskName',
+ sortable:true,
+ headerAlign:'center',
+ align:'left',
html: true,
formatter: (val) => {
- return '<a name="processname" href="javascript:;" style="color: #66b1ff;">' + val.taskName + '</a>'
+ return '<a name="processname" href="javascript:;" style="color: #66b1ff;">' + val.variables.processName+'-'+val.taskName + '</a>'
}
},
{
label: '涓婁竴姝ュ鐞嗘椂闂�',
- prop: 'createTime'
- },
- {
- label: '鎻忚堪',
- prop: 'description'
+ sortable:true,
+ prop: 'historyActivityDurationTime'
},
{
label: '涓婁竴姝ユ搷浣滀汉',
- prop: 'creator_name'
+ sortable:true,
+ prop: 'historyActivityAssigneName'
+ },
+ {
+ label: '娴佺▼鎻忚堪',
+ prop: 'processDesc',
+ formatter: (val) => {
+ return val.variables.processDesc
+ }
},
{
label: '鎵�灞炴祦绋嬫ā鏉�',
+ sortable:true,
prop: 'categoryName'
}
]
diff --git a/Source/UBCS-WEB/src/views/work/claim.vue b/Source/UBCS-WEB/src/views/work/claim.vue
index 6eb9ce6..63b6582 100644
--- a/Source/UBCS-WEB/src/views/work/claim.vue
+++ b/Source/UBCS-WEB/src/views/work/claim.vue
@@ -80,44 +80,42 @@
dialogWidth: 900,
menuWidth: 200,
dialogClickModal: false,
- column: [
- {
- label: "娴佺▼鍒嗙被",
- type: "select",
- row: true,
- dicUrl: "/api/ubcs-system/dict/dictionary?code=flow",
- props: {
- label: "dictValue",
- value: "dictKey"
- },
- dataType: "number",
- slot: true,
- prop: "category",
- search: true,
- hide: true,
- width: 100,
- },
- {
- label: '娴佺▼鍚嶇О',
- prop: 'processDefinitionName',
- search: true,
- },
- {
- label: '褰撳墠姝ラ',
- prop: 'taskName',
- },
- {
- label: '娴佺▼鐗堟湰',
- prop: 'processDefinitionVersion',
- slot: true,
- width: 80,
- },
- {
- label: '鐢宠鏃堕棿',
- prop: 'createTime',
- width: 165,
- },
- ]
+ align: 'center',
+ column: [{
+ label: '娴佺▼鍚嶇О',
+ prop: 'processName',
+ search: true,
+ headerAlign:'center',
+ align:'left',
+ sortable:true,
+ formatter: (val) => {
+ return val.variables.processName
+ }
+ }, {
+ label: '鍙戣捣浜�',
+ prop: 'createUser',
+ sortable:true,
+ formatter: (val) => {
+ return val.variables.createUser
+ }
+ }, {
+ label: '鍙戣捣鏃堕棿',
+ sortable:true,
+ prop: 'createTime',
+ }, {
+ label: '褰撳墠姝ラ',
+ prop: 'taskName',
+ },{
+ label: '鎵�灞炴祦绋嬫ā鏉�',
+ sortable:true,
+ prop: 'categoryName'
+ }, {
+ label: '娴佺▼鎻忚堪',
+ prop: 'processDesc',
+ formatter: (val) => {
+ return val.variables.processDesc
+ }
+ }]
},
data: []
};
diff --git a/Source/UBCS-WEB/src/views/work/done.vue b/Source/UBCS-WEB/src/views/work/done.vue
index 09160ea..88cc1f7 100644
--- a/Source/UBCS-WEB/src/views/work/done.vue
+++ b/Source/UBCS-WEB/src/views/work/done.vue
@@ -74,44 +74,43 @@
dialogWidth: 900,
menuWidth: 150,
dialogClickModal: false,
- column: [
- {
- label: "娴佺▼鍒嗙被",
- type: "select",
- row: true,
- dicUrl: "/api/ubcs-system/dict/dictionary?code=flow",
- props: {
- label: "dictValue",
- value: "dictKey"
- },
- dataType: "number",
- slot: true,
- prop: "category",
- search: true,
- hide: true,
- width: 100,
- },
- {
- label: '娴佺▼鍚嶇О',
- prop: 'processDefinitionName',
- search: true,
- },
- {
- label: '褰撳墠姝ラ',
- prop: 'taskName',
- },
- {
- label: '娴佺▼鐗堟湰',
- prop: 'processDefinitionVersion',
- slot: true,
- width: 80,
- },
- {
- label: '鐢宠鏃堕棿',
- prop: 'createTime',
- width: 165,
- },
- ]
+ align: 'center',
+ column: [{
+ label: '娴佺▼鍚嶇О',
+ prop: 'processName',
+ search: true,
+ headerAlign: 'center',
+ align: 'left',
+ sortable: true,
+ formatter: (val) => {
+ return val.variables.processName
+ }
+ }, {
+ label: '鍙戣捣浜�',
+ prop: 'createUser',
+ sortable: true,
+ formatter: (val) => {
+ return val.variables.createUser
+ }
+ }, {
+ label: '鍙戣捣鏃堕棿',
+ sortable: true,
+ prop: 'createTime',
+ }, {
+ label: '瀹屾垚鏃堕棿',
+ sortable: true,
+ prop: 'endTime',
+ }, {
+ label: '鎵�灞炴祦绋嬫ā鏉�',
+ sortable: true,
+ prop: 'categoryName'
+ }, {
+ label: '娴佺▼鍚姩鏃舵弿杩�',
+ prop: 'processDesc',
+ formatter: (val) => {
+ return val.variables.processDesc
+ }
+ }]
},
data: []
};
diff --git a/Source/UBCS-WEB/src/views/work/send.vue b/Source/UBCS-WEB/src/views/work/send.vue
index c1931ee..2cd93e8 100644
--- a/Source/UBCS-WEB/src/views/work/send.vue
+++ b/Source/UBCS-WEB/src/views/work/send.vue
@@ -78,50 +78,40 @@
dialogWidth: 900,
menuWidth: 150,
dialogClickModal: false,
- column: [
- {
- label: "娴佺▼鍒嗙被",
- type: "select",
- row: true,
- dicUrl: "/api/ubcs-system/dict/dictionary?code=flow",
- props: {
- label: "dictValue",
- value: "dictKey"
- },
- dataType: "number",
- slot: true,
- prop: "category",
- search: true,
- hide: true,
- width: 100,
- },
- {
- label: '娴佺▼鍚嶇О',
- prop: 'processDefinitionName',
- search: true,
- },
- {
- label: '褰撳墠姝ラ',
- prop: 'taskName',
- },
- {
- label: '娴佺▼鐗堟湰',
- prop: 'processDefinitionVersion',
- slot: true,
- width: 80,
- },
- {
- label: '娴佺▼杩涘害',
- prop: 'processIsFinished',
- slot: true,
- width: 80,
- },
- {
- label: '鐢宠鏃堕棿',
- prop: 'createTime',
- width: 165,
- },
- ]
+ align: 'center',
+ column: [{
+ label: '娴佺▼鍚嶇О',
+ prop: 'processName',
+ search: true,
+ headerAlign:'center',
+ align:'left',
+ sortable:true,
+ formatter: (val) => {
+ return val.variables.processName
+ }
+ }, {
+ label: '娴佺▼杩涘害',
+ prop: 'processIsFinished',
+ slot: true,
+ width: 80,
+ }, {
+ label: '褰撳墠姝ラ',
+ prop: 'taskName',
+ }, {
+ label: '鍙戣捣鏃堕棿',
+ sortable:true,
+ prop: 'createTime',
+ },{
+ label: '鎵�灞炴祦绋嬫ā鏉�',
+ sortable:true,
+ prop: 'categoryName'
+ }, {
+ label: '娴佺▼鎻忚堪',
+ prop: 'processDesc',
+ formatter: (val) => {
+ return val.variables.processDesc
+ }
+ }]
},
data: []
};
diff --git a/Source/UBCS-WEB/src/views/work/todo.vue b/Source/UBCS-WEB/src/views/work/todo.vue
index ca53516..30514b7 100644
--- a/Source/UBCS-WEB/src/views/work/todo.vue
+++ b/Source/UBCS-WEB/src/views/work/todo.vue
@@ -80,44 +80,39 @@
dialogWidth: 900,
menuWidth: 200,
dialogClickModal: false,
- column: [
- {
- label: "娴佺▼鍒嗙被",
- type: "select",
- row: true,
- dicUrl: "/api/ubcs-system/dict/dictionary?code=flow",
- props: {
- label: "dictValue",
- value: "dictKey"
- },
- dataType: "number",
- slot: true,
- prop: "category",
- search: true,
- hide: true,
- width: 100,
- },
- {
- label: '娴佺▼鍚嶇О',
- prop: 'processDefinitionName',
- search: true,
- },
- {
- label: '褰撳墠姝ラ',
- prop: 'taskName',
- },
- {
- label: '娴佺▼鐗堟湰',
- prop: 'processDefinitionVersion',
- slot: true,
- width: 80,
- },
- {
- label: '鐢宠鏃堕棿',
- prop: 'createTime',
- width: 165,
- },
- ]
+ align: 'center',
+ column: [{
+ label: '娴佺▼鍚嶇О',
+ prop: 'processName',
+ search: true,
+ headerAlign:'center',
+ align:'left',
+ sortable:true,
+ formatter: (val) => {
+ return val.variables.processName
+ }
+ }, {
+ label: '鍙戣捣浜�',
+ prop: 'createUser',
+ sortable:true,
+ formatter: (val) => {
+ return val.variables.createUser
+ }
+ }, {
+ label: '鍙戣捣鏃堕棿',
+ sortable:true,
+ prop: 'createTime',
+ }, {
+ label: '鎵�灞炴祦绋嬫ā鏉�',
+ sortable:true,
+ prop: 'categoryName'
+ }, {
+ label: '娴佺▼鎻忚堪',
+ prop: 'processDesc',
+ formatter: (val) => {
+ return val.variables.processDesc
+ }
+ }]
},
data: []
};
diff --git a/Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/service/impl/ProcessTemplateServiceImpl.java b/Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/service/impl/ProcessTemplateServiceImpl.java
index 601c524..c82ff71 100644
--- a/Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/service/impl/ProcessTemplateServiceImpl.java
+++ b/Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/service/impl/ProcessTemplateServiceImpl.java
@@ -56,7 +56,7 @@
queryWrapper.ne("id", processTemplate.getId());
}
if(baseMapper.selectOne(queryWrapper)!=null){
- throw new ServiceException(processTemplate.getButtonTypeValue()+"鍔熻兘宸茬粡閰嶇疆浜嗘祦绋�!");
+ throw new ServiceException("妯℃澘key锛�"+processTemplate.getModelKey()+"涓庢ā鏉垮悕绉帮細"+processTemplate.getModelName()+",鍦ㄦ妯℃澘涓嬪凡琚厤缃紝璇锋鏌�!");
}
if(StringUtils.isEmpty(processTemplate.getButtonTypeValue())){
processTemplate.setButtonTypeValue(ProcessTemplateTypeEnum.getTextByValue(processTemplate.getButtonTypeKey()));
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 5b0ef91..1c4d73c 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
@@ -649,11 +649,10 @@
}
wrapperKeyAttrConditionMap(value, keyRuleVO, attrId, trim, ignoreCase, ignoreWidth, trimAll, conditionMap);
});
- conditionMap.put("CODETEMPLATEOID","'" + orderDTO.getTemplateOid() + "'");
//娌℃湁闄愬埗鍒嗙被锛屼絾鏄竴涓ā鏉垮彧鍙兘鍦ㄤ竴涓笟鍔＄被鍨嬮噷闈紝鎵�浠ョ洿鎺ユ煡璇㈣繖涓笟鍔＄被鍨嬪嵆鍙�
-
if (!CollectionUtils.isEmpty(conditionMap)) {
+ conditionMap.put("CODETEMPLATEOID","'" + orderDTO.getTemplateOid() + "'");
// final String[] sql = {"select count(*) from " + VciBaseUtil.getTableName(classifyFullInfo.getTopClassifyVO().getBtmtypeid()) + " t where 1 = 1 "};
R<List<BtmTypeVO>> listR = btmTypeClient.selectByIdCollection(Collections.singletonList(classifyFullInfo.getTopClassifyVO().getBtmTypeId()));
// String referTable = VciBaseUtil.getTableName(referVO.getReferType());
@@ -805,10 +804,6 @@
} else {
fullPath = classifyFullInfo.getCurrentClassifyVO().getOid();
}
-
-// BeanUtils.
-// BeanUtils.copyProperties(orderDTO.getData(),cbo);
-// cbo.setMaterialtype(Short.valueOf("1001"));
orderDTO.getData().forEach((key, value) -> {
if (!edit || (!checkUnAttrUnEdit(key) &&
!VciQueryWrapperForDO.LC_STATUS_FIELD.equalsIgnoreCase(key))) {
@@ -819,9 +814,6 @@
}
}
});
-// BeanMap beanMap = BeanMap.create(cbo);
-// beanMap.putAll(orderDTO.getData());
-
try {
Map<String, String> data = new HashMap<>();
data.put(cbo.getData().containsKey(CODE_CLASSIFY_OID_FIELD.toUpperCase())?CODE_CLASSIFY_OID_FIELD.toUpperCase():CODE_CLASSIFY_OID_FIELD, classifyFullInfo.getCurrentClassifyVO().getOid());
--
Gitblit v1.9.3