From c2f4f9b87e283857a3fbdded2f8e7a93c346415a Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Mon, 1 Apr 2024 16:49:53 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=B0=83=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/qms/sampleCode/index.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/api/qms/sampleCode/index.ts b/src/api/qms/sampleCode/index.ts index 828f162f7..021edea4e 100644 --- a/src/api/qms/sampleCode/index.ts +++ b/src/api/qms/sampleCode/index.ts @@ -3,7 +3,7 @@ import request from '@/config/axios' export interface SampleCodeVO { id: number code: string - batchLow limiting: number + batchLowLimiting: number batchUpperLimiting: number s1: number s2: number @@ -54,4 +54,4 @@ export const exportSampleCode = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/qms/sample-code/get-import-template' }) -} \ No newline at end of file +} From 1443846cac280653900f66eff963229666e5ab26 Mon Sep 17 00:00:00 2001 From: bjang03 Date: Mon, 1 Apr 2024 16:50:57 +0800 Subject: [PATCH 2/2] =?UTF-8?q?1=E3=80=81=E5=A2=9E=E5=8A=A0=E5=B7=A5?= =?UTF-8?q?=E4=BD=8D=E6=93=8D=E4=BD=9C=E6=AD=A5=E9=AA=A4=E5=85=B3=E8=81=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/mes/workstation/index.vue | 93 +------------------ src/views/mes/workstation/workstation.data.ts | 27 ++++++ 2 files changed, 32 insertions(+), 88 deletions(-) diff --git a/src/views/mes/workstation/index.vue b/src/views/mes/workstation/index.vue index 8514b3808..6c408efca 100644 --- a/src/views/mes/workstation/index.vue +++ b/src/views/mes/workstation/index.vue @@ -67,45 +67,8 @@ /> - - - @@ -120,7 +83,7 @@ import { TabsList, Team, Workstation, - WorkstationRules + WorkstationRules, popCheckList } from './workstation.data' import * as WorkstationApi from '@/api/mes/workstation' import * as defaultButtons from '@/utils/disposition/defaultButtons' @@ -328,54 +291,8 @@ const changeTabs = (data) =>{ tabsDeleteApi = WorkstationApi.deleteOperstepsRelation } } -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 operstepsListRef = ref() -const { tableObject: selectOperstepsListTableData, tableMethods: OperstepsListTableMethods } = useTable({ - getListApi: WorkstationApi.checkOperstepsPageList -}) -const { getList:selectOperstepsList } = OperstepsListTableMethods +const popCheckListRef = ref() const detailOpenForm = async (type, params) => { - if (tableKey.value == 'Team') { - selectTeamListTableData.params = { - workstationCode: params.code - } - await selectTeamList() - teamListRef.value.open('viewDetail', params, null, 'viewDetail')//查看明细数据 - } else if (tableKey.value == 'Equipment') { - selectEquipmentListTableData.params = { - workstationCode: params.code - } - await selectEquipmentList() - equipmentListRef.value.open('viewDetail', params.code, null, 'viewDetail')//查看明细数据 - } else if (tableKey.value == 'Process') { - selectProcessListTableData.params = { - workstationCode: params.code - } - await selectProcessListList() - processListRef.value.open('viewDetail', params.code, null, 'viewDetail')//查看明细数据 - } else if (tableKey.value == 'Production') { - selectOperstepsListTableData.params = { - workstationCode: params.code - } - await selectOperstepsList() - operstepsListRef.value.open('viewDetail', params.code, null, 'viewDetail')//查看明细数据 - } + popCheckListRef.value.open('create', params.code, null, 'viewDetail') } diff --git a/src/views/mes/workstation/workstation.data.ts b/src/views/mes/workstation/workstation.data.ts index 9813e222b..535bf7dbc 100644 --- a/src/views/mes/workstation/workstation.data.ts +++ b/src/views/mes/workstation/workstation.data.ts @@ -1,5 +1,7 @@ import type {CrudSchema} from '@/hooks/web/useCrudSchemas' import {dateFormatter} from '@/utils/formatTime' +import {Warehouse} from "@/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data"; +import * as WarehouseApi from "@/api/wms/warehouse"; // 表单校验 export const WorkstationRules = reactive({ @@ -213,3 +215,28 @@ export const Opersteps = useCrudSchemas(reactive([ isTableForm:true, } ])) +export const popCheckList = useCrudSchemas(reactive([ + { + label: '多选列表', + field: 'popCheckList', + sort: 'custom', + isSearch: true, + isForm: false, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择仓库代码', // 输入框占位文本 + searchField: 'code', // 查询弹窗赋值字段 + searchTitle: '仓库信息', // 查询弹窗标题 + searchAllSchemas: Warehouse.allSchemas, // 查询弹窗所需类 + searchPage: WarehouseApi.getWarehousePage, // 查询弹窗所需分页方法 + searchCondition: [{ + key: 'available', + value: 'TRUE', + isMainValue: false + }] + } + } + } +]))