From 436b0a8be0c5930d87ad6aa8c63fce2ef1133f79 Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Tue, 8 Oct 2024 18:14:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=BC=94=E7=A4=BA=E7=95=8C=E9=9D=A2=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/product/product.vue   | 59 ++++++++++++++-------------
 src/views/inout/DialogCreateOrder.vue | 59 +++++++++++++++------------
 2 files changed, 62 insertions(+), 56 deletions(-)

diff --git a/src/views/basic/product/product.vue b/src/views/basic/product/product.vue
index 32bd8c69..91564b6d 100644
--- a/src/views/basic/product/product.vue
+++ b/src/views/basic/product/product.vue
@@ -277,36 +277,37 @@
               >查询
               </el-button
               >
+              <el-button
+                type="primary"
+                icon="el-icon-plus" v-if="vueRouteSource==1"
+                @click="intentDetail"
+              >添加
+              </el-button
+              >
               <template v-if="!isChoose">
-                <el-button type="primary" icon="el-icon-plus" @click="editUdiType"
-                           v-if="vueRouteSource==1"
-                >物资分类管理
-                </el-button>
-                <el-button
-                  type="primary"
-                  icon="el-icon-plus" v-if="vueRouteSource==1"
-                  @click="intentImportUdi"
-                >选入DI信息
-                </el-button
-                >
-                <el-button
-                  type="primary"
-                  icon="el-icon-plus" v-if="vueRouteSource==1"
-                  @click="intentImportErp"
-                >添加院内字典
-                </el-button
-                >
-                <el-button
-                  type="primary"
-                  icon="el-icon-plus" v-if="vueRouteSource==1"
-                  @click="intentDetail"
-                >关联添加
-                </el-button
-                >
-                <el-button type="primary" icon="el-icon-plus" @click="addProducType"
-                           v-if="vueRouteSource==1"
-                >新增产品
-                </el-button>
+<!--                <el-button type="primary" icon="el-icon-plus" @click="editUdiType"-->
+<!--                           v-if="vueRouteSource==1"-->
+<!--                >物资分类管理-->
+<!--                </el-button>-->
+<!--                <el-button-->
+<!--                  type="primary"-->
+<!--                  icon="el-icon-plus" v-if="vueRouteSource==1"-->
+<!--                  @click="intentImportUdi"-->
+<!--                >选入DI信息-->
+<!--                </el-button-->
+<!--                >-->
+<!--                <el-button-->
+<!--                  type="primary"-->
+<!--                  icon="el-icon-plus" v-if="vueRouteSource==1"-->
+<!--                  @click="intentImportErp"-->
+<!--                >添加院内字典-->
+<!--                </el-button-->
+<!--                >-->
+
+<!--                <el-button type="primary" icon="el-icon-plus" @click="addProducType"-->
+                <!--                           v-if="vueRouteSource==1"-->
+                <!--                >新增产品-->
+                <!--                </el-button>-->
               </template>
             </el-button-group>
           </div>
diff --git a/src/views/inout/DialogCreateOrder.vue b/src/views/inout/DialogCreateOrder.vue
index 368c5b47..7e8e9754 100644
--- a/src/views/inout/DialogCreateOrder.vue
+++ b/src/views/inout/DialogCreateOrder.vue
@@ -1398,15 +1398,17 @@ export default {
               });
             return;
           } else if (response.code == 604) {
-            this.$confirm(response.message, "提示", {
-              confirmButtonText: "确定",
-              cancelButtonText: "取消",
-              type: "warning",
-            })
-              .then(() => {
-              })
-              .catch(() => {
-              });
+            this.$message.error(response.message);
+
+            // this.$confirm(response.message, "提示", {
+            //   confirmButtonText: "确定",
+            //   cancelButtonText: "取消",
+            //   type: "warning",
+            // })
+            //   .then(() => {
+            //   })
+            //   .catch(() => {
+            //   });
             return;
           } else if (response.code == 507) {
             this.editOriginCodeVisible = true;
@@ -1426,15 +1428,17 @@ export default {
             this.spaceCodeList = response.data;
             this.selectSpaceVisible = true;
           } else {
-            this.$alert(response.message, "提示", {
-              confirmButtonText: "确定",
-              type: "warning",
-              closeOnClickModal: true,
-              callback: (action) => {
-                this.$refs.inputRef.focus();
-                this.$refs.inputRef.select();
-              },
-            });
+
+            this.$message.error(response.message);
+            // this.$alert(response.message, "提示", {
+            //   confirmButtonText: "确定",
+            //   type: "warning",
+            //   closeOnClickModal: true,
+            //   callback: (action) => {
+            //     this.$refs.inputRef.focus();
+            //     this.$refs.inputRef.select();
+            //   },
+            // });
           }
         }
         this.loading = false;
@@ -1740,15 +1744,16 @@ export default {
             this.codeFormData.code = "01" + response.data.nameCode;
             this.originCode = this.codeFormData.code;
           } else {
-            this.$alert(response.message, "提示", {
-              confirmButtonText: "确定",
-              type: "warning",
-              closeOnClickModal: true,
-              callback: (action) => {
-                this.$refs.inputRef.focus();
-                this.$refs.inputRef.select();
-              },
-            });
+            this.$message.error(response.message);
+            // this.$alert(response.message, "提示", {
+            //   confirmButtonText: "确定",
+            //   type: "warning",
+            //   closeOnClickModal: true,
+            //   callback: (action) => {
+            //     this.$refs.inputRef.focus();
+            //     this.$refs.inputRef.select();
+            //   },
+            // });
           }
         }
         this.loading = false;