From 870a9499eb65de0031ef8e8f70607e5dfb64b806 Mon Sep 17 00:00:00 2001
From: cy <1664593601@qq.com>
Date: 星期四, 30 十一月 2023 09:30:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 admin-web/src/views/stock/scrap/itemScrapping/edit.vue |   18 ++++++------------
 1 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/admin-web/src/views/stock/scrap/itemScrapping/edit.vue b/admin-web/src/views/stock/scrap/itemScrapping/edit.vue
index ea65c12..98b1f00 100644
--- a/admin-web/src/views/stock/scrap/itemScrapping/edit.vue
+++ b/admin-web/src/views/stock/scrap/itemScrapping/edit.vue
@@ -177,21 +177,15 @@
   </win-md>
 </template>
 <script>
-import { scrappedAdd } from '@/api/stock/scrap';
-import {
-  goodsTemplate,
-  selectTenantWarehouse,
-  goodsModel,
-  warehouseSelectNumber,
-} from '@/api/baseSetting/finsystenant';
-import { getTree } from '@/api/foudation/classification';
+import {scrappedAdd} from '@/api/stock/scrap';
+import {goodsModel, goodsTemplate, selectTenantWarehouse, warehouseSelectNumber,} from '@/api/baseSetting/finsystenant';
+import {getTree} from '@/api/foudation/classification';
 import MyButton from '@/components/myButton/myButton';
 import winMd from '@/components/win/win-md';
 import upload from '@/components/upload/index';
-import { getUploadUrl } from '@/utils/base';
-import { mapGetters } from 'vuex';
-import SettingIplatform from '../../../../../public/static/config';
-import { getDicts } from '@/api/system/dict/data';
+import {getUploadUrl} from '@/utils/base';
+import {mapGetters} from 'vuex';
+import {getDicts} from '@/api/system/dict/data';
 
 export default {
   components: { MyButton, winMd, upload },

--
Gitblit v1.9.1