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/stock/scrap/itemScrapping/edit.vue |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/admin-web/src/views/stock/scrap/itemScrapping/edit.vue b/admin-web/src/views/stock/scrap/itemScrapping/edit.vue
index fb35d81..3f020cd 100644
--- a/admin-web/src/views/stock/scrap/itemScrapping/edit.vue
+++ b/admin-web/src/views/stock/scrap/itemScrapping/edit.vue
@@ -193,6 +193,7 @@
 import {getUploadUrl} from '@/utils/base';
 import {mapGetters} from 'vuex';
 import {getDicts} from '@/api/system/dict/data';
+import * as DateFormatter from "@/utils/DateFormatter";
 
 export default {
   components: { MyButton, winMd, upload },
@@ -224,7 +225,7 @@
       formData: {
         uploadFiles: '',
         warehouseId: '', // 鎶ュ簾浠撳簱id
-        dealTime: '', // 鎶ュ簾鏃堕棿
+        dealTime: DateFormatter.formatDate(new Date(), 'yyyyMMddhhmmss'), // 鎶ュ簾鏃堕棿
         scrappedGoodsInfo: [],
       },
       goodsItem: {
@@ -256,7 +257,6 @@
         uploadUrl: getUploadUrl(), // 涓婁紶璺緞
         multiple: true, // 鏄惁鏀寔鎵归噺涓婁紶
         disabled: false, // 鏄惁绂佺敤
-        type: 'picture', // text/picture
       },
     };
   },

--
Gitblit v1.9.1