Merge branch 'master' of http://192.168.0.149:10010/r/高精2.0

src/api/ManufacturingCenter/ShopScheduling.js

@@ -11,13 +11,14 @@ export function getPerson() {
     }
   })
 }
-export function getParts(pageCurrent, pageSize) {
+export function getParts(num1, num2, pageCurrent, pageSize) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: '车间生产管理工艺_车间排产_零件查询',
+      param: `零件图号_check=${num1}&零件图号=${num2}`,
       Pagination: pageCurrent + '&' + pageSize
     }
   })

src/views/ManufacturingCenter/ShopScheduling/index.vue

@@ -4,6 +4,7 @@
       <el-col style="width: 650px">
         <el-card style="height: 800px">
           <el-row style="margin-top: 5px">
+            <el-input v-model="Parts" placeholder="零件图号" size="small" style="width: 150px" @keyup.enter.native="getParts"/>
             <el-select v-model="PersonValue" filterable placeholder="操作者" size="small" style="width: 100px;float: right" @change="searchTableData2">
               <el-option
                 v-for="item in Person"
@@ -123,6 +124,7 @@ import { getPerson, getParts, getGongxu, XuanRu, XuanChu, searchTableData2, panD
 export default {
   data() {
     return {
+      Parts: '',
       index: 0,
       工艺计划流水号: '',
       PersonValue: '',
@@ -160,7 +162,9 @@ export default {
     getParts() {
       this.tableData1 = []
       this.loading1 = true
-      getParts(this.pageCurrent, this.pageSize).then(response => {
+      let check
+      this.Parts ? check = 1 : check = 0
+      getParts(check, this.Parts, this.pageCurrent, this.pageSize).then(response => {
         response.data.rows.map(v => {
           this.tableData1.push({
             工艺计划流水号: v.工艺计划流水号,