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 | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/admin-web/src/views/stock/scrap/itemScrapping/edit.vue b/admin-web/src/views/stock/scrap/itemScrapping/edit.vue
index 5fda39f..3f020cd 100644
--- a/admin-web/src/views/stock/scrap/itemScrapping/edit.vue
+++ b/admin-web/src/views/stock/scrap/itemScrapping/edit.vue
@@ -108,8 +108,8 @@
v-model="goodsItem.modelsIds"
multiple
clearable
- :placeholder="goodsItem.baseCategoryId?'璇烽�夋嫨瑙勬牸鍨嬪彿':'璇峰厛閫夋嫨鐗╁搧鍚嶇О'"
- :disabled="!goodsItem.baseCategoryId"
+ :placeholder="goodsItem.baseGoodsTemplateId?'璇烽�夋嫨瑙勬牸鍨嬪彿':'璇峰厛閫夋嫨鐗╁搧鍚嶇О'"
+ :disabled="!goodsItem.baseGoodsTemplateId"
@change="modelChange($event, goodsIndex)"
@remove-tag="modelRemoveTag($event, goodsIndex)"
@clear="modelRemoveTag(-1, goodsIndex)"
@@ -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