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 | 28 +++++++---------------------
1 files changed, 7 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 7597782..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,7 +25,7 @@
<!-- 鐜板満鎯呭喌鐓х墖 -->
<el-form-item label="鐜板満鎯呭喌鐓х墖:" prop="situationPic">
<div class="upImg" >
- <MyUpload @setPictureUrl="setPicUrl" @delPictureUrl="delPicUrl"></MyUpload>
+ <MyUpload :picture-list="arrive.situationPic" @setPictureUrl="setPicUrl" @delPictureUrl="delPicUrl"></MyUpload>
<div class="tip">{{ arrive.situationPic.length }} / 4</div>
</div>
</el-form-item>
@@ -35,6 +35,7 @@
</template>
<script>
import MyUpload from "@/components/myUpload"
+import { deepClone } from "@/utils/helper";
export default {
components: {
MyUpload
@@ -67,13 +68,6 @@
callback(new Error('鐜板満鎯呭喌璇存槑涓嶈兘涓虹┖'));
}
}
- const checkReplay = (rule, value, callback) => {
- if (value) {
- callback()
- } else {
- callback(new Error('淇¤鍥炲璇存槑涓嶈兘涓虹┖'));
- }
- }
const checkSitPic = (rule, value, callback) => {
if (value.length !== 0) {
callback()
@@ -103,7 +97,10 @@
}
},
created() {
- this.arrive = this.arriveData;
+ if (this.arriveData) {
+ this.arrive = deepClone(this.arriveData);
+ this.arrive.situationPic = this.arriveData.situationPic.split(',');
+ }
},
methods: {
handleSuccess(res, file, filelist) {
@@ -139,17 +136,6 @@
delPicUrl({url}){
const baseUrl = 'http://140.143.152.226:8410/';
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