样式

src/views/ManufacturingCenter/PartAssignment/index.vue

@@ -557,10 +557,7 @@
 <script>
 import { initProject, searchgroup, searchTable, searchPart, searchPart1, searchTable1, addData, editData, deleteData, searchDetailed, searchDetailed1, purchaseRequisition, purchaseRequisition1, purchaseRequisition2, MoveOut, MoveOut1, PurchasingDepartment, Production, PartCallbackInformation, PartCallbackInformation1, submit, submit1, Delete, Delete1, editStock, editNum } from '@/api/ManufacturingCenter/PartAssignment'
 import { mapGetters } from 'vuex'
-<<<<<<< HEAD
-=======
 import Cookie from 'js-cookie'
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
 export default {
   inject: ['reload'],
   data() {
@@ -650,8 +647,6 @@ export default {
       'id'
     ])
   },
-<<<<<<< HEAD
-=======
   watch: {
     // 如果路由有变化，会再次执行该方法
     '$route': {
@@ -663,45 +658,11 @@ export default {
       }
     }
   },
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
   created() {
     this.fetchData()
   },
   methods: {
     fetchData() {
-<<<<<<< HEAD
-      initProject().then(response => {
-        for (let i = 0; i < response.data.length; i++) {
-          this.machineNumber.push({
-            label: response.data[i].机床图号,
-            name: response.data[i].项目名称,
-            value: response.data[i].机床流水号
-          })
-        }
-      })
-      PartCallbackInformation().then(response => {
-        for (let i = 0; i < response.data.length; i++) {
-          if (response.data[i].退回时间 !== '') {
-            response.data[i].退回时间 = (response.data[i].退回时间).split(' ')[0]
-          }
-          if (response.data[i].是否确认 === 0) {
-            this.value += 1
-          }
-        }
-        this.tableData9 = response.data
-      })
-      PartCallbackInformation1().then(response => {
-        for (let i = 0; i < response.data.length; i++) {
-          if (response.data[i].退回时间 !== '') {
-            response.data[i].退回时间 = (response.data[i].退回时间).split(' ')[0]
-          }
-          if (response.data[i].是否确认 === 0) {
-            this.value1 += 1
-          }
-        }
-        this.tableData10 = response.data
-      })
-=======
       if (Cookie.get('machineValue') !== undefined) {
         this.machineNumber = []
         initProject().then(response => {
@@ -757,7 +718,6 @@ export default {
           this.tableData10 = response.data
         })
       }
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
     },
     PartCallbackInformation() {
       this.dialogFormVisible1 = true