From 7eba377238cc794e47d1d5efd11a952f6e6a5135 Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Mon, 7 Nov 2022 11:04:18 +0800
Subject: [PATCH] =?UTF-8?q?1.=E8=B0=83=E6=95=B4=E7=9B=98=E7=82=B9=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E6=8C=89=E9=92=AE=E7=A6=81=E7=94=A8=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=202.=E4=BF=AE=E5=A4=8D=E8=80=97=E6=9D=90=E5=AD=98=E6=94=BE?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2=E9=94=99=E8=AF=AF=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E6=97=A0=E6=B3=95=E6=AD=A3=E7=A1=AE=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=203.=E4=BF=AE=E5=A4=8D=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E7=9B=98=E7=82=B9=EF=BC=8C=E7=9B=98=E7=82=B9?=
 =?UTF-8?q?=E5=8D=95=E6=97=A0=E6=B3=95=E9=80=89=E6=8B=A9=E4=BA=A7=E5=93=81?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inventory/InvGoodsPlacement.vue | 13 +++++++------
 src/views/inventory/addCountOrder.vue     |  2 +-
 src/views/inventory/invCountSetting.vue   |  4 ++--
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/views/inventory/InvGoodsPlacement.vue b/src/views/inventory/InvGoodsPlacement.vue
index d1a7197..667fa7f 100644
--- a/src/views/inventory/InvGoodsPlacement.vue
+++ b/src/views/inventory/InvGoodsPlacement.vue
@@ -251,7 +251,6 @@ import {filterSubByInv} from "@/api/basic/invSubWarehouse";
 import {getSpaceCodeList} from "@/api/inventory/invSpace";
 import {getPlacementDetailList, bindInvSpace, checkCodeSpace} from "@/api/inventory/InvProducts";
 import {isBlank} from "@/utils/strUtil";
-import {enterCodeWeb} from "@/api/inout/order";
 
 
 export default {
@@ -432,7 +431,7 @@ export default {
                 invWarehouseCode: this.formData.invWarehouseCode,
                 invSpaceCode: this.formData.invSpaceCode
             }
-            this.checkCode(tQuery);
+            this.addCode(event);
             this.$refs.inputRef.focus();
             this.$refs.inputRef.select();
         },
@@ -443,17 +442,17 @@ export default {
             }
             this.actionEnable = true;
             this.$refs.inputRef.select();
-            if (this.$isBlank(this.formData.invStorageCode)) {
+            if (isBlank(this.formData.invStorageCode)) {
                 this.$message.error('当前仓库不能为空');
                 return;
             }
 
-            if (this.formData.invWarehouseCode == null || this.formData.invWarehouseCode == '') {
+            if (isBlank(this.formData.invWarehouseCode)) {
                 this.$message.error('当前分库不能为空');
                 return;
             }
 
-            if (this.$isBlank(this.formData.invSpaceCode)) {
+            if (isBlank(this.formData.invSpaceCode)) {
                 this.$message.error('当前货位不能为空');
                 return;
             }
@@ -500,7 +499,8 @@ export default {
                 if (res.code === 20000) {
                     this.codeArray.push(this.formData.code);
                 } else if (res.code === 8){
-                    this.$message.error(res.data);
+                    this.loading = false;
+                    this.$message.error(res.message);
                 } else if (res.code === 7) {
                     this.$confirm(res.data, '提示', {
                         confirmButtonText: '确定',
@@ -509,6 +509,7 @@ export default {
                     }).then(() => {
                         this.codeArray.push(this.formData.code);
                     }).catch(() => {
+                        this.loading = false;
                         this.$message({
                             type: 'info',
                             message: '已取消'
diff --git a/src/views/inventory/addCountOrder.vue b/src/views/inventory/addCountOrder.vue
index a4093fd..93e7cda 100644
--- a/src/views/inventory/addCountOrder.vue
+++ b/src/views/inventory/addCountOrder.vue
@@ -14,7 +14,7 @@
                     v-if="countType == 2"
                     type="primary"
                     :disabled="this.codeArray.length > 0"
-                    @click.native="saveOrder()"
+                    @click.native="startCount()"
                 >录入产品
                 </el-button>
                 <el-button
diff --git a/src/views/inventory/invCountSetting.vue b/src/views/inventory/invCountSetting.vue
index e2ec5a5..9690133 100644
--- a/src/views/inventory/invCountSetting.vue
+++ b/src/views/inventory/invCountSetting.vue
@@ -14,7 +14,7 @@
                             >查询
                             </el-button
                             >-->
-                            <el-button type="primary" icon="search" :disabled="addBtnEnabled" @click="addSetting"
+                            <el-button type="primary" icon="search" :disabled="!addBtnEnabled" @click="addSetting"
                             >添加盘点设置
                             </el-button
                             >
@@ -179,7 +179,7 @@ export default {
                 if (res.code === 20000) {
                     this.settingFormVisible = false;
                     this.getList();
-                    this.addBtnEnabled = true;
+                    this.addBtnEnabled = false;
                 } else {
                     this.$message.error(res.data.message);
                 }