From 5506edbe54883b31db3cc8e4a1d9d0795a18a3c9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 27 十二月 2024 14:37:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
company/src/components/business/OperaUnionChangeUnitCheckWindow.vue | 65 +++++++++++++++++---------------
1 files changed, 35 insertions(+), 30 deletions(-)
diff --git a/company/src/components/business/OperaUnionChangeUnitCheckWindow.vue b/company/src/components/business/OperaUnionChangeUnitCheckWindow.vue
index 5791392..685a964 100644
--- a/company/src/components/business/OperaUnionChangeUnitCheckWindow.vue
+++ b/company/src/components/business/OperaUnionChangeUnitCheckWindow.vue
@@ -35,30 +35,30 @@
<el-input v-model="form.code" placeholder="璇疯緭鍏�" v-trim/>
</el-form-item>
<el-form-item label="涓婁紶鎵瑰崟锛�" prop="baoxianFile">
- <UploadFile @remove="dele3" :uploadData="{ folder: 'apply',fileType:'.pdf' }" :fileList="form.fileList1" @uploadSuccess="baoxianFileUploaded" />
+ <UploadFile @remove="dele3" :limit="99" :uploadData="{ folder: 'apply',fileType:'.pdf' }" :fileList="form.fileList1" @uploadSuccess="baoxianFileUploaded" />
</el-form-item>
- <div class="box_table">
- <div class="box_table_head">
- <div class="box_table_head_item">搴忓彿</div>
- <div class="box_table_head_item">琚繚闄╀汉</div>
- <div v-if="model.type==0" class="box_table_head_item">鍔犱繚浜烘暟</div>
- <div v-if="model.type==0" class="box_table_head_item">鍑忎繚浜烘暟</div>
- <div v-if="model.type==1" class="box_table_head_item">鍙樻洿浜烘暟</div>
- <div class="box_table_head_item">涓婁紶鎵瑰崟</div>
- </div>
- <div class="box_table_content" v-for="(item, index) in model.applyList" :key="index">
- <div class="box_table_content_item">{{index + 1}}</div>
- <div class="box_table_content_item" >{{ item.companyName }}</div>
- <div v-if="model.type==0" class="box_table_content_item">{{ item.addNum }}</div>
- <div v-if="model.type==0" class="box_table_content_item">{{ item.delNum }}</div>
- <div v-if="model.type==1" class="box_table_content_item">{{ item.changeNum }}</div>
- <div class="box_table_content_item">
- <el-form-item label="" prop="bxdMultifileList[index]">
- <UploadFileLink @remove="deleIndex(1,index)" :uploadData="{ folder: 'apply',fileType:'.pdf' }" :fileIndex="index" :showTips="showTips" :fileList="model.applyList[index].fileList1" @uploadSuccess="baoxianFileUploaded2" />
- </el-form-item>
- </div>
- </div>
- </div>
+<!-- <div class="box_table">-->
+<!-- <div class="box_table_head">-->
+<!-- <div class="box_table_head_item">搴忓彿</div>-->
+<!-- <div class="box_table_head_item">琚繚闄╀汉</div>-->
+<!-- <div v-if="model.type==0" class="box_table_head_item">鍔犱繚浜烘暟</div>-->
+<!-- <div v-if="model.type==0" class="box_table_head_item">鍑忎繚浜烘暟</div>-->
+<!-- <div v-if="model.type==1" class="box_table_head_item">鍙樻洿浜烘暟</div>-->
+<!-- <div class="box_table_head_item">涓婁紶鎵瑰崟</div>-->
+<!-- </div>-->
+<!-- <div class="box_table_content" v-for="(item, index) in model.applyList" :key="index">-->
+<!-- <div class="box_table_content_item">{{index + 1}}</div>-->
+<!-- <div class="box_table_content_item" >{{ item.companyName }}</div>-->
+<!-- <div v-if="model.type==0" class="box_table_content_item">{{ item.addNum }}</div>-->
+<!-- <div v-if="model.type==0" class="box_table_content_item">{{ item.delNum }}</div>-->
+<!-- <div v-if="model.type==1" class="box_table_content_item">{{ item.changeNum }}</div>-->
+<!-- <div class="box_table_content_item">-->
+<!-- <el-form-item label="" prop="bxdMultifileList[index]">-->
+<!-- <UploadFileLink @remove="deleIndex(1,index)" :uploadData="{ folder: 'apply',fileType:'.pdf' }" :fileIndex="index" :showTips="showTips" :fileList="model.applyList[index].fileList1" @uploadSuccess="baoxianFileUploaded2" />-->
+<!-- </el-form-item>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- </div>-->
</el-form>
<template v-slot:footer>
<el-button type="primary" @click="doSubmit">纭� 瀹�</el-button>
@@ -108,7 +108,7 @@
backCheckInfo: '',
applyTime: null,
code: null,
- baoxianFile: null,
+ baoxianFile: [],
bxdMultifileList: [],
fileList1: [],
selectRadio: 0
@@ -134,8 +134,12 @@
this.form.bxdMultifileList[index].name = null
}
},
- dele3 () {
- this.form.baoxianFile = null
+ dele3 (e) {
+ this.form.baoxianFile.forEach((item, index) => {
+ if (e === item.imgaddr) {
+ this.form.baoxianFile.splice(index, 1)
+ }
+ })
},
open (title, target, flag) {
this.visible = true
@@ -145,7 +149,7 @@
backCheckInfo: '',
startTime: null,
code: null,
- baoxianFile: null,
+ baoxianFile: [],
bxdMultifileList:[],
fileList1: [],
selectRadio: 0,
@@ -198,7 +202,7 @@
}
},
baoxianFileUploaded (data) {
- this.form.baoxianFile = data
+ this.form.baoxianFile.push(data)
},
baoxianFileUploaded2 (data) {
this.form.bxdMultifileList[data.index].fileurl = data.fileurl
@@ -225,8 +229,9 @@
id: this.model.id,
applyDate: this.form.applyTime,
code: this.form.code,
- fileurl: this.form.baoxianFile.fileurl,
- name: this.form.baoxianFile.name,
+ // fileurl: this.form.baoxianFile.fileurl,
+ // name: this.form.baoxianFile.name,
+ pidanFileList: this.form.baoxianFile,
applyChangeBXDList:this.form.bxdMultifileList
}
uploadBXD(param)
--
Gitblit v1.9.3