Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella

7 months ago · 90ba6dde97
27 changed files with 46 additions and 31 deletions
--- a/src/api/mes/workstation/index.ts
+++ b/src/api/mes/workstation/index.ts
@ -42,7 +42,7 @@ export const getEquipmentPage = async (params) => {
    const data = {...params}
    return await request.post({ url: '/mes/equipment/senior', data })
  } else {
-    return await request.get({ url: `/mes/equipment/pageListByWorkstationCode`, params })
+    return await request.get({ url: `/mes/equipment/getEquipmentPage`, params })
  }
 }
 // 查询选择设备列表
@ -53,11 +53,11 @@ export const checkEquipmentPageList = async (params) => {
    const data = {...params}
    return await request.post({ url: '/mes/equipment/senior', data })
  } else {
-    return await request.get({ url: `/mes/equipment/pageCheckListByWorkstationCode`, params })
+    return await request.get({ url: `/mes/equipment/pageCheckList`, params })
  }
 }
 // 添加设备关联
-export const createEquipmentRelation = async (equipmentCodes:string[]) => {
+export const createEquipment = async (equipmentCodes:string[]) => {
  const data = {
    workstationCode : goalParams.workstationCode,
    equipmentCodes : equipmentCodes
@ -66,7 +66,7 @@ export const createEquipmentRelation = async (equipmentCodes:string[]) => {
 }

 // 删除设备关联
-export const deleteEquipmentRelation = async (equipmentCodes:string[]) => {
+export const deleteEquipment = async (equipmentCodes:string[]) => {
  const data = {
    workstationCode : goalParams.workstationCode,
    equipmentCodes : equipmentCodes
@ -118,35 +118,25 @@ export const getOperstepsPage = async (params) => {
    const data = {...params}
    return await request.post({ url: '/mes/workstation-opersteps/senior', data })
  } else {
-    return await request.get({ url: `/mes/workstation-opersteps/pageListByWorkstationCode`, params })
-  }
-}
-export const checkOperstepsPageList = async (params) => {
-  params.workstationCode = goalParams.workstationCode
-  if (params.isSearch) {
-    delete params.isSearch
-    const data = {...params}
-    return await request.post({ url: '/mes/workstation-opersteps/senior', data })
-  } else {
-    return await request.get({ url: `/mes/workstation-opersteps/pageCheckListByWorkstationCode`, params })
+    return await request.get({ url: `/mes/workstation-opersteps/getWorkstationOperstepsPage`, params })
  }
 }
 // 添加操作步骤关联
-export const createOperstepsRelation = async (codes:string[]) => {
+export const createOpersteps = async (codes:string[]) => {
  const data = {
    workstationCode : goalParams.workstationCode,
    operstepsCodes : codes
  }
-  return await request.post({ url: `/mes/workstation-opersteps/createRelation`, data })
+  return await request.post({ url: `/mes/workstation-opersteps/create`, data })
 }

 // 删除操作步骤关联
-export const deleteOperstepsRelation = async (codes:string[]) => {
+export const deleteOpersteps = async (codes:string[]) => {
  const data = {
    workstationCode : goalParams.workstationCode,
    operstepsCodes : codes
  }
-  return await request.post({ url: `/mes/workstation-opersteps/deleteRelation`, data })
+  return await request.post({ url: `/mes/workstation-opersteps/delete`, data })
 }


@ -157,7 +147,7 @@ export const getAbilityPage = async (params) => {
    const data = {...params}
    return await request.post({ url: '/mes/workstation-ability/senior', data })
  } else {
-    return await request.get({ url: `/mes/workstation-ability/page`, params })
+    return await request.get({ url: `/mes/workstation-ability/getWorkstationAbilityPage`, params })
  }
 }
 // 添加能力关联
--- a/src/views/mes/workstation/index.vue
+++ b/src/views/mes/workstation/index.vue
@ -94,8 +94,8 @@ import TableHead from '@/components/TableHead/src/TableHead.vue'
 import Detail from './components/Detail.vue'

 defineOptions({ name: 'Workstation' })
-let tabsDeleteApi = WorkstationApi.deleteEquipmentRelation
-let tabsCreateApi = WorkstationApi.createEquipmentRelation
+let tabsDeleteApi = WorkstationApi.deleteEquipment
+let tabsCreateApi = WorkstationApi.createEquipment
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 const route = useRoute() // 路由信息
@ -243,14 +243,14 @@ const changeTabs = (data) =>{
  if(data.prop == 'Equipment'){
    apiPage.value = WorkstationApi.getEquipmentPage
    detailAllSchemas.value = Equipment.allSchemas
-    tabsDeleteApi = WorkstationApi.deleteEquipmentRelation
-    tabsCreateApi = WorkstationApi.createEquipmentRelation
+    tabsDeleteApi = WorkstationApi.deleteEquipment
+    tabsCreateApi = WorkstationApi.createEquipment
    tmpPopList = equipmentPopList.allSchemas
  }else if(data.prop == 'Opersteps'){
    apiPage.value = WorkstationApi.getOperstepsPage
    detailAllSchemas.value = Opersteps.allSchemas
-    tabsDeleteApi = WorkstationApi.deleteOperstepsRelation
-    tabsCreateApi = WorkstationApi.createOperstepsRelation
+    tabsDeleteApi = WorkstationApi.deleteOpersteps
+    tabsCreateApi = WorkstationApi.createOpersteps
    tmpPopList = stepPopList.allSchemas
  }else if(data.prop == 'Ability'){
    apiPage.value = WorkstationApi.getAbilityPage
@ -261,8 +261,8 @@ const changeTabs = (data) =>{
  }else if(data.prop == 'Post'){
    apiPage.value = WorkstationApi.getOperstepsPage
    detailAllSchemas.value = Opersteps.allSchemas
-    tabsDeleteApi = WorkstationApi.deleteOperstepsRelation
-    tabsCreateApi = WorkstationApi.createOperstepsRelation
+    tabsDeleteApi = WorkstationApi.deleteOpersteps
+    tabsCreateApi = WorkstationApi.createOpersteps
    tmpPopList = stepPopList.allSchemas
  }
 }
--- a/src/views/mes/workstation/workstation.data.ts
+++ b/src/views/mes/workstation/workstation.data.ts
@ -10,6 +10,7 @@ import * as ProductionlineApi from "@/api/wms/productionline";
 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";

 // 表单校验
 export const WorkstationRules = reactive({
@ -354,10 +355,10 @@ export const stepPopList = useCrudSchemas(reactive<CrudSchema[]>([
        multiple:true,
        isSearchList: true, // 开启查询弹窗
        searchListPlaceholder: '选择操作步骤', // 输入框占位文本
-        searchField: 'code', // 查询弹窗赋值字段
+        searchField: 'stepsCode', // 查询弹窗赋值字段
        searchTitle: '选择操作步骤', // 查询弹窗标题
-        searchAllSchemas: searchPop.allSchemas, // 查询弹窗所需类
-        searchPage: WorkstationApi.checkOperstepsPageList, // 查询弹窗所需分页方法
+        searchAllSchemas: Opersteps.allSchemas, // 查询弹窗所需类
+        searchPage: getOperstepsPage, // 查询弹窗所需分页方法
        searchCondition: [{
          key: 'available',
          value: 'TRUE',
--- a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts
+++ b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts
@ -839,6 +839,7 @@ export const IssueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
  {
    label: '操作',
    field: 'action',
+    hiddenInMain:true,
    isDetail: false,
    isForm: false ,
    table: {
--- a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts
+++ b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts
@ -738,6 +738,7 @@ export const PreparetoissueDetail = useCrudSchemas(reactive<CrudSchema[]>([
  },
  {
    label: '操作',
+    hiddenInMain:true,
    field: 'action',
    isDetail: false,
    isForm: false ,
--- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts
@ -946,6 +946,7 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
  },
  {
    label: '操作',
+    hiddenInMain:true,
    field: 'action',
    isDetail: false,
    isForm: false ,
--- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts
@ -530,6 +530,7 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
  },
  {
    label: '操作',
+    hiddenInMain:true,
    field: 'action',
    isDetail: false,
    isForm: false ,
--- a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts
+++ b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts
@ -720,6 +720,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
  {
    label: '操作',
    field: 'action',
+    hiddenInMain:true,
    isDetail: false,
    isForm: false ,
    table: {
--- a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts
+++ b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts
@ -876,6 +876,7 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
  },
  {
    label: '操作',
+    hiddenInMain:true,
    field: 'action',
    isDetail: false,
    isForm: false ,
--- a/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts
+++ b/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts
@ -876,6 +876,7 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
  },
  {
    label: '操作',
+    hiddenInMain:true,
    field: 'action',
    isDetail: false,
    isForm: false ,
--- a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts
+++ b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts
@ -875,6 +875,7 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
  },
  {
    label: '操作',
+    hiddenInMain:true,
    field: 'action',
    isDetail: false,
    isForm: false ,
--- a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts
+++ b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts
@ -876,6 +876,7 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
  },
  {
    label: '操作',
+    hiddenInMain:true,
    field: 'action',
    isDetail: false,
    isForm: false ,
--- a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts
+++ b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts
@ -652,6 +652,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
  },
  {
    label: '操作',
+    hiddenInMain:true,
    field: 'action',
    isDetail: false,
    isForm: false ,
--- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
+++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
@ -1035,6 +1035,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
  },
  {
    label: '操作',
+    hiddenInMain:true,
    field: 'action',
    isDetail: false,
    isForm: false ,
--- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts
+++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts
@ -1035,6 +1035,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
  },
  {
    label: '操作',
+    hiddenInMain:true,
    field: 'action',
    isDetail: false,
    isForm: false ,
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts
@ -954,6 +954,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
  },
  {
    label: '操作',
+    hiddenInMain:true,
    field: 'action',
    isDetail: false,
    isForm: false ,
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
@ -889,6 +889,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
  },
  {
    label: '操作',
+    hiddenInMain:true,
    field: 'action',
    isDetail: false,
    isForm: false ,
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
@ -1129,6 +1129,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
  },
  {
    label: '操作',
+    hiddenInMain:true,
    field: 'action',
    isDetail: false,
    isForm: false ,
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
@ -1053,6 +1053,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
  },
  {
    label: '操作',
+    hiddenInMain:true,
    field: 'action',
    isDetail: false,
    isForm: false ,
--- a/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/putawayJobMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/putawayJobMain.data.ts
@ -792,6 +792,7 @@ export const PutawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
  },
  {
    label: '操作',
+    hiddenInMain:true,
    field: 'action',
    isDetail: false,
    isForm: false ,
--- a/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/putawayRecordMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/putawayRecordMain.data.ts
@ -615,6 +615,7 @@ export const PutawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
  },
  {
    label: '操作',
+    hiddenInMain:true,
    field: 'action',
    isDetail: false,
    isForm: false ,
--- a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts
@ -770,6 +770,7 @@ export const PutawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
  },
  {
    label: '操作',
+    hiddenInMain:true,
    field: 'action',
    isDetail: false,
    isForm: false,
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts
@ -531,6 +531,7 @@ export const DemandforecastingDetail = useCrudSchemas(reactive<CrudSchema[]>([
  },
  {
    label: '操作',
+    hiddenInMain:true,
    field: 'action',
    isDetail: false,
    isForm: false,
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
@ -661,6 +661,7 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
    field: 'action',
    isDetail: false,
    isForm: false,
+    hiddenInMain:true,
    table: {
      width: 150,
      fixed: 'right'
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts
@ -718,6 +718,7 @@ export const SupplierdeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
  },
  {
    label: '操作',
+    hiddenInMain:true,
    field: 'action',
    isDetail: false,
    isForm: false ,
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
@ -1022,6 +1022,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
  },
  {
    label: '操作',
+    hiddenInMain:true,
    field: 'action',
    isDetail: false,
    isForm: false,
--- a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/purchaseclaimRequestMain.data.ts
+++ b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/purchaseclaimRequestMain.data.ts
@ -530,6 +530,7 @@ export const PurchaseclaimRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
  },
   {
    label: '操作',
+    hiddenInMain:true,
    field: 'action',
    isDetail: false,
    isForm: false ,