From 9d82d4b8c155e53c3efc388b649c670e5afd104f Mon Sep 17 00:00:00 2001
From: zxx <47968546@163.com>
Date: Wed, 15 Nov 2023 17:48:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layouts/footer/PageFooter.vue                       | 2 +-
 src/pages/Middle/Mes/MesMaterials/MesMaterials/Edit.vue | 9 +++++++++
 src/pages/Middle/Mes/MesStock/MesStock/Edit.vue         | 2 ++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/layouts/footer/PageFooter.vue b/src/layouts/footer/PageFooter.vue
index 42a3b9e..56e6a89 100644
--- a/src/layouts/footer/PageFooter.vue
+++ b/src/layouts/footer/PageFooter.vue
@@ -3,7 +3,7 @@
     <div class="copyright">
       <a-icon type="copyright" />{{ Project.copyright }} <br />
       <a-icon type="copyright"  />{{ Project.en_copyright }} <br />
-      
+
     </div>
   </div>
 </template>
diff --git a/src/pages/Middle/Mes/MesMaterials/MesMaterials/Edit.vue b/src/pages/Middle/Mes/MesMaterials/MesMaterials/Edit.vue
index 26568f3..89509c6 100644
--- a/src/pages/Middle/Mes/MesMaterials/MesMaterials/Edit.vue
+++ b/src/pages/Middle/Mes/MesMaterials/MesMaterials/Edit.vue
@@ -28,6 +28,15 @@
 
 
       <a-tab-pane key="2" tab="料品自定义属性">
+
+        <a-divider orientation="left">属性A类</a-divider>
+
+
+
+        <a-divider orientation="left">属性B类</a-divider>
+
+
+
         <!-- 料品属性 Start -->
         <vxe-form :data="options.formOptions2.data" ref="xForm2" :title-width="options.formOptions2.titleWidth"
           :title-align="options.formOptions2.titleAlign" :rules="options.formOptions2.rules"
diff --git a/src/pages/Middle/Mes/MesStock/MesStock/Edit.vue b/src/pages/Middle/Mes/MesStock/MesStock/Edit.vue
index f23da2e..cd28ecc 100644
--- a/src/pages/Middle/Mes/MesStock/MesStock/Edit.vue
+++ b/src/pages/Middle/Mes/MesStock/MesStock/Edit.vue
@@ -128,6 +128,8 @@ export default {
           items: [
             // =============================== 表单项 自动生成 Start ===============================
 
+            { field: 'warehouse_id', title: '仓库', span: 12, itemRender: { name: '$input' } },
+            { field: 'warehouse_pos_id', title: '仓位', span: 12, itemRender: { name: '$input' } },
             { field: 'product_id', title: '料品', span: 12, itemRender: { name: '$input' } },
             { field: 'code', title: '库存编码', span: 12, itemRender: { name: '$input' } },
             { field: 'stock', title: '库存数量', span: 12, itemRender: { name: '$input' } },