From f05b6a55f452bbd0434ed8ae6d6416f66488e94b Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Tue, 8 Nov 2022 16:52:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=BA=8F=E6=89=AB=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/SearchBox.vue                  |  8 +--
 src/pages/xinrui/production/GrindBallFeed.vue | 12 ++---
 .../xinrui/production/GroupDiskOperateN.vue   | 15 ++----
 src/pages/xinrui/production/ProcessChuimo.vue |  2 +-
 src/pages/xinrui/production/ProcessDry.vue    |  2 +-
 .../xinrui/production/ProcessGranulation.vue  |  2 +-
 .../xinrui/production/ProcessGrindBall.vue    | 36 +++++++-------
 .../xinrui/production/ProcessMakePowder.vue   |  2 +-
 src/pages/xinrui/production/ProcessMix.vue    |  2 +-
 src/pages/xinrui/production/ProcessSeDry.vue  |  2 +-
 src/pages/xinrui/production/ProcessSpray.vue  | 49 +++++++++----------
 src/pages/xinrui/production/ProcessWipe.vue   |  2 +-
 src/pages/xinrui/production/ProcessYatuan.vue |  2 +-
 src/pages/xinrui/production/SprayFeed.vue     | 21 ++++----
 src/style/iconfont.styl                       |  2 -
 15 files changed, 73 insertions(+), 86 deletions(-)

diff --git a/src/components/SearchBox.vue b/src/components/SearchBox.vue
index 019cb13..a27b609 100644
--- a/src/components/SearchBox.vue
+++ b/src/components/SearchBox.vue
@@ -13,10 +13,10 @@
         @blur="handleBlur($event)"
         @input="handleChange($event)">
       <div class="button_box">
-        <button v-show="scanShow === true" class="search_box_icon fxcol" @click="handleScan">
+        <button v-show="scanShow === true" class="search_box_icon fxcol" :class="{'bor_r': keyShow === true || seaShow === true}" @click="handleScan">
           <span class="iconfont scan_icon" :class="{'scan_icon_checked': type === true}"></span>
         </button>
-        <button v-show="keyShow === true" class="search_box_icon fxcol" @click="handleKey">
+        <button v-show="keyShow === true" class="search_box_icon fxcol" :class="{'bor_r': seaShow === true}" @click="handleKey">
           <span class="iconfont key_icon" :class="{'key_icon_checked': type === false}"></span>
         </button>
         <button v-show="seaShow === true" class="search_box_icon fxcol" @click="handleSearch">
@@ -137,9 +137,11 @@ export default {
   position absolute
   top 50%
   transform translateY(-50%)
-  right 1px
+  right 0.02rem
   // height .9rem
 .search_box_icon
   _wh(.7rem, 100%)
   background-color #fff
+.bor_r
+  border-right 0.02rem solid #dcdfe6
 </style>
diff --git a/src/pages/xinrui/production/GrindBallFeed.vue b/src/pages/xinrui/production/GrindBallFeed.vue
index 2974eca..90af1e1 100644
--- a/src/pages/xinrui/production/GrindBallFeed.vue
+++ b/src/pages/xinrui/production/GrindBallFeed.vue
@@ -3,12 +3,12 @@
     <nav-bar :inner="true" title="球磨上料"></nav-bar>
     <section class="content mgt186">
       <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>
+        <search-box
+        label="设备"
+        :keyShow="false"
+        :seaShow="false"
+        v-model="val1"
+        ></search-box>
       </div>
       <div class="grid-wraper">
         <div class="left_fixed">
diff --git a/src/pages/xinrui/production/GroupDiskOperateN.vue b/src/pages/xinrui/production/GroupDiskOperateN.vue
index 3ac002b..d67b151 100644
--- a/src/pages/xinrui/production/GroupDiskOperateN.vue
+++ b/src/pages/xinrui/production/GroupDiskOperateN.vue
@@ -5,19 +5,16 @@
       <div class="filter-wraper">
         <search-box
         label="托盘"
-        keyCode="请输入"
-        :focused="true"
-        :scanShow="false"
         :keyShow="false"
+        :seaShow="false"
         v-model="val1"
         @handleChange="handleChange1"
         ></search-box>
         <search-box
         label="扫桶"
-        keyCode="请输入"
         :focused="true"
-        :scanShow="false"
         :keyShow="false"
+        :seaShow="false"
         v-model="val2"
         @handleChange="handleChange2"
         ></search-box>
@@ -105,14 +102,10 @@ export default {
   },
   methods: {
     handleChange1 (e, type) {
-      if (type) {
-        this._queryVehicle(e)
-      }
+      this._queryVehicle(e)
     },
     handleChange2 (e, type) {
-      if (type) {
-        this._queryBucket(e)
-      }
+      this._queryBucket(e)
     },
     /** 删除行 */
     async _deleteRow () {
diff --git a/src/pages/xinrui/production/ProcessChuimo.vue b/src/pages/xinrui/production/ProcessChuimo.vue
index ff89581..fe7266d 100644
--- a/src/pages/xinrui/production/ProcessChuimo.vue
+++ b/src/pages/xinrui/production/ProcessChuimo.vue
@@ -144,5 +144,5 @@ export default {
 
 <style lang="stylus" scoped>
 >>>.filter-label
-  width 1.6rem
+  width 1.8rem
 </style>
diff --git a/src/pages/xinrui/production/ProcessDry.vue b/src/pages/xinrui/production/ProcessDry.vue
index 643054d..059f099 100644
--- a/src/pages/xinrui/production/ProcessDry.vue
+++ b/src/pages/xinrui/production/ProcessDry.vue
@@ -176,5 +176,5 @@ export default {
 
 <style lang="stylus" scoped>
 >>>.filter-label
-  width 1.6rem
+  width 1.8rem
 </style>
diff --git a/src/pages/xinrui/production/ProcessGranulation.vue b/src/pages/xinrui/production/ProcessGranulation.vue
index 4217694..24c5520 100644
--- a/src/pages/xinrui/production/ProcessGranulation.vue
+++ b/src/pages/xinrui/production/ProcessGranulation.vue
@@ -205,5 +205,5 @@ export default {
 
 <style lang="stylus" scoped>
 >>>.filter-label
-  width 1.6rem
+  width 1.8rem
 </style>
diff --git a/src/pages/xinrui/production/ProcessGrindBall.vue b/src/pages/xinrui/production/ProcessGrindBall.vue
index 5f3d570..7f319dd 100644
--- a/src/pages/xinrui/production/ProcessGrindBall.vue
+++ b/src/pages/xinrui/production/ProcessGrindBall.vue
@@ -3,27 +3,27 @@
     <nav-bar title="球磨工序"></nav-bar>
     <section ref="content" class="content" :style="'margin-top: '+(0.96+3 * 0.92)+ 'rem'">
       <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>
+        <search-box
+        label="设备"
+        :keyShow="false"
+        :seaShow="false"
+        v-model="val1"
+        ></search-box>
         <search-box
         label="工艺指令卡"
-        keyCode="请输入"
         :focused="true"
-        :scanShow="false"
         :keyShow="false"
+        :seaShow="false"
         v-model="val2"
         @handleChange="handleChange2"
         ></search-box>
-        <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="val3">
-          </div>
-        </div>
+        <search-box
+        label="料浆大桶"
+        :focused="true"
+        :keyShow="false"
+        :seaShow="false"
+        v-model="val3"
+        ></search-box>
         <div class="bottom-filter-tip">
           <div class="filter-label txtjustify">备注</div>
           <div class="fxcol mgl20">
@@ -141,10 +141,8 @@ export default {
       }, 100)
     },
     handleChange2 (e, type) {
-      if (type) {
-        this.barCode = e
-        this._queryWorkTask(e)
-      }
+      this.barCode = e
+      this._queryWorkTask(e)
     },
     toCheck (e) {
       this.pkId = this.pkId === e.worktask_id ? '' : e.worktask_id
@@ -271,7 +269,7 @@ export default {
 
 <style lang="stylus" scoped>
 >>>.filter-label
-  width 1.6rem
+  width 1.8rem
 .content
   height calc(100% - 1.86rem)
   overflow hidden
diff --git a/src/pages/xinrui/production/ProcessMakePowder.vue b/src/pages/xinrui/production/ProcessMakePowder.vue
index 3b9ffda..9a9059d 100644
--- a/src/pages/xinrui/production/ProcessMakePowder.vue
+++ b/src/pages/xinrui/production/ProcessMakePowder.vue
@@ -272,7 +272,7 @@ export default {
 
 <style lang="stylus" scoped>
 >>>.filter-label
-  width 1.6rem
+  width 1.8rem
 .btn1
   font-size .22rem
 </style>
diff --git a/src/pages/xinrui/production/ProcessMix.vue b/src/pages/xinrui/production/ProcessMix.vue
index 6e4b9ee..e9c1409 100644
--- a/src/pages/xinrui/production/ProcessMix.vue
+++ b/src/pages/xinrui/production/ProcessMix.vue
@@ -228,5 +228,5 @@ export default {
 
 <style lang="stylus" scoped>
 >>>.filter-label
-  width 1.6rem
+  width 1.8rem
 </style>
diff --git a/src/pages/xinrui/production/ProcessSeDry.vue b/src/pages/xinrui/production/ProcessSeDry.vue
index f483e9c..ed1d4d7 100644
--- a/src/pages/xinrui/production/ProcessSeDry.vue
+++ b/src/pages/xinrui/production/ProcessSeDry.vue
@@ -180,5 +180,5 @@ export default {
 
 <style lang="stylus" scoped>
 >>>.filter-label
-  width 1.6rem
+  width 1.8rem
 </style>
diff --git a/src/pages/xinrui/production/ProcessSpray.vue b/src/pages/xinrui/production/ProcessSpray.vue
index eebff58..b0e3bce 100644
--- a/src/pages/xinrui/production/ProcessSpray.vue
+++ b/src/pages/xinrui/production/ProcessSpray.vue
@@ -3,33 +3,34 @@
     <nav-bar title="喷雾工序"></nav-bar>
     <section ref="content" class="content" :style="'margin-top: '+(0.96+3 * 0.92)+ 'rem'">
       <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>
+        <search-box
+        label="设备"
+        v-model="val1"
+        :keyShow="false"
+        :seaShow="false"
+        ></search-box>
         <search-box
         label="工艺指令卡"
-        keyCode="请输入"
         :focused="true"
-        :scanShow="false"
         :keyShow="false"
+        :seaShow="false"
         v-model="val2"
         @handleChange="handleChange2"
         ></search-box>
-        <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="val3">
-          </div>
-        </div>
-        <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="val4">
-          </div>
-        </div>
+        <search-box
+        label="托盘"
+        :focused="true"
+        :keyShow="false"
+        :seaShow="false"
+        v-model="val3"
+        ></search-box>
+        <search-box
+        label="站点"
+        :focused="true"
+        :keyShow="false"
+        :seaShow="false"
+        v-model="val4"
+        ></search-box>
         <div class="bottom-filter-tip">
           <div class="filter-label txtjustify">混合设备</div>
           <div class="fxcol mgl20 visible" >
@@ -144,10 +145,8 @@ export default {
   },
   methods: {
     handleChange2 (e, type) {
-      if (type) {
-        this.barCode = e
-        this._queryWorkTask(e)
-      }
+      this.barCode = e
+      this._queryWorkTask(e)
     },
     toCheck (e) {
       this.pkId = this.pkId === e.worktask_id ? '' : e.worktask_id
@@ -325,5 +324,5 @@ export default {
 
 <style lang="stylus" scoped>
 >>>.filter-label
-  width 1.6rem
+  width 1.8rem
 </style>
diff --git a/src/pages/xinrui/production/ProcessWipe.vue b/src/pages/xinrui/production/ProcessWipe.vue
index c2bff19..1cc8e8f 100644
--- a/src/pages/xinrui/production/ProcessWipe.vue
+++ b/src/pages/xinrui/production/ProcessWipe.vue
@@ -205,5 +205,5 @@ export default {
 
 <style lang="stylus" scoped>
 >>>.filter-label
-  width 1.6rem
+  width 1.8rem
 </style>
diff --git a/src/pages/xinrui/production/ProcessYatuan.vue b/src/pages/xinrui/production/ProcessYatuan.vue
index 813d3ef..e14e5c2 100644
--- a/src/pages/xinrui/production/ProcessYatuan.vue
+++ b/src/pages/xinrui/production/ProcessYatuan.vue
@@ -144,5 +144,5 @@ export default {
 
 <style lang="stylus" scoped>
 >>>.filter-label
-  width 1.6rem
+  width 1.8rem
 </style>
diff --git a/src/pages/xinrui/production/SprayFeed.vue b/src/pages/xinrui/production/SprayFeed.vue
index 6c60fd5..ffab59c 100644
--- a/src/pages/xinrui/production/SprayFeed.vue
+++ b/src/pages/xinrui/production/SprayFeed.vue
@@ -5,19 +5,18 @@
       <div class="filter-wraper">
         <search-box
         label="设备"
-        keyCode="请输入"
-        :focused="true"
-        :scanShow="false"
         :keyShow="false"
+        :seaShow="false"
         v-model="val1"
         @handleChange="handleChange1"
         ></search-box>
-        <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="val2">
-          </div>
-        </div>
+        <search-box
+        label="载具"
+        :focused="true"
+        :keyShow="false"
+        :seaShow="false"
+        v-model="val2"
+        ></search-box>
       </div>
       <div class="grid-wraper">
         <div class="left_fixed">
@@ -82,9 +81,7 @@ export default {
   },
   methods: {
     handleChange1 (e, type) {
-      if (type) {
-        this._PWload(e)
-      }
+      this._PWload(e)
     },
     toCheck (e) {
       this.pkId = this.pkId === e.worktask_id ? '' : e.worktask_id
diff --git a/src/style/iconfont.styl b/src/style/iconfont.styl
index 5bd4360..2e1a504 100644
--- a/src/style/iconfont.styl
+++ b/src/style/iconfont.styl
@@ -58,7 +58,6 @@
   text-align center
   color #c9c9c9
   overflow hidden
-  border-right 1px solid #c9c9c9
 .scan_icon::before
   content '\e7aa'
 .scan_icon_checked
@@ -72,7 +71,6 @@
   text-align center
   color #c9c9c9
   overflow hidden
-  border-right 1px solid #c9c9c9
 .key_icon::before
   content '\e61b'
 .search_icon