productDev/dmMes.git

			@@ -1,6 +1,5 @@
			{
			"pages": [
			{
			"pages": [{
			"path": "pages/workbench/workbench",
			"style": {
			"navigationBarTitleText": "工作台",
			@@ -53,85 +52,67 @@
			"enablePullDownRefresh": false
			}

			}, {
			"path": "pages/plannedProgress/plannedProgress",
			"style": {
			"navigationBarTitleText": "计划进度",
			"enablePullDownRefresh": false
			}

			}, {
			"path": "pages/planDetails/planDetails",
			"style": {
			"navigationBarTitleText": "计划详情",
			"enablePullDownRefresh": false
			}

			}, {
			"path": "pages/plannedDistribution/plannedDistribution",
			"style": {
			"navigationBarTitleText": "计划分配",
			"enablePullDownRefresh": false
			}

			}, {
			"path": "pages/allocation/allocation",
			"style": {
			"navigationBarTitleText": "选择",
			"enablePullDownRefresh": false
			}

			}, {
			"path": "pages/inspectComplete/inspectComplete",
			"style": {
			"navigationBarTitleText": "完工检",
			"enablePullDownRefresh": false
			}

			}, {
			"path": "pages/selectWorkOrder/selectWorkOrder",
			"style": {
			"navigationBarTitleText": "选择工单",
			"enablePullDownRefresh": false
			}

			}, {
			"path": "pages/inspectPatrol/inspectPatrol",
			"style": {
			"navigationBarTitleText": "巡检",
			"enablePullDownRefresh": false
			}

			}, {
			"path": "pages/linePatrol/linePatrol",
			"style": {
			"navigationBarTitleText": "巡线",
			"enablePullDownRefresh": false
			}

			}
			,{
			"path" : "pages/plannedProgress/plannedProgress",
			"style" :
			{
			"navigationBarTitleText": "计划进度",
			"enablePullDownRefresh": false
			}

			}
			,{
			"path" : "pages/planDetails/planDetails",
			"style" :
			{
			"navigationBarTitleText": "计划详情",
			"enablePullDownRefresh": false
			}

			}
			,{
			"path" : "pages/plannedDistribution/plannedDistribution",
			"style" :
			{
			"navigationBarTitleText": "计划分配",
			"enablePullDownRefresh": false
			}

			}
			,{
			"path" : "pages/allocation/allocation",
			"style" :
			{
			"navigationBarTitleText": "选择",
			"enablePullDownRefresh": false
			}

			}
			,{
			"path" : "pages/inspectComplete/inspectComplete",
			"style" :
			{
			"navigationBarTitleText": "完工检",
			"enablePullDownRefresh": false
			}

			}
			,{
			"path" : "pages/selectWorkOrder/selectWorkOrder",
			"style" :
			{
			"navigationBarTitleText": "选择工单",
			"enablePullDownRefresh": false
			}

			}
			,{
			"path" : "pages/inspectPatrol/inspectPatrol",
			"style" :
			{
			"navigationBarTitleText": "巡检",
			"enablePullDownRefresh": false
			}

			}
			,{
			"path" : "pages/linePatrol/linePatrol",
			"style" :
			{
			"navigationBarTitleText": "巡线",
			"enablePullDownRefresh": false
			}

			}
			],
			"subPackages": [
			{
			],
			"subPackages": [{
			"root": "pages_adjust",
			"pages": [
			{
			"pages": [{
			"path": "pages/newOutbound/newOutbound",
			"style": {
			"navigationBarTitleText": "新建出库",
			@@ -146,6 +127,7 @@
			}
			},
			{
			<<<<<<< HEAD
			"path": "pages/newTransfer/newTransfer",
			"style": {
			"navigationBarTitleText": "新建转库",
			@@ -172,6 +154,27 @@
			"navigationBarTitleText": "工单报工",
			"enablePullDownRefresh": false
			}
			=======
			"path": "pages/manualFeed/manualFeed",
			"style": {
			"navigationBarTitleText": "手动投料",
			"enablePullDownRefresh": false
			}
			},
			{
			"path": "pages/OrderDetail/OrderDetail",
			"style": {
			"navigationBarTitleText": "工单详情",
			"enablePullDownRefresh": false
			}
			},
			{
			"path": "pages/workOrderReporting/workOrderReporting",
			"style": {
			"navigationBarTitleText": "工单报工",
			"enablePullDownRefresh": false
			}
			>>>>>>> a52f13d719ee9cd53f129f4c59dcad783977fce9
			},
			{
			"path": "pages/transferList/transferList",
			@@ -226,20 +229,19 @@
			},
			{
			"root": "pages_inspect",
			"pages": [
			{
			"path": "pages/InspectionRecords/InspectionRecords",
			"style": {
			"navigationBarTitleText": "检验记录",
			"enablePullDownRefresh": false
			}
			"pages": [{
			"path": "pages/InspectionRecords/InspectionRecords",
			"style": {
			"navigationBarTitleText": "检验记录",
			"enablePullDownRefresh": false
			}
			},
			{
			"path": "pages/InspectionDetails/InspectionDetails",
			"style": {
			"navigationBarTitleText": "检验详情",
			"enablePullDownRefresh": false
			}
			"path": "pages/InspectionDetails/InspectionDetails",
			"style": {
			"navigationBarTitleText": "检验详情",
			"enablePullDownRefresh": false
			}
			}
			]
			}