From ddc3c5f70ed391c55dc83cc9d9e9c6d1fa672de5 Mon Sep 17 00:00:00 2001
From: wente <329538422@qq.com>
Date: 星期四, 30 十一月 2023 10:58:41 +0800
Subject: [PATCH] 项目表
---
web/src/views/modules/flowChart/flowChartView.vue | 7 +++----
web/src/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate.vue | 21 +++++++++++++++++++--
web/src/views/modules/flowChart/ProcessTrajectory.vue | 3 ---
web/src/views/modules/sys/task/already-task.vue | 4 +++-
web/src/views/modules/flowChart/processTimeline.vue | 2 +-
modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/service/ItemCirculatOrderService.java | 5 +++--
6 files changed, 29 insertions(+), 13 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/service/ItemCirculatOrderService.java b/modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/service/ItemCirculatOrderService.java
index 901ef8d..738cd08 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/service/ItemCirculatOrderService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/service/ItemCirculatOrderService.java
@@ -135,8 +135,9 @@
data.setId(circulatOrderid);
ItemCirculatOrder itemCirculatOrder = this.get(circulatOrderid);
data.setCirculatOrder(itemCirculatOrder);
-
- projectId = itemCirculatOrder.getProjectId();
+ if (projectId==null){
+ projectId = itemCirculatOrder.getProjectId();
+ }
data.setTestAgencyInfo(testAgencyInfoService.get(circulatOrderid));
diff --git a/web/src/views/modules/flowChart/ProcessTrajectory.vue b/web/src/views/modules/flowChart/ProcessTrajectory.vue
index 4fa2bfc..031bc8c 100644
--- a/web/src/views/modules/flowChart/ProcessTrajectory.vue
+++ b/web/src/views/modules/flowChart/ProcessTrajectory.vue
@@ -1,7 +1,5 @@
<!--娴佺▼杞ㄨ抗-->
<template>
- <zt-dialog ref="dialog" :hasConfirm="false" title="娴佺▼鍔炵悊杞ㄨ抗" append-to-body
- @close="close">
<el-table :data="tableData" v-adaptive="{bottomOffset: 100}"
height="250"
v-loading="this.dataLoading">
@@ -10,7 +8,6 @@
<el-table-column align="center" label="鎺ュ彈浠诲姟鏃堕棿" prop="receiveTime"></el-table-column>
<el-table-column align="center" label="瀹屾垚鏃堕棿" prop="finishTime"></el-table-column>
</el-table>
- </zt-dialog>
</template>
<script>
diff --git a/web/src/views/modules/flowChart/flowChartView.vue b/web/src/views/modules/flowChart/flowChartView.vue
index 5a1aa6d..a0fcc6f 100644
--- a/web/src/views/modules/flowChart/flowChartView.vue
+++ b/web/src/views/modules/flowChart/flowChartView.vue
@@ -200,8 +200,7 @@
this.graph.positionContent('top',{ padding: { left: 0 }})
// this.graph.zoomToFit()
this.graph.freeze('flowChartView')
- if(flowCode!='planFlow' && flowCode!='wltFlow' && flowCode!='xbsy' && flowCode!='hxsy' && flowCode!='kybgFlow'
- && flowCode!='jsfaFlow' && flowCode!='jzjysFlow' && flowCode!='zjgcFlow'){
+ /* if(params.flowCode!='planFlow'){
if(this.graph.scroller){
for(let graph in this.graph.scroller.widgetOptions){
this.graph.scroller.widgetOptions[graph] = false
@@ -209,7 +208,7 @@
}
// this.graph.disablePanning()
this.graph.lockScroller()
- }
+ }*/
} else {
this.graph.unfreeze('flowChartView')
this.dataForm.id = null
@@ -224,7 +223,7 @@
this.graph = new Graph({
container: document.getElementById('flowChartView'),
width: document.documentElement.clientWidth*0.5,
- height:this.flowChartHeight? 595:document.documentElement.clientHeight-220,
+ height:400,
// async: true,
// grid: {
// visible: true,
diff --git a/web/src/views/modules/flowChart/processTimeline.vue b/web/src/views/modules/flowChart/processTimeline.vue
index 0ad1db2..4e073cf 100644
--- a/web/src/views/modules/flowChart/processTimeline.vue
+++ b/web/src/views/modules/flowChart/processTimeline.vue
@@ -3,7 +3,7 @@
<el-col>
<FlowChartView :flowChartHeight="flowChartHeight" ref="flowChartView"></FlowChartView>
</el-col>
- <el-col>
+ <el-col style="margin-top: 10px">
<ProcessTrajectory ref="processTrajectory" @refreshDataList="getQuery()"></ProcessTrajectory>
</el-col>
</el-row>
diff --git a/web/src/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate.vue b/web/src/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate.vue
index 7e73462..6afe80e 100644
--- a/web/src/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate.vue
+++ b/web/src/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate.vue
@@ -4,7 +4,7 @@
label-width="120px" class="circulationFormAuto">
<div>
<el-form-item label-width="60px" label="缂栧彿:" style="width:100%;margin-bottom: -5px">
- <span>{{dataForm.circulatOrder.code}}</span>
+ <span>{{dataForm.circulatOrder.code || '缂栧彿鑷姩鐢熸垚'}}</span>
</el-form-item>
</div>
<div style="border: 1px solid rgba(0,0,0,.2);width: 99%">
@@ -302,12 +302,17 @@
return index += 1
},
init(id, row) {
+ console.log(id,row,'娴佽浆鍗曠殑')
if (id) {
this.dataForm.id = id
} else {
this.dataForm.id = row.id
}
- this.dataForm.projectId = row.projectId
+ if(row.projectId){
+ this.dataForm.projectId =row.projectId
+ } else {
+ this.dataForm.projectId=row.bizGroupId
+ }
// this.dataForm.disabled
this.getInfo()
if (!this.dataForm.disabled) {
@@ -339,6 +344,18 @@
...this.dataForm,
...res.data
}
+ if(this.dataForm.project === null){
+ this.dataForm.project={}
+ }
+ if(this.dataForm.circulatOrder === null){
+ this.dataForm.circulatOrder={}
+ }
+ if(this.dataForm.testAgencyInfo === null){
+ this.dataForm.testAgencyInfo={}
+ }
+ if(this.dataForm.flowInfoDto === null){
+ this.dataForm.flowInfoDto={}
+ }
console.log(this.dataForm, "getInfo this.dataForm")
},
// 琛ㄥ崟鎻愪氦
diff --git a/web/src/views/modules/sys/task/already-task.vue b/web/src/views/modules/sys/task/already-task.vue
index 0691a61..1999bc6 100644
--- a/web/src/views/modules/sys/task/already-task.vue
+++ b/web/src/views/modules/sys/task/already-task.vue
@@ -186,7 +186,9 @@
let row2 = cloneDeep(row)
row2.stepMarker = null
if (row.flowCode === 'wplz') {
- this.$refs.itemCirculatOrder.$refs.dialog.init(row2)
+ this.$nextTick(()=>{
+ this.$refs.itemCirculatOrder.$refs.dialog.init(row2.id,row2)
+ })
} else if (row.flowCode === 'aaa') {
//this.$refs.itemCirculatOrder.$refs.dialog.init(row2)
}
--
Gitblit v1.9.1