From ca5b4958bfef50df85883311cc95bd8f847a0705 Mon Sep 17 00:00:00 2001
From: zxx <47968546@163.com>
Date: Fri, 17 Nov 2023 11:21:43 +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/mk/basic-pages/list.vue       |  16 +-
 src/application/zk/func/request.js            | 171 ++++++++++++++++++
 src/application/zk/index.js                   |   8 +-
 .../Middle/Mes/MesEnum/MesEnum/index.vue      |   4 +-
 .../Mes/MesMaterials/MesMaterials/index.vue   |   4 +-
 .../Mes/MesProcesses/MesProcesses/List.vue    |   4 +-
 .../MesProductCustomAttribute/List.vue        |   4 +-
 .../MesProductionOrder/voucher.vue            |   4 +-
 .../Middle/Mes/MesStock/MesStock/List.vue     |   4 +-
 .../Mes/MesStock/MesStock/OutIn/InEdit.vue    |  71 ++++----
 .../Mes/MesStock/MesStock/OutIn/InList.vue    |   2 +-
 .../Mes/MesStock/MesStock/OutIn/LogDetail.vue |   2 +
 .../Mes/MesStock/MesStock/OutIn/OutEdit.vue   |  10 +-
 .../Mes/MesStock/MesStock/OutIn/OutList.vue   |   2 +-
 .../MesStock/Position/PositionList.vue        |  18 +-
 .../Middle/Mes/MesStock/MesStock/test.vue     |  52 ++++++
 .../Mes/MesWarehouse/MesWarehouse/Edit.vue    |  16 +-
 .../Mes/MesWarehouse/MesWarehouse/List.vue    |  18 +-
 .../MesWarehouse/PositionEdit.vue             |   9 +
 .../MesWarehouse/PositionList.vue             |  13 +-
 src/pages/Middle/Mold/printTemplate/edit.vue  |   4 +-
 src/services/Middle/Mes/MesStock/api.js       |  38 ++++
 22 files changed, 379 insertions(+), 95 deletions(-)
 create mode 100644 src/pages/Middle/Mes/MesStock/MesStock/test.vue

diff --git a/src/application/mk/basic-pages/list.vue b/src/application/mk/basic-pages/list.vue
index 4796d62..d972ecf 100644
--- a/src/application/mk/basic-pages/list.vue
+++ b/src/application/mk/basic-pages/list.vue
@@ -22,7 +22,8 @@
 
     <vxe-toolbar ref="xToolbar" custom>
       <template #buttons>
-        <a-button type="primary" icon="delete" @click="pageDelete()" v-if="options.disabledDelete !== true">批量删除</a-button>
+        <a-button type="primary" icon="delete" @click="pageDelete()"
+          v-if="options.disabledDelete !== true">批量删除</a-button>
         <a-button type="primary" style="margin-left: 5px;" icon="print" v-if="options.enabledPrint"
           @click="pagePrint()">打印</a-button>
         <a-button type="primary" style="margin-left: 5px;" icon="print" v-if="options.enabledPrint2"
@@ -44,8 +45,8 @@
       <vxe-grid ref='xGrid' v-bind="options.gridOptions" class="mytable-style" :row-class-name="rowClassName">
         <template #op="{ row }">
           <div class="oplinks">
-            <a v-if="enabledOp({ name: 'edit', row: row })" @click.stop="pageEdit(row)" title="编辑"><a-icon
-                type="edit" /></a>
+            <a v-if="options.disabledEdit !== false && enabledOp({ name: 'edit', row: row })" @click.stop="pageEdit(row)"
+              title="编辑"><a-icon type="edit" /></a>
             <a v-if="enabledOp({ name: 'delete', row: row })" @click.stop="pageDelete(row)" title="删除"><a-icon
                 type="delete" /></a>
           </div>
@@ -628,11 +629,11 @@ export default {
             data: delParms,
             useBigInt: true
           }).then((r) => { // 成功
-            if(r.code == 200){
+            if (r.code == 200) {
               this.$mk.success("删除成功"); // 提示成功
-            this.$refs.xGrid.commitProxy('query') // 提交搜索
-            }else{
-              this.$mk.error(r.msg); 
+              this.$refs.xGrid.commitProxy('query') // 提交搜索
+            } else {
+              this.$mk.error(r.msg);
             }
 
 
@@ -687,6 +688,7 @@ export default {
 .page-body {
   padding: 15px;
   background: @base-bg-color;
+  //border: 1px solid red;
 }
 
 .gridPanel {
diff --git a/src/application/zk/func/request.js b/src/application/zk/func/request.js
index e69de29..796ed4b 100644
--- a/src/application/zk/func/request.js
+++ b/src/application/zk/func/request.js
@@ -0,0 +1,171 @@
+import { request } from '@/utils/request' // 加载request
+import modal from './modal' // 加载modal
+
+import JSONbig from 'json-bigint'
+
+export default {
+
+    // 提交post请求 ，获取数据
+    post: function ({ url, data, loading, config, useBigInt }) { // post请求
+
+        if (useBigInt) {
+            config = config || {};
+            config.headers = {
+                'Content-Type': 'application/json'
+            };
+            data = JSONbig.stringify(data);
+        }
+        return new Promise((resolve, reject) => { // 返回一个Promise
+
+            if (loading) { // 如果需要加载
+                modal.loading(loading); // 显示加载
+            }
+            request(url, 'post', data, config).then(response => { // 发送请求
+                if (!response) { // 如果没有返回
+                    reject && reject(response); // 返回错误
+                    return; // 返回
+                }
+                var result = response.data; // 获取数据
+                if (!result) { // 如果没有数据
+                    reject && reject(response); // 返回错误
+                    return; // 返回
+                }
+                if (loading) { // 如果需要加载
+                    modal.hideLoading(); // 隐藏加载
+                }
+                /*
+                if (result.code != 200) { // 如果返回的状态码不是200
+                    if (reject) { // 如果有错误回调
+                        reject(response); // 返回错误
+                    } else { // 如果没有错误回调
+                        modal.error(result.msg); // 显示错误
+                    }
+                    return; // 返回
+                }
+                */
+                resolve(result);  // 返回成功
+            }).catch((error) => {    // 如果出错
+                if (loading) { // 如果需要加载
+                    modal.hideLoading(); // 隐藏加载
+                }
+                modal.error(error.toString()); // 显示错误
+            });
+        });
+
+    },
+
+    get: function ({ url, loading, config, useBigInt }) { // post请求
+
+        if (useBigInt) {
+            config = config || {};
+            config.headers = {
+                'Content-Type': 'application/json'
+            };
+        }
+        return new Promise((resolve, reject) => { // 返回一个Promise
+
+            if (loading) { // 如果需要加载
+                modal.loading(loading); // 显示加载
+            }
+            request(url, 'get', {}, config).then(response => { // 发送请求
+                if (!response) { // 如果没有返回
+                    reject && reject(response); // 返回错误
+                    return; // 返回
+                }
+                var result = response.data; // 获取数据
+                if (!result) { // 如果没有数据
+                    reject && reject(response); // 返回错误
+                    return; // 返回
+                }
+                if (loading) { // 如果需要加载
+                    modal.hideLoading(); // 隐藏加载
+                }
+                resolve(result);  // 返回成功
+            }).catch((error) => {    // 如果出错
+                if (loading) { // 如果需要加载
+                    modal.hideLoading(); // 隐藏加载
+                }
+                modal.error(error.toString()); // 显示错误
+            });
+        });
+
+    },
+
+    // 获取分页数据
+    getPagedData: function ({ url, method = 'post', data, callback, config,useBigInt,rowFilters,listFieldName }) { // 获取分页数据 默认post请求
+
+        if (useBigInt) {
+            config = config || {};
+            config.headers = {
+                'Content-Type': 'application/json'
+            };
+            data = JSONbig.stringify(data);
+        }
+
+        return new Promise((resolve, reject) => { // 返回一个Promise
+
+            if (data.start_time && typeof (data.start_time) == "string") { // 如果开始时间是字符串
+                data.start_time = parseInt(new Date(data.start_time).getTime() / 1000); // 转换为时间戳
+            }
+            if (data.end_time && typeof (data.end_time) == "string") { // 如果结束时间是字符串
+                data.end_time = parseInt(new Date(data.end_time).getTime() / 1000); // 转换为时间戳
+            }
+            request(url, method, data, config).then(response => { // 发送请求
+                if (!response) { // 如果没有返回
+                    reject && reject(response);  // 返回错误
+                    return;
+                }
+                var result = response.data; // 获取数据
+                if (!result) { // 如果没有数据
+                    reject && reject(response); // 返回错误
+                    return;
+                }
+
+                if (result.code != 200) { // 如果返回的状态码不是200
+                    if (reject) { // 如果有错误回调
+                        reject(response); // 返回错误
+                    } else { // 如果没有错误回调
+                        modal.error(result.msg); // 显示错误
+                    }
+                    return;
+                }
+
+                if(
+                    rowFilters && // 如果有行过滤器
+                    rowFilters.length && // 如果行过滤器有数据
+                    listFieldName && // 如果列表字段名有数据
+                    result.data && // 如果返回的数据有数据
+                    result.data[listFieldName] && // 如果返回的数据中有列表字段名
+                    result.data[listFieldName].length // 如果返回的数据中的列表字段名有数据
+                ){
+                    console.log( JSON.stringify(result.data[listFieldName]))
+                    result.data[listFieldName] = result.data[listFieldName].filter((row)=>{
+                        for(let i =0;i<rowFilters.length;i++){
+                            let f = rowFilters[i];
+                            if(!f(row)){
+                                return false;
+                            }
+                        }
+                        return true;
+                    });
+                    console.log( JSON.stringify(result.data[listFieldName]))
+                }
+                // console.log(result.data)
+                resolve(result.data);  // 返回成功
+
+                if (callback) { // 如果有回调
+                    callback(result.data);  // 执行回调
+                }
+            }).catch((error) => {
+                resolve({ // 返回一个空数据
+                    total: 0, // 总数
+                    list: [] // 列表
+                });
+                modal.error(error.toString()); // 显示错误
+            });
+        });
+
+    }
+
+
+}
\ No newline at end of file
diff --git a/src/application/zk/index.js b/src/application/zk/index.js
index e9ea792..1caf5b5 100644
--- a/src/application/zk/index.js
+++ b/src/application/zk/index.js
@@ -1,8 +1,12 @@
-
+import dialog from "@/application/mk/components/dialog";
+import request from "@/application/zk/func/request";
 
 var zk = {
+
+    dialog: dialog,
     init: (Vue) => {
-        Vue.component("mk-toolbar", () => import("../mk/components/toolbar/toolbar"));
+        Vue.component("zk-toolbar", () => import("../mk/components/toolbar/toolbar"));
     },
+    request:request
 }
 export default zk;
\ No newline at end of file
diff --git a/src/pages/Middle/Mes/MesEnum/MesEnum/index.vue b/src/pages/Middle/Mes/MesEnum/MesEnum/index.vue
index 34eb137..62d89c9 100644
--- a/src/pages/Middle/Mes/MesEnum/MesEnum/index.vue
+++ b/src/pages/Middle/Mes/MesEnum/MesEnum/index.vue
@@ -461,10 +461,10 @@ export default {
 };
 
 </script>
-<style>
+<style scoped>
 .page-body {
   background: white;
-  padding: 8px;
+  padding: 15px;
 }
 
 .toolbarbtns .ant-btn {
diff --git a/src/pages/Middle/Mes/MesMaterials/MesMaterials/index.vue b/src/pages/Middle/Mes/MesMaterials/MesMaterials/index.vue
index c00b1f2..0f1796f 100644
--- a/src/pages/Middle/Mes/MesMaterials/MesMaterials/index.vue
+++ b/src/pages/Middle/Mes/MesMaterials/MesMaterials/index.vue
@@ -607,10 +607,10 @@ export default {
 };
 
 </script>
-<style>
+<style scoped>
 .page-body {
   background: white;
-  padding: 8px;
+  padding: 15px;
 }
 
 
diff --git a/src/pages/Middle/Mes/MesProcesses/MesProcesses/List.vue b/src/pages/Middle/Mes/MesProcesses/MesProcesses/List.vue
index 79fa8c9..afde0e0 100644
--- a/src/pages/Middle/Mes/MesProcesses/MesProcesses/List.vue
+++ b/src/pages/Middle/Mes/MesProcesses/MesProcesses/List.vue
@@ -622,10 +622,10 @@ export default {
 };
 
 </script>
-<style>
+<style scoped>
 .page-body {
   background: white;
-  padding: 8px;
+  padding: 15px;
 }
 
 .toolbarbtns .ant-btn {
diff --git a/src/pages/Middle/Mes/MesProductCustomAttribute/MesProductCustomAttribute/List.vue b/src/pages/Middle/Mes/MesProductCustomAttribute/MesProductCustomAttribute/List.vue
index 9ca8775..523c814 100644
--- a/src/pages/Middle/Mes/MesProductCustomAttribute/MesProductCustomAttribute/List.vue
+++ b/src/pages/Middle/Mes/MesProductCustomAttribute/MesProductCustomAttribute/List.vue
@@ -512,10 +512,10 @@ export default {
 };
 
 </script>
-<style>
+<style scoped>
 .page-body {
   background: white;
-  padding: 8px;
+  padding: 15px;
 }
 
 
diff --git a/src/pages/Middle/Mes/MesProductionOrder/MesProductionOrder/voucher.vue b/src/pages/Middle/Mes/MesProductionOrder/MesProductionOrder/voucher.vue
index 1a8aa07..f79eb8c 100644
--- a/src/pages/Middle/Mes/MesProductionOrder/MesProductionOrder/voucher.vue
+++ b/src/pages/Middle/Mes/MesProductionOrder/MesProductionOrder/voucher.vue
@@ -1089,10 +1089,10 @@ export default {
 
 </script>
  
-<style>
+<style scoped>
 .page-body {
   background: white;
-  padding: 8px;
+  padding: 15px;
 }
 
 .oplinks2 svg {
diff --git a/src/pages/Middle/Mes/MesStock/MesStock/List.vue b/src/pages/Middle/Mes/MesStock/MesStock/List.vue
index f0c4d18..6d57676 100644
--- a/src/pages/Middle/Mes/MesStock/MesStock/List.vue
+++ b/src/pages/Middle/Mes/MesStock/MesStock/List.vue
@@ -3,7 +3,7 @@
 
   <basic-page-list :desc="desc" :options="pageOptions">
     <template v-slot:column1="{ row }">
-      <a-button class="in"  type="primary" @click="positionAdd(row.id)">增加仓位</a-button> 
+      <a-button class="in"  type="primary" @click="positionAdd(row.id)">为该库存增加仓位</a-button>
     </template>
 
   </basic-page-list>
@@ -46,7 +46,7 @@ export default {
         keyName: 'id', // 主键字段名
         listFieldName: 'MesStock',
 
-        disabledDelete:true, 
+        disabledDelete:false,
 
         addPageUrl: "/MesStock/MesStockAdd",
         editPageUrl: "/MesStock/MesStockUpdate/",
diff --git a/src/pages/Middle/Mes/MesStock/MesStock/OutIn/InEdit.vue b/src/pages/Middle/Mes/MesStock/MesStock/OutIn/InEdit.vue
index ddd5f39..df59bf4 100644
--- a/src/pages/Middle/Mes/MesStock/MesStock/OutIn/InEdit.vue
+++ b/src/pages/Middle/Mes/MesStock/MesStock/OutIn/InEdit.vue
@@ -3,7 +3,7 @@
 
     <vxe-form :data="formOptions.data" ref="xForm" :title-width="formOptions.titleWidth"
       :title-align="formOptions.titleAlign" :rules="formOptions.rules" :items="formOptions.items" titleColon>
-    </vxe-form> 
+    </vxe-form>
 
     <div class="footerbar">
       <a-button type="primary" @click="ok">确定</a-button>
@@ -17,7 +17,7 @@
 import BASE_URL from '@/services/mes/api.js';
 
 export default {
- 
+
   components: {},
   props: {
     pageMode: {
@@ -68,49 +68,50 @@ export default {
 
           in_stock: [
             { required: true, message: '请输入入库数量' }
-          ] 
+          ]
 
         },
         // 表单项
-        items: [ 
+        items: [
 
 
-        { field: 'in_stock', dataRule: { type: 'number' }, title: '入库数量', span: 12, itemRender: { name: '$input' , props: { type: "number" }} },
-          { field: 'in_time', dataRule: { type: 'timestamp' }, title: '入库时间', span: 12, itemRender: { name: '$input' , props: { type: "date" }} },
-     
+          { field: 'stock', dataRule: { type: 'number' }, title: '入库数量', span: 12, itemRender: { name: '$input', props: { type: "number" } } },
+          { field: 'in_type',title: '入库类型', span: 12, itemRender: { name: '$input' } },
+          { field: 'in_time', dataRule: { type: 'timestamp' }, title: '入库时间', span: 12, itemRender: { name: '$input', props: { type: "date" } } },
+
           {
-              title: '业务员', span: 12,
-              field: 'salesman_name',
-              dataRule: {
-                fromField: "id",
-                saveField: "salesman_uid"
-              },
-              itemRender: {
-                name: 'MkFormDataSelector', props: {
-                  params: {
-                    dataType: "string",
-                    valueField: "id",
-                    textField: "name",
-                    listdataFieldName: 'MesStaff',
-                    dataUrl: `${BASE_URL.BASE_URL}/MesStaff/v1/mes/staff/list`,
-                    onDataChanged: ({ data }) => {
-                      console.log(data)
-                      this.pageOptions.formOptions.data.warehouse_mobile = data.phone;
-                    }
+            title: '业务员', span: 12,
+            field: 'salesman_name',
+            dataRule: {
+              fromField: "id",
+              saveField: "salesman_uid"
+            },
+            itemRender: {
+              name: 'MkFormDataSelector', props: {
+                params: {
+                  dataType: "string",
+                  valueField: "id",
+                  textField: "name",
+                  listdataFieldName: 'MesStaff',
+                  dataUrl: `${BASE_URL.BASE_URL}/MesStaff/v1/mes/staff/list`,
+                  onDataChanged: ({ data }) => {
+                    console.log(data)
+                    this.pageOptions.formOptions.data.warehouse_mobile = data.phone;
                   }
                 }
               }
-            },
+            }
+          },
+
+
 
-    
-          
           { field: 'check_time', dataRule: { type: 'timestamp' }, title: '验货时间', span: 12, itemRender: { name: '$input', props: { type: "date" } } },
 
           { field: 'delivery_no', title: '发货单号', span: 12, itemRender: { name: '$input' } },
 
           { field: 'contact', title: '联系人', span: 12, itemRender: { name: '$input' } },
           { field: 'phone', title: '联系电话', span: 12, itemRender: { name: '$input' } },
-          { field: 'remark', title: '备注', span: 12, itemRender: { name: '$input' } }, 
+          { field: 'remark', title: '备注', span: 12, itemRender: { name: '$input' } },
         ]
       },
       // 新增模式表单项
@@ -200,7 +201,7 @@ export default {
     // 返回
     back() {
 
-      this.$emit("callback", {});
+      this.$emit("callback", { success: true });
     },
 
 
@@ -209,13 +210,13 @@ export default {
     ok() {
 
 
- 
+
 
       let save = () => {
 
-  
+
         let postdata = Object.assign({}, this.formOptions.data);
- 
+
         // 格式化提交的数据
         this.$mk.formatFormData({ data: postdata, rules: this.formOptions.items });
 
@@ -246,7 +247,7 @@ export default {
 
       };
 
- 
+
 
       // 验证表单
       this.$mk.validateForm({ form: this.$refs.xForm }).then(() => { // 验证表单
@@ -266,7 +267,7 @@ export default {
       this.back();
     },
 
-  
+
   },
   // 监听属性
   watch: {
diff --git a/src/pages/Middle/Mes/MesStock/MesStock/OutIn/InList.vue b/src/pages/Middle/Mes/MesStock/MesStock/OutIn/InList.vue
index ec77df6..47949a2 100644
--- a/src/pages/Middle/Mes/MesStock/MesStock/OutIn/InList.vue
+++ b/src/pages/Middle/Mes/MesStock/MesStock/OutIn/InList.vue
@@ -164,7 +164,7 @@ export default {
       };
 
       pageData.actions.getList = pageData.actions.ProductStockLogInList;
-      pageData.actions.delete = pageData.actions.MesStockPositionBatchDelete;
+      pageData.actions.delete = pageData.actions.ProductStockLogBatchDelete;
       pageData.gridOptions = Object.assign({}, this.$mk.config.defaults.gridOptions, pageData.gridOptions); // 合并表格数据
       this.pageOptions = pageData;
     },
diff --git a/src/pages/Middle/Mes/MesStock/MesStock/OutIn/LogDetail.vue b/src/pages/Middle/Mes/MesStock/MesStock/OutIn/LogDetail.vue
index d868f85..32b713d 100644
--- a/src/pages/Middle/Mes/MesStock/MesStock/OutIn/LogDetail.vue
+++ b/src/pages/Middle/Mes/MesStock/MesStock/OutIn/LogDetail.vue
@@ -1,6 +1,7 @@
 <!-- 出入库记录 -->
 <template>
   <basic-page-edit :desc="desc" :dataId="getDataId()" :options="pageOptions"></basic-page-edit>
+
 </template>
 
 <script>
@@ -233,6 +234,7 @@ export default {
       if (!dataId) {
         dataId = 0;
       }
+
       return dataId;
     }
   },
diff --git a/src/pages/Middle/Mes/MesStock/MesStock/OutIn/OutEdit.vue b/src/pages/Middle/Mes/MesStock/MesStock/OutIn/OutEdit.vue
index 4bf3c4c..16fdf48 100644
--- a/src/pages/Middle/Mes/MesStock/MesStock/OutIn/OutEdit.vue
+++ b/src/pages/Middle/Mes/MesStock/MesStock/OutIn/OutEdit.vue
@@ -72,10 +72,10 @@ export default {
 
         },
         // 表单项
-        items: [ 
+        items: [
 
-
-        { field: 'out_stock', dataRule: { type: 'number' }, title: '出库数量', span: 12, itemRender: { name: '$input' , props: { type: "number" }} },
+          { field: 'stock', dataRule: { type: 'number' }, title: '出库数量', span: 12, itemRender: { name: '$input' , props: { type: "number" }} },
+          { field: 'out_type',title: '出库类型', span: 12, itemRender: { name: '$input' } },
           { field: 'out_time', dataRule: { type: 'timestamp' }, title: '出库时间', span: 12, itemRender: { name: '$input' , props: { type: "date" }} },
      
           {
@@ -201,7 +201,7 @@ export default {
     back() {
 
       
-      this.$emit("callback", {});
+      this.$emit("callback", {success:true});
     },
 
 
@@ -240,6 +240,8 @@ export default {
               this.back();
             }, 500);
 
+
+
           } else {
             this.$mk.error(a.msg || a.message);
           }
diff --git a/src/pages/Middle/Mes/MesStock/MesStock/OutIn/OutList.vue b/src/pages/Middle/Mes/MesStock/MesStock/OutIn/OutList.vue
index 856ce9a..cd432b4 100644
--- a/src/pages/Middle/Mes/MesStock/MesStock/OutIn/OutList.vue
+++ b/src/pages/Middle/Mes/MesStock/MesStock/OutIn/OutList.vue
@@ -164,7 +164,7 @@ export default {
       };
 
       pageData.actions.getList = pageData.actions.ProductStockLogOutList;
-      pageData.actions.delete = pageData.actions.MesStockPositionBatchDelete;
+      pageData.actions.delete = pageData.actions.ProductStockLogBatchDelete;
       pageData.gridOptions = Object.assign({}, this.$mk.config.defaults.gridOptions, pageData.gridOptions); // 合并表格数据
       this.pageOptions = pageData;
     },
diff --git a/src/pages/Middle/Mes/MesStock/MesStock/Position/PositionList.vue b/src/pages/Middle/Mes/MesStock/MesStock/Position/PositionList.vue
index f9a60cc..83f6075 100644
--- a/src/pages/Middle/Mes/MesStock/MesStock/Position/PositionList.vue
+++ b/src/pages/Middle/Mes/MesStock/MesStock/Position/PositionList.vue
@@ -47,10 +47,8 @@ export default {
 
         keyName: 'id', // 主键字段名
         listFieldName: 'MesStockPosition',
-
         addPageUrl: "/MesStock/MesStockPositionAdd",
         editPageUrl: "/MesStock/MesStockPositionUpdate/",
-        disabledAdd:true,
         // 接口动作
         actions: { // Api 接口地址
           // =============================== 接口地址 自动生成 Start ===============================
@@ -91,7 +89,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: {  // 按钮列
@@ -102,6 +100,8 @@ export default {
         ],
 
 
+        disabledEdit:false,
+        disabledAdd:true,
         //数据区
         gridOptions: { // 表格配置
           height: '100%', // 表格高度  100% 会自动撑满父容器
@@ -115,7 +115,7 @@ export default {
 
             // =============================== 表格列 自动生成 Start ===============================
 
-            { title: '操作', slots: { default: 'op' }, width: 120 },
+            { title: '操作', slots: { default: 'op' }, width: 50 },
             { field: 'warehouse_idetail.name', sortable: true, title: '仓库', width: 150 }, // 仓库名称
             { field: 'warehouse_pos_idetail.name', sortable: true, title: '库位', width: 150 }, // 库位信息
             { field: 'product_detail.name', sortable: true, title: '料品名称', width: 250 }, // 产品详情
@@ -159,12 +159,13 @@ export default {
             title: "出库",
             pageOptions: {
             },
-            width: 800,
-            height: 600,
+            width: 1000,
+            height: 800,
             dataId: id,
             callback: ({ success }) => {
               if (success) {
                 this.$refs.xGrid.commitProxy('query')
+
               }
             }
           });
@@ -182,12 +183,13 @@ export default {
             title: "入库",
             pageOptions: {
             },
-            width: 800,
-            height: 600,
+            width: 1000,
+            height: 800,
             dataId: id,
             callback: ({ success }) => {
               if (success) {
                 this.$refs.xGrid.commitProxy('query')
+
               }
             }
           });
diff --git a/src/pages/Middle/Mes/MesStock/MesStock/test.vue b/src/pages/Middle/Mes/MesStock/MesStock/test.vue
new file mode 100644
index 0000000..19f9da5
--- /dev/null
+++ b/src/pages/Middle/Mes/MesStock/MesStock/test.vue
@@ -0,0 +1,52 @@
+<script>
+export default {
+  api: require('@/services/Middle/Mes/MesStock/api.js'),
+  i18n: require('../i18n'),
+  components: {},
+  props: {
+    pageMode: {
+      type: String,
+      default: "edit"
+    },
+    dataId: {
+    }
+  },
+
+  data() {
+
+    return {
+      pageOptions: {},
+      search_rules:[],
+      order_bys:[],
+      start_time: 0,
+      end_time: 0,
+      page: 1,
+      limit: 10,
+      MesStock: this.$zk.request(this.api.MesStockList.url, {
+        "limit":this.limit,
+        "end_time":
+        "start_time": 0,
+        "search_rules": this.search_rules,
+        "order_bys": this.order_bys,
+        "page": 1
+      }, true,{}, true)
+    };
+  },
+  created() {
+    console.log(this.MesStock)
+  },
+  computed: {
+    desc() {
+      return this.$t('editPageDesc')
+    }
+  },
+}
+</script>
+
+<template>
+
+</template>
+
+<style scoped lang="less">
+
+</style>
\ No newline at end of file
diff --git a/src/pages/Middle/Mes/MesWarehouse/MesWarehouse/Edit.vue b/src/pages/Middle/Mes/MesWarehouse/MesWarehouse/Edit.vue
index 53e439b..b242998 100644
--- a/src/pages/Middle/Mes/MesWarehouse/MesWarehouse/Edit.vue
+++ b/src/pages/Middle/Mes/MesWarehouse/MesWarehouse/Edit.vue
@@ -145,11 +145,10 @@ export default {
             { field: 'warehouse_code', title: '仓库编号', span: 6, itemRender: { name: '$input' } },
             { field: 'warehouse_type', title: '仓库类型', span: 6, itemRender: { name: '$select', props: { options: settings.options_warehouse_type } } },
             { field: 'warehouse_storage_type', title: '存储类型', span: 6, itemRender: { name: '$select', props: { options: settings.options_warehouse_storage_type } } },
-            { field: 'warehouse_address', title: '仓库地址', span: 12, itemRender: { name: '$input' } },
-            { field: 'warehouse_phone', title: '仓库电话', span: 12, itemRender: { name: '$input' } },
+            { field: 'warehouse_phone', title: '仓库电话', span: 6, itemRender: { name: '$input' } },
 
             {
-              title: '仓库负责人', span: 12,
+              title: '仓库负责人', span: 6,
               field: 'warehouse_uname',
               dataRule: {
                 fromField: "id",
@@ -171,15 +170,16 @@ export default {
                 }
               }
             },
-            { field: 'warehouse_mobile', title: '仓库负责人手机号', span: 12, itemRender: { name: 'MkFormInputShow' } },
+            { field: 'warehouse_mobile', title: '仓库负责人手机号', span: 6, itemRender: { name: 'MkFormInputShow' } },
+            { field: 'warehouse_address', title: '仓库地址', span: 24, itemRender: { name: '$input' } },
 
 
-            { field: 'warehouse_remark', title: '仓库备注', span: 24, itemRender: { name: '$input' } },
+            { field: 'warehouse_remark', title: '仓库备注', span: 24, itemRender: { name: '$textarea' } },
             { field: 'warehouse_status', title: '仓库状态', dataRule: { type: 'bool' }, span: 4, itemRender: { name: '$switch', props: { options: settings.options_is_enabled } } },
             { field: 'warehouse_negative_stock', dataRule: { type: 'bool' }, title: '仓库是否允许负库存', span: 4, itemRender: { name: '$switch', props: { options: settings.options_warehouse_negative_stock } } },
-            { field: 'warehouse_location', dataRule: { type: 'bool' }, title: '是否启用库位管理', span: 4, itemRender: { name: '$switch', props: { options: settings.options_is_open } } },
-            { field: 'warehouse_batch', dataRule: { type: 'bool' }, title: '是否启用批次管理', span: 4, itemRender: { name: '$switch', props: { options: settings.options_is_open } } },
-            { field: 'warehouse_serial', dataRule: { type: 'bool' }, title: '是否启用序列号', span: 4, itemRender: { name: '$switch', props: { options: settings.options_is_open } } },
+            { field: 'warehouse_location', dataRule: { type: 'bool' }, title: '是否启用多库位管理', span: 4, itemRender: { name: '$switch', props: { options: settings.options_is_open } } },
+            // { field: 'warehouse_batch', dataRule: { type: 'bool' }, title: '是否启用批次管理', span: 4, itemRender: { name: '$switch', props: { options: settings.options_is_open } } },
+            // { field: 'warehouse_serial', dataRule: { type: 'bool' }, title: '是否启用序列号', span: 4, itemRender: { name: '$switch', props: { options: settings.options_is_open } } },
 
             // =============================== 表单项 自动生成 End ===============================
           ]
diff --git a/src/pages/Middle/Mes/MesWarehouse/MesWarehouse/List.vue b/src/pages/Middle/Mes/MesWarehouse/MesWarehouse/List.vue
index b1ba834..e2c9431 100644
--- a/src/pages/Middle/Mes/MesWarehouse/MesWarehouse/List.vue
+++ b/src/pages/Middle/Mes/MesWarehouse/MesWarehouse/List.vue
@@ -86,15 +86,15 @@ export default {
         ],
         //搜索区
         searchFormItems: [ // 子项
-          { field: 'title', title: '标题', span: 5, itemRender: { name: '$input', props: { placeholder: '请输入标题' } } },
-          { field: 'desc', title: '描述', span: 5, itemRender: { name: '$input', props: { placeholder: '请输入描述' } } },
-          { span: 8, slots: { default: 'date' } },  // 自定义列
-          {
-            align: 'right', span: 4, itemRender: {  // 按钮列
-              name: '$buttons', children: [{ props: { type: 'submit', content: '搜索', status: 'primary' } },  // 搜索按钮
-              { props: { type: 'reset', content: '重置' } }]
-            }
-          }
+          // { field: 'code', title: '编码', span: 4, itemRender: { name: '$input', props: { placeholder: '请输入编码' } } },
+          // { field: 'warehouse_title', title: '名称', span: 5, itemRender: { name: '$input', props: { placeholder: '请输入名称' } } },
+          // { span: 8, slots: { default: 'date' } },  // 自定义列
+          // {
+          //   align: 'right', span: 4, itemRender: {  // 按钮列
+          //     name: '$buttons', children: [{ props: { type: 'submit', content: '搜索', status: 'primary' } },  // 搜索按钮
+          //     { props: { type: 'reset', content: '重置' } }]
+          //   }
+          // }
         ],
 
 
diff --git a/src/pages/Middle/Mes/MesWarehouse/MesWarehouse/PositionEdit.vue b/src/pages/Middle/Mes/MesWarehouse/MesWarehouse/PositionEdit.vue
index 44e64fc..44bd79f 100644
--- a/src/pages/Middle/Mes/MesWarehouse/MesWarehouse/PositionEdit.vue
+++ b/src/pages/Middle/Mes/MesWarehouse/MesWarehouse/PositionEdit.vue
@@ -169,6 +169,15 @@ export default {
                       { field: 'code', title: '编码' }   
                     ],
                     listdataFieldName: 'MesWarehouse',
+                    actionParams: {
+                      search_rules: [
+                        {
+                          column: "warehouse_location",
+                          mode: "=",
+                          value: "1"
+                        }
+                      ]
+                    },
                     dataUrl: `${BASE_URL.BASE_URL}/MesWarehouse/v1/mes/warehouse/list`
                   }
                 }
diff --git a/src/pages/Middle/Mes/MesWarehouse/MesWarehouse/PositionList.vue b/src/pages/Middle/Mes/MesWarehouse/MesWarehouse/PositionList.vue
index 741fcce..d30e1f4 100644
--- a/src/pages/Middle/Mes/MesWarehouse/MesWarehouse/PositionList.vue
+++ b/src/pages/Middle/Mes/MesWarehouse/MesWarehouse/PositionList.vue
@@ -102,7 +102,8 @@ export default {
         ],
         //搜索区
         searchFormItems: [ // 子项
-          { field: 'title', title: '标题', span: 5, itemRender: { name: '$input', props: { placeholder: '请输入仓位名称' } } },
+          { field: 'code', title: '仓位编码', span: 5, itemRender: { name: '$input', props: { placeholder: '请输入仓位编码' } } },
+          { field: 'warehouse_location_name', title: '仓位名称', span: 5, itemRender: { name: '$input', props: { placeholder: '请输入仓位名称' } } },
           { span: 8, slots: { default: 'date' } },  // 自定义列
           {
             align: 'right', span: 4, itemRender: {  // 按钮列
@@ -127,13 +128,13 @@ export default {
             // =============================== 表格列 自动生成 Start ===============================
 
             { title: '操作', slots: { default: 'op' }, width: 120 },
+            { field: 'warehouse_detail.code', sortable: true, title: '仓库编码', width: 120 }, // 仓库编号
             { field: 'warehouse_detail.warehouse_title', sortable: true, title: '仓库名称', width: 150 }, // 仓库名称
-            { field: 'warehouse_detail.code', sortable: true, title: '仓库编码', width: 'auto' }, // 仓库编号
-            { field: 'code', sortable: true, title: '库位编码', width: 'auto' }, // 编码
+            { field: 'code', sortable: true, title: '库位编码', width: 120 }, // 编码
             { field: 'warehouse_location_name', sortable: true, title: '库位名称', width: 'auto' }, // 库位名称
-            { field: 'warehouse_location_keeper_uname', sortable: true, title: '库管员姓名', width: 150 }, // 库管员姓名
-            { field: 'is_default', sortable: true, title: '默认库位', slots: { default: 'column1' }, width: 100 }, // 是否默认库位:0.否,1.是
-            { field: 'warehouse_location_status', sortable: true, title: '库位状态', slots: { default: 'column2' }, width: 100 }, // 库位状态:0.禁用,1.启用
+            { field: 'warehouse_location_keeper_uname', sortable: true, title: '库管员', width: 100 }, // 库管员姓名
+            { field: 'is_default', sortable: true, title: '默认', slots: { default: 'column1' }, width: 70 }, // 是否默认库位:0.否,1.是
+            { field: 'warehouse_location_status', sortable: true, title: '状态', slots: { default: 'column2' }, width: 70 }, // 库位状态:0.禁用,1.启用
             { field: 'create_time', formatter: 'formatDate', width: 100, sortable: true, title: '创建时间', showHeaderOverflow: true }, // 创建时间
             { field: 'update_time', formatter: 'formatDate', width: 100, sortable: true, title: '更新时间', showHeaderOverflow: true }, // 更新时间
 
diff --git a/src/pages/Middle/Mold/printTemplate/edit.vue b/src/pages/Middle/Mold/printTemplate/edit.vue
index 852cbe8..b4367e0 100644
--- a/src/pages/Middle/Mold/printTemplate/edit.vue
+++ b/src/pages/Middle/Mold/printTemplate/edit.vue
@@ -144,10 +144,10 @@ export default {
 };
 
 </script>
-<style>
+<style scoped>
 .page-body {
   background: white;
-  padding: 8px;
+  padding: 15px;
 }
 
 .formtabs .ant-tabs-tabpane {
diff --git a/src/services/Middle/Mes/MesStock/api.js b/src/services/Middle/Mes/MesStock/api.js
index e69de29..d0bee26 100644
--- a/src/services/Middle/Mes/MesStock/api.js
+++ b/src/services/Middle/Mes/MesStock/api.js
@@ -0,0 +1,38 @@
+const request = require('@/utils/request') // 导入请求方法
+const METHOD = request.METHOD
+const BASE_URL = process.env.VUE_APP_API_BASE_URL // 获取环境变量VUE_APP_API_BASE_URL
+
+module.exports = {
+    BASE_URL,
+    Settings: {url:`${BASE_URL}/MesStock/v1/settings/list`, method:METHOD.POST }, // 服务配置
+    SettingsUpdate: {url:`${BASE_URL}/MesStock/v1/settings/update`, method:METHOD.POST }, // 配置修改
+    LogList: {url:`${BASE_URL}/MesStock/v1/log/list`, method:METHOD.POST }, // 日志列表
+    LogDetail: {url:`${BASE_URL}/MesStock/v1/log/detail`, method:METHOD.POST }, // 日志详情
+    MesStockList: {url:`${BASE_URL}/MesStock/v1/mes/stock/list`, method:METHOD.POST }, // 库存列表
+    MesStockDetail: {url:`${BASE_URL}/MesStock/v1/mes/stock/detail`, method:METHOD.POST }, // 库存详情
+    MesStockCreate: {url:`${BASE_URL}/MesStock/v1/mes/stock/create`, method:METHOD.POST }, // 创建库存
+    MesStockUpdate: {url:`${BASE_URL}/MesStock/v1/mes/stock/update`, method:METHOD.POST }, // 更新库存
+    MesStockDelete: {url:`${BASE_URL}/MesStock/v1/mes/stock/detele`, method:METHOD.POST }, // 删除库存
+    MesStockBatchDelete: {url:`${BASE_URL}/MesStock/v1/mes/stock/batchDelete`, method:METHOD.POST }, // 批量删除库存
+    ProductStockOut: {url:`${BASE_URL}/MesStock/v1/product/stock/out`, method:METHOD.POST }, // 商品出库
+    ProductStockIn: {url:`${BASE_URL}/MesStock/v1/product/stock/in`, method:METHOD.POST }, // 商品入库
+    ProductStockBatchOut: {url:`${BASE_URL}/MesStock/v1/product/stock/batchOut`, method:METHOD.POST }, // 商品批量出库
+    ProductStockBatchIn: {url:`${BASE_URL}/MesStock/v1/product/stock/batchIn`, method:METHOD.POST }, // 商品批量入库
+    ProductStockLogList: {url:`${BASE_URL}/MesStock/v1/product/stock/log/list`, method:METHOD.POST }, // 商品出入库记录列表
+    ProductStockLogOutList: {url:`${BASE_URL}/MesStock/v1/product/stock/log/out/list`, method:METHOD.POST }, // 商品出库记录
+    ProductStockLogInList: {url:`${BASE_URL}/MesStock/v1/product/stock/log/in/list`, method:METHOD.POST }, // 商品入库记录
+    ProductStockLogDetail: {url:`${BASE_URL}/MesStock/v1/product/stock/log/detail`, method:METHOD.POST }, // 商品出入库记录详情
+    ProductStockLogCreate: {url:`${BASE_URL}/MesStock/v1/product/stock/log/create`, method:METHOD.POST }, // 创建商品出入库记录
+    ProductStockLogUpdate: {url:`${BASE_URL}/MesStock/v1/product/stock/log/update`, method:METHOD.POST }, // 更新商品出入库记录
+    ProductStockLogDelete: {url:`${BASE_URL}/MesStock/v1/product/stock/log/detele`, method:METHOD.POST }, // 删除商品出入库记录
+    ProductStockLogBatchDelete: {url:`${BASE_URL}/MesStock/v1/product/stock/log/batchDelete`, method:METHOD.POST }, // 批量删除商品出入库记录
+    MesStockPositionList: {url:`${BASE_URL}/MesStock/v1/mes/stock/position/list`, method:METHOD.POST }, // 仓位库存列表
+    MesStockPositionDetail: {url:`${BASE_URL}/MesStock/v1/mes/stock/position/detail`, method:METHOD.POST }, // 仓位库存详情
+    MesStockPositionCreate: {url:`${BASE_URL}/MesStock/v1/mes/stock/position/create`, method:METHOD.POST }, // 创建仓位库存
+    MesStockPositionUpdate: {url:`${BASE_URL}/MesStock/v1/mes/stock/position/update`, method:METHOD.POST }, // 更新仓位库存
+    MesStockPositionDelete: {url:`${BASE_URL}/MesStock/v1/mes/stock/position/detele`, method:METHOD.POST }, // 删除仓位库存
+    MesStockPositionBatchDelete: {url:`${BASE_URL}/MesStock/v1/mes/stock/position/batchDelete`, method:METHOD.POST }, // 批量删除仓位库存
+    MesStockPositionBatchUpdate: {url:`${BASE_URL}/MesStock/v1/mes/stock/position/batchUpdate`, method:METHOD.POST }, // 批量更新仓位库存
+    MesStockPositionBatchCreate: {url:`${BASE_URL}/MesStock/v1/mes/stock/position/batchCreate`, method:METHOD.POST }, // 批量创建仓位库存
+    MesStockPositionBatchHandle: {url:`${BASE_URL}/MesStock/v1/mes/stock/position/batchHandle`, method:METHOD.POST }, // 批量处理仓位库存
+}