From fc8e5721735416135b1fad2b06fde9ff4b05c2a3 Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Thu, 25 Aug 2022 14:58:09 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/invWarehouse.vue              |  2 +-
 src/views/inventory/InvPreProductsDetail.vue  |  1 -
 .../userManage/param/systemPDFTemplate.vue    | 20 +------------------
 src/views/warehouse/stockOrderDelete.vue      |  2 +-
 src/views/warehouse/stockOrderSearch.vue      |  2 ++
 5 files changed, 5 insertions(+), 22 deletions(-)

diff --git a/src/views/basic/invWarehouse.vue b/src/views/basic/invWarehouse.vue
index 69ac590..ef47938 100644
--- a/src/views/basic/invWarehouse.vue
+++ b/src/views/basic/invWarehouse.vue
@@ -217,7 +217,7 @@
                       style="width: 100%">
                 <el-table-column
                     type="selection"
-                    :reserve-selection="false"
+                    :reserve-selection="true"
                     width="55">
                 </el-table-column>
                 <el-table-column label="账号" prop="userName" fixed></el-table-column>
diff --git a/src/views/inventory/InvPreProductsDetail.vue b/src/views/inventory/InvPreProductsDetail.vue
index efc869f..8f3d940 100644
--- a/src/views/inventory/InvPreProductsDetail.vue
+++ b/src/views/inventory/InvPreProductsDetail.vue
@@ -189,7 +189,6 @@ export default {
             this.query.batchNo = this.idQuery.batchNo;
             this.query.supId = this.idQuery.supId;
             this.query.invStorageCode = this.idQuery.invStorageCode;
-            this.query.invCodes = [this.idQuery.invCodes];
             filterDetailProducts(this.query) //查找该单号下的所有条码
                 .then((response) => {
                     this.loading = false;
diff --git a/src/views/userManage/param/systemPDFTemplate.vue b/src/views/userManage/param/systemPDFTemplate.vue
index 7a89721..8837f28 100644
--- a/src/views/userManage/param/systemPDFTemplate.vue
+++ b/src/views/userManage/param/systemPDFTemplate.vue
@@ -199,7 +199,6 @@
                             >
                                 <el-button slot="trigger" size="small" type="primary" :disabled="uploadDisabled">选取文件
                                 </el-button>
-                                <!--                               <el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">上传到服务器</el-button>-->
                                 <div slot="tip" class="el-upload__tip" v-if="formData.path==''">只能上传 jasper 文件，且不超过 2
                                     MB
                                 </div>
@@ -613,24 +612,7 @@ export default {
 
         },
         submitUpload() {
-            if (this.$refs.uploadJasper.uploadFiles.length < 1 && !this.uploadDisabled) {
-                this.$message.warning(`请选择jasper文件`);
-            }
-            if (this.$refs.uploadJrxml.uploadFiles.length < 1 && !this.uploadDisabled) {
-                this.$message.warning(`请选择jasper文件`);
-            }
-            this.$refs["dataForm"].validate(valid => {
-                if (valid) {
-                    this.submitTemplate();
-
-                    // if (!this.uploadDisabled) {
-                    //     this.$refs.uploadJasper.submit();
-                    //     this.$refs.uploadJrxml.submit();
-                    // } else {
-                    //     this.submitTemplate();
-                    // }
-                }
-            });
+            this.submitTemplate();
         },
         uploadHandleExceed(files, fileList) {
             this.$message.warning(`当前限制选择 1 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`);
diff --git a/src/views/warehouse/stockOrderDelete.vue b/src/views/warehouse/stockOrderDelete.vue
index dcf2a97..756920c 100644
--- a/src/views/warehouse/stockOrderDelete.vue
+++ b/src/views/warehouse/stockOrderDelete.vue
@@ -415,7 +415,7 @@
                     type: 'warning'
                 }).then(() => {
                     let params = {
-                        id: row.orderId
+                        orderId: row.orderId
                     };
                     deleteByOrderId(params).then((res) => {
                         if (res.code === 20000) {
diff --git a/src/views/warehouse/stockOrderSearch.vue b/src/views/warehouse/stockOrderSearch.vue
index 02d75d3..0d0bc8b 100644
--- a/src/views/warehouse/stockOrderSearch.vue
+++ b/src/views/warehouse/stockOrderSearch.vue
@@ -938,6 +938,8 @@ export default {
             updateReceiveStatus(params).then((res) => {
                 this.$message.success("验收成功");
                 this.getList();
+                //清空单据详情列表
+                this.detailList = [];
             }).error((error) => {
                 this.$message.error("验收失败");
             })