修正很多東西

web/admin/order/reg.aspx

@@ -900,6 +900,7 @@
                     //console.log("底家:",this.data_table.selected);
                     localStorage.setItem("item", item.actitem_num_selected.val);
                     localStorage.setItem("list", JSON.stringify(list));
+                    localStorage.setItem("mode","preview");
 
                     document.body.appendChild(form); // Not entirely sure if this is necessary
                     form.submit();
@@ -910,7 +911,7 @@
                 async editTabletNew(item) {
                     this.editedIndex = this.desserts.indexOf(item);
                     this.editedItem = $.extend(true, {}, item);
-
+                    console.log("editTabletNew:",this.editedItem,item)
                     try {
                         //document.getElementById("tablet_edit_new_iframe").contentWindow.location.reload();
                         // 如果是新項目，先保存
@@ -920,6 +921,7 @@
                             if (savedItem) {
                                 this.$set(this.desserts, this.editedIndex, savedItem);
                                 this.editedItem = $.extend(true, {}, savedItem);
+                                console.log("savedItem:", this.editedItem)
                             }
                         }
                         // 先發送消息
@@ -1129,7 +1131,8 @@
                 async save(shouldClose = true) {
                     if (this.editedIndex > -1) {
                         if (this.order_no != '') {
-                            console.log("ok:",this.editedItem);
+                            this.editedItem.order_no=this.order_no
+                            //console.log("ok:",this.editedItem);
                             //chcck necessary params
                             if (this.editedItem.actitem_num_selected.val != 0 &&
                                 this.editedItem.keyin1_selected.val !=0 &&
@@ -1137,11 +1140,11 @@
                                /* (this.editedItem.category=="1"? this.editedItem.from_id_selected.val != 0 : true) &&*/
                                 this.requireData(this.editedItem.qty, (this.editedItem.num == 0 ? false : true)) ) /* qty為0視為不需要此項目,不儲存此筆資料*/
                             {
-                                console.log(this.editedItem);
+                                //console.log(this.editedItem);
                                 //check price
                                 if (this.editedItem.pay <= this.editedItem.price * this.editedItem.qty) {
-                                    console.log(this.editedItem.f_num_selected.val);
-                                    console.log(this.editedItem.from_id_selected.val);
+                                    //console.log(this.editedItem.f_num_selected.val);
+                                    //console.log(this.editedItem.from_id_selected.val);
                                     //check qty
                                     //數量不可小於掛單明細的數量
                                     if (this.editedItem.qty >= this.editedItem.writeBedQty + this.editedItem.notBedQty) {
@@ -2176,9 +2179,9 @@
                                   <v-icon title="刪除" color="red" class="mr-2" @click="deleteItem(item)">
                                     mdi-delete
                                   </v-icon>
-                                  <%--<v-icon title="編輯牌位" color="blue" class="mr-2" @click="editTablet(item);">
+                                  <v-icon title="編輯牌位" color="blue" class="mr-2" @click="editTablet(item);">
                                     mdi-file-document-edit-outline
-                                  </v-icon>   --%>  
+                                  </v-icon>  
                                   <v-icon title="編輯牌位New" color="blue" class="mr-2" @click="editTabletNew(item);">
                                     mdi-file-document-edit-outline
                                   </v-icon>