浏览代码

工序档案

陈龙 11 月之前
父节点
当前提交
a02157bcde

+ 21 - 0
source/OumanMESUni/pages.json

@@ -21,6 +21,27 @@
             "style": {
                 "navigationBarTitleText": "服务器设置"
             }
+        },
+        {
+            "path" : "pages/loborQuota/index",
+            "style" : 
+            {
+                "navigationBarTitleText" : "人工定额管理"
+            }
+        },
+        {
+            "path" : "pages/process/index",
+            "style" : 
+            {
+                "navigationBarTitleText" : "工序档案"
+            }
+        },
+        {
+            "path" : "pages/process/insert",
+            "style" : 
+            {
+                "navigationBarTitleText" : "新增工序档案"
+            }
         }
     ],
     "globalStyle": {

+ 45 - 26
source/OumanMESUni/pages/home/index.vue

@@ -1,52 +1,71 @@
 <template>
-	<view class="content">
-		<view class="card">
+    <view class="content">
+        <view class="card">
             <view class="card-item" v-for="(item, index) in menus" :key="index" @tap="openPage(item.url)">
-                <view>{{item.text}}</view>
+                <uni-icons :type="item.icon" size="40" color="rgb(50, 50, 50)"></uni-icons>
+                <view class="card-item-text">{{item.text}}</view>
             </view>
         </view>
-	</view>
+    </view>
 </template>
 
 <script>
     import token from '../../utils/token.js';
     import pages from '../../utils/pages.js';
-    
-	export default {
-		data() {
-			return {
-				isLogin: false,
+
+    export default {
+        data() {
+            return {
+                isLogin: false,
                 menus: []
-			}
-		},
-		onLoad() {
+            }
+        },
+        onLoad() {
             if (token.has()) {
                 this.isLogin = true;
             }
             this.menus = pages.pages;
-		},
-		methods: {
+        },
+        methods: {
             openPage(url) {
                 uni.navigateTo({
                     url: url
                 });
             }
-		}
-	}
+        }
+    }
 </script>
 
 <style lang="scss">
-	.content {
-		display: flex;
-        flex-wrap: wrap;
-        
+    page {
+        background-color: rgb(235, 235, 235);
+    }
+    .content {
         .card {
             position: relative;
             display: flex;
-            width: 200upx;
-            height: 200upx;
-            justify-content: center;
-            align-items: center;
+            flex-wrap: wrap;
+            justify-content: flex-start;
+            box-sizing: border-box;
+            padding: 10upx;
+
+            .card-item {
+                position: relative;
+                display: flex;
+                width: calc(33.3% - 20upx);
+                height: 200upx;
+                flex-direction: column;
+                justify-content: center;
+                align-items: center;
+                margin: 10upx;
+                color: rgb(50, 50, 50);
+                border: 2upx solid rgb(230, 230, 230);
+                background-color: rgb(245, 245, 245);
+                
+                .card-item-text {
+                    margin-top: 15upx;
+                }
+            }
         }
-	}
-</style>
+    }
+</style>

+ 47 - 0
source/OumanMESUni/pages/loborQuota/index.vue

@@ -0,0 +1,47 @@
+<template>
+    <view>
+
+    </view>
+</template>
+
+<script>
+    import Request from '../../utils/request';
+    import Api from '../../utils/api';
+
+    export default {
+        data() {
+            return {
+                searchParams: {
+                    pageIndex: 1,
+                    pageSize: 20,
+                    sort: '',
+                    order: '',
+                    inventoryText: '',
+                },
+                list: [],
+                totalCount: 0
+            };
+        },
+        async onLoad() {
+            await this.search();
+        },
+        methods: {
+            async search() {
+                let res = await Request.sendToken({
+                    url: Api.LaborQuota.Search.url,
+                    method: Api.LaborQuota.Search.method,
+                    data: this.searchParams
+                });
+                if (res.success) {
+                    console.log(res.data);
+                    this.list = res.data.list;
+                    this.totalCount = res.data.totalCount;
+                }
+            }
+        }
+    }
+</script>
+
+<style lang="scss">
+
+</style>

+ 73 - 0
source/OumanMESUni/pages/process/index.vue

@@ -0,0 +1,73 @@
+<template>
+    <view class="page">
+        <uni-search-bar v-model="searchParams.searchText" @confirm="search"></uni-search-bar>
+        <view class="tools justify-end">
+            <button class="button" type="primary" size="mini" @tap="openInsert">新增</button>
+        </view>
+        <view class="content">
+            <uni-table>
+                <uni-tr>
+                    <uni-th>1</uni-th>
+                    <uni-th>2</uni-th>
+                </uni-tr>
+                <uni-tr>
+                    <uni-td>1</uni-td>
+                    <uni-td>2</uni-td>
+                </uni-tr>
+            </uni-table>
+        </view>
+        <view class="tools">
+            <button type="primary" size="mini">1</button>
+        </view>
+    </view>
+</template>
+
+<script>
+    import Request from '../../utils/request';
+    import Api from '../../utils/api';
+    import pages from '../../utils/pages';
+
+    export default {
+        data() {
+            return {
+                searchParams: {
+                    searchText: '',
+                    workshopSectionId: 0,
+                    opened: true
+                },
+                list: []
+            };
+        },
+        async onLoad() {
+            await this.search();
+        },
+        methods: {
+            async search() {
+                let res = await Request.sendToken({
+                    url: Api.Process.Search.url,
+                    method: Api.LaborQuota.Search.method,
+                    data: this.searchParams
+                });
+                if (res.success) {
+                    console.log(res.data);
+                    this.list = res.data;
+                }
+            },
+            
+            openInsert(){
+                uni.navigateTo({
+                    url: pages.process.insert
+                });
+            }
+        }
+    }
+</script>
+
+<style lang="scss">
+    .content {
+        position: relative;
+        display: flex;
+        height: 100%;
+        flex-direction: column;
+    }
+</style>

+ 19 - 0
source/OumanMESUni/pages/process/insert.vue

@@ -0,0 +1,19 @@
+<template>
+    <view>
+        
+    </view>
+</template>
+
+<script>
+    export default {
+        data() {
+            return {
+                
+            };
+        }
+    }
+</script>
+
+<style lang="scss">
+
+</style>

+ 24 - 0
source/OumanMESUni/styles/main.css

@@ -5,10 +5,18 @@ navigator {
 
 .page {
     position: relative;
+    display: flex;
+    flex-direction: column;
     height: 100%;
     box-sizing: border-box;
 }
 
+.content {
+    position: relative;
+    flex-grow: 1;
+    overflow: auto;
+}
+
 .width-0 {
     width: 0;
 }
@@ -299,4 +307,20 @@ navigator {
     align-items: center;
     padding-left: 10upx;
     padding-right: 10upx;
+}
+
+/* 工具栏 */
+.tools {
+    position: relative;
+    display: flex;
+    align-items: center;
+    flex-wrap: wrap;
+    gap: 10upx;
+    flex-shrink: 0;
+    padding: 10upx;
+}
+
+.button {
+    margin-left: 0;
+    margin-right: 0;
 }

+ 0 - 5
source/OumanMESUni/uni.scss

@@ -78,9 +78,4 @@ $uni-font-size-paragraph:15px;
 /* 状态栏 */
 .status-bar-height {
     height: var(--status-bar-height);
-}
-
-uni-button {
-    margin-left: 0;
-    margin-right: 0;
 }

+ 2 - 2
source/OumanMESUni/utils/api.js

@@ -1,7 +1,7 @@
 /**
  * API 接口
  */
-const api = {
+const Api = {
     /**
      * 人工定额管理
      */
@@ -294,4 +294,4 @@ const api = {
     }
 };
 
-export default api;
+export default Api;

+ 25 - 4
source/OumanMESUni/utils/pages.js

@@ -9,7 +9,7 @@ class Pages {
         /**
          * 人工定额管理首页
          */
-        index: 'pages/LoborQuota/Index'
+        index: '/pages/loborQuota/index'
     }
 
     /**
@@ -19,7 +19,22 @@ class Pages {
         /**
          * 定额调整单首页
          */
-        index: 'pages/LoborQuotaOrder/Index'
+        index: '/pages/loborQuotaOrder/index'
+    }
+
+    /**
+     * 工序档案
+     */
+    process = {
+        /**
+         * 工序档案首页
+         */
+        index: '/pages/process/index',
+        
+        /**
+         * 新增工序档案
+         */
+        insert: '/pages/process/insert'
     }
 
     /**
@@ -28,10 +43,16 @@ class Pages {
     get pages() {
         let list = [{
             text: '人工定额管理',
-            url: this.loborQuota.index
+            url: this.loborQuota.index,
+            icon: 'calendar'
         }, {
             text: '定额调整单',
-            url: this.loborQuotaOrder.index
+            url: this.loborQuotaOrder.index,
+            icon: 'compose'
+        }, {
+            text: '工序档案',
+            url: this.process.index,
+            icon: 'color'
         }];
         return list;
     }