From c09bffe6ce1178fbbed632afe33388ce298acf92 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Thu, 29 Jun 2023 14:06:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=85=E8=A3=85=E7=BA=BF=E9=80=81=E8=B4=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config/getData2.js              |  3 ++-
 src/pages/proj/PackLineDelivery.vue | 37 +++++++++++++++++++----------
 src/style/common.styl               |  2 +-
 3 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/src/config/getData2.js b/src/config/getData2.js
index ded9e39..2f9be92 100644
--- a/src/config/getData2.js
+++ b/src/config/getData2.js
@@ -140,7 +140,8 @@ export const workorderExecutes = (id) => post('api/pda/workorder/executes', {
  * 包装输送线送货
  */
 // 物料
-export const ssxqueryMaterial = () => post('api/pda/ssx/sendMaterial/queryMaterial', {
+export const ssxqueryMaterial = (code) => post('api/pda/ssx/sendMaterial/queryMaterial', {
+  material_code: code
 })
 // 载具类型
 export const ssxqueryVehicle = () => post('api/pda/ssx/sendMaterial/queryVehicle', {
diff --git a/src/pages/proj/PackLineDelivery.vue b/src/pages/proj/PackLineDelivery.vue
index e3655fd..1854e16 100644
--- a/src/pages/proj/PackLineDelivery.vue
+++ b/src/pages/proj/PackLineDelivery.vue
@@ -3,6 +3,15 @@
     <nav-bar title="包装输送线送货"></nav-bar>
     <section class="content mgb110">
       <div class="filter-wraper">
+        <div class="bottom-filter-tip">
+          <div class="filter-label txtjustify">物料编码</div>
+          <div class="fxcol mgl20">
+            <input type="text" class="filter-input filter-scan-input" v-model="val1">
+          </div>
+          <div class="filter_button">
+            <button class="btn submit-button" @click="_ssxqueryMaterial">查询</button>
+          </div>
+        </div>
         <div class="bottom-filter-tip">
           <div class="filter-label txtjustify">载具类型</div>
           <div class="fxcol mgl20 visible" >
@@ -23,22 +32,14 @@
         </div>
       </div>
       <div class="grid-wraper">
-        <div class="left_fixed">
-          <table class="layout-t left_layout_t">
-            <tr>
-              <th>物料名称</th>
-            </tr>
-            <tr v-for="e in dataList" :key="e.material_id" @click="toCheck(e)" :class="{'checked': e.material_id === pkId}">
-              <td>{{e.material_name}}</td>
-            </tr>
-          </table>
-        </div>
         <div class="slide">
           <table class="layout-t">
             <tr>
+              <th>物料名称</th>
               <th>物料编码</th>
             </tr>
             <tr v-for="e in dataList" :key="e.material_id" @click="toCheck(e)" :class="{'checked': e.material_id === pkId}">
+              <td>{{e.material_name}}</td>
               <td>{{e.material_code}}</td>
             </tr>
           </table>
@@ -63,11 +64,12 @@ export default {
   },
   data () {
     return {
+      val1: '',
       option1: [],
       active1: '',
       open1: false,
       qty: '',
-      dataList: [],
+      dataList: [{}],
       pkId: '',
       pkObj: {},
       disabled1: false
@@ -96,7 +98,7 @@ export default {
     },
     // 查询grid
     async _ssxqueryMaterial () {
-      let res = await ssxqueryMaterial()
+      let res = await ssxqueryMaterial(this.val1)
       if (res.code) {
         this.dataList = [...res.result]
       } else {
@@ -132,4 +134,15 @@ export default {
 </script>
 
 <style lang="stylus" scoped>
+.filter_button
+  .submit-button
+    margin 0 0 0 .15rem
+.slide
+  overflow hidden
+  tr
+    td
+      white-space wrap
+      line-height .38rem
+      height auto
+      padding .1rem .2rem
 </style>
diff --git a/src/style/common.styl b/src/style/common.styl
index 15a7218..54707fe 100644
--- a/src/style/common.styl
+++ b/src/style/common.styl
@@ -150,7 +150,7 @@ header
 /** grid列表 **/
 .grid-wraper
   _fj(,flex-start)
-  max-height 12rem
+  // max-height 12rem
   overflow-y: auto
 .left_fixed
   flex 0 0 1.5rem