From 3ed27f73472eee0194a67b841f56c60981f70076 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Tue, 21 Mar 2023 10:25:26 +0800
Subject: [PATCH] =?UTF-8?q?=E9=AA=8C=E5=AE=A1=E6=A0=B8=E9=AA=8C=E6=94=B6?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.production                             |   4 +-
 src/api/inout/acceptOrder.js                |   9 ++
 src/views/inout/DialogReviewOrder.vue       | 101 ++++++++++++--------
 src/views/inout/DialogThrReviewOrder.vue    |  67 +++++++++----
 src/views/inout/IoArrivalSearchOrder.vue    |   2 +-
 src/views/inout/IoInoutSearchOrder.vue      |   2 +-
 src/views/inout/IoReturnedSearchOrder.vue   |   2 +-
 src/views/system/param/busTypePreModify.vue |   2 +-
 8 files changed, 121 insertions(+), 68 deletions(-)

diff --git a/.env.production b/.env.production
index 6139ee6..101f3fd 100644
--- a/.env.production
+++ b/.env.production
@@ -4,8 +4,8 @@ VUE_APP_TITLE = 供应商自助管理系统
 # 生产环境配置
 ENV = 'production'
 # VUE_APP_BASE_API = 'http://116.204.71.86:9150/UDI_WMS_MC/'
-VUE_APP_BASE_API = 'http://192.168.0.62:9150/UDI_SPMS_SERVER/'
-# VUE_APP_BASE_API = 'http://192.168.0.66:9160/UDI_WMS_MC/'
+VUE_APP_BASE_API = 'http://101.43.77.55:9150/UDI_SPMS_SERVER/'
+# VUE_APP_BASE_API = 'http://192.168.0.62:9150/UDI_SPMS_SERVER/'
 # 应用访问路径 例如使用前缀 /admin/
 VUE_APP_CONTEXT_PATH = '/UDI_SPMS_CLIENT/'
 
diff --git a/src/api/inout/acceptOrder.js b/src/api/inout/acceptOrder.js
index e4ffc88..750d041 100644
--- a/src/api/inout/acceptOrder.js
+++ b/src/api/inout/acceptOrder.js
@@ -26,3 +26,12 @@ export function acceptAddCode(query) {
     data: query
   });
 }
+
+export function getAcceptStatus(query) {
+  return axios({
+    url: "/udiwms/stock/order/accept/getStatus",
+    method: "get",
+    params: query
+  });
+}
+
diff --git a/src/views/inout/DialogReviewOrder.vue b/src/views/inout/DialogReviewOrder.vue
index d80d29d..9ea6e14 100644
--- a/src/views/inout/DialogReviewOrder.vue
+++ b/src/views/inout/DialogReviewOrder.vue
@@ -5,7 +5,7 @@
         <el-button-group style="display: flex;margin: 0px 0 10px 80%; height: 35px">
           <el-button
             type="primary"
-            @click.native="finishAccept()"
+            @click.native="checkFinish()"
           >完成审核
           </el-button
           >
@@ -123,7 +123,7 @@
 <script>
 import A from "../../plugins/KeyScaner"
 import {updateStatus, enterCodeWeb, thirdUpdateStatus} from "@/api/inout/order";
-import {getAcceptOrder, acceptClear, acceptAddCode} from "@/api/inout/acceptOrder";
+import {getAcceptOrder, acceptClear, acceptAddCode, getAcceptStatus} from "@/api/inout/acceptOrder";
 
 
 export default {
@@ -256,7 +256,7 @@ export default {
                 type: "warning",
               })
                 .then(() => {
-                  this.finishAccept();
+                  this.postAccept();
                 })
                 .catch(() => {
                 });
@@ -281,55 +281,74 @@ export default {
       event.currentTarget.select();
     },
 
-    finishAccept() {
-      this.$confirm('审核未完成,是否强制完成审核此单据？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        let query = {
-          orderId: this.orderQuery.billNo,
-        };
-
-        if (this.reviewType != null && this.reviewType == 2) {
-
-          thirdUpdateStatus(query)
-            .then((response) => {
-              if (response.code == 20000) {
-                this.$message.success("核对成功！");
-                this.closeDialog();
-                this.$emit('childByValue', 1)
-              } else {
-                this.$message.error(response.message);
-              }
 
-            })
-            .catch(() => {
-            });
+    checkFinish() {
+      let query = {
+        orderId: this.orderQuery.billNo,
+      };
+      getAcceptStatus(query)
+        .then((response) => {
+          if (response.code == 20000) {
+            let tip = "审核结果正确，是否立即完成审核?";
+            this.finishAccept(tip);
+          } else {
+            let tip = "审核未完成,是否强制完成审核此单据？";
+            this.finishAccept(tip);
+          }
+        })
+        .catch(() => {
+        });
 
-        } else {
-          updateStatus(query)
-            .then((response) => {
-              if (response.code == 20000) {
-                this.$message.success("审核成功！");
-                this.closeDialog();
-                this.$emit('childByValue', 1)
-              } else {
-                this.$message.error(response.message);
-              }
 
-            })
-            .catch(() => {
-            });
-        }
+    },
+
 
+    finishAccept(tip) {
+      this.$confirm(tip, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.postAccept();
 
       }).catch(() => {
         // this.$message.info('回退失败');
       });
 
     },
+    postAccept() {
+      let query = {
+        orderId: this.orderQuery.billNo,
+      };
+      if (this.reviewType != null && this.reviewType == 2) {
+        thirdUpdateStatus(query)
+          .then((response) => {
+            if (response.code == 20000) {
+              this.$message.success("核对成功！");
+              this.closeDialog();
+              this.$emit('childByValue', 1)
+            } else {
+              this.$message.error(response.message);
+            }
+          })
+          .catch(() => {
+          });
 
+      } else {
+        updateStatus(query)
+          .then((response) => {
+            if (response.code == 20000) {
+              this.$message.success("审核成功！");
+              this.closeDialog();
+              this.$emit('childByValue', 1)
+            } else {
+              this.$message.error(response.message);
+            }
+          })
+          .catch(() => {
+          });
+      }
+    },
 
     renewAccept() {
       let query = {
diff --git a/src/views/inout/DialogThrReviewOrder.vue b/src/views/inout/DialogThrReviewOrder.vue
index 85ceedf..f3179af 100644
--- a/src/views/inout/DialogThrReviewOrder.vue
+++ b/src/views/inout/DialogThrReviewOrder.vue
@@ -5,7 +5,7 @@
         <el-button-group style="display: flex;margin: 0px 0 10px 80%; height: 35px">
           <el-button
             type="primary"
-            @click.native="finishAccept()"
+            @click.native="checkFinish()"
           >完成核对
           </el-button
           >
@@ -123,7 +123,7 @@
 <script>
 import A from "../../plugins/KeyScaner"
 import {updateStatus, enterCodeWeb, thirdUpdateStatus} from "@/api/inout/order";
-import {getAcceptOrder, acceptClear, acceptAddCode} from "@/api/inout/acceptOrder";
+import {getAcceptOrder, acceptClear, acceptAddCode, getAcceptStatus} from "@/api/inout/acceptOrder";
 
 
 export default {
@@ -256,7 +256,7 @@ export default {
                 type: "warning",
               })
                 .then(() => {
-                  this.finishAccept();
+                  this.postAccept();
                 })
                 .catch(() => {
                 });
@@ -281,31 +281,56 @@ export default {
       event.currentTarget.select();
     },
 
-    finishAccept() {
-      this.$confirm('核对未完成,是否强制完成核对此单据？？', '提示', {
+
+    checkFinish() {
+
+      let query = {
+        orderId: this.orderQuery.billNo,
+      };
+      getAcceptStatus(query)
+        .then((response) => {
+          if (response.code == 20000) {
+            let tip = "核对结果正确,是否立即完成核对？";
+            this.finishAccept(tip);
+          } else {
+            let tip = "核对未完成,是否强制完成核对此单据？";
+            this.finishAccept(tip);
+          }
+        })
+        .catch(() => {
+        });
+
+
+    },
+
+    finishAccept(tip) {
+      this.$confirm(tip, '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        let query = {
-          orderId: this.orderQuery.billNo,
-        };
-        thirdUpdateStatus(query)
-          .then((response) => {
-            if (response.code == 20000) {
-              this.$message.success("核对成功！");
-              this.closeDialog();
-              this.$emit('childByValue', 1)
-            } else {
-              this.$message.error(response.message);
-            }
-          })
-          .catch(() => {
-          });
+        this.postAccept();
       }).catch(() => {
-        // this.$message.info('回退失败');
       });
+    },
+
 
+    postAccept() {
+      let query = {
+        orderId: this.orderQuery.billNo,
+      };
+      thirdUpdateStatus(query)
+        .then((response) => {
+          if (response.code == 20000) {
+            this.$message.success("核对成功！");
+            this.closeDialog();
+            this.$emit('childByValue', 1)
+          } else {
+            this.$message.error(response.message);
+          }
+        })
+        .catch(() => {
+        });
     },
 
 
diff --git a/src/views/inout/IoArrivalSearchOrder.vue b/src/views/inout/IoArrivalSearchOrder.vue
index 9c7b3f1..3085e70 100644
--- a/src/views/inout/IoArrivalSearchOrder.vue
+++ b/src/views/inout/IoArrivalSearchOrder.vue
@@ -147,7 +147,7 @@
             </el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="操作" width="160">
+        <el-table-column label="操作" width="160" fixed="right">
           <template slot-scope="scope">
 
             <el-button
diff --git a/src/views/inout/IoInoutSearchOrder.vue b/src/views/inout/IoInoutSearchOrder.vue
index bc53319..851606c 100644
--- a/src/views/inout/IoInoutSearchOrder.vue
+++ b/src/views/inout/IoInoutSearchOrder.vue
@@ -144,7 +144,7 @@
         <!--            </el-tag>-->
         <!--          </template>-->
         <!--        </el-table-column>-->
-        <el-table-column label="操作" width="160">
+        <el-table-column label="操作" width="160" fixed="right">
           <template slot-scope="scope">
 
             <el-button
diff --git a/src/views/inout/IoReturnedSearchOrder.vue b/src/views/inout/IoReturnedSearchOrder.vue
index e05d981..00b68e7 100644
--- a/src/views/inout/IoReturnedSearchOrder.vue
+++ b/src/views/inout/IoReturnedSearchOrder.vue
@@ -147,7 +147,7 @@
             </el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="操作" width="160">
+        <el-table-column label="操作" width="160" fixed="right">
           <template slot-scope="scope">
 
             <el-button
diff --git a/src/views/system/param/busTypePreModify.vue b/src/views/system/param/busTypePreModify.vue
index d63a70a..7170c40 100644
--- a/src/views/system/param/busTypePreModify.vue
+++ b/src/views/system/param/busTypePreModify.vue
@@ -94,7 +94,7 @@
           <el-form-item label="审核状态" prop="auditStatus" class="query-form-item">
             <el-radio-group v-model="inputQuery.auditStatus">
               <el-radio :label="1">草稿</el-radio>
-              <el-radio :label="2">带和对</el-radio>
+              <el-radio :label="2">待核对</el-radio>
             </el-radio-group>
 <!--            <el-select v-model="inputQuery.auditStatus" placeholder="请选择出入库类型" style="width: 90%">-->
 <!--              <el-radio :label="1">草稿</el-radio>-->