fix : 修改打印范围, 详情增加项目实施模块

This commit is contained in:
2024-08-26 20:52:39 +08:00
parent 741187c129
commit 2173cd1cf1
9 changed files with 322 additions and 370 deletions

View File

@@ -23,6 +23,9 @@
:fileListShow="fileListShow"
:preProcessShow="preProcessShow"
v-model:value="auditOpinion"/>
<div v-if="showActive == '30'&&!editShow">
<project-attachment/>
</div>
<ApprovalDetail type="execute"
v-if="showActive == '40'&&!editShow"
:formData="detailData.formData"
@@ -49,7 +52,8 @@
</template>
</steps>
<div style="width: 100%;height: 30px"></div>
<opinion v-if="detailData.taskId" :formData="detailData.formData" :taskId="detailData.taskId" :taskUserOptionList="detailData.taskUserOptionList"
<opinion v-if="detailData.taskId" :formData="detailData.formData" :taskId="detailData.taskId"
:taskUserOptionList="detailData.taskUserOptionList"
v-model:value="auditOpinion"/>
</template>
@@ -75,8 +79,9 @@ const auditOpinion = ref('')
// const step = ref(route.query.step)
route.query.step == '10' && (currentStep.value = 1)
route.query.step == '20' && (currentStep.value = 2)
route.query.step == '40' && (currentStep.value = 3)
route.query.step == '50' && (currentStep.value = 4)
route.query.step == '30' && (currentStep.value = 3)
route.query.step == '40' && (currentStep.value = 4)
route.query.step == '50' && (currentStep.value = 5)
const showActive = ref()
const detailShow = ref(false)
const detailData = ref({})
@@ -88,6 +93,8 @@ localStorage.removeItem('projectChargePersonUserList')
localStorage.removeItem('projectPersonUserList')
localStorage.removeItem('optionalChargeLeadershipList')
localStorage.removeItem('originallySelectedList')
const getAllInfo = async (state) => {
const loading = ElLoading.service({fullscreen: true})
detailData.value = {
@@ -148,18 +155,28 @@ const changeModel = (active, mode) => {
applyTitle.value = 'apply'
} else if (active === '40') {
applyTitle.value = 'check'
}else if ( active === '50') {
} else if (active === '50') {
applyTitle.value = 'filing'
}
})
}
const setDetail = (active) => {
showActive.value = active
if (active == '30') {
changeModel(30, 'view')
detailShow.value = true
return;
}
getAllInfo(active)
}
const stepChange = (data) => {
showActive.value = data.active
if (data.active == '30') {
changeModel(30, 'view')
detailShow.value = true
return;
}
getAllInfo(data.active)
}
</script>

View File

@@ -297,14 +297,14 @@ const tableConfig = reactive({
btn.push({label: '验收', prem: ['mosr:implementation:check'], func: () => handleCheck(row), type: 'primary'})
}
if (buttons.has("edit")) {
btn.push({label: '编辑', prem: ['mosr:implementation:resubmit'], func: () => handleEdit(row), type: 'primary'})
btn.push({label: '编辑', prem: ['mosr:implementation:resubmit'], func: () => handleEdit(row), type: 'primary'})
}
if (buttons.has("standing")) {
btn.push({label: '台账', prem: ['project:management:implementation:account'], func: () => handleStandingBook(row), type: 'primary'})
}
if (buttons.has("attachments")) {
btn.push({label: '附件', prem: ['project:management:implementation:attachment'], func: () => handleAttachment(row), type: 'primary'})
}
// if (buttons.has("attachments")) {
// btn.push({label: '附件', prem: ['project:management:implementation:attachment'], func: () => handleAttachment(row), type: 'primary'})
// }
if (buttons.has("viewAllocation")) {
btn.push({label: '查看分摊', prem: ['project:management:implementation:share'], func: () => handleShare(row), type: 'primary'})
}
@@ -355,13 +355,19 @@ const search = (val) => {
}
const handleDetail = (row) => {
let step=''
if(row.state==0){
step='30'
}else {
step='40'
}
router.push({
name: 'Implementation/detail',
query: {
id: row.requirementId,
projectId: row.projectId,
state: row.state,
step: '40'
step: step
}
})
}

View File

@@ -483,7 +483,7 @@ const handleSubmit = async (instance) => {
id: route.query.id,
projectId: route.query.projectId,
state: route.query.state,
step: '40'
step: '30'
}
})
}