Merge branch 'develop' into devTee

This commit is contained in:
setthawutttty 2023-12-15 17:30:06 +07:00
commit b659857c7b
24 changed files with 1145 additions and 796 deletions

View file

@ -22,7 +22,7 @@ import http from "@/plugins/http";
import config from "@/app.config";
const type = ref<string>("");
const rows = ref<DataListRow[]>([])
const rows = ref<DataListRow[]>([]);
const $q = useQuasar();
const selected = ref<ResponseData[]>([]);
const mixin = useCounterMixin();
@ -125,9 +125,11 @@ const fecthTypeOption = async () => {
.then((res) => {
optionsType.value = res.data.result.filter(
(e: OpType) =>
e.commandCode === "C-PM-26" ||
e.commandCode === "C-PM-19" ||
e.commandCode === "C-PM-20" ||
e.commandCode === "C-PM-27" ||
e.commandCode === "C-PM-28"
e.commandCode === "C-PM-28" ||
e.commandCode === "C-PM-29"
);
})
.catch((e) => {
@ -141,9 +143,11 @@ const fecthTypeOption = async () => {
watchEffect(() => {
if (props.Modal === true) {
selected.value = [];
type.value = ''
type.value = "";
// console.log(props.data.status)
rows.value = props.data.persons.filter((item: any) => item.status !== 'REPORT');
rows.value = props.data.persons.filter(
(item: any) => item.status !== "REPORT"
);
}
});