Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z

# Conflicts:
#	src/views/collect/IoCreateOrder.vue
#	src/views/collect/IoCreateOrderBlank.vue

src/views/collect/DealOrderBlank.vue

@@ -366,7 +366,7 @@ export default {
       let query = {
         key: val,
         status: 1,
-        invCode: this.formData.invCode,
+        // invCode: this.formData.invCode,
         page: 1,
         limit: 100,
       }

src/views/collect/IoCreateOrder.vue

@@ -29,17 +29,13 @@
           </el-col>
         </el-row>
 
-
           <el-alert
-          style="margin-top: 15px"
+            style="margin-top: 15px;font-size: 20px"
             :title="msgTip"
             :closable="false"
             type="warning">
           </el-alert>
 
-        <div class="scroll-alert" style="margin-top: 15px;">
-          <div class="scroll-text">{{ msgTip }}</div>
-        </div>
 
         <el-row>
           <el-button-group
@@ -491,7 +487,7 @@ export default {
       isSuccess: false,
       result: "",
       scanResultType: "success",
-      msgTip: "工位存量提醒：",
+      msgTip: "当前工位存量提醒：",
       splitType: null,
     };
   },

src/views/collect/IoCreateOrderBlank.vue

@@ -29,17 +29,13 @@
           </el-col>
         </el-row>
 
-
         <el-alert
-          style="margin-top: 15px"
+          style="margin-top: 15px;font-size: 20px"
           :title="msgTip"
           :closable="false"
           type="warning">
         </el-alert>
 
-        <div class="scroll-alert" style="margin-top: 15px;">
-          <div class="scroll-text">{{ msgTip }}</div>
-        </div>
 
         <el-row>
           <el-button-group
@@ -491,8 +487,7 @@ export default {
       isSuccess: false,
       result: "",
       scanResultType: "success",
-      msgTip: "工位存量提醒：",
-      splitType: null,
+      msgTip: "当前工位存量提醒：",
     };
   },
   components: {
@@ -911,7 +906,7 @@ export default {
       let query = {
         key: val,
         status: 1,
-        invCode: this.orderFormData.invCode,
+        // invCode: this.orderFormData.invCode,
         page: 1,
         limit: 100,
       }
@@ -1767,31 +1762,31 @@ export default {
 
 
 <style scoped>
-.scroll-alert {
-  width: 100%; /* 或者你需要的宽度 */
-  overflow: hidden;
-  white-space: nowrap;
-  box-sizing: border-box;
-  /*border: 1px solid #f56c6c; !* 类似于 Element UI 警告框的边框 *!*/
-  background-color: rgba(255, 235, 59, 0.1); /* 类似于 Element UI 警告框的背景色 */
-  padding: 10px;
-  position: relative;
-}
-
-.scroll-text {
-  display: inline-block;
-  padding-left: 100%; /* 初始位置在容器右侧 */
-  animation: scroll 10s linear infinite; /* 滚动动画 */
-}
-
-@keyframes scroll {
-  from {
-    transform: translateX(0);
-  }
-  to {
-    transform: translateX(-100%);
-  }
-}
+/*.scroll-alert {*/
+/*  width: 100%; !* 或者你需要的宽度 *!*/
+/*  overflow: hidden;*/
+/*  white-space: nowrap;*/
+/*  box-sizing: border-box;*/
+/*  !*border: 1px solid #f56c6c; !* 类似于 Element UI 警告框的边框 *!*!*/
+/*  background-color: rgba(255, 235, 59, 0.1); !* 类似于 Element UI 警告框的背景色 *!*/
+/*  padding: 10px;*/
+/*  position: relative;*/
+/*}*/
+
+/*.scroll-text {*/
+/*  display: inline-block;*/
+/*  padding-left: 100%; !* 初始位置在容器右侧 *!*/
+/*  animation: scroll 10s linear infinite; !* 滚动动画 *!*/
+/*}*/
+
+/*@keyframes scroll {*/
+/*  from {*/
+/*    transform: translateX(0);*/
+/*  }*/
+/*  to {*/
+/*    transform: translateX(-100%);*/
+/*  }*/
+/*}*/
 
 .query-form-item {
   margin-right: 5px;