修复删除bug

app/public/js/material_list.js

@@ -1700,6 +1700,61 @@ $(document).ready(() => {
             materialSelfSpread.bind(spreadNS.Events.EditEnded, materialSelfSpreadObj.editEnded);
             materialSelfSpread.bind(spreadNS.Events.ClipboardPasted, materialSelfSpreadObj.clipboardPasted);
             SpreadJsObj.addDeleteBind(materialSelfSpread, materialSelfSpreadObj.deletePress);
+
+            if (!editForAudit) {
+                $.contextMenu({
+                    selector: '#material-self-spread',
+                    build: function ($trigger, e) {
+                        const target = SpreadJsObj.safeRightClickSelection($trigger, e, materialSelfSpread);
+                        return target.hitTestType === GC.Spread.Sheets.SheetArea.viewport || target.hitTestType === GC.Spread.Sheets.SheetArea.rowHeader;
+                    },
+                    items: {
+                        'create': {
+                            name: '添加工料',
+                            icon: 'fa-sign-in',
+                            callback: function (key, opt) {
+                                // 获取已选清单
+                                changeMaterialTable('self');
+                                $('#add_type').val('self');
+                                $('#addgl').modal('show');
+                            },
+                            disabled: function (key, opt) {
+                                const sheet = leafXmjSpread.getActiveSheet();
+                                const select = SpreadJsObj.getSelectObject(sheet);
+                                // const notx = findNotJoinLeafXmj(select);
+                                if (!select) {
+                                    return true;
+                                }
+                                // if (!readOnly && notx === undefined) {
+                                //     return false;
+                                // } else {
+                                //     return true;
+                                // }
+                                return readOnly;
+                            },
+                        },
+                        'delete': {
+                            name: '删除工料',
+                            icon: 'fa-remove',
+                            callback: function (key, opt) {
+                                materialSelfSpreadObj.del(materialSelfSpread.getActiveSheet());
+                            },
+                            disabled: function (key, opt) {
+                                const sheet = materialSelfSpread.getActiveSheet();
+                                const select = SpreadJsObj.getSelectObject(sheet);
+                                if (!select) {
+                                    return true;
+                                }
+                                if (!readOnly && select) {
+                                    return false;
+                                } else {
+                                    return true;
+                                }
+                            }
+                        },
+                    }
+                });
+            }
         }
         if (!openMaterialChecklist && !editForAudit) {
             $.contextMenu({
@@ -1755,60 +1810,6 @@ $(document).ready(() => {
                 }
             });
         }
-        if (openMaterialSelf && !editForAudit) {
-            $.contextMenu({
-                selector: '#material-self-spread',
-                build: function ($trigger, e) {
-                    const target = SpreadJsObj.safeRightClickSelection($trigger, e, materialSelfSpread);
-                    return target.hitTestType === GC.Spread.Sheets.SheetArea.viewport || target.hitTestType === GC.Spread.Sheets.SheetArea.rowHeader;
-                },
-                items: {
-                    'create': {
-                        name: '添加工料',
-                        icon: 'fa-sign-in',
-                        callback: function (key, opt) {
-                            // 获取已选清单
-                            changeMaterialTable('self');
-                            $('#add_type').val('self');
-                            $('#addgl').modal('show');
-                        },
-                        disabled: function (key, opt) {
-                            const sheet = leafXmjSpread.getActiveSheet();
-                            const select = SpreadJsObj.getSelectObject(sheet);
-                            // const notx = findNotJoinLeafXmj(select);
-                            if (!select) {
-                                return true;
-                            }
-                            // if (!readOnly && notx === undefined) {
-                            //     return false;
-                            // } else {
-                            //     return true;
-                            // }
-                            return readOnly;
-                        },
-                    },
-                    'delete': {
-                        name: '删除工料',
-                        icon: 'fa-remove',
-                        callback: function (key, opt) {
-                            materialSelfSpreadObj.del(materialSelfSpread.getActiveSheet());
-                        },
-                        disabled: function (key, opt) {
-                            const sheet = materialSelfSpread.getActiveSheet();
-                            const select = SpreadJsObj.getSelectObject(sheet);
-                            if (!select) {
-                                return true;
-                            }
-                            if (!readOnly && select) {
-                                return false;
-                            } else {
-                                return true;
-                            }
-                        }
-                    },
-                }
-            });
-        }
     }
 
     // 应用调差工料至其他清单明细