样式

src/views/ManufacturingCenter/InitialProduction/index.vue

@@ -340,10 +340,7 @@
 <script>
 import { getEntryNameValue, getToolNum, getNum, getTable, production, getTable1, revisionBatch, editList, dele, production2, edit } from '@/api/ManufacturingCenter/InitialProduction'
 import { mapGetters } from 'vuex'
-<<<<<<< HEAD
-=======
 import Cookie from 'js-cookie'
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
 
 export default {
   data() {
@@ -440,10 +437,6 @@ export default {
       'id'
     ])
   },
-<<<<<<< HEAD
-  created() {
-    this.typeChange()
-=======
   watch: {
     // 如果路由有变化，会再次执行该方法
     '$route': {
@@ -457,7 +450,6 @@ export default {
   },
   created() {
     // this.typeChange()
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
     this.getCurrentTime()
     this.getNowTime()
   },
@@ -528,19 +520,6 @@ export default {
       })
     },
     typeChange() {
-<<<<<<< HEAD
-      this.NumValue = ''
-      this.Num = []
-      getToolNum().then(response => {
-        for (let i = 0; i < response.data.length; i++) {
-          this.toolNum.push({
-            label: response.data[i].机床图号,
-            value: response.data[i].机床流水号,
-            value2: response.data[i].项目名称
-          })
-        }
-      })
-=======
       if (Cookie.get('machineValue') !== undefined) {
         this.toolNumValue = ''
         this.NumValue = ''
@@ -575,7 +554,6 @@ export default {
           }
         })
       }
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
     },
     typeChange1() {
       this.NumValue = ''