From c99842953dccf0cfe37d1caa4704a0f3f9a025a4 Mon Sep 17 00:00:00 2001
From: bjang03 <wenwu901@icloud.com>
Date: Wed, 17 Apr 2024 14:01:09 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=B7=A5=E4=BD=8D=E8=83=BD=E5=8A=9B?=
 =?UTF-8?q?=E5=85=B3=E8=81=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mes/workstation/index.ts              | 65 ++++++-------
 src/views/mes/workstation/index.vue           | 17 ++--
 src/views/mes/workstation/workstation.data.ts | 93 ++++++-------------
 3 files changed, 60 insertions(+), 115 deletions(-)

diff --git a/src/api/mes/workstation/index.ts b/src/api/mes/workstation/index.ts
index a7ca304ca..fcd745b8e 100644
--- a/src/api/mes/workstation/index.ts
+++ b/src/api/mes/workstation/index.ts
@@ -73,43 +73,7 @@ export const deleteEquipment = async (equipmentCodes:string[]) => {
   }
   return await request.post({ url: `/mes/equipment/deleteRelation`, data })
 }
-export const getProcessPage = async (params) => {
-  params.workstationCode = goalParams.workstationCode
-  if (params.isSearch) {
-    delete params.isSearch
-    const data = {...params}
-    return await request.post({ url: '/mes/workstation-process/senior', data })
-  } else {
-    return await request.get({ url: `/mes/workstation-process/pageListByWorkstationCode`, params })
-  }
-}
-export const checkProcessPageList = async (params) => {
-  params.workstationCode = goalParams.workstationCode
-  if (params.isSearch) {
-    delete params.isSearch
-    const data = {...params}
-    return await request.post({ url: '/mes/workstation-process/senior', data })
-  } else {
-    return await request.get({ url: `/mes/workstation-process/pageCheckListByWorkstationCode`, params })
-  }
-}
-// 添加工序关联
-export const createProcessRelation = async (processCodes:string[]) => {
-  const data = {
-    workstationCode : goalParams.workstationCode,
-    processCodes : processCodes
-  }
-  return await request.post({ url: `/mes/workstation-process/createRelation`, data })
-}
 
-// 删除工序关联
-export const deleteProcessRelation = async (processCodes:string[]) => {
-  const data = {
-    workstationCode : goalParams.workstationCode,
-    processCodes : processCodes
-  }
-  return await request.post({ url: `/mes/workstation-process/deleteRelation`, data })
-}
 
 export const getOperstepsPage = async (params) => {
   params.workstationCode = goalParams.workstationCode
@@ -139,7 +103,6 @@ export const deleteOpersteps = async (codes:string[]) => {
   return await request.post({ url: `/mes/workstation-opersteps/delete`, data })
 }
 
-
 export const getAbilityPage = async (params) => {
   params.workstationCode = goalParams.workstationCode
   if (params.isSearch) {
@@ -167,3 +130,31 @@ export const deleteAbility = async (codes:string[]) => {
   }
   return await request.post({ url: `/mes/workstation-ability/delete`, data })
 }
+// 查询工位岗位关联
+export const getPostPage = async (params) => {
+  params.workstationCode = goalParams.workstationCode
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/mes/workstation-post/senior', data })
+  } else {
+    return await request.get({ url: `/mes/workstation-post/getWorkstationPostPage`, params })
+  }
+}
+// 添加能力关联
+export const createAPost = async (codes:string[]) => {
+  const data = {
+    workstationCode : goalParams.workstationCode,
+    postCodes : codes
+  }
+  return await request.post({ url: `/mes/workstation-post/create`, data })
+}
+
+// 删除能力关联
+export const deletePost = async (codes:string[]) => {
+  const data = {
+    workstationCode : goalParams.workstationCode,
+    postCodes : codes
+  }
+  return await request.post({ url: `/mes/workstation-post/delete`, data })
+}
diff --git a/src/views/mes/workstation/index.vue b/src/views/mes/workstation/index.vue
index cb101fbad..13b6a688f 100644
--- a/src/views/mes/workstation/index.vue
+++ b/src/views/mes/workstation/index.vue
@@ -79,10 +79,9 @@
 
 <script setup lang="ts">
 import {
-  Ability, abilityPopList,
+  abilityPopList,
   Equipment,
-  equipmentPopList,
-  Opersteps,
+  equipmentPopList, postPopList,
   stepPopList,
   TabsList,
   Workstation,
@@ -242,28 +241,24 @@ const changeTabs = (data) =>{
   tableKey.value = data.prop
   if(data.prop == 'Equipment'){
     apiPage.value = WorkstationApi.getEquipmentPage
-    detailAllSchemas.value = Equipment.allSchemas
     tabsDeleteApi = WorkstationApi.deleteEquipment
     tabsCreateApi = WorkstationApi.createEquipment
     tmpPopList = equipmentPopList.allSchemas
   }else if(data.prop == 'Opersteps'){
     apiPage.value = WorkstationApi.getOperstepsPage
-    detailAllSchemas.value = Opersteps.allSchemas
     tabsDeleteApi = WorkstationApi.deleteOpersteps
     tabsCreateApi = WorkstationApi.createOpersteps
     tmpPopList = stepPopList.allSchemas
   }else if(data.prop == 'Ability'){
     apiPage.value = WorkstationApi.getAbilityPage
-    detailAllSchemas.value = Ability.allSchemas
     tabsDeleteApi = WorkstationApi.deleteAbility
     tabsCreateApi = WorkstationApi.createAbility
     tmpPopList = abilityPopList.allSchemas
   }else if(data.prop == 'Post'){
-    apiPage.value = WorkstationApi.getOperstepsPage
-    detailAllSchemas.value = Opersteps.allSchemas
-    tabsDeleteApi = WorkstationApi.deleteOpersteps
-    tabsCreateApi = WorkstationApi.createOpersteps
-    tmpPopList = stepPopList.allSchemas
+    apiPage.value = WorkstationApi.getPostPage
+    tabsDeleteApi = WorkstationApi.deletePost
+    tabsCreateApi = WorkstationApi.createAPost
+    tmpPopList = postPopList.allSchemas
   }
 }
 const tmpPopListRef = ref()
diff --git a/src/views/mes/workstation/workstation.data.ts b/src/views/mes/workstation/workstation.data.ts
index 9bdfc1c1a..50c88e58b 100644
--- a/src/views/mes/workstation/workstation.data.ts
+++ b/src/views/mes/workstation/workstation.data.ts
@@ -11,6 +11,8 @@ import * as ProcessApi from "@/api/mes/process";
 import * as AbilityInfoApi from "@/api/mes/abilityInfo";
 import {AbilityInfo} from "@/views/mes/abilityInfo/abilityInfo.data";
 import {getOperstepsPage} from "@/api/mes/opersteps";
+import {Opersteps} from "@/views/mes/opersteps/opersteps.data";
+import {getPostPage} from "@/api/system/post";
 
 // 表单校验
 export const WorkstationRules = reactive({
@@ -195,22 +197,6 @@ export const Workstation = useCrudSchemas(reactive<CrudSchema[]>([
     }
   }
 ]))
-export const searchPop = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '代码',
-    field: 'code',
-    sort: 'custom',
-    isSearch: true,
-    isForm: false
-  },
-  {
-    label: '名称',
-    field: 'name',
-    sort: 'custom',
-    isSearch: true,
-    isForm: false
-  }
-]))
 
 export const Equipment = useCrudSchemas(reactive<CrudSchema[]>([
   {
@@ -239,7 +225,7 @@ export const Equipment = useCrudSchemas(reactive<CrudSchema[]>([
     isTableForm:true
   }
 ]))
-export const Opersteps = useCrudSchemas(reactive<CrudSchema[]>([
+export const Post = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '代码',
     field: 'code',
@@ -263,34 +249,7 @@ export const Opersteps = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150,
       fixed: 'right'
     },
-    isTableForm:true,
-  }
-]))
-export const Ability = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '代码',
-    field: 'code',
-    sort: 'custom',
-    isSearch: true,
-    isForm: false
-  },
-  {
-    label: '名称',
-    field: 'name',
-    sort: 'custom',
-    isSearch: true,
-    isForm: false
-  },
-  {
-    label: '操作',
-    field: 'action',
-    isDetail: false,
-    isForm: false ,
-    table: {
-      width: 150,
-      fixed: 'right'
-    },
-    isTableForm:true,
+    isTableForm:true
   }
 ]))
 export const equipmentPopList = useCrudSchemas(reactive<CrudSchema[]>([
@@ -307,7 +266,7 @@ export const equipmentPopList = useCrudSchemas(reactive<CrudSchema[]>([
         searchListPlaceholder: '选择设备', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
         searchTitle: '选择设备', // 查询弹窗标题
-        searchAllSchemas: searchPop.allSchemas, // 查询弹窗所需类
+        searchAllSchemas: Equipment.allSchemas, // 查询弹窗所需类
         searchPage: WorkstationApi.checkEquipmentPageList, // 查询弹窗所需分页方法
         searchCondition: [{
           key: 'available',
@@ -318,9 +277,9 @@ export const equipmentPopList = useCrudSchemas(reactive<CrudSchema[]>([
     }
   }
 ]))
-export const PostList = useCrudSchemas(reactive<CrudSchema[]>([
+export const stepPopList = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '选择岗位',
+    label: '选择操作步骤',
     field: 'list',
     sort: 'custom',
     isSearch: false,
@@ -329,11 +288,11 @@ export const PostList = useCrudSchemas(reactive<CrudSchema[]>([
       componentProps: {
         multiple:true,
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '选择岗位', // 输入框占位文本
-        searchField: 'code', // 查询弹窗赋值字段
-        searchTitle: '选择岗位', // 查询弹窗标题
-        searchAllSchemas: searchPop.allSchemas, // 查询弹窗所需类
-        searchPage: WorkstationApi.checkProcessPageList, // 查询弹窗所需分页方法
+        searchListPlaceholder: '选择操作步骤', // 输入框占位文本
+        searchField: 'stepsCode', // 查询弹窗赋值字段
+        searchTitle: '选择操作步骤', // 查询弹窗标题
+        searchAllSchemas: Opersteps.allSchemas, // 查询弹窗所需类
+        searchPage: getOperstepsPage, // 查询弹窗所需分页方法
         searchCondition: [{
           key: 'available',
           value: 'TRUE',
@@ -343,9 +302,9 @@ export const PostList = useCrudSchemas(reactive<CrudSchema[]>([
     }
   }
 ]))
-export const stepPopList = useCrudSchemas(reactive<CrudSchema[]>([
+export const abilityPopList = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '选择操作步骤',
+    label: '选择能力',
     field: 'list',
     sort: 'custom',
     isSearch: false,
@@ -354,11 +313,11 @@ export const stepPopList = useCrudSchemas(reactive<CrudSchema[]>([
       componentProps: {
         multiple:true,
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '选择操作步骤', // 输入框占位文本
-        searchField: 'stepsCode', // 查询弹窗赋值字段
-        searchTitle: '选择操作步骤', // 查询弹窗标题
-        searchAllSchemas: Opersteps.allSchemas, // 查询弹窗所需类
-        searchPage: getOperstepsPage, // 查询弹窗所需分页方法
+        searchListPlaceholder: '选择能力', // 输入框占位文本
+        searchField: 'ablityCode', // 查询弹窗赋值字段
+        searchTitle: '选择能力', // 查询弹窗标题
+        searchAllSchemas: AbilityInfo.allSchemas, // 查询弹窗所需类
+        searchPage: AbilityInfoApi.getAbilityInfoPage, // 查询弹窗所需分页方法
         searchCondition: [{
           key: 'available',
           value: 'TRUE',
@@ -368,9 +327,9 @@ export const stepPopList = useCrudSchemas(reactive<CrudSchema[]>([
     }
   }
 ]))
-export const abilityPopList = useCrudSchemas(reactive<CrudSchema[]>([
+export const postPopList = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '选择能力',
+    label: '选择岗位',
     field: 'list',
     sort: 'custom',
     isSearch: false,
@@ -379,11 +338,11 @@ export const abilityPopList = useCrudSchemas(reactive<CrudSchema[]>([
       componentProps: {
         multiple:true,
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '选择能力', // 输入框占位文本
-        searchField: 'ablityCode', // 查询弹窗赋值字段
-        searchTitle: '选择能力', // 查询弹窗标题
-        searchAllSchemas: AbilityInfo.allSchemas, // 查询弹窗所需类
-        searchPage: AbilityInfoApi.getAbilityInfoPage, // 查询弹窗所需分页方法
+        searchListPlaceholder: '选择岗位', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '选择岗位', // 查询弹窗标题
+        searchAllSchemas: Post.allSchemas, // 查询弹窗所需类
+        searchPage: getPostPage, // 查询弹窗所需分页方法
         searchCondition: [{
           key: 'available',
           value: 'TRUE',