From 0615f6c8dddf1cff5368e85ce4bfa92c4deebe02 Mon Sep 17 00:00:00 2001
From: luobisheng <727299681@qq.com>
Date: 星期二, 29 十一月 2022 18:36:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/book/index.vue | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/book/index.vue b/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/book/index.vue
index 5f92844..af8f7c9 100644
--- a/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/book/index.vue
+++ b/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/book/index.vue
@@ -23,12 +23,12 @@
</el-form-item>
<!-- 鏂囦功鍙戞斁鏃堕棿 -->
<el-form-item label="鏂囦功鍙戞斁鏃堕棿:" prop="sendTime">
- <el-date-picker v-model="book.sendTime" type="datetime" placeholder="璇烽�夋嫨骞存湀鏃�">
+ <el-date-picker v-model="book.sendTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" placeholder="璇烽�夋嫨骞存湀鏃�">
</el-date-picker>
</el-form-item>
<!-- 鏂囦功闄愬畾鏃堕棿 -->
<el-form-item label="鏂囦功闄愬畾鏃堕棿" prop="limitTime">
- <el-date-picker v-model="book.limitTime" type="datetime" placeholder="璇烽�夋嫨骞存湀鏃�">
+ <el-date-picker v-model="book.limitTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" placeholder="璇烽�夋嫨骞存湀鏃�">
</el-date-picker>
</el-form-item>
<!-- 鏂囦功鍙戞斁鍐呭 -->
@@ -37,7 +37,7 @@
</el-form-item>
<!-- 瀹為檯鏁存敼鏃堕棿 -->
<el-form-item label="瀹為檯鏁存敼鏃堕棿:" prop="rectifyTime">
- <el-date-picker v-model="book.rectifyTime" type="datetime" placeholder="璇烽�夋嫨骞存湀鏃�">
+ <el-date-picker v-model="book.rectifyTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" placeholder="璇烽�夋嫨骞存湀鏃�">
</el-date-picker>
</el-form-item>
<!-- 鏁存敼鎯呭喌 -->
@@ -255,6 +255,7 @@
this.book.originalPic = this.writ.originalPic.split(',');
this.book.writPic = this.writ.writPic.split(',');
this.book.otherPic = this.writ.otherPic.split(',');
+ this.book.rectifiedPic = this.writ.rectifiedPic.split(',');
}
},
props: ['caseId', 'closeDialog','mycode', 'writ'],
--
Gitblit v1.8.0