diff --git a/src/views/project-demand/summary/index.vue b/src/views/project-demand/summary/index.vue index 10bfffb..51e7242 100644 --- a/src/views/project-demand/summary/index.vue +++ b/src/views/project-demand/summary/index.vue @@ -257,20 +257,19 @@ const tableConfig = reactive({ return row.startTime + ' 至 ' + row.endTime } }, - - // { - // prop: 'approveName', - // label: '当前审批节点', - // align: 'center', - // width: 120, - // currentRender: ({row, index}) => { - // if (row.state == '1') { - // return {row.approveName} - // } else { - // return {row.taskNode} - // } - // } - // }, + { + prop: 'approveName', + label: '当前审批节点', + align: 'center', + width: 120, + currentRender: ({row, index}) => { + if (row.state == '1') { + return {row.approveName||'--'} + } else { + return {row.taskNode||'--'} + } + } + }, { prop: 'state', label: '状态', diff --git a/src/views/project-management/implementation/phase.vue b/src/views/project-management/implementation/phase.vue index 7e36b12..712a8a7 100644 --- a/src/views/project-management/implementation/phase.vue +++ b/src/views/project-management/implementation/phase.vue @@ -8,19 +8,20 @@ - - + + - - - - - - + + + + + + @@ -86,6 +87,7 @@ const name = ref(router.currentRoute.value.name) const loading = ref(false) const formData = ref({ changeState:'0', + stateChange:'', isStop:'0' }) const file = ref({}) @@ -456,7 +458,8 @@ const handleSubmit = async () => { // singleFile: formData.value.singleFile, projectId: route.query.projectId, userIds: userIds, - changeState:formData.value.changeState + changeState:formData.value.changeState, + stateChange:formData.value.stateChange } if (!attachment.value.isHaveOneFile) { attachment.value.validate() @@ -514,7 +517,8 @@ const handleResubmit = () => { // singleFile: attachment.value.singleFile, projectId: route.query.projectId, userIds: userIds, - changeState:formData.value.changeState + changeState:formData.value.changeState, + stateChange:formData.value.stateChange } // console.log('重新提交params', params) resubmitPhaseForm(params).then(res => { diff --git a/src/views/project-management/implementation/phaseDetail.vue b/src/views/project-management/implementation/phaseDetail.vue index 969cc80..716ee6f 100644 --- a/src/views/project-management/implementation/phaseDetail.vue +++ b/src/views/project-management/implementation/phaseDetail.vue @@ -5,10 +5,15 @@
抄送人{{copyName?copyName:'--'}}
- 变更状态 + 阶段变更
+
+ 状态变更 + + -- +
@@ -34,6 +39,7 @@ const loading = ref(false) const auditOpinion = ref('') const copyName = ref('') const changeState = ref('') +const stateChange = ref('') const fileListShow = ref('READ') const baseFormData = ref([]) const schema = computed(() => { @@ -307,6 +313,7 @@ const getInfo = async () => { summaryData.value = data; copyName.value= data.formData.userInfoList?.map(item=>item.name).join(',') changeState.value= data.formData.changeState + stateChange.value= data.formData.stateChange loading.value = false processStore.setDesign(data) processStore.runningList.value = data.runningList;