From d89e3b13fa45f55f91fd7e2dd568e9dc27a7d7fa Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Tue, 29 Nov 2022 10:39:22 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BC=98=E5=8C=96=E5=BA=93=E5=AD=98=E5=85=BB?=
 =?UTF-8?q?=E6=8A=A4=E9=A1=B5=E9=9D=A2=E5=B1=95=E7=A4=BA=E6=95=88=E6=9E=9C?=
 =?UTF-8?q?=202.=E5=AE=8C=E5=96=84=E5=BA=93=E5=AD=98=E5=85=BB=E6=8A=A4?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inventory/addInvMAOrder.vue       |  3 +-
 src/views/inventory/invMAOrderAudit.vue     | 40 ++++++++++++++-------
 src/views/inventory/invMAOrderCompleted.vue | 24 ++++++-------
 src/views/inventory/invMAOrderNew.vue       |  3 +-
 4 files changed, 43 insertions(+), 27 deletions(-)

diff --git a/src/views/inventory/addInvMAOrder.vue b/src/views/inventory/addInvMAOrder.vue
index fa2567a..4f560dd 100644
--- a/src/views/inventory/addInvMAOrder.vue
+++ b/src/views/inventory/addInvMAOrder.vue
@@ -380,8 +380,7 @@ export default {
                     if (res.code === 20000) {
                         this.formData.orderId = res.data.orderId;
                         this.formData.createTime = res.data.createTime;
-                        this.$message.success("保存成功！");
-                        if (!isBlank(!code)) {
+                        if (!isBlank(code)) {
                             //扫码添加库存养护记录详情
                             let params = {
                                 orderIdFk: this.formData.orderId,
diff --git a/src/views/inventory/invMAOrderAudit.vue b/src/views/inventory/invMAOrderAudit.vue
index dc96a4d..7c39c63 100644
--- a/src/views/inventory/invMAOrderAudit.vue
+++ b/src/views/inventory/invMAOrderAudit.vue
@@ -61,9 +61,9 @@
                 <el-table-column label="养护记录号" prop="orderId" 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="createTime" width="120"></el-table-column>
-                <el-table-column label="养护人" prop="createUser" width="120"></el-table-column>
-                <el-table-column label="状态" prop="status" show-overflow-tooltip width="120">
+                <el-table-column label="养护日期" prop="createTime" width="150"></el-table-column>
+                <el-table-column label="养护人" prop="createUser" width="150"></el-table-column>
+                <el-table-column label="状态" prop="status" width="120">
                     <template slot-scope="scope">
                         <el-tag>{{ statusMap[scope.row.status] }}</el-tag>
                     </template>
@@ -101,15 +101,15 @@
         <el-card>
             <el-table v-loading="loading" :data="detailList" style="width: 100%; margin-top: 10px;">
                 <el-table-column label="序号" type="index" width="50"></el-table-column>
-                <el-table-column label="条码" width="150" prop="code"></el-table-column>
-                <el-table-column width="150"
+                <el-table-column label="条码" width="150" prop="code" show-overflow-tooltip></el-table-column>
+                <el-table-column width="200"
                                  label="产品通用名"
                                  prop="productName"
-                                 show-overflow-tooltip
                 ></el-table-column>
                 <el-table-column width="150" label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
                 <el-table-column width="150" label="批次号" prop="batchNo"></el-table-column>
-                <el-table-column width="150" label="养护数量" prop="count" show-overflow-tooltip></el-table-column>
+                <el-table-column label="养护日期" prop="createTime" width="150"></el-table-column>
+                <el-table-column width="150" label="养护数量" prop="count"></el-table-column>
                 <el-table-column width="150" label="养护状态" prop="maintenanceStatus">
                     <template slot-scope="scope">
                         <el-radio disabled="true" v-model="scope.row.maintenanceStatus"
@@ -132,12 +132,12 @@
                 </el-table-column>
                 <el-table-column width="200" label="养护备注" prop="remark">
                 </el-table-column>
-                <el-table-column width="180" label="生产日期(yyMMdd)" prop="produceDate"></el-table-column>
-                <el-table-column width="180" label="失效日期(yyMMdd)" prop="expireDate"
+                <el-table-column width="150" label="生产日期(yyMMdd)" prop="produceDate"></el-table-column>
+                <el-table-column width="160" label="失效日期(yyMMdd)" prop="expireDate"
                                  show-overflow-tooltip></el-table-column>
                 <el-table-column width="250" label="注册/备案凭证号" prop="zczbhhzbapzbh"
                                  show-overflow-tooltip></el-table-column>
-                <el-table-column width="150" label="生产厂家" prop="ylqxzcrbarmc"
+                <el-table-column width="200" label="生产厂家" prop="ylqxzcrbarmc"
                                  show-overflow-tooltip></el-table-column>
             </el-table>
 
@@ -272,7 +272,7 @@ export default {
         auditOrder(row) {
             this.$confirm('请选择审核意见', '提示', {
                 confirmButtonText: '确定',
-                cancelButtonText: '取消',
+                cancelButtonText: '驳回',
                 type: 'warning',
                 center: true
             }).then(() => {
@@ -290,7 +290,23 @@ export default {
                 }).catch((error) => {
                     this.$message.error(error.message);
                 })
-            }).catch(() => {
+            }).catch((action) => {
+                if (action === "cancel") {
+                    let params = {
+                        id: row.id,
+                        status: 0
+                    };
+                    updateStatus(params).then((res) => {
+                        if (res.code === 20000) {
+                            this.$message.success("审核通过！");
+                            this.getList();
+                        } else {
+                            this.$message.error(res.message);
+                        }
+                    }).catch((error) => {
+                        this.$message.error(error.message);
+                    })
+                }
             });
         },
         deleteDialog(id) {
diff --git a/src/views/inventory/invMAOrderCompleted.vue b/src/views/inventory/invMAOrderCompleted.vue
index 80e3813..7eb580c 100644
--- a/src/views/inventory/invMAOrderCompleted.vue
+++ b/src/views/inventory/invMAOrderCompleted.vue
@@ -57,9 +57,10 @@
                 <el-table-column label="养护记录号" prop="orderId" 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="createTime" width="120"></el-table-column>
+                <el-table-column label="养护日期" prop="createTime" width="150"></el-table-column>
+                <el-table-column label="审核日期" prop="auditTime" width="150"></el-table-column>
                 <el-table-column label="养护人" prop="createUser" width="120"></el-table-column>
-                <el-table-column label="状态" prop="status" show-overflow-tooltip width="120">
+                <el-table-column label="状态" prop="status" width="120">
                     <template slot-scope="scope">
                         <el-tag>{{ statusMap[scope.row.status] }}</el-tag>
                     </template>
@@ -79,15 +80,15 @@
         <el-card>
             <el-table v-loading="loading" :data="detailList" style="width: 100%; margin-top: 10px;">
                 <el-table-column label="序号" type="index" width="50"></el-table-column>
-                <el-table-column label="条码" width="150" prop="code"></el-table-column>
-                <el-table-column width="150"
+                <el-table-column label="条码" width="150" prop="code" show-overflow-tooltip></el-table-column>
+                <el-table-column width="200"
                                  label="产品通用名"
                                  prop="productName"
-                                 show-overflow-tooltip
                 ></el-table-column>
-                <el-table-column width="150" label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
+                <el-table-column width="150" label="规格型号" prop="ggxh"></el-table-column>
                 <el-table-column width="150" label="批次号" prop="batchNo"></el-table-column>
-                <el-table-column width="150" label="养护数量" prop="count" show-overflow-tooltip></el-table-column>
+                <el-table-column label="养护日期" prop="createTime" width="150"></el-table-column>
+                <el-table-column width="150" label="养护数量" prop="count"></el-table-column>
                 <el-table-column width="150" label="养护状态" prop="maintenanceStatus">
                     <template slot-scope="scope">
                         <el-radio disabled="true" v-model="scope.row.maintenanceStatus"
@@ -108,14 +109,13 @@
                         </el-radio>
                     </template>
                 </el-table-column>
-                <el-table-column width="200" label="养护备注" prop="remark"></el-table-column>
+                <el-table-column width="200" label="养护备注" prop="remark" show-overflow-tooltip></el-table-column>
                 <el-table-column width="180" label="生产日期(yyMMdd)" prop="produceDate"></el-table-column>
-                <el-table-column width="180" label="失效日期(yyMMdd)" prop="expireDate"
-                                 show-overflow-tooltip></el-table-column>
+                <el-table-column width="180" label="失效日期(yyMMdd)" prop="expireDate"></el-table-column>
                 <el-table-column width="250" label="注册/备案凭证号" prop="zczbhhzbapzbh"
                                  show-overflow-tooltip></el-table-column>
-                <el-table-column width="150" label="生产厂家" prop="ylqxzcrbarmc"
-                                 show-overflow-tooltip></el-table-column>
+                <el-table-column width="180" label="生产厂家" prop="ylqxzcrbarmc"
+                ></el-table-column>
             </el-table>
 
             <el-pagination
diff --git a/src/views/inventory/invMAOrderNew.vue b/src/views/inventory/invMAOrderNew.vue
index 7b0b702..5097768 100644
--- a/src/views/inventory/invMAOrderNew.vue
+++ b/src/views/inventory/invMAOrderNew.vue
@@ -58,7 +58,7 @@
                 <el-table-column label="养护记录号" prop="orderId" 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="createTime" width="120"></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="status" show-overflow-tooltip width="120">
                     <template slot-scope="scope">
@@ -222,6 +222,7 @@ export default {
         },
         closeDialog() {
             this.formVisible = false;
+            this.getList();
         },
         addMAOrder() {
             this.maOrder = null;