Merge branch 'develop' into devTee

This commit is contained in:
STW_TTTY\stwtt 2024-04-22 11:35:49 +07:00
commit 6c6cdc0462

View file

@ -4,6 +4,7 @@ import { useQuasar } from "quasar";
import http from "@/plugins/http";
import config from "@/app.config";
import { useRoute } from "vue-router";
import { useDevelopmentDataStore } from "@/modules/15_development/store/developmentStore";
import type { QTableProps } from "quasar";
import type { DataOption } from "@/modules/15_development/interface/index/Main";
import type {
@ -22,6 +23,8 @@ import type {
import DialogHeader from "@/components/DialogHeader.vue";
import { useCounterMixin } from "@/stores/mixin";
const store = useDevelopmentDataStore();
const route = useRoute();
const projectId = ref<string>(route.params.id.toLocaleString());
const $q = useQuasar();
@ -471,7 +474,7 @@ onMounted(() => {
<q-card bordered style="border: 1px solid #d6dee1">
<div class="text-weight-medium bg-grey-1 q-py-sm q-px-md">
เปาหมายตามแผน
<q-btn flat round dense icon="add" color="primary">
<q-btn v-if="store.projectStatus !== 'FINISH'" flat round dense icon="add" color="primary">
<q-menu>
<q-list style="min-width: 100px">
<q-item
@ -544,6 +547,7 @@ onMounted(() => {
</q-td>
<q-td>
<q-btn
v-if="store.projectStatus !== 'FINISH'"
round
flat
color="primary"
@ -601,6 +605,7 @@ onMounted(() => {
</q-td>
<q-td>
<q-btn
v-if="store.projectStatus !== 'FINISH'"
round
flat
color="primary"
@ -628,7 +633,7 @@ onMounted(() => {
</q-card>
<!--CARD เปาหมายตามจร -->
<q-card bordered style="border: 1px solid #d6dee1" class="q-mt-md">
<q-card v-if="store.projectStatus === 'FINISH'" bordered style="border: 1px solid #d6dee1" class="q-mt-md">
<div class="text-weight-medium bg-grey-1 q-py-sm q-px-md">
เปาหมายตามจร
<q-btn flat round dense icon="add" color="primary">