From 38cd608cab0da6d1e8a756429cc953c681fcd2dc Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Tue, 8 Nov 2022 14:45:12 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E7=9B=98=E7=82=B9=E9=83=A8?=
 =?UTF-8?q?=E5=88=86bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/inventory/invCountOrder.js        |  2 +-
 src/views/inventory/InvGoodsPlacement.vue | 29 ++++++++++++++++-------
 src/views/inventory/addCountOrder.vue     | 14 +++++++----
 3 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/src/api/inventory/invCountOrder.js b/src/api/inventory/invCountOrder.js
index ad89b00..a2d8b96 100644
--- a/src/api/inventory/invCountOrder.js
+++ b/src/api/inventory/invCountOrder.js
@@ -26,7 +26,7 @@ export function getCountOrderDetailList(params) {
 
 export function saveCountOrder(data) {
     return axios({
-        url: "/invCount/order/saveCountOrder",
+            url: "/invCount/order/saveCountOrder",
         method: "post",
         data: data
     });
diff --git a/src/views/inventory/InvGoodsPlacement.vue b/src/views/inventory/InvGoodsPlacement.vue
index 667fa7f..40e6ab9 100644
--- a/src/views/inventory/InvGoodsPlacement.vue
+++ b/src/views/inventory/InvGoodsPlacement.vue
@@ -61,14 +61,12 @@
 
             <el-table v-loading="loading" :data="list" style="width: 100%">
                 <el-table-column label="序号" type="index" fixed></el-table-column>
-                <el-table-column label="仓库" prop="lo" width="120"></el-table-column>
-                <el-table-column label="分库" prop="expireDate" width="120"></el-table-column>
-                <el-table-column label="货位" prop="expireDate" width="120"></el-table-column>
+                <el-table-column label="仓库" prop="invStorageName" width="180"></el-table-column>
+                <el-table-column label="分库" prop="invWarehouseName" width="180"></el-table-column>
+                <el-table-column label="货位" prop="invSpaceName" width="180"></el-table-column>
                 <el-table-column label="产品标识" prop="nameCode" width="120"></el-table-column>
-                <el-table-column label="产品名称" prop="cpmctymc" width="180">
-                </el-table-column>
-                <el-table-column label="规格型号" prop="ggxh" width="180" show-overflow-tooltip>
-                </el-table-column>
+                <el-table-column label="产品名称" prop="productName" width="200"></el-table-column>
+                <el-table-column label="规格型号" prop="ggxh" width="180" show-overflow-tooltip></el-table-column>
                 <el-table-column label="批次号" prop="batchNo" width="120"></el-table-column>
                 <el-table-column label="生产日期" prop="productionDate" width="120"></el-table-column>
                 <el-table-column label="失效日期" prop="expireDate" width="120"></el-table-column>
@@ -251,6 +249,7 @@ 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 {userInfo} from "@/api/auth/login";
 
 
 export default {
@@ -498,7 +497,7 @@ export default {
             checkCodeSpace(tQuery).then((res) => {
                 if (res.code === 20000) {
                     this.codeArray.push(this.formData.code);
-                } else if (res.code === 8){
+                } else if (res.code === 8) {
                     this.loading = false;
                     this.$message.error(res.message);
                 } else if (res.code === 7) {
@@ -520,8 +519,20 @@ export default {
         },
     },
     created() {
-        this.getList();
         this.getStorage();
+        //获取用户默认仓库信息
+        userInfo().then((res) => {
+            if (res.code === 20000) {
+                if (!isBlank(res.data.locInvCode)) {
+                    this.filterQuery.invStorageCode = res.data.locInvCode;
+                    this.invChange();
+                    this.filterQuery.invWarehouseCode = res.data.locSubInvCode;
+                    this.invWarehouseChange();
+                }
+                this.getList();
+            }
+        }).catch((error) => {
+        });
     },
 };
 </script>
diff --git a/src/views/inventory/addCountOrder.vue b/src/views/inventory/addCountOrder.vue
index c14b8b3..929f2dc 100644
--- a/src/views/inventory/addCountOrder.vue
+++ b/src/views/inventory/addCountOrder.vue
@@ -102,10 +102,9 @@
                     </div>
                 </el-col>
                 <el-col :span="7">
-                    <el-form-item class="query-form-item" prop="invSpaceCode"
-                    >
+                    <el-form-item class="query-form-item" prop="invSpaceCode">
                         <el-select v-model="formData.invSpaceCode" placeholder="盘点货位信息"
-                                   :disabled="codeArray.length>0"
+                                   :disabled="codeArray.length>0 || disableSpace"
                                    @change="invSpaceChange"
                                    clearable>
                             <el-option
@@ -120,7 +119,6 @@
                 </el-col>
             </el-row>
 
-
             <el-row :gutter="20" style="margin-top: 12px">
                 <el-col :span="2">
                     <div class="ao-text">
@@ -380,6 +378,7 @@ export default {
                 edit: true
             },
             codesVisible: false,
+            disableSpace: false
         };
     },
     methods: {
@@ -420,7 +419,7 @@ export default {
                         this.closeDialog();
                     }
                 } else {
-                    this.$message.error(res.data.message);
+                    this.$message.error(res.message);
                 }
             });
         },
@@ -589,6 +588,7 @@ export default {
             }
         },
         startCount() {
+            this.countProductList = [];
             if (this.countType === 0) {
                 if (isBlank(this.formData.invStorageCode) || isBlank(this.formData.invWarehouseCode)) {
                     this.$message.warning("请先选择盘点仓库");
@@ -618,6 +618,7 @@ export default {
                     invWarehouseCode: this.formData.invWarehouseCode,
                     invSpaceCode: this.formData.invSpaceCode
                 };
+                console.log(params)
                 getCountInvProductProduct(params).then((res) => {
                     if (res.data.length !== 0) {
                         let invProductList = res.data;
@@ -654,6 +655,9 @@ export default {
             });
             this.getCountOrderCodesNum();
         }
+        if (this.countType == 0) {
+            this.disableSpace = true;
+        }
     },
 };
 </script>