From 1ec00a645693dbc08b7ea70855451bbd72c43a6a Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期四, 08 十二月 2022 16:21:35 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_ui
---
src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/arrive/index.vue | 59 ++++++++++++++++-------------------------------------------
1 files changed, 16 insertions(+), 43 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 a632347..29c80ea 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
@@ -5,7 +5,7 @@
<el-form ref="arriveForm" label-width="160px" :model="arrive" :rules="arriveRules" autoComplete="on">
<!-- 鍒拌揪鏃堕棿 -->
<el-form-item label="鍒拌揪鏃堕棿:" prop="arrivalTime">
- <el-date-picker v-model="arrive.arrivalTime" type="datetime" placeholder="閫夋嫨鍒拌揪鏃堕棿">
+ <el-date-picker v-model="arrive.arrivalTime" value-format="yyyy-MM-dd HH:mm:ss" type="datetime" placeholder="閫夋嫨鍒拌揪鏃堕棿">
</el-date-picker>
</el-form-item>
<!-- 鍒拌揪鍦板潃 -->
@@ -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> -->
+ <MyUpload :picture-list="arrive.situationPic" @setPictureUrl="setPicUrl" @delPictureUrl="delPicUrl"></MyUpload>
<div class="tip">{{ arrive.situationPic.length }} / 4</div>
</div>
</el-form-item>
@@ -50,10 +35,17 @@
</template>
<script>
import MyUpload from "@/components/myUpload"
+import { deepClone } from "@/utils/helper";
export default {
components: {
MyUpload
},
+ props: {
+ arriveData: {
+ type: Object,
+ default: () => null
+ }
+ },
data() {
const checkTime = (rule, value, callback) => {
if (value) {
@@ -74,13 +66,6 @@
callback()
} else {
callback(new Error('鐜板満鎯呭喌璇存槑涓嶈兘涓虹┖'));
- }
- }
- const checkReplay = (rule, value, callback) => {
- if (value) {
- callback()
- } else {
- callback(new Error('淇¤鍥炲璇存槑涓嶈兘涓虹┖'));
}
}
const checkSitPic = (rule, value, callback) => {
@@ -104,9 +89,6 @@
situationExplain: [
{ trigger: 'blur', validator: checkSit }
],
- // replyExplain: [
- // { trigger: 'blur', validator: checkReplay }
- // ],
situationPic: [
{ trigger: 'blur', validator: checkSitPic }
],
@@ -114,11 +96,15 @@
fileList: [],
}
},
- methods: {
+ created() {
+ if (this.arriveData) {
+ this.arrive = deepClone(this.arriveData);
+ this.arrive.situationPic = this.arriveData.situationPic.split(',');
+ }
+ },
+ 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)
}
@@ -145,24 +131,11 @@
if (this.arrive.situationPic.length < 4) {
this.arrive.situationPic.push(baseUrl + url)
}
- console.log(url);
},
//鍒犻櫎鍥剧墖
delPicUrl({url}){
const baseUrl = 'http://140.143.152.226:8410/';
- console.log(url);
this.arrive.situationPic.splice(this.arrive.situationPic.indexOf(baseUrl + url),1);
- console.log(this.arrive.situationPic);
- }
- },
- watch: {
- 'arrive.situationPic.length': {
- handler(newLen, oldLen) {
- if (newLen !== 0) {
- this.$refs.arriveForm.validateField('situationPic');
- }
- },
- deep: true,
}
}
}
--
Gitblit v1.8.0