Merge branch 'develop' of github.com:Frappet/hrms-mgt into develop
This commit is contained in:
commit
0ff2b91d24
31 changed files with 69 additions and 31 deletions
|
|
@ -334,5 +334,6 @@ watch(
|
|||
v-model:modal="modalCommand"
|
||||
:command-type-code="props.mainTabs === '1' ? 'C-PM-17' : 'C-PM-41'"
|
||||
:persons="dataMapToSend"
|
||||
:fetch-data="props.fecthList"
|
||||
/>
|
||||
</template>
|
||||
|
|
|
|||
|
|
@ -219,8 +219,9 @@ async function fecthlist() {
|
|||
.get(pathAPI)
|
||||
.then(async (res) => {
|
||||
const data = await res.data.result;
|
||||
rows.value = data;
|
||||
rowsData.value = data;
|
||||
rows.value = data;
|
||||
onSearch();
|
||||
})
|
||||
.catch((e) => {
|
||||
messageError($q, e);
|
||||
|
|
|
|||
|
|
@ -309,5 +309,6 @@ watch(
|
|||
v-model:modal="modalCommand"
|
||||
:command-type-code="props.mainTabs === '1' ? 'C-PM-23' : 'C-PM-42'"
|
||||
:persons="dataMapToSend"
|
||||
:fecth-list="props.fecthList"
|
||||
/>
|
||||
</template>
|
||||
|
|
|
|||
|
|
@ -215,6 +215,7 @@ async function fecthlist() {
|
|||
const data = await res.data.result;
|
||||
rows.value = data;
|
||||
rowsData.value = data;
|
||||
onSearch();
|
||||
})
|
||||
.catch((e) => {
|
||||
messageError($q, e);
|
||||
|
|
|
|||
|
|
@ -3,8 +3,6 @@ import { ref, computed, watchEffect } from "vue";
|
|||
import { useQuasar } from "quasar";
|
||||
import type { QTableProps } from "quasar";
|
||||
|
||||
import http from "@/plugins/http";
|
||||
import config from "@/app.config";
|
||||
import { useCounterMixin } from "@/stores/mixin";
|
||||
import { useTransferDataStore } from "@/modules/05_placement/store";
|
||||
|
||||
|
|
@ -297,5 +295,6 @@ watchEffect(() => {
|
|||
v-model:modal="modalCommand"
|
||||
:command-type-code="'C-PM-18'"
|
||||
:persons="dataMapToSend"
|
||||
:fetch-data="props.fecthlistRecevice"
|
||||
/>
|
||||
</template>
|
||||
|
|
|
|||
|
|
@ -3,8 +3,6 @@ import { ref, computed, watchEffect } from "vue";
|
|||
import { useQuasar } from "quasar";
|
||||
import type { QTableProps } from "quasar";
|
||||
|
||||
import http from "@/plugins/http";
|
||||
import config from "@/app.config";
|
||||
import { useCounterMixin } from "@/stores/mixin";
|
||||
import { useTransferDataStore } from "@/modules/05_placement/store";
|
||||
|
||||
|
|
@ -297,5 +295,6 @@ watchEffect(() => {
|
|||
v-model:modal="modalCommand"
|
||||
:command-type-code="'C-PM-43'"
|
||||
:persons="dataMapToSend"
|
||||
:fetch-data="props.fecthlistRecevice"
|
||||
/>
|
||||
</template>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue