Merge remote-tracking branch 'origin/dev_new' into dev_new

gaoluyang

昨天 1efd1857c521e55a1f7267a53fc2953d24886542

 src/pages.json

@@ -58,6 +58,20 @@
      }
    },
    {
      "path": "pages/sales/salesAccount/out",
      "style": {
        "navigationBarTitleText": "发货状态",
        "navigationStyle": "custom"
      }
    },
    {
      "path": "pages/sales/salesAccount/goOut",
      "style": {
        "navigationBarTitleText": "发货",
        "navigationStyle": "custom"
      }
    },
    {
      "path": "pages/sales/salesAccount/detail",
      "style": {
        "navigationBarTitleText": "修改台账",
@@ -275,6 +289,13 @@
      }
    },
    {
      "path": "pages/indexItem",
      "style": {
        "navigationBarTitleText": "考勤管理",
        "navigationStyle": "custom"
      }
    },
    {
      "path": "pages/cooperativeOffice/collaborativeApproval/index5",
      "style": {
        "navigationBarTitleText": "采购管理",
@@ -291,7 +312,7 @@
    {
      "path": "pages/cooperativeOffice/collaborativeApproval/index7",
      "style": {
        "navigationBarTitleText": "出库管理",
        "navigationBarTitleText": "发货审批",
        "navigationStyle": "custom"
      }
    },
@@ -373,6 +394,55 @@
      }
    },
    {
      "path": "pages/managementMeetings/knowledgeBase/index",
      "style": {
        "navigationBarTitleText": "知识库",
        "navigationStyle": "custom"
      }
    },
    {
      "path": "pages/managementMeetings/sealManagement/index",
      "style": {
        "navigationBarTitleText": "用印管理",
        "navigationStyle": "custom"
      }
    },
    {
      "path": "pages/managementMeetings/sealManagement/detail",
      "style": {
        "navigationBarTitleText": "用印详情",
        "navigationStyle": "custom"
      }
    },
    {
      "path": "pages/managementMeetings/rulesRegulationsManagement/index",
      "style": {
        "navigationBarTitleText": "规章制度管理",
        "navigationStyle": "custom"
      }
    },
    {
      "path": "pages/managementMeetings/rulesRegulationsManagement/detail",
      "style": {
        "navigationBarTitleText": "规章制度详情",
        "navigationStyle": "custom"
      }
    },
    {
      "path": "pages/managementMeetings/rulesRegulationsManagement/fileList",
      "style": {
        "navigationBarTitleText": "规章制度文件管理",
        "navigationStyle": "custom"
      }
    },
    {
      "path": "pages/managementMeetings/knowledgeBase/detail",
      "style": {
        "navigationBarTitleText": "知识库详情",
        "navigationStyle": "custom"
      }
    },
    {
      "path": "pages/cooperativeOffice/collaborativeApproval/detail",
      "style": {
        "navigationBarTitleText": "审批流程",
@@ -436,6 +506,13 @@
      }
    },
    {
      "path": "pages/equipmentManagement/runManagement/index",
      "style": {
        "navigationBarTitleText": "运行管理",
        "navigationStyle": "custom"
      }
    },
    {
      "path": "pages/equipmentManagement/repair/index",
      "style": {
        "navigationBarTitleText": "设备报修",
@@ -474,6 +551,13 @@
      "path": "pages/equipmentManagement/upkeep/maintain",
      "style": {
        "navigationBarTitleText": "维修保养",
        "navigationStyle": "custom"
      }
    },
    {
      "path": "pages/equipmentManagement/upkeep/fileList",
      "style": {
        "navigationBarTitleText": "保养文件管理",
        "navigationStyle": "custom"
      }
    },
@@ -582,6 +666,229 @@
      "style": {
        "navigationBarTitleText": "自定义出库",
        "navigationStyle": "custom"
      }
    },
    {
      "path": "pages/safeProduction/safeQualifications/index",
      "style": {
        "navigationBarTitleText": "规程与资质",
        "navigationStyle": "custom"
      }
    },
    {
      "path": "pages/safeProduction/safeQualifications/detail",
      "style": {
        "navigationBarTitleText": "规程资质详情",
        "navigationStyle": "custom"
      }
    },
    {
      "path": "pages/safeProduction/safeQualifications/view",
      "style": {
        "navigationBarTitleText": "规程资质详情",
        "navigationStyle": "custom"
      }
    },
    {
      "path": "pages/safeProduction/hazardSourceLedger/index",
      "style": {
        "navigationBarTitleText": "危险源台账",
        "navigationStyle": "custom"
      }
    },
    {
      "path": "pages/safeProduction/hazardSourceLedger/detail",
      "style": {
        "navigationBarTitleText": "危险源详情",
        "navigationStyle": "custom"
      }
    },
    {
      "path": "pages/safeProduction/hazardSourceLedger/view",
      "style": {
        "navigationBarTitleText": "危险源详情",
        "navigationStyle": "custom"
      }
    },
    {
      "path": "pages/safeProduction/accidentReportingRecord/index",
      "style": {
        "navigationBarTitleText": "事故报告记录",
        "navigationStyle": "custom"
      }
    },
    {
      "path": "pages/safeProduction/accidentReportingRecord/detail",
      "style": {
        "navigationBarTitleText": "事故报告详情",
        "navigationStyle": "custom"
      }
    },
    {
      "path": "pages/safeProduction/accidentReportingRecord/view",
      "style": {
        "navigationBarTitleText": "事故报告详情",
        "navigationStyle": "custom"
      }
    },
    {
      "path": "pages/cooperativeOffice/collaborativeApproval/index8",
      "style": {
        "navigationBarTitleText": "危险作业审批",
        "navigationStyle": "custom"
      }
    },
    {
      "path": "pages/safeProduction/dangerInvestigation/index",
      "style": {
        "navigationBarTitleText": "隐患排查上报",
        "navigationStyle": "custom"
      }
    },
    {
      "path": "pages/safeProduction/dangerInvestigation/detail",
      "style": {
        "navigationBarTitleText": "隐患上报详情",
        "navigationStyle": "custom"
      }
    },
    {
      "path": "pages/safeProduction/dangerInvestigation/view",
      "style": {
        "navigationBarTitleText": "隐患详情",
        "navigationStyle": "custom"
      }
    },
    {
      "path": "pages/safeProduction/dangerInvestigation/rectify",
      "style": {
        "navigationBarTitleText": "隐患整改",
        "navigationStyle": "custom"
      }
    },
    {
      "path": "pages/safeProduction/dangerInvestigation/acceptance",
      "style": {
        "navigationBarTitleText": "隐患验收",
        "navigationStyle": "custom"
      }
    },
    {
      "path": "pages/safeProduction/dangerInvestigation/fileList",
      "style": {
        "navigationBarTitleText": "隐患排查上报附件",
        "navigationStyle": "custom"
      }
    },
    {
      "path": "pages/safeProduction/hazardousMaterialsControl/index",
      "style": {
        "navigationBarTitleText": "危险物料管控",
        "navigationStyle": "custom"
      }
    },
    {
      "path": "pages/safeProduction/hazardousMaterialsControl/detail",
      "style": {
        "navigationBarTitleText": "危险物料详情",
        "navigationStyle": "custom"
      }
    },
    {
      "path": "pages/safeProduction/emergencyPlanReview/index",
      "style": {
        "navigationBarTitleText": "应急预案审核",
        "navigationStyle": "custom"
      }
    },
    {
      "path": "pages/safeProduction/emergencyPlanReview/detail",
      "style": {
        "navigationBarTitleText": "应急预案详情",
        "navigationStyle": "custom"
      }
    },
    {
      "path": "pages/safeProduction/emergencyPlanReview/view",
      "style": {
        "navigationBarTitleText": "应急预案详情",
        "navigationStyle": "custom"
      }
    },
    {
      "path": "pages/safeProduction/safetyTrainingAssessment/index",
      "style": {
        "navigationBarTitleText": "安全培训考核",
        "navigationStyle": "custom"
      }
    },
    {
      "path": "pages/safeProduction/safetyTrainingAssessment/detail",
      "style": {
        "navigationBarTitleText": "培训详情",
        "navigationStyle": "custom"
      }
    },
    {
      "path": "pages/safeProduction/safetyTrainingAssessment/view",
      "style": {
        "navigationBarTitleText": "培训详情",
        "navigationStyle": "custom"
      }
    },
    {
      "path": "pages/safeProduction/safetyTrainingAssessment/fileList",
      "style": {
        "navigationBarTitleText": "培训附件",
        "navigationStyle": "custom"
      }
    },
    {
      "path": "pages/safeProduction/safetyTrainingAssessment/resultDetail",
      "style": {
        "navigationBarTitleText": "结果明细",
        "navigationStyle": "custom"
      }
    },
    {
      "path": "pages/safeProduction/safetyTrainingAssessment/record",
      "style": {
        "navigationBarTitleText": "培训记录",
        "navigationStyle": "custom"
      }
    },
    {
      "path": "pages/humanResources/attendance/checkin",
      "style": {
        "navigationBarTitleText": "打卡签到",
        "navigationStyle": "custom"
      }
    },
    {
      "path": "pages/humanResources/attendance/report",
      "style": {
        "navigationBarTitleText": "考勤日报",
        "navigationStyle": "custom"
      }
    },
    {
      "path": "pages/humanResources/monthlyStatistics/index",
      "style": {
        "navigationBarTitleText": "薪资台账",
        "navigationStyle": "custom"
      }
    },
    {
      "path": "pages/humanResources/monthlyStatistics/detail",
      "style": {
        "navigationBarTitleText": "薪资台账详情",
        "navigationStyle": "custom"
      }
    },
    {
      "path": "pages/message",
      "style": {
        "navigationBarTitleText": "消息中心"
      }
    }
  ],
@@ -795,6 +1102,12 @@
        "text": "首页"
      },
      {
        "pagePath": "pages/message",
        "iconPath": "static/images/tabbar/work.png",
        "selectedIconPath": "static/images/tabbar/work_.png",
        "text": "消息"
      },
      {
        "pagePath": "pages/mine",
        "iconPath": "static/images/tabbar/mine.png",
        "selectedIconPath": "static/images/tabbar/mine_.png",