@@ -559,16 +559,7 @@ const getBaseInfo = async () => {
if (data.procedure.indexOf('40') == -1) {
data.procedure.push('40')
}
- }
- // else if (route.query.step === '10'||route.query.step === '20') {
- // if (data.procedure.indexOf('40') != -1||data.procedure.indexOf('50') != -1) {
- // data.procedure.push('30')
- // }
- // }
- else if (route.query.step === '50') {
- // if (data.procedure.indexOf('30') == -1) {
- // data.procedure.push('30')
- // }
+ } else if (route.query.step === '50') {
if (data.procedure.indexOf('50') == -1) {
data.procedure.push('50')
}
diff --git a/src/views/project-demand/summary/add.vue b/src/views/project-demand/summary/add.vue
index ff333eb..3131abd 100644
--- a/src/views/project-demand/summary/add.vue
+++ b/src/views/project-demand/summary/add.vue
@@ -3,7 +3,8 @@
-
+
{{ formData.specialFund }}
-
+
- {{ item.name }}{{index != optionalChargeLeadershipList?.length - 1 ? '，' : ''}}
+ {{ item.name }}{{ index != optionalChargeLeadershipList?.length - 1 ? '，' : '' }}
-
-
+
-
+
-
+
{
})
return;
}
- let otherFiles = []
- otherFileList.value.forEach(item => {
- otherFiles.push(getFileParam(item))
- })
- formData.value.optionalChargeLeadership = optionalChargeLeadershipList.value
- if (formData.value.singleFile !== undefined) {
- formData.value.singleFile = getFileParam(formData.value.singleFile)
- }
- // if (!attachment.value.isHaveOneFile) {
- // attachment.value.validate()
- // ElNotification({
- // title: '提示',
- // message: '请上传附件',
- // type: 'error'
- // })
- // return;
- // } else {
- // attachment.value.clearValidate()
- // }
- let params = {
- ...formData.value,
- deploymentId: deploymentId.value,
- fileList: otherFiles,
- requirementId: route.query.id ? route.query.id : '-1'
- }
- console.log('params', params)
- let res = await requirementReported(params)
- ElNotification({
- title: '提示',
- message: res.msg,
- type: res.code === 1000 ? 'success' : 'error'
- })
- if (res.code === 1000) {
- tagsViewStore.delVisitedViews(router.currentRoute.value.path)
- await router.push({
- name: 'Summary'
+ let otherFiles = []
+ otherFileList.value.forEach(item => {
+ otherFiles.push(getFileParam(item))
})
- }
+ formData.value.optionalChargeLeadership = optionalChargeLeadershipList.value
+ if (formData.value.singleFile !== undefined) {
+ formData.value.singleFile = getFileParam(formData.value.singleFile)
+ }
+ if (!attachment.value.isHaveOneFile) {
+ attachment.value.validate()
+ ElNotification({
+ title: '提示',
+ message: '请上传附件',
+ type: 'error'
+ })
+ return;
+ } else {
+ attachment.value.clearValidate()
+ }
+ let params = {
+ ...formData.value,
+ deploymentId: deploymentId.value,
+ fileList: otherFiles,
+ requirementId: route.query.id ? route.query.id : '-1'
+ }
+ console.log('params', params)
+ let res = await requirementReported(params)
+ ElNotification({
+ title: '提示',
+ message: res.msg,
+ type: res.code === 1000 ? 'success' : 'error'
+ })
+ if (res.code === 1000) {
+ tagsViewStore.delVisitedViews(router.currentRoute.value.path)
+ await router.push({
+ name: 'Summary'
+ })
+ }
})
})
const handleResubmit = debounce((instance) => {
@@ -534,17 +540,17 @@ const handleResubmit = debounce((instance) => {
if (formData.value.isSpecialFund && formData.value.specialFund === null) {
formData.value.specialFund = getFundName(formData.value.specialFundId)
}
- // if (!attachment.value.isHaveOneFile) {
- // attachment.value.validate()
- // ElNotification({
- // title: '提示',
- // message: '请上传附件',
- // type: 'error'
- // })
- // return;
- // } else {
- // attachment.value.clearValidate()
- // }
+ if (!attachment.value.isHaveOneFile) {
+ attachment.value.validate()
+ ElNotification({
+ title: '提示',
+ message: '请上传附件',
+ type: 'error'
+ })
+ return;
+ } else {
+ attachment.value.clearValidate()
+ }
let params = {
...formData.value,
deploymentId: deploymentId.value,
diff --git a/src/views/project-management/implementation/phase.vue b/src/views/project-management/implementation/phase.vue
index 255fd8f..e938fff 100644
--- a/src/views/project-management/implementation/phase.vue
+++ b/src/views/project-management/implementation/phase.vue
@@ -424,17 +424,17 @@ const handleSubmit = async () => {
userIds: userIds,
changeState:formData.value.changeState
}
- // if (!attachment.value.isHaveOneFile) {
- // attachment.value.validate()
- // ElNotification({
- // title: '提示',
- // message: '请上传附件',
- // type: 'error'
- // })
- // return;
- // } else {
- // attachment.value.clearValidate()
- // }
+ if (!attachment.value.isHaveOneFile) {
+ attachment.value.validate()
+ ElNotification({
+ title: '提示',
+ message: '请上传附件',
+ type: 'error'
+ })
+ return;
+ } else {
+ attachment.value.clearValidate()
+ }
console.log('params', params)
let res = await submitPhaseChange(params)
ElNotification({
@@ -449,7 +449,7 @@ const handleSubmit = async () => {
})
}
}
-const handleResubmit = (instance) => {
+const handleResubmit = () => {
let otherFiles = []
if (name.value === 'Phase/edit') {
attachment.value.allFileList?.forEach(item => {
@@ -462,17 +462,17 @@ const handleResubmit = (instance) => {
return item.id
})
}
- // if (!attachment.value.isHaveOneFile) {
- // attachment.value.validate()
- // ElNotification({
- // title: '提示',
- // message: '请上传附件',
- // type: 'error'
- // })
- // return;
- // } else {
- // attachment.value.clearValidate()
- // }
+ if (!attachment.value.isHaveOneFile) {
+ attachment.value.validate()
+ ElNotification({
+ title: '提示',
+ message: '请上传附件',
+ type: 'error'
+ })
+ return;
+ } else {
+ attachment.value.clearValidate()
+ }
let params = {
deploymentId: deploymentId.value,
requirementId: route.query.id,
diff --git a/src/views/project-management/mobledetail/ApprovalDetailMoblie.vue b/src/views/project-management/mobledetail/ApprovalDetailMoblie.vue
index fc2dcd8..87643b2 100644
--- a/src/views/project-management/mobledetail/ApprovalDetailMoblie.vue
+++ b/src/views/project-management/mobledetail/ApprovalDetailMoblie.vue
@@ -1,33 +1,6 @@
-
-
-
-
-
-
-
-
-
-
-
- 搜索
-
-
-
-
-
-
-
-
-
(parseInt(row.size / 1024) + 'KB')
- },
- {
- prop: 'oper',
- label: '操作',
- align: 'center',
- showOverflowTooltip: false,
- currentRender: ({row, index}) => {
- return (
-
- handleDownload(row)}>下载
-
- )
- }
- }
- ]
-})
const changeDiagram = ref(false)
-const showAttachmentTable = ref(true)
const props = defineProps({
formData: {
type: Object,
@@ -177,7 +101,6 @@ const props = defineProps({
}
})
const form = ref()
-const otherAttachmentList = ref([])
const editSingleTableConfig = reactive({
columns: [
{
@@ -334,24 +257,40 @@ const schema = computed(() => {
}
}
arr.push(preProcess)
- arr.push({
- label: '项目立项附件',
- prop: 'singleFile',
+ // arr.push({
+ // label: '项目立项附件',
+ // prop: 'singleFile',
+ // colProps: {
+ // span: 24
+ // },
+ // labelWidth: 'left',
+ // component: () => {
+ // let singleFileArray = [props.formData.singleFile]
+ // return props.formData.singleFile ?
+ //
+ // : --
+ // }
+ // })
+ } else if (props.type == 'execute') {
+ arr = [{
+ label: '部门分管领导',
+ prop: 'optionalChargeLeadership',
colProps: {
span: 24
},
labelWidth: 'left',
- component: () => {
- let singleFileArray = [props.formData.singleFile]
- return props.formData.singleFile ?
-
- : --
- }
- })
- } else if (props.type == 'execute') {
- arr = []
+ component: () => (
+
+ {
+ props.formData.optionalChargeLeadership?.length > 0 ? props.formData.optionalChargeLeadership.map(item => {
+ return {item.name}
+ }) : {'--'}
+ }
+
+ )
+ }]
if (props.preProcessShow == 'EDIT') {
preProcess = {
label: '前置流程',
@@ -370,77 +309,60 @@ const schema = computed(() => {
}
}
arr.push(preProcess)
- arr.push(
- {
- label: '部门分管领导',
- prop: 'optionalChargeLeadership',
- colProps: {
- span: 24
- },
- labelWidth: 'left',
- component: () => (
-
- {
- props.formData.optionalChargeLeadership?.length > 0 ? props.formData.optionalChargeLeadership.map(item => {
- return {item.name}
- }) : {'--'}
- }
-
- )
- },
- {
- label: '项目验收附件',
- prop: 'singleFile',
- colProps: {
- span: 24
- },
- labelWidth: 'left',
- component: () => {
- let singleFileArray = [props.formData.singleFile]
- return props.formData.singleFile ?
-
- : --
- }
- })
+ // arr.push(
+ // {
+ // label: '项目验收附件',
+ // prop: 'singleFile',
+ // colProps: {
+ // span: 24
+ // },
+ // labelWidth: 'left',
+ // component: () => {
+ // let singleFileArray = [props.formData.singleFile]
+ // return props.formData.singleFile ?
+ //
+ // : --
+ // }
+ // })
} else if (props.type == 'archivist') {
arr = [
- {
- label: '项目归档附件',
- prop: 'singleFile',
- colProps: {
- span: 24
- },
- labelWidth: 'left',
- component: () => {
- let singleFileArray = [props.formData.singleFile]
- return props.formData.singleFile ?
-
- : --
- }
- },
+ // {
+ // label: '项目归档附件',
+ // prop: 'singleFile',
+ // colProps: {
+ // span: 24
+ // },
+ // labelWidth: 'left',
+ // component: () => {
+ // let singleFileArray = [props.formData.singleFile]
+ // return props.formData.singleFile ?
+ //
+ // : --
+ // }
+ // },
]
} else if (props.type == 'phase') {
arr = [
- {
- label: '阶段变更附件',
- prop: 'singleFile',
- colProps: {
- span: 24
- },
- labelWidth: 'left',
- component: () => {
- let singleFileArray = [props.formData.singleFile]
- return props.formData.singleFile ?
-
- : --
- }
- },
+ // {
+ // label: '阶段变更附件',
+ // prop: 'singleFile',
+ // colProps: {
+ // span: 24
+ // },
+ // labelWidth: 'left',
+ // component: () => {
+ // let singleFileArray = [props.formData.singleFile]
+ // return props.formData.singleFile ?
+ //
+ // : --
+ // }
+ // },
]
}
return arr
@@ -467,49 +389,6 @@ const clickToPreview=(row)=>{
filePreviewShow.value = true
})
}
-const getTagsOption = () => {
- if (!route.query.projectId) return
- getTags(route.query.projectId).then(res => {
- if (res.code === 1000) {
- tagsOption.value = res.data
- }else{
- ElNotification({
- title: '提示',
- message: res.msg,
- type: 'error'
- })
- }
- })
-}
-const handleSearchImplementationFileList = () => {
- let params = {
- targetId: route.query.projectId,
- targetState: "40"
- }
- if (attachmentParam.tag) {
- tagsOption.value.forEach(item => {
- if (item.value === attachmentParam.tag) {
- attachmentParam.tag = item.label
- }
- })
- params.tag = attachmentParam.tag
- }
- searchImplementationFileList(params).then(res => {
- showAttachmentTable.value = false
- if (res.code === 1000) {
- otherAttachmentList.value = res.data.fileList
- nextTick(() => {
- showAttachmentTable.value = true
- })
- }else{
- ElNotification({
- title: '提示',
- message: res.msg,
- type: 'error'
- })
- }
- })
-}
const getTagName = (type) => {
switch (type) {
case 'approval':
@@ -537,15 +416,25 @@ const handleDownload = (row) => {
watchEffect(() => {
Object.keys(props.formData).length && (form.value?.setValues(props.formData))
})
-if (props.formData.mode == 'view' && props.type == 'execute') {
- handleSearchImplementationFileList()
- getTagsOption()
-}
watch(() => props.loading, (newVal) => {
props.loading = newVal
}, {deep: true})
-
diff --git a/src/views/project-management/mobledetail/OpinionMoblie.vue b/src/views/project-management/mobledetail/OpinionMoblie.vue
index 35ae8fd..3afbc83 100644
--- a/src/views/project-management/mobledetail/OpinionMoblie.vue
+++ b/src/views/project-management/mobledetail/OpinionMoblie.vue
@@ -197,8 +197,7 @@ const rollbackHandler = async () => {
type: res.code === 1000 ? 'success' : 'error'
})
if (res.code === 1000) {
- tagsViewStore.delVisitedViews(router.currentRoute.value.path)
- back()
+ location.reload()
}
}
const handleAgree = async () => {
diff --git a/src/views/project-management/mobledetail/StepsMoblie.vue b/src/views/project-management/mobledetail/StepsMoblie.vue
index 4b60b2b..8d7974c 100644
--- a/src/views/project-management/mobledetail/StepsMoblie.vue
+++ b/src/views/project-management/mobledetail/StepsMoblie.vue
@@ -1,31 +1,35 @@
-
-
-
-
-
+
+
+ 打印
+
+
+
+
+
+
+
+
+
+
+
+
- >
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+