1

zrg

2025-10-31 73ebcc1465bd203e556a3157e8139fa916d14ba2

1

 pages.json

@@ -562,7 +562,6 @@
                "navigationBarTitleText": "下模单"
            }
        },
<<<<<<< .mine
        {
            "path": "pages/MJGL/mujudianjianjiludan/table",
            "style": {
@@ -570,7 +569,6 @@
                "enablePullDownRefresh": true
            }
        },
=======
        {
            "path": "pages/qitachukujiaoyan/qitachukujiaoyan",
            "style": {
@@ -578,7 +576,6 @@
                "enablePullDownRefresh": true
            }
        },
>>>>>>> .theirs
        {
            "path": "pages/MJGL/mujudianjianjiludan/form",
            "style": {
@@ -591,37 +588,28 @@
                "navigationBarTitleText": "模具保养记录子表"
            }
        },
<<<<<<< .mine
        {
            "path": "pages/MJGL/mujubaoyangjiludan/table",
            "style": {
                "navigationBarTitleText": "模具保养记录单",
                "enablePullDownRefresh": true
            }
        },
=======
        },
        {
        },{
            "path": "pages/shengchanbuliaojiaoyan/form",
            "style": {
                "navigationBarTitleText": "生产补料单校验"
            }
        },
>>>>>>> .theirs
        {
        },{
            "path": "pages/MJGL/mujubaoyangjiludan/form",
            "style": {
                "navigationBarTitleText": "模具保养记录单"
            }
        },
<<<<<<< .mine
        {
        },{
            "path": "pages/MJGL/mujubaoyangjiludan/table_son",
            "style": {
                "navigationBarTitleText": "模具保养记录子表"
            }
        },
        {
        },{
            "path": "pages/qitachukujiaoyan/qitachukujiaoyan",
            "style": {
                "navigationBarTitleText": "其他出库校验",
@@ -751,7 +739,6 @@
            "style": {
                "navigationBarTitleText": "生产入库单"
            }
=======
        },
        {
            "path": "pages/xiaoshouchukujiaoyan/form",
@@ -870,8 +857,7 @@
                "navigationBarTitleText": "其他入库",
                "enablePullDownRefresh": true
            }
        },
        {
        },{
            "path": "pages/qitaruku_v2/form",
            "style": {
                "navigationBarTitleText": "其他入库单"
@@ -888,7 +874,7 @@
            "path": "pages/qitachuku_v2/form",
            "style": {
                "navigationBarTitleText": "其他出库单"
>>>>>>> .theirs
            }
        },
        {
            "path": "pages/shengchanbuliao/table",
@@ -896,13 +882,8 @@
                "navigationBarTitleText": "生产补料",
                "enablePullDownRefresh": true
            }
<<<<<<< .mine
        },
        {
=======
        },
        {
>>>>>>> .theirs
            "path": "pages/shengchanbuliao/form",
            "style": {
                "navigationBarTitleText": "生产补料单"
@@ -926,7 +907,6 @@
            "style": {
                "navigationBarTitleText": "其他出库",
                "enablePullDownRefresh": true
<<<<<<< .mine
            }
        },
        {
@@ -934,15 +914,12 @@
            "style": {
                "navigationBarTitleText": "其他出库单"
            }
=======
        },
        {
            "path": "pages/tiaomaguanli/table",
            "style": {
                "navigationBarTitleText": "条码管理"
            }
        },
>>>>>>> .theirs
        }, {
            "path": "pages/weiwairuku/table",
            "style": {
@@ -980,11 +957,11 @@
            "style": {
                "navigationBarTitleText": "条码管理"
            }
        },
        {
            "path": "pages/tiaomaguanli/table_son",
        },{
            "path": "pages/weiwairuku/table",
            "style": {
                "navigationBarTitleText": "条码生成"
                "navigationBarTitleText": "委外入库",
                "enablePullDownRefresh": true
            }
        },
        {
@@ -994,7 +971,6 @@
                "enablePullDownRefresh": true
            }
        },
<<<<<<< .mine
        {
            "path": "pages/quyangdan/form",
            "style": {
@@ -1096,147 +1072,4 @@
        "pageOrientation": "default"
    },
    "uniIdRouter": {}




















=======
            }
        },
        {
            "path" : "pages/zutuosaoma/table",
            "style" : 
            {
                "navigationBarTitleText" : "组托扫码缓存"
            }
        },
        {
            "path" : "pages/chaituosaoma/form",
            "style" : 
            {
                "navigationBarTitleText" : "拆托扫码"
            }
        },
        {
            "path" : "pages/shengchantuiliao/table",
            "style" : 
            {
                "navigationBarTitleText" : "生产退料"
            }
        },
        {
            "path" : "pages/shengchantuiliao/form",
            "style" : 
            {
                "navigationBarTitleText" : "生产退料单"
            }
        },
        {
            "path" : "pages/weixiujilu/table",
            "style" : 
            {
                "navigationBarTitleText" : "维修记录",
                "enablePullDownRefresh": true
            }
        },
        {
            "path" : "pages/weixiujilu/form",
            "style" : 
            {
                "navigationBarTitleText" : "维修记录单"
            }
        },
        {
            "path" : "pages/qijvguzhangdengji/table",
            "style" : 
            {
                "navigationBarTitleText" : "器具故障登记"
               
            }
        },
        {
            "path" : "pages/qijvguzhangdengji/form",
            "style" : 
            {
                "navigationBarTitleText" : "器具故障登记单"
            }
        },
        {
            "path": "pages/jishikucunchaxun/table",
            "style" :
            {
                "navigationBarTitleText" : "ERP即时库存查询"
            }
        },
        {
            "path" : "pages/ZLGL/shoujianjianyan/table",
            "style" : 
            {
                "navigationBarTitleText" : "首件检验单维护"
            }
        },
        {
            "path" : "pages/ZLGL/shoujianjianyan/form",
            "style" : 
            {
                "navigationBarTitleText" : "首件检验单"
            }
        }
    ],
    "tabBar": {
        "color": "#888888", //tab 上的文字默认颜色，仅支持十六进制颜色
        "selectedColor": "#2d7dee", //tab 上的文字选中时的颜色，仅支持十六进制颜色
        "borderStyle": "black", //tabbar上边框的颜色， 仅支持 black / white
        "backgroundColor": "#ffffff", //tab 的背景色，仅支持十六进制颜色
        "list": [{
                "pagePath": "pages/index/index",
                "iconPath": "static/tabBar/home.png",
                "selectedIconPath": "static/tabBar/home-default.png",
                "text": "仓储管理"
            },
            {
                "pagePath": "pages/index/tab1",
                "iconPath": "static/tabBar/icon1.png",
                "selectedIconPath": "static/tabBar/icon1-default.png",
                "text": "车间工序"
            },
            {
                "pagePath": "pages/index/tab2",
                "iconPath": "static/tabBar/icon2.png",
                "selectedIconPath": "static/tabBar/icon2-default.png",
                "text": "单据列表"
            },
            {
                "pagePath": "pages/index/mine",
                "iconPath": "static/tabBar/user.png",
                "selectedIconPath": "static/tabBar/user-default.png",
                "text": "我的"
            }
        ]
    },
    "globalStyle": {
        "navigationBarTextStyle": "white",
        "navigationBarTitleText": "设备管理",
        "navigationBarBackgroundColor": "#3A78FF",
        "backgroundColor": "#F8F8F8",
        "pageOrientation": "default"
    },
    "uniIdRouter": {}
>>>>>>> .theirs
}

 pages/index/tab2.vue

@@ -273,8 +273,6 @@
                    id: 34,
                    hidden: false,
                },
				
                // 上模下模（hidden为true，放最后）
                {
                    img: '../../static/icon/icon13.png',
                    text: '上模单',