From 0f3aefbd35f3f3f121c6b96516a89f7b77eb6f30 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Wed, 26 Apr 2023 14:54:25 +0800
Subject: [PATCH] =?UTF-8?q?=E7=90=83=E7=A3=A8=E4=B8=8A=E6=96=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config/getData2.js                        |  5 +++--
 src/pages/xinrui/production/GrindBallFeed.vue | 22 +++++++++++++++----
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/src/config/getData2.js b/src/config/getData2.js
index a18ded0..a7c63cd 100644
--- a/src/config/getData2.js
+++ b/src/config/getData2.js
@@ -362,8 +362,9 @@ export const querySupMaterial = (code, date, wcode) => post('api/pda/pdm/querySu
   workprocedure_code: wcode
 })
 // 1.2上料查询
-export const QMload = (code) => post('api/pda/pdm/QMload', {
-  is_second: code
+export const QMload = (code, dev) => post('api/pda/pdm/QMload', {
+  is_second: code,
+  device_code: dev
 })
 // 1.3确认上料
 export const confirmQMLoad = (code, pcode, scode, id, btn) => post('api/pda/pdm/confirmQMLoad', {
diff --git a/src/pages/xinrui/production/GrindBallFeed.vue b/src/pages/xinrui/production/GrindBallFeed.vue
index 90af1e1..8f3bea2 100644
--- a/src/pages/xinrui/production/GrindBallFeed.vue
+++ b/src/pages/xinrui/production/GrindBallFeed.vue
@@ -2,7 +2,14 @@
   <section>
     <nav-bar :inner="true" title="球磨上料"></nav-bar>
     <section class="content mgt186">
-      <div class="filter-wraper">
+      <div v-if="$route.query.type === '1'" class="filter-wraper">
+        <search-box
+        label="设备"
+        v-model="val1"
+        @handleChange="handleChange1"
+        ></search-box>
+      </div>
+      <div v-else class="filter-wraper">
         <search-box
         label="设备"
         :keyShow="false"
@@ -70,16 +77,23 @@ export default {
     }
   },
   created () {
-    this._QMload()
+    if (this.$route.query.type !== '1') {
+      this._QMload()
+    }
   },
   methods: {
+    handleChange1 (e, type) {
+      if (type) {
+        this._QMload(e)
+      }
+    },
     toCheck (e) {
       this.pkId = this.pkId === e.storagevehicle_code ? '' : e.storagevehicle_code
       this.pkObj = this.pkId === e.storagevehicle_code ? e : {}
     },
-    async _QMload () {
+    async _QMload (e) {
       let code = this.$route.query.type === '1' ? '' : '1'
-      let res = await QMload(code)
+      let res = await QMload(code, e)
       if (res.code === '1') {
         this.dataList = [...res.content]
       } else {