+
选取文件
文件大小且不超过500M
@@ -38,214 +70,216 @@
-
\ No newline at end of file
+
diff --git a/src/views/myWork/inComplete/inComplete.data.ts b/src/views/myWork/inComplete/inComplete.data.ts
index f11782c..3da918d 100644
--- a/src/views/myWork/inComplete/inComplete.data.ts
+++ b/src/views/myWork/inComplete/inComplete.data.ts
@@ -115,6 +115,17 @@ export const approvalformSchemas: FormSchema[] = [
},
colProps: { span: 12 },
},
+ {
+ label: '修改次数',
+ field: 'modifyNum',
+ component: 'InputNumber',
+ required: true,
+ ifShow:false,
+ componentProps: {
+ min:0,
+ },
+ colProps: { span: 12 },
+ },
{
label: '审批意见',
field: 'comment',
diff --git a/src/views/projectLib/projectPlan/planinfoFileDetail.vue b/src/views/projectLib/projectPlan/planinfoFileDetail.vue
index 3acf13f..fbff0e1 100644
--- a/src/views/projectLib/projectPlan/planinfoFileDetail.vue
+++ b/src/views/projectLib/projectPlan/planinfoFileDetail.vue
@@ -23,15 +23,15 @@ const [registerModal, { closeModal }] = useModalInner(init);
let processName = ref("")
let planinfoid = ref()
let taskName=ref()
-let isfinish=ref()
+let isfinish=ref(0)
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
- processName.value =await getProcessName({pid:data.planinfoid})
}
diff --git a/src/views/projectLib/projectPlan/projectPlan.data.ts b/src/views/projectLib/projectPlan/projectPlan.data.ts
index 349066c..46cdfec 100644
--- a/src/views/projectLib/projectPlan/projectPlan.data.ts
+++ b/src/views/projectLib/projectPlan/projectPlan.data.ts
@@ -63,6 +63,14 @@ export const PlaninfoFiletableColumns: BasicColumn[] = [
title: '上传时间',
dataIndex: 'createDate',
},
+ {
+ title: '修改次数',
+ dataIndex: 'modifyNum',
+ },
+ {
+ title: '处理人',
+ dataIndex: 'createUser',
+ },
{
title: '文件状态',
dataIndex: 'status',
diff --git a/src/views/projectLib/projectPlan/viewPlanDetail.vue b/src/views/projectLib/projectPlan/viewPlanDetail.vue
index ece9862..5a8dd6e 100644
--- a/src/views/projectLib/projectPlan/viewPlanDetail.vue
+++ b/src/views/projectLib/projectPlan/viewPlanDetail.vue
@@ -85,7 +85,7 @@ import { ref, onMounted } from 'vue'
import elstepchild from './elstepchild.vue'
import addPlanFile from './addPlanFile.vue'
import planinfoFileDetail from './planinfoFileDetail.vue'
-import { Progress } from 'ant-design-vue';
+import { Progress,message } from 'ant-design-vue';
import { BasicModal } from '@/components/Modal';
import { PlaninfoColumn } from './projectPlan.data';
import { queryPlanInfoMainTimeline, getPlanFileApprovalInfoByPlaninfoId, planUploadFile, downloadPlanInfo } from './projectPlan.api'
@@ -124,7 +124,7 @@ onMounted(() => {
// 项目入库审批table
-const [registerTable, { reload }] = useTable({
+const [registerTable, { reload,getDataSource }] = useTable({
size: 'small',//紧凑型表格
title: '项目计划阶段详情',
api: queryPlanInfoMainTimeline,
@@ -197,10 +197,26 @@ function handleDetail(record) {
openFileInfo(true, { planinfoid: record.id, taskName: record.taskName, isfinish: record.isfinish })
}
-function handleuploadfile(record) {
+ async function handleuploadfile(record) {
type.value = record.isfinish
fileArr = record.taskFile.split(",")
planinfoid.value = record.id
+ let tableData = await getDataSource()
+ console.log("tableData",tableData)
+ //项目立项阶段
+ for(let i = 0;i