1.報名牌位 2.牌位列印

web/admin/order/reg.aspx

@@ -11,9 +11,9 @@
     border-bottom: 1px solid #eee;
 }
 </style>
+
 </asp:Content>
 <asp:Content ID="Content4" ContentPlaceHolderID="footer_script" runat="Server">
-
     <script>
         Vue.filter('timeString', function (value, myFormat) {
             return value == null || value == "" ? "" : moment(value).format(myFormat || 'YYYY-MM-DD, HH:mm:ss');
@@ -531,13 +531,13 @@
                 window.addEventListener('message', async (event) => {
                     if (event.data.source === 'editor.btn.click') {
                         const receivedData = event.data.data;
-                        
+
                         // 更新編輯中的項目
                         //if (receivedData.tabletItem && this.editedIndex > -1) {
                         if (receivedData.tabletItem) {
                             // 將 tablet_data 轉換為 JSON 字串
                             //this.editedItem.f_num_tablet = JSON.stringify(receivedData.tablet_data);
-                            
+
                             // 確保其他必要欄位保持不變
                             const currentItem = this.desserts[this.editedIndex];
                             //currentItem.f_num_tablet = JSON.stringify(receivedData.tablet_data);
@@ -549,14 +549,41 @@
                             // 呼叫 save 方法
                             await this.save();
                         }
-                        
+
                         // 關閉編輯對話框
                         this.tablet_edit.show = false;
-                        thiw.tablet_edit_new.show = false;
+                        this.tablet_edit_new.show = false;
-                        
+
                         // 顯示成功訊息
                         this.snackbar.text = '牌位資料已更新';
                         this.snackbar.show = true;
+                    } else if (event.data.source === 'editorNew.btn.click') {
+
+                        const receivedData = event.data.data;
+
+                        // 更新編輯中的項目
+                        //if (receivedData.tabletItem && this.editedIndex > -1) {
+                        if (receivedData.tabletItem) {
+                            // 將 tablet_data 轉換為 JSON 字串
+                            //this.editedItem.f_num_tablet = JSON.stringify(receivedData.tablet_data);
+
+                            // 確保其他必要欄位保持不變
+                            const currentItem = this.desserts[this.editedIndex];
+                            //currentItem.f_num_tablet = JSON.stringify(receivedData.tablet_data);
+                            this.editedItem = {
+                                ...currentItem,
+                                f_num_tablet: JSON.stringify(receivedData.tablet_data),
+                                style: receivedData.style
+                            };
+                            // 呼叫 save 方法
+                            await this.save();
+                        }
+                        this.tablet_edit_new.show = false;
+
+                        // 顯示成功訊息
+                        this.snackbar.text = '牌位資料已更新';
+                        this.snackbar.show = true;
+
                     }
                 });
                 
@@ -585,6 +612,7 @@
                 'tablet_edit.show': {
                     handler(newVal) {
                         if (!newVal && this._savedEditedItem) {
+                           // console.log("三小");
                             this.editedItem = $.extend(true, {}, this._savedEditedItem);
                             this._savedEditedItem = null;
                         }
@@ -593,6 +621,8 @@
                 'tablet_edit_new.show': {
                     handler(newVal) {
                         if (!newVal && this._savedEditedItem) {
+                            //console.log("不合理");
+                            //$("#tablet_edit_new_iframe").src = $("#tablet_edit_new_iframe").src;
                             this.editedItem = $.extend(true, {}, this._savedEditedItem);
                             this._savedEditedItem = null;
                         }
@@ -845,6 +875,9 @@
                     this.editedItem = $.extend(true, {}, item);
 
                     try {
+                        console.log("衝啥");
+
+                        //document.getElementById("tablet_edit_new_iframe").contentWindow.location.reload();
                         // 如果是新項目，先保存
                         if (this.editedItem.num <= 0 || this.editedItem.num === null || this.editedItem.num === undefined) {
                             this.editedItem.qty = 1;
@@ -859,6 +892,7 @@
                         // 保存當前的 editedItem 數據
                         const currentData = $.extend(true, {}, this.editedItem);
                         // 顯示對話框
+                        
                         this.tablet_edit_new.show = true;
                         // 立即恢復數據
                         this.editedItem = $.extend(true, {}, currentData);

web/admin/print/print_multi_new.aspx

@@ -534,7 +534,7 @@
                 }
 
                 .sub-text {
-                    font-size: ${ancestorFontSize}px ;/*0.8em;*/ /* 縮小字體 */
+                    /*font-size: ${ancestorFontSize}px ;*//*0.8em;*/ /* 縮小字體 */
                     line-height: 1.2;
                     margin-top: 4px; /* 與上方林張的間距 */
                     white-space: normal; /* 避免自動換行 */

web/web.config

@@ -46,8 +46,8 @@
   </appSettings>
   <connectionStrings>
     <!--SQL用-->
-    <add name="shopConn" providerName="System.Data.SqlClient" connectionString="Data Source=192.168.5.27;Initial Catalog=17168erp_c;User ID=sa;Password=linux@mssql1234;Encrypt=False;TrustServerCertificate=True;Provider=SQLOLEDB;Connection Timeout=10;" />
+    <add name="shopConn" providerName="System.Data.SqlClient" connectionString="Data Source=192.168.5.20;Initial Catalog=17168erp_c;User ID=sa;Password=linux@mssql1234;Encrypt=False;TrustServerCertificate=True;Provider=SQLOLEDB;Connection Timeout=10;" />
-    <add name="ezEntities" providerName="System.Data.EntityClient" connectionString="metadata=res://*/App_Code.Model.Model.csdl|res://*/App_Code.Model.Model.ssdl|res://*/App_Code.Model.Model.msl;provider=System.Data.SqlClient;provider connection string=&quot;Data Source=192.168.5.27;Initial Catalog=17168erp_c;User ID=sa;Password=linux@mssql1234;Encrypt=False;TrustServerCertificate=True;Connection Timeout=10;&quot;" />
+    <add name="ezEntities" providerName="System.Data.EntityClient" connectionString="metadata=res://*/App_Code.Model.Model.csdl|res://*/App_Code.Model.Model.ssdl|res://*/App_Code.Model.Model.msl;provider=System.Data.SqlClient;provider connection string=&quot;Data Source=192.168.5.20;Initial Catalog=17168erp_c;User ID=sa;Password=linux@mssql1234;Encrypt=False;TrustServerCertificate=True;Connection Timeout=10;&quot;" />
     <!-- 
     -->
     <!--SQL用-->