From cfd1125684ee040f93ce26e5462964b2b744529a Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Fri, 4 Nov 2022 16:29:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=BA=8F=E8=BE=93=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/SearchBox.vue                  | 12 +++++-
 src/pages/login/Setup.vue                     | 14 ++++---
 src/pages/xinrui/production/GrindBallFeed.vue | 10 +++--
 .../xinrui/production/GroupDiskOperateN.vue   |  8 ++++
 .../xinrui/production/ProcessGrindBall.vue    | 24 +++++++-----
 src/pages/xinrui/production/ProcessSpray.vue  | 38 ++++++++++---------
 src/pages/xinrui/production/SprayFeed.vue     | 15 +++++---
 src/style/iconfont.styl                       |  4 +-
 src/vuex/modules/com.js                       |  2 +-
 9 files changed, 82 insertions(+), 45 deletions(-)

diff --git a/src/components/SearchBox.vue b/src/components/SearchBox.vue
index d4baa69..019cb13 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 class="search_box_icon fxcol" @click="handleScan">
+        <button v-show="scanShow === true" class="search_box_icon fxcol" @click="handleScan">
           <span class="iconfont scan_icon" :class="{'scan_icon_checked': type === true}"></span>
         </button>
-        <button class="search_box_icon fxcol" @click="handleKey">
+        <button v-show="keyShow === true" class="search_box_icon fxcol" @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">
@@ -41,6 +41,14 @@ export default {
       type: Boolean,
       default: false
     },
+    scanShow: {
+      type: Boolean,
+      default: true
+    },
+    keyShow: {
+      type: Boolean,
+      default: true
+    },
     seaShow: {
       type: Boolean,
       default: true
diff --git a/src/pages/login/Setup.vue b/src/pages/login/Setup.vue
index 56ad472..76e70cf 100644
--- a/src/pages/login/Setup.vue
+++ b/src/pages/login/Setup.vue
@@ -163,10 +163,10 @@ export default {
         this.toast('请填写标签打印地址')
         return
       }
-      if (this.active === '') {
-        this.toast('请选择打印机')
-        return
-      }
+      // if (this.active === '') {
+      //   this.toast('请选择打印机')
+      //   return
+      // }
       if (this.billPrintip === '') {
         this.toast('请填写单据打印地址')
         return
@@ -183,7 +183,11 @@ export default {
       this.$store.dispatch('setBaseUrl', this.addrip)
       this.$store.dispatch('setImgIp', this.imgip)
       this.$store.dispatch('setPrintUrl', this.printip)
-      this.$store.dispatch('setPrintName', this.option[this.active].value)
+      let print = ''
+      if (this.active !== '') {
+        print = this.option[this.active].value
+      }
+      this.$store.dispatch('setPrintName', print)
       this.$store.dispatch('setBillPrintUrl', this.billPrintip)
       this.$store.dispatch('setRefreshTime', this.setTime * 1000)
       this.$store.dispatch('setWeightLimit', this.weightLimit)
diff --git a/src/pages/xinrui/production/GrindBallFeed.vue b/src/pages/xinrui/production/GrindBallFeed.vue
index d413865..2974eca 100644
--- a/src/pages/xinrui/production/GrindBallFeed.vue
+++ b/src/pages/xinrui/production/GrindBallFeed.vue
@@ -3,10 +3,12 @@
     <nav-bar :inner="true" title="球磨上料"></nav-bar>
     <section class="content mgt186">
       <div class="filter-wraper">
-        <search-box
-        label="设备"
-        v-model="val1"
-        ></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="val1">
+          </div>
+        </div>
       </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 0fbea9c..3ac002b 100644
--- a/src/pages/xinrui/production/GroupDiskOperateN.vue
+++ b/src/pages/xinrui/production/GroupDiskOperateN.vue
@@ -5,11 +5,19 @@
       <div class="filter-wraper">
         <search-box
         label="托盘"
+        keyCode="请输入"
+        :focused="true"
+        :scanShow="false"
+        :keyShow="false"
         v-model="val1"
         @handleChange="handleChange1"
         ></search-box>
         <search-box
         label="扫桶"
+        keyCode="请输入"
+        :focused="true"
+        :scanShow="false"
+        :keyShow="false"
         v-model="val2"
         @handleChange="handleChange2"
         ></search-box>
diff --git a/src/pages/xinrui/production/ProcessGrindBall.vue b/src/pages/xinrui/production/ProcessGrindBall.vue
index ed842a2..5f3d570 100644
--- a/src/pages/xinrui/production/ProcessGrindBall.vue
+++ b/src/pages/xinrui/production/ProcessGrindBall.vue
@@ -3,21 +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">
-        <search-box
-        label="设备"
-        v-model="val1"
-        ></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="val1">
+          </div>
+        </div>
         <search-box
         label="工艺指令卡"
+        keyCode="请输入"
         :focused="true"
+        :scanShow="false"
+        :keyShow="false"
         v-model="val2"
         @handleChange="handleChange2"
         ></search-box>
-        <search-box
-        label="料浆大桶"
-        :focused="true"
-        v-model="val3"
-        ></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">
diff --git a/src/pages/xinrui/production/ProcessSpray.vue b/src/pages/xinrui/production/ProcessSpray.vue
index 3ef9537..eebff58 100644
--- a/src/pages/xinrui/production/ProcessSpray.vue
+++ b/src/pages/xinrui/production/ProcessSpray.vue
@@ -3,29 +3,33 @@
     <nav-bar title="喷雾工序"></nav-bar>
     <section ref="content" class="content" :style="'margin-top: '+(0.96+3 * 0.92)+ 'rem'">
       <div class="filter-wraper">
-        <search-box
-        label="设备"
-        v-model="val1"
-        :seaShow="false"
-        ></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="val1">
+          </div>
+        </div>
         <search-box
         label="工艺指令卡"
+        keyCode="请输入"
         :focused="true"
+        :scanShow="false"
+        :keyShow="false"
         v-model="val2"
         @handleChange="handleChange2"
         ></search-box>
-        <search-box
-        label="托盘"
-        :focused="true"
-        :seaShow="false"
-        v-model="val3"
-        ></search-box>
-        <search-box
-        label="站点"
-        :focused="true"
-        :seaShow="false"
-        v-model="val4"
-        ></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>
         <div class="bottom-filter-tip">
           <div class="filter-label txtjustify">混合设备</div>
           <div class="fxcol mgl20 visible" >
diff --git a/src/pages/xinrui/production/SprayFeed.vue b/src/pages/xinrui/production/SprayFeed.vue
index a37013b..6c60fd5 100644
--- a/src/pages/xinrui/production/SprayFeed.vue
+++ b/src/pages/xinrui/production/SprayFeed.vue
@@ -5,14 +5,19 @@
       <div class="filter-wraper">
         <search-box
         label="设备"
+        keyCode="请输入"
+        :focused="true"
+        :scanShow="false"
+        :keyShow="false"
         v-model="val1"
         @handleChange="handleChange1"
         ></search-box>
-        <search-box
-        label="载具"
-        :focused="true"
-        v-model="val2"
-        ></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>
       </div>
       <div class="grid-wraper">
         <div class="left_fixed">
diff --git a/src/style/iconfont.styl b/src/style/iconfont.styl
index 1c78a4a..5bd4360 100644
--- a/src/style/iconfont.styl
+++ b/src/style/iconfont.styl
@@ -58,6 +58,7 @@
   text-align center
   color #c9c9c9
   overflow hidden
+  border-right 1px solid #c9c9c9
 .scan_icon::before
   content '\e7aa'
 .scan_icon_checked
@@ -71,7 +72,7 @@
   text-align center
   color #c9c9c9
   overflow hidden
-  border-left 1px solid #c9c9c9
+  border-right 1px solid #c9c9c9
 .key_icon::before
   content '\e61b'
 .search_icon
@@ -83,7 +84,6 @@
   text-align center
   color #c9c9c9
   overflow hidden
-  border-left 1px solid #c9c9c9
 .search_icon::before
   content: '\e752'
 .key_icon_checked
diff --git a/src/vuex/modules/com.js b/src/vuex/modules/com.js
index 13c9f8d..07648bb 100644
--- a/src/vuex/modules/com.js
+++ b/src/vuex/modules/com.js
@@ -1,7 +1,7 @@
 import * as types from '../types'
 import { getStore, setStore } from '@config/mUtils.js'
 
-const baseUrl = process.env.NODE_ENV === 'development' ? 'http://192.168.81.252:8010' : 'http://10.16.1.24:8010'
+const baseUrl = process.env.NODE_ENV === 'development' ? 'http://192.168.81.252:8010' : 'http://17.0.0.1:8013'
 const imgip = 'http://10.16.1.24:8010'
 const printUrl = 'http://10.16.1.24:8000'
 const billPrintUrl = ''