From 3011b9800d6c5bee031d87bc4e225b5b1fb52571 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期六, 23 十一月 2024 09:19:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
company/src/components/business/OperaUnionApplyCheckWindow.vue | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/company/src/components/business/OperaUnionApplyCheckWindow.vue b/company/src/components/business/OperaUnionApplyCheckWindow.vue
index 4ccb8b5..becba97 100644
--- a/company/src/components/business/OperaUnionApplyCheckWindow.vue
+++ b/company/src/components/business/OperaUnionApplyCheckWindow.vue
@@ -16,11 +16,11 @@
<el-form-item label="涓婁紶鎶曚繚鍗曪細" prop="toubaodanFile">
<UploadFile @remove="dele2" :uploadData="{ folder: 'apply',fileType:'.pdf' }" :fileList="form.fileList" @uploadSuccess="toubaoFileUploaded" />
</el-form-item>
- <div v-for="(item,index) in this.model.applyList" :key="index">
- <el-form-item :label="(index+1)+'.琚繚闄╀汉锛�'+item.companyName+')锛�'" prop="tbdMultifileList[index]">
- <UploadFile @remove="deleIndex(0,index)" :uploadData="{ folder: 'apply',fileType:'.pdf' }" :fileIndex="index" :showTips="showTips" :fileList="model.applyList[index].fileList" @uploadSuccess="toubaoFileUploaded2" />
- </el-form-item>
- </div>
+<!-- <div v-for="(item,index) in this.model.applyList" :key="index">-->
+<!-- <el-form-item :label="(index+1)+'.琚繚闄╀汉锛�'+item.companyName+')锛�'" prop="tbdMultifileList[index]">-->
+<!-- <UploadFile @remove="deleIndex(0,index)" :uploadData="{ folder: 'apply',fileType:'.pdf' }" :fileIndex="index" :showTips="showTips" :fileList="model.applyList[index].fileList" @uploadSuccess="toubaoFileUploaded2" />-->
+<!-- </el-form-item>-->
+<!-- </div>-->
</el-form>
<!-- 涓婁紶淇濋櫓鍗� -->
<el-form v-if="visible3==true" :model="form" ref="form3" :rules="rules3" style="width: 100%;">
@@ -56,7 +56,7 @@
<el-form-item label="涓婁紶淇濋櫓鍗曪細" prop="baoxianFile">
<UploadFile @remove="dele3" :uploadData="{ folder: 'apply',fileType:'.pdf' }" :fileList="form.fileList1" @uploadSuccess="baoxianFileUploaded" />
</el-form-item>
- <div class="box_table">
+ <div class="box_table" v-if="false">
<div class="box_table_head">
<div class="box_table_head_item">搴忓彿</div>
<div class="box_table_head_item">琚繚闄╀汉</div>
@@ -204,6 +204,7 @@
}
this.model = target
+ console.log(target)
this.form.startTime = target.startTime
this.form.endTime = target.endTime
this.title = title
--
Gitblit v1.9.3