From 190d80057e4209fb14f0a860687d54291c50e6a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Fri, 14 Jul 2023 17:55:15 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=86=85=E9=83=A8=E7=A0=81=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/business/stockOrder.vue               | 4 ++--
 src/views/inventory/inner/innerOrderSelectProduct.vue | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/views/basic/business/stockOrder.vue b/src/views/basic/business/stockOrder.vue
index 2c8aed38..7bd21122 100644
--- a/src/views/basic/business/stockOrder.vue
+++ b/src/views/basic/business/stockOrder.vue
@@ -408,7 +408,7 @@ export default {
         this.query.startTime = null;
         this.query.endTime = null;
       }
-      this.query.vueType = "supDelivery";
+      this.query.vueType = "stock";
       filterOrder(this.query)
         .then(response => {
           this.loading = false;
@@ -469,7 +469,7 @@ export default {
     getBusType() {
       let query = {
         enabled: true,
-        vueType: "supDelivery",
+        vueType: "stock",
       };
       getLocalJoinByUser(query)
         .then((response) => {
diff --git a/src/views/inventory/inner/innerOrderSelectProduct.vue b/src/views/inventory/inner/innerOrderSelectProduct.vue
index 78942bc3..ff4aaed3 100644
--- a/src/views/inventory/inner/innerOrderSelectProduct.vue
+++ b/src/views/inventory/inner/innerOrderSelectProduct.vue
@@ -128,6 +128,7 @@ import {addApplyDetail, addApply} from "../../../api/purchase/purApply";
 import store from "../../../store";
 import udiRlDetailDialog from "./../../purchase/purApply/purUdiRlDetailDialog";
 import {addOrderDetail} from "@/api/inventory/innerOrder";
+import {isBlank} from "@/utils/strUtil";
 
 export default {
   name: "stockOrderNewSelectProduct",
@@ -324,7 +325,7 @@ export default {
         }
       }
       let str = this.multipleSelection.zczbhhzbapzbh;
-      if (str.search(",") != -1) {
+      if (!isBlank(str) && str.search(",") != -1) {
         this.currentCert = null;
         this.certList = str.split(',');
         this.dialogFormVisible = true;

From b42de9c907a6ebe639bcb3e069aad2cfebf329ff Mon Sep 17 00:00:00 2001
From: 1178634255 <1178634255@qq.com>
Date: Mon, 17 Jul 2023 09:53:32 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=99=A8?=
 =?UTF-8?q?=E6=A2=B0=E4=BF=A1=E6=81=AF=EF=BC=9A=E9=94=81=E5=AE=9A=E3=80=81?=
 =?UTF-8?q?=E9=80=80=E5=9B=9E=E6=8F=90=E7=A4=BA=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/product/udiInfoManageSp.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/basic/product/udiInfoManageSp.vue b/src/views/basic/product/udiInfoManageSp.vue
index ff53de71..8099d4de 100644
--- a/src/views/basic/product/udiInfoManageSp.vue
+++ b/src/views/basic/product/udiInfoManageSp.vue
@@ -523,7 +523,7 @@ export default {
         postQuery.ids.push(row.rlId);
       });
       if(postQuery.ids.length<=0){
-        this.$message.error("请先选择供应商！");
+        this.$message.error("请先选择产品！");
         return
       }
       lockStatus(postQuery)