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

src/views/ManufacturingCenter/GroupMatching/index.vue

@@ -549,16 +549,12 @@ export default {
       })
     },
     searchTable() {
-      if (this.Machine === '' || this.Machine === null) {
-        this.$message.warning('请先选择机床组号')
-      } else {
-        if (this.PartType === '标准件') {
-          this.searchTable0()
-        } else if (this.PartType === '外购件') {
-          this.searchTable1()
-        } else if (this.PartType === '基本件') {
-          this.searchTable2()
-        }
+      if (this.PartType === '标准件') {
+        this.searchTable0()
+      } else if (this.PartType === '外购件') {
+        this.searchTable1()
+      } else if (this.PartType === '基本件') {
+        this.searchTable2()
       }
     },
     searchTable0() { // 查询标准件

src/views/ManufacturingCenter/InventoryQuery/index.vue

@@ -116,7 +116,7 @@ export default {
       param[3] = ['物料规格', this.materialSpec]
       param[4] = ['物料型号_check', check3]
       param[5] = ['物料型号', this.materialModel]
-      var Data = this.CreateData('00', '报表_采购部仓库_库存_查询', param)
+      var Data = this.CreateData('2001', '报表_采购部仓库_库存_查询', param)
       this.exportExcel_NPOI(Data)
     },
     // 初始化数据

src/views/ManufacturingCenter/TraceabilityOfParts/index.vue

@@ -251,7 +251,7 @@ export default {
     querySearch(queryString, cb) {
       this.restaurantsPick = []
       if (this.searchPick !== '' && this.searchPick !== null) {
-        SelectPart(0, '', 0, '', 0, '', 1, this.searchPick, 0, '', 0, '', 0, '', '', '', '').then(response => {
+        SelectPart(this.searchPick).then(response => {
           const res = response.data
           res.forEach(item => {
             this.restaurantsPick.push({