Merge remote-tracking branch 'origin/dev' into dev

liuleilei

2023-09-11 faf1d3cc35a3a5f83558946c8056537a4d77fa1f

 web_standard/src/components/ext/OperaProceduresExtWindow.vue

@@ -156,7 +156,7 @@
        // tobescrappedWarehouseId: '',
        iscalculate: 1,
        level: 0,
        needcheck: 0,
        needcheck: 1,
        sortnum: ''
      },
      iscalculates: [