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/OperaUnionChangeCheckWindow.vue | 75 ++++++++++++++++++++++---------------
1 files changed, 44 insertions(+), 31 deletions(-)
diff --git a/company/src/components/business/OperaUnionChangeCheckWindow.vue b/company/src/components/business/OperaUnionChangeCheckWindow.vue
index 4a85267..d758456 100644
--- a/company/src/components/business/OperaUnionChangeCheckWindow.vue
+++ b/company/src/components/business/OperaUnionChangeCheckWindow.vue
@@ -71,30 +71,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>
@@ -118,6 +118,13 @@
extends: BaseOpera,
components: { UploadFile, GlobalWindow ,UploadFileLink},
data () {
+ const checkFile = (rule, value, callback) => {
+ if (value.length === 0) {
+ callback(new Error('璇蜂笂浼犳壒鍗�'));
+ } else {
+ callback();
+ }
+ };
return {
// 琛ㄥ崟鏁版嵁
model: {},
@@ -136,7 +143,7 @@
{ required: true, message: '璇峰畬鍠勪俊鎭�' }
],
baoxianFile: [
- { required: true, message: '璇峰畬鍠勪俊鎭�' }
+ { required: true, validator: checkFile }
]
},
form: {
@@ -145,7 +152,7 @@
applyTime: null,
delValidTime: null,
code: null,
- baoxianFile: null,
+ baoxianFile: [],
bxdMultifileList: [],
fileList1: [],
selectRadio: 0
@@ -171,8 +178,12 @@
this.form.bxdMultifileList[index].name = null
}
},
- dele3 () {
- this.form.baoxianFile = null
+ dele3 (imgaddr) {
+ this.form.baoxianFile.forEach((item, index) => {
+ if (imgaddr === item.imgaddr) {
+ this.form.baoxianFile.splice(index, 1)
+ }
+ })
},
open (title, target, flag) {
this.visible = true
@@ -182,7 +193,7 @@
backCheckInfo: '',
startTime: null,
code: null,
- baoxianFile: null,
+ baoxianFile: [],
delValidTime: null,
bxdMultifileList:[],
fileList1: [],
@@ -238,7 +249,8 @@
}
},
baoxianFileUploaded (data) {
- this.form.baoxianFile = data
+ this.form.baoxianFile.push(data)
+ console.log(this.form.baoxianFile)
},
baoxianFileUploaded2 (data) {
this.form.bxdMultifileList[data.index].fileurl = data.fileurl
@@ -266,8 +278,9 @@
applyDate: (this.model.delOnlyReplace != 1 ? this.form.applyTime : this.form.delValidTime),
delValidTime:this.form.delValidTime,
code: this.form.code,
- fileurl: this.form.baoxianFile.fileurl,
- name: this.form.baoxianFile.name,
+ pidanFileList: this.form.baoxianFile,
+ // fileurl: this.form.baoxianFile.fileurl,
+ // name: this.form.baoxianFile.name,
applyChangeBXDList:this.form.bxdMultifileList
}
uploadBXD(param)
--
Gitblit v1.9.3