Browse Source

新增需求

changchun
Jinyuanyuan 7 months ago
parent
commit
c0397b4c0d
  1. 14
      src/views/ProcessApprovalSubPage/component/ApprovalPageModel.vue
  2. 3
      src/views/myWork/completed/index.vue
  3. 4
      src/views/myWork/inComplete/inComplete.data.ts
  4. 2
      src/views/myWork/inComplete/index.vue

14
src/views/ProcessApprovalSubPage/component/ApprovalPageModel.vue

@ -1,6 +1,5 @@
<template> <template>
<BasicModal v-bind="$attrs" @register="registerModal" width="1200px" :showOkBtn="false"> <BasicModal v-bind="$attrs" @register="registerModal" width="1200px" :showOkBtn="false" :title="processName">
<initiatesProjectsApproval :record="record" @close="exit" v-if="record.stage=='creatProjectinfo'"/>
<uploadfileApproval :record="record" @close="exit" v-if="record.stage=='supervisionFile'"/> <uploadfileApproval :record="record" @close="exit" v-if="record.stage=='supervisionFile'"/>
<projectPlanApproval :record="record" @close="exit" v-if="record.stage=='createPlaninfo'"/> <projectPlanApproval :record="record" @close="exit" v-if="record.stage=='createPlaninfo'"/>
<planFileApproval :record="record" @close="exit" v-if="planfileNames.includes(record.stage)"/> <planFileApproval :record="record" @close="exit" v-if="planfileNames.includes(record.stage)"/>
@ -10,7 +9,7 @@
</BasicModal> </BasicModal>
</template> </template>
<script lang="ts" name="ApprovalPageModel" setup> <script lang="ts" name="ApprovalPageModel" setup>
import {ref} from "vue"
import { BasicModal, useModalInner } from '@/components/Modal'; import { BasicModal, useModalInner } from '@/components/Modal';
import initiatesProjectsApproval from "../initiatesProjectsApproval.vue" import initiatesProjectsApproval from "../initiatesProjectsApproval.vue"
@ -20,15 +19,20 @@ import projectPlanApproval from '../projectPlanApproval.vue'
import fieldChangeApproval from '../fieldChangeApproval.vue' import fieldChangeApproval from '../fieldChangeApproval.vue'
import contractApproval from '../contractApproval.vue' import contractApproval from '../contractApproval.vue'
import uploadURTfileApproval from '../uploadURTfileApproval.vue' import uploadURTfileApproval from '../uploadURTfileApproval.vue'
const planfileNames = ["feasibilityReportPreparation","jointTechnicalReview","centralizedCheck","createPlaninfoFile"] const planfileNames = ["feasibilityReportPreparation","jointTechnicalReview","centralizedCheck","createPlaninfoFile","bidDocumentsPreparation"]
const [registerModal, { closeModal }] = useModalInner(); const [registerModal, { closeModal }] = useModalInner(init);
defineProps(["record"]) defineProps(["record"])
let processName= ref()
let emit = defineEmits(["close"]) let emit = defineEmits(["close"])
function exit(){ function exit(){
closeModal() closeModal()
console.log("ApprovalPageModel") console.log("ApprovalPageModel")
emit("close") emit("close")
} }
function init(initData){
processName.value=initData.record.processName
}
</script> </script>
<style></style> <style></style>

3
src/views/myWork/completed/index.vue

@ -66,7 +66,8 @@ function handleEdit(record) {
record.procesType="1" // 1 0 record.procesType="1" // 1 0
//openApprovePage(record,router); //openApprovePage(record,router);
rowData.value =record rowData.value =record
openModal(true) console.log("recordrecord",record)
openModal(true,{record:record})
} }
function exit(){ function exit(){
console.log("fatheer") console.log("fatheer")

4
src/views/myWork/inComplete/inComplete.data.ts

@ -46,8 +46,8 @@ export const columns: BasicColumn[] = [
dataIndex: 'taskName', dataIndex: 'taskName',
}, },
{ {
title: '节点id', title: '所属流程',
dataIndex: 'taskId', dataIndex: 'processName',
width: 150, width: 150,
}, },
{ {

2
src/views/myWork/inComplete/index.vue

@ -56,7 +56,7 @@ function getTableAction(record): ActionItem[] {
function handleEdit(record) { function handleEdit(record) {
record.procesType="0" //流程类型, 已办是1 代办是0Object.assign({}, xiaoming, {test1:'demo1', test2:'demo2'}); // 第一个参数是 目标对象后面的全是源对象执行完之后返回目标对象 record.procesType="0" //流程类型, 已办是1 代办是0Object.assign({}, xiaoming, {test1:'demo1', test2:'demo2'}); // 第一个参数是 目标对象后面的全是源对象执行完之后返回目标对象
rowData.value =record rowData.value =record
openModal(true) openModal(true,{record:record})
} }
function exit(){ function exit(){
console.log("fatheer") console.log("fatheer")

Loading…
Cancel
Save