From 9027351c68d5dabf70120f5c1304abebddc3afca Mon Sep 17 00:00:00 2001
From: luobisheng <727299681@qq.com>
Date: 星期二, 22 十一月 2022 18:33:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/arrive/index.vue | 31 ++++++++++---------------------
1 files changed, 10 insertions(+), 21 deletions(-)
diff --git a/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/arrive/index.vue b/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/arrive/index.vue
index 3fcba43..7597782 100644
--- a/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/arrive/index.vue
+++ b/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/arrive/index.vue
@@ -25,22 +25,7 @@
<!-- 鐜板満鎯呭喌鐓х墖 -->
<el-form-item label="鐜板満鎯呭喌鐓х墖:" prop="situationPic">
<div class="upImg" >
- <!-- <div class="img-list" v-if="arrive.situationPic.length!==0">
- <div class="img" v-for="(item,index) in arrive.situationPic" :key="index">
- <img :src="item" alt="">
- <i class="el-icon-close myicon" @click="handleRemove(index)"></i>
- </div>
- </div> -->
-
<MyUpload @setPictureUrl="setPicUrl" @delPictureUrl="delPicUrl"></MyUpload>
-
- <!-- <div class="upload" v-if="arrive.situationPic.length<4">
- <el-upload :file-list="fileList" class="upload-demo"
- action="/sccg/file/medias" multiple :show-file-list="false"
- :limit="50" :on-success="handleSuccess" list-type="picture" :headers="getToken()">
- <i class="el-icon-plus"></i>
- </el-upload>
- </div> -->
<div class="tip">{{ arrive.situationPic.length }} / 4</div>
</div>
</el-form-item>
@@ -54,6 +39,12 @@
components: {
MyUpload
},
+ props: {
+ arriveData: {
+ type: Object,
+ default: () => null
+ }
+ },
data() {
const checkTime = (rule, value, callback) => {
if (value) {
@@ -104,9 +95,6 @@
situationExplain: [
{ trigger: 'blur', validator: checkSit }
],
- // replyExplain: [
- // { trigger: 'blur', validator: checkReplay }
- // ],
situationPic: [
{ trigger: 'blur', validator: checkSitPic }
],
@@ -114,11 +102,12 @@
fileList: [],
}
},
- methods: {
+ created() {
+ this.arrive = this.arriveData;
+ },
+ methods: {
handleSuccess(res, file, filelist) {
const baseUrl = 'http://140.143.152.226:8410/';
- console.log(res);
- console.log(this.fileList);
if (this.arrive.situationPic.length < 4) {
this.arrive.situationPic.push(baseUrl + res.data.url1)
}
--
Gitblit v1.8.0