แก้ฟิล
This commit is contained in:
parent
1e1bb91b29
commit
f3e2d1c82d
2 changed files with 10 additions and 10 deletions
|
|
@ -139,7 +139,7 @@ const customPosition = () => ({ top: "385px", left: "410px" });
|
||||||
async function getDataByYear() {
|
async function getDataByYear() {
|
||||||
if (formData.year) {
|
if (formData.year) {
|
||||||
showLoader();
|
showLoader();
|
||||||
http
|
await http
|
||||||
.get(config.API.developmentMain + `/done?year=${formData.year}`)
|
.get(config.API.developmentMain + `/done?year=${formData.year}`)
|
||||||
.then(async (res) => {
|
.then(async (res) => {
|
||||||
const data = await res.data.result.data;
|
const data = await res.data.result.data;
|
||||||
|
|
@ -170,15 +170,15 @@ function getProjectDetail(val: any) {
|
||||||
development.value = data.developmentProjectTechniqueActuals;
|
development.value = data.developmentProjectTechniqueActuals;
|
||||||
reasonDevelopment70.value =
|
reasonDevelopment70.value =
|
||||||
data.developmentProjectTechniqueActuals.includes("other1")
|
data.developmentProjectTechniqueActuals.includes("other1")
|
||||||
? data.reasonDevelopment70
|
? data.reasonActual70
|
||||||
: "";
|
: "";
|
||||||
reasonDevelopment20.value =
|
reasonDevelopment20.value =
|
||||||
data.developmentProjectTechniqueActuals.includes("other2")
|
data.developmentProjectTechniqueActuals.includes("other2")
|
||||||
? data.reasonDevelopment20
|
? data.reasonActual20
|
||||||
: "";
|
: "";
|
||||||
reasonDevelopment10.value =
|
reasonDevelopment10.value =
|
||||||
data.developmentProjectTechniqueActuals.includes("other3")
|
data.developmentProjectTechniqueActuals.includes("other3")
|
||||||
? data.reasonDevelopment10
|
? data.reasonActual10
|
||||||
: "";
|
: "";
|
||||||
})
|
})
|
||||||
.catch((e) => {
|
.catch((e) => {
|
||||||
|
|
@ -218,7 +218,7 @@ watch(
|
||||||
http
|
http
|
||||||
.get(url)
|
.get(url)
|
||||||
.then(async (res) => {
|
.then(async (res) => {
|
||||||
const data = res.data.result;
|
const data = await res.data.result;
|
||||||
formData.year = data.selectTypeYear;
|
formData.year = data.selectTypeYear;
|
||||||
await getDataByYear();
|
await getDataByYear();
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
|
|
@ -234,6 +234,8 @@ watch(
|
||||||
formData.isDevelopment20 = data.isDevelopment20;
|
formData.isDevelopment20 = data.isDevelopment20;
|
||||||
formData.isDevelopment10 = data.isDevelopment10;
|
formData.isDevelopment10 = data.isDevelopment10;
|
||||||
formData.achievement10 = data.achievement10;
|
formData.achievement10 = data.achievement10;
|
||||||
|
|
||||||
|
console.log("🚀 ~ setTimeout ~ projectName.value:", projectName.value)
|
||||||
formData.achievement5 = data.achievement5;
|
formData.achievement5 = data.achievement5;
|
||||||
formData.achievement0 = data.achievement0;
|
formData.achievement0 = data.achievement0;
|
||||||
development.value = data.developmentProjects;
|
development.value = data.developmentProjects;
|
||||||
|
|
|
||||||
|
|
@ -225,15 +225,15 @@ function getProjectDetail(val: any) {
|
||||||
development.value = data.developmentProjectTechniqueActuals;
|
development.value = data.developmentProjectTechniqueActuals;
|
||||||
reasonDevelopment70.value =
|
reasonDevelopment70.value =
|
||||||
data.developmentProjectTechniqueActuals.includes("other1")
|
data.developmentProjectTechniqueActuals.includes("other1")
|
||||||
? data.reasonDevelopment70
|
? data.reasonActual70
|
||||||
: "";
|
: "";
|
||||||
reasonDevelopment20.value =
|
reasonDevelopment20.value =
|
||||||
data.developmentProjectTechniqueActuals.includes("other2")
|
data.developmentProjectTechniqueActuals.includes("other2")
|
||||||
? data.reasonDevelopment20
|
? data.reasonActual20
|
||||||
: "";
|
: "";
|
||||||
reasonDevelopment10.value =
|
reasonDevelopment10.value =
|
||||||
data.developmentProjectTechniqueActuals.includes("other3")
|
data.developmentProjectTechniqueActuals.includes("other3")
|
||||||
? data.reasonDevelopment10
|
? data.reasonActual10
|
||||||
: "";
|
: "";
|
||||||
})
|
})
|
||||||
.catch((e) => {
|
.catch((e) => {
|
||||||
|
|
@ -344,9 +344,7 @@ watch(
|
||||||
v-model="formData.year"
|
v-model="formData.year"
|
||||||
:locale="'th'"
|
:locale="'th'"
|
||||||
autoApply
|
autoApply
|
||||||
position="center"
|
|
||||||
year-picker
|
year-picker
|
||||||
:alt-position="customPosition"
|
|
||||||
:enableTimePicker="false"
|
:enableTimePicker="false"
|
||||||
@update:model-value="getDataByYear(), (projectName = '')"
|
@update:model-value="getDataByYear(), (projectName = '')"
|
||||||
>
|
>
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue