From 329c2e87db15837aa7ce9b556f46bffaf7b5c1f8 Mon Sep 17 00:00:00 2001
From: zxx <47968546@163.com>
Date: Thu, 16 Nov 2023 09:48:48 +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/application/index.js                        |  6 +++++-
 src/application/zk/index.js                     |  8 ++++++++
 src/pages/Middle/Mes/MesStock/MesStock/Edit.vue | 10 ++++++++--
 src/pages/Middle/Mes/MesStock/MesStock/List.vue |  4 ++--
 src/store/modules/account.js                    |  2 +-
 5 files changed, 24 insertions(+), 6 deletions(-)
 create mode 100644 src/application/zk/index.js

diff --git a/src/application/index.js b/src/application/index.js
index 2abe913..8082445 100644
--- a/src/application/index.js
+++ b/src/application/index.js
@@ -1,13 +1,17 @@
 // 跟业务系统相关的
 
 import mk from './mk' // mk插件
+import zk from './zk' // zk插件
 
 export default {
   install(Vue) { // 安装插件
 
 
     mk.init(Vue); // 初始化
-    Vue.prototype.$mk = mk; // 挂载到Vue原型上 
+    zk.init(Vue); // 初始化
+    Vue.prototype.$mk = mk; // 挂载到Vue原型上
+    Vue.prototype.$zk = zk; // 挂载到Vue原型上
+
 
   } 
 }
\ No newline at end of file
diff --git a/src/application/zk/index.js b/src/application/zk/index.js
new file mode 100644
index 0000000..e9ea792
--- /dev/null
+++ b/src/application/zk/index.js
@@ -0,0 +1,8 @@
+
+
+var zk = {
+    init: (Vue) => {
+        Vue.component("mk-toolbar", () => import("../mk/components/toolbar/toolbar"));
+    },
+}
+export default zk;
\ No newline at end of file
diff --git a/src/pages/Middle/Mes/MesStock/MesStock/Edit.vue b/src/pages/Middle/Mes/MesStock/MesStock/Edit.vue
index cd28ecc..e656f38 100644
--- a/src/pages/Middle/Mes/MesStock/MesStock/Edit.vue
+++ b/src/pages/Middle/Mes/MesStock/MesStock/Edit.vue
@@ -113,7 +113,7 @@ export default {
             // =============================== 表单校验 自动生成 Start ===============================
 
             code: [
-              { required: true, message: '请输入编码' }
+              { required: true, message: '请输入初始化入库单编码' }
             ],
             product_id: [
               { required: true, message: '请选择产品' }
@@ -121,6 +121,12 @@ export default {
             stock: [
               { required: true, message: '请输入库存数量' }
             ],
+            warehouse_id: [
+              { required: true, message: '请选择仓库' }
+            ],
+            warehouse_pos_id: [
+              { required: true, message: '请选择仓位' }
+            ],
 
             // =============================== 表单校验 自动生成 End ===============================
           },
@@ -131,7 +137,7 @@ export default {
             { 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: 'code', title: '初始化入库单编码', span: 12, itemRender: { name: '$input' } },
             { field: 'stock', title: '库存数量', span: 12, itemRender: { name: '$input' } },
 
             // =============================== 表单项 自动生成 End ===============================
diff --git a/src/pages/Middle/Mes/MesStock/MesStock/List.vue b/src/pages/Middle/Mes/MesStock/MesStock/List.vue
index 5c28e42..5f6b8e4 100644
--- a/src/pages/Middle/Mes/MesStock/MesStock/List.vue
+++ b/src/pages/Middle/Mes/MesStock/MesStock/List.vue
@@ -88,7 +88,7 @@ export default {
         ],
         //搜索区
         searchFormItems: [ // 子项
-          { field: 'title', title: '标题', span: 5, itemRender: { name: '$input', props: { placeholder: '请输入库存编码' } } },
+          // { field: 'title', title: '标题', span: 5, itemRender: { name: '$input', props: { placeholder: '请输入库存编码' } } },
           { span: 8, slots: { default: 'date' } },  // 自定义列
           {
             align: 'right', span: 4, itemRender: {  // 按钮列
@@ -113,7 +113,7 @@ export default {
             // =============================== 表格列 自动生成 Start ===============================
 
             { title: '操作', slots: { default: 'op' }, width: 120 },
-            { field: 'code', sortable: true, title: '库存编码', width: 100 }, // 编码
+            // { field: 'code', sortable: true, title: '库存编码', width: 100 }, // 编码
             { field: 'product_detail.mes_materials_sort.name', sortable: true, title: '料品分类', width: 100 }, // 产品详情
             { field: 'product_detail.name', sortable: true, title: '料品名称', width: 250 }, // 产品详情
             { field: 'product_detail.code', sortable: true, title: '料品编码', width: 120 }, // 产品详情
diff --git a/src/store/modules/account.js b/src/store/modules/account.js
index 118192b..39c76c0 100644
--- a/src/store/modules/account.js
+++ b/src/store/modules/account.js
@@ -11,7 +11,7 @@ export default {
   },
   getters: {
     uid: state => { // 用户id
-      if (state.uid == 0) { // 如果没有用户uid
+      if (state.uid === 0) { // 如果没有用户uid
         try {
           const uid = localStorage.getItem(process.env.VUE_APP_UID_KEY) // 获取用户id
           state.uid = uid  // 将用户信息赋值给state.user