Merge branch 'develop' of https://github.com/Frappet/bma-ehr-frontend into develop
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
commit
5f516981ee
14 changed files with 482 additions and 348 deletions
|
|
@ -64,6 +64,8 @@ const formData = reactive<FormProjectDetail>({
|
|||
projectDayHoldActual: null,
|
||||
projectNigthHoldActual: null,
|
||||
developmentProjectTechniqueActuals: [],
|
||||
projectModalActual: null,
|
||||
projectModalPlanneds: null,
|
||||
});
|
||||
|
||||
const nodes = ref<any>([
|
||||
|
|
@ -162,7 +164,7 @@ onMounted(() => {
|
|||
|
||||
<template>
|
||||
<q-form greedy @submit.prevent @validation-success="onSubmit">
|
||||
<div class="row q-pa-md q-col-gutter-sm">
|
||||
<div class="row">
|
||||
<div class="col-12">
|
||||
<q-select
|
||||
dense
|
||||
|
|
@ -177,260 +179,308 @@ onMounted(() => {
|
|||
multiple
|
||||
/>
|
||||
</div>
|
||||
<div class="col-12 col-sm-6 col-md-4">
|
||||
<q-input
|
||||
dense
|
||||
outlined
|
||||
v-model="formData.projectModal"
|
||||
label="จำนวน (รุ่น)"
|
||||
mask="#"
|
||||
reverse-fill-mask
|
||||
/>
|
||||
</div>
|
||||
|
||||
<q-card bordered class="col-12 q-my-sm">
|
||||
<div
|
||||
class="col-xs-12 col-sm-12 text-weight-medium bg-grey-3 q-py-xs q-px-md"
|
||||
>
|
||||
ความสอดคล้องหรือเชื่อมโยงกับยุทธศาสตร์ / แผน
|
||||
</div>
|
||||
<q-separator />
|
||||
|
||||
<div class="col-12"><q-separator class="q-my-md" /></div>
|
||||
<q-card-section>
|
||||
<div class="row col-12 q-col-gutter-sm">
|
||||
<div class="col-6">
|
||||
<q-card bordered class="col-12">
|
||||
<div
|
||||
class="col-xs-12 col-sm-12 text-weight-medium bg-grey-1 q-py-xs q-px-md"
|
||||
>
|
||||
ยุทธศาสตร์ / แผน
|
||||
</div>
|
||||
<q-separator />
|
||||
|
||||
<div class="row">
|
||||
<div
|
||||
:class="
|
||||
store.projectStatus === 'FINISH'
|
||||
? 'col-6 q-col-gutter-sm'
|
||||
: 'col-12 q-col-gutter-sm'
|
||||
"
|
||||
>
|
||||
<div class="col-12 text-bold">รูปแบบโครงการตามแผน</div>
|
||||
|
||||
<div class="col-12 q-py-md">
|
||||
<q-label class="q-mb-sm">เทคนิควิธีการที่ใช้ในการพัฒนา</q-label>
|
||||
<q-option-group
|
||||
:disable="store.projectStatus === 'FINISH'"
|
||||
keep-color
|
||||
color="primary"
|
||||
dense
|
||||
v-model="formData.developmentProjectTechniquePlanneds"
|
||||
:options="projectTechniquesOp"
|
||||
type="checkbox"
|
||||
/>
|
||||
<q-card-section class="q-pa-sm">
|
||||
<q-input dense outlined v-model="filter" label="ค้นหา">
|
||||
<template v-slot:append>
|
||||
<q-icon
|
||||
v-if="filter !== ''"
|
||||
name="clear"
|
||||
class="cursor-pointer"
|
||||
@click="filter = ''"
|
||||
/>
|
||||
<q-icon v-else name="search" color="grey-5" />
|
||||
</template>
|
||||
</q-input>
|
||||
<q-tree
|
||||
dense
|
||||
:nodes="nodes"
|
||||
selected-color="primary"
|
||||
node-key="orgTreeName"
|
||||
label-key="orgTreeName"
|
||||
:filter="filter"
|
||||
:no-results-label="notFound"
|
||||
:no-nodes-label="noData"
|
||||
v-model:expanded="expanded"
|
||||
>
|
||||
<template v-slot:default-header="prop">
|
||||
<q-item
|
||||
clickable
|
||||
@click.stop="updateSelected(prop.node, '1')"
|
||||
:active="nodeId == prop.node.orgTreeName"
|
||||
active-class="my-list-link text-white text-weight-medium bg-primary"
|
||||
class="row col-12 items-center text-dark q-py-xs q-pl-sm rounded-borders my-list"
|
||||
>
|
||||
<div>
|
||||
<div class="text-weight-medium">
|
||||
{{ prop.node.orgTreeName }}
|
||||
</div>
|
||||
</div>
|
||||
</q-item>
|
||||
</template>
|
||||
</q-tree>
|
||||
</q-card-section>
|
||||
</q-card>
|
||||
</div>
|
||||
<div class="col-6">
|
||||
<q-card bordered class="col-12">
|
||||
<div
|
||||
class="col-xs-12 col-sm-12 text-weight-medium bg-grey-1 q-py-xs q-px-md"
|
||||
>
|
||||
ยุทธศาสตร์ / แผน
|
||||
</div>
|
||||
<q-separator />
|
||||
|
||||
<div class="row col-12 q-col-gutter-sm">
|
||||
<div class="col-12 col-md-3">
|
||||
<q-checkbox
|
||||
<q-card-section class="q-pa-sm">
|
||||
<q-input dense outlined v-model="filter2" label="ค้นหา">
|
||||
<template v-slot:append>
|
||||
<q-icon
|
||||
v-if="filter2 !== ''"
|
||||
name="clear"
|
||||
class="cursor-pointer"
|
||||
@click="filter2 = ''"
|
||||
/>
|
||||
<q-icon v-else name="search" color="grey-5" />
|
||||
</template>
|
||||
</q-input>
|
||||
<q-tree
|
||||
dense
|
||||
:nodes="nodes"
|
||||
node-key="orgTreeName"
|
||||
label-key="orgTreeName"
|
||||
:filter="filter2"
|
||||
:no-results-label="notFound"
|
||||
:no-nodes-label="noData"
|
||||
v-model:expanded="expanded2"
|
||||
>
|
||||
<template v-slot:default-header="prop">
|
||||
<q-item
|
||||
clickable
|
||||
@click.stop="updateSelected(prop.node, '2')"
|
||||
:active="nodeId2 == prop.node.orgTreeName"
|
||||
active-class="my-list-link text-white text-weight-medium bg-primary"
|
||||
class="row col-12 items-center text-dark q-py-xs q-pl-sm rounded-borders my-list"
|
||||
>
|
||||
<div>
|
||||
<div class="text-weight-medium">
|
||||
{{ prop.node.orgTreeName }}
|
||||
</div>
|
||||
</div>
|
||||
</q-item>
|
||||
</template>
|
||||
</q-tree>
|
||||
</q-card-section>
|
||||
</q-card>
|
||||
</div>
|
||||
</div>
|
||||
</q-card-section>
|
||||
</q-card>
|
||||
|
||||
<q-card bordered class="col-12 q-my-sm">
|
||||
<div
|
||||
class="col-xs-12 col-sm-12 text-weight-medium bg-grey-3 q-py-xs q-px-md"
|
||||
>
|
||||
รูปแบบโครงการ
|
||||
</div>
|
||||
<q-separator />
|
||||
|
||||
<q-card-section>
|
||||
<div class="row col-12 q-col-gutter-sm">
|
||||
<div class="col-6 q-col-gutter-sm">
|
||||
<div class="col-12 text-bold">รูปแบบโครงการตามแผน</div>
|
||||
|
||||
<div class="row col-12 q-col-gutter-sm">
|
||||
<div class="col-12 col-md-3">
|
||||
<q-checkbox
|
||||
:disable="store.projectStatus === 'FINISH'"
|
||||
keep-color
|
||||
color="primary"
|
||||
dense
|
||||
value="GO_BLACK"
|
||||
label="ไป-กลับ"
|
||||
v-model="formData.isBackPlanned"
|
||||
></q-checkbox>
|
||||
</div>
|
||||
<div class="col-12 col-md-4">
|
||||
<q-input
|
||||
:readonly="store.projectStatus === 'FINISH'"
|
||||
dense
|
||||
outlined
|
||||
v-model="formData.projectDayBackPlanned"
|
||||
label="จำนวน (วัน)"
|
||||
mask="#"
|
||||
reverse-fill-mask
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row col-12 q-col-gutter-sm">
|
||||
<div class="col-12 col-md-3">
|
||||
<q-checkbox
|
||||
:disable="store.projectStatus === 'FINISH'"
|
||||
keep-color
|
||||
color="primary"
|
||||
dense
|
||||
value="HOLD"
|
||||
label="พักค้าง"
|
||||
v-model="formData.isHoldPlanned"
|
||||
></q-checkbox>
|
||||
</div>
|
||||
<div class="col-12 col-md-4">
|
||||
<q-input
|
||||
:readonly="store.projectStatus === 'FINISH'"
|
||||
dense
|
||||
outlined
|
||||
v-model="formData.projectDayHoldPlanned"
|
||||
label="จำนวน (วัน)"
|
||||
mask="#"
|
||||
reverse-fill-mask
|
||||
/>
|
||||
</div>
|
||||
<div class="col-12 col-md-4">
|
||||
<q-input
|
||||
:readonly="store.projectStatus === 'FINISH'"
|
||||
dense
|
||||
outlined
|
||||
v-model="formData.projectNigthHoldPlanned"
|
||||
label="จำนวน (คืน)"
|
||||
mask="#"
|
||||
reverse-fill-mask
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col-12 q-py-md">
|
||||
<q-label class="q-mb-sm">เทคนิควิธีการที่ใช้ในการพัฒนา</q-label>
|
||||
<q-option-group
|
||||
:disable="store.projectStatus === 'FINISH'"
|
||||
keep-color
|
||||
color="primary"
|
||||
dense
|
||||
value="GO_BLACK"
|
||||
label="ไป-กลับ"
|
||||
v-model="formData.isBackPlanned"
|
||||
></q-checkbox>
|
||||
v-model="formData.developmentProjectTechniquePlanneds"
|
||||
:options="projectTechniquesOp"
|
||||
type="checkbox"
|
||||
/>
|
||||
</div>
|
||||
<div class="col-12 col-md-4">
|
||||
|
||||
<div class="col-12 col-sm-6 col-md-4">
|
||||
<q-input
|
||||
:readonly="store.projectStatus === 'FINISH'"
|
||||
:disable="store.projectStatus === 'FINISH'"
|
||||
dense
|
||||
outlined
|
||||
v-model="formData.projectDayBackPlanned"
|
||||
label="จำนวน (วัน)"
|
||||
v-model="formData.projectModalPlanneds"
|
||||
label="จำนวน (รุ่น)"
|
||||
mask="#"
|
||||
reverse-fill-mask
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row col-12 q-col-gutter-sm">
|
||||
<div class="col-12 col-md-3">
|
||||
<q-checkbox
|
||||
:disable="store.projectStatus === 'FINISH'"
|
||||
|
||||
<div
|
||||
v-if="store.projectStatus === 'FINISH'"
|
||||
class="col-6 q-col-gutter-sm"
|
||||
>
|
||||
<div class="col-12 text-bold">รูปแบบโครงการตามจริง</div>
|
||||
|
||||
<div class="row col-12 q-col-gutter-sm">
|
||||
<div class="col-md-3">
|
||||
<q-checkbox
|
||||
keep-color
|
||||
color="primary"
|
||||
dense
|
||||
value="GO_BLACK"
|
||||
label="ไป-กลับ"
|
||||
v-model="formData.isBackActual"
|
||||
></q-checkbox>
|
||||
</div>
|
||||
<div class="col-12 col-md-4">
|
||||
<q-input
|
||||
dense
|
||||
outlined
|
||||
v-model="formData.projectDayBackActual"
|
||||
label="จำนวน (วัน)"
|
||||
mask="#"
|
||||
reverse-fill-mask
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row col-12 q-col-gutter-sm">
|
||||
<div class="col-12 col-md-3">
|
||||
<q-checkbox
|
||||
keep-color
|
||||
color="primary"
|
||||
dense
|
||||
value="HOLD"
|
||||
label="พักค้าง"
|
||||
v-model="formData.isHoldActual"
|
||||
></q-checkbox>
|
||||
</div>
|
||||
<div class="col-12 col-md-4">
|
||||
<q-input
|
||||
dense
|
||||
outlined
|
||||
v-model="formData.projectDayHoldActual"
|
||||
label="จำนวน (วัน)"
|
||||
mask="#"
|
||||
reverse-fill-mask
|
||||
/>
|
||||
</div>
|
||||
<div class="col-12 col-md-4">
|
||||
<q-input
|
||||
dense
|
||||
outlined
|
||||
v-model="formData.projectNigthHoldActual"
|
||||
label="จำนวน (คืน)"
|
||||
mask="#"
|
||||
reverse-fill-mask
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-12 q-py-md">
|
||||
<q-label class="q-mb-sm">เทคนิควิธีการที่ใช้ในการพัฒนา</q-label>
|
||||
<q-option-group
|
||||
keep-color
|
||||
color="primary"
|
||||
dense
|
||||
value="HOLD"
|
||||
label="พักค้าง"
|
||||
v-model="formData.isHoldPlanned"
|
||||
></q-checkbox>
|
||||
</div>
|
||||
<div class="col-12 col-md-4">
|
||||
<q-input
|
||||
:readonly="store.projectStatus === 'FINISH'"
|
||||
dense
|
||||
outlined
|
||||
v-model="formData.projectDayHoldPlanned"
|
||||
label="จำนวน (วัน)"
|
||||
mask="#"
|
||||
reverse-fill-mask
|
||||
v-model="formData.developmentProjectTechniqueActuals"
|
||||
:options="projectTechniquesOp"
|
||||
type="checkbox"
|
||||
/>
|
||||
</div>
|
||||
<div class="col-12 col-md-4">
|
||||
<div class="col-12 col-sm-6 col-md-4">
|
||||
<q-input
|
||||
:readonly="store.projectStatus === 'FINISH'"
|
||||
dense
|
||||
outlined
|
||||
v-model="formData.projectNigthHoldPlanned"
|
||||
label="จำนวน (คืน)"
|
||||
v-model="formData.projectModalActual"
|
||||
label="จำนวน (รุ่น)"
|
||||
mask="#"
|
||||
reverse-fill-mask
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</q-card-section>
|
||||
</q-card>
|
||||
|
||||
<div
|
||||
v-if="store.projectStatus === 'FINISH'"
|
||||
class="col-6 q-col-gutter-sm"
|
||||
>
|
||||
<div class="col-12 text-bold">รูปแบบโครงการตามจริง</div>
|
||||
<div class="col-12 q-py-md">
|
||||
<q-label class="q-mb-sm">เทคนิควิธีการที่ใช้ในการพัฒนา</q-label>
|
||||
<q-option-group
|
||||
keep-color
|
||||
color="primary"
|
||||
dense
|
||||
v-model="formData.developmentProjectTechniqueActuals"
|
||||
:options="projectTechniquesOp"
|
||||
type="checkbox"
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div class="row col-12 q-col-gutter-sm">
|
||||
<div class="col-md-3">
|
||||
<q-checkbox
|
||||
keep-color
|
||||
color="primary"
|
||||
dense
|
||||
value="GO_BLACK"
|
||||
label="ไป-กลับ"
|
||||
v-model="formData.isBackActual"
|
||||
></q-checkbox>
|
||||
</div>
|
||||
<div class="col-12 col-md-4">
|
||||
<q-input
|
||||
dense
|
||||
outlined
|
||||
v-model="formData.projectDayBackActual"
|
||||
label="จำนวน (วัน)"
|
||||
mask="#"
|
||||
reverse-fill-mask
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row col-12 q-col-gutter-sm">
|
||||
<div class="col-12 col-md-3">
|
||||
<q-checkbox
|
||||
keep-color
|
||||
color="primary"
|
||||
dense
|
||||
value="HOLD"
|
||||
label="พักค้าง"
|
||||
v-model="formData.isHoldActual"
|
||||
></q-checkbox>
|
||||
</div>
|
||||
<div class="col-12 col-md-4">
|
||||
<q-input
|
||||
dense
|
||||
outlined
|
||||
v-model="formData.projectDayHoldActual"
|
||||
label="จำนวน (วัน)"
|
||||
mask="#"
|
||||
reverse-fill-mask
|
||||
/>
|
||||
</div>
|
||||
<div class="col-12 col-md-4">
|
||||
<q-input
|
||||
dense
|
||||
outlined
|
||||
v-model="formData.projectNigthHoldActual"
|
||||
label="จำนวน (คืน)"
|
||||
mask="#"
|
||||
reverse-fill-mask
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<q-separator />
|
||||
<div class="row">
|
||||
<div class="col-6 q-pa-md">
|
||||
<q-input dense outlined v-model="filter" label="ค้นหา">
|
||||
<template v-slot:append>
|
||||
<q-icon
|
||||
v-if="filter !== ''"
|
||||
name="clear"
|
||||
class="cursor-pointer"
|
||||
@click="filter = ''"
|
||||
/>
|
||||
<q-icon v-else name="search" color="grey-5" />
|
||||
</template>
|
||||
</q-input>
|
||||
<q-tree
|
||||
dense
|
||||
:nodes="nodes"
|
||||
selected-color="primary"
|
||||
node-key="orgTreeName"
|
||||
label-key="orgTreeName"
|
||||
:filter="filter"
|
||||
:no-results-label="notFound"
|
||||
:no-nodes-label="noData"
|
||||
v-model:expanded="expanded"
|
||||
>
|
||||
<template v-slot:default-header="prop">
|
||||
<q-item
|
||||
clickable
|
||||
@click.stop="updateSelected(prop.node, '1')"
|
||||
:active="nodeId == prop.node.orgTreeName"
|
||||
active-class="my-list-link text-white text-weight-medium bg-primary"
|
||||
class="row col-12 items-center text-dark q-py-xs q-pl-sm rounded-borders my-list"
|
||||
>
|
||||
<div>
|
||||
<div class="text-weight-medium">
|
||||
{{ prop.node.orgTreeName }}
|
||||
</div>
|
||||
</div>
|
||||
</q-item>
|
||||
</template>
|
||||
</q-tree>
|
||||
</div>
|
||||
<div class="col-6 q-pa-md">
|
||||
<q-input dense outlined v-model="filter2" label="ค้นหา">
|
||||
<template v-slot:append>
|
||||
<q-icon
|
||||
v-if="filter2 !== ''"
|
||||
name="clear"
|
||||
class="cursor-pointer"
|
||||
@click="filter2 = ''"
|
||||
/>
|
||||
<q-icon v-else name="search" color="grey-5" />
|
||||
</template>
|
||||
</q-input>
|
||||
<q-tree
|
||||
dense
|
||||
:nodes="nodes"
|
||||
node-key="orgTreeName"
|
||||
label-key="orgTreeName"
|
||||
:filter="filter2"
|
||||
:no-results-label="notFound"
|
||||
:no-nodes-label="noData"
|
||||
v-model:expanded="expanded2"
|
||||
>
|
||||
<template v-slot:default-header="prop">
|
||||
<q-item
|
||||
clickable
|
||||
@click.stop="updateSelected(prop.node, '2')"
|
||||
:active="nodeId2 == prop.node.orgTreeName"
|
||||
active-class="my-list-link text-white text-weight-medium bg-primary"
|
||||
class="row col-12 items-center text-dark q-py-xs q-pl-sm rounded-borders my-list"
|
||||
>
|
||||
<div>
|
||||
<div class="text-weight-medium">
|
||||
{{ prop.node.orgTreeName }}
|
||||
</div>
|
||||
</div>
|
||||
</q-item>
|
||||
</template>
|
||||
</q-tree>
|
||||
</div>
|
||||
</div>
|
||||
<q-separator />
|
||||
<div class="text-right q-pa-sm">
|
||||
<q-btn
|
||||
|
|
|
|||
|
|
@ -340,7 +340,6 @@ onMounted(() => {
|
|||
<q-th v-for="col in props.cols" :key="col.name" :props="props">
|
||||
<span class="text-weight-medium">{{ col.label }}</span>
|
||||
</q-th>
|
||||
<q-th auto-width />
|
||||
</q-tr>
|
||||
</template>
|
||||
<template v-slot:body="props">
|
||||
|
|
@ -357,23 +356,6 @@ onMounted(() => {
|
|||
</div>
|
||||
<div v-else>{{ col.value ? col.value : "-" }}</div>
|
||||
</q-td>
|
||||
<q-td auto-width>
|
||||
<q-btn
|
||||
color="primary"
|
||||
flat
|
||||
dense
|
||||
round
|
||||
class="q-mr-xs"
|
||||
size="14px"
|
||||
icon="mdi-pencil-outline"
|
||||
clickable
|
||||
>
|
||||
<q-tooltip>แก้ไขข้อมูล</q-tooltip>
|
||||
</q-btn>
|
||||
<q-btn color="info" flat dense round size="14px" icon="mdi-history">
|
||||
<q-tooltip>ประวัติบันทึกผล</q-tooltip>
|
||||
</q-btn>
|
||||
</q-td>
|
||||
</q-tr>
|
||||
</template>
|
||||
</d-table>
|
||||
|
|
|
|||
|
|
@ -54,12 +54,12 @@ const columnsPlannedGoals = ref<QTableProps["columns"]>([
|
|||
{
|
||||
name: "posTypePlannedId",
|
||||
align: "left",
|
||||
label: "ประเภท",
|
||||
label: "ตำแหน่ง",
|
||||
sortable: true,
|
||||
field: "posTypePlannedId",
|
||||
headerStyle: "font-size: 14px",
|
||||
style: "font-size: 14px",
|
||||
format: (val) => convertTypeGoals(val),
|
||||
// format: (val) => convertTypeGoals(val),
|
||||
},
|
||||
|
||||
{
|
||||
|
|
@ -87,12 +87,12 @@ const columnsActualGoals = ref<QTableProps["columns"]>([
|
|||
{
|
||||
name: "posTypeActualId",
|
||||
align: "left",
|
||||
label: "ประเภท",
|
||||
label: "ตำแหน่ง",
|
||||
sortable: true,
|
||||
field: "posTypeActualId",
|
||||
headerStyle: "font-size: 14px",
|
||||
style: "font-size: 14px",
|
||||
format: (val) => convertTypeGoals(val),
|
||||
// format: (val) => convertTypeGoals(val),
|
||||
},
|
||||
|
||||
{
|
||||
|
|
@ -213,6 +213,7 @@ async function fetchData(id: string) {
|
|||
.get(config.API.developmentMainTab("tab2", id))
|
||||
.then(async (res) => {
|
||||
const data = res.data.result;
|
||||
|
||||
actualGoals.value = data.actualGoals;
|
||||
actualPeoples.value = data.actualPeoples;
|
||||
plannedGoals.value = data.plannedGoals;
|
||||
|
|
@ -258,9 +259,9 @@ async function onSubmitGroup() {
|
|||
groupTarget: formGroupTarget.groupTarget,
|
||||
groupTargetSub: formGroupTarget.groupTargetSub,
|
||||
positions: formGroupTarget.positions.map((v) => ({
|
||||
position: v.position,
|
||||
posTypePlannedId: v.posTypePlannedId,
|
||||
posLevelPlannedId: v.posLevelPlannedId,
|
||||
position: v.position ? v.position : "",
|
||||
posTypePlannedId: v.posTypePlannedId ? v.posTypePlannedId : "",
|
||||
posLevelPlannedId: v.posLevelPlannedId ? v.posLevelPlannedId : "",
|
||||
})),
|
||||
type: formGroupTarget.type ? formGroupTarget.type : "",
|
||||
amount: formGroupTarget.amount,
|
||||
|
|
@ -430,9 +431,16 @@ function convertNamePeoples(id: string) {
|
|||
return data && data?.name;
|
||||
}
|
||||
|
||||
function convertTypeGoals(id: string) {
|
||||
const data = posTypeMain.value.find((e: ResGroup) => e.id === id);
|
||||
return data && data?.posTypeName;
|
||||
function convertTypeGoals(row: ResActualGoals) {
|
||||
const posTypeName = posTypeMain.value.find(
|
||||
(e: ResGroup) => e.id === row.posTypeActualId
|
||||
);
|
||||
const posLevelName = posTypeName?.posLevels.find(
|
||||
(e: any) => e.id === row.posLevelActualId
|
||||
);
|
||||
const fullName = posTypeName?.posTypeName + " " + posLevelName?.posLevelName;
|
||||
// return posTypeName && posTypeName?.posTypeName;
|
||||
return fullName;
|
||||
}
|
||||
|
||||
const addGroupTargetData = async () => {
|
||||
|
|
@ -527,7 +535,18 @@ onMounted(() => {
|
|||
<template v-slot:body="props">
|
||||
<q-tr :props="props" class="cursor-pointer">
|
||||
<q-td v-for="col in props.cols" :key="col.name" :props="props">
|
||||
<div class="table_ellipsis">
|
||||
<div v-if="col.name === 'posTypePlannedId'">
|
||||
<div
|
||||
v-if="props.row.groupTarget !== 'OUTSIDERS'"
|
||||
v-for="row in props.row.plannedGoalPositions"
|
||||
>
|
||||
{{ `- ${row.position} (${row.posType} ${row.posLevel})` }}
|
||||
</div>
|
||||
<div v-else>
|
||||
{{ props.row.type ? props.row.type : "-" }}
|
||||
</div>
|
||||
</div>
|
||||
<div v-else class="table_ellipsis">
|
||||
{{ col.value ? col.value : "-" }}
|
||||
</div>
|
||||
</q-td>
|
||||
|
|
@ -542,7 +561,6 @@ onMounted(() => {
|
|||
() => {
|
||||
isEdit = true;
|
||||
isTarget = 'planned';
|
||||
|
||||
editId = props.row.id;
|
||||
formGroupTarget.type = props.row.type;
|
||||
formGroupTarget.groupTarget = props.row.groupTarget;
|
||||
|
|
@ -550,6 +568,7 @@ onMounted(() => {
|
|||
formGroupTarget.amount = props.row.amount;
|
||||
formGroupTarget.positions =
|
||||
props.row.plannedGoalPositions;
|
||||
|
||||
newModalGroupTarget = true;
|
||||
}
|
||||
"
|
||||
|
|
@ -672,7 +691,30 @@ onMounted(() => {
|
|||
<template v-slot:body="props">
|
||||
<q-tr :props="props" class="cursor-pointer">
|
||||
<q-td v-for="col in props.cols" :key="col.name" :props="props">
|
||||
<div class="table_ellipsis">
|
||||
<div v-if="col.name === 'posTypeActualId'">
|
||||
<div v-if="props.row.groupTarget !== 'OUTSIDERS'">
|
||||
{{
|
||||
`${props.row.position} (${props.row.posType} ${props.row.posLevel})`
|
||||
}}
|
||||
</div>
|
||||
<div v-else>
|
||||
{{ props.row.type ? props.row.type : "-" }}
|
||||
</div>
|
||||
</div>
|
||||
<div v-else class="table_ellipsis">
|
||||
{{ col.value ? col.value : "-" }}
|
||||
</div>
|
||||
<!-- <div
|
||||
v-if="col.name === 'posTypeActualId'"
|
||||
class="table_ellipsis"
|
||||
>
|
||||
{{
|
||||
props.row.posTypeActualId !== null
|
||||
? convertTypeGoals(props.row)
|
||||
: props.row.type
|
||||
}}
|
||||
</div> -->
|
||||
<div v-else class="table_ellipsis">
|
||||
{{ col.value ? col.value : "-" }}
|
||||
</div>
|
||||
</q-td>
|
||||
|
|
@ -686,7 +728,6 @@ onMounted(() => {
|
|||
@click="
|
||||
() => {
|
||||
isEdit = true;
|
||||
|
||||
isTarget = 'actual';
|
||||
editId = props.row.id;
|
||||
formGroupTarget.type = props.row.type;
|
||||
|
|
@ -876,8 +917,11 @@ onMounted(() => {
|
|||
lazy-rules
|
||||
class="inputgreen"
|
||||
v-model="formGroupTarget.level"
|
||||
:options="posLevelOp"
|
||||
option-label="name"
|
||||
:options="
|
||||
posTypeMain.find((v) => formGroupTarget.posType === v.id)
|
||||
?.posLevels || []
|
||||
"
|
||||
option-label="posLevelName"
|
||||
option-value="id"
|
||||
emit-value
|
||||
map-options
|
||||
|
|
@ -1106,8 +1150,11 @@ onMounted(() => {
|
|||
lazy-rules
|
||||
class="inputgreen"
|
||||
v-model="items.posLevelPlannedId"
|
||||
:options="posLevelOp"
|
||||
option-label="name"
|
||||
:options="
|
||||
posTypeMain.find((v) => items.posTypePlannedId === v.id)
|
||||
?.posLevels || []
|
||||
"
|
||||
option-label="posLevelName"
|
||||
option-value="id"
|
||||
emit-value
|
||||
map-options
|
||||
|
|
|
|||
|
|
@ -188,6 +188,7 @@ function fetchDataDetail(id: string) {
|
|||
formBody.reportBackNo = data.reportBackNo;
|
||||
formBody.reportBackNoDate = data.reportBackNoDate;
|
||||
formBody.reportBackDate = data.reportBackDate;
|
||||
|
||||
formBody.degreeLevel = data.degreeLevel;
|
||||
formBody.course = data.course;
|
||||
formBody.field = data.field;
|
||||
|
|
|
|||
|
|
@ -77,6 +77,8 @@ interface FormProjectDetail {
|
|||
projectDayHoldActual: string | null;
|
||||
projectNigthHoldActual: string | null;
|
||||
developmentProjectTechniqueActuals: [];
|
||||
projectModalActual?: string | null;
|
||||
projectModalPlanneds?: string | null;
|
||||
}
|
||||
|
||||
export type {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue