From e8b3bf26a7b44629b02f18fe0e7e87de62db16a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com> Date: Fri, 15 Mar 2024 11:45:15 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=8F=AB=E6=96=99=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../callmaterials/callmaterials.data.ts | 147 +++++++++++++++++- .../labelManage/callmaterials/index.vue | 7 +- .../issueRequestMain/issueRequestMain.data.ts | 4 +- 3 files changed, 152 insertions(+), 6 deletions(-) diff --git a/src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts b/src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts index 72a53bc6a..d8e3e1f7a 100644 --- a/src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts +++ b/src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts @@ -8,6 +8,18 @@ import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/l import * as PackageunitApi from '@/api/wms/packageunit' import { Packageunit } from '@/views/wms/basicDataManage/itemManage/packageunit/packageunit.data' +import * as WarehouseApi from '@/api/wms/warehouse' +import { Warehouse } from '@/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data' + +import * as WorkshopApi from '@/api/wms/workshop' +import { Workshop } from '@/views/wms/basicDataManage/factoryModeling/workshop/workshop.data' + +import * as ProductionlineApi from '@/api/wms/productionline' +import { Productionline } from '@/views/wms/basicDataManage/factoryModeling/productionline/productionline.data' + +import * as WorkStationApi from '@/api/wms/workstation' +import { Workstation } from '@/views/wms/basicDataManage/factoryModeling/workstation/workstation.data' + // 表单校验 export const CallmaterialsRules = reactive({ itemCode: [required], @@ -81,12 +93,22 @@ export const Callmaterials = useCrudSchemas(reactive([ { label: '计量单位', field: 'uom', - sort: 'custom', dictType: DICT_TYPE.UOM, dictClass: 'string', + isTable: true, + sort: 'custom', table: { - width: 120 + width: 150 + }, + tableForm: { + disabled: true, + type: 'Select' }, + form: { + componentProps: { + disabled: true + } + } }, { label: '批次', @@ -116,6 +138,126 @@ export const Callmaterials = useCrudSchemas(reactive([ } } }, + { + label: '仓库代码', + field: 'warehouseCode', + sort: 'custom', + table: { + width: 150 + }, + isSearch: true, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择仓库代码', // 输入框占位文本 + searchField: 'code', // 查询弹窗赋值字段 + searchTitle: '仓库信息', // 查询弹窗标题 + searchAllSchemas: Warehouse.allSchemas, // 查询弹窗所需类 + searchPage: WarehouseApi.getWarehousePage, // 查询弹窗所需分页方法 + searchCondition: [{ + key: 'available', + value: 'TRUE', + isMainValue: false + }] + } + } + }, + { + label: '车间', + field: 'workshopCode', + sort: 'custom', + table: { + width: 150 + }, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择车间代码', // 输入框占位文本 + searchField: 'code', // 查询弹窗赋值字段 + searchTitle: '车间信息', // 查询弹窗标题 + searchAllSchemas: Workshop.allSchemas, // 查询弹窗所需类 + searchPage: WorkshopApi.getWorkshopPage // 查询弹窗所需分页方法 + } + } + }, + { + label: '生产线', + field: 'productionLineCode', + sort: 'custom', + table: { + width: 150 + }, + form: { + // labelMessage: '', + componentProps: { + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择生产线', // 输入框占位文本 + searchField: 'code', // 查询弹窗赋值字段 + searchTitle: '生产线信息', // 查询弹窗标题 + searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类 + searchPage: ProductionlineApi.getProductionlinePage // 查询弹窗所需分页方法 + } + } + }, + { + label: '工位', + field: 'workStationCode', + sort: 'custom', + table: { + width: 150 + }, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择工位', // 输入框占位文本 + searchField: 'code', // 查询弹窗赋值字段 + searchTitle: '工位信息', // 查询弹窗标题 + searchAllSchemas: Workstation.allSchemas, // 查询弹窗所需类 + searchPage: WorkStationApi.getWorkstationPage, // 查询弹窗所需分页方法 + searchCondition: [{ + key:'productionLineCode', + value:'productionLineCode', + message: '请填写生产线代码！', + isMainValue: true + },{ + key:'workshopCode', + value:'workshopCode', + message: '请填写车间代码！', + isMainValue: true + },{ + key:'available', + value:'TRUE', + isMainValue: false + }] + } + }, + tableForm:{ + isInpuFocusShow: true, + searchListPlaceholder: '请选择工位', // 输入框占位文本 + searchField: 'code', // 查询弹窗赋值字段 + searchTitle: '工位信息', // 查询弹窗标题 + searchAllSchemas: Workstation.allSchemas, // 查询弹窗所需类 + searchPage: WorkStationApi.getWorkstationPage, // 查询弹窗所需分页方法 + searchCondition: [{ + key:'productionLineCode', + value:'productionLineCode', + message: '请填写生产线代码！', + isMainValue: true + },{ + key:'workshopCode', + value:'workshopCode', + message: '请填写车间代码！', + isMainValue: true + },{ + key:'available', + value:'TRUE', + isMainValue: false + }] + }, + }, { label: '是否确认接收', field: 'isRecive', @@ -123,7 +265,6 @@ export const Callmaterials = useCrudSchemas(reactive([ dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', isTable: true, - sort: 'custom', table: { width: 150 }, diff --git a/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue b/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue index ea36ed856..93a27d450 100644 --- a/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue +++ b/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue @@ -82,7 +82,12 @@ const tableColumns = ref(Callmaterials.allSchemas.tableColumns) const searchTableSuccess = (formField, searchField, val, formRef) => { nextTick(() => { const setV = {} - setV[formField] = val[0][searchField] + if (formField == 'itemCode') { + setV['itemCode'] = val[0]['code'] + setV['uom'] = val[0]['uom'] + } else { + setV[formField] = val[0][searchField] + } formRef.setValues(setV) }) } diff --git a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts index eaed0a207..d0c63ed67 100644 --- a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts +++ b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts @@ -142,7 +142,7 @@ export const IssueRequestMain = useCrudSchemas(reactive([ { label: '从库区类型范围', field: 'fromAreaTypes', - dictType: DICT_TYPE.LOCATION_TYPE, + dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', isSearch: true, isTable: true, @@ -155,7 +155,7 @@ export const IssueRequestMain = useCrudSchemas(reactive([ { label: '到库区类型范围', field: 'toAreaTypes', - dictType: DICT_TYPE.LOCATION_TYPE, + dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', isTable: true, sort: 'custom', From 8478371eb9e5832ba51d1b450280b07d399e54a5 Mon Sep 17 00:00:00 2001 From: bjang03 Date: Fri, 15 Mar 2024 11:47:55 +0800 Subject: [PATCH 2/3] =?UTF-8?q?1=E3=80=81=E5=B7=A5=E4=BD=8D=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=A2=9E=E5=8A=A0=E7=8F=AD=E7=BB=84=E3=80=81=E4=BA=A7?= =?UTF-8?q?=E7=BA=BF=E6=90=9C=E7=B4=A2=E5=8F=8A=E7=BB=91=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/mes/workstation/index.ts | 2 +- src/views/mes/workstation/index.vue | 9 ++++----- src/views/mes/workstation/workstation.data.ts | 5 +++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/api/mes/workstation/index.ts b/src/api/mes/workstation/index.ts index f12b0a5c4..1e8e44a8f 100644 --- a/src/api/mes/workstation/index.ts +++ b/src/api/mes/workstation/index.ts @@ -46,4 +46,4 @@ export const exportWorkstation = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/mes/workstation/get-import-template' }) -} +} \ No newline at end of file diff --git a/src/views/mes/workstation/index.vue b/src/views/mes/workstation/index.vue index c72da2656..35f6f2dd1 100644 --- a/src/views/mes/workstation/index.vue +++ b/src/views/mes/workstation/index.vue @@ -65,7 +65,6 @@ 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 {mainBindBtn} from "@/utils/disposition/defaultButtons"; defineOptions({ name: 'Workstation' }) @@ -136,7 +135,7 @@ const buttonBaseClick = (val, item) => { const butttondata = [ defaultButtons.mainListEditBtn({hasPermi:'wms:workstation:update'}), // 编辑 defaultButtons.mainListDeleteBtn({hasPermi:'wms:workstation:delete'}), // 删除 - defaultButtons.mainListBindBtn({hasPermi:'wms:workstation:update'}), // 删除 + defaultButtons.mainListBindBtn({hasPermi:'wms:workstation:update'}), // 绑定 ] // 列表-操作按钮事件 @@ -144,9 +143,9 @@ const buttonTableClick = async (val, row) => { if (val == 'edit') { // 编辑 openForm('update', row) } else if (val == 'delete') { // 删除 - handleDelete(row.id) - }else if (val == 'bind') { // 绑定 - detailRef.value.openDetail(row, row.name, "绑定", 'mesWorkstation') + await handleDelete(row.id) + }else if (val == 'bind') { // 删除 + await detailRef.value.openDetail(row, '绑定', row.name, 'mesWorkstation') } } diff --git a/src/views/mes/workstation/workstation.data.ts b/src/views/mes/workstation/workstation.data.ts index b74f05a6d..611194817 100644 --- a/src/views/mes/workstation/workstation.data.ts +++ b/src/views/mes/workstation/workstation.data.ts @@ -1,12 +1,13 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' import { dateFormatter } from '@/utils/formatTime' + // 表单校验 export const WorkstationRules = reactive({ - code: [required], - name: [required] + code: [required] }) export const Workstation = useCrudSchemas(reactive([ + { label: '代码', field: 'code', From a4ee25f768f017b4f38b0d033fcb981fca4c771a Mon Sep 17 00:00:00 2001 From: chenfang Date: Fri, 15 Mar 2024 14:06:03 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=A4=87=E8=B4=A7=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E5=89=8D=E6=AE=B5=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../stockupMainJob/stockupMainJob.data.ts | 6 ---- .../stockupMainRecord.data.ts | 9 ------ .../stockup/stockupMainRequest/index.vue | 7 ++-- .../stockupMainRequest.data.ts | 32 ------------------- 4 files changed, 3 insertions(+), 51 deletions(-) diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainJob/stockupMainJob.data.ts b/src/views/wms/deliversettlementManage/stockup/stockupMainJob/stockupMainJob.data.ts index 30db7688f..2ef94ee4b 100644 --- a/src/views/wms/deliversettlementManage/stockup/stockupMainJob/stockupMainJob.data.ts +++ b/src/views/wms/deliversettlementManage/stockup/stockupMainJob/stockupMainJob.data.ts @@ -19,12 +19,6 @@ export const StockupMainJob = useCrudSchemas(reactive([ sort: 'custom', isForm: false, }, - { - label: '发货计划单号', - field: 'deliverPlanNumber', - sort: 'custom', - isForm: false, - }, { label: '从仓库代码', field: 'fromWarehouseCode', diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts b/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts index feaa984b8..81b6e81b3 100644 --- a/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts +++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts @@ -34,15 +34,6 @@ export const StockupMainRecord = useCrudSchemas(reactive([ width: 180 }, }, - { - label: '发货计划单号', - field: 'deliverPlanNumber', - sort: 'custom', - isSearch: true, - table: { - width: 180 - }, - }, { label: '从仓库代码', field: 'fromWarehouseCode', diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue index 7a77e7e45..2947840a4 100644 --- a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue +++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue @@ -89,7 +89,7 @@ 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 * as DeliverPlanDetailApi from '@/api/wms/deliverPlanDetail' // 备货申请 defineOptions({ name: 'StockupMainRequest' }) @@ -124,9 +124,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => row['inventoryStatus'] = val[0]['inventoryStatus'] row['itemCode'] = val[0]['itemCode'] row['uom'] = val[0]['uom'] - } else if(formField == 'toLocationCode'){ - console.log(row,111); - + } + if(formField == 'toLocationCode'){ row['toLocationCode'] = val[0]['code'] }else{ row[formField] = val[0][searchField] diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts index beb6c11e2..efa656f42 100644 --- a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts +++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts @@ -4,9 +4,6 @@ import { TableColumn } from '@/types/table' import { dateFormatter } from '@/utils/formatTime' import * as getRequestsettingApi from '@/api/wms/requestsetting/index' -import * as DeliverPlanMainApi from '@/api/wms/deliverPlanMain' -import { DeliverPlanMain } from '../../deliverplan/deliverPlanMain/deliverPlanMain.data' - import * as BalanceApi from '@/api/wms/balance' import { Balance } from '@/views/wms/inventoryManage/balance/balance.data' @@ -51,35 +48,6 @@ export const StockupMainRequest = useCrudSchemas(reactive([ }, isForm: false, }, - { - label: '发货计划单号', - field: 'deliverPlanNumber', - sort: 'custom', - table: { - width: 140 - }, - form: { - // labelMessage: '信息提示说明！！！', - componentProps: { - isSearchList: true, // 开启查询弹窗 - searchListPlaceholder: '请选择发货计划单号', // 输入框占位文本 - searchField: 'number', // 查询弹窗赋值字段 - searchTitle: '发货计划信息', // 查询弹窗标题 - searchAllSchemas: DeliverPlanMain.allSchemas, // 查询弹窗所需类 - searchPage: DeliverPlanMainApi.getDeliverPlanMainPage, // 查询弹窗所需分页方法 - searchCondition: [{ - key: 'available', - value: 'TRUE', - isMainValue: false - }, - { - key: 'status', - value: '6', - isMainValue: false - }] - } - } - }, { label: '从仓库代码', field: 'fromWarehouseCode',