Merge branch 'develop' into dev-tee

This commit is contained in:
setthawutttty 2023-10-10 16:14:07 +07:00
commit daad016d2c

View file

@ -170,11 +170,11 @@ const getData = async () => {
adjustOther.value = data.adjustOther ?? "";
realReason.value = data.realReason ?? "";
notExitFactor.value = data.notExitFactor ?? "";
haveJob.value = data.havejob ?? null;
haveJob.value = data.havejob == false ? 0 : 1;
haveJobReason.value = data.havejobReason ?? "";
suggestFriends.value = data.suggestFriends ?? null;
suggestFriends.value = data.suggestFriends == false ? 0 : 1;
suggestFriendsReason.value = data.suggestFriendsReason ?? "";
futureWork.value = data.futureWork ?? null;
futureWork.value = data.futureWork == false ? 0 : 1;
futureWorkReason.value = data.futureWorkReason ?? "";
suggestion.value = data.suggestion ?? "";
score.forEach((item, index) => {
@ -224,30 +224,39 @@ async function fecthquestion() {
`${i}.` + " " + data[`question${i}Desc`];
}
//
question1Answer.value = data.question1Answer.map(
(e: any, index: number) => ({
label: e,
value: index,
})
);
const Answer1 = data.question1Answer.map((e: any, index: number) => ({
label: e,
value: index,
}));
question1Answer.value = Answer1;
question1Answer.value.push({
label: "อื่น ๆ (ระบุ)",
value: Answer1.length,
});
question2Answer.value = data.question2Answer.map(
(e: any, index: number) => ({
label: e,
value: index,
})
);
question3Answer.value = data.question3Answer.map(
(e: any, index: number) => ({
label: e,
value: index,
})
);
question4Answer.value = data.question4Answer.map(
(e: any, index: number) => ({
label: e,
value: index,
})
);
const Answer3 = data.question3Answer.map((e: any, index: number) => ({
label: e,
value: index,
}));
question3Answer.value = Answer3;
question3Answer.value.push({
label: "อื่น ๆ (ระบุ)",
value: Answer3.length,
});
const Answer4 = data.question4Answer.map((e: any, index: number) => ({
label: e,
value: index,
}));
question4Answer.value = Answer4;
question4Answer.value.push({
label: "อื่น ๆ (ระบุ)",
value: Answer4.length,
});
question7Answer.value = data.question7Answer.map(
(e: any, index: number) => ({
label: e,
@ -399,15 +408,382 @@ const putData = () => {
>
แบบสอบถาม
</div>
<q-separator />
<div class="col-12 row q-pa-sm q-col-gutter-sm">
<div class="col-10 text-top0 items-center">
<!-- 1. เหตใดทานจงตดสนใจรวมงานกบกรงเทพมหานคร (เลอกไดมากกว
1 ) -->
{{ questionDesc.question1Desc }}
<!-- 1 -->
<q-card-section>
<div class="row">
<div class="col-10 items-center row inline">
{{ questionDesc.question1Desc }}
</div>
<div class="col-2">
<q-input
dense
outlined
v-model="score[0].score"
label="คะแนนข้อ 1"
type="number"
lazy-rules
:rules="[(val) => val !== '' || 'กรุณากรอกคะเเนน']"
/>
</div>
</div>
<div class="col-2 text-top0 items-center">
<q-option-group
:options="question1Answer"
type="checkbox"
v-model="reasonWork"
disable
/>
<q-item-label>
<q-input
v-if="reasonWork.includes(question1Answer.length - 1)"
v-model="reasonWorkOther"
disable
label="กรอกข้อความ"
dense
lazy-rules
type="text"
autogrow
hide-bottom-space
outlined
class="bg-white"
:rules="[
(val) => (val && val.length > 0) || 'กรุณากรอกข้อความ',
]"
/>
</q-item-label>
</q-card-section>
<!-- 2 -->
<q-card-section>
<div class="row">
<div class="col-10 items-center row inline">
{{ questionDesc.question2Desc }}
</div>
<div class="col-2">
<q-input
dense
outlined
v-model="score[1].score"
label="คะแนนข้อ 2"
type="number"
lazy-rules
:rules="[(val) => val !== '' || 'กรุณากรอกคะเเนน']"
/>
</div>
</div>
<q-option-group
:options="question2Answer"
type="radio"
v-model="timeThink"
disable
/>
</q-card-section>
<!-- 3 -->
<q-card-section>
<div class="row">
<div class="col-10 items-center row inline">
{{ questionDesc.question3Desc }}
</div>
<div class="col-2">
<q-input
dense
outlined
v-model="score[2].score"
label="คะแนนข้อ 3"
type="number"
lazy-rules
:rules="[(val) => val !== '' || 'กรุณากรอกคะเเนน']"
/>
</div>
</div>
<q-option-group
:options="question3Answer"
type="checkbox"
v-model="exitFactor"
disable
/>
<q-item-label>
<q-input
v-if="exitFactor.includes(question3Answer.length - 1)"
v-model="exitFactorOther"
label="กรอกข้อความ"
dense
disable
lazy-rules
type="text"
autogrow
hide-bottom-space
outlined
class="bg-white"
:rules="[
(val) => (val && val.length > 0) || 'กรุณากรอกข้อความ',
]"
/>
</q-item-label>
</q-card-section>
<!-- 4 -->
<q-card-section>
<div class="row">
<div class="col-10 items-center row inline">
{{ questionDesc.question4Desc }}
</div>
<div class="col-2">
<q-input
dense
outlined
v-model="score[3].score"
label="คะแนนข้อ 4"
type="number"
lazy-rules
:rules="[(val) => val !== '' || 'กรุณากรอกคะเเนน']"
/>
</div>
</div>
<q-option-group
:options="question4Answer"
type="checkbox"
v-model="adjust"
disable
/>
<q-item-label>
<q-input
v-if="adjust.includes(question4Answer.length - 1)"
v-model="adjustOther"
label="กรอกอื่นๆ"
dense
disable
lazy-rules
type="text"
autogrow
hide-bottom-space
outlined
class="bg-white"
:rules="[
(val) => (val && val.length > 0) || 'กรุณากรอกข้อความ',
]"
/>
</q-item-label>
</q-card-section>
<!-- 5 -->
<q-card-section>
<div class="row">
<div class="col-10 items-center row inline">
{{ questionDesc.question5Desc }}
</div>
<div class="col-2">
<q-input
dense
outlined
v-model="score[4].score"
label="คะแนนข้อ 5"
type="number"
lazy-rules
:rules="[(val) => val !== '' || 'กรุณากรอกคะเเนน']"
/>
</div>
</div>
<q-input
class="col-12"
dense
disable
outlined
v-model="realReason"
label=" "
type="textarea"
/>
</q-card-section>
<!-- 6 -->
<q-card-section>
<div class="row">
<div class="col-10 items-center row inline">
{{ questionDesc.question6Desc }}
</div>
<div class="col-2">
<q-input
dense
outlined
v-model="score[5].score"
label="คะแนนข้อ 6"
type="number"
lazy-rules
:rules="[(val) => val !== '' || 'กรุณากรอกคะเเนน']"
/>
</div>
</div>
<q-input
class="col-12"
dense
outlined
disable
v-model="notExitFactor"
label=" "
type="textarea"
/>
</q-card-section>
<!-- 7 -->
<q-card-section>
<div class="row">
<div class="col-10 items-center row inline">
{{ questionDesc.question7Desc }}
</div>
<div class="col-2">
<q-input
dense
outlined
v-model="score[6].score"
label="คะแนนข้อ 7"
type="number"
lazy-rules
:rules="[(val) => val !== '' || 'กรุณากรอกคะเเนน']"
/>
</div>
</div>
<q-option-group
:options="question7Answer"
type="radio"
v-model="haveJob"
disable
/>
<q-item-label>
<q-input
v-if="haveJob == 0"
v-model="haveJobReason"
label="กรอกอื่นๆ"
dense
disable
lazy-rules
type="text"
autogrow
hide-bottom-space
outlined
class="bg-white"
:rules="[
(val) => (val && val.length > 0) || 'กรุณากรอกข้อความ',
]"
/>
</q-item-label>
</q-card-section>
<!-- 8 -->
<q-card-section>
<div class="row">
<div class="col-10 items-center row inline">
{{ questionDesc.question8Desc }}
</div>
<div class="col-2">
<q-input
dense
outlined
v-model="score[7].score"
label="คะแนนข้อ 8"
type="number"
lazy-rules
:rules="[(val) => val !== '' || 'กรุณากรอกคะเเนน']"
/>
</div>
</div>
<q-option-group
:options="question8Answer"
type="radio"
v-model="suggestFriends"
disable
/>
<q-item-label>
<q-input
v-if="suggestFriends === 1"
v-model="suggestFriendsReason"
label="กรอกข้อความ"
dense
lazy-rules
disable
type="text"
autogrow
hide-bottom-space
outlined
class="bg-white"
:rules="[
(val) => (val && val.length > 0) || 'กรุณากรอกข้อความ',
]"
/>
</q-item-label>
</q-card-section>
<!-- 9 -->
<q-card-section>
<div class="row">
<div class="col-10 items-center row inline">
{{ questionDesc.question9Desc }}
</div>
<div class="col-2">
<q-input
dense
outlined
v-model="score[8].score"
label="คะแนนข้อ 9"
type="number"
lazy-rules
:rules="[(val) => val !== '' || 'กรุณากรอกคะเเนน']"
/>
</div>
</div>
<q-option-group
:options="question9Answer"
type="radio"
v-model="futureWork"
disable
/>
<q-item-label>
<q-input
v-if="futureWork === 1"
v-model="futureWorkReason"
label="กรอกข้อความ"
dense
lazy-rules
type="text"
autogrow
hide-bottom-space
outlined
disable
class="bg-white"
:rules="[
(val) => (val && val.length > 0) || 'กรุณากรอกข้อความ',
]"
/>
</q-item-label>
</q-card-section>
<!-- 10 -->
<q-card-section>
<div class="row">
<div class="col-10 items-center row inline">
{{ questionDesc.question10Desc }}
</div>
<div class="col-2">
<q-input
dense
outlined
v-model="score[9].score"
label="คะแนนข้อ 10"
type="number"
lazy-rules
:rules="[(val) => val !== '' || 'กรุณากรอกคะเเนน']"
/>
</div>
</div>
<q-input
class="col-12"
dense
disable
outlined
v-model="suggestion"
label=" "
type="textarea"
/>
</q-card-section>
<!-- <div class="col-12 row q-pa-sm q-col-gutter-sm"> -->
<!-- <div class="col-10 text-top0 items-center row inline">
{{ questionDesc.question1Desc }}
</div> -->
<!-- <div class="col-2">
<q-input
dense
outlined
@ -417,18 +793,17 @@ const putData = () => {
lazy-rules
:rules="[(val) => val !== '' || 'กรุณากรอกคะเเนน']"
/>
</div>
<q-option-group
</div> -->
<!-- <q-option-group
:options="question1Answer"
type="checkbox"
v-model="reasonWork"
disable
/>
<div class="col-12 text-top0 items-center">
/> -->
<!-- <div class="col-12 text-top0 items-center">
<q-item-label>
<q-input
v-if="reasonWork.includes(12)"
v-if="reasonWork.includes(question1Answer.length - 1)"
v-model="reasonWorkOther"
disable
label="กรอกข้อความ"
@ -444,13 +819,12 @@ const putData = () => {
]"
/>
</q-item-label>
</div>
<div class="col-10 text-top0 items-center">
<!-- 2. สำหรบการลาออกในครงน
านไดดทบทวนอยางจรงจงเปนระยะเวลานานเทาใด -->
</div> -->
<!-- <div class="col-10 text-top0 items-center row inline">
{{ questionDesc.question2Desc }}
</div>
<div class="col-2 text-top0 items-center">
</div> -->
<!-- <div class="col-2 text-top0 items-center">
<q-input
dense
outlined
@ -460,24 +834,22 @@ const putData = () => {
lazy-rules
:rules="[(val) => val !== '' || 'กรุณากรอกคะเเนน']"
/>
</div>
</div> -->
<div class="col-12">
<!-- <div class="col-12">
<q-option-group
:options="question2Answer"
type="radio"
v-model="timeThink"
disable
/>
</div>
</div> -->
<div class="col-10 text-top0 items-center">
<!-- 3. จจยใดททำใหานตดสนใจลาออกจากราชการ (เลอกไดมากกว 1
) -->
<!-- <div class="col-10 text-top0 items-center row inline">
{{ questionDesc.question3Desc }}
</div>
</div> -->
<div class="col-2 text-top0 items-center">
<!-- <div class="col-2 text-top0 items-center">
<q-input
dense
outlined
@ -487,19 +859,19 @@ const putData = () => {
lazy-rules
:rules="[(val) => val !== '' || 'กรุณากรอกคะเเนน']"
/>
</div>
</div> -->
<q-option-group
<!-- <q-option-group
:options="question3Answer"
type="checkbox"
v-model="exitFactor"
disable
/>
/> -->
<div class="col-12 text-top0 items-center">
<!-- <div class="col-12 text-top0 items-center">
<q-item-label>
<q-input
v-if="exitFactor.includes(15)"
v-if="exitFactor.includes(question3Answer.length - 1)"
v-model="exitFactorOther"
label="กรอกข้อความ"
dense
@ -515,13 +887,12 @@ const putData = () => {
]"
/>
</q-item-label>
</div>
</div> -->
<div class="col-10 text-top0 items-center">
<!-- 4. อะไรคอสงทานเหนวาควรปรบปร (เลอกไดมากกว 1 ) -->
<!-- <div class="col-10 text-top0 items-center row inline">
{{ questionDesc.question4Desc }}
</div>
</div> -->
<!--
<div class="col-2 text-top0 items-center">
<q-input
dense
@ -532,20 +903,20 @@ const putData = () => {
lazy-rules
:rules="[(val) => val !== '' || 'กรุณากรอกคะเเนน']"
/>
</div>
</div> -->
<q-list>
<!-- <q-list>
<q-option-group
:options="question4Answer"
type="checkbox"
v-model="adjust"
disable
/>
</q-list>
<div class="col-12 text-top0 items-center">
</q-list> -->
<!-- <div class="col-12 text-top0 items-center">
<q-item-label>
<q-input
v-if="adjust.includes(15)"
v-if="adjust.includes(question4Answer.length - 1)"
v-model="adjustOther"
label="กรอกอื่นๆ"
dense
@ -561,13 +932,11 @@ const putData = () => {
]"
/>
</q-item-label>
</div>
<div class="col-10 text-top0 items-center">
<!-- 5. โปรดระบสาเหตแทจร
ทำใหานตดสนใจลาออกจากการปฏราชการกบกรงเทพมหานคร ? -->
</div> -->
<!-- <div class="col-10 text-top0 items-center row inline">
{{ questionDesc.question5Desc }}
</div>
<div class="col-2 text-top0 items-center">
</div> -->
<!-- <div class="col-2 text-top0 items-center">
<q-input
dense
outlined
@ -577,9 +946,9 @@ const putData = () => {
lazy-rules
:rules="[(val) => val !== '' || 'กรุณากรอกคะเเนน']"
/>
</div>
</div> -->
<q-input
<!-- <q-input
class="col-12"
dense
disable
@ -587,14 +956,12 @@ const putData = () => {
v-model="realReason"
label=" "
type="textarea"
/>
/> -->
<div class="col-10 text-top0 items-center">
<!-- 6. จจยใดทจะชวยทำใหานเปลยนใจ
ไมอยากลาออกจากการปฏราชการกบกรงเทพมหานคร -->
<!-- <div class="col-10 text-top0 items-center row inline">
{{ questionDesc.question6Desc }}
</div>
<div class="col-2 text-top0 items-center">
</div> -->
<!-- <div class="col-2 text-top0 items-center">
<q-input
dense
outlined
@ -604,9 +971,9 @@ const putData = () => {
lazy-rules
:rules="[(val) => val !== '' || 'กรุณากรอกคะเเนน']"
/>
</div>
</div> -->
<q-input
<!-- <q-input
class="col-12"
dense
outlined
@ -614,17 +981,12 @@ const putData = () => {
v-model="notExitFactor"
label=" "
type="textarea"
/>
/> -->
<div class="col-10 text-top0 items-center">
<!-- 7. านมงานใหมหรอไม าม (โปรดระบ
อบรทเอกชน/หนวยงานภาคร)
และอะไรคอสงททำงานใหมใหบทาน
งทานรกวาเปนทาพอใจมากกวาการปฏราชการกบกรงเทพมหานคร -->
<!-- <div class="col-10 text-top0 items-center row inline">
{{ questionDesc.question7Desc }}
</div>
<div class="col-2 text-top0 items-center">
</div> -->
<!-- <div class="col-2 text-top0 items-center">
<q-input
dense
outlined
@ -634,18 +996,17 @@ const putData = () => {
lazy-rules
:rules="[(val) => val !== '' || 'กรุณากรอกคะเเนน']"
/>
</div>
<q-option-group
</div> -->
<!-- <q-option-group
:options="question7Answer"
type="radio"
v-model="haveJob"
disable
/>
<div class="col-12 text-top0 items-center">
/> -->
<!-- <div class="col-12 text-top0 items-center">
<q-item-label>
<q-input
v-if="haveJob === true"
v-if="haveJob == 0"
v-model="haveJobReason"
label="กรอกอื่นๆ"
dense
@ -661,14 +1022,11 @@ const putData = () => {
]"
/>
</q-item-label>
</div>
<div class="col-10 text-top0 items-center">
<!-- 8. านจะแนะนำเพอนใหมารวมงานกบกรงเทพมหานครหรอไม (าไม
โปรดระบเหตผล) -->
</div> -->
<!-- <div class="col-10 text-top0 items-center row inline">
{{ questionDesc.question8Desc }}
</div>
<div class="col-2 text-top0 items-center">
</div> -->
<!-- <div class="col-2 text-top0 items-center">
<q-input
dense
outlined
@ -678,18 +1036,17 @@ const putData = () => {
lazy-rules
:rules="[(val) => val !== '' || 'กรุณากรอกคะเเนน']"
/>
</div>
<q-option-group
</div> -->
<!-- <q-option-group
:options="question8Answer"
type="radio"
v-model="suggestFriends"
disable
/>
<div class="col-12 text-top0 items-center">
/> -->
<!-- <div class="col-12 text-top0 items-center">
<q-item-label>
<q-input
v-if="suggestFriends === false"
v-if="suggestFriends === 1"
v-model="suggestFriendsReason"
label="กรอกข้อความ"
dense
@ -705,14 +1062,11 @@ const putData = () => {
]"
/>
</q-item-label>
</div>
<div class="col-10 text-top0 items-center">
<!-- 9. หากทานมโอกาสในอนาคต
านอยากกลบมารวมงานกบกรงเทพมหานครหรอไม (าไม
โปรดระบเหตผล) -->
</div> -->
<!-- <div class="col-10 text-top0 items-center row inline">
{{ questionDesc.question9Desc }}
</div>
<div class="col-2 text-top0 items-center">
</div> -->
<!-- <div class="col-2 text-top0 items-center">
<q-input
dense
outlined
@ -722,17 +1076,17 @@ const putData = () => {
lazy-rules
:rules="[(val) => val !== '' || 'กรุณากรอกคะเเนน']"
/>
</div>
<q-option-group
</div> -->
<!-- <q-option-group
:options="question9Answer"
type="radio"
v-model="futureWork"
disable
/>
<div class="col-12 text-top0 items-center">
/> -->
<!-- <div class="col-12 text-top0 items-center">
<q-item-label>
<q-input
v-if="futureWork === false"
v-if="futureWork === 1"
v-model="futureWorkReason"
label="กรอกข้อความ"
dense
@ -748,13 +1102,11 @@ const putData = () => {
]"
/>
</q-item-label>
</div>
<div class="col-10 text-top0 items-center">
<!-- 10. ความคดเหนและขอเสนอแนะอ -->
</div> -->
<!-- <div class="col-10 text-top0 items-center row inline">
{{ questionDesc.question10Desc }}
</div>
<div class="col-2 text-top0 items-center">
</div> -->
<!-- <div class="col-2 text-top0 items-center">
<q-input
dense
outlined
@ -764,8 +1116,8 @@ const putData = () => {
lazy-rules
:rules="[(val) => val !== '' || 'กรุณากรอกคะเเนน']"
/>
</div>
<q-input
</div> -->
<!-- <q-input
class="col-12"
dense
disable
@ -773,8 +1125,8 @@ const putData = () => {
v-model="suggestion"
label=" "
type="textarea"
/>
</div>
/> -->
<!-- </div> -->
</q-card>
<q-card bordered flat class="q-mt-md">