From 1c832a75b4a620f445d190663672ac3f2e30651f Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Tue, 25 Feb 2025 17:22:06 +0800
Subject: [PATCH] =?UTF-8?q?2/25=20=E7=95=8C=E9=9D=A2=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E5=BE=85=E6=B5=8B=E8=AF=951.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inout/DialogCreateOrder.vue | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/views/inout/DialogCreateOrder.vue b/src/views/inout/DialogCreateOrder.vue
index e51be879..6894de95 100644
--- a/src/views/inout/DialogCreateOrder.vue
+++ b/src/views/inout/DialogCreateOrder.vue
@@ -44,11 +44,18 @@
           </el-col>
         </el-row>
         <el-row>
-          <div class="result-display" :class="{'result-success': isSuccess, 'result-failure': !isSuccess}">
-            <p class="result-text" :class="{'result-text-success': isSuccess, 'result-text-failure': !isSuccess}">{{
-                result
-              }}</p>
-          </div>
+          <el-alert
+            title="扫码结果"
+            :type="scanResultType"
+            :closable="false"
+            :dangerouslyUseHTMLString="true"
+            :description="result">
+          </el-alert>
+          <!--<div class="result-display" :class="{'result-success': isSuccess, 'result-failure': !isSuccess}">-->
+          <!--  <p class="result-text" :class="{'result-text-success': isSuccess, 'result-text-failure': !isSuccess}">{{-->
+          <!--      result-->
+          <!--    }}</p>-->
+          <!--</div>-->
         </el-row>
         <el-row style="margin-top: 25px;margin-bottom: -15px">
           <div v-if="showSearch  && splitBusType!=null">
@@ -839,7 +846,8 @@ export default {
       showSearch: false,
       scanCode: "",
       isSuccess: false,
-      result: "扫码解析结果："
+      result: "\n",
+      scanResultType: "success",
     };
   },
   components: {
@@ -1756,6 +1764,7 @@ export default {
           this.$refs.inputRef.focus();
           this.$refs.inputRef.select();
           this.isSuccess = true;
+          this.scanResultType = "success"
           this.printCodeResult(response.data)
           this.codeFormData.code = response.data.code;
           this.scanCode = ""
@@ -1764,6 +1773,7 @@ export default {
           if (response.code == 502) {
             this.checkSuccess = false;
             this.isSuccess = false;
+            this.scanResultType = "error"
             this.printCodeResult(response.data)
             this.codeFormData.code = response.data.code;
             this.originCode = this.codeFormData.code;
@@ -1773,6 +1783,7 @@ export default {
           } else if (response.code == 503) {
             this.checkSuccess = false;
             this.isSuccess = false;
+            this.scanResultType = "error"
             this.scanCode = ""
             this.printCodeResult(response.data)
             this.codeFormData.code = response.data.code;