From 3d5e29a5e12832efc0cbb8bc341afef457f1879b Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Sun, 1 Jan 2023 19:29:15 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86bug?=
 =?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0=E8=AE=BE=E5=A4=87=E5=85=BB=E6=8A=A4?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=89=93=E5=8D=B0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/inventory/deviceMAOrder.js            | 17 +++++++
 src/views/inventory/InvProducts.vue           | 11 +++--
 src/views/inventory/InvStatistics.vue         | 11 ++++-
 src/views/inventory/addInvMAOrder.vue         | 44 ++++++++++++++-----
 .../inventory/deviceMAOrderCompleted.vue      | 33 ++++++++++++--
 5 files changed, 96 insertions(+), 20 deletions(-)

diff --git a/src/api/inventory/deviceMAOrder.js b/src/api/inventory/deviceMAOrder.js
index 99214fd..f6e2cfd 100644
--- a/src/api/inventory/deviceMAOrder.js
+++ b/src/api/inventory/deviceMAOrder.js
@@ -79,3 +79,20 @@ export function addDeviceMAOrder(data) {
         data: data
     });
 }
+
+
+export function verifyTemplateFile(data) {
+    return axios({
+        url: "/device/MA/order/verifyTemplateFile",
+        method: "post",
+        data: data
+    });
+}
+
+export function printOrder(data) {
+    return axios({
+        url: "/device/MA/order/pintOrder",
+        method: "post",
+        data: data
+    });
+}
diff --git a/src/views/inventory/InvProducts.vue b/src/views/inventory/InvProducts.vue
index 8d42940..8f35b57 100644
--- a/src/views/inventory/InvProducts.vue
+++ b/src/views/inventory/InvProducts.vue
@@ -63,8 +63,7 @@
 <!--            </el-select>-->
 <!--          </el-form-item>-->
           <el-form-item class="query-form-item">
-            <el-select v-model="filterQuery.invWarehouseCode" placeholder="请选择当前仓库" clearable="true"
-                       :disabled="invWarehouseDisabled"
+            <el-select v-model="filterQuery.invWarehouseCode" @change="invWarehouseChange" placeholder="请选择当前仓库" clearable="true"
                        size="mini">
               <el-option
                   v-for="item in subInvList"
@@ -239,7 +238,6 @@ export default {
         page: 1,
         limit: 20,
       };
-      this.invChange();
       this.getList();
     },
     onSubmit() {
@@ -398,6 +396,13 @@ export default {
         }
       }
     },
+      invWarehouseChange(invWarehouseCode) {
+          this.subInvList.forEach(item => {
+              if (item.code === invWarehouseCode) {
+                  this.filterQuery.invStorageCode = item.parentId;
+              }
+          });
+      },
   },
   filters: {
     statusFilterType(status) {
diff --git a/src/views/inventory/InvStatistics.vue b/src/views/inventory/InvStatistics.vue
index 64dc911..f1197cd 100644
--- a/src/views/inventory/InvStatistics.vue
+++ b/src/views/inventory/InvStatistics.vue
@@ -62,7 +62,7 @@
 <!--                        </el-select>-->
 <!--                    </el-form-item>-->
                     <el-form-item class="query-form-item">
-                        <el-select v-model="filterQuery.invWarehouseCode" placeholder="请选择当前仓库" clearable="true"
+                        <el-select v-model="filterQuery.invWarehouseCode" @change="invWarehouseChange" placeholder="请选择当前仓库" clearable="true"
                                    size="mini">
                             <el-option
                                 v-for="item in subInvList"
@@ -212,7 +212,7 @@ export default {
         onSubmit() {
             //判断统计条件是否全部为空
             var param = this.filterQuery;
-            if (this.$isBlank(this.filterQuery.invStorageCode)) {
+            if (this.$isBlank(this.filterQuery.invWarehouseCode)) {
                 this.$message({
                     message: '请先选择当前仓库',
                     type: 'warning'
@@ -337,6 +337,13 @@ export default {
                 .catch(() => {
                 });
         },
+        invWarehouseChange(invWarehouseCode) {
+            this.subInvList.forEach(item => {
+                if (item.code === invWarehouseCode) {
+                    this.filterQuery.invStorageCode = item.parentId;
+                }
+            });
+        },
     },
     filters: {
         statusFilterType(status) {
diff --git a/src/views/inventory/addInvMAOrder.vue b/src/views/inventory/addInvMAOrder.vue
index 39ff688..7d3790f 100644
--- a/src/views/inventory/addInvMAOrder.vue
+++ b/src/views/inventory/addInvMAOrder.vue
@@ -372,6 +372,21 @@ export default {
             if (!isBlank(this.formData.orderId)) {
                 //更新单据
                 updateOrder(this.formData).then((res) => {
+                    if (!isBlank(this.formData.code)) {
+                        //扫码添加库存养护记录详情
+                        let params = {
+                            orderIdFk: this.formData.orderId,
+                            code: this.formData.code
+                        }
+                        addOrderDetail(params).then((res) => {
+                            if (res.code === 20000) {
+                                this.$message.success("添加成功！");
+                                this.getList();
+                            } else {
+                                this.$message.error(res.message);
+                            }
+                        });
+                    }
                 }).catch((error) => {
                     this.$message.error("更新单据信息失败！");
                 })
@@ -422,19 +437,24 @@ export default {
                 this.saveOrder(this.formData.code);
                 return;
             }
-            //扫码添加库存养护记录详情
-            let params = {
-                orderIdFk: this.formData.orderId,
-                code: this.formData.code
+
+            if (this.detailList.length === 0) {
+                this.saveOrder();
+            } else {
+                //扫码添加库存养护记录详情
+                let params = {
+                    orderIdFk: this.formData.orderId,
+                    code: this.formData.code
+                };
+                addOrderDetail(params).then((res) => {
+                    if (res.code === 20000) {
+                        this.$message.success("添加成功！");
+                        this.getList();
+                    } else {
+                        this.$message.error(res.message);
+                    }
+                });
             }
-            addOrderDetail(params).then((res) => {
-                if (res.code === 20000) {
-                    this.$message.success("添加成功！");
-                    this.getList();
-                } else {
-                    this.$message.error(res.message);
-                }
-            });
         },
         deleteOrderDetail(index, row) {
             if (row.count === 1) {
diff --git a/src/views/inventory/deviceMAOrderCompleted.vue b/src/views/inventory/deviceMAOrderCompleted.vue
index 95f566e..9a52583 100644
--- a/src/views/inventory/deviceMAOrderCompleted.vue
+++ b/src/views/inventory/deviceMAOrderCompleted.vue
@@ -40,13 +40,14 @@
                 <el-table-column label="领用记录号" prop="collOrderId" width="180"></el-table-column>
                 <el-table-column label="养护日期" prop="createTime" width="180"></el-table-column>
                 <el-table-column label="养护人" prop="createUser" width="120"></el-table-column>
+                <el-table-column label="养护备注" prop="remark" width="120"></el-table-column>
                 <el-table-column label="操作" width="180" fixed="right">
                     <template slot-scope="scope">
                         <el-button
                             type="text"
                             size="small"
                             @click.native.stop="print(scope.row)"
-                        >养护
+                        >打印
                         </el-button
                         >
                     </template>
@@ -114,7 +115,7 @@
 </template>
 
 <script>
-import {getDeviceMAOrderList, getDeviceMAOrderDetailList} from "@/api/inventory/deviceMAOrder";
+import {getDeviceMAOrderList, getDeviceMAOrderDetailList, verifyTemplateFile, printOrder} from "@/api/inventory/deviceMAOrder";
 
 export default {
     data() {
@@ -213,7 +214,33 @@ export default {
             })
         },
         print(row) {
-
+            let query = {moduleId: 7};
+            this.loading = true;
+            verifyTemplateFile(query).then((res) => {
+                if (res.code === 20000) {
+                    let printParams = {
+                        templateId: res.data,
+                        orderId: row.orderId
+                    };
+                    printOrder(printParams).then((response) => {
+                        //将pdf文件转换为url。
+                        const binaryData = [];
+                        binaryData.push(response);
+                        //获取blob链接。
+                        let url = window.URL.createObjectURL(
+                            new Blob(binaryData, {type: "application/pdf"})
+                        );
+                        this.loading = false;
+                        window.open(url);//打开新标签页，预览pdf。
+                    })
+                } else {
+                    this.loading = false;
+                    this.$message.error(res.message);
+                }
+            }).catch((error) => {
+                this.loading = false;
+                this.$message.error(error.message);
+            })
         },
     },
     created() {