Merge branch 'nice_dev' into develop

src/api/02_organizational/api.organization.ts

@@ -77,4 +77,5 @@ export default {
   orgPosMasterByIdEmp: (id: string) => `${orgEmployeePos}/master/${id}`,
   orgPosMasterListEmp: `${orgEmployeePos}/master/list`,
   orgPosMasterEmp: `${orgEmployeePos}/master`,
+  orgPosSortEmp: `${orgEmployeePos}/sort`,
 };

src/modules/16_positionEmployee/components/DialogSortPosition.vue

@@ -46,7 +46,7 @@ function save() {
     const dataId = data.map((item: any) => item.id);
     showLoader();
     http
-      .post(config.API.orgPosSort, {
+      .post(config.API.orgPosSortEmp, {
         id: store.treeId,
         type: store.level,
         sortId: dataId,
@@ -68,14 +68,14 @@ function save() {
 function getData() {
   showLoader();
   http
-    .post(config.API.orgPosMasterList, {
+    .post(config.API.orgPosMasterListEmp, {
       id: store.treeId,
       type: store.level,
       isAll: false,
       page: 1,
       pageSize: 100,
       keyword: "",
-      revisionId: store.draftId,
+      revisionId: store.activeId,
     })
     .then((res) => {
       const dataList = res.data.result.data;

src/modules/16_positionEmployee/components/TreeTable.vue

@@ -536,7 +536,6 @@ async function onClickDownloadReport(val: string, name: string) {
     >
       <template v-slot:header="props">
         <q-tr :props="props">
-          <q-th auto-width></q-th>
           <q-th v-for="col in props.cols" :key="col.name" :props="props">
             <span class="text-weight-medium">{{ col.label }}</span>
           </q-th>
@@ -545,7 +544,7 @@ async function onClickDownloadReport(val: string, name: string) {
       </template>
       <template v-slot:body="props">
         <q-tr :props="props" class="cursor-pointer">
-          <q-td>
+          <!-- <q-td>
             <q-btn
               flat
               size="14px"
@@ -555,7 +554,7 @@ async function onClickDownloadReport(val: string, name: string) {
               @click="props.expand = !props.expand"
               :icon="props.expand ? 'mdi-menu-down' : 'mdi-menu-right'"
             />
-          </q-td>
+          </q-td> -->
           <q-td v-for="col in props.cols" :key="col.name" :props="props">
             <div v-if="col.name == 'no'">
               {{
@@ -683,7 +682,7 @@ async function onClickDownloadReport(val: string, name: string) {
           </q-td>
         </q-tr>
 
-        <q-tr v-show="props.expand" :props="props">
+        <!-- <q-tr v-show="props.expand" :props="props">
           <q-td colspan="100%" class="bg-grey-1">
             <q-card flat bordered class="text-left q-ma-sm">
               <d-table
@@ -751,7 +750,7 @@ async function onClickDownloadReport(val: string, name: string) {
               </d-table>
             </q-card>
           </q-td>
-        </q-tr>
+        </q-tr> -->
       </template>
       <template v-slot:pagination="scope">
         <q-pagination

src/modules/16_positionEmployee/components/TreeView.vue

@@ -97,12 +97,7 @@ async function fetchDataTable(id: string, level: number, action: boolean) {
     reqMaster.page = 1;
     reqMaster.pageSize = 10;
     reqMaster.keyword = "";
-    reqMaster.revisionId =
-      store.typeOrganizational == "draft"
-        ? store.draftId
-        : store.typeOrganizational == "current"
-        ? store.activeId
-        : store.historyId;
+    reqMaster.revisionId = store.activeId;
   }
 
   if (action === true) {