diff --git a/src/main/resources/templates/zmquotation/index.html b/src/main/resources/templates/zmquotation/index.html index 684c85c..00f3942 100644 --- a/src/main/resources/templates/zmquotation/index.html +++ b/src/main/resources/templates/zmquotation/index.html @@ -704,7 +704,7 @@ this.$set(this.materialData, this.clickedRowIndex, updatedRow); } this.dialogInventoryVisible = false; // 打开选择盘具的 dialog - // 其他逻辑...23123123 + // 其他逻辑... }, }, diff --git a/target/classes/templates/zmquotation/index.html b/target/classes/templates/zmquotation/index.html index 88d9c44..684c85c 100644 --- a/target/classes/templates/zmquotation/index.html +++ b/target/classes/templates/zmquotation/index.html @@ -183,33 +183,17 @@ >>>>>> b1df0122aa39f2820f3b77c6d2aafe960d76c135 prop="voltage" label="电压"> >>>>>> b1df0122aa39f2820f3b77c6d2aafe960d76c135 prop="standard" label="标准"> - - >>>>>> b1df0122aa39f2820f3b77c6d2aafe960d76c135 prop="costPrice" label="成本价"> @@ -221,21 +205,6 @@ - - - - - >>>>>> b1df0122aa39f2820f3b77c6d2aafe960d76c135 prop="weighInv" label="盘重"> @@ -296,11 +264,7 @@ -<<<<<<< HEAD -
-=======
->>>>>>> b1df0122aa39f2820f3b77c6d2aafe960d76c135 @@ -374,25 +338,16 @@
-<<<<<<< HEAD -
- >>>>>> b1df0122aa39f2820f3b77c6d2aafe960d76c135 ref="materialTable" @selection-change="handleSelectionChange" :header-cell-style="{ background: '#eef1f6', color: '#606266', 'text-align': 'center', 'padding': '0px'}" :cell-style="{'text-align': 'center', 'padding': '5px 0px'}" highlight-selection-row -<<<<<<< HEAD -======= :row-key="row => row.materialName" :reserve-selection="true" ->>>>>>> b1df0122aa39f2820f3b77c6d2aafe960d76c135 border> -<<<<<<< HEAD - - - -=======
->>>>>>> b1df0122aa39f2820f3b77c6d2aafe960d76c135
-<<<<<<< HEAD -======= ->>>>>>> b1df0122aa39f2820f3b77c6d2aafe960d76c135
确认 取消 -<<<<<<< HEAD -=======
@@ -507,7 +448,6 @@ ->>>>>>> b1df0122aa39f2820f3b77c6d2aafe960d76c135
>>>>>> b1df0122aa39f2820f3b77c6d2aafe960d76c135 ], + regionTableData: [], price_0t_5t: '', price_5t_10t: '', price_10t_25t: '', @@ -586,28 +510,6 @@ materialCurrentPage: 1, pageSize: 10, dialogMaterialVisible: false, -<<<<<<< HEAD - materialTableData: [ - { - materialName: 'Material 1', - model: 'Model A', - district: 'Spec 1', - voltage: '220V', - standard: 'Standard 1', - core: 'Core X' - }, - { - materialName: 'Material 2', - model: 'Model B', - district: 'Spec 2', - voltage: '110V', - standard: 'Standard 2', - core: 'Core Y' - }, - // Add more data as needed - ], - selectedMaterialItems: [], // 选中的数据 -======= materialTableData: [], selectedMaterialItems: [], // 选中的数据 savedSelectedMaterials: [], // 保存选中的数据 @@ -617,7 +519,6 @@ dialogInventoryVisible: false, inventoryTableData: [], clickedRowIndex: null, // 用于记录点击的行的索引 ->>>>>>> b1df0122aa39f2820f3b77c6d2aafe960d76c135 } }, computed: { @@ -715,14 +616,6 @@ this.dialogMaterialVisible = true; }, handleSelectionChange(selection) { -<<<<<<< HEAD - // 当选择发生变化时更新选中数据 - this.selectedMaterialItems = selection; - }, - removeSelectedItem(selectedItem) { - // 移除选中的记录 - const index = this.selectedMaterialItems.indexOf(selectedItem); -======= selection.forEach(item => { // 判断是否已经存在于已选列表中,避免重复添加 if (!this.selectedMaterialItems.some(selectedItem => selectedItem.materialName === item.materialName)) { @@ -737,24 +630,15 @@ // 从已选列表中移除该项 const index = this.selectedMaterialItems.findIndex(item => item.materialName === selectedItem.materialName); ->>>>>>> b1df0122aa39f2820f3b77c6d2aafe960d76c135 if (index !== -1) { this.selectedMaterialItems.splice(index, 1); } -<<<<<<< HEAD - // 同步取消左侧表格中对应项的选择 - const tableIndex = this.materialTableData.indexOf(selectedItem); - if (tableIndex !== -1) { - this.$refs.materialTable.toggleRowSelection(this.materialTableData[tableIndex]); - } -======= // 如果当前数据被选择,则取消 el-table 中该项的选择状态 if (isSelected) { this.$refs.materialTable.toggleRowSelection(selectedItem, false); } ->>>>>>> b1df0122aa39f2820f3b77c6d2aafe960d76c135 }, addMaterialToTable() { @@ -770,9 +654,6 @@ closeMaterialDialog() { this.dialogMaterialVisible = false; -<<<<<<< HEAD - } -======= }, searchMaterial() { @@ -823,12 +704,11 @@ this.$set(this.materialData, this.clickedRowIndex, updatedRow); } this.dialogInventoryVisible = false; // 打开选择盘具的 dialog - // 其他逻辑... + // 其他逻辑...23123123 }, ->>>>>>> b1df0122aa39f2820f3b77c6d2aafe960d76c135 }, }) - \ No newline at end of file +