更新

2019-09-19 19:52:46 +08:00
parent faab73c1fa
commit aef7132f40
49 changed files with 733 additions and 585 deletions
--- a/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue
+++ b/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue
@@ -1,33 +1,14 @@
 <template>
  <div>
    <el-card>
-      <span>机床号:</span>
-      <el-select v-model="Machine" filterable clearable size="small" style="margin-top:10px;width: 220px" placeholder="机床号" @change="getGroup()">
-        <el-option
-          v-for="item in Machines"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value">
-          <div style="float: left">{{ item.label }}</div>
-          <div style="float: right; color: #8492a6; font-size: 13px">{{ item.value2 }}</div>
-        </el-option>
-      </el-select>
-      <span>组号:</span>
-      <el-select v-model="Group" size="small" clearable placeholder="组号" style="margin-top:10px;width: 180px;">
-        <el-option
-          v-for="item in Groups"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"/>
-      </el-select>
      <span>零件图号:</span>
-      <el-input v-model="partName" placeholder="零件图号" size="small" clearable style="width:200px"/>
+      <el-input v-model="partName" placeholder="零件图号" size="small" clearable style="width:200px;margin: 3px 0"/>
      <el-button size="small" icon="el-icon-search" type="success" style="margin-left: 10px" @click="pageSize=10; pageCurrent=1;searchTable()">查询</el-button>
      <el-button size="small" icon="el-icon-success" type="primary" style="margin-left: 10px" @click="edit2()">自家备料确认</el-button>
      <el-button size="small" icon="el-icon-success" type="primary" style="margin-left: 10px" @click="back()">打回</el-button>
    </el-card>
    <el-card>
-      <el-table v-loading="loading" :data="tableData" height="580" style="width: 100%;" border element-loading-text="拼命加载中" @selection-change="handleSelectionChange2">
+      <el-table v-loading="loading" :data="tableData" height="350" style="width: 100%;margin: 3px 0" size="mini" border stripe highlight-current-row element-loading-text="拼命加载中" @selection-change="handleSelectionChange2">
        <el-table-column type="selection" width="55" align="center"/>
        <el-table-column label="零件名称" align="center" width="220px">
          <template slot-scope="scope">
@@ -52,6 +33,7 @@
          :page-sizes="[10, 20, 30, 40, 100]"
          :page-size="pageSize"
          :total="total"
+          style="margin: 3px 0"
          layout="total, sizes, prev, pager, next, jumper"
          @size-change="handleSizeChange"
          @current-change="handleCurrentChange"/>
@@ -60,12 +42,12 @@

    <el-card>
      <span>零件图号:</span>
-      <el-input v-model="partName2" placeholder="零件图号" size="small" clearable style="width:200px"/>
+      <el-input v-model="partName2" placeholder="零件图号" size="small" clearable style="width:200px;margin: 3px 0"/>
      <el-button size="small" icon="el-icon-search" type="success" style="margin-left: 10px" @click="total2=0;pageSize2=10; pageCurrent2=1;searchTable2()">查询</el-button>
      <el-button size="small" icon="el-icon-success" type="primary" style="margin-left: 10px" @click="edit()">外购备料确认</el-button>
    </el-card>
    <el-card>
-      <el-table v-loading="loading2" :data="tableData2" height="580" style="width: 100%;" border element-loading-text="拼命加载中" @selection-change="handleSelectionChange">
+      <el-table v-loading="loading2" :data="tableData2" height="350" style="width: 100%;margin: 3px 0" size="mini" border stripe highlight-current-row element-loading-text="拼命加载中" @selection-change="handleSelectionChange">
        <el-table-column type="selection" width="55" align="center"/>
        <el-table-column label="零件名称" align="center" width="220px">
          <template slot-scope="scope">
@@ -110,17 +92,11 @@
 </template>

 <script>
-import { getMachines, getGroups, searchtable, searchtable2, searchtable3, change2, change3, edit } from '@/api/ManufacturingCenter/MaterialArrivalManagement'
+import { searchtable, searchtable2, searchtable3, change2, change3, edit } from '@/api/ManufacturingCenter/MaterialArrivalManagement'
 import { mapGetters } from 'vuex'
-import Cookie from 'js-cookie'
-
 export default {
  data() {
    return {
-      Machine: '',
-      Machines: [],
-      Group: '',
-      Groups: [],
      arrest2: [],
      editTime: '',
      bianliang1: [],
@@ -152,21 +128,10 @@ export default {
      'userId'
    ])
  },
-  watch: {
-    // 如果路由有变化，会再次执行该方法
-    '$route': {
-      handler(route) {
-        const _this = this
-        if (route.name === 'MaterialArrivalManagement') {
-          _this.getMachine()
-        }
-      }
-    }
+  created() {
+    this.searchTable()
+    this.searchTable2()
  },
-  // created() {
-  //   this.searchTable()
-  //   this.searchTable2()
-  // },
  methods: {
    handleSelectionChange2(val) {
      this.arrest2 = val
@@ -186,67 +151,17 @@ export default {
        })
      }
    },
-    getMachine() {
-      if (Cookie.get('machineValue') !== undefined) {
-        this.Machine = ''
-        this.Machines = []
-        this.Group = ''
-        this.Groups = []
-        getMachines().then(response => {
-          for (let i = 0; i < response.data.length; i++) {
-            this.Machines.push({
-              label: response.data[i].机床图号,
-              value: response.data[i].机床流水号,
-              value2: response.data[i].项目名称
-            })
-          }
-        }).then(() => {
-          this.Machine = parseInt(Cookie.get('machineValue'))
-          this.getGroup()
-          this.Group = parseInt(Cookie.get('group'))
-          this.searchTable()
-          Cookie.remove('machineValue')
-          Cookie.remove('group')
-          this.searchTable2()
-        })
-      } else {
-        this.Machine = ''
-        this.Machines = []
-        this.Group = ''
-        this.Groups = []
-        getMachines().then(response => {
-          for (let i = 0; i < response.data.length; i++) {
-            this.Machines.push({
-              label: response.data[i].机床图号,
-              value: response.data[i].机床流水号,
-              value2: response.data[i].项目名称
-            })
-          }
-        })
-        this.searchTable()
-      }
-    },
-    getGroup() {
-      this.Group = ''
-      this.Groups = []
-      getGroups(this.Machine).then(response => {
-        for (let i = 0; i < response.data.length; i++) {
-          this.Groups.push({
-            label: response.data[i].组号,
-            value: response.data[i].组件流水号
-          })
-        }
-      })
-    },
    // 查询表格数据
    searchTable() {
      this.loading = true
      this.tableData = []
      this.Data = []
-      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 => {
+      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 (response.data.total === 0) {
          this.loading = false
        } else {