From 699a14f2d8dc4493156f58f194f29d8e7e715d0c Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Thu, 13 Apr 2023 16:27:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E6=92=A4=E5=9B=9E=EF=BC=8C?=
 =?UTF-8?q?=E8=80=97=E6=9D=90=E5=AD=97=E5=85=B8=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/product/product.vue                 | 11 ++++++-----
 src/views/basic/product/udiInfoManageSp.vue         |  1 +
 src/views/inout/DialogSelectRl.vue                  |  1 +
 src/views/inout/IoDeliverySearchOrder.vue           |  8 ++++----
 src/views/supplier/company/basicCompanyProducts.vue |  1 +
 5 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/views/basic/product/product.vue b/src/views/basic/product/product.vue
index 2403d79..f4e382c 100644
--- a/src/views/basic/product/product.vue
+++ b/src/views/basic/product/product.vue
@@ -119,7 +119,7 @@
               <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
               <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
               <el-button type="primary" icon="el-icon-search" @click="submit">查询</el-button>
-<!--              <el-button type="primary" icon="el-icon-plus" @click="editUdiType">物资分类管理</el-button>-->
+              <!--              <el-button type="primary" icon="el-icon-plus" @click="editUdiType">物资分类管理</el-button>-->
               <el-button type="primary" icon="el-icon-plus" @click="intentImportUdi">选入DI信息</el-button>
               <el-button type="primary" icon="el-icon-plus" @click="intentImportErp">添加院内字典</el-button>
               <el-button type="primary" icon="el-icon-plus" @click="intentDetail">关联添加</el-button>
@@ -1222,12 +1222,12 @@ export default {
         nameCode: null
       },
       groupBuyMap: {
-        true:"集采",
-        false:"非集采"
+        true: "集采",
+        false: "非集采"
       },
       dispatchMap: {
-        true:"可配送",
-        false:"不可配送"
+        true: "可配送",
+        false: "不可配送"
       },
       pId: 0,
       productRemarkSet: {},
@@ -1386,6 +1386,7 @@ export default {
 
       deletetUdiInfos(tquery)
         .then((response) => {
+          this.loading = false;
           if (response.code == 20000) {
             this.getList();
             this.$message({
diff --git a/src/views/basic/product/udiInfoManageSp.vue b/src/views/basic/product/udiInfoManageSp.vue
index d112fae..935734e 100644
--- a/src/views/basic/product/udiInfoManageSp.vue
+++ b/src/views/basic/product/udiInfoManageSp.vue
@@ -308,6 +308,7 @@ export default {
 
       deletetUdiInfos(tquery)
         .then((response) => {
+          this.loading = false;
           if (response.code == 20000) {
             this.getList();
             this.$message({
diff --git a/src/views/inout/DialogSelectRl.vue b/src/views/inout/DialogSelectRl.vue
index c9d1c22..c9c7d5a 100644
--- a/src/views/inout/DialogSelectRl.vue
+++ b/src/views/inout/DialogSelectRl.vue
@@ -641,6 +641,7 @@ export default {
 
       deletetUdiInfos(tquery)
         .then((response) => {
+          this.loading = false;
           if (response.code == 20000) {
             this.getList();
             this.$message({
diff --git a/src/views/inout/IoDeliverySearchOrder.vue b/src/views/inout/IoDeliverySearchOrder.vue
index 707e9b7..309977f 100644
--- a/src/views/inout/IoDeliverySearchOrder.vue
+++ b/src/views/inout/IoDeliverySearchOrder.vue
@@ -526,7 +526,7 @@
 <script>
 import {
   deleteByOrderId,
-  getOrderList, rollUnReceivebackOrder
+  getOrderList, rollbackOrder, rollUnReceivebackOrder
 } from "../../api/inout/order";
 import {getLocalJoinByUser} from "@/api/basic/busType";
 import {getInvListByUser} from "@/api/system/invWarehouse";
@@ -703,8 +703,8 @@ export default {
         endTime: null,
         invCode: this.$store.getters.locInvCode,
       };
-      this.actDateRange=[];
-      this.auditDateRange=[];
+      this.actDateRange = [];
+      this.auditDateRange = [];
       this.getList();
     },
     onSubmit() {
@@ -1009,7 +1009,7 @@ export default {
         type: 'warning'
       }).then(() => {
         let param = {billNo: row.billNo};
-        rollUnReceivebackOrder(param).then((res) => {
+        rollbackOrder(param).then((res) => {
           if (res.code === 20000) {
             this.$message.success("撤回成功");
             this.getList();
diff --git a/src/views/supplier/company/basicCompanyProducts.vue b/src/views/supplier/company/basicCompanyProducts.vue
index 26e5eac..e830491 100644
--- a/src/views/supplier/company/basicCompanyProducts.vue
+++ b/src/views/supplier/company/basicCompanyProducts.vue
@@ -464,6 +464,7 @@ export default {
 
       deletetUdiInfos(tquery)
         .then((response) => {
+          this.loading = false;
           if (response.code == 20000) {
             this.getList();
             this.$message({