From b792164fdbaeb68eaf09403de1b68494cbae78cd Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Mon, 13 May 2024 14:25:01 +0800 Subject: [PATCH 01/39] =?UTF-8?q?=E9=87=87=E8=B4=AD=E4=BB=B7=E6=A0=BC?= =?UTF-8?q?=E5=AE=A1=E6=89=B9=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/locales/zh-CN.ts | 2 +- .../supplierinvoiceRequestMain/index.vue | 1 + .../supplierinvoiceRequestMain.data.ts | 50 +++++++++++++------ 3 files changed, 37 insertions(+), 16 deletions(-) diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts index f97feb5a9..d9930cdca 100644 --- a/src/locales/zh-CN.ts +++ b/src/locales/zh-CN.ts @@ -1018,7 +1018,7 @@ export default { 到货检验申请生成成功:'到货检验申请生成成功', 采购收货记录主:'采购收货记录主', 采购退货记录主:'采购退货记录主', - 合同附件:'合同附件t', + 合同附件:'合同附件', 发票附件:'发票附件', 货运单附件:'货运单附件', 其他附件:'其他附件', diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue index 37ac30524..340e644e7 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue @@ -395,6 +395,7 @@ const handleImport = () => { /** 添加/修改操作 */ const formRef = ref() const openForm = async (type : string, row ?: number) => { + if(row&&row.procurementCreator) row.procurementCreator = Number(row.procurementCreator) // 校验是否可以开票 SupplierinvoiceRequestMainApi.checkInvoicingCalendar({}).then(res => { if(res.flag){ diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts index 73c75ff0d..3fbf1f305 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts @@ -28,6 +28,7 @@ const requestsettingData = data?.list[0] || {} userDept.id = userDept.id.toString() const userDeptArray:any = [userDept] + const procurementCreators = await SupplierinvoiceRequestMainApi.queryUserInfoByRoleCode({ roleCode: 'purchase',pageSize: 1000,pageNo: 1,sort: '',by: 'ASC' }) /** * @returns {Array} 采购员列表 */ @@ -514,25 +515,44 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( width: 150 }, isForm: true, + isTable: false, form: { - // labelMessage: '信息提示说明！！！', + component: 'Select', + api: () => procurementCreators.list, componentProps: { - isSearchList: true, // 开启查询弹窗 - hiddenFilterButton:true,//是否隐藏筛选按钮 - dialogWidth:'665px',//搜索出来弹窗的宽度 - searchListPlaceholder: '请选择采购员', // 输入框占位文本 - searchField: 'id', // 查询弹窗赋值字段 - searchTitle: '采购员信息', // 查询弹窗标题 - searchAllSchemas: PurchaseMemberInfo.allSchemas, // 查询弹窗所需类 - searchPage: SupplierinvoiceRequestMainApi.queryUserInfoByRoleCode, // 查询弹窗所需分页方法 - searchCondition: [{ - key: 'roleCode', // 查询列表中字段 - value: 'purchase', // 指查询具体值 - isMainValue: false // 表示查询条件不是主表的字段的值 - }] - } + optionsAlias: { + labelField: 'nickname', + valueField: 'id' + } + }, + // labelMessage: '信息提示说明！！！', + // componentProps: { + // isSearchList: true, // 开启查询弹窗 + // hiddenFilterButton:true,//是否隐藏筛选按钮 + // dialogWidth:'665px',//搜索出来弹窗的宽度 + // searchListPlaceholder: '请选择采购员', // 输入框占位文本 + // searchField: 'id', // 查询弹窗赋值字段 + // searchTitle: '采购员信息', // 查询弹窗标题 + // searchAllSchemas: PurchaseMemberInfo.allSchemas, // 查询弹窗所需类 + // searchPage: SupplierinvoiceRequestMainApi.queryUserInfoByRoleCode, // 查询弹窗所需分页方法 + // searchCondition: [{ + // key: 'roleCode', // 查询列表中字段 + // value: 'purchase', // 指查询具体值 + // isMainValue: false // 表示查询条件不是主表的字段的值 + // }] + // } } }, + { + label: '采购价格审批人', + field: 'procurementCreatorName', + sortTableDefault:1003, + table: { + width: 150 + }, + isTable:true, + isForm: false, + }, { label: '采购审批时间', field: 'procurementCreateTime', From 47b23566d583cff7ca156187af6fe7ff63ee7e03 Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Mon, 13 May 2024 14:25:28 +0800 Subject: [PATCH 02/39] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/supplier/index.ts | 23 +++++++++++++++++++ .../supplierManage/supplier/index.vue | 11 ++++++--- 2 files changed, 31 insertions(+), 3 deletions(-) diff --git a/src/api/wms/supplier/index.ts b/src/api/wms/supplier/index.ts index 805a4163c..961d949a0 100644 --- a/src/api/wms/supplier/index.ts +++ b/src/api/wms/supplier/index.ts @@ -31,6 +31,18 @@ export const getSupplierPage = async (params) => { return await request.get({ url: `/wms/supplier/page`, params }) } } + +// 查询供应商列表分页 +export const getSupplierPageSCP = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return request.post({ url: '/wms/supplier/seniorSCP', data }) + } else { + return await request.get({ url: `/wms/supplier/pageSCP`, params }) + } +} + // 查询供应商列表 export const getSupplierList = async (params) => { return await request.get({ url: `/wms/supplier/list`, params }) @@ -66,6 +78,17 @@ export const exportSupplier = async (params) => { } } + +// 导出供应商 Excel +export const exportSupplierSCP = async (params) => { + if (params.isSearch) { + const data = {...params} + return await request.downloadPost({ url: `/wms/supplier/export-excel-senior-SCP`, data }) + } else { + return await request.download({ url: `/wms/supplier/export-excel-SCP`, params }) + } +} + // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/supplier/get-import-template' }) diff --git a/src/views/wms/basicDataManage/supplierManage/supplier/index.vue b/src/views/wms/basicDataManage/supplierManage/supplier/index.vue index 896737aac..e2a6b142f 100644 --- a/src/views/wms/basicDataManage/supplierManage/supplier/index.vue +++ b/src/views/wms/basicDataManage/supplierManage/supplier/index.vue @@ -82,7 +82,7 @@ const updataTableColumns = (val) => { } const { tableObject, tableMethods } = useTable({ - getListApi: SupplierApi.getSupplierPage // 分页接口 + getListApi: routeName.value.includes('SCP')?SupplierApi.getSupplierPageSCP:SupplierApi.getSupplierPage // 分页接口 }) // 获得表格的各种操作 @@ -220,8 +220,13 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true - const data = await SupplierApi.exportSupplier(tableObject.params) - download.excel(data, `${t('ts.供应商')}.xlsx`) + if(routeName.value.includes('SCP')){ + const data = await SupplierApi.exportSupplier(tableObject.params) + download.excel(data, `${t('ts.供应商')}.xlsx`) + }else{ + const data = await SupplierApi.exportSupplierSCP(tableObject.params) + download.excel(data, `${t('ts.供应商')}.xlsx`) + } } catch { } finally { exportLoading.value = false From 213a2bb62cafd153d5098ae0aeaee3e06097b08e Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Mon, 13 May 2024 15:02:14 +0800 Subject: [PATCH 03/39] =?UTF-8?q?=E5=8F=91=E7=A5=A8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/basicDataManage/supplierManage/supplier/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/wms/basicDataManage/supplierManage/supplier/index.vue b/src/views/wms/basicDataManage/supplierManage/supplier/index.vue index e2a6b142f..b79d5b41a 100644 --- a/src/views/wms/basicDataManage/supplierManage/supplier/index.vue +++ b/src/views/wms/basicDataManage/supplierManage/supplier/index.vue @@ -221,10 +221,10 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true if(routeName.value.includes('SCP')){ - const data = await SupplierApi.exportSupplier(tableObject.params) + const data = await SupplierApi.exportSupplierSCP(tableObject.params) download.excel(data, `${t('ts.供应商')}.xlsx`) }else{ - const data = await SupplierApi.exportSupplierSCP(tableObject.params) + const data = await SupplierApi.exportSupplier(tableObject.params) download.excel(data, `${t('ts.供应商')}.xlsx`) } } catch { From 556c8034fa5a8e7a9564314da97aca862af82168 Mon Sep 17 00:00:00 2001 From: chenfang Date: Mon, 13 May 2024 15:19:00 +0800 Subject: [PATCH 04/39] =?UTF-8?q?=E5=99=A8=E5=85=B7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.wyf | 4 +- src/api/wms/balance/index.ts | 11 + src/api/wms/containerDetailRequest/index.ts | 58 +++ src/api/wms/containerMainRequest/index.ts | 82 ++++ src/api/wms/containerRecordMain/index.ts | 56 +++ src/api/wms/itembasic/index.ts | 10 + src/utils/dict.ts | 1 + .../itemManage/packageunit/index.vue | 25 + .../containerMainRequest.data.ts | 418 ++++++++++++++++ .../containerMainRequest/index.vue | 424 +++++++++++++++++ .../containerRecordMain.data.ts | 111 +++++ .../containerRecordMain/index.vue | 244 ++++++++++ .../initialContainerMainRequest/index.vue | 385 +++++++++++++++ .../initialContainerMainRequest.data.ts | 446 ++++++++++++++++++ 14 files changed, 2273 insertions(+), 2 deletions(-) create mode 100644 src/api/wms/containerDetailRequest/index.ts create mode 100644 src/api/wms/containerMainRequest/index.ts create mode 100644 src/api/wms/containerRecordMain/index.ts create mode 100644 src/views/wms/inventoryjobManage/containermanage/containerMainRequest/containerMainRequest.data.ts create mode 100644 src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue create mode 100644 src/views/wms/inventoryjobManage/containermanage/containerRecordMain/containerRecordMain.data.ts create mode 100644 src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue create mode 100644 src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue create mode 100644 src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/initialContainerMainRequest.data.ts diff --git a/.env.wyf b/.env.wyf index ee1d6eb3a..4c5de71c6 100644 --- a/.env.wyf +++ b/.env.wyf @@ -4,9 +4,9 @@ NODE_ENV=test VITE_DEV=false # 请求路径 -VITE_BASE_URL='http://192.168.0.108:12080' +VITE_BASE_URL='http://192.168.0.113:12080' # 上传路径 -VITE_UPLOAD_URL='http://192.168.0.108:12080/admin-api/infra/file/upload' +VITE_UPLOAD_URL='http://192.168.0.113:12080/admin-api/infra/file/upload' # # 请求路径 # VITE_BASE_URL='http://dev.ccwin-in.com:25300/api' diff --git a/src/api/wms/balance/index.ts b/src/api/wms/balance/index.ts index 4b21cda4d..15189a33d 100644 --- a/src/api/wms/balance/index.ts +++ b/src/api/wms/balance/index.ts @@ -150,3 +150,14 @@ export const selectLocationTypeToBalance = async (params) => { return request.get({ url: '/wms/balance/pageLocationCodeToBalance', params}) } } + +// 获得配置筛选出的库存余额分页 +export const selectConfigToBalance = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/balance/pageConfigToBalanceSenior', data }) + } else { + return request.get({ url: '/wms/balance/pageConfigToBalance', params}) + } +} diff --git a/src/api/wms/containerDetailRequest/index.ts b/src/api/wms/containerDetailRequest/index.ts new file mode 100644 index 000000000..a88d054ca --- /dev/null +++ b/src/api/wms/containerDetailRequest/index.ts @@ -0,0 +1,58 @@ +import request from '@/config/axios' + +export interface ContainerDetailRequestVO { + id: number + masterId: number + number: string + containerNumber: string + fromLocationCode: string + toLocationCode: string + qty: number + uom: string + remark: string + siteId: string + concurrencyStamp: number + fromOwnerCode: string + toOwnerCode: string +} + +// 查询器具管理申请子列表 +export const getContainerDetailRequestPage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/container-detail-request/senior', data }) + } else { + return await request.get({ url: `/wms/container-detail-request/page`, params }) + } +} + +// 查询器具管理申请子详情 +export const getContainerDetailRequest = async (id: number) => { + return await request.get({ url: `/wms/container-detail-request/get?id=` + id }) +} + +// 新增器具管理申请子 +export const createContainerDetailRequest = async (data: ContainerDetailRequestVO) => { + return await request.post({ url: `/wms/container-detail-request/create`, data }) +} + +// 修改器具管理申请子 +export const c = async (data: ContainerDetailRequestVO) => { + return await request.put({ url: `/wms/container-detail-request/update`, data }) +} + +// 删除器具管理申请子 +export const deleteContainerDetailRequest = async (id: number) => { + return await request.delete({ url: `/wms/container-detail-request/delete?id=` + id }) +} + +// 导出器具管理申请子 Excel +export const exportContainerDetailRequest = async (params) => { + return await request.download({ url: `/wms/container-detail-request/export-excel`, params }) +} + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/wms/container-detail-request/get-import-template' }) +} \ No newline at end of file diff --git a/src/api/wms/containerMainRequest/index.ts b/src/api/wms/containerMainRequest/index.ts new file mode 100644 index 000000000..35e7a9f8d --- /dev/null +++ b/src/api/wms/containerMainRequest/index.ts @@ -0,0 +1,82 @@ +import request from '@/config/axios' + +export interface ContainerMainRequestVO { + id: number + type: string + available: string + remark: string + extraProperties: string + concurrencyStamp: number + siteId: string +} + +// 查询器具管理申请主列表 +export const getContainerMainRequestPage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/container-main-request/senior', data }) + } else { + return await request.get({ url: `/wms/container-main-request/page`, params }) + } +} + +// 查询器具管理申请主详情 +export const getContainerMainRequest = async (id: number) => { + return await request.get({ url: `/wms/container-main-request/get?id=` + id }) +} + +// 新增器具管理申请主 +export const createContainerMainRequest = async (data: ContainerMainRequestVO) => { + return await request.post({ url: `/wms/container-main-request/create`, data }) +} + +// 修改器具管理申请主 +export const updateContainerMainRequest = async (data: ContainerMainRequestVO) => { + return await request.put({ url: `/wms/container-main-request/update`, data }) +} + +// 删除器具管理申请主 +export const deleteContainerMainRequest = async (id: number) => { + return await request.delete({ url: `/wms/container-main-request/delete?id=` + id }) +} + +// 导出器具管理申请主 Excel +export const exportContainerMainRequest = async (params) => { + return await request.download({ url: `/wms/container-main-request/export-excel`, params }) +} + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/wms/container-main-request/get-import-template' }) +} + +// 关闭 +export const close = (id) => { + return request.put({ url: '/wms/container-main-request/close?id=' + id }) +} + +// 重新添加 +export const reAdd = (id) => { + return request.put({ url: '/wms/container-main-request/reAdd?id=' + id }) +} + +// 提交审批 +export const submit = (id) => { + return request.put({ url: '/wms/container-main-request/submit?id=' + id }) +} + +// 驳回 +export const refused = (id) => { + return request.put({ url: '/wms/container-main-request/refused?id=' + id }) +} + +// 审批通过 +export const agree = (id) => { + return request.put({ url: '/wms/container-main-request/agree?id=' + id }) +} + +// 处理 +export const handle = (id) => { + return request.put({ url: '/wms/container-main-request/handle?id=' + id }) +} \ No newline at end of file diff --git a/src/api/wms/containerRecordMain/index.ts b/src/api/wms/containerRecordMain/index.ts new file mode 100644 index 000000000..ea84c1260 --- /dev/null +++ b/src/api/wms/containerRecordMain/index.ts @@ -0,0 +1,56 @@ +import request from '@/config/axios' + +export interface ContainerRecordMainVO { + id: number + type: string + number: string + requestNumber: string + status: string + available: string + remark: string + extraProperties: string + concurrencyStamp: number + siteId: string + departmentCode: string +} + +// 查询器具管理记录主列表 +export const getContainerRecordMainPage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/container-record-main/senior', data }) + } else { + return await request.get({ url: `/wms/container-record-main/page`, params }) + } +} + +// 查询器具管理记录主详情 +export const getContainerRecordMain = async (id: number) => { + return await request.get({ url: `/wms/container-record-main/get?id=` + id }) +} + +// 新增器具管理记录主 +export const createContainerRecordMain = async (data: ContainerRecordMainVO) => { + return await request.post({ url: `/wms/container-record-main/create`, data }) +} + +// 修改器具管理记录主 +export const updateContainerRecordMain = async (data: ContainerRecordMainVO) => { + return await request.put({ url: `/wms/container-record-main/update`, data }) +} + +// 删除器具管理记录主 +export const deleteContainerRecordMain = async (id: number) => { + return await request.delete({ url: `/wms/container-record-main/delete?id=` + id }) +} + +// 导出器具管理记录主 Excel +export const exportContainerRecordMain = async (params) => { + return await request.download({ url: `/wms/container-record-main/export-excel`, params }) +} + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/wms/container-record-main/get-import-template' }) +} \ No newline at end of file diff --git a/src/api/wms/itembasic/index.ts b/src/api/wms/itembasic/index.ts index 20f58f85c..a92781ac3 100644 --- a/src/api/wms/itembasic/index.ts +++ b/src/api/wms/itembasic/index.ts @@ -98,4 +98,14 @@ export const selectTypeToItembasic = async (params) => { } else { return await request.get({ url: `/wms/itembasic/pageTypeToItembasic`, params }) } +} + +// 查询物料类型为器具的信息列表 +export const selectConfigToItembasic = async (params) => { + if (params.isSearch) { + const data = {...params} + return request.post({ url: '/wms/itembasic/pageConfigToItembasicSenior', data }) + } else { + return await request.get({ url: `/wms/itembasic/pageConfigToItembasic`, params }) + } } \ No newline at end of file diff --git a/src/utils/dict.ts b/src/utils/dict.ts index 90dddeceb..170df34ab 100644 --- a/src/utils/dict.ts +++ b/src/utils/dict.ts @@ -281,6 +281,7 @@ export enum DICT_TYPE { PLAN_PRODUCTION_TYPE = "plan_production_type", // 生产计划类型 DELIVER_TYPE="deliver_type",//发货类型 BILL_TYPE="bill_type", // 发票类型 + CONTAIN_MANAGE_TYPE="contain_menage_type",//器具管理类型 // ========== 业务 - mes ========== MESDO_STATUS= 'mes_do_status', // 工单执行状态 diff --git a/src/views/wms/basicDataManage/itemManage/packageunit/index.vue b/src/views/wms/basicDataManage/itemManage/packageunit/index.vue index 1177ae564..075c78dbd 100644 --- a/src/views/wms/basicDataManage/itemManage/packageunit/index.vue +++ b/src/views/wms/basicDataManage/itemManage/packageunit/index.vue @@ -149,6 +149,31 @@ const buttonTableClick = async (val, row) => { /** 添加/修改操作 */ const basicFormRef = ref() const openForm = (type: string, row?: any) => { + if(type == "update"){ + Packageunit.allSchemas.formSchema.forEach((item) => { + if (item.field == 'code') { + item.componentProps.disabled = true + } + if (item.field == 'name') { + item.componentProps.disabled = true + } + if (item.field == 'manageBalance') { + item.componentProps.disabled = true + } + }) + }else { + Packageunit.allSchemas.formSchema.forEach((item) => { + if (item.field == 'code') { + item.componentProps.disabled = false + } + if (item.field == 'name') { + item.componentProps.disabled = false + } + if (item.field == 'manageBalance') { + item.componentProps.disabled = false + } + }) + } basicFormRef.value.open(type, row) } diff --git a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/containerMainRequest.data.ts b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/containerMainRequest.data.ts new file mode 100644 index 000000000..b15436d33 --- /dev/null +++ b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/containerMainRequest.data.ts @@ -0,0 +1,418 @@ +import type { CrudSchema } from '@/hooks/web/useCrudSchemas' +import { TableColumn } from '@/types/table' +import { dateFormatter } from '@/utils/formatTime' + +import * as BalanceApi from '@/api/wms/balance' +import { Balance } from '@/views/wms/inventoryManage/balance/balance.data' + +import * as LocationApi from '@/api/wms/location' +import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data' + +import * as getRequestsettingApi from '@/api/wms/requestsetting/index' + +// 表单校验 +export const ContainerMainRequestRules = reactive({ + type:[ + { required: true, message: '请选择类型', trigger: 'change' }, + ], + concurrencyStamp: [required], +}) + +// 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值 +const queryParams = { + pageSize:10, + pageNo:1, + code:'ContainerRequest' +} + const data = await getRequestsettingApi.getRequestsettingPage(queryParams) + const requestsettingData =data?.list[0]||{} + + // 获取当前操作人的部门 +import { useUserStore } from '@/store/modules/user' +const userStore = useUserStore() +const userDept = userStore.userSelfInfo.dept + // id 转str 否则form回显匹配不到 + userDept.id = userDept.id.toString() +const userDeptArray:any = [userDept] + +export const ContainerMainRequest = useCrudSchemas(reactive([ + { + label: '单据号', + field: 'number', + sort: 'custom', + isSearch: true, + isForm: false, + table: { + width: 100 + }, + },{ + label: '类型', + field: 'type', + sort: 'custom', + dictType: DICT_TYPE.CONTAIN_MANAGE_TYPE, + dictClass: 'string', + isSearch: true, + isTable: true, + table: { + width: 120 + } + }, + { + label: '是否可用', + field: 'available', + sort: 'custom', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isForm: false, + table: { + width: 150 + }, + }, + { + label: '备注', + field: 'remark', + sort: 'custom', + isSearch: true, + }, + { + label: '部门', + field: 'departmentCode', + sort: 'custom', + isForm: false, + table: { + width: 150 + }, + isTable:false, + formatter: (_: Recordable, __: TableColumn, cellValue: number) => { + return userDeptArray.find((account) => account.id == cellValue)?.name + }, + form: { + value: userDept.id, + component: 'Select', + api: () => userDeptArray, + componentProps: { + disabled: true, + optionsAlias: { + labelField: 'name', + valueField: 'id' + } + } + } + }, + { + label: '自动提交', + field: 'autoCommit', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isTable: false, + isForm: false, + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'Switch', + value: requestsettingData.autoCommit, + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE', + disabled: true + } + } + }, + { + label: '自动通过', + field: 'autoAgree', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isTable: false, + isForm: false, + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'Switch', + value: requestsettingData.autoAgree, + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE', + disabled: true + } + } + }, + { + label: '自动执行', + field: 'autoExecute', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isTable: false, + isForm: false, + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'Switch', + value: requestsettingData.autoExecute, + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE', + disabled: true + } + } + }, + { + label: '直接生成记录', + field: 'directCreateRecord', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isForm: false, + isTable: false, + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'Switch', + value: requestsettingData.directCreateRecord, + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE', + disabled: true + } + } + }, + { + label: '创建时间', + field: 'createTime', + sort: 'custom', + formatter: dateFormatter, + search: { + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'daterange', + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + } + }, + table: { + width: 200 + }, + isForm: false, + }, + { + label: '扩展属性', + field: 'extraProperties', + sort: 'custom', + isForm: false, + isTable: false + }, + { + label: '并发乐观锁', + field: 'concurrencyStamp', + sort: 'custom', + form: { + component: 'InputNumber', + value: 0 + }, + isForm: false, + isTable: false + }, + { + label: '地点ID', + field: 'siteId', + sort: 'custom', + isForm: false, + table: { + width: 100 + }, + }, + { + label: '操作', + field: 'action', + isForm: false, + table: { + width: 150, + fixed: 'right' + } + } +])) + +// 表单校验 +export const ContainerDetailRequestRules = reactive({ + fromLocationCode: [required], + toLocationCode: [required], + concurrencyStamp: [required], +}) + +export const ContainerDetailRequest = useCrudSchemas(reactive([ + { + label: 'id', + field: 'id', + sort: 'custom', + isForm: false, + isTableForm: false, + isTable: false + }, + { + label: '主表ID', + field: 'masterId', + sort: 'custom', + isSearch: true, + form: { + component: 'InputNumber', + value: 0 + }, + isForm: false, + isTableForm: false, + isTable: false + }, + { + label: '单据号', + field: 'number', + sort: 'custom', + isSearch: true, + isForm: false, + isTableForm: false, + isTable: false + }, + { + label: '器具号', + field: 'containerNumber', + sort: 'custom', + tableForm:{ + isInpuFocusShow: true, // 开启查询弹窗 + searchListPlaceholder: '请选择器具号', + searchField: 'itemCode', + searchTitle: '库存余额信息', + searchAllSchemas: Balance.allSchemas, + searchPage: BalanceApi.selectConfigToBalance, + }, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择器具号', + searchField: 'itemCode', + searchTitle: '库存余额信息', + searchAllSchemas: Balance.allSchemas, + searchPage: BalanceApi.selectConfigToBalance, + } + } + }, + { + label: '来源库位代码', + field: 'fromLocationCode', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '目标库位代码', + field: 'toLocationCode', + sort: 'custom', + table: { + width: 150 + }, + tableForm:{ + isInpuFocusShow: true, // 开启查询弹窗 + searchListPlaceholder: '请选择到库位代码', + searchField: 'code', + searchTitle: '库位信息', + searchAllSchemas: Location.allSchemas, + searchPage: LocationApi.selectBusinessTypeToLocation, + }, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择到库位代码', + searchField: 'code', + searchTitle: '库位信息', + searchAllSchemas: Location.allSchemas, + searchPage: LocationApi.selectBusinessTypeToLocation, + } + } + }, + { + label: '数量', + field: 'qty', + sort: 'custom', + }, + { + label: '计量单位', + field: 'uom', + sort: 'custom', + table: { + width: 120 + }, + }, + { + label: '备注', + field: 'remark', + sort: 'custom', + }, + { + label: '创建时间', + field: 'createTime', + sort: 'custom', + formatter: dateFormatter, + search: { + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'daterange', + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + } + }, + table: { + width: 200 + }, + isForm: false, + isTableForm: false + }, + { + label: '地点ID', + field: 'siteId', + sort: 'custom', + isForm: false, + isTableForm: false, + isTable: false + }, + { + label: '并发乐观锁', + field: 'concurrencyStamp', + sort: 'custom', + isForm: false, + isTableForm: false, + isTable: false + }, + { + label: '从货主代码', + field: 'fromOwnerCode', + sort: 'custom', + isForm: false, + isTableForm: false, + isTable: false + }, + { + label: '到货主代码', + field: 'toOwnerCode', + sort: 'custom', + isForm: false, + isTableForm: false, + isTable: false + }, + { + label: '操作', + field: 'action', + isForm: false, + table: { + width: 150, + fixed: 'right' + } + } +])) + diff --git a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue new file mode 100644 index 000000000..38ebcd11c --- /dev/null +++ b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue @@ -0,0 +1,424 @@ + + + diff --git a/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/containerRecordMain.data.ts b/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/containerRecordMain.data.ts new file mode 100644 index 000000000..6c7faacb0 --- /dev/null +++ b/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/containerRecordMain.data.ts @@ -0,0 +1,111 @@ +import type { CrudSchema } from '@/hooks/web/useCrudSchemas' +import { dateFormatter } from '@/utils/formatTime' + +// 表单校验 +export const ContainerRecordMainRules = reactive({ + available: [required], + concurrencyStamp: [required], +}) + +export const ContainerRecordMain = useCrudSchemas(reactive([ + { + label: 'id', + field: 'id', + sort: 'custom', + isForm: false, + }, + { + label: '类型', + field: 'type', + sort: 'custom', + dictType: DICT_TYPE.CONTAIN_MANAGE_TYPE, + dictClass: 'string', + isSearch: true, + }, + { + label: '单据号', + field: 'number', + sort: 'custom', + isSearch: true, + }, + { + label: '申请单号', + field: 'requestNumber', + sort: 'custom', + isSearch: true, + }, + { + label: '状态', + field: 'status', + sort: 'custom', + isSearch: true, + form: { + component: 'Radio' + }, + }, + { + label: '是否可用', + field: 'available', + sort: 'custom', + isSearch: true, + }, + { + label: '备注', + field: 'remark', + sort: 'custom', + isSearch: true, + }, + { + label: '扩展属性', + field: 'extraProperties', + sort: 'custom', + isSearch: true, + }, + { + label: '并发乐观锁', + field: 'concurrencyStamp', + sort: 'custom', + isSearch: true, + form: { + component: 'InputNumber', + value: 0 + }, + }, + { + label: '地点ID', + field: 'siteId', + sort: 'custom', + isSearch: true, + }, + { + label: '创建时间', + field: 'createTime', + sort: 'custom', + formatter: dateFormatter, + isSearch: true, + search: { + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'daterange', + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + } + }, + isForm: false, + }, + { + label: '部门', + field: 'departmentCode', + sort: 'custom', + isSearch: true, + }, + { + label: '操作', + field: 'action', + isForm: false, + table: { + width: 150, + fixed: 'right' + } + } +])) diff --git a/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue b/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue new file mode 100644 index 000000000..c8321bf5d --- /dev/null +++ b/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue @@ -0,0 +1,244 @@ + + + diff --git a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue new file mode 100644 index 000000000..dadb6ac5c --- /dev/null +++ b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue @@ -0,0 +1,385 @@ + + + +./initialContainerMainRequest.data \ No newline at end of file diff --git a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/initialContainerMainRequest.data.ts b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/initialContainerMainRequest.data.ts new file mode 100644 index 000000000..0f4e928c3 --- /dev/null +++ b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/initialContainerMainRequest.data.ts @@ -0,0 +1,446 @@ +import type { CrudSchema } from '@/hooks/web/useCrudSchemas' +import { TableColumn } from '@/types/table' +import { dateFormatter } from '@/utils/formatTime' + +import * as BalanceApi from '@/api/wms/balance' +import { Balance } from '@/views/wms/inventoryManage/balance/balance.data' + +import * as LocationApi from '@/api/wms/location' +import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data' + +import * as ItembasicApi from '@/api/wms/itembasic' +import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data' + +import * as getRequestsettingApi from '@/api/wms/requestsetting/index' + +// 表单校验 +export const ContainerMainRequestRules = reactive({ + type:[ + { required: true, message: '请选择类型', trigger: 'change' }, + ], + concurrencyStamp: [required], +}) + +// 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值 +const queryParams = { + pageSize:10, + pageNo:1, + code:'ContainerRequest' +} + const data = await getRequestsettingApi.getRequestsettingPage(queryParams) + const requestsettingData =data?.list[0]||{} + + // 获取当前操作人的部门 +import { useUserStore } from '@/store/modules/user' +import { ItemBasic } from '@/utils/disposition/formFields' +const userStore = useUserStore() +const userDept = userStore.userSelfInfo.dept + // id 转str 否则form回显匹配不到 + userDept.id = userDept.id.toString() +const userDeptArray:any = [userDept] + +export const ContainerMainRequest = useCrudSchemas(reactive([ + { + label: '单据号', + field: 'number', + sort: 'custom', + isSearch: true, + isForm: false, + table: { + width: 100 + }, + }, + { + label: '状态', + field: 'status', + dictType: DICT_TYPE.REQUEST_STATUS, + dictClass: 'string', + isSearch: true, + isForm: false, + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + form: { + value: '1', + componentProps: { + disabled: true + } + } + }, + { + label: '类型', + field: 'type', + sort: 'custom', + dictType: DICT_TYPE.CONTAIN_MANAGE_TYPE, + dictClass: 'string', + isSearch: true, + isTable: true, + table: { + width: 120 + } + }, + { + label: '是否可用', + field: 'available', + sort: 'custom', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isForm: false, + table: { + width: 150 + }, + }, + { + label: '备注', + field: 'remark', + sort: 'custom', + isSearch: true, + }, + { + label: '部门', + field: 'departmentCode', + sort: 'custom', + isForm: false, + table: { + width: 150 + }, + isTable:false, + formatter: (_: Recordable, __: TableColumn, cellValue: number) => { + return userDeptArray.find((account) => account.id == cellValue)?.name + }, + form: { + value: userDept.id, + component: 'Select', + api: () => userDeptArray, + componentProps: { + disabled: true, + optionsAlias: { + labelField: 'name', + valueField: 'id' + } + } + } + }, + { + label: '自动提交', + field: 'autoCommit', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isTable: false, + isForm: false, + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'Switch', + value: requestsettingData.autoCommit, + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE', + disabled: true + } + } + }, + { + label: '自动通过', + field: 'autoAgree', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isTable: false, + isForm: false, + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'Switch', + value: requestsettingData.autoAgree, + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE', + disabled: true + } + } + }, + { + label: '自动执行', + field: 'autoExecute', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isTable: false, + isForm: false, + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'Switch', + value: requestsettingData.autoExecute, + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE', + disabled: true + } + } + }, + { + label: '直接生成记录', + field: 'directCreateRecord', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isForm: false, + isTable: false, + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'Switch', + value: requestsettingData.directCreateRecord, + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE', + disabled: true + } + } + }, + { + label: '创建时间', + field: 'createTime', + sort: 'custom', + formatter: dateFormatter, + search: { + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'daterange', + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + } + }, + table: { + width: 200 + }, + isForm: false, + }, + { + label: '扩展属性', + field: 'extraProperties', + sort: 'custom', + isForm: false, + isTable: false + }, + { + label: '并发乐观锁', + field: 'concurrencyStamp', + sort: 'custom', + form: { + component: 'InputNumber', + value: 0 + }, + isForm: false, + isTable: false + }, + { + label: '地点ID', + field: 'siteId', + sort: 'custom', + isForm: false, + table: { + width: 100 + }, + }, + { + label: '操作', + field: 'action', + isForm: false, + table: { + width: 150, + fixed: 'right' + } + } +])) + +// 表单校验 +export const ContainerDetailRequestRules = reactive({ + fromLocationCode: [required], + toLocationCode: [required], + concurrencyStamp: [required], +}) + +export const ContainerDetailRequest = useCrudSchemas(reactive([ + { + label: 'id', + field: 'id', + sort: 'custom', + isForm: false, + isTableForm: false, + isTable: false + }, + { + label: '主表ID', + field: 'masterId', + sort: 'custom', + isSearch: true, + form: { + component: 'InputNumber', + value: 0 + }, + isForm: false, + isTableForm: false, + isTable: false + }, + { + label: '单据号', + field: 'number', + sort: 'custom', + isSearch: true, + isForm: false, + isTableForm: false, + isTable: false + }, + { + label: '器具号', + field: 'containerNumber', + sort: 'custom', + tableForm:{ + isInpuFocusShow: true, // 开启查询弹窗 + searchListPlaceholder: '请选择器具号', + searchField: 'itemCode', + searchTitle: '器具信息', + searchAllSchemas: Itembasic.allSchemas, + searchPage: ItembasicApi.selectConfigToItembasic, + }, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择器具号', + searchField: 'itemCode', + searchTitle: '器具信息', + searchAllSchemas: Itembasic.allSchemas, + searchPage: ItembasicApi.selectConfigToItembasic, + } + } + }, + { + label: '目标库位代码', + field: 'toLocationCode', + sort: 'custom', + table: { + width: 150 + }, + tableForm:{ + isInpuFocusShow: true, // 开启查询弹窗 + searchListPlaceholder: '请选择到库位代码', + searchField: 'code', + searchTitle: '库位信息', + searchAllSchemas: Location.allSchemas, + searchPage: LocationApi.selectBusinessTypeToLocation, + }, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择到库位代码', + searchField: 'code', + searchTitle: '库位信息', + searchAllSchemas: Location.allSchemas, + searchPage: LocationApi.selectBusinessTypeToLocation, + } + } + }, + { + label: '到数量', + field: 'toQty', + sort: 'custom', + }, + { + label: '计量单位', + field: 'uom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + tableForm: { + type: 'Select', + disabled: true + }, + form: { + componentProps: { + disabled: true + } + } + }, + { + label: '备注', + field: 'remark', + sort: 'custom', + }, + { + label: '创建时间', + field: 'createTime', + sort: 'custom', + formatter: dateFormatter, + search: { + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'daterange', + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + } + }, + table: { + width: 200 + }, + isForm: false, + isTableForm: false + }, + { + label: '地点ID', + field: 'siteId', + sort: 'custom', + isForm: false, + isTableForm: false, + isTable: false + }, + { + label: '并发乐观锁', + field: 'concurrencyStamp', + sort: 'custom', + isForm: false, + isTableForm: false, + isTable: false + }, + { + label: '从货主代码', + field: 'fromOwnerCode', + sort: 'custom', + isForm: false, + isTableForm: false, + isTable: false + }, + { + label: '到货主代码', + field: 'toOwnerCode', + sort: 'custom', + isForm: false, + isTableForm: false, + isTable: false + }, + { + label: '操作', + field: 'action', + isForm: false, + table: { + width: 150, + fixed: 'right' + } + } +])) + From 2011f278d3d1437fd907c63f1e6b1e9b54fb24de Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Mon, 13 May 2024 15:40:28 +0800 Subject: [PATCH 05/39] =?UTF-8?q?=E6=8C=89=E9=92=AE=E4=B8=8D=E5=B1=95?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../initialContainerMainRequest/index.vue | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue index dadb6ac5c..576fe1137 100644 --- a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue +++ b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue @@ -33,8 +33,8 @@ {{ row.number }} - @@ -113,7 +113,7 @@ const { tableObject, tableMethods } = useTable({ tableObject.params = { type:'INITIAL' } - businessType.value = 'InitialContainerManageRequest' + businessType.value = 'InitialContainerManage' importFileName.value = '器具初始化申请' } @@ -195,6 +195,15 @@ const updataTableColumns = (val) => { // 获得表格的各种操作 const { getList, setSearchParams } = tableMethods +// 根据状态返回该按钮是否显示 +const isShowMainButton = (row,val) => { + if (val.indexOf(row.status) > -1) { + return false + } else { + return true + } +} + // 列表头部按钮 const HeadButttondata = [ defaultButtons.defaultAddBtn({hasPermi:'wms:container-main-request:create'}), // 新增 @@ -247,15 +256,75 @@ const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['ma ] } -// // 列表-操作按钮 -// const butttondata = [ -// defaultButtons.mainListEditBtn({hasPermi:'wms:container-main-request:update'}), // 编辑 -// defaultButtons.mainListDeleteBtn({hasPermi:'wms:container-main-request:delete'}), // 删除 -// ] - // 列表-操作按钮事件 const buttonTableClick = async (val, row) => { - if (val == 'edit') { // 编辑 + if (val == 'mainClose') { // 关闭 + await message.confirm('确认要关闭吗？') + tableObject.loading = true + ContainerMainRequestApi.close(row.masterId).then(() => { + message.success(t('common.updateSuccess')) + tableObject.loading = false + getList() + }).catch(err => { + tableObject.loading = false + console.log(err) + }) + } else if (val == 'mainReAdd') { // 重新添加 + await message.confirm('确认要重新添加吗？') + tableObject.loading = true + ContainerMainRequestApi.reAdd(row.masterId).then(() => { + message.success(t('common.updateSuccess')) + tableObject.loading = false + getList() + }).catch(err => { + tableObject.loading = false + console.log(err) + }) + } else if (val == 'mainSubmit') { // 提交审批 + await message.confirm('确认要提交审批吗？') + tableObject.loading = true + ContainerMainRequestApi.submit(row.masterId).then(() => { + message.success(t('common.updateSuccess')) + tableObject.loading = false + getList() + }).catch(err => { + tableObject.loading = false + console.log(err) + }) + } else if (val == 'mainTurnDown') { // 驳回 + await message.confirm('确认要驳回吗？') + tableObject.loading = true + ContainerMainRequestApi.refused(row.masterId).then(() => { + message.success(t('common.updateSuccess')) + tableObject.loading = false + getList() + }).catch(err => { + tableObject.loading = false + console.log(err) + }) + } else if (val == 'mainApprove') { // 审批通过 + await message.confirm('确认要审批通过吗？') + tableObject.loading = true + ContainerMainRequestApi.agree(row.masterId).then(() => { + message.success(t('common.updateSuccess')) + tableObject.loading = false + getList() + }).catch(err => { + tableObject.loading = false + console.log(err) + }) + } else if (val == 'mainHandle') { // 处理 + await message.confirm('确认要 处理吗？') + tableObject.loading = true + ContainerMainRequestApi.handle(row.masterId).then(() => { + message.success(t('common.updateSuccess')) + tableObject.loading = false + getList() + }).catch(err => { + tableObject.loading = false + console.log(err) + }) + } else if (val == 'edit') { // 编辑 openForm('update', row) } else if (val == 'delete') { // 删除 handleDelete(row.id) @@ -303,6 +372,9 @@ const submitForm = async (formType,data) => { }) try { if (formType === 'create') { + data.businessType = businessType.value + console.log(data.businessType,999); + await ContainerMainRequestApi.createContainerMainRequest(data) message.success(t('common.createSuccess')) } else { diff --git a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/initialContainerMainRequest.data.ts b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/initialContainerMainRequest.data.ts index 0f4e928c3..e1f6cfe03 100644 --- a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/initialContainerMainRequest.data.ts +++ b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/initialContainerMainRequest.data.ts @@ -257,7 +257,7 @@ export const ContainerMainRequest = useCrudSchemas(reactive([ field: 'action', isForm: false, table: { - width: 150, + width: 200, fixed: 'right' } } @@ -352,6 +352,26 @@ export const ContainerDetailRequest = useCrudSchemas(reactive([ } } }, + { + label: '到库存状态', + field: 'toInventoryStatus', + dictType: DICT_TYPE.INVENTORY_STATUS, + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + tableForm: { + disabled: true, + type: 'Select' + }, + form: { + componentProps: { + disabled: true + } + } + }, { label: '到数量', field: 'toQty', @@ -438,7 +458,7 @@ export const ContainerDetailRequest = useCrudSchemas(reactive([ field: 'action', isForm: false, table: { - width: 150, + width: 200, fixed: 'right' } } From 61fe0b949135248cf78aa8be48ed359c6f17cfd2 Mon Sep 17 00:00:00 2001 From: chenfang Date: Mon, 13 May 2024 17:05:18 +0800 Subject: [PATCH 11/39] =?UTF-8?q?=E5=99=A8=E5=85=B7=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../containermanage/containerMainRequest/index.vue | 11 ++++++++++- .../initialContainerMainRequest/index.vue | 4 ++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue index 45065f6eb..1404bc0d4 100644 --- a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue +++ b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue @@ -134,7 +134,7 @@ const { tableObject, tableMethods } = useTable({ businessType.value = 'MoveContainerManage' importFileName.value = '器具转移申请' } else if ( routeName.value == 'deliverContainerMainRequest') { - tableObject.params = {InitialContainerManage + tableObject.params = { type: 'DELIVER', } // fromLocationCode.value = null @@ -278,6 +278,15 @@ const buttonBaseClick = (val, item) => { } } +// 根据状态返回该按钮是否显示 +const isShowMainButton = (row,val) => { + if (val.indexOf(row.status) > -1) { + return false + } else { + return true + } +} + // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 diff --git a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue index 13b18bc25..43462be56 100644 --- a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue +++ b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue @@ -113,7 +113,7 @@ const { tableObject, tableMethods } = useTable({ tableObject.params = { type:'INITIAL' } - businessType.value = 'InitialContainerManage' + businessType.value = 'InitialContainerManageRequest' importFileName.value = '器具初始化申请' } @@ -374,7 +374,7 @@ const submitForm = async (formType,data) => { if (formType === 'create') { data.businessType = businessType.value console.log(data.businessType,999); - + await ContainerMainRequestApi.createContainerMainRequest(data) message.success(t('common.createSuccess')) } else { From 2150bcf379382c635610bf16f8cbe67ecd9d40fb Mon Sep 17 00:00:00 2001 From: chenfang Date: Mon, 13 May 2024 17:06:05 +0800 Subject: [PATCH 12/39] =?UTF-8?q?=E5=99=A8=E5=85=B7=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../containermanage/containerMainRequest/index.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue index 1404bc0d4..e2b234ab2 100644 --- a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue +++ b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue @@ -340,6 +340,9 @@ const handleDeleteTable = (item, index) => { tableData.value.splice(index, 1) } +//为true表示子表数据中存在数量为0的数据 +const flag = ref() + // form表单提交 const submitForm = async (formType,data) => { data.subList = tableData.value // 拼接子表数据参数 From 4d7d52670a28e2bf8eba39e63658b6851582fdf6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com> Date: Mon, 13 May 2024 20:34:51 +0800 Subject: [PATCH 13/39] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=96=B0=E5=A2=9E=E5=AF=BC=E5=85=A5=E6=93=8D?= =?UTF-8?q?=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../deliverplan/saleMain/index.vue | 4 ++-- .../deliverplan/saleMain/saleMain.data.ts | 20 +++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/views/wms/deliversettlementManage/deliverplan/saleMain/index.vue b/src/views/wms/deliversettlementManage/deliverplan/saleMain/index.vue index 721ca03ec..44cbf66a7 100644 --- a/src/views/wms/deliversettlementManage/deliverplan/saleMain/index.vue +++ b/src/views/wms/deliversettlementManage/deliverplan/saleMain/index.vue @@ -134,8 +134,8 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultAddBtn({hasPermi:'wms:sale-main:create'}), // 新增 - defaultButtons.defaultImportBtn({hasPermi:'wms:sale-main:import'}), // 导入 + // defaultButtons.defaultAddBtn({hasPermi:'wms:sale-main:create'}), // 新增 + // defaultButtons.defaultImportBtn({hasPermi:'wms:sale-main:import'}), // 导入 defaultButtons.defaultExportBtn({hasPermi:'wms:sale-main:export'}), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 diff --git a/src/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data.ts b/src/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data.ts index 1b0e5640e..39362227c 100644 --- a/src/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data.ts @@ -264,16 +264,16 @@ export const SaleMain = useCrudSchemas(reactive([ } } }, - { - label: '操作', - field: 'action', - isDetail: false, - isForm: false, - table: { - width: 150, - fixed: 'right' - } - } + // { + // label: '操作', + // field: 'action', + // isDetail: false, + // isForm: false, + // table: { + // width: 150, + // fixed: 'right' + // } + // } ])) //表单校验 From 4184af839ff9145a675d002d2542ef586c068af5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com> Date: Mon, 13 May 2024 20:37:14 +0800 Subject: [PATCH 14/39] =?UTF-8?q?=E9=80=80=E6=96=99=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E5=88=97=E5=AE=BD=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productionreturnRequestMain.data.ts | 2 +- .../productionreturnRequestMainNo.data.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts index b798c5b92..ea9a67180 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts +++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts @@ -1035,7 +1035,7 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive Date: Tue, 14 May 2024 07:36:42 +0800 Subject: [PATCH 15/39] =?UTF-8?q?=E5=8F=91=E5=B8=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4efd818f0..02da9e245 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -## dev发布2024-05-13-002 +## dev发布2024-05-14-001 **xxxx.data.ts 文件配置说明** **form表单查询弹窗配置** form: { From 8befd1c16a99f54a7dcb6e5644b6482b53f39e23 Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Tue, 14 May 2024 07:50:54 +0800 Subject: [PATCH 16/39] =?UTF-8?q?scp=E5=8F=91=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 02da9e245..fb28fcf11 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -## dev发布2024-05-14-001 +## dev发布2024-05-14-002 **xxxx.data.ts 文件配置说明** **form表单查询弹窗配置** form: { From 0a36cc83dda4f2d884f243323c1a7eec241df93c Mon Sep 17 00:00:00 2001 From: chenfang Date: Tue, 14 May 2024 08:47:00 +0800 Subject: [PATCH 17/39] =?UTF-8?q?=E5=99=A8=E5=85=B7=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../containerMainRequest.data.ts | 85 +++++++++++- .../containerMainRequest/index.vue | 131 +++++++++++++++--- .../initialContainerMainRequest/index.vue | 13 +- .../initialContainerMainRequest.data.ts | 7 +- 4 files changed, 204 insertions(+), 32 deletions(-) diff --git a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/containerMainRequest.data.ts b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/containerMainRequest.data.ts index b15436d33..14153366b 100644 --- a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/containerMainRequest.data.ts +++ b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/containerMainRequest.data.ts @@ -45,7 +45,25 @@ export const ContainerMainRequest = useCrudSchemas(reactive([ table: { width: 100 }, - },{ + }, { + label: '状态', + field: 'status', + dictType: DICT_TYPE.REQUEST_STATUS, + dictClass: 'string', + isSearch: true, + isForm: false, + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + form: { + componentProps: { + disabled: true + } + } + }, + { label: '类型', field: 'type', sort: 'custom', @@ -55,6 +73,11 @@ export const ContainerMainRequest = useCrudSchemas(reactive([ isTable: true, table: { width: 120 + }, + form:{ + componentProps:{ + disabled: true, + } } }, { @@ -308,6 +331,16 @@ export const ContainerDetailRequest = useCrudSchemas(reactive([ table: { width: 150 }, + tableForm: { + disabled: true, + type: 'Select' + }, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + disabled: true, + } + } }, { label: '目标库位代码', @@ -337,17 +370,61 @@ export const ContainerDetailRequest = useCrudSchemas(reactive([ } }, { - label: '数量', - field: 'qty', + label: '从库存状态', + field: 'fromInventoryStatus', + dictType: DICT_TYPE.INVENTORY_STATUS, + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + tableForm: { + disabled: true, + type: 'Select' + }, + }, + { + label: '到库存状态', + field: 'toInventoryStatus', + dictType: DICT_TYPE.INVENTORY_STATUS, + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + tableForm: { + type: 'Select' + }, + }, + // { + // label: '从数量', + // field: 'fromQty', + // sort: 'custom', + // tableForm: { + // disabled: true, + // }, + // }, + { + label: '到数量', + field: 'toQty', sort: 'custom', }, { label: '计量单位', field: 'uom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isTable: true, sort: 'custom', table: { - width: 120 + width: 150 }, + tableForm:{ + disabled: true, + type: 'Select' + } }, { label: '备注', diff --git a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue index e2b234ab2..9d28c0abc 100644 --- a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue +++ b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue @@ -34,7 +34,7 @@ @@ -90,7 +90,7 @@ import TableHead from '@/components/TableHead/src/TableHead.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue' import Detail from '@/components/Detail/src/Detail.vue' -defineOptions({ name: 'ContainerMainRequest' }) +defineOptions({ name: 'ContainerManage' }) const message = useMessage() // 消息弹窗 const { t } = useI18n() // 国际化 @@ -110,38 +110,54 @@ const { tableObject, tableMethods } = useTable({ /** * */ - if ( routeName.value == 'scrapContainerMainRequest') { + if ( routeName.value == 'ScrapContainerManage') { tableObject.params = { type:'SCRAP' } - // toLocationCode.value = "SCRAP_CONTAIN" + ContainerMainRequest.allSchemas.formSchema.forEach(item=>{ + if(item.field == 'type'){ + item.value = "SCRAP" + }}); + ContainerDetailRequest.allSchemas.formSchema.forEach(item=>{ + if(item.field == 'toInventoryStatus'){ + item.value = "SCRAP" + } + }); businessType.value = 'ScrapContainerManage' importFileName.value = '器具报废申请' -} else if ( routeName.value == 'returnContainerMain') { +} else if ( routeName.value == 'ReturnContainerManage') { tableObject.params = { type:'RETURN' } - // fromLocationCode.value = null - // toLocationCode.value = "NULL_CONTAIN" + ContainerMainRequest.allSchemas.formSchema.forEach(item=>{ + if(item.field == 'type'){ + item.value = "RETURN" + }}); businessType.value = 'ReturnContainerManage' importFileName.value = '器具返回申请' -} else if ( routeName.value == 'moveContainerMainRequest') { +} else if ( routeName.value == 'MoveContainerManage') { tableObject.params = { type:'MOVE' } - // fromLocationCode.value = null - // toLocationCode.value = null + ContainerMainRequest.allSchemas.formSchema.forEach(item=>{ + if(item.field == 'type'){ + item.value = "MOVE" + }}); businessType.value = 'MoveContainerManage' + importFileName.value = '器具转移申请' -} else if ( routeName.value == 'deliverContainerMainRequest') { +} else if ( routeName.value == 'DeliverContainerManage') { tableObject.params = { type: 'DELIVER', } - // fromLocationCode.value = null - // toLocationCode.value = null - businessType.value = 'DeliverContainerMainRequest' - importFileName.value = '器具发运申请' -} else if( routeName.value == 'containerMainRequest'){ + //主表字段赋值 + ContainerMainRequest.allSchemas.formSchema.forEach(item=>{ + if(item.field == 'type'){ + item.value = "DELIVER" + }}); + businessType.value = 'DeliverContainerManage' + importFileName.value = '器具管理申请' +} else if( routeName.value == 'ContainerManage'){ businessType.value = 'ContainerManage' importFileName.value = '器具管理申请' } @@ -153,8 +169,10 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) => nextTick(() => { if (type == 'tableForm') { if(formField == 'containerNumber') { - row['containerNumber'] = val[0]['code'] + row['containerNumber'] = val[0]['itemCode'] row['uom'] = val[0]['uom'] + row['fromLocationCode'] = val[0]['locationCode'] + row['fromInventoryStatus'] = val[0]['inventoryStatus'] }else if(formField == 'toLocationCode'){ row['toLocationCode'] = val[0]['code'] }else { @@ -172,8 +190,10 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => { nextTick(() => { const setV = {} if(formField == 'containerNumber') { - setV['containerNumber'] = val[0]['itemCode'] - setV['fromLocationNumber'] = val[0]['locationNumber'] + setV['containerNumber'] = val[0]['code'] + setV['uom'] = val[0]['uom'] + }else if(formField == 'toLocationCode'){ + setV['toLocationCode'] = val[0]['code'] }else { setV[formField] = val[0][searchField] } @@ -307,7 +327,73 @@ const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['ma // 列表-操作按钮事件 const buttonTableClick = async (val, row) => { - if (val == 'edit') { // 编辑 + if (val == 'mainClose') { // 关闭 + await message.confirm('确认要关闭吗？') + tableObject.loading = true + ContainerMainRequestApi.close(row.masterId).then(() => { + message.success(t('common.updateSuccess')) + tableObject.loading = false + getList() + }).catch(err => { + tableObject.loading = false + console.log(err) + }) + } else if (val == 'mainReAdd') { // 重新添加 + await message.confirm('确认要重新添加吗？') + tableObject.loading = true + ContainerMainRequestApi.reAdd(row.masterId).then(() => { + message.success(t('common.updateSuccess')) + tableObject.loading = false + getList() + }).catch(err => { + tableObject.loading = false + console.log(err) + }) + } else if (val == 'mainSubmit') { // 提交审批 + await message.confirm('确认要提交审批吗？') + tableObject.loading = true + ContainerMainRequestApi.submit(row.masterId).then(() => { + message.success(t('common.updateSuccess')) + tableObject.loading = false + getList() + }).catch(err => { + tableObject.loading = false + console.log(err) + }) + } else if (val == 'mainTurnDown') { // 驳回 + await message.confirm('确认要驳回吗？') + tableObject.loading = true + ContainerMainRequestApi.refused(row.masterId).then(() => { + message.success(t('common.updateSuccess')) + tableObject.loading = false + getList() + }).catch(err => { + tableObject.loading = false + console.log(err) + }) + } else if (val == 'mainApprove') { // 审批通过 + await message.confirm('确认要审批通过吗？') + tableObject.loading = true + ContainerMainRequestApi.agree(row.masterId).then(() => { + message.success(t('common.updateSuccess')) + tableObject.loading = false + getList() + }).catch(err => { + tableObject.loading = false + console.log(err) + }) + } else if (val == 'mainHandle') { // 处理 + await message.confirm('确认要处理吗？') + tableObject.loading = true + ContainerMainRequestApi.handle(row.masterId).then(() => { + message.success(t('common.updateSuccess')) + tableObject.loading = false + getList() + }).catch(err => { + tableObject.loading = false + console.log(err) + }) + } else if (val == 'edit') { // 编辑 openForm('update', row) } else if (val == 'delete') { // 删除 handleDelete(row.id) @@ -347,14 +433,15 @@ const flag = ref() const submitForm = async (formType,data) => { data.subList = tableData.value // 拼接子表数据参数 data.subList.forEach(item => { - if(item.qty == 0){ + if(item.toQty == 0){ message.error(`到数量不能为0!`) flag.value = true return; - } + } }) try { if (formType === 'create') { + data.businessType = businessType.value await ContainerMainRequestApi.createContainerMainRequest(data) message.success(t('common.createSuccess')) } else { diff --git a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue index 43462be56..534c99432 100644 --- a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue +++ b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue @@ -90,7 +90,7 @@ import TableHead from '@/components/TableHead/src/TableHead.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue' import Detail from '@/components/Detail/src/Detail.vue' -defineOptions({ name: 'initialContainerMainRequest' }) +defineOptions({ name: 'InitialContainerManage' }) const message = useMessage() // 消息弹窗 const { t } = useI18n() // 国际化 @@ -109,11 +109,15 @@ const { tableObject, tableMethods } = useTable({ /** * */ - if ( routeName.value == 'initialContainerMainRequest') { + if ( routeName.value == 'InitialContainerManage') { tableObject.params = { - type:'INITIAL' + type:'INITIAL', } - businessType.value = 'InitialContainerManageRequest' + ContainerMainRequest.allSchemas.formSchema.forEach(item=>{ + if(item.field == 'type'){ + item.value = "INITIAL" + }}); + businessType.value = 'InitialContainerManage' importFileName.value = '器具初始化申请' } @@ -126,6 +130,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) => if(formField == 'containerNumber') { row['containerNumber'] = val[0]['code'] row['uom'] = val[0]['uom'] + row['toInventoryStatus'] = 'OK' }else if(formField == 'toLocationCode'){ row['toLocationCode'] = val[0]['code'] }else { diff --git a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/initialContainerMainRequest.data.ts b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/initialContainerMainRequest.data.ts index e1f6cfe03..d7385bc01 100644 --- a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/initialContainerMainRequest.data.ts +++ b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/initialContainerMainRequest.data.ts @@ -32,7 +32,6 @@ const queryParams = { // 获取当前操作人的部门 import { useUserStore } from '@/store/modules/user' -import { ItemBasic } from '@/utils/disposition/formFields' const userStore = useUserStore() const userDept = userStore.userSelfInfo.dept // id 转str 否则form回显匹配不到 @@ -63,7 +62,6 @@ export const ContainerMainRequest = useCrudSchemas(reactive([ width: 150 }, form: { - value: '1', componentProps: { disabled: true } @@ -79,6 +77,11 @@ export const ContainerMainRequest = useCrudSchemas(reactive([ isTable: true, table: { width: 120 + }, + form:{ + componentProps:{ + disabled: true, + } } }, { From b84f3bbf90215423a635111d1a2edfe1dc1ca65e Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Tue, 14 May 2024 09:22:23 +0800 Subject: [PATCH 18/39] =?UTF-8?q?=E6=8B=92=E6=94=B6=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereceiptJobMain/index.vue | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue index 87273290d..a9d2e713c 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue @@ -205,16 +205,16 @@ const butttondata = (row,$index) => { // defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-job-main:close'}), // 关闭 // defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃 // defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行 - // { - // label: '拒收', - // name: 'mainJobClo', - // hide: isShowMainButton(row, ['1']), - // type: 'primary', - // icon: '', - // color: '', - // hasPermi: 'wms:purchasereceipt-job-main:close', - // link: true // 文本展现按钮 - // } + { + label: '拒收', + name: 'mainJobClo', + hide: isShowMainButton(row, ['1']), + type: 'primary', + icon: '', + color: '', + hasPermi: 'wms:purchasereceipt-job-main:close', + link: true // 文本展现按钮 + } ] } From 710481e8f10a6df266a1ec8f522ae431e3d3d286 Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Tue, 14 May 2024 09:22:34 +0800 Subject: [PATCH 19/39] =?UTF-8?q?=E6=8B=92=E6=94=B6=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/dict.ts | 1 + .../supplierinvoiceRequestMain.data.ts | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/utils/dict.ts b/src/utils/dict.ts index 170df34ab..9d701ad18 100644 --- a/src/utils/dict.ts +++ b/src/utils/dict.ts @@ -336,4 +336,5 @@ export enum DICT_TYPE { TAX_RATE_DICT='tax_rate_dict', //税率 INTERFACE_STATUS = 'interfaceStatus', // 接口调用信息 接口状态 SYSTEM_DAY = 'system_day', // 系统天数 + PURCHASE_INVOICE_ORDER_TYPE = 'purchase_invoice_order_type', // 发票采购订单类型 } diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts index 477d2451a..28b34d9d1 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts @@ -154,7 +154,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( { label: '订单类型', field: 'orderType', - dictType: DICT_TYPE.PURCHASE_ORDER_TYPE, + dictType: DICT_TYPE.PURCHASE_INVOICE_ORDER_TYPE, dictClass: 'string', isTable: false, sort: 'custom', From e63a522bb256752ad119c0b91937e12510e2ebdd Mon Sep 17 00:00:00 2001 From: chenfang Date: Tue, 14 May 2024 11:25:52 +0800 Subject: [PATCH 20/39] =?UTF-8?q?=E5=99=A8=E5=85=B7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/containerDetailRequest/index.ts | 4 +- src/api/wms/containerRecordDetail/index.ts | 58 ++ .../containerMainRequest.data.ts | 3 +- .../containerMainRequest/index.vue | 24 +- .../containerRecordMain.data.ts | 229 +++++++- .../containerRecordMain/index.vue | 170 +++--- .../initialContainerMainRequest/index.vue | 2 +- .../scrapContainerMainRequest/index.vue | 486 ++++++++++++++++ .../scrapContainerMainRequest.data.ts | 520 ++++++++++++++++++ 9 files changed, 1364 insertions(+), 132 deletions(-) create mode 100644 src/api/wms/containerRecordDetail/index.ts create mode 100644 src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue create mode 100644 src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/scrapContainerMainRequest.data.ts diff --git a/src/api/wms/containerDetailRequest/index.ts b/src/api/wms/containerDetailRequest/index.ts index a88d054ca..43ec7211f 100644 --- a/src/api/wms/containerDetailRequest/index.ts +++ b/src/api/wms/containerDetailRequest/index.ts @@ -18,6 +18,8 @@ export interface ContainerDetailRequestVO { // 查询器具管理申请子列表 export const getContainerDetailRequestPage = async (params) => { + console.log(params); + if (params.isSearch) { delete params.isSearch const data = {...params} @@ -38,7 +40,7 @@ export const createContainerDetailRequest = async (data: ContainerDetailRequestV } // 修改器具管理申请子 -export const c = async (data: ContainerDetailRequestVO) => { +export const updateContainerDetailRequest = async (data: ContainerDetailRequestVO) => { return await request.put({ url: `/wms/container-detail-request/update`, data }) } diff --git a/src/api/wms/containerRecordDetail/index.ts b/src/api/wms/containerRecordDetail/index.ts new file mode 100644 index 000000000..e8993f74e --- /dev/null +++ b/src/api/wms/containerRecordDetail/index.ts @@ -0,0 +1,58 @@ +import request from '@/config/axios' + +export interface ContainerRecordDetailVO { + id: number + masterId: number + number: string + containerNumber: string + fromLocationCode: string + toLocationCode: string + qty: number + uom: string + remark: string + siteId: string + concurrencyStamp: number + fromOwnerCode: string + toOwnerCode: string +} + +// 查询器具管理记录子列表 +export const getContainerRecordDetailPage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/container-record-detail/senior', data }) + } else { + return await request.get({ url: `/wms/container-record-detail/page`, params }) + } +} + +// 查询器具管理记录子详情 +export const getContainerRecordDetail = async (id: number) => { + return await request.get({ url: `/wms/container-record-detail/get?id=` + id }) +} + +// 新增器具管理记录子 +export const createContainerRecordDetail = async (data: ContainerRecordDetailVO) => { + return await request.post({ url: `/wms/container-record-detail/create`, data }) +} + +// 修改器具管理记录子 +export const updateContainerRecordDetail = async (data: ContainerRecordDetailVO) => { + return await request.put({ url: `/wms/container-record-detail/update`, data }) +} + +// 删除器具管理记录子 +export const deleteContainerRecordDetail = async (id: number) => { + return await request.delete({ url: `/wms/container-record-detail/delete?id=` + id }) +} + +// 导出器具管理记录子 Excel +export const exportContainerRecordDetail = async (params) => { + return await request.download({ url: `/wms/container-record-detail/export-excel`, params }) +} + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/wms/container-record-detail/get-import-template' }) +} \ No newline at end of file diff --git a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/containerMainRequest.data.ts b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/containerMainRequest.data.ts index 14153366b..ca0f4f308 100644 --- a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/containerMainRequest.data.ts +++ b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/containerMainRequest.data.ts @@ -395,7 +395,8 @@ export const ContainerDetailRequest = useCrudSchemas(reactive([ width: 150 }, tableForm: { - type: 'Select' + type: 'Select', + disabled:true }, }, // { diff --git a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue index 9d28c0abc..00d2bdfb1 100644 --- a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue +++ b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue @@ -33,7 +33,7 @@ {{ row.number }} -