员工技能更改

src/common/configs/dictDataUtil.ts

@@ -5,7 +5,7 @@ const DictDataUtil = {
     import.meta.env.VITE_APP_BASE_API + "/api/v1/sys/dictData/queryByType/",
   dept_tree_url: import.meta.env.VITE_APP_BASE_API + "/api/v1/sys/dept/orgTree",
   dept_list_url:
-    import.meta.env.VITE_APP_BASE_API + "/api/v1/sys/dept/parent/list",
+    import.meta.env.VITE_APP_BASE_API + "/api/v1/sys/dept/list",
   post_list_url: import.meta.env.VITE_APP_BASE_API + "/api/v1/sys/post/list",
 
   img_url: import.meta.env.VITE_APP_UPLOAD_URL,

src/components/CommonTable/configs/tableConfig.ts

@@ -552,12 +552,12 @@ export const tableConfig = {
       },
 
       {
-        label: "部门",
+        label: "所属机构",
         prop: "deptName",
         overHidden: true,
         disabled: true,
       },
-      {
+     /* {
         label: "所属机构",
         prop: "institution",
         search: true,
@@ -569,7 +569,7 @@ export const tableConfig = {
         dicMethod: "post",
         props: { label: "deptName", value: "id" },
         disabled: true,
-      },
+      },*/
     ],
   },
 

src/views/base/skill/components/edit-skill.vue

@@ -44,10 +44,8 @@
 <script setup>
 import {ref, getCurrentInstance} from "vue";
 import {useCrud} from "@/hooks/userCrud";
-import ButtonPermKeys from "@/common/configs/buttonPermission";
 import {useCommonStoreHook, useDictionaryStore} from "@/store";
 import dictDataUtil from "@/common/configs/dictDataUtil";
-import SingleUpload from "@/components/Upload/SingleUpload.vue";
 
 const {isShowTable, tableType} = toRefs(useCommonStoreHook());
 import {getPostSkill, addEmployeeSkill, getSkillDetail} from "@/api/system/skill";
@@ -181,7 +179,6 @@ option2.value = {
     {
       label: "id", prop: "id", width: 130, overHidden: true, search: true,
       filterable: true,
-      width: 100, overHidden: true,
       disabled: false,
       display: false,
 
@@ -190,7 +187,6 @@ option2.value = {
     {
       label: "用户id", prop: "userId", width: 130, overHidden: true, search: true,
       filterable: true,
-      width: 100, overHidden: true,
       disabled: true,
       display: false,
 
@@ -206,13 +202,13 @@ option2.value = {
         ctableRef.value.startSelect();
       },
     },
-    {
+   /* {
       label: "所属机构", prop: "institution", width: 130, overHidden: true, search: true,
       filterable: true,
       width: 100, overHidden: true,
       disabled: true,
 
-    },
+    },*/
     {
       label: "员工编号",
       prop: "employeeCode",
@@ -239,7 +235,7 @@ option2.value = {
 
     },
     {
-      label: "部门", prop: "deptName", overHidden: true,
+      label: "所属机构", prop: "deptName", overHidden: true,
       disabled: true,
     },
 
@@ -311,7 +307,7 @@ const onSelectedFinish = (selectedValue) => {
   form.value.userName = selectedValue.userName;
   form.value.deptName = selectedValue.deptName;
   form.value.employeeCode = selectedValue.employeeCode;
-  form.value.institution = selectedValue.institution;
+  //form.value.institution = selectedValue.institution;
 
 }
 const skillValue = ref(null);

src/views/base/skill/components/user-skill.vue

@@ -63,10 +63,8 @@
 <script setup>
 import { ref, getCurrentInstance } from "vue";
 import { useCrud } from "@/hooks/userCrud";
-import ButtonPermKeys from "@/common/configs/buttonPermission";
 import { useCommonStoreHook, useDictionaryStore } from "@/store";
 import dictDataUtil from "@/common/configs/dictDataUtil";
-import SingleUpload from "@/components/Upload/SingleUpload.vue";
 const { isShowTable, tableType } = toRefs(useCommonStoreHook());
 import {getPostSkill,addEmployeeSkill} from "@/api/system/skill";
 // 数据字典相关
@@ -194,10 +192,8 @@ option2.value = {
 
     { label: "用户id", prop: "userId", width: 130,overHidden: true,search: true ,
       filterable: true,
-      width: 100,overHidden: true,
       disabled:true,
       display:false,
-
     },
     { label: "用户名", prop: "userName", width: 140,overHidden: true,search: true ,rules: [{
         required: true,
@@ -208,11 +204,9 @@ option2.value = {
       click: ({ value, column }) => {
         ctableRef.value.startSelect();
       },},
-    { label: "所属机构", prop: "institution", width: 130,overHidden: true,search: true ,
+    { label: "所属机构", prop: "deptName", width: 130,overHidden: true,search: true ,
       filterable: true,
-      width: 100,overHidden: true,
       disabled:true,
-
     },
     {
       label: "员工编号",
@@ -237,9 +231,8 @@ option2.value = {
       props: { label: "postName", value: "id" },
 
     },
-    { label: "部门", prop: "deptName", overHidden: true,
-      disabled:true, },
-
+  /*  { label: "部门", prop: "deptName", overHidden: true,
+      disabled:true, },*/
   ],
 };
 
@@ -258,7 +251,6 @@ option.value = Object.assign(option.value,{
   viewBtn: false,
   editBtn:false,
   saveBtn:false,
-
   cellBtn: true,
   column: [{
     label: "技能",
@@ -285,12 +277,10 @@ option.value = Object.assign(option.value,{
 });
 const onSelectedFinish=(selectedValue)=>{
   form.value.userId=selectedValue.id;
-
   form.value.userName=selectedValue.userName;
   form.value.deptName=selectedValue.deptName;
   form.value.employeeCode=selectedValue.employeeCode;
   form.value.institution=selectedValue.institution;
-
 }
 const skillValue=ref(null);
 const optionSkill=ref([]);

src/views/base/skill/components/view-skill.vue

@@ -169,7 +169,6 @@ option2.value = {
   column: [
     { label: "id", prop: "id", width: 130,overHidden: true,search: true ,
       filterable: true,
-      width: 100,overHidden: true,
       disabled:false,
       display:false,
 
@@ -177,18 +176,17 @@ option2.value = {
 
     { label: "用户id", prop: "userId", width: 130,overHidden: true,search: true ,
       filterable: true,
-      width: 100,overHidden: true,
       disabled:true,
       display:false,
 
     },
     { label: "用户名", prop: "userName",disabled:true, width: 140,overHidden: true,search: true },
-    { label: "所属机构", prop: "institution", width: 130,overHidden: true,search: true ,
+   /* { label: "所属机构", prop: "institution", width: 130,overHidden: true,search: true ,
       filterable: true,
       width: 100,overHidden: true,
       disabled:true,
 
-    },
+    },*/
     {
       label: "员工编号",
       prop: "employeeCode",
@@ -213,7 +211,7 @@ option2.value = {
       props: { label: "postName", value: "id" },
 
     },
-    { label: "部门", prop: "deptName", overHidden: true,
+    { label: "所属机构", prop: "deptName", overHidden: true,
       disabled:true, },
 
   ],
@@ -251,7 +249,6 @@ option.value = Object.assign(option.value,{
   saveBtn:false,
   delBtn:false,
   menu:false,
-
   cellBtn: true,
   column: [{
     label: "技能",
@@ -282,12 +279,10 @@ option.value = Object.assign(option.value,{
 });
 const onSelectedFinish=(selectedValue)=>{
   form.value.userId=selectedValue.id;
-
   form.value.userName=selectedValue.userName;
   form.value.deptName=selectedValue.deptName;
   form.value.employeeCode=selectedValue.employeeCode;
   form.value.institution=selectedValue.institution;
-
 }
 const skillValue=ref(null);
 const optionSkill=ref([]);

src/views/base/skill/index.vue

@@ -84,11 +84,8 @@
 <script setup>
 import {ref, getCurrentInstance} from "vue";
 import {useCrud} from "@/hooks/userCrud";
-import ButtonPermKeys from "@/common/configs/buttonPermission";
 import {useCommonStoreHook, useDictionaryStore} from "@/store";
 import dictDataUtil from "@/common/configs/dictDataUtil";
-import editSkill from "@/views/base/skill/components/edit-skill.vue"
-import viewSkill from "@/views/base/skill/components/view-skill.vue"
 
 const {isShowTable, tableType} = toRefs(useCommonStoreHook());
 // 数据字典相关
@@ -182,19 +179,21 @@ option.value = Object.assign(option.value, {
   viewBtn: false,
   editBtn: false,
   column: [
-
-
     {
-      label: "所属机构", prop: "institution", width: 130,
+      label: "所属机构", prop: "deptId", width: 200,
       search: true,
+      hide: true,
       filterable: true,
       type: "select",
       overHidden: true,
       dicUrl: dictDataUtil.dept_list_url,
       dicMethod: "post",
       props: {label: "deptName", value: "id"},
+      display: true,
+    },
+    {
+      label: "所属机构", prop: "deptName", width: 200,
       disabled: true,
-
     },
     {
       label: "员工姓名", prop: "userName", width: 140, overHidden: true, search: true, rules: [{
@@ -221,10 +220,10 @@ option.value = Object.assign(option.value, {
       props: {label: "postName", value: "id"},
 
     },
-    {
+    /*{
       label: "部门", prop: "deptName", overHidden: true,
       disabled: true,
-    },
+    },*/
     {
       label: "分数",
       prop: "scopes",