Browse Source

优化通讯录

master
zhouhaibin 5 months ago
parent
commit
ff1a63ac1a
  1. 16
      src/views/addressBook/address/address.data.ts
  2. 9
      src/views/projectLib/projectArchive/SubmitProjectArchive.vue
  3. 14
      src/views/projectLib/projectPlan/planinfoFileDetail.vue
  4. 6
      src/views/projectLib/projectPlan/viewPlanDetail.vue

16
src/views/addressBook/address/address.data.ts

@ -48,15 +48,9 @@ export const searchFormSchema: FormSchema[] = [
component: 'Input',
//colProps: { span: 6 },
},
// {
// label: '',
// field: 'status',
// component: 'JDictSelectTag',
// componentProps: {
// dictCode: 'user_status',
// placeholder: '请选择状态',
// stringToNumber: true,
// },
// //colProps: { span: 6 },
// },
{
label: '项目名称',
field: 'projectName',
component: 'Input',
},
];

9
src/views/projectLib/projectArchive/SubmitProjectArchive.vue

@ -19,8 +19,7 @@
</el-tabs>
<!-- <ApprovalDetails :projectid="projectid" stage="createProjectArchive" v-if="showApprovalForm" /> -->
<planinfoFileDetail @register="registerFileInfo" :planinfoid="planinfoid" :taskName="taskName"
:isfinish="isfinish" />
<planinfoFileDetail @register="registerFileInfo" />
<!-- <div style="display: flex; justify-content: center; align-items: center; height: 100px;" v-if="!showApprovalForm">
<el-button type="primary" @click="submitImportForm">发起审批</el-button>
<el-button type="info" @click="closeModel()">关闭窗口</el-button>
@ -86,12 +85,6 @@ function getTableAction(record): ActionItem[] {
}
function handleDetail(record) {
console.log("rrrrrrrr", record)
planinfoid.value = record.record.id
taskName.value = record.record.taskName
isfinish.value = record.record.isfinish
console.log("rrrrrrrr", record, record.id, record.taskName, planinfoid.value, taskName.value)
openFileInfo(true,{planinfoid:record.id,taskName:record.taskName,isfinish:record.isfinish})
}

14
src/views/projectLib/projectPlan/planinfoFileDetail.vue

@ -1,33 +1,37 @@
<template>
<BasicModal v-bind="$attrs" @register="registerModal" title="文件详情" width="1200px" :showOkBtn="false">
<el-divider content-position="left">{{ dataTo.taskName }}</el-divider>
<el-divider content-position="left">{{ taskName }}</el-divider>
<div>
<el-divider content-position="left">项目计划资料详情</el-divider>
<PlanFileDetail :planinfoid="planinfoid" :stage="1" />
<el-divider content-position="left">项目计划审批文件列表</el-divider>
<PlanFileDetail :planinfoid="planinfoid" :stage="2" />
<div v-if="dataTo.isfinish == 1">
<div v-if="isfinish == 1">
<ApprovalDetails :projectid="planinfoid" :stage="processName" />
</div>
</div>
</BasicModal>
</template>
<script lang="ts" name="Detailpage" setup>
import { ref,defineProps, onMounted } from 'vue'
import { ref, onMounted } from 'vue'
import { BasicModal, useModalInner } from '@/components/Modal';
import {getProcessName} from "./projectPlan.api"
import ApprovalDetails from "../../ProcessApprovalSubPage/component/ApprovalDetails.vue"
import PlanFileDetail from "@/views/ProcessApprovalSubPage/component/PlanFileDetail.vue";
const [registerModal, { closeModal }] = useModalInner(init);
let dataTo = defineProps(["planinfoid", "taskName", "isfinish"])
console.log("wwwwwwwwwwww", dataTo)
let processName = ref("")
let planinfoid = ref()
let taskName=ref()
let isfinish=ref()
onMounted(async () => {
// processName.value =await getProcessName(dataTo.planinfoid)
})
async function init(data) {
processName.value =await getProcessName({pid:data.planinfoid})
planinfoid.value = data.planinfoid
taskName.value = data.taskName
isfinish.value = data.isfinish
}

6
src/views/projectLib/projectPlan/viewPlanDetail.vue

@ -72,7 +72,7 @@
<BasicModal @register="registeruploadFile" title="上传文件" width="1200px" :showOkBtn="false" :showCancelBtn="false">
<addPlanFile :type="type" :planinfoid="planinfoid" :files="fileArr" @close="closePlanFileModal()" />
</BasicModal>
<planinfoFileDetail @register="registerFileInfo" :planinfoid="planinfoid" :taskName="taskName" :isfinish="isfinish" />
<planinfoFileDetail @register="registerFileInfo" />
<BasicModal @register="registerplanFileApproval" title="文件审批" width="1200px" :showOkBtn="false"
:showCancelBtn="false">
<planFileApproval :record="recordData" @close="closeplanFile" />
@ -189,9 +189,7 @@ function getTableAction(record): ActionItem[] {
}
function handleDetail(record) {
planinfoid.value = record.id
taskName.value = record.taskName
isfinish.value = record.isfinish
openFileInfo(true, { planinfoid: record.id, taskName: record.taskName, isfinish: record.isfinish })
}

Loading…
Cancel
Save