浏览代码

问题件和订单 分箱号展开方式

ajun 5 年之前
父节点
当前提交
040e99411a
共有 2 个文件被更改,包括 8 次插入11 次删除
  1. 5 8
      resources/views/order/index/delivering.blade.php
  2. 3 3
      resources/views/order/issue/index.blade.php

+ 5 - 8
resources/views/order/index/delivering.blade.php

@@ -858,25 +858,22 @@
                 copyLogisticNumber(){
                     let text="";
                     this.checkData.forEach((code,i)=>{
-                        if (this.picktotraceidMap[code] && this.picktotraceidMap[code].length>1){console.log(1);
+                        if(this.picktotraceidMap[code] && this.picktotraceidMap[code].length>1){
                             this.picktotraceidMap[code].forEach((number,j)=>{
-                                text += number;
-                                if (i!==this.checkData.length-1 && j!==this.picktotraceidMap[code].length-1){
-                                    text += ",";
-                                }
+                                text += number+"\r\n";
                             });
-                        }else{
+                        }else {
                             this.orders.some(order=>{
                                 if (order.orderno == code){
                                     if (order.soreference5) {
-                                        text += order.soreference5;
-                                        if(i!==this.checkData.length-1)text += "\r\n";
+                                        text += order.soreference5+"\r\n";
                                     }
                                     return true;
                                 }
                             });
                         }
                     });
+                    text.substring(0,text.lastIndexOf("\r\n",text));
                     if (!text)text = " ";
                     this.copyText(text)
                 },

+ 3 - 3
resources/views/order/issue/index.blade.php

@@ -257,9 +257,9 @@
                             <span v-if='orderIssue.order.logistic'>@{{ orderIssue.order.logistic.name }}</span>
                         </td>
                         <td class=" hide-content p-0 td-yellow child-layer-2" valign="middle" align="center">
-                            <span :id="'logisticNumbers'+orderIssue.id" :class="orderIssue.order.logisticNumbers.length > 1 ?'collapse ':''">
-                                <span v-for="logisticNumber in orderIssue.order.logisticNumbers" >@{{ logisticNumber }}&nbsp;&nbsp;</span>
-                            </span>
+                            <div :class="orderIssue.order.logisticNumbers.length > 1 ?'collapse ':''" :id="'logisticNumbers'+orderIssue.id" >
+                                <p class="m-0 p-0" v-for="logisticNumber in orderIssue.order.logisticNumbers" >@{{ logisticNumber }}&nbsp;&nbsp;</p>
+                            </div>
                             <button v-if="orderIssue.order.logisticNumbers.length > 1" type="button" class="btn btn-sm btn-outline-primary align-middle mt-1"
                                     :id="'logisticNumbersBtn'+orderIssue.id" data-toggle="collapse" :data-target="'#logisticNumbers'+orderIssue.id"
                                     @click="toggleLogisticNumbers(orderIssue.id,orderIssue.order.logisticNumbers.length)">