From 6ee0651de095b09ede6c022e7512ebeef501a9bf Mon Sep 17 00:00:00 2001
From: xqu <xqu@163.com>
Date: Wed, 17 May 2023 11:12:56 +0800
Subject: [PATCH] Changes

---
 src/views/wcs/configuration/index.vue | 40 +++++++++++++--------------
 src/views/wcs/location/index.vue      | 16 +++++------
 src/views/wcs/stackerView/index.vue   |  5 ++--
 3 files changed, 30 insertions(+), 31 deletions(-)

diff --git a/src/views/wcs/configuration/index.vue b/src/views/wcs/configuration/index.vue
index ae12027..a8425e3 100644
--- a/src/views/wcs/configuration/index.vue
+++ b/src/views/wcs/configuration/index.vue
@@ -16,25 +16,25 @@
       </el-form-item>
     </el-form>
 
-<!--    <el-table v-loading="loading" :data="systemConfigurationList">-->
-<!--      <el-table-column label="名称" align="center"   prop="equipmentName" />-->
-<!--      <el-table-column label="上线状态" align="center" prop="onlineStatus" />-->
-<!--      <el-table-column label="设备状态" align="center" prop="equipmentStatus" />-->
-<!--      <el-table-column label="通信状态" align="center" prop="communicationStatus" />-->
-<!--      <el-table-column label="创建时间" align="center" prop="createTime"/>-->
-<!--      <el-table-column label="修改时间" align="center" prop="updateTime"/>-->
-<!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
-<!--        <template slot-scope="scope">-->
-<!--          <el-button-->
-<!--            size="mini"-->
-<!--            type="text"-->
-<!--            icon="el-icon-edit"-->
-<!--            @click="handleUpdate(scope.row)"-->
-<!--            v-hasPermi="['wcs:configuration:edit']"-->
-<!--          >修改</el-button>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
-<!--    </el-table>-->
+    <!--    <el-table v-loading="loading" :data="systemConfigurationList">-->
+    <!--      <el-table-column label="名称" align="center"   prop="equipmentName" />-->
+    <!--      <el-table-column label="上线状态" align="center" prop="onlineStatus" />-->
+    <!--      <el-table-column label="设备状态" align="center" prop="equipmentStatus" />-->
+    <!--      <el-table-column label="通信状态" align="center" prop="communicationStatus" />-->
+    <!--      <el-table-column label="创建时间" align="center" prop="createTime"/>-->
+    <!--      <el-table-column label="修改时间" align="center" prop="updateTime"/>-->
+    <!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
+    <!--        <template slot-scope="scope">-->
+    <!--          <el-button-->
+    <!--            size="mini"-->
+    <!--            type="text"-->
+    <!--            icon="el-icon-edit"-->
+    <!--            @click="handleUpdate(scope.row)"-->
+    <!--            v-hasPermi="['wcs:configuration:edit']"-->
+    <!--          >修改</el-button>-->
+    <!--        </template>-->
+    <!--      </el-table-column>-->
+    <!--    </el-table>-->
 
 
     <div class="layout-full">
@@ -166,7 +166,7 @@ export default {
               name: "修改",
               event: "handleUpdate",
               hidden(value) {
-                if (value.equipmentName !== "WCS") {
+                if (value.equipmentName !== "WCS" && value.equipmentStatus !== 1) {
                   return true;
                 } else {
                   return false;
diff --git a/src/views/wcs/location/index.vue b/src/views/wcs/location/index.vue
index ea09250..d71baf9 100644
--- a/src/views/wcs/location/index.vue
+++ b/src/views/wcs/location/index.vue
@@ -182,14 +182,14 @@
             v-hasPermi="['wcs:location:verify']"
           >验证、重扫
           </el-button>
-<!--          <el-button-->
-<!--            size="mini"-->
-<!--            type="text"-->
-<!--            icon="el-icon-refresh"-->
-<!--            @click="handleRescan(scope.row)"-->
-<!--            v-hasPermi="['wcs:location:rescan']"-->
-<!--          >重扫-->
-<!--          </el-button>-->
+          <!--          <el-button-->
+          <!--            size="mini"-->
+          <!--            type="text"-->
+          <!--            icon="el-icon-refresh"-->
+          <!--            @click="handleRescan(scope.row)"-->
+          <!--            v-hasPermi="['wcs:location:rescan']"-->
+          <!--          >重扫-->
+          <!--          </el-button>-->
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/wcs/stackerView/index.vue b/src/views/wcs/stackerView/index.vue
index 2112d0a..df2fa81 100644
--- a/src/views/wcs/stackerView/index.vue
+++ b/src/views/wcs/stackerView/index.vue
@@ -178,7 +178,7 @@
         <div style="margin-top: 10px;margin-bottom: 20px">
           <el-button-group v-model="receiptIssueParams1.mode"
                           style="margin-right: 5px">
-            <el-button label="1" class="view" @click="inStore2">入库</el-button>
+            <el-button label="1" class="view" @clicknpm="inStore2">入库</el-button>
             <el-button label="2" class="view" @click="outStore2">出库</el-button>
           </el-button-group>
 
@@ -214,7 +214,7 @@
             <el-button
               size="mini"
               type="text"
-              @click="chooseA(scope.row)"
+              @click="chooseA(scope.row)"n
             >选择
             </el-button>
           </template>
@@ -644,7 +644,6 @@
           this.receiptIssueParams.mode = 0;
           this.clearReceiptIssueParams()
           this.$modal.msgSuccess(response.msg);
-
         })
       },
       receiptIssue2() {