diff --git a/src/pages/Middle/Mold/MoldOrder/Edit.vue b/src/pages/Middle/Mold/MoldOrder/Edit.vue
index 997af37..edfadd2 100644
--- a/src/pages/Middle/Mold/MoldOrder/Edit.vue
+++ b/src/pages/Middle/Mold/MoldOrder/Edit.vue
@@ -215,7 +215,7 @@ export default {
this.formOptions.data = this.$mk.formatDetailData({ data: a.data[this.detailDataFieldName],rules:this.formOptions.items });
-
+ console.log(this.formOptions.data)
this.detailsData = JSON.parse(JSON.stringify(a.data[this.detailDataFieldName].order_molds || []));
this.detailsDataInit();
diff --git a/src/pages/Middle/Mold/MoldProductionOrder/Edit.vue b/src/pages/Middle/Mold/MoldProductionOrder/Edit.vue
index 6339f6f..180efe2 100644
--- a/src/pages/Middle/Mold/MoldProductionOrder/Edit.vue
+++ b/src/pages/Middle/Mold/MoldProductionOrder/Edit.vue
@@ -39,9 +39,8 @@
:edit-render="{ name: '$input', props: { type: 'date' } }">
-
-
-
-
-
-
-
@@ -107,26 +103,22 @@
-
-
-
-
-
-
@@ -149,7 +141,7 @@
-
+
+
+
diff --git a/src/pages/Middle/Mold/Touch/index.vue b/src/pages/Middle/Mold/Touch/index.vue
new file mode 100644
index 0000000..40be1e9
--- /dev/null
+++ b/src/pages/Middle/Mold/Touch/index.vue
@@ -0,0 +1,41 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/router/async/base.map.js b/src/router/async/base.map.js
index d400b4e..8f2ce01 100644
--- a/src/router/async/base.map.js
+++ b/src/router/async/base.map.js
@@ -138,6 +138,22 @@ const view = {
path: '/touch/mesreporting',
component: () => import('@/pages/Middle/Mes/MesReporting/MesReporting')
},
+ TouchMoldHome : {
+ name: '触摸屏首页',
+ path: '/touch/moldhome',
+ component: () => import('@/pages/Middle/Mold/Touch/index')
+ },
+ TouchMoldReporting : {
+ name: '报工',
+ path: '/touch/moldreporting',
+ component: () => import('@/pages/Middle/Mold/Touch/Reporting')
+ },
+ TouchMoldSend : {
+ name: '发料',
+ path: '/touch/moldsend',
+ component: () => import('@/pages/Middle/Mold/Touch/Reporting')
+ },
+
exp403: {
authority: '*',
name: 'exp403',
diff --git a/src/router/index.js b/src/router/index.js
index 253d4fe..494a82d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -45,7 +45,21 @@ if (Authorization != null) {
// console.log("=================touchRoute:"+[touchRoute,routesConfig])
loadRoutes([touchRoute,routesConfig]) // 加载路由
- }else{
+ }
+ else if(process.env.VUE_APP_BEID == 5){
+ let touchRoute = {
+ router: "touch",
+ children:[
+ {router:'TouchMoldHome'},
+ {router:'TouchMoldReporting'},
+ {router:'TouchMoldSend'},
+ ]
+ };
+
+ // console.log("=================touchRoute:"+[touchRoute,routesConfig])
+ loadRoutes([touchRoute,routesConfig]) // 加载路由
+ }
+ else{
// console.log("=================touchRoute:"+[routesConfig])
loadRoutes([routesConfig]) // 加载路由
}