Merge branch 'dev' of http://94.191.100.41/tfmom/tf-mom-web into dev

applications/dee-mes/src/privateComponents/components/MBOMConfig/unit.vue

@@ -213,6 +213,28 @@ export default {
       }
       var zoomConfig = {
         levels: [
+          [
+            {
+              unit: 'month',
+              // step: 1,
+              format: function(date) {
+                var month =
+                  (new Date(date).getFullYear() - 2007) * 12 +
+                  new Date(date).getMonth() +
+                  1
+                return month + '月' // ganttAg.date.getWeek(date)
+              }
+            },
+            {
+              unit: 'week',
+              format: function(date) {
+                var newDate = new Date(date)
+                var oldDate = new Date('2007/01/01')
+                var days = (newDate - oldDate) / (1 * 24 * 60 * 60 * 7 * 1000)
+                return Math.ceil(days + 1) + '周' // ganttAss.date.getWeek(date)
+              }
+            }
+          ],
           [
             {
               unit: 'week',
@@ -247,29 +269,6 @@ export default {
               unit: 'hour',
               format: '%H'
             }
-          ],
-
-          [
-            {
-              unit: 'month',
-              // step: 1,
-              format: function(date) {
-                var month =
-                  (new Date(date).getFullYear() - 2007) * 12 +
-                  new Date(date).getMonth() +
-                  1
-                return month + '月' // ganttAg.date.getWeek(date)
-              }
-            },
-            {
-              unit: 'week',
-              format: function(date) {
-                var newDate = new Date(date)
-                var oldDate = new Date('2007/01/01')
-                var days = (newDate - oldDate) / (1 * 24 * 60 * 60 * 7 * 1000)
-                return Math.ceil(days + 1) + '周' // ganttAss.date.getWeek(date)
-              }
-            }
           ]
         ],
         startDate: new Date('2007/01/01'),

applications/dee-mes/src/views/assemblyPlanManagement/instructionsIssued/index.vue

@@ -461,12 +461,12 @@ export default {
       this.searchFormData.aoName = ''
       this.searchFormData.actualEnd = ''
       this.activeName = tab.index
+      this.groupPage = 1
+      this.groupTotal = 0
+      this.groupDropList = []
+      this.getGroupList()
       if (this.activeName === '1') {
         this.defaultPercent = 100
-        this.groupPage = 1
-        this.groupTotal = 0
-        this.groupDropList = []
-        this.getGroupList()
       } else {
         this.defaultPercent = 80
       }