Merge branch 'develop' into nice_dev

# Conflicts:
#	src/modules/11_discipline/router.ts

src/modules/11_discipline/stroes/OrderStore.ts

@@ -0,0 +1,24 @@
+import { defineStore } from "pinia";
+import { ref } from "vue";
+
+export const useOrderStore = defineStore("order", () => {
+    const rows = ref<any>([])
+    async function fecthOrder(data: any) {
+        let datalist = data.map((e: any) => ({
+            subject: e.subject,
+            ordernumber: e.ordernumber,
+            dateOrder: e.dateOrder,
+            orderby: e.orderby,
+            signer: e.signer,
+            statusorder: e.statusorder
+
+
+        }))
+        rows.value = datalist
+    }
+
+    return {
+        rows,
+        fecthOrder
+    }
+})