11.23

src/main/vue/src/entries/admin.js

@@ -167,9 +167,9 @@ Vue.mixin({
 });
 
 //serviceName, methodName, params,返回类型:list/json,tableKey:默认牛号,日期转换格式:YYYY-MM-DD
-Vue.prototype.getHaleInfo = function(serviceName, methodName, params, type, key, dateType) {
+Vue.prototype.getHaleInfo = function(serviceName, methodName, params, type, newkey, dateType) {
+    console.log(newkey)
     return new Promise((resolve, reject) => {
-
         var data = {
             "serviceName": serviceName,
             "methodName": methodName,
@@ -187,8 +187,12 @@ Vue.prototype.getHaleInfo = function(serviceName, methodName, params, type, key,
             } else if (type == 'list') {
                 //list处理
 
+                var useKey = '牛号'
+                if (newkey) {
+                    useKey = newkey
+                }
 
-                if (res.data.data[key ? key : '牛号']) {
+                if (res.data.data[useKey]) {
                     list.push(res.data.data)
                 } else {
                     list = res.data.data
@@ -217,7 +221,6 @@ Vue.prototype.getHaleInfo = function(serviceName, methodName, params, type, key,
                         jsonp[key] = format(new Date(jsonp[key]), dateType ? dateType : 'YYYY-MM-DD HH:mm:ss', { locale: zh })
                     }
                 }
-                console.log(jsonp)
                 resolve(jsonp)
             }
 

src/main/vue/src/pages/Menus.vue

@@ -81,7 +81,7 @@ export default {
                 name: '',
                 href: '',
                 icon: '',
-                handheld: '',
+                handheld: 'N',
             },
             icon: '',
             roleShow: false,
@@ -101,7 +101,7 @@ export default {
                 name: '',
                 href: '',
                 icon: 'bars',
-                handheld: '',
+                handheld: 'N',
             };
             this.icon = 'bars';
             if (this.menus && this.menus.length > 0) {
@@ -120,7 +120,7 @@ export default {
                 name: '',
                 href: '',
                 icon: null,
-                handheld: '',
+                handheld: 'N',
             };
             this.icon = '';
             if (node.childNodes && node.childNodes.length > 0) {

src/main/vue/src/router/index.js

@@ -455,6 +455,26 @@ const router = new Router({
                         type: '手持机录入',
                         title: '奶牛转舍'
                     }
+                },
+                {
+                    path: '/handleCalving',
+                    name: 'handleCalving',
+                    component: () =>
+                        import ('../pages/HandleCalving'),
+                    meta: {
+                        type: '手持机录入',
+                        title: '产犊登记'
+                    }
+                },
+                {
+                    path: '/handleCalf',
+                    name: 'handleCalf',
+                    component: () =>
+                        import ('../pages/HandleCalf'),
+                    meta: {
+                        type: '手持机录入',
+                        title: '犊牛登记'
+                    }
                 }
             ]
         },