jn

2024-02-26 09:00:43 +08:00 · 2024-02-26 09:00:43 +08:00 · 9b6d083888
parent b799dee5eb
commit 9b6d083888
2 changed files with 31 additions and 4 deletions
--- a/logs/JIAL-ss.log
+++ b/logs/JIAL-ss.log
--- a/target/classes/templates/zmquotation/index.html
+++ b/target/classes/templates/zmquotation/index.html
@ -519,10 +519,7 @@
                dialogInventoryVisible: false,
                inventoryTableData: [],
                clickedRowIndex: null, // 用于记录点击的行的索引
-<<<<<<< HEAD
                materialTotalRows: 0,
-=======
->>>>>>> df9601da10f7db0d8609eddc1505f4a6f7a1f427
            }
        },
        computed: {
@ -706,7 +703,7 @@
                    this.$set(this.materialData, this.clickedRowIndex, updatedRow);
                }
                this.dialogInventoryVisible = false; // 打开选择盘具的 dialog
-                // 其他逻辑...23123123
+                // 其他逻辑...
            },

        },