From c6030e4b408078173caa25f67235c58503bff573 Mon Sep 17 00:00:00 2001
From: zuowenwen <zuowenwen>
Date: Fri, 3 Dec 2021 14:21:51 +0800
Subject: [PATCH] =?UTF-8?q?=20=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/toolMan/IQCInspectionTool.vue     |  1 +
 src/views/modules/toolMan/checkIn.vue         |  1 +
 src/views/modules/toolMan/location.vue        | 22 ++++++++++++++++++-
 src/views/modules/toolMan/tool-info.vue       |  1 +
 4 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/src/views/modules/toolMan/IQCInspectionTool.vue b/src/views/modules/toolMan/IQCInspectionTool.vue
index 7ffbced4..bc0089de 100644
--- a/src/views/modules/toolMan/IQCInspectionTool.vue
+++ b/src/views/modules/toolMan/IQCInspectionTool.vue
@@ -548,6 +548,7 @@ import {
           values1 : row.site,
           values2 : row.toolInstanceId,
           values3 : '',
+          additionEmailAddress : row.email,
         }
         inserteEEmailToSendQueue(saveData).then(({data}) =>{
 
diff --git a/src/views/modules/toolMan/checkIn.vue b/src/views/modules/toolMan/checkIn.vue
index 9a43b9bf..75145fce 100644
--- a/src/views/modules/toolMan/checkIn.vue
+++ b/src/views/modules/toolMan/checkIn.vue
@@ -548,6 +548,7 @@ import {
           values1 : row.site,
           values2 : row.toolInstanceId,
           values3 : '',
+          additionEmailAddress : row.email,
         }
         inserteEEmailToSendQueue(saveData).then(({data}) =>{
 
diff --git a/src/views/modules/toolMan/location.vue b/src/views/modules/toolMan/location.vue
index deb5d486..c5c65ef4 100644
--- a/src/views/modules/toolMan/location.vue
+++ b/src/views/modules/toolMan/location.vue
@@ -34,6 +34,17 @@
           </el-option>
         </el-select>
       </el-form-item>
+      <el-form-item :label="inputLabel.headerInput.label6">
+        <el-select  v-model="queryHeaderData.nullFlag" placeholder="请选择" style="width: 115px;">
+          <el-option label="全部" value=""></el-option>
+          <el-option
+            v-for="item in selectList.select3"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+          </el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button @click="getDataList()" type="primary">{{buttons.search}}</el-button>
       </el-form-item>
@@ -106,7 +117,7 @@
       <el-dialog :close-on-click-modal="false" :close-on-press-escape="false" v-drag :title="inputLabel.headerInput.label5" :visible.sync="setUp.reviewFlag" width="325px">
         <el-form :inline="true" label-position="top">
           <el-form-item :label="inputLabel.headerInput.label1">
-            <el-input style="width: 130px;" :readonly = "setUp.readonlyFlag" v-model="saveHeaderData.locationId"></el-input>
+            <el-input style="width: 130px;" :readonly = "setUp.readonlyFlag" onkeyup="this.value = this.value.toUpperCase()" v-model="saveHeaderData.locationId"></el-input>
           </el-form-item>
           <el-form-item :label="inputLabel.headerInput.label2">
             <el-input style="width: 130px;"  v-model="saveHeaderData.locationName"></el-input>
@@ -191,6 +202,7 @@ import {
           locationName : '',
           warehouseId : '',
           active : '',
+          nullFlag : '',
         },
         setUp: {
           reviewFlag: false,
@@ -205,6 +217,7 @@ import {
             label3 : '库房代码',
             label4 : '使用状态',
             label5 : '库位信息',
+            label6 : '是否使用',
           },
         },
         selectList: {
@@ -216,6 +229,13 @@ import {
             label: '禁用'
           }],
           select2: [],
+          select3: [{
+            value: 'Y',
+            label: '是'
+          }, {
+            value: 'N',
+            label: '否'
+          }],
         },
         site : this.$store.state.user.site,
         userName : this.$store.state.user.name,
diff --git a/src/views/modules/toolMan/tool-info.vue b/src/views/modules/toolMan/tool-info.vue
index 53484466..6c9be3c1 100644
--- a/src/views/modules/toolMan/tool-info.vue
+++ b/src/views/modules/toolMan/tool-info.vue
@@ -514,6 +514,7 @@
         detailList : [],
         headerData :{},
         site : this.$store.state.user.site,
+        userName : this.$store.state.user.name,
         // table高度
         height:450,
         tableHeight : 300,