Keep query field order when using Batch Edit

[alesan99]

Fixes #6597

Preserves order from query to batch edit.

Query:

New:

Old:

What this PR does not do:

• Order new tree rank columns by rank id. Should this be a new issue, Or in this PR?

Checklist

• Self-review the PR after opening it to make sure the changes look good and
  self-explanatory (or properly documented)
• Add relevant issue to release milestone
• Add pr to documentation list
• Add automated tests

Testing instructions

• Create a query with many fields, including ones from different tables.
  • Fields from different tables shouldn't get grouped together. Test this by putting fields in-between fields belonging to other tables.
  • Also test fields with the same name. Like cataloger last name and determiner last name, for example.
• Click Batch Edit
• See that the order stayed the same as in the original query.
• Make sure there are no glitches when sorting by column, looking at the mapping, editing cells, and searching
• Create a query with tree fields. Batch edit should prompt you to add missing ranks.
• See that the order is the same, and all new columns were added to the end.