Merge branch 'develop' into nice_dev

# Conflicts:
#	src/api/11_discipline/api.discipline.ts
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2023-11-27 17:34:51 +07:00
parent 73a0384fa8
commit eafbc65bf2
6 changed files with 104 additions and 28 deletions

View file

@ -6,6 +6,7 @@ import type {
DataOption,
directorType,
responseType,
DataOptioGroup,
} from "@/modules/11_discipline/interface/index/Main";
import { useCounterMixin } from "@/stores/mixin";
const mixin = useCounterMixin();
@ -23,14 +24,22 @@ export const useInvestigateDisStore = defineStore(
{ id: "1", name: "ร้ายแรง" },
{ id: "2", name: "ไม่ร้ายแรง" },
]);
const optionsfaultLevel = ref<DataOption[]>([
// { id: "0", name: "ไม่ร้ายแรง" },
// { id: "1", name: "ภาคทัณฑ์" },
// { id: "2", name: "ตัดเงินเดือน" },
// { id: "3", name: "ลดขั้นเงินเดือน" },
// { id: "4", name: "ร้ายแรง" },
// { id: "5", name: "ปลดออก" },
// { id: "6", name: "ไล่ออก" },
const optionsfaultLevel = ref<DataOptioGroup[]>([
{ id: "0", name: "ไม่ร้ายแรง", disable: true },
{ id: "ภาคทัณฑ์", name: "ภาคทัณฑ์", disable: false },
{
id: "ตัดเงินเดือน",
name: "ตัดเงินเดือน",
disable: false,
},
{
id: "ลดขั้นเงินเดือน",
name: "ลดขั้นเงินเดือน",
disable: false,
},
{ id: "4", name: "ร้ายแรง", disable: true },
{ id: "ปลดออก", name: "ปลดออก", disable: false },
{ id: "ไล่ออก", name: "ไล่ออก", disable: false },
]);
async function fetchList(data: investigateDisDataRowType[]) {
let datalist: any[] = data.map((e: any) => ({