diff --git a/src/app.vue b/src/app.vue
index d153cd6..1ad6e24 100644
--- a/src/app.vue
+++ b/src/app.vue
@@ -4,9 +4,9 @@
             <div slot="brand">
                 <div class="logo">
                     <a href="/console" v-if="isMicroservice">
-                        <img src="/assets/lambda/images/logo.svg" alt="Lambda Platform">
+                        <img src="/assets/lambda/images/kb-logo.svg" alt="Lambda Platform">
                     </a>
-                    <img v-else src="/assets/lambda/images/logo.svg" alt="Puzzle Visual Builder">
+                    <img v-else src="/assets/lambda/images/kb-logo.svg" alt="Puzzle Visual Builder">
 
                     <div class="language-switcher">
                         <Select size="small" v-if="has_language && languages.length >= 2" v-model="selectedLang"
@@ -60,61 +60,62 @@
                 <!--                        <span>Алхамт процесс</span>-->
                 <!--                    </router-link>-->
                 <!--                </li>-->
-                <li class="divider"></li>
-                <li class="sub-title">
-                    <span>{{ lang.data_processor }}</span>
-                </li>
+<!--                <li class="divider"></li>-->
+<!--                <li class="sub-title">-->
+<!--                    <span>{{ lang.data_processor }}</span>-->
+<!--                </li>-->
 
-                <li>
-                    <router-link to="/datasource">
-                        <i class="ti-server"></i>
-                        <span>{{ lang.data_settings }}</span>
-                    </router-link>
-                </li>
-                <li>
-                    <router-link to="/chart">
-                        <i class="ti-pie-chart"></i>
-                        <span>{{ lang._chart }}</span>
-                    </router-link>
-                </li>
-                <li>
-                    <router-link to="/moqup">
-                        <i class="ti-layout"></i>
-                        <span>{{ lang.original_preparation }}</span>
-                    </router-link>
-                </li>
-                <li v-if="!isMicroservice">
-                    <router-link to="/report">
-                        <i class="ti-layout-accordion-list"></i>
-                        <span>{{ lang._report }}</span>
-                    </router-link>
-                </li>
-                <li v-if="!isMicroservice">
-                    <router-link to="/analytic">
-                        <i class="ti-bar-chart"></i>
-                        <span>{{ lang.analysis }}</span>
-                    </router-link>
-                </li>
+<!--                <li>-->
+<!--                    <router-link to="/datasource">-->
+<!--                        <i class="ti-server"></i>-->
+<!--                        <span>{{ lang.data_settings }}</span>-->
+<!--                    </router-link>-->
+<!--                </li>-->
+<!--                <li>-->
+<!--                    <router-link to="/chart">-->
+<!--                        <i class="ti-pie-chart"></i>-->
+<!--                        <span>{{ lang._chart }}</span>-->
+<!--                    </router-link>-->
+<!--                </li>-->
+<!--                <li>-->
+<!--                    <router-link to="/moqup">-->
+<!--                        <i class="ti-layout"></i>-->
+<!--                        <span>{{ lang.original_preparation }}</span>-->
+<!--                    </router-link>-->
+<!--                </li>-->
+<!--                <li v-if="!isMicroservice">-->
+<!--                    <router-link to="/report">-->
+<!--                        <i class="ti-layout-accordion-list"></i>-->
+<!--                        <span>{{ lang._report }}</span>-->
+<!--                    </router-link>-->
+<!--                </li>-->
+<!--                <li v-if="!isMicroservice">-->
+<!--                    <router-link to="/analytic">-->
+<!--                        <i class="ti-bar-chart"></i>-->
+<!--                        <span>{{ lang.analysis }}</span>-->
+<!--                    </router-link>-->
+<!--                </li>-->
 
-                <li>
-                    <router-link to="/notification">
-                        <i class="ti-bell"></i>
-                        <span>{{ lang.target_statement }}</span>
-                    </router-link>
-                </li>
-                <li>
-                    <router-link to="/graphql">
-                        <img src="/assets/lambda/images/graphql.svg" width="21">&nbsp;
-                        <span>{{ lang.graphql_management }}</span>
-                    </router-link>
-                </li>
+<!--                <li>-->
+<!--                    <router-link to="/notification">-->
+<!--                        <i class="ti-bell"></i>-->
+<!--                        <span>{{ lang.target_statement }}</span>-->
+<!--                    </router-link>-->
+<!--                </li>-->
+<!--                <li>-->
+<!--                    <router-link to="/graphql">-->
+<!--                        <img src="/assets/lambda/images/graphql.svg" width="21">&nbsp;-->
+<!--                        <span>{{ lang.graphql_management }}</span>-->
+<!--                    </router-link>-->
+<!--                </li>-->
+
+<!--                <li>-->
+<!--                    <router-link to="/visual-builder">-->
+<!--                        <i class="ti-panel"></i>-->
+<!--                        <span>{{ lang.web_page }}</span>-->
+<!--                    </router-link>-->
+<!--                </li>-->
 
-                <li>
-                    <router-link to="/visual-builder">
-                        <i class="ti-panel"></i>
-                        <span>{{ lang.web_page }}</span>
-                    </router-link>
-                </li>
                 <li class="divider" v-if="accessAdminModule"></li>
                 <li class="sub-title" v-if="accessAdminModule">
                     <span>{{ lang.usersAndUserGroups }}</span>
@@ -242,8 +243,13 @@ export default {
                 }
                 return false
             }
-            return true;
 
+            if(this.lambda_access_permission && this.user.role!=this.lambda_access_permission)
+            {
+                return false;
+            }
+
+            return true;
         }
     },
     data() {
@@ -256,6 +262,7 @@ export default {
             app_logo: app_logo,
             app_text: app_text,
             languages: window.lambda.languages,
+            lambda_access_permission: window.lambda.lambda_access_permission?window.lambda.lambda_access_permission:null,
             has_language: window.lambda.has_language,
             selectedLang: localStorage.getItem("lang") == null ? window.lambda.default_language : localStorage.getItem("lang"),
         };
diff --git a/src/components/UserControl.vue b/src/components/UserControl.vue
index 792290b..c5f0502 100644
--- a/src/components/UserControl.vue
+++ b/src/components/UserControl.vue
@@ -1,7 +1,6 @@
 <template>
     <div class="user-control">
         <ul>
-
             <li class="avatar-item">
                 <Poptip placement="bottom-end" popper-class="no-animation">
                     <a href="javascript:void(0)" class="avatar">
diff --git a/src/components/listview.vue b/src/components/listview.vue
index 7121d0d..189284f 100644
--- a/src/components/listview.vue
+++ b/src/components/listview.vue
@@ -255,18 +255,15 @@ export default {
         filterList($event) {
             let vm = this;
             let q = $event.target.value;
+            console.log(q);
+            console.log(vm.listData);
             if (q != "") {
                 let filtered = vm.listData.filter(
-                    (f) => {
-                        f.name
-                            .toString()
-                            .toLowerCase()
-                            .indexOf(q.toLowerCase()) >= 0
-                    }
+                    f => f.name?f.name.toLowerCase().includes(q.toLowerCase()):false
                 );
-                vm.filteredList = filtered.map(o => ({...o}));
+                vm.filteredList = filtered;
             } else {
-                vm.filteredList = vm.listData.map(o => ({...o}));
+                vm.filteredList = vm.listData;
             }
         }
     }
diff --git a/src/locale/mn_MN.js b/src/locale/mn_MN.js
index 8a1a2f0..df8dc29 100644
--- a/src/locale/mn_MN.js
+++ b/src/locale/mn_MN.js
@@ -99,7 +99,7 @@ export default {
         "firstNameandLastName": "Овог нэр",
         "mobile": "Гар утас",
         "createdDate": "Үүсгэсэн огноо",
-        "registrationregistrationConfirmedConfirmed": "БҮРТГЭЛ БАТАЛГААЖСАН",
+        "registrationConfirmed": "БҮРТГЭЛ БАТАЛГААЖСАН",
         "registrationIsNotConfirmed": "БҮРТГЭЛ БАТАЛГААЖААГҮЙ",
         "success": "Амжилттай",
         "systemUpdate": "Систем шинэчлэх",
diff --git a/src/modules/agent/scss/theme/lexus/style.scss b/src/modules/agent/scss/theme/lexus/style.scss
index 8d1fc4f..c9bd806 100644
--- a/src/modules/agent/scss/theme/lexus/style.scss
+++ b/src/modules/agent/scss/theme/lexus/style.scss
@@ -23,7 +23,7 @@ $color-overlay: #131314;
     font-weight: 600;
     font-display: swap;
   }
-  
+
   @font-face {
     font-family: "Nobel Light";
     src: url("/assets/web/lexus/fonts/nobel/nobel-light.eot");
@@ -35,7 +35,7 @@ $color-overlay: #131314;
     font-weight: normal;
     font-display: swap;
   }
-  
+
   @font-face {
     font-family: "Nobel";
     src: url("/asset/webs/lexus/fonts/nobel/nobel-regular.eot");
@@ -47,7 +47,7 @@ $color-overlay: #131314;
     font-weight: normal;
     font-display: swap;
   }
-  
+
   @font-face {
     font-family: "Nobel Book";
     src: url("/assets/web/lexus/fonts/nobel/nobel-book.eot");
diff --git a/src/modules/agent/views/index.vue b/src/modules/agent/views/index.vue
index 6d5cfa2..6bd2b3f 100644
--- a/src/modules/agent/views/index.vue
+++ b/src/modules/agent/views/index.vue
@@ -4,14 +4,18 @@
             <Row :gutter="16" class="tbl-header">
                 <Col span="12" class-name="tbl-header-left">
                     <div class="tbl-header-title">
-                        <span v-if="!isDeleted">{{lang.userList}}</span>
-                        <span v-else>{{lang.listOfDeletedUsers}}</span>
+                        <span v-if="!isDeleted">{{ lang.userList }}</span>
+                        <span v-else>{{ lang.listOfDeletedUsers }}</span>
                     </div>
                     <div class="tbl-header-count">
                         <a @click="isDeleted = false" :class="isDeleted ? '': 'active'"><i
-                            class="mdi mdi-account-group mdi-18px"></i> {{lang.totalEmployees}}: <span>{{ users.total }}</span></a>
+                            class="mdi mdi-account-group mdi-18px"></i> {{ lang.totalEmployees }}: <span>{{
+                                users.total
+                            }}</span></a>
                         <a @click="isDeleted = true" :class="isDeleted ? 'active': ''"><i
-                            class="mdi mdi-account-remove mdi-18px"></i> {{lang.deleted}}: <span>{{ deletedUsers.total }}</span></a>
+                            class="mdi mdi-account-remove mdi-18px"></i> {{ lang.deleted }}: <span>{{
+                                deletedUsers.total
+                            }}</span></a>
                     </div>
                 </Col>
 
@@ -24,7 +28,7 @@
                     </div>
 
                     <Button class="agent-add-btn" type="success" @click="showForm = true">
-                        <i class="ti-plus"></i> {{lang.addUser}}
+                        <i class="ti-plus"></i> {{ lang.addUser }}
                     </Button>
 
                     <slot name="user-control"></slot>
@@ -37,7 +41,7 @@
                 <template v-if="deletedUsers.total == 0">
                     <div class="no-user-data">
                         <i class="mdi mdi-account-off mdi-48px"></i>
-                        <p>{{lang.noMatchingData}}</p>
+                        <p>{{ lang.noMatchingData }}</p>
                     </div>
                 </template>
             </template>
@@ -46,16 +50,18 @@
                 <template v-if="users.total == 0">
                     <div class="no-user-data">
                         <i class="mdi mdi-account-off mdi-48px"></i>
-                        <p>{{lang.noMatchingData}}</p>
+                        <p>{{ lang.noMatchingData }}</p>
                     </div>
                 </template>
             </template>
 
             <dv-pagination :is-deleted="isDeleted" :deleted-model="deletedUsers"
-                           :model="users" :query="query" :roles="roles" :is-top="false" :layout="layout"></dv-pagination>
+                           :model="users" :query="query" :roles="roles" :is-top="false"
+                           :layout="layout"></dv-pagination>
 
             <Row :gutter="16" class="user-grid-wrapper">
-                <Col v-for="user in isDeleted ? deletedUsers.data : users.data" :key="user.id" :xs="24" :sm="12" :md="12"
+                <Col v-for="user in isDeleted ? deletedUsers.data : users.data" :key="user.id" :xs="24" :sm="12"
+                     :md="12"
                      :lg="8">
                     <div class="user-grid">
                         <div class="user-head">
@@ -112,12 +118,12 @@
                             <div class="user-status">
                                 <div v-if="user.status == 0" class="false">
                                     <i class="ti-na"></i>
-                                    <span>{{lang.registrationIsNotConfirmed}}</span>
+                                    <span>{{ lang.registrationIsNotConfirmed }}</span>
                                 </div>
 
                                 <div v-else class="user-status">
                                     <i class="ti-check"></i>
-                                    <span>{{lang.registrationConfirmed}}</span>
+                                    <span>{{ lang.registrationConfirmed }}</span>
                                 </div>
                             </div>
                         </div>
@@ -126,40 +132,45 @@
                             <ul class="user-content-list">
                                 <li>
                                     <div class="user-content-list-content">
-                                        <span class="user-content-list-heading">{{lang.firstNameandLastName}}</span>
+                                        <span class="user-content-list-heading">{{ lang.firstNameandLastName }}</span>
                                         <span class="user-content-list-data">
                                             <template
-                                                v-if="user.first_name != null && user.first_name !=''">{{ user.first_name}}</template>
+                                                v-if="user.first_name != null && user.first_name !=''">{{ user.first_name }}</template>
                                             <template
-                                                v-if="user.last_name != null && user.last_name !=''"> {{user.last_name}}</template>
-                                            <template v-else><span class="user-no-data">{{lang.noInfo}}</span></template>
+                                                v-if="user.last_name != null && user.last_name !=''"> {{ user.last_name }}</template>
+                                            <template v-else><span
+                                                class="user-no-data">{{ lang.noInfo }}</span></template>
                                         </span>
                                     </div>
                                 </li>
                                 <li>
                                     <div class="user-content-list-content">
-                                        <span class="user-content-list-heading">{{lang.email}}</span>
+                                        <span class="user-content-list-heading">{{ lang.email }}</span>
                                         <span class="user-content-list-data">
                                             <template
-                                                v-if="user.email != null && user.email != ''">{{ user.email}}</template>
-                                            <template v-else><span class="user-no-data">{{lang.noData}}</span></template>
+                                                v-if="user.email != null && user.email != ''">{{ user.email }}</template>
+                                            <template v-else><span
+                                                class="user-no-data">{{ lang.noData }}</span></template>
                                         </span>
                                     </div>
                                 </li>
                                 <li>
                                     <div class="user-content-list-content">
-                                        <span class="user-content-list-heading">{{lang.mobile}}</span>
+                                        <span class="user-content-list-heading">{{ lang.mobile }}</span>
                                         <span class="user-content-list-data">
                                             <template
-                                                v-if="user.phone != null && user.phone != ''">{{ user.phone}}</template>
-                                            <template v-else><span class="user-no-data">{{lang.noData}}</span></template>
+                                                v-if="user.phone != null && user.phone != ''">{{ user.phone }}</template>
+                                            <template v-else><span
+                                                class="user-no-data">{{ lang.noData }}</span></template>
                                         </span>
                                     </div>
                                 </li>
                                 <li>
                                     <div class="user-content-list-content">
-                                        <span class="user-content-list-heading">{{ !isDeleted ? lang.createdDate : lang.deleted}} </span>
-                                        <span class="user-content-list-data">{{ !isDeleted ? setMoment(user.created_at) : user.deleted_at}}</span>
+                                        <span
+                                            class="user-content-list-heading">{{ !isDeleted ? lang.createdDate : lang.deleted }} </span>
+                                        <span
+                                            class="user-content-list-data">{{ !isDeleted ? setMoment(user.created_at) : user.deleted_at }}</span>
                                     </div>
                                 </li>
                             </ul>
@@ -170,7 +181,8 @@
         </section>
 
         <Drawer width="700" class="agent-form" :closable="false" v-model="showForm">
-            <dataform ref="agentForm" schemaID="user_form" :url="baseUrl ? baseUrl : ''" :editMode="editMode" :onSuccess="onSuccess"/>
+            <dataform ref="agentForm" schemaID="user_form" :url="baseUrl ? baseUrl : ''" :editMode="editMode"
+                      :onSuccess="onSuccess"/>
         </Drawer>
     </section>
 </template>
@@ -180,12 +192,12 @@ import moment from 'moment';
 import pagination from "./pagination";
 
 export default {
-    props:['baseUrl'],
+    props: ['baseUrl'],
     computed: {
         lang() {
             const labels = ['db', 'usersAndUserGroups', 'users', 'userGroupsPermission', 'sendDBSchema',
                 'userList', 'totalEmployees', 'categorySearch', 'sort', 'searchForInformation', 'noMatchingData', 'addUser',
-                'registrationConfirmed','registrationIsNotConfirmed', 'createdDate', 'firstNameandLastName', 'noInfo', 'noData', 'email',
+                'registrationConfirmed', 'registrationIsNotConfirmed', 'createdDate', 'firstNameandLastName', 'noInfo', 'noData', 'email',
                 'ruconfinfo', 'ruconfinfoDelete', 'created', 'deleted', 'listOfDeletedUsers', 'byLoginName', 'yes', 'no', 'completeDestruction',
                 'recovery', 'edit', ''
             ];
@@ -207,7 +219,7 @@ export default {
                 return obj;
             }, {});
         },
-        url(){
+        url() {
             return this.baseUrl ? this.baseUrl : "";
         },
     },
@@ -280,10 +292,14 @@ export default {
         editUser(id) {
             this.editMode = true;
             this.showForm = true;
-            this.$refs.agentForm.editModel(id);
+            this.$nextTick(() => {
+                if (this.$refs.agentForm) {
+                    this.$refs.agentForm.editModel(id);
+                }
+            });
         },
         deleteUser(id) {
-            axios.get(this.url+'/agent/delete/' + id).then(o => {
+            axios.get(this.url + '/agent/delete/' + id).then(o => {
                 if (o.status) {
                     this.$Message.success(`${this._messageTranslate.userDeleted}`);
                     let deletedUser = this.users.data.find(item => item.id == id);
@@ -297,7 +313,7 @@ export default {
             })
         },
         deleteUserComplete(id) {
-            axios.get(this.url+'/agent/delete/complete/' + id).then(o => {
+            axios.get(this.url + '/agent/delete/complete/' + id).then(o => {
                 if (o.status) {
                     this.$Message.success(`${this._messageTranslate.userDeleted}`)
                     this.deletedUsers.data = this.deletedUsers.data.filter(item => item.id != id);
@@ -308,7 +324,7 @@ export default {
             })
         },
         restoreUser(id) {
-            axios.get(this.url+'/agent/restore/' + id)
+            axios.get(this.url + '/agent/restore/' + id)
                 .then(o => {
                     if (o.status) {
                         this.$Message.success(`${this._messageTranslate.UserInformationRestored}`);
@@ -326,7 +342,7 @@ export default {
                 });
         },
         showDefaultAvatar(e) {
-            e.target.src = this.url+"/assets/lambda/images/avatar.png";
+            e.target.src = this.url + "/assets/lambda/images/avatar.png";
         },
         searchUser() {
             if (this.q == null || this.q == '') {
@@ -336,7 +352,7 @@ export default {
             }
         },
         handleSearch(q) {
-            axios.get(this.url+'/agent/search/' + q).then(o => {
+            axios.get(this.url + '/agent/search/' + q).then(o => {
                 if (o.data.status) {
                     this.users = o.data.data;
                 } else {
@@ -345,11 +361,11 @@ export default {
             });
         },
         getRoles() {
-            axios.get(this.url+'/agent/roles').then(({data}) => {
+            axios.get(this.url + '/agent/roles').then(({data}) => {
                 this.roles = data;
             })
         },
-        wordSwap(words){
+        wordSwap(words) {
             console.log("words");
             console.log(words);
             //words = this.lang().words;
diff --git a/src/modules/dataform/Dataform.vue b/src/modules/dataform/Dataform.vue
index 51cc43a..ab8dc37 100644
--- a/src/modules/dataform/Dataform.vue
+++ b/src/modules/dataform/Dataform.vue
@@ -73,9 +73,10 @@
                                  :key='col.index' :xs='col.span.xs'
                                  :sm='col.span.sm' :md='col.span.md' :lg='col.span.lg'>
 
-                                <div
-                                    :class="col.name !== '' && col.name !== null && col.name !== undefined ? 'fieldset' : ''">
-                                    <legend v-if="col.name != ''">{{ col.name }}
+                                <div :id='col.id'
+                                    :class="`${col.visibleModelValue? 'lbd-dataform-section-hide':''} ${col.name !== '' && col.name !== null && col.name !== undefined ? 'fieldset' : ''}`">
+                                    <legend>
+                                        <div class="fieldset-title"> {{ col.name }}</div>
                                     <Row v-for='srow in col.children' :key='srow.index'>
                                         <Col v-for='scol in srow.children' :id='scol.id' :key='scol.index' :xs='24'
                                              :sm='24' :md='scol.span.md' :lg='scol.span.lg'>
@@ -87,7 +88,7 @@
 
                                         <component
                                             :key='item.model'
-                                            :ref="'sf'+item.model"
+                                            :ref="`sf${item.subtype=='FormKb'?'-kb-':''}${item.model}`"
                                             :url='url'
                                             v-if="isShow(item.model) && item.formType == 'SubForm' && item.subtype"
                                             :is='element(`subform/${item.subtype}`)'
@@ -138,7 +139,7 @@
                                             </Divider>
                                             <span v-for='item in scol.children' :key='item.index'>
                                         <component
-                                            :ref="'sf'+item.model"
+                                            :ref="`sf${item.subtype=='FormKb'?'-kb-':''}${item.model}`"
                                             v-if="isShow(item.model) && item.formType == 'SubForm' && item.subtype"
                                             :is='element(`subform/${item.subtype}`)'
                                             :model='{form: model, component: item.model}'
@@ -184,7 +185,7 @@
                                 <span v-for='item in col.children' :key='item.index'>
                             <component
                                 :key='item.model'
-                                :ref="'sf'+item.model"
+                                :ref="`sf${item.subtype=='FormKb'?'-kb-':''}${item.model}`"
                                 v-if="isShow(item.model) && item.formType == 'SubForm' && item.subtype"
                                 :is='element(`subform/${item.subtype}`)'
                                 :label='item.label ? item.label : `[${item.model}]`'
@@ -234,7 +235,7 @@
                     </Button>
                     <Button type='info' :loading='asyncMode' @click="handleSubmit(meta.model +'-'+ schemaID)">
                     <span v-if='!asyncMode'>
-                        {{ save_btn_text !== 'Хадгалах' && save_btn_text != '' ? save_btn_text : lang.save }}
+                        {{ save_btn_text != '' ? save_btn_text : lang.save }}
                     </span>
                         <span v-else>
                         {{ lang.pleaseWait }}
diff --git a/src/modules/dataform/DataformMixin.js b/src/modules/dataform/DataformMixin.js
index 10c0579..8f1f2d0 100644
--- a/src/modules/dataform/DataformMixin.js
+++ b/src/modules/dataform/DataformMixin.js
@@ -64,6 +64,7 @@ export default {
             },
             currentStep: 0,
             step: {},
+            isKbForm: this.schemaID==325?1:0,
         }
     },
 
@@ -105,6 +106,7 @@ export default {
 
     watch: {
         src(val, oldValue) {
+            console.log('src changing')
             this.initForm()
         },
 
@@ -160,8 +162,8 @@ export default {
                     return true
                 }
             }
-            // else if (col.type == 'col') {
-            //     return col;
+                // else if (col.type == 'col') {
+                //     return col;
             // }
             else {
                 return false
@@ -291,7 +293,7 @@ export default {
                 this.step = formSchema.step;
             }
 
-            this.ui = formSchema.ui
+            this.ui = formSchema.ui;
             if (formSchema.save_btn_text) {
                 this.save_btn_text = formSchema.save_btn_text
             }
@@ -348,12 +350,13 @@ export default {
                         if (item.fillByUserField !== null && item.fillByUserField !== '' && item.fillByUserField !== undefined) {
                             this.setModel(item.model, window.init.user[item.fillByUserField], item.formType)
                         }
-                        if (this.isValid(item.param)) {
-                            if (item.param in this.$route.params) {
-                                let param = this.$route.params[item.param]
-                                if (param != 'null') {
-                                    Vue.set(this.$data.model, item.model, param)
-                                }
+                    }
+                    //hidden luu oruulsan bsan paramaas hidden hamaagui utgaa avnaa
+                    if (this.isValid(item.param)) {
+                        if (item.param in this.$route.params) {
+                            let param = this.$route.params[item.param]
+                            if (param != 'null') {
+                                Vue.set(this.$data.model, item.model, param)
                             }
                         }
                     }
@@ -542,8 +545,11 @@ export default {
                 Vue.set(this.$data.model, model, value)
             } else if (prop == 'sub-value') {
                 Vue.set(this.$data.model, model, value)
+                console.log('prop');
+                console.log(prop);
                 this.subFormFillData(model)
             } else {
+                console.log('prop -else');
                 let index = this.schema.findIndex(item => item.model == model)
 
                 if (index >= 0) {
@@ -583,7 +589,49 @@ export default {
                 this.onClose();
             }
         },
+        handleResetKb() {
+            this.handleReset[this.meta.model + '-' + this.schemaID]
+        },
+        handleSubmitKb(parentData,lang_id) {
+            this.setIdentityManual();
+            console.log(this.identity);
+            console.log("parentData:");
+            console.log(parentData);
+             if(!this.$data.model['title']) {
+                 this.$data.model['title'] = parentData['title'];
+             }
+            this.$data.model['slug'] = parentData['slug'];
+            this.$data.model['is_special'] = parentData['is_special'];
+            this.$data.model['order_id'] = parentData['order_id'];
+            this.$data.model['is_show_menu'] = parentData['is_show_menu'];
+            this.$data.model['lang_id'] = lang_id;
 
+            if (_.isEmpty(this.$data.rule)) {
+                if (this.subFormValidations.length >= 1) {
+                    this.validateWithSubForm()
+                } else {
+                    this.postData()
+                }
+            } else {
+                this.$refs[this.meta.model + '-' + this.schemaID].validate(valid => {
+                    if (valid) {
+                        if (this.subFormValidations.length >= 1) {
+                            this.validateWithSubForm()
+                        } else {
+                            this.postData()
+                        }
+                    } else {
+                        //auh дээр хэрэглэгдэж байгаа шүү
+                        this.$Notice.error({
+                            title: this.lang.informationIsIncomplete,
+                            desc: this.formValidationCustomText != '' ? this.formValidationCustomText : this.lang.trRMandatoryFieldsFillInformationLookFormAFillRequiredFieldsWithRedBorder
+                            , duration: 0
+                        })
+
+                    }
+                })
+            }
+        },
         handleSubmit(name) {
             this.setIdentityManual()
             if (_.isEmpty(this.$data.rule)) {
@@ -649,7 +697,24 @@ export default {
             if (this.isSubForm) {
                 this.$props.onSuccess(this.$data.model)
             } else {
-                this.asyncMode = true
+                if (this.isKbForm) {
+                    console.log('this.isKbForm:');
+                    console.log(this.isKbForm);
+
+                    if (this.$refs[`sf-kb-public.product`]) {
+                        if (this.$refs[`sf-kb-public.product`].length >= 1) {
+                            const clonedObject = { ...this.$data.model};
+                            this.$refs[`sf-kb-public.product`][0].$refs['kbmnform'].handleSubmitKb(clonedObject,2);
+                            this.$refs[`sf-kb-public.product`][0].$refs['kbenform'].handleSubmitKb(clonedObject,1);
+                        }
+                    }
+                }
+                this.asyncMode = true;
+                if (!this.editMode) {
+                   delete this.$data.model[this.identity];
+                }
+                console.log("this.submitUrl:");
+                console.log(this.submitUrl);
                 axios.post(this.submitUrl, this.$data.model)
                     .then(({data}) => {
                         if (data.status) {
@@ -716,8 +781,6 @@ export default {
                                 duration: 3,
                                 desc: e
                             })
-
-
                         }
 
                         this.asyncMode = false
@@ -725,7 +788,7 @@ export default {
                             this.$props.onError()
                         }
 
-                    })
+                    });
             }
         },
 
@@ -735,7 +798,6 @@ export default {
             setIdentity(this.identity, null)
             this.schema.forEach(item => {
                 if (item.formType == 'SubForm' && typeof this.$refs[`sf${item.model}`] != 'undefined') {
-                    console.log(this.$refs[`sf${item.model}`]);
                     this.$refs[`sf${item.model}`][0].reset()
                 }
                 //if (item.default != null && !this.editMode) {
@@ -793,7 +855,7 @@ export default {
             }
         },
 
-        editModel(id, editData) {
+        editModel(id, editData=null) {
             if (editData) {
                 this.model = {...this.model, ...editData}
                 if (this.ui && this.ui.hasOwnProperty('schema')) {
@@ -817,6 +879,28 @@ export default {
                     })
             }
         },
+        editModelBySlug(slug, lang) {
+           return axios.post(`${this.baseUrl}/lambda/krud/${this.$props.schemaID}/edit-slug/${slug}/${lang}`)
+                .then(({data}) => {
+                    if (data.status) {
+                        this.dataID = data.data.id;
+                        setIdentity(this.identity, data.data.id);
+                        this.model = {...this.model, ...data.data}
+                        if (this.ui && this.ui.hasOwnProperty('schema')) {
+                            this.setEditModel(this.ui.schema)
+                        }
+                        this.setUserConditionValues(false)
+                        this.setCustomData();
+                        return 1;
+                    }
+                    else{
+                        return 0;
+                    }
+                }).catch(error => {
+                   console.log(error.response.data.error);
+                   return 0;
+               })
+        },
 
         setHiddenValues(values) {
             values.map(item => {
@@ -824,6 +908,19 @@ export default {
             })
         },
 
+        subFormFillDataKB(subModel) {
+            console.log('KB SUB FORM');
+            console.log(subModel);
+            console.log(this.model.slug);
+            console.log(this.model.id);
+            if (this.$refs[`sf-kb-${subModel}`]) {
+                if (this.$refs[`sf-kb-${subModel}`].length >= 1) {
+                    if (this.model.slug) {
+                        this.$refs[`sf-kb-${subModel}`][0].editBySlug(this.model.slug);
+                    }
+                }
+            }
+        },
         subFormFillData(subModel) {
             if (this.$refs[`sf${subModel}`]) {
                 if (this.$refs[`sf${subModel}`].length >= 1) {
@@ -842,10 +939,14 @@ export default {
 
         setEditModel(items) {
             items.forEach(item => {
-                if (item.type == 'form' || item.type == 'Form' || item.formType == 'SubForm') {
+                if (item.type == 'form' || item.type == 'Form' || item.type == 'FormKb' || item.formType == 'SubForm') {
                     switch (item.formType) {
                         case 'SubForm':
-                            this.subFormFillData(item.model)
+                            if (item.type == 'FormKb') {
+                                this.subFormFillDataKB(item.model);
+                            } else {
+                                this.subFormFillData(item.model);
+                            }
                             break
                         case 'Switch':
                             if (this.model[item.model] == 1 || this.model[item.model] == 'true') {
@@ -1000,7 +1101,6 @@ export default {
                     }
                 }
             })
-            console.log('selects: ', selects);
 
             return selects
         },
diff --git a/src/modules/dataform/FormBuilder.vue b/src/modules/dataform/FormBuilder.vue
index f0e6f97..968346e 100644
--- a/src/modules/dataform/FormBuilder.vue
+++ b/src/modules/dataform/FormBuilder.vue
@@ -7,6 +7,10 @@
                     <label>{{ lang.Form_name }}</label>
                     <Input v-model='formName' :placeholder='lang.Form_name'/>
                 </div>
+                <div class='fb-control-item'>
+                    <label>Slug /Давхцахгүй/</label>
+                    <Input v-model='slug' placeholder='Slug /Давхцахгүй/'/>
+                </div>
 
                 <div class='fb-control-item'>
                     <label>{{ lang.Sub_name }}</label>
@@ -176,6 +180,7 @@
                                                       :label='lang.field + (index+1)'>
                                                 <Row :gutter='8' :label='80'>
                                                     <Col span='10'>
+                                                        <div style="display: flex; flex-direction: column; align-items: center">
                                                         <Select v-model='target.field'
                                                                 :placeholder='lang.field'
                                                                 v-if="formulaForm.form == 'main'">
@@ -185,6 +190,13 @@
                                                                 }}
                                                             </Option>
                                                         </Select>
+                                                            <span  v-if="formulaForm.form == 'main'">
+                                                        or </span>
+                                                        <Input type='text' v-model='target.section'
+                                                               v-if="formulaForm.form == 'main'"
+                                                               placeholder='Section Id'/>
+                                                        </div>
+                                                        <div style="display: flex; flex-direction: column; align-items: center;">
                                                         <Select v-model='target.field'
                                                                 :placeholder='lang.field'
                                                                 v-for="(f, f_index) in dataform.schema.filter(ff=>ff.formType === 'SubForm' && ff.model === formulaForm.form && formulaForm.form !== 'main')"
@@ -195,6 +207,7 @@
                                                                 }}
                                                             </Option>
                                                         </Select>
+                                                        </div>
                                                     </Col>
 
                                                     <Col span='10'>
@@ -607,6 +620,7 @@ export default {
             //Form part
             isModelSelected: false,
             formName: null,
+            slug: null,
             editor: Editor,
             dataform: {
                 formType: 'normal',
@@ -927,7 +941,7 @@ export default {
 
     watch: {
         reCallDataAw() {
-            console.log('watch ajilj bn')
+
             //this.data();
         }
     },
@@ -998,6 +1012,7 @@ export default {
         addFormulaTarget() {
             this.formulaForm.targets.push({
                 field: '',
+                section:'',
                 prop: ''
             })
         },
@@ -1043,6 +1058,7 @@ export default {
                 let res = await axios.get(this.$props.src + '/builder')
                 try {
                     this.formName = res.data.data.hasOwnProperty('name') ? res.data.data.name : res.data.data.model
+                    this.slug = res.data.data.hasOwnProperty('slug') ? res.data.data.slug : res.data.data.model
                     this.dataform = JSON.parse(res.data.data.schema)
                     await this.callOtherFormsGrids()
                     await this.updateSyncForm()
@@ -1497,6 +1513,7 @@ export default {
 
             let data = {
                 name: this.formName,
+                slug: this.slug,
                 schema: JSON.stringify(this.dataform)
             }
             let defualtURL = `/lambda/puzzle/schema/form`
diff --git a/src/modules/dataform/FormMoqup.vue b/src/modules/dataform/FormMoqup.vue
index 97e0f0a..4ad9a99 100644
--- a/src/modules/dataform/FormMoqup.vue
+++ b/src/modules/dataform/FormMoqup.vue
@@ -11,19 +11,19 @@
                     <div class='view-port-switcher'>
                         <a href='javascript:void(0)' :class="`${mode.type} ${mode.type == 'xs' ? 'active' :''}`"
                            @click="setMode('xs', langMoqup.phone)">
-                            <Icon type='md-phone-portrait' />
+                            <Icon type='md-phone-portrait'/>
                         </a>
                         <a href='javascript:void(0)' :class="`${mode.type} ${mode.type == 'sm' ? 'active' :''}`"
                            @click="setMode('sm', langMoqup.tablet)">
-                            <Icon type='md-tablet-portrait' />
+                            <Icon type='md-tablet-portrait'/>
                         </a>
                         <a href='javascript:void(0)' :class="`${mode.type} ${mode.type == 'md' ? 'active' :''}`"
                            @click="setMode('md', langMoqup.computer)">
-                            <Icon type='md-laptop' />
+                            <Icon type='md-laptop'/>
                         </a>
                         <a href='javascript:void(0)' :class="`${mode.type} ${mode.type == 'lg' ? 'active' :''}`"
                            @click="setMode('lg', langMoqup.bigComputer)">
-                            <Icon type='md-browsers' />
+                            <Icon type='md-browsers'/>
                         </a>
                     </div>
                 </div>
@@ -48,23 +48,23 @@
 
                                             <span class='tool' @click='addSection(row.id, 1)'>
                                                 <Tooltip :content='lang.section_add'>
-                                                    <Icon type='md-menu' />
+                                                    <Icon type='md-menu'/>
                                                 </Tooltip>
                                             </span>
                                             <span class='tool' @click='addCol(row.id)'>
                                                 <Tooltip :content='lang.add_column'>
-                                                    <Icon type='md-add' />
+                                                    <Icon type='md-add'/>
                                                 </Tooltip>
                                             </span>
 
                                             <span class='tool' @click='deleteFromSchema(row.id)'>
                                                 <Tooltip :content='lang._delete'>
-                                                    <Icon type='md-close' />
+                                                    <Icon type='md-close'/>
                                                 </Tooltip>
                                             </span>
                                             <span class='row-drag-handler tool'>
                                                 <Tooltip :content='lang._move'>
-                                                    <Icon type='md-move' />
+                                                    <Icon type='md-move'/>
                                                 </Tooltip>
                                             </span>
                                         </div>
@@ -83,10 +83,20 @@
                                                      v-if="col.type == 'section'">
                                                     <div class='pz-col easing'>
                                                         <div class='pz-col-control'>
+                                                            <Input type='text' v-model='col.id' size='small'
+                                                                   placeholder='Section Id'
+                                                                   autocomplete="off"
+                                                                   disabled
+                                                                   class='pz-col-input'/>
                                                             <Input type='text' v-model='col.name' size='small'
                                                                    :placeholder='lang.Get_name'
                                                                    autocomplete="off"
-                                                                   class='pz-col-input' />
+                                                                   class='pz-col-input'/>
+                                                            <Checkbox class='pz-col-input'
+                                                                      v-model="col.visibleModelValue">Нуух
+                                                            </Checkbox>
+
+
                                                             <div class='pz-col-control-items'>
                                                                 <Poptip placement='bottom-end' size='small'>
                                                                     <!-- <a href="javascript:void(0)" @click="addSectionCol(srow.id)"> -->
@@ -94,7 +104,7 @@
                                                                   <Badge :count='col.visibleUserRoles.length'
                                                                          v-if='col.visibleUserRoles'
                                                                          class-name='badge-user-roles'></Badge>
-                                                                                <Icon type='md-person-add' />
+                                                                                <Icon type='md-person-add'/>
                                                                             </span>
                                                                     <div class='auto-col' slot='content'>
                                                                         <Select v-model='col.visibleUserRoles' multiple
@@ -108,13 +118,13 @@
                                                                     </div>
                                                                 </Poptip>
                                                                 <span class='tool' @click='addRow(col.id)'>
-                                                                    <Icon type='md-add' />
+                                                                    <Icon type='md-add'/>
                                                                 </span>
                                                                 <span class='tool' @click='deleteFromSchema(col.id)'>
-                                                                    <Icon type='md-close' />
+                                                                    <Icon type='md-close'/>
                                                                 </span>
                                                                 <span class='scol-drag-handler tool'>
-                                                                    <Icon type='md-move' />
+                                                                    <Icon type='md-move'/>
                                                                 </span>
                                                             </div>
                                                         </div>
@@ -132,7 +142,7 @@
                                                                         <Poptip placement='left' size='small'>
                                                                             <!-- <a href="javascript:void(0)" @click="addSectionCol(srow.id)"> -->
                                                                             <span class='tool'>
-                                                                                <Icon type='md-menu' />
+                                                                                <Icon type='md-menu'/>
                                                                             </span>
                                                                             <div class='auto-col' slot='content'>
                                                                                 <a v-for='options in colOptions'
@@ -149,11 +159,11 @@
 
                                                                         <span class='tool'
                                                                               @click='deleteFromSchema(srow.id)'>
-                                                                            <Icon type='md-close' />
+                                                                            <Icon type='md-close'/>
                                                                         </span>
 
                                                                         <span class='srow-drag-handler tool'>
-                                                                            <Icon type='md-move' />
+                                                                            <Icon type='md-move'/>
                                                                         </span>
                                                                     </div>
                                                                     <Col v-for='(scol, scol_index) in srow.children'
@@ -164,16 +174,16 @@
                                                                             <div class='pz-col-control'>
                                                                                 <Input type='text' v-model='scol.id'
                                                                                        size='small'
-                                                                                       class='pz-col-input' />
+                                                                                       class='pz-col-input'/>
                                                                                 <Input type='text' v-model='scol.name'
                                                                                        size='small'
                                                                                        :placeholder='lang.Get_name'
                                                                                        autocomplete="off"
-                                                                                       class='pz-col-input' />
+                                                                                       class='pz-col-input'/>
                                                                                 <div class='pz-col-control-items'>
                                                                                     <a href='javascript:void(0)'
                                                                                        @click='deleteFromSchema(scol.id)'>
-                                                                                        <Icon type='md-close' />
+                                                                                        <Icon type='md-close'/>
                                                                                     </a>
                                                                                 </div>
                                                                             </div>
@@ -213,20 +223,22 @@
                                                     </div>
                                                 </Col>
                                                 <!--  Standart column -->
-                                                <Col :span='col.span[mode.type]'     class="drag-able-column" v-if="col.type == 'col'">
+                                                <Col :span='col.span[mode.type]' class="drag-able-column"
+                                                     v-if="col.type == 'col'">
                                                     <div class='pz-col easing'>
                                                         <div class='pz-col-control'>
                                                             <Input type='text' v-model='col.id' size='small'
-                                                                   class='pz-col-input' />
+                                                                   class='pz-col-input'/>
                                                             <Input type='text' v-model='col.name' size='small'
-                                                                   class='pz-col-input' :placeholder='lang.Get_name' autocomplete="off" />
+                                                                   class='pz-col-input' :placeholder='lang.Get_name'
+                                                                   autocomplete="off"/>
 
                                                             <div class='pz-col-control-items'>
                                                         <span class='tool' @click='deleteFromSchema(col.id)'>
-                                                            <Icon type='md-close' />
+                                                            <Icon type='md-close'/>
                                                         </span>
                                                                 <span class='scol-drag-handler tool'>
-                                                            <Icon type='md-move' />
+                                                            <Icon type='md-move'/>
                                                         </span>
                                                             </div>
                                                         </div>
@@ -288,6 +300,7 @@
                                @drop='onDropMain($event)'>
                         <!--form element-->
                         <Draggable v-for='(item, index) in schema' :key='index'>
+                            {{item.formType}}   {{item.subtype}}
                             <component
                                 v-if="item.formType != null && item.formType != 'SubForm' && !item.hidden && item.model != identity"
                                 :do_render='true'
@@ -306,11 +319,11 @@
     </div>
 </template>
 <script>
-import { element } from './elements'
+import {element} from './elements'
 import Grid from './elements/subform/Grid.vue'
-import { idGenerator } from './utils/methods'
-import { Container, Draggable } from 'vue-smooth-dnd'
-import { applyDrag } from './utils/helpers'
+import {idGenerator} from './utils/methods'
+import {Container, Draggable} from 'vue-smooth-dnd'
+import {applyDrag} from './utils/helpers'
 
 export default {
     props: ['schema', 'ui', 'isDisabled', 'meta', 'schemaID', 'identity', 'use2ColumnLayout'],
@@ -360,8 +373,7 @@ export default {
         }
     },
     mounted() {
-        // console.log('Форм угсрах');
-        //  console.log(this.$props.schema);
+
     },
     computed: {
         lang() {
@@ -505,6 +517,7 @@ export default {
         addSection(parentId, type) {
             let rowItem = {
                 type: 'row',
+                visibleModelValue: 0,
                 id: this.idGenerator('row'),
                 children: [],
                 visibleUserRoles: []
@@ -532,6 +545,7 @@ export default {
             cols.forEach(item => {
                 let colItem = {
                     type: 'col',
+                    visibleModelValue: 0,
                     id: this.idGenerator('col'),
                     span: {
                         xs: item,
@@ -568,7 +582,7 @@ export default {
         handleResize(e, id) {
             this.currentDom = e.target.parentElement
             this.findElId = id
-            console.log(this.findElId)
+
             e.target.parentElement.classList.remove('easing')
             window.addEventListener('mousemove', this.resize, {
                 passive: true
@@ -608,7 +622,7 @@ export default {
                         currentWidth >= colStandartW - 40 &&
                         currentWidth <= colStandartW + 40
                     ) {
-                        console.log(vm.findElId)
+
                         let el = this.findInTree(vm.findElId, vm.ui.schema)
                         el.span[vm.$data.mode.type] = i * 2
                         parent.style.width = '100%'
diff --git a/src/modules/dataform/SubForm.vue b/src/modules/dataform/SubForm.vue
index e298e51..2e0371b 100644
--- a/src/modules/dataform/SubForm.vue
+++ b/src/modules/dataform/SubForm.vue
@@ -15,7 +15,7 @@
                     </Select>
                 </div>
 
-                <div class='fb-control-sub-item' v-if="f.subtype === 'Form'">
+                <div class='fb-control-sub-item' v-if="f.subtype === 'Form' || f.subtype === 'FormKb'">
                     <Select v-model='f.formId' :placeholder='lang._subform' clearable
                             filterable
                             @on-change='setBuilder'>
@@ -25,7 +25,7 @@
                     </Select>
                 </div>
 
-                <div class='fb-control-sub-item' v-if="f.subtype !== 'Form'">
+                <div class='fb-control-sub-item' v-if="f.subtype !== 'Form' && f.subtype !== 'FormKb'">
                     <Select v-model='f.model' :placeholder='lang.selectTable' clearable @on-change='setBuilder'
                             :disabled='isEdit'>
                         <Option v-for='item in tableList' :value='item' :key='item.index'>
@@ -317,6 +317,10 @@ export default {
                     label: 'Форм',
                     value: 'Form'
                 },
+                {
+                    label: 'Форм Хаанбанк',
+                    value: 'FormKb'
+                },
                 {
                     label: 'Баазын хүснэгт',
                     value: 'Grid'
@@ -462,7 +466,7 @@ export default {
                     })
                 } else {
 
-                    if (this.f.subtype === 'Form') {
+                    if (this.f.subtype === 'Form' || this.f.subtype === 'FormKb') {
 
                         this.f.formId = val
 
diff --git a/src/modules/dataform/elements/DateTime.vue b/src/modules/dataform/elements/DateTime.vue
index 95a6140..abc72f4 100644
--- a/src/modules/dataform/elements/DateTime.vue
+++ b/src/modules/dataform/elements/DateTime.vue
@@ -1,8 +1,10 @@
 <template>
-    <FormItem :label=label :prop=rule>
-<!--        <DatePicker v-if="model.form[model.component] === null && meta.disabled" :value="now"-->
+    <FormItem :label=label :prop=rule :key="model.form[model.component]">
+<!--        <DatePicker v-if="model.form[model.component] === null" :value="now"-->
 <!--                    type="datetime" v-model="now"-->
-<!--                    placement="bottom-end" :placeholder="meta && meta.placeHolder !== null ? meta.placeHolder : label"-->
+<!--                    @on-change="getDateValueNow"-->
+<!--                    placement="bottom-end"-->
+<!--                    :placeholder="meta && meta.placeHolder !== null ? meta.placeHolder : label"-->
 <!--                    :disabled="meta && meta.disabled ? meta.disabled : false"-->
 <!--                    format="yyyy-MM-dd HH:mm"-->
 <!--        ></DatePicker>-->
@@ -10,12 +12,10 @@
         <DatePicker
                     type="datetime" v-model="model.form[model.component]"
                     @on-change="getDateValue"
-                    :key="model.form[model.component]"
                     placement="bottom-end"
                     :placeholder="meta && meta.placeHolder !== null ? meta.placeHolder : label"
                     :disabled="meta && meta.disabled ? meta.disabled : false"
                     format="yyyy-MM-dd HH:mm"></DatePicker>
-
     </FormItem>
 </template>
 
diff --git a/src/modules/dataform/elements/index.js b/src/modules/dataform/elements/index.js
index e2b5c81..21343d6 100644
--- a/src/modules/dataform/elements/index.js
+++ b/src/modules/dataform/elements/index.js
@@ -55,6 +55,10 @@ export const elements = [
         element: "subform/Form",
         component: () => import(/* webpackChunkName: "form-field-sub-form" */'./subform/Form.vue'),
     },
+    {
+        element: "subform/FormKb",
+        component: () => import(/* webpackChunkName: "form-field-sub-form" */'./subform/FormKb.vue'),
+    },
     {
         element: "ImageDrag",
         component: () => import(/* webpackChunkName: "form-field-ImageDrag" */'./ImageDrag.vue'),
diff --git a/src/modules/dataform/elements/subform/Form.vue b/src/modules/dataform/elements/subform/Form.vue
index c5b3863..08451fb 100644
--- a/src/modules/dataform/elements/subform/Form.vue
+++ b/src/modules/dataform/elements/subform/Form.vue
@@ -280,7 +280,6 @@ export default {
             hasEq: false,
             modal_show: false,
             editIndex: -1,
-
         };
     },
     methods: {
diff --git a/src/modules/dataform/elements/subform/FormKb.vue b/src/modules/dataform/elements/subform/FormKb.vue
new file mode 100644
index 0000000..1449bb7
--- /dev/null
+++ b/src/modules/dataform/elements/subform/FormKb.vue
@@ -0,0 +1,97 @@
+<template>
+    <Tabs value="tab_mn" class="kb-tabbed-form">
+        <Tab-pane label="Монгол" name="tab_mn">
+            <div class="kb-form-with-language">
+                <dataform ref="kbmnform" :schemaID="form.formId"
+                          :editMode="editIndexMn == 1 ? true : false"
+                          :onSuccess="onSuccess"
+                          :onReady="formReady"
+                          :onError="onError"></dataform>
+            </div>
+        </Tab-pane>
+        <Tab-pane label="Англи" name="tab_en">
+            <div class="kb-form-with-language">
+                <dataform ref="kbenform" :schemaID="form.formId"
+                          :editMode="editIndexEn == 1 ? true : false"
+                          :onSuccess="onSuccessEn"
+                          :onReady="formReadyEn"
+                          :onError="onErrorEn"></dataform>
+            </div>
+        </Tab-pane>
+<!--        <Tab-pane label="Мэдээлэл зассан түүх" name="tab_rev" v-if="model.form.id">-->
+<!--            <div>-->
+<!--                <Alert show-icon>Бүтээгдэхүүн Мэдээлэл зассан түүх харах бол <a-->
+<!--                    :href="`/kb/#/revision/history/${model.form.id}`" target="_blank">ЭНД</a> дарна-->
+<!--                    уу-->
+<!--                </Alert>-->
+<!--            </div>-->
+<!--        </Tab-pane>-->
+    </Tabs>
+</template>
+
+<script>
+const DataForm = () => import('../../Dataform');
+export default {
+    name: "FormKb",
+    props: ["form", "model", "editMode", "relations", "formula", "url", "slug"],
+    components: {
+        "dataform": DataForm
+    },
+    mounted() {
+        console.log("this.model:", this.slug);
+        console.log(this.model);
+        console.log(this.form);
+    },
+    data() {
+        return {
+            activeTab: 'tab_mn',
+            editIndexMn: 0,
+            editIndexEn: 0,
+        }
+    },
+    methods: {
+        editBySlug(slug) {
+            this.$refs.kbmnform.editModelBySlug(slug, 2).then(result => {
+                if (result === 1) {
+                    this.editIndexMn = 1;
+                }
+                else{
+                    this.editIndexMn = 0;
+                    this.$refs.kbmnform.handleResetKb();
+                }
+                console.log('MN EDIT:', this.editIndexMn);
+            });
+
+            setTimeout(() => {
+                this.$refs.kbenform.editModelBySlug(slug, 1)
+                    .then(result => {
+                        if (result === 1) {
+                            this.editIndexEn = 1;
+                        }
+                        else{
+                            this.editIndexMn = 0;
+                            this.$refs.kbenform.handleResetKb();
+                        }
+                        console.log('EN EDIT:', this.editIndexEn);
+                    });
+            }, 1000);
+        },
+        formReady(formData, subSchema) {
+        },
+        onError() {
+        },
+        onSuccess(data) {
+        },
+        formReadyEn(formData, subSchema) {
+        },
+        onErrorEn() {
+        },
+        onSuccessEn(data) {
+        },
+    }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/modules/dataform/elements/subform/Grid.vue b/src/modules/dataform/elements/subform/Grid.vue
index f9edeb3..723f38a 100644
--- a/src/modules/dataform/elements/subform/Grid.vue
+++ b/src/modules/dataform/elements/subform/Grid.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="subform-grid" :style="subStyle">
         <h3 style="display: none">{{ rowLength }}</h3>
-        <div class="subform-header" v-if="!form.min_height && !form.disableCreate">
+        <div class="subform-header">
             {{ form.name }}
             <Button shape="circle" type="success" size="small" @click="add" icon="md-add"
                     class="sub-form-add-btn"></Button>
diff --git a/src/modules/dataform/rule.js b/src/modules/dataform/rule.js
index 1196469..d227585 100644
--- a/src/modules/dataform/rule.js
+++ b/src/modules/dataform/rule.js
@@ -54,6 +54,10 @@ export const rules = [{
         type: 'unique',
         msg: 'Давхацсан утга оруулсан байна!'
     },
+    {
+        type: 'uniqueKbProductSlug',
+        msg: 'Давхацсан слаг оруулсан байна!'
+    },
     {
         type: 'lambda-account',
         msg: 'Давхацсан утга оруулсан байна!'
@@ -75,6 +79,21 @@ const unique = (rule, value, callback, baseUrl) => {
         }
     })
 };
+const uniqueKb = (rule, value, callback, baseUrl) => {
+    axios.post(`${baseUrl}/lambda/krud/unique`, {
+        table: 'public.product_main',
+        identityColumn: identityColumn,
+        identity: identity,
+        field: rule.field,
+        val: value
+    }).then(o => {
+        if (o.data.status) {
+            callback();
+        } else {
+            callback(new Error(o.data.msg));
+        }
+    })
+};
 const checkLambdaaccount = (rule, value, callback, baseUrl) => {
     axios.post(`${baseUrl}/lambda/check`, {
         value: value
@@ -189,6 +208,12 @@ export const getRule = (rule, baseUrl) => {
                 trigger: 'blur',
                 // message: rule.msg
             }
+        case 'uniqueKbProductSlug':
+            return {
+                validator: (rule, value, callback)=> uniqueKb(rule, value, callback, baseUrl),
+                trigger: 'blur',
+                // message: rule.msg
+            }
         case 'lambda-account':
             return {
                 validator: (rule, value, callback)=> checkLambdaaccount(rule, value, callback, baseUrl),
diff --git a/src/modules/dataform/scss/_dataform.scss b/src/modules/dataform/scss/_dataform.scss
index dcc1747..45c26b6 100644
--- a/src/modules/dataform/scss/_dataform.scss
+++ b/src/modules/dataform/scss/_dataform.scss
@@ -279,11 +279,17 @@
             legend {
                 width:100%;
                 margin-top: -20px;
-                background-color: white;
+                //background-color: white;
                 padding: 0 10px;
                 font-size: 12px;
                 font-weight: 600;
                 margin-bottom: 10px;
+                .fieldset-title{
+                    background: white;
+                    width: fit-content;
+                    padding-right: 10px;
+                    padding-left: 10px;
+                }
             }
         }
 
@@ -325,3 +331,4 @@
         }
     }
 }
+
diff --git a/src/modules/dataform/scss/_kb_tabbed_form.scss b/src/modules/dataform/scss/_kb_tabbed_form.scss
new file mode 100644
index 0000000..1a02de4
--- /dev/null
+++ b/src/modules/dataform/scss/_kb_tabbed_form.scss
@@ -0,0 +1,323 @@
+.kb-tabbed-form{
+    .subform-grid {
+        display: flex;
+        flex-direction: column;
+
+        min-height: 30px;
+
+        background: transparent;
+
+        .ivu-form-item-label{
+            display: none !important;
+        }
+        .sub-form-grid {
+            display: block;
+            overflow-x: auto;
+            overflow-y: hidden;
+        }
+
+        .sub-form-table-wrap{
+            width: 100%;
+            overflow-x: auto;
+        }
+
+        table {
+            width: 100% !important;
+            border-collapse: collapse;
+            border-spacing: 0;
+            background: #ffffff;
+            border: 0 !important;
+            //display: block;
+            //overflow-x: auto;
+            //overflow-y: hidden;
+
+            tbody {
+                min-height: 200px !important;
+
+                tr {
+                    padding: 0;
+                    border: 1px solid #CCC;
+
+                    &:hover {
+                        td,
+                        ivu-input {
+                            // background: #f4f5f6;
+                        }
+                    }
+
+                    td {
+                        border: 1px solid #CCC;
+                        padding: 0;
+                        font-size: 13px;
+                        text-align: center;
+                        vertical-align: middle;
+
+                        .multiselect {
+                            min-height: 22px;
+                            height: 22px;
+
+                            .multiselect__tags {
+                                min-height: 22px;
+                                border: none;
+                                margin: 0 2px;
+                                padding: 0 20px 0 6px;
+                                position: relative;
+                            }
+
+                            .multiselect__input, .multiselect__single {
+                                height: 22px;
+                            }
+
+                            .multiselect__placeholder {
+                                height: 22px;
+                            }
+
+                            .multiselect__select {
+                                padding: 0;
+                                height: 22px;
+
+                            }
+
+                            .multiselect__single {
+                                position: absolute;
+                                max-width: calc(100% - 26px);
+                            }
+
+                            .caret-container {
+                                z-index: 20;
+
+                                .addable-caret {
+                                    right: 28px;
+                                }
+
+                                button {
+                                    width: 20px;
+                                    height: 20px;
+                                    top: 2px;
+                                    z-index: 21;
+                                }
+                            }
+
+                            .clear-container {
+                                display: none;
+                            }
+
+                            .multiselect__content-wrapper {
+                                margin-top: 4px;
+                                border-radius: 0 !important;
+                            }
+
+                            .multiselect__option {
+                                min-height: 22px;
+                                line-height: 22px;
+
+                                &:after {
+                                    line-height: 22px;
+                                }
+                            }
+
+                            .multiselect__input {
+                                position: absolute;
+                                top: 2px;
+                                left: 2px;
+                            }
+                        }
+
+                        .ivu-form-item-content {
+                            line-height: 24px;
+
+                            .ivu-upload {
+                                height: 24px;
+                                overflow: hidden;
+
+                                .ivu-upload-select {
+                                    .ivu-btn {
+                                        span {
+                                            div {
+                                                display: none;
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+
+                        .ivu-form-item {
+                            margin-bottom: 0 !important;
+
+                            .ivu-input {
+                                height: 24px;
+                                margin: 0;
+                                border: 0;
+                                border-radius: 0;
+                                background: transparent;
+
+                                &:hover,
+                                &:active,
+                                &:focus {
+                                    //background: #ffffff !important;
+                                    box-shadow: none;
+                                    outline: none;
+                                }
+                            }
+
+                            .ivu-select {
+                                &-selection {
+                                    height: 24px;
+                                    border: 0;
+                                }
+
+                                &-input {
+                                    border: 0;
+                                    max-height: 24px;
+                                }
+                            }
+
+                            .ivu-form-item-content {
+                                height: 24px;
+                            }
+
+                            .ivu-checkbox-wrapper {
+                                margin: auto 0;
+                                height: 24px;
+                                padding-top: 4px;
+                            }
+
+                            .ivu-btn {
+                                border: none !important;
+
+                                i {
+                                    font-size: 14px;
+                                }
+                            }
+
+                            .ivu-upload {
+                                img {
+                                    height: 22px;
+                                    margin-top: 1px;
+                                }
+
+                                .ivu-upload-list {
+                                    display: none;
+                                }
+
+                                .ivu-btn {
+                                    .ivu-icon + span {
+                                        display: none;
+                                    }
+                                }
+                            }
+                        }
+
+                        &.action {
+                            text-align: center;
+                            display: inline-block;
+                            height: 24px;
+                            width: 100%;
+                            display: flex;
+                            justify-content: center;
+                            align-items: center;
+                            border: 0;
+
+                            a {
+                                padding: 0 5px;
+                                color: #777777;
+
+                                i {
+                                    font-size: 12px;
+                                }
+
+                                &:hover {
+                                    color: #e74c3c;
+                                }
+                            }
+
+                            .sub-edit {
+                                &:hover {
+                                    color: #1d45aa;
+                                }
+                            }
+                        }
+                        .file-upload-handler, .ivu-upload{
+                            //display: none;
+                        }
+                        .file-uploader{
+                            border:none;
+                        }
+                    }
+                }
+            }
+
+            tfoot {
+                background: #f1f2f3;
+
+                tr {
+                    border-bottom: solid 1px #dedede;
+                    padding: 0;
+                    border: 1px solid #CCC;
+
+                    td {
+                        font-size: 12px;
+                        text-align: center;
+                        padding: 5px 0 5px 0;
+                        border: 1px solid #CCC;
+                        color: #565665;
+                    }
+                }
+            }
+        }
+
+        a.sub-grid-add {
+            text-align: center;
+            border: solid 1px #cccccc;
+            border-radius: 2px;
+            padding: 4px;
+            font-size: 12px;
+            width: 100%;
+            display: inline-block;
+            margin: -1px auto 0;
+            color: #666666;
+            flex: 1;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            min-height: 30px;
+            cursor: pointer;
+
+            i {
+                font-size: 12px;
+                margin-right: 5px;
+            }
+
+            &:hover {
+                color: #006FE1; // border-color: #2ecc71;
+            }
+        }
+
+        th.row-number, td.row-number {
+            width: 60px;
+        }
+        .source-grid{
+            .add-from-pre-source{
+                padding: 0px 10px 10px 10px;
+
+                text-align: right;
+            }
+            .dg-footer{
+                border-bottom: solid 1px #dedede;
+                height: 28px !important;
+            }
+            .source-grid-description{
+                padding: 15px;
+                h3{
+                    //font-weight: 400;
+                }
+                p{
+                    color: #636E72;
+                }
+
+            }
+        }
+
+    }
+}
diff --git a/src/modules/dataform/scss/style.scss b/src/modules/dataform/scss/style.scss
index 34ff9c9..603dfb8 100644
--- a/src/modules/dataform/scss/style.scss
+++ b/src/modules/dataform/scss/style.scss
@@ -35,6 +35,7 @@
 @import "./elements/qgis";
 @import "./elements/label";
 @import "./elements/register";
+@import "kb_tabbed_form";
 @import "step";
 @import "responsive";
 
@@ -135,3 +136,7 @@
     background: #F5F6FC;
     padding: 20px 10px;
 }
+
+.lbd-dataform-section-hide{
+    display: none!important;
+}
diff --git a/src/modules/dataform/utils/date.js b/src/modules/dataform/utils/date.js
index f6b5c73..a309271 100644
--- a/src/modules/dataform/utils/date.js
+++ b/src/modules/dataform/utils/date.js
@@ -23,11 +23,11 @@ export function toTime(time) {
 }
 
 export function toDateTime(datetime) {
-    return Moment(datetime, 'YYYY-MM-DD HH:mm:ss')
+    return Moment(datetime, 'YYYY-MM-DD HH:mm:ss').tz('Asia/Ulaanbaatar')
 }
 
 export function now() {
-    return Moment().format("YYYY-MM-DD HH:mm:ss")
+    return Moment().tz('Asia/Ulaanbaatar').format("YYYY-MM-DD HH:mm:ss")
 }
 
 export function getDateTime(date) {
diff --git a/src/modules/dataform/utils/formula_and_trigger.js b/src/modules/dataform/utils/formula_and_trigger.js
index d62259e..fb7df2c 100644
--- a/src/modules/dataform/utils/formula_and_trigger.js
+++ b/src/modules/dataform/utils/formula_and_trigger.js
@@ -36,7 +36,6 @@ export function doFormula(formulas, model, model_, schema_, rule_, subFormModelN
 function doFormula2(formula, model, model_, schema_, rule_, subFormModelName) {
 
     let use_formula = false;
-
     //old one i dont know just commented
     // if (formula['form']) {
     //     if (formula['form'] == 'main')
@@ -62,21 +61,33 @@ function doFormula2(formula, model, model_, schema_, rule_, subFormModelName) {
             if (pre_formula) {
                 let calculated = evil(pre_formula);
                 formula.targets.map(target => {
-                    let schema_index = getSchemaIndex(schema_, target.field);
-                    if (schema_index >= 0) {
-                        if (target.prop == 'value') {
-                            model_[target.field] = calculated;
-                        } else {
-                            if (target.prop == 'hidden') {
-                                if (rule_) {
-                                    if (rule_[target.field]) {
-                                        if (rule_[target.field].length > 0 && rule_[target.field][0].hasOwnProperty("required"))
-                                            rule_[target.field][0].required = calculated ? false : true;
+                    //for filed
+                    if(target.field) {
+                        let schema_index = getSchemaIndex(schema_, target.field);
+                        if (schema_index >= 0) {
+                            if (target.prop == 'value') {
+                                model_[target.field] = calculated;
+                            } else {
+                                if (target.prop == 'hidden') {
+                                    if (rule_) {
+                                        if (rule_[target.field]) {
+                                            if (rule_[target.field].length > 0 && rule_[target.field][0].hasOwnProperty("required"))
+                                                rule_[target.field][0].required = calculated ? false : true;
+                                        }
                                     }
                                 }
+                                // schema_[schema_index][target.prop] = calculated;
+                                Vue.set(schema_[schema_index], target.prop, calculated)
                             }
-                            // schema_[schema_index][target.prop] = calculated;
-                            Vue.set(schema_[schema_index], target.prop, calculated)
+                        }
+                    }
+                    //for section
+                    if(target.section) {
+                        let element = document.getElementById(target.section);
+                        element.classList.remove("lbd-dataform-section-hide");
+                        if (target.prop == 'hidden' && calculated) {
+                            let element = document.getElementById(target.section);
+                            element.classList.add("lbd-dataform-section-hide");
                         }
                     }
                 })
diff --git a/src/modules/datagrid/Datagrid.vue b/src/modules/datagrid/Datagrid.vue
index 68fcb45..df6ffa5 100644
--- a/src/modules/datagrid/Datagrid.vue
+++ b/src/modules/datagrid/Datagrid.vue
@@ -581,10 +581,10 @@ export default {
                 (gridSchema.actions.length > 0 ||
                     (this.$props.actions && this.$props.actions.length > 0))
             ) {
-                let width = gridSchema.actions.length * 50;
+                let width = gridSchema.actions.length * 100;
 
                 if (this.$props.actions) {
-                    width += this.$props.actions.length * 50;
+                    width += this.$props.actions.length * 100;
                 }
 
                 if (this.header != null) {
@@ -604,6 +604,7 @@ export default {
                 let actions = {
                     headerName: "...",
                     width: width,
+                    resizable: false,
                     field: this.identity ? this.identity : 'id',
                     suppressMenu: true,
                     sortable: false,
@@ -624,7 +625,6 @@ export default {
                         actionsVisibility: this.$props.actionvisibility,
                     }
                 };
-
                 if (this.permissions) {
                     if (this.permissions.r || this.permissions.u || this.permissions.d) {
                         if (this.actionPosition == 0) {
@@ -1755,8 +1755,6 @@ export default {
                 this.filterData(1);
             } else {
                 let filters = event.api.getFilterModel();
-                console.log(filters);
-
                 for (let key in filters) {
                     if (Object.prototype.hasOwnProperty.call(filters, key)) {
                         // console.log(filters[key]);
diff --git a/src/modules/datagrid/GridActions.vue b/src/modules/datagrid/GridActions.vue
index 2559810..00c052e 100644
--- a/src/modules/datagrid/GridActions.vue
+++ b/src/modules/datagrid/GridActions.vue
@@ -76,11 +76,6 @@ export default Vue.extend({
             }, {});
         },
     },
-    mounted()
-    {
-      console.log("this.params.methods");
-      console.log(this.params.methods);
-    },
     methods: {
         edit() {
             this.params.methods.edit(this.params.value, this.params.data)
diff --git a/src/modules/krud/components/subCrud.vue b/src/modules/krud/components/subCrud.vue
index 9ddb573..126db64 100644
--- a/src/modules/krud/components/subCrud.vue
+++ b/src/modules/krud/components/subCrud.vue
@@ -152,8 +152,7 @@ export default {
         },
 
         onError(val) {
-            console.log(val)
-        }
+      }
     },
     computed: {
         condition() {
diff --git a/src/modules/krud/templates/canvas-multi-lang.vue b/src/modules/krud/templates/canvas-multi-lang.vue
new file mode 100644
index 0000000..950603a
--- /dev/null
+++ b/src/modules/krud/templates/canvas-multi-lang.vue
@@ -0,0 +1,192 @@
+<template>
+    <section class="offcanvas-template">
+        <div class="crud-page">
+            <portal to="header-left" v-if="withoutHeader">
+                <h3>{{ title }}</h3>
+
+                <span v-if="permissions ? permissions.c : true" class="divider"></span>
+
+                <Button v-if="permissions ? permissions.c : true" type="success"
+                        @click="openSlidePanel = true; editMode = false;" shape="circle" size="small"
+                        icon="md-add">
+                    {{ lang._add }}
+                </Button>
+            </portal>
+
+            <portal to="header-right" v-if="withoutHeader">
+                <krudtools :search="search"
+                           :refresh="refresh"
+                           :exportExcel="exportExcel"
+                           :importExcel="importExcel"
+                           :exportLoading="exportLoading"
+                           :print="print"
+                           :save="save"
+                           :isPrint="isPrint"
+                           :isExcel="isExcel"
+                           :isExcelUpload="isExcelUpload"
+                           :excelUploadCustomUrl="excelUploadCustomUrl"
+                           :excelUploadMethod="excelUploadMethod"
+                           :isRefresh="isRefresh"
+                           :isSave="isSave"
+                />
+            </portal>
+
+            <div class="crud-page-header" v-if="!withoutHeader">
+                <div v-if="hasNavSlot" class="crud-page-header-left">
+                    <slot name="nav"></slot>
+                    <span v-if="permissions ? permissions.c : true" class="divider"></span>
+                    <Button v-if="permissions ? permissions.c : true" type="success"
+                            @click="openSlidePanel = true; editMode = false;" shape="circle" size="small"
+                            icon="md-add">
+                        {{ lang._add }}
+                    </Button>
+                </div>
+
+                <div v-else :class="`crud-page-header-left ${hasNavSlot ? '' : 'no-nav'}`">
+                    <h3 v-if="$props.title != null">{{ $props.title.replace('-', ' ') }}</h3>
+                    <span v-if="permissions ? permissions.c : true" class="divider"></span>
+                    <Button v-if="permissions ? permissions.c : true"
+                            @click="openSlidePanel = true; editMode = false;" type="success" shape="circle" size="small"
+                            icon="md-add">
+                        {{ lang._add }}
+                    </Button>
+
+                </div>
+
+                <div class="crud-page-header-right">
+                    <div class="tooloptions">
+                        <slot name="tooloptions"></slot>
+                    </div>
+                    <krudtools :search="search"
+                               :refresh="refresh"
+                               :exportExcel="exportExcel"
+                               :exportLoading="exportLoading"
+                               :print="print"
+                               :save="save"
+                               :isPrint="isPrint"
+                               :isExcel="isExcel"
+                               :isExcelUpload="isExcelUpload"
+                               :excelUploadMethod="excelUploadMethod"
+                               :excelUploadCustomUrl="excelUploadCustomUrl"
+                               :isRefresh="isRefresh"
+                               :isSave="isSave"
+                               :isSearch="isSearch"
+                    />
+                    <Button v-if="exportSelectedRows" @click="exportByPath" :disabled="selectedData.length < 1"
+                            type="success" shape="circle" size="small">{{ exportLabel }}
+                    </Button>
+                    <slot name="right"></slot>
+
+                </div>
+            </div>
+
+            <div class="crud-page-body">
+                <div class="v-nav" v-if="hasVNavSlot">
+                    <slot name="v-nav"></slot>
+                </div>
+                <div class="dg-flex">
+                    <datagrid v-if="permissions ? permissions.r : true" ref="grid"
+                              :url="url"
+                              :schemaID="grid"
+                              :paginate="50"
+                              :fnClone="clone"
+                              :fnEdit="edit"
+                              :fnQuickEdit="quickEdit"
+                              :fnView="view"
+                              :actions="$props.actions"
+                              :dblClick="$props.dbClickAction"
+                              :onRowSelect="onRowSelectedEvent"
+                              :hasSelection="hasSelection"
+                              :permissions="permissions"
+                              :page_id="page_id"
+                              :custom_condition="$props.custom_condition? $props.custom_condition :null"
+                              :user_condition="user_condition ? user_condition.gridCondition : null">
+                    </datagrid>
+                </div>
+            </div>
+
+            <slide-panel v-model="openSlidePanel" :widths="[form_width ? form_width :'1024px']"
+                         @close="coleSidePanel" :closeByBtn="true" :withCrudLog="withCrudLog">
+                <div :class="withCrudLog && editMode ? 'with-crud-log' : ''" style="height: 100%">
+                    <dataform ref="form"
+                              :schemaID="form"
+                              :title="title"
+                              :url="url"
+                              :editMode="editMode"
+                              mode="refresh"
+                              :onSuccess="onSuccess"
+                              :onReady="onReady"
+                              :do_render="openSlidePanel"
+                              :permissions="permissions"
+                              :page_id="page_id"
+                              :user_condition="user_condition ? user_condition.formCondition : null"
+                              :onError="onError"
+                              :close="coleSidePanel"
+                    />
+                    <crud-log v-if="withCrudLog && editMode" :form="form" :rowId="rowId" :grid="grid"/>
+                </div>
+            </slide-panel>
+        </div>
+    </section>
+</template>
+
+<script>
+import slidePanel from "../components/slidePanel";
+import crudLog from "../components/crudLog";
+import mixins from "./mixins";
+
+export default {
+    mixins: [mixins],
+    data() {
+        return {
+            form_width: '800px',
+            openSlidePanel: false,
+            exportLoading: false
+        };
+    },
+    created() {
+
+    },
+    components: {
+        "slide-panel": slidePanel,
+        "crud-log": crudLog,
+    },
+    computed: {
+        lang() {
+            const labels = [
+                '_add',
+                'Information_viewing_history', 'excelUpload'
+            ];
+            return labels.reduce((obj, key, i) => {
+                obj[key] = this.$t('crud.' + labels[i]);
+                return obj;
+            }, {});
+        },
+
+    },
+    methods: {
+        templateEdit() {
+            this.openSlidePanel = true;
+        },
+        templateOnSuccess() {
+            this.openSlidePanel = false;
+        },
+        templateOnError() {
+            // this.openSlidePanel = false;
+        },
+        onReady(formOption) {
+            if (formOption.width.includes("%")) {
+                this.form_width = formOption.width;
+            } else {
+                if (!formOption.width.includes("px")) {
+                    this.form_width = formOption.width + 'px';
+                }
+            }
+        },
+        coleSidePanel() {
+            this.openSlidePanel = false;
+            this.rowId = null;
+        }
+    },
+};
+</script>
diff --git a/src/modules/krud/templates/edit.vue b/src/modules/krud/templates/edit.vue
index 26d62d8..f4ced0a 100644
--- a/src/modules/krud/templates/edit.vue
+++ b/src/modules/krud/templates/edit.vue
@@ -14,7 +14,7 @@
                 </div>
             </div>
 
-            <div class="crud-page-body">
+            <div class="crud-page-body" style="overflow-y: auto">
                 <div class="v-nav" v-if="hasVNavSlot">
                     <slot name="v-nav"></slot>
                 </div>
diff --git a/src/modules/page/Nav.vue b/src/modules/page/Nav.vue
index 65e22f7..39ca9e2 100644
--- a/src/modules/page/Nav.vue
+++ b/src/modules/page/Nav.vue
@@ -29,7 +29,7 @@
                     <i v-if="item.icon" :class="item.icon"></i>
                 </a>
             </Tooltip>
-            <a href="item.url" v-if="item.link_to == 'link' && !hasTooltip" target="_blank">
+            <a :href="item.url" v-if="item.link_to == 'link' && !hasTooltip" :target="item.target">
                 <i v-if="item.icon" :class="item.icon"></i>
                 <span v-html="getTitle(item)"></span>
             </a>
diff --git a/src/pages/form/views/list.vue b/src/pages/form/views/list.vue
index 429a2e4..3541aa4 100755
--- a/src/pages/form/views/list.vue
+++ b/src/pages/form/views/list.vue
@@ -1,7 +1,6 @@
 <template>
     <div>
-        <list-view v-if="$project" :src="`/lambda/puzzle/project/${$project.id}/form`" :title="lang._form" type="form" :data="listData" ></list-view>
-        <list-view v-else src="/lambda/puzzle/schema/form" :title="lang._form" type="form" :data="listData" ></list-view>
+        <list-view src="/lambda/puzzle/schema/form" :title="lang._form" type="form"></list-view>
     </div>
 </template>
 
@@ -17,7 +16,6 @@ export default {
         };
     },
     methods: {
-
     },
     computed: {
         lang() {
diff --git a/src/pages/grid/views/list.vue b/src/pages/grid/views/list.vue
index 18ebf26..2fba389 100755
--- a/src/pages/grid/views/list.vue
+++ b/src/pages/grid/views/list.vue
@@ -1,7 +1,6 @@
 <template>
     <div>
-        <list-view v-if="$project" :src="`/lambda/puzzle/project/${$project.id}/grid`" :title="lang.table" type="grid" :data="listData"></list-view>
-        <list-view v-else src="/lambda/puzzle/schema/grid" :title="lang.table" type="grid" :data="listData"></list-view>
+        <list-view src="/lambda/puzzle/schema/grid" :title="lang.table" type="grid"></list-view>
     </div>
 </template>
 
diff --git a/src/pages/role/views/ProductItem/ProductItem.vue b/src/pages/role/views/ProductItem/ProductItem.vue
index 13ba8dd..e297fdf 100644
--- a/src/pages/role/views/ProductItem/ProductItem.vue
+++ b/src/pages/role/views/ProductItem/ProductItem.vue
@@ -17,7 +17,7 @@
             <div class="menu-control">
                 <span>&nbsp;</span>
                 <span>
-                    <Checkbox :disabled="!permissions[data.id].show" v-model="permissions[data.id].e">E</Checkbox>
+                    <Checkbox :disabled="!permissions[data.id].show" v-model="permissions[data.id].e">E {{permissions[data.id].e}}</Checkbox>
                     <Checkbox :disabled="!permissions[data.id].show" v-model="permissions[data.id].c">C</Checkbox>
                     <Checkbox :disabled="!permissions[data.id].show" v-model="permissions[data.id].r">R</Checkbox>
                     <Checkbox :disabled="!permissions[data.id].show" v-model="permissions[data.id].u">U</Checkbox>
diff --git a/src/pages/role/views/index.vue b/src/pages/role/views/index.vue
index da711bc..73395b4 100644
--- a/src/pages/role/views/index.vue
+++ b/src/pages/role/views/index.vue
@@ -11,17 +11,11 @@
                         </router-link>
                     </li>
                     <li>
-                        <router-link to="/role-multi">
-                            <i class="ti-user"></i>
-                            <span>Олон цэс удирдах</span>
+                        <router-link to="/role-kb-product">
+                            <i class="ti-layout-grid2"></i>
+                            <span>Бүтээгдэхүүн удирдах эрх</span>
                         </router-link>
                     </li>
-                    <!--                    <li>-->
-                    <!--                        <router-link to="/role-kb-product">-->
-                    <!--                            <i class="ti-layout-grid2"></i>-->
-                    <!--                            <span>Бүтээгдэхүүн удирдах эрх</span>-->
-                    <!--                        </router-link>-->
-                    <!--                    </li>-->
                 </ul>
             </div>
         </paper-header>
diff --git a/src/template/paper/components/ribbon/ribbon.scss b/src/template/paper/components/ribbon/ribbon.scss
index 72228db..7de244f 100644
--- a/src/template/paper/components/ribbon/ribbon.scss
+++ b/src/template/paper/components/ribbon/ribbon.scss
@@ -42,4 +42,4 @@ ul.ribbon {
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/template/paper/components/user-control/UserControl.vue b/src/template/paper/components/user-control/UserControl.vue
index 8848024..11456a9 100644
--- a/src/template/paper/components/user-control/UserControl.vue
+++ b/src/template/paper/components/user-control/UserControl.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="user-control">
         <ul>
-            <li class="paper-notification">
+            <li class="paper-notification" v-if="!hideNotif">
                 <notif-widget :user="$user.id"/>
             </li>
 
@@ -20,24 +20,18 @@
                             <small>{{ $user.org_id ? $user.org_id : lang.loggedIn }}</small>
                         </div>
                         <ul>
-                            <li>
-                                <router-link to="/module/profile">
-                                    <Icon type="ios-contact-outline"/>
-                                    <span>{{lang.personalInfo}}</span>
-                                </router-link>
-                            </li>
-                            <li>
-                                <router-link to="/module/password">
-                                    <Icon type="ios-key-outline"/>
-                                    <span>{{lang.changePass}}</span>
-                                </router-link>
-                            </li>
-                            <li v-if="$user.role==1 || $user.role==29">
-                                <a href="/lambda/puzzle" target="_blank">
-                                    <Icon type="ios-settings-outline"/>
-                                    <span>{{lang.superAdminManagement}}</span>
-                                </a>
-                            </li>
+<!--                            <li>-->
+<!--                                <router-link to="/module/profile">-->
+<!--                                    <Icon type="ios-contact-outline"/>-->
+<!--                                    <span>{{lang.personalInfo}}</span>-->
+<!--                                </router-link>-->
+<!--                            </li>-->
+<!--                            <li>-->
+<!--                                <router-link to="/module/password">-->
+<!--                                    <Icon type="ios-key-outline"/>-->
+<!--                                    <span>{{lang.changePass}}</span>-->
+<!--                                </router-link>-->
+<!--                            </li>-->
                             <li>
                                 <a @click="logoutModal = true">
                                     <Icon type="ios-log-out"/>
@@ -79,6 +73,7 @@ import {mapGetters} from "vuex";
 
 export default {
     name: "UserControl",
+    props:['hideNotif'],
     computed: {
         ...mapGetters({
             user: "user",