样式

src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue

@@ -1,8 +1,6 @@
 <template>
   <div>
     <el-card>
-<<<<<<< HEAD
-=======
       <span>机床号:</span>
       <el-select v-model="Machine" filterable clearable size="small" style="margin-top:10px;width: 220px" placeholder="机床号" @change="getGroup()">
         <el-option
@@ -22,7 +20,6 @@
           :label="item.label"
           :value="item.value"/>
       </el-select>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       <span>零件图号:</span>
       <el-input v-model="partName" placeholder="零件图号" size="small" clearable style="width:200px"/>
       <el-button size="small" icon="el-icon-search" type="success" style="margin-left: 10px" @click="pageSize=10; pageCurrent=1;searchTable()">查询</el-button>
@@ -113,13 +110,6 @@
 </template>
 
 <script>
-<<<<<<< HEAD
-import { searchtable, searchtable2, searchtable3, change2, change3, edit } from '@/api/ManufacturingCenter/MaterialArrivalManagement'
-import { mapGetters } from 'vuex'
-export default {
-  data() {
-    return {
-=======
 import { getMachines, getGroups, searchtable, searchtable2, searchtable3, change2, change3, edit } from '@/api/ManufacturingCenter/MaterialArrivalManagement'
 import { mapGetters } from 'vuex'
 import Cookie from 'js-cookie'
@@ -131,7 +121,6 @@ export default {
       Machines: [],
       Group: '',
       Groups: [],
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       arrest2: [],
       editTime: '',
       bianliang1: [],
@@ -163,12 +152,6 @@ export default {
       'userId'
     ])
   },
-<<<<<<< HEAD
-  created() {
-    this.searchTable()
-    this.searchTable2()
-  },
-=======
   watch: {
     // 如果路由有变化，会再次执行该方法
     '$route': {
@@ -184,7 +167,6 @@ export default {
   //   this.searchTable()
   //   this.searchTable2()
   // },
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
   methods: {
     handleSelectionChange2(val) {
       this.arrest2 = val
@@ -204,8 +186,6 @@ export default {
         })
       }
     },
-<<<<<<< HEAD
-=======
     getMachine() {
       if (Cookie.get('machineValue') !== undefined) {
         this.Machine = ''
@@ -258,25 +238,15 @@ export default {
         }
       })
     },
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
     // 查询表格数据
     searchTable() {
       this.loading = true
       this.tableData = []
       this.Data = []
-<<<<<<< HEAD
-      if (this.partName !== '' && this.partName !== null) {
-        this.partNamecheck = true
-      } else {
-        this.partNamecheck = false
-      }
-      searchtable(this.partNamecheck, this.partName, 0, this.pageCurrent, this.pageSize).then(response => {
-=======
       if (this.Machine) { this.Machinecheck = true } else { this.Machinecheck = false }
       if (this.Group) { this.Groupcheck = true } else { this.Groupcheck = false }
       if (this.partName) { this.partNamecheck = true } else { this.partNamecheck = false }
       searchtable(this.Machinecheck, this.Machine, this.Groupcheck, this.Group, this.partNamecheck, this.partName, 0, this.pageCurrent, this.pageSize).then(response => {
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
         if (response.data.total === 0) {
           this.loading = false
         } else {