From 2096ac6f7379d75001b610c2de1fa380abd09519 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期二, 12 十二月 2023 16:13:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 admin-web/src/views/departmentitem/itemscr/scrapping/edit.vue |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/admin-web/src/views/departmentitem/itemscr/scrapping/edit.vue b/admin-web/src/views/departmentitem/itemscr/scrapping/edit.vue
index 7370b1f..fe8b798 100644
--- a/admin-web/src/views/departmentitem/itemscr/scrapping/edit.vue
+++ b/admin-web/src/views/departmentitem/itemscr/scrapping/edit.vue
@@ -288,7 +288,7 @@
       fenfaData: [],
       formData: {
         departmentId: '', // 鎶ュ簾閮ㄩ棬id
-        dealTime: '', // 鎶ュ簾鏃堕棿
+        dealTime: DateFormatter.formatDate(new Date(), 'yyyyMMddhhmmss'), // 鎶ュ簾鏃堕棿
         procureDoc: '',
         goods: [],
       },
@@ -331,7 +331,6 @@
         uploadUrl: getUploadUrl(), // 涓婁紶璺緞
         multiple: true, // 鏄惁鏀寔鎵归噺涓婁紶
         disabled: false, // 鏄惁绂佺敤
-        type: 'picture', // text/picture
       },
       scrapReasonOptions: [] // 鎶ュ簾鍘熷洜
     };

--
Gitblit v1.9.1