Merge remote-tracking branch 'origin/20240912_adapter' into 20240912_adapter

src/components/ShelfDisplay/index.vue

@@ -17,28 +17,38 @@
             @click="handleSlotClick(slot)"
           >
             <div class="top-border-boxes">
-              <div
+              <div class="left-box">
-                :class="['top-border-box',  slot.red != null && slot.red != 0 ?  'red-box' : 'white-box' ]"
+
-              ></div>
-              <div
-                :class="['top-border-box',  slot.blue != null &&slot.blue != 0 ?  'blue-box': 'white-box' ]"
-              ></div>
-              <div
-                :class="['top-border-box',  slot.green != null &&slot.green != 0 ?  'green-box'  : 'white-box' ]"
-              ></div>
-              <div
-                :class="['top-border-box',  slot.orange != null &&slot.orange != 0 ?  'orange-box':  'white-box' ]"
-              ></div>
-            </div>
-            <div class="centered-container">
                 <span :style="{
                             color: slot.cpmctymc ? 'green' : 'black',
-                            fontSize:`${16 + 30/row.sysWorkplaceQueues.length}px` ,
+                            fontSize:`${13 + 25/row.sysWorkplaceQueues.length}px` ,
                             fontWeight: 'bold'
                           }">
                   {{ slot.cpmctymc ? slot.cpmctymc: "暂未绑定"}}
                 </span>
 
+              </div>
+              <div class="right-box">
+
+                <div
+                  :class="['top-border-box',  slot.red != null && slot.red != 0 ?  'red-box' : 'white-box' ]"
+                ></div>
+                <div
+                  :class="['top-border-box',  slot.blue != null &&slot.blue != 0 ?  'blue-box': 'white-box' ]"
+                ></div>
+                <div
+                  :class="['top-border-box',  slot.green != null &&slot.green != 0 ?  'green-box'  : 'white-box' ]"
+                ></div>
+                <div
+                  :class="['top-border-box',  slot.orange != null &&slot.orange != 0 ?  'orange-box':  'white-box' ]"
+                ></div>
+
+
+              </div>
+
+            </div>
+            <div class="centered-container">
+
               <span  v-if="slot.cpmctymc" :style="{
                             color: 'black',
                             fontSize:`${10 + 20/row.sysWorkplaceQueues.length}px` ,
@@ -183,15 +193,26 @@ export default {
 /* 上边框的颜色框容器 */
 .top-border-boxes {
   display: flex;
-  height: 10px; /* 上边框颜色框的高度 */
+  height: 20px; /* 上边框颜色框的高度 */
   padding: 0;
 }
 
+.top-border-boxes .left-box {
+  display: flex;
+  flex-grow: 5; /* 左边区域将占据剩余空间 */
+}
+.top-border-boxes .right-box {
+  display: flex;
+  flex-grow: 0.1;/* 右边区域将占据剩余空间 */
+}
+
 /* 上边框的颜色框 */
 .top-border-box {
-  flex: 1; /* 平均分配宽度 */
+  /*flex: 1; !* 平均分配宽度 *!*/
-  height: 10px; /* 与容器高度一致 */
+  height:10px; /* 与容器高度一致 */
+  width: 10px; /* 与容器高度一致 */
   border: 1px solid #ccc; /* 边框 */
+  border-radius: 50%; /* 使元素成为圆形 */
 }
 
 .red-box {

src/plugins/KeyScaner.js

@@ -6,110 +6,141 @@
  * 1.0
  */
 const KeyScaner = /** @class */ (function () {
-    function KeyScaner(_dom) {
+  function KeyScaner(_dom) {
-        this.keybufs = [];
+    this.keybufs = [];
-        this.altBuf = [];
+    this.altBuf = [];
-        this.isShift = false;
+    this.isShift = false;
-        this.lastTime = 0;
+    this.lastTime = 0;
-        /**
+    /**
-         * 在收集到文本输入时触发
+     * 在收集到文本输入时触发
-         * @param text 收集到的连续文本
+     * @param text 收集到的连续文本
-         */
+     */
-        this.onInput = function (text) {
+    this.onInput = function (text) {
-        };
-        this.dom = _dom;
-        _dom.addEventListener('keydown', this.onKeyDown.bind(this));
-        _dom.addEventListener('keyup', this.onKeyUp.bind(this));
-        this.interval = setInterval(this.onTick.bind(this), 100);
-    }
-
-    KeyScaner.prototype.appendChar = function (c) {
-        this.keybufs.push(c);
     };
-    KeyScaner.prototype.onKeyDown = function (ev) {
+    this.dom = _dom;
-        this.lastTime = new Date().getTime();
+    _dom.addEventListener('keydown', this.onKeyDown.bind(this));
-        if (ev.key == "Alt") {
+    _dom.addEventListener('keyup', this.onKeyUp.bind(this));
-            if (ev.shiftKey || ev.ctrlKey || ev.metaKey) {
+    _dom.addEventListener('keypress', this.onKeyPress.bind(this));
-                return;
+    this.interval = setInterval(this.onTick.bind(this), 100);
-            }
+  }
-        } else if (ev.key == "Shift") {
+
-            if (ev.altKey || ev.ctrlKey || ev.metaKey) {
+  KeyScaner.prototype.appendChar = function (c) {
-                return;
+    this.keybufs.push(c);
-            }
+    // console.log('appendChar:', c, this.keybufs)
-            this.isShift = true;
+  };
-        } else if (ev.key == "Enter") {
+  KeyScaner.prototype.onKeyDown = function (ev) {
-            if (ev.shiftKey || ev.altKey || ev.ctrlKey || ev.metaKey) {
+    this.lastTime = new Date().getTime();
-                return;
+    if (ev.key == "Alt") {
-            }
+      if (ev.shiftKey || ev.ctrlKey || ev.metaKey) {
-            this.appendChar("\r");
+        return;
-            this.completeInput(); //立即完成输入
+      }
-        } else if (ev.key == "Delete" || ev.key == "Backspace") {
+    } else if (ev.key == "Shift") {
-            this.dom.innerTex = "";
+      if (ev.altKey || ev.ctrlKey || ev.metaKey) {
-            this.appendChar("delete");
+        return;
-            this.completeInput(); //立即完成输入
+      }
+      this.isShift = true;
+    } else if (ev.key == "Enter") {
+      if (ev.shiftKey || ev.altKey || ev.ctrlKey || ev.metaKey) {
+        return;
+      }
+      this.appendChar("\r");
+      this.completeInput(); //立即完成输入
+    } else if (ev.key == "Delete" || ev.key == "Backspace") {
+      this.dom.innerTex = "";
+      this.appendChar("delete");
+      this.completeInput(); //立即完成输入
+    } else {
+      if (ev.key.length == 1) {
+        var charCode = ev.key.charCodeAt(0);
+        // console.log("key="+charCode);
+        if (charCode >= 48 && charCode <= 57) {
+          if (ev.altKey) {
+            this.altBuf.push(ev.key);
+          } else {
+            this.appendChar(ev.key);
+          }
+        } else if ((charCode >= 65 && charCode <= 90) || (charCode >= 97 && charCode <= 122)) {
+          //忽略大小写锁定键，直接通过SHIFT键判断大小写
+          if (ev.shiftKey) {
+            this.appendChar(ev.key.toUpperCase());
+          } else {
+            this.appendChar(ev.key.toLowerCase());
+          }
         } else {
-            if (ev.key.length == 1) {
+          this.appendChar(ev.key);
-                var charCode = ev.key.charCodeAt(0);
-                // console.log("key="+charCode);
-                if (charCode >= 48 && charCode <= 57) {
-                    if (ev.altKey) {
-                        this.altBuf.push(ev.key);
-                    } else {
-                        this.appendChar(ev.key);
-                    }
-                } else if ((charCode >= 65 && charCode <= 90) || (charCode >= 97 && charCode <= 122)) {
-                    //忽略大小写锁定键，直接通过SHIFT键判断大小写
-                    if (ev.shiftKey) {
-                        this.appendChar(ev.key.toUpperCase());
-                    } else {
-                        this.appendChar(ev.key.toLowerCase());
-                    }
-                } else {
-                    this.appendChar(ev.key);
-                }
-            }
-            //忽略其他控制键
-        }
-    };
-    KeyScaner.prototype.onKeyUp = function (ev) {
-        this.lastTime = new Date().getTime();
-        if (ev.key == "Alt") {
-            if (this.altBuf && this.altBuf.length > 0) {
-                var str = this.altBuf.join("");
-                var num = parseInt(str);
-                var c = String.fromCharCode(num);
-                this.appendChar(c);
-                this.altBuf = [];
-            }
-        } else if (ev.key == "Shift") {
-            this.isShift = false;
-        }
-    };
-    KeyScaner.prototype.completeInput = function () {
-        var text = this.keybufs.join("");
-        this.keybufs = [];
-        if (this.onInput) {
-            this.onInput.bind(this)(text);
-        }
-    };
-    KeyScaner.prototype.onTick = function () {
-        if (this.keybufs && this.keybufs.length > 0 && (!this.altBuf || this.altBuf.length == 0) && new Date().getTime() - this.lastTime > 500) {
-            //有缓存的字符，且没有缓存的alt字符 且 与上次按键时间超过500毫秒。 收集输入
-            // this.completeInput();
         }
-    };
+      }
+      //忽略其他控制键
+    }
+  };
+  KeyScaner.prototype.onKeyUp = function (ev) {
+    this.lastTime = new Date().getTime();
+    if (ev.charCode === 29) {
+      var str = this.altBuf.join("");
+      var num = parseInt(str);
+      var c = String.fromCharCode(num);
+      this.appendChar(c);
+      this.altBuf = [];
+      console.log('onKeyUp success:', ev.charCode, this.keybufs);
+    } else if (ev.key == "Alt") {
+      if (this.altBuf && this.altBuf.length > 0) {
+        var str = this.altBuf.join("");
+        var num = parseInt(str);
+        var c = String.fromCharCode(num);
+        this.appendChar(c);
+        this.altBuf = [];
+      }
+    } else if (ev.key == "Shift") {
+      this.isShift = false;
+    }
+  };
+
+  KeyScaner.prototype.onKeyPress = function (ev) {
+    this.lastTime = new Date().getTime();
+    const char = String.fromCharCode(ev.charCode);
+    console.log('KeyPress:', ev.charCode, char);
     /**
-     * 释放资源
+     *   if (ev.charCode === 29) {
+      this.appendChar(char);
+      // console.log('KeyPress success:', ev.charCode, this.keybufs);
+    } else
      */
-    KeyScaner.prototype.dispose = function () {
+    if (char == '\n') {
-        this.dom.removeEventListener('keydown', this.onKeyDown);
+      this.completeInput();
-        this.dom.removeEventListener('keyup', this.onKeyUp);
+    }
-        clearInterval(this.interval);
+
-    };
+    // if (ev.charCode === 49) {
-    return KeyScaner;
+    //   const char = String.fromCharCode(ev.charCode);
+    //   this.appendChar(char);
+    // }
+  };
+
+  KeyScaner.prototype.completeInput = function () {
+    var text = this.keybufs.join("");
+    this.keybufs = [];
+    if (this.onInput) {
+      this.onInput.bind(this)(text);
+    }
+  };
+  KeyScaner.prototype.onTick = function () {
+    if (this.keybufs && this.keybufs.length > 0 && (!this.altBuf || this.altBuf.length == 0) && new Date().getTime() - this.lastTime > 500) {
+      //有缓存的字符，且没有缓存的alt字符 且 与上次按键时间超过500毫秒。 收集输入
+      // this.completeInput();
+    }
+  };
+  /**
+   * 释放资源
+   */
+  KeyScaner.prototype.dispose = function () {
+    this.dom.removeEventListener('keydown', this.onKeyDown);
+    this.dom.removeEventListener('keyup', this.onKeyUp);
+    this.dom.removeEventListener('keypress', this.onKeyPress);
+    clearInterval(this.interval);
+  };
+  return KeyScaner;
 }());
 
 export default {
-    KeyScaner
+  KeyScaner
 }
 

src/views/basic/workplace/rackManage.vue

@@ -26,16 +26,29 @@
             >
               <el-card class="slot-card">
                 <p  style="font-size: 12px;fontWeight: bold">{{ slot.name }}</p>
-                <span :style="{
+                  <div
-                            color: slot.reCount <= 0? 'red': slot.reCount <= slot.remindCount?'orange':'green' ,
+                    v-for="(row, rowIndex) in slot.sysWorkplaceQueueList"
-                            fontSize: '12px',
+                    :key="rowIndex"
-                      fontWeight: 'bold',
+                    :style="{ display: 'flex', flexWrap: 'nowrap', height: `10px`,marginTop: `2px` }"
-                      position: 'absolute',
+                  >
-                      bottom: 0,
+                    <div
-                      right: 0,
+                      v-for="(slot, slotIndex) in row.sysWorkplaceQueues"
-                      margin: '10px'
+                      :key="slot.id"
-                          }">{{ slot.reCount <= 0? '无库存': slot.reCount <= slot.remindCount?'低库存':'正常' }}
+                      class="shelf-slot-Queue"
-                </span>
+                      :style="{ width: `${180 / row.sysWorkplaceQueues.length}%` , height: `10px`, backgroundColor: slot.reCount <= 0? 'red': slot.reCount <= slot.remindCount?'orange':'green' }"
+                    >
+                    </div>
+                  </div>
+<!--                <span :style="{-->
+<!--                            color:  slot.reCount <= 0 ?'orange':'green' ,-->
+<!--                            fontSize: '12px',-->
+<!--                      fontWeight: 'bold',-->
+<!--                      position: 'absolute',-->
+<!--                      bottom: 0,-->
+<!--                      right: 0,-->
+<!--                      margin: '10px'-->
+<!--                          }">{{  slot.reCount <= 0 ?'低库存':'正常' }}-->
+<!--                </span>-->
               </el-card>
             </div>
 
@@ -215,8 +228,8 @@ export default {
 .shelf-slot {
   margin-right: 10px; /* 增加槽位之间的间距 */
   margin-bottom: 10px; /* 增加槽位之间的间距 */
-  width: 180px; /* 固定槽位宽度 */
+  width: 200px; /* 固定槽位宽度 */
-  height: 100px; /* 固定槽位高度 */
+  height: 200px; /* 固定槽位高度 */
   display: flex;
   align-items: center; /* 垂直居中 */
   justify-content: space-between; /* 水平居中 */
@@ -226,6 +239,18 @@ export default {
   z-index: 10;
 }
 
+
+.shelf-slot-Queue {
+  margin: 2px;
+  display: flex;
+  align-items: center; /* 垂直居中 */
+  justify-content: space-between; /* 水平居中 */
+  transition: transform 0.3s ease; /* 平滑的过渡效果 */
+  transform-style: preserve-3d; /* 保持3D变换的子元素在3D空间中 */
+  perspective: 800px; /* 设置透视效果，模拟3D深度 */
+  z-index: 66;
+}
+
 .shelf-slot:hover {
   z-index: 25;
   transform: perspective(800px) rotateX(0deg) rotateY(0deg) scale(1.1); /* 悬停时应用3D变换和放大效果 */
@@ -233,7 +258,7 @@ export default {
 .slot-card {
   width: 100%; /* 确保卡片宽度与槽位一致 */
   height: 100%; /* 确保卡片高度与槽位一致 */
-  box-sizing: border-box; /* 确保宽度和高度包含内边距和边框 */
+  /*box-sizing: border-box; !* 确保宽度和高度包含内边距和边框 *!*/
   /* 应用从白色到淡淡绿色的线性渐变背景 */
   background: linear-gradient(to bottom, white, #d4edda);
   /* #d4edda 是一个浅绿色，接近于 Bootstrap 中的成功提示背景色 */
@@ -241,5 +266,4 @@ export default {
   box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1); /* 可选：为卡片添加阴影，增加立体感 */
   position: relative; /* 为了让内部的绝对定位元素相对于卡片定位 */
 }
-
 </style>

src/views/collect/CollectOrderAllotCardComponents.vue

@@ -772,7 +772,7 @@ export default {
         this.filterQuery.endTime = null;
       }
       let query = JSON.parse(JSON.stringify(this.filterQuery));
-      query.workPlaceCode = null
+      // query.workPlaceCode = null
       orderPage(query).then(res => {
         this.loading = false
         this.list = res.data.list || []

src/views/collect/DealOrder.vue

@@ -324,7 +324,7 @@
       >
         <selectPrescribeDialog
           ref="childRef"
-          :workPlaceCode="null"
+          :workPlaceCode="this.workplaceId"
           :busType="this.formData.busType"
           :fromCorp="this.formData.fromCorp"
           :confirmSelect="this.confirmSelect"

src/views/collect/selectCollectOrderDialog.vue

@@ -642,7 +642,9 @@ export default {
         this.filterQuery.startTime = null;
         this.filterQuery.endTime = null;
       }
-      this.filterQuery.workPlaceCode = null
+      // this.filterQuery.workPlaceCode = null
+      this.filterQuery.workPlaceCode = this.$route.query.workplaceId
+      // workPlaceCode: this.workplaceId,
       this.filterQuery.busType = this.busType
       // this.filterQuery.fromCorp = this.fromCorp
       this.filterQuery.excludeWorkCode = null

src/views/inout/DialogCreateOrder.vue

@@ -1928,8 +1928,26 @@ export default {
     };
     var that = this;
     var inputer = document.getElementById("inputer");
+    // inputer.addEventListener('keypress', function(e) {
+    //   if (e.charCode === 29) {
+    //     // this.value += String.fromCharCode(e.which);
+    //     that.sictomText = that.sictomText + String.fromCharCode(e.which);
+    //     console.log(that.sictomText+"*")
+    //   }
+    //
+    //     // if (that.sitcomScan) {
+    //     //   let tempTxt = text;
+    //     //   let str = tempTxt.replace(/[\r]/g, "");
+    //     //   that.sictomText = that.sictomText + str;
+    //     //   that.codeFormData.code = that.sictomText;
+    //     // } else {
+    //     //   that.codeFormData.code = text;
+    //     // }
+    // });
     window.sc = new A.KeyScaner(inputer); //传入要监听的DOM节点
+
     sc.onInput = function (text) {
+
       if (text.includes("delete")) {
         that.codeFormData.code = "";
         that.sictomText = "";
@@ -1941,8 +1959,11 @@ export default {
         let str = tempTxt.replace(/[\r]/g, "");
         that.sictomText = that.sictomText + str;
         that.codeFormData.code = that.sictomText;
+        console.log(text + "*1")
       } else {
+        console.log(text + "*2")
         that.codeFormData.code = text;
+        that.scanCode = text;
       }
     };
     inputer.focus();