Merge branch 'qingban' of http://192.168.101.4:3000/jiaxiaoqiang/JG-ADMIN-TEMP into qingban

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

@@ -577,9 +577,9 @@ export const tableConfig = {
         overHidden: true,
         disabled: true,
       },
-      {
+      /*{
         label: "所属机构",
-        prop: "institution",
+        prop: "deptName",
         filterable: true,
         type: "select",
         width: 100,
@@ -588,7 +588,7 @@ export const tableConfig = {
         dicMethod: "post",
         props: { label: "deptName", value: "id" },
         disabled: true,
-      },
+      },*/
     ],
   },
 

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

@@ -35,10 +35,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,
@@ -211,8 +209,6 @@ option2.value = {
       overHidden: true,
       search: true,
       filterable: true,
-      width: 100,
-      overHidden: true,
       disabled: true,
       display: false,
     },
@@ -234,17 +230,14 @@ 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",
@@ -270,7 +263,7 @@ option2.value = {
       },
       props: { label: "postName", value: "id" },
     },
-    { label: "部门", prop: "deptName", overHidden: true, disabled: true },
+    { label: "所属机构", prop: "deptName", overHidden: true, disabled: true },
   ],
 };
 const postIdValue = ref({});
@@ -339,11 +332,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;
+  //form.value.institution = selectedValue.institution;
 };
 const skillValue = ref(null);
 const optionSkill = ref([]);

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

@@ -215,8 +215,6 @@ option2.value = {
       overHidden: true,
       search: true,
       filterable: true,
-      width: 100,
-      overHidden: true,
       disabled: true,
       display: false,
     },
@@ -238,17 +236,15 @@ 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",
@@ -325,7 +321,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);
 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,16 @@ 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 +210,7 @@ option2.value = {
       props: { label: "postName", value: "id" },
 
     },
-    { label: "部门", prop: "deptName", overHidden: true,
+    { label: "所属机构", prop: "deptName", overHidden: true,
       disabled:true, },
 
   ],

src/views/base/skill/index.vue

@@ -187,8 +187,8 @@ option.value = Object.assign(option.value, {
   column: [
     {
       label: "所属机构",
-      prop: "institution",
-      width: 130,
+      prop: "deptId",
+      hide: true,
       search: true,
       filterable: true,
       type: "select",
@@ -196,6 +196,12 @@ option.value = Object.assign(option.value, {
       dicUrl: dictDataUtil.dept_list_url,
       dicMethod: "post",
       props: { label: "deptName", value: "id" },
+    },
+    {
+      label: "所属机构",
+      prop: "deptName",
+      width: 200,
+      overHidden: true,
       disabled: true,
     },
     {
@@ -230,7 +236,7 @@ option.value = Object.assign(option.value, {
       dicMethod: "post",
       props: { label: "postName", value: "id" },
     },
-    { label: "部门", prop: "deptName", overHidden: true, disabled: true },
+    //{ label: "部门", prop: "deptName", overHidden: true, disabled: true },
     {
       label: "分数",
       prop: "scopes",

src/views/plan/workOrder/index.vue

@@ -526,6 +526,8 @@ const workShopInfo = (value) => {
   form.value.workshopName = value.id;
   form.value.workshopCode = value.code;
   form.value.workshopName = value.name;
+  form.value.productLineId = ""
+  form.value.productLineName = "";
   dialog2.visible = false;
 };
 const routeInfo = (value) => {