From 1b7db2150a50c1920d4d4483caf73e24f4e47cd9 Mon Sep 17 00:00:00 2001
From: bjang03 <wenwu901@icloud.com>
Date: Thu, 28 Mar 2024 08:49:39 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=B7=A5=E4=BD=8D=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=85=B3=E8=81=94=E5=BC=B9=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mes/workstation/index.ts              | 156 +++++++++++++-
 src/utils/dict.ts                             |   2 +-
 src/views/mes/workstation/index.vue           | 190 +++++++++++++++---
 src/views/mes/workstation/workstation.data.ts | 163 ++++++++++++++-
 4 files changed, 478 insertions(+), 33 deletions(-)

diff --git a/src/api/mes/workstation/index.ts b/src/api/mes/workstation/index.ts
index 1e8e44a8f..37694b15d 100644
--- a/src/api/mes/workstation/index.ts
+++ b/src/api/mes/workstation/index.ts
@@ -6,7 +6,9 @@ export interface WorkstationVO {
   expireTime: Date
   name: string
 }
-
+export const goalParams = {
+  workstationCode:null
+}
 // 查询工位列表
 export const getWorkstationPage = async (params) => {
   if (params.isSearch) {
@@ -46,4 +48,154 @@ export const exportWorkstation = async (params) => {
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/mes/workstation/get-import-template' })
-}
\ No newline at end of file
+}// 查询班组列表
+export const getTeamPage = async (params) => {
+  console.log(goalParams.workstationCode)
+  params.workstationCode = goalParams.workstationCode
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/mes/team/senior', data })
+  } else {
+    return await request.get({ url: `/mes/team/pageListByWorkstationCode`, params })
+  }
+}
+// 查询选择班组列表
+export const checkTeamPageList = async (params) => {
+  console.log(goalParams.workstationCode)
+  params.workstationCode = goalParams.workstationCode
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/mes/team/senior', data })
+  } else {
+    return await request.get({ url: `/mes/team/pageCheckListByWorkstationCode`, params })
+  }
+}
+// 添加班组关联
+export const createTeamRelation = async (workstationCode,teamCodes:string[]) => {
+  const data = {
+    workstationCode : workstationCode,
+    teamCodes : teamCodes
+  }
+  return await request.post({ url: `/mes/team/createRelation`, data })
+}
+
+// 删除班组关联
+export const deleteTeamRelation = async (workstationCode,teamCodes:string[]) => {
+  const data = {
+    workstationCode : workstationCode,
+    teamCodes : teamCodes
+  }
+  return await request.post({ url: `/mes/team/deleteRelation`, data })
+}
+export const getEquipmentPage = async (params) => {
+  console.log(goalParams.workstationCode)
+  params.workstationCode = goalParams.workstationCode
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/mes/equipment/senior', data })
+  } else {
+    return await request.get({ url: `/mes/equipment/pageListByWorkstationCode`, params })
+  }
+}
+// 查询选择设备列表
+export const checkEquipmentPageList = async (params) => {
+  console.log(goalParams.workstationCode)
+  params.workstationCode = goalParams.workstationCode
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/mes/equipment/senior', data })
+  } else {
+    return await request.get({ url: `/mes/equipment/pageCheckListByWorkstationCode`, params })
+  }
+}
+// 添加设备关联
+export const createEquipmentRelation = async (workstationCode,equipmentCodes:string[]) => {
+  const data = {
+    workstationCode : workstationCode,
+    equipmentCodes : equipmentCodes
+  }
+  return await request.post({ url: `/mes/team/createRelation`, data })
+}
+
+// 删除设备关联
+export const deleteEquipmentRelation = async (workstationCode,equipmentCodes:string[]) => {
+  const data = {
+    workstationCode : workstationCode,
+    equipmentCodes : equipmentCodes
+  }
+  return await request.post({ url: `/mes/team/deleteRelation`, data })
+}
+export const getProcessPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/mes/production-process/senior', data })
+  } else {
+    return await request.get({ url: `/mes/production-process/pageListByWorkstationCode`, params })
+  }
+}
+export const checkProcessPageList = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/mes/production-process/senior', data })
+  } else {
+    return await request.get({ url: `/mes/production-process/pageCheckListByWorkstationCode`, params })
+  }
+}
+// 添加工序关联
+export const createProcessRelation = async (workstationCode,processCodes:string[]) => {
+  const data = {
+    workstationCode : workstationCode,
+    processCodes : processCodes
+  }
+  return await request.post({ url: `/mes/production-process/createRelation`, data })
+}
+
+// 删除工序关联
+export const deleteProcessRelation = async (workstationCode,processCodes:string[]) => {
+  const data = {
+    workstationCode : workstationCode,
+    processCodes : processCodes
+  }
+  return await request.post({ url: `/mes/production-process/deleteRelation`, data })
+}
+export const getProductionPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/mes/production-process/senior', data })
+  } else {
+    return await request.get({ url: `/mes/production-process/pageListByWorkstationCode`, params })
+  }
+}
+export const checkProductionPageList = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/mes/production-process/senior', data })
+  } else {
+    return await request.get({ url: `/mes/production-process/pageCheckListByWorkstationCode`, params })
+  }
+}
+// 添加产品关联
+export const createProductionRelation = async (workstationCode,productionCodes:string[]) => {
+  const data = {
+    workstationCode : workstationCode,
+    productionCodes : productionCodes
+  }
+  return await request.post({ url: `/mes/production-process/createRelation`, data })
+}
+
+// 删除产品关联
+export const deleteProductionRelation = async (workstationCode,productionCodes:string[]) => {
+  const data = {
+    workstationCode : workstationCode,
+    productionCodes : productionCodes
+  }
+  return await request.post({ url: `/mes/production-process/deleteRelation`, data })
+}
diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index 237ab67ab..67ad62537 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -280,7 +280,7 @@ export enum DICT_TYPE {
   MESDO_STATUS= 'mes_do_status', // 工单执行状态
   MES_WORKBILL_MODEL='mes_workbill_model',// 工单模式 单工单（根据产品数量生成多个工单）、批量工单（一个产品一个工单）
   MES_TASK_MODE='mes_task_mode', //生产模式 派工方式、领工方式
-  MES_PLANDO_STATUS='mes_plando_status' //计划执行状态
+  MES_PLANDO_STATUS='mes_plando_status', //计划执行状态
   PLAN_PRODUCTION_TYPE = "plan_production_type", // 生产计划类型
   DELIVER_TYPE="deliver_type",//发货类型
   BILL_TYPE="bill_type", // 发票类型
diff --git a/src/views/mes/workstation/index.vue b/src/views/mes/workstation/index.vue
index 35f6f2dd1..fe96e49f1 100644
--- a/src/views/mes/workstation/index.vue
+++ b/src/views/mes/workstation/index.vue
@@ -4,15 +4,15 @@
     <Search :schema="Workstation.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
-    <!-- 列表头部 -->
-    <TableHead
-      :HeadButttondata="HeadButttondata"
-      @button-base-click="buttonBaseClick"
-      :routeName="routeName"
-      @updataTableColumns="updataTableColumns"
-      @searchFormClick="searchFormClick"
-      :allSchemas="Workstation.allSchemas"
-    />
+  <!-- 列表头部 -->
+  <TableHead
+    :HeadButttondata="HeadButttondata"
+    @button-base-click="buttonBaseClick"
+    :routeName="routeName"
+    @updataTableColumns="updataTableColumns"
+    @searchFormClick="searchFormClick"
+    :allSchemas="Workstation.allSchemas"
+  />
 
   <!-- 列表 -->
   <ContentWrap>
@@ -51,26 +51,90 @@
   />
 
   <!-- 详情 -->
-  <Detail ref="detailRef" :isBasic="true" :allSchemas="Workstation.allSchemas" />
-
+  <Detail ref="detailRef"
+          :isBasic="false"
+          :allSchemas="Workstation.allSchemas"
+          :detailAllSchemas="detailAllSchemas"
+          :detailAllSchemasRules="WorkstationRules"
+          :apiPage="apiPage"
+          :tabs="TabsList"
+          @changeTabs="changeTabs"
+          :buttondataTable="buttondataTable"
+          @tableFormButton="tableFormButton"
+  />
+  <!-- 记录子包装弹窗 -->
+  <BasicForm
+    ref="teamRef"
+    @success="getList"
+    :tableAllSchemas="Team.allSchemas"
+    :tableData="selectTeamListTableData.tableList"
+    :isBusiness="true"
+    :isShowButton="false"
+    :isShowReduceButton="false"
+    :isShowFooterButtton="false"
+  />
+  <BasicForm
+    ref="equipmentListRef"
+    @success="getList"
+    :tableAllSchemas="Equipment.allSchemas"
+    :tableData="selectEquipmentListTableData.tableList"
+    :isBusiness="true"
+    :isShowButton="false"
+    :isShowReduceButton="false"
+    :isShowFooterButtton="false"
+  />
+  <BasicForm
+    ref="processListRef"
+    @success="getList"
+    :tableAllSchemas="Process.allSchemas"
+    :tableData="selectProcessListTableData.tableList"
+    :isBusiness="true"
+    :isShowButton="false"
+    :isShowReduceButton="false"
+    :isShowFooterButtton="false"
+  />
+  <BasicForm
+    ref="productionListRef"
+    @success="getList"
+    :tableAllSchemas="Production.allSchemas"
+    :tableData="selectProductionListTableData.tableList"
+    :isBusiness="true"
+    :isShowButton="false"
+    :isShowReduceButton="false"
+    :isShowFooterButtton="false"
+  />
   <!-- 导入 -->
   <ImportForm ref="importFormRef" url="/mes/workstation/import" :importTemplateData="importTemplateData" @success="importSuccess" />
 </template>
 
 <script setup lang="ts">
 import download from '@/utils/download'
-import { Workstation,WorkstationRules } from './workstation.data'
+import {
+  Equipment,
+  Process,
+  Production,
+  TabsList,
+  Team,
+  Workstation,
+  WorkstationRules
+} from './workstation.data'
 import * as WorkstationApi from '@/api/mes/workstation'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
-import Detail from '@/components/Detail/src/Detail.vue'
-
+import {
+  checkEquipmentPageList, checkProcessPageList, checkProductionPageList,
+  checkTeamPageList,
+  getEquipmentPage, getProcessPage, getProductionPage, getSelectEquipmentPage,
+  getSelectTeamPage,
+  goalParams,
+} from "@/api/mes/workstation";
+import * as PurchasereceiptRecordDetailApi from "@/api/wms/purchasereceiptRecordDetail";
 defineOptions({ name: 'Workstation' })
 
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
-
+const teamRef = ref()
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
@@ -135,7 +199,6 @@ const buttonBaseClick = (val, item) => {
 const butttondata = [
   defaultButtons.mainListEditBtn({hasPermi:'wms:workstation:update'}), // 编辑
   defaultButtons.mainListDeleteBtn({hasPermi:'wms:workstation:delete'}), // 删除
-  defaultButtons.mainListBindBtn({hasPermi:'wms:workstation:update'}), // 绑定
 ]
 
 // 列表-操作按钮事件
@@ -144,11 +207,8 @@ const buttonTableClick = async (val, row) => {
     openForm('update', row)
   } else if (val == 'delete') { // 删除
     await handleDelete(row.id)
-  }else if (val == 'bind') { // 删除
-    await detailRef.value.openDetail(row, '绑定', row.name, 'mesWorkstation')
   }
 }
-
 /** 添加/修改操作 */
 const basicFormRef = ref()
 const openForm = (type: string, row?: any) => {
@@ -179,11 +239,6 @@ const formsSuccess = async (formType,data) => {
   getList()
 }
 
-/** 详情操作 */
-const detailRef = ref()
-const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue, 'basicWorkstation')
-}
 
 /** 删除按钮操作 */
 const handleDelete = async (id: number) => {
@@ -243,5 +298,92 @@ onMounted(async () => {
   getList()
   importTemplateData.templateUrl = await WorkstationApi.importTemplate()
 })
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  goalParams.workstationCode = row.code
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicWorkstation')
+}
+// 子包装数据
+const detailAllSchemas = ref(Team.allSchemas)
+const apiPage = ref(WorkstationApi.getTeamPage)
+const tableKey = ref("workstationDetail");
+// tabs 切换事件
+const changeTabs = (data) =>{
+  tableKey.value = data.prop
+  if(data.prop == 'Team'){
+    apiPage.value = WorkstationApi.getTeamPage
+    detailAllSchemas.value = Team.allSchemas
+  }else if(data.prop == 'Equipment'){
+    apiPage.value = WorkstationApi.getEquipmentPage
+    detailAllSchemas.value = Equipment.allSchemas
+  }else if(data.prop == 'Process'){
+    apiPage.value = WorkstationApi.getProcessPage
+    detailAllSchemas.value = Process.allSchemas
+  }else if(data.prop == 'Production'){
+    apiPage.value = WorkstationApi.getProductionPage
+    detailAllSchemas.value = Production.allSchemas
+  }
+}
+const buttondataTable = ref([{
+  label: '取消关联',
+  name: 'viewParentPickingNumber',
+  hide: false,
+  type: 'primary',
+  icon: '',
+  color: '',
+  hasPermi: '',
+  link: true, // 文本展现按钮
+}])
+const teamListRef = ref()
+const { tableObject: selectTeamListTableData, tableMethods: selectTeamListTableMethods } = useTable({
+  getListApi: WorkstationApi.checkTeamPageList
+})
+const { getList:selectTeamList } = selectTeamListTableMethods
 
+const equipmentListRef = ref()
+const { tableObject: selectEquipmentListTableData, tableMethods: selectEquipmentListTableMethods } = useTable({
+  getListApi: WorkstationApi.checkEquipmentPageList
+})
+const { getList:selectEquipmentList } = selectEquipmentListTableMethods
+
+const processListRef = ref()
+const { tableObject: selectProcessListTableData, tableMethods: processListTableMethods } = useTable({
+  getListApi: WorkstationApi.checkProcessPageList
+})
+const { getList:selectProcessListList } = processListTableMethods
+
+const productionListRef = ref()
+const { tableObject: selectProductionListTableData, tableMethods: productionListTableMethods } = useTable({
+  getListApi: WorkstationApi.checkProductionPageList
+})
+const { getList:selectProductionList } = productionListTableMethods
+
+const tableFormButton = async (val , row) => {
+  if(val == 'Team'){
+    selectTeamListTableData.params = {
+      workstationCode:row.workstationCode
+    }
+    await selectTeamList()
+    teamListRef.value.open('create', row, null,'viewDetail')//查看明细数据
+  }else if(val == 'Equipment'){
+    selectEquipmentListTableData.params = {
+      workstationCode:row.workstationCode
+    }
+    await selectEquipmentList()
+    equipmentListRef.value.open('create', row, null,'viewDetail')//查看明细数据
+  }else if(val == 'Process'){
+    selectProcessListTableData.params = {
+      workstationCode:row.workstationCode
+    }
+    await selectProcessListList()
+    processListRef.value.open('create', row, null,'viewDetail')//查看明细数据
+  }else if(val == 'Production'){
+    selectProductionListTableData.params = {
+      workstationCode:row.workstationCode
+    }
+    await selectProductionList()
+    productionListRef.value.open('create', row, null,'viewDetail')//查看明细数据
+  }
+}
 </script>
diff --git a/src/views/mes/workstation/workstation.data.ts b/src/views/mes/workstation/workstation.data.ts
index 611194817..21d49d7d0 100644
--- a/src/views/mes/workstation/workstation.data.ts
+++ b/src/views/mes/workstation/workstation.data.ts
@@ -1,11 +1,28 @@
-import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
+import type {CrudSchema} from '@/hooks/web/useCrudSchemas'
+import {dateFormatter} from '@/utils/formatTime'
 
 // 表单校验
 export const WorkstationRules = reactive({
   code: [required]
 })
+export const TabsList = [{
+  label: "班组",
+  prop: 'Team',
+},
+  {
+    label: "设备",
+    prop: 'Equipment',
+  },
+  {
+    label: "工序",
+    prop: 'Process',
+  },
+  {
+    label: "产品",
+    prop: 'Production',
+  }
 
+]
 export const Workstation = useCrudSchemas(reactive<CrudSchema[]>([
 
   {
@@ -46,26 +63,36 @@ export const Workstation = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'activeTime',
     sort: 'custom',
     formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
     form: {
       component: 'DatePicker',
       componentProps: {
+        style: {width: '100%'},
         type: 'datetime',
-        valueFormat: 'x'
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
       }
-    }
+    },
   },
   {
     label: '失效时间',
     field: 'expireTime',
     sort: 'custom',
     formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
     form: {
       component: 'DatePicker',
       componentProps: {
+        style: {width: '100%'},
         type: 'datetime',
-        valueFormat: 'x'
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
       }
-    }
+    },
   },
   {
     label: '操作',
@@ -77,3 +104,127 @@ export const Workstation = useCrudSchemas(reactive<CrudSchema[]>([
     }
   }
 ]))
+export const Team = 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,
+  }
+]))
+export const TeamSelect = 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[]>([
+  {
+    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,
+  }
+]))
+export const Process = 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,
+  }
+]))
+export const Production = 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,
+  }
+]))