From d95918786c2b62872e2196df2ebac2cbde2cbf8c Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Mon, 4 Mar 2024 10:50:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=9F=E6=88=90=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/locales/en-US.ts | 3 +- src/locales/zh-CN.ts | 3 +- src/utils/dict.ts | 1 + .../unplannedreceiptRequestMain/index.vue | 5 - .../purchasereceiptRequestMain.data.ts | 26 + .../supplierdeliverRequestMain/index.vue | 103 ++-- .../supplierdeliverRequestMain/point.vue | 114 ----- .../supplierdeliverRequestMain.data.ts | 445 ++++++++++++++++++ 8 files changed, 525 insertions(+), 175 deletions(-) delete mode 100644 src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/point.vue diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts index 75bd2a270..754c51198 100644 --- a/src/locales/en-US.ts +++ b/src/locales/en-US.ts @@ -310,7 +310,8 @@ export default { typeUpdate: 'Dict Type Eidt', dataCreate: 'Dict Data Create', dataUpdate: 'Dict Data Eidt', - fileUpload: 'File Upload' + fileUpload: 'File Upload', + createLabel: 'create label' }, dialog: { dialog: 'Dialog', diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts index 6f253a896..4f308a7cb 100644 --- a/src/locales/zh-CN.ts +++ b/src/locales/zh-CN.ts @@ -309,7 +309,8 @@ export default { typeCreate: '字典类型新增', typeUpdate: '字典类型编辑', dataCreate: '字典数据新增', - dataUpdate: '字典数据编辑' + dataUpdate: '字典数据编辑', + createLabel: '创建标签' }, dialog: { dialog: '弹窗', diff --git a/src/utils/dict.ts b/src/utils/dict.ts index f48aadb70..4dc76cd96 100644 --- a/src/utils/dict.ts +++ b/src/utils/dict.ts @@ -275,4 +275,5 @@ export enum DICT_TYPE { PREDICT_TIME_TYPE = 'predict_time_type', // 预测时间类型 PACK_UNIT_TYPE = 'pack_unit_type', // 包装规格类型 TRANSFER_REASON = 'transfer_reason', // 调拨出入库原因 + PURCHASERECEIPT_SOURCE_TYPE="purchasereceipt_source_type",//采购收货数据来源 } diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue index 05319c4c8..78cbb6234 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue @@ -110,13 +110,8 @@ import { import * as UnplannedreceiptRequestMainApi from '@/api/wms/unplannedreceiptRequestMain' import * as UnplannedreceiptRequestDetailApi from '@/api/wms/unplannedreceiptRequestDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' -import { - ProductionreturnRequestDetailLabel, ProductionreturnRequestDetailLabelRules -} from "@/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data"; -import * as ProductionreturnRequestDetailApi from "@/api/wms/productionreturnRequestDetail"; import * as ItembasicApi from "@/api/wms/itembasic"; import * as PackageApi from "@/api/wms/package"; -import {UnplannedreceiptRequestDetailVO} from "@/api/wms/unplannedreceiptRequestDetail"; import { formatTime } from '@/utils/index' // 计划外入库申请 diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts index 6755f673f..2bcdb3412 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts @@ -143,6 +143,32 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive( width: 150 }, }, + { + label: '运输方式', + field: 'transferMode', + dictType: DICT_TYPE.TRANSFER_MODE, + sort: 'custom', + table: { + width: 150 + }, + isSearch: true, + }, + { + label: '数据来源', + field: 'sourceType', + dictType: DICT_TYPE.PURCHASERECEIPT_SOURCE_TYPE, + sort: 'custom', + table: { + width: 150 + }, + form: { + value: 'ASN_ExternalReceipt', + componentProps: { + disabled: true + } + }, + isSearch: false, + }, { label: '从仓库代码', field: 'fromWarehouseCode', diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue index 7f343ea58..b86a1351f 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue @@ -72,7 +72,6 @@ :apiUpdate="SupplierdeliverRequestDetailApi.updateSupplierdeliverRequestDetail" :apiPage="SupplierdeliverRequestDetailApi.getSupplierdeliverRequestDetailPage" :apiDelete="SupplierdeliverRequestDetailApi.deleteSupplierdeliverRequestDetail" - :Echo="Echo" @searchTableSuccessDetail="searchTableSuccessDetail" /> @@ -87,8 +86,18 @@ :mode="2" /> - - + + @@ -100,12 +109,12 @@ import { SupplierdeliverRequestMain, SupplierdeliverRequestMainRules, SupplierdeliverRequestDetail, - SupplierdeliverRequestDetailRules + SupplierdeliverRequestDetailRules, + SupplierdeliverRequestDetailLabel, } from './supplierdeliverRequestMain.data' import * as SupplierdeliverRequestMainApi from '@/api/wms/supplierdeliverRequestMain' import * as SupplierdeliverRequestDetailApi from '@/api/wms/supplierdeliverRequestDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' -import point from '@/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/point.vue' import { formatDate } from '@/utils/formatTime' // 供应商发货申请 @@ -113,7 +122,7 @@ defineOptions({ name: 'SupplierdeliverRequestMain' }) const message = useMessage() // 消息弹窗 const { t } = useI18n() // 国际化 - +const genLabelId = ref(); const route = useRoute() // 路由信息 const routeName = ref() routeName.value = route.name @@ -181,10 +190,6 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef) => { }) } -// 子表新增的时候选择表格之后需要会显得字段 -// const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom'] -const Echo = [] - const { tableObject, tableMethods } = useTable({ getListApi: SupplierdeliverRequestMainApi.getSupplierdeliverRequestMainPage // 分页接口 }) @@ -310,8 +315,22 @@ const buttonTableClick = async (val, row) => { // 删除 handleDelete(row.id) } else if (val == 'ssbq') { - // 生成标签 - handlePoint(row) + await SupplierdeliverRequestMainApi.selfCheckReport(row.id).then(async (res) => { + if(!res){ + message.warning("请先上传自检报告!") + return + }else{ + // 生成标签 + detatableData.params = { + masterId:row.id + } + genLabelId.value = row.id + await getDetailList() + formLabelRef.value.open('create', row, null,'createLabel')//创建标签页面 createLabel 标题 + } + }).catch(err => { + console.log("自检报告校验异常",err) + }) } else if (val == 'point') { // 标签打印 labelPrint(row) @@ -512,57 +531,33 @@ const handleExport = async () => { } } -const detailTableColumns = ref(SupplierdeliverRequestDetail.allSchemas.tableColumns) -const detailListTableColumns = detailTableColumns.value.filter( - (item) => - item.label != '操作' && - item.label != '创建者' && - item.label != '创建时间' && - item.label != '最后更新者' && - item.label != '最后更新时间' -) -const dialogVisible = ref(false) -const isShow = ref(false) -const dialogTitle = ref('') -const closeDialog = () => { - dialogVisible.value = false - isShow.value = false -} +// 生成标签 +const isCreateLabel = ref(false) +const formLabelRef = ref() +const { tableObject: detatableData, tableMethods: detatableMethods } =useTable({ + getListApi: SupplierdeliverRequestDetailApi.getSupplierdeliverRequestDetailPage +}) +const { getList:getDetailList } = detatableMethods -/** 生成标签按钮操作 */ -const genLabel = async () => { + +// 生成标签按钮操作 +const submitFormLabel = async (formType, data) => { try { - // 生成标签的二次确认 + console.log("data",data) await message.confirm('是否为此数据生成标签？') - // 发起生成标签 await SupplierdeliverRequestMainApi.genLabel(genLabelId.value) - dialogVisible.value = false - isShow.value = false - message.success(t('生成标签成功!')) - // 刷新列表 - await getList() - } catch {} + isCreateLabel.value = true + message.success('创建标签成功') + } finally { + formLabelRef.value.formLoading = false + formLabelRef.value.dialogVisible = false + } } + const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken()) -const genLabelId = ref() -// 生成标签 -const pointRef = ref() -const handlePoint = async (row) => { - await SupplierdeliverRequestMainApi.selfCheckReport(row.id).then(res => { - console.log(row.id) - if(!res){ - message.warning("请先上传自检报告!") - return - }else{ - pointRef.value.openPoint(row.id) - } - }).catch(err => { - console.log("自检报告校验异常",err) - }) -} // 标签打印 const labelPrint = async (row) => { window.open(src.value + '&asn_number=' + row.asnNumber) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/point.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/point.vue deleted file mode 100644 index d9278bfa2..000000000 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/point.vue +++ /dev/null @@ -1,114 +0,0 @@ - - - diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts index 53e2a645a..0231819d2 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts @@ -1110,3 +1110,448 @@ export const SupplierdeliverRequestDetailRules = reactive({ { max: 50, message: '不得超过50个字符', trigger: 'blur' } ], }) + +export const SupplierdeliverRequestDetailLabel = useCrudSchemas(reactive([ + { + label: '批次', + field: 'batch', + sort: 'custom', + table: { + width: 150 + }, + tableForm: { + disabled: true + } + }, + { + label: '生产日期', + field: 'produceDate', + formatter: dateFormatter2, + detail: { + dateFormat: 'YYYY-MM-DD' + }, + sort: 'custom', + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + disabled:true, + style: {width: '100%'}, + type: 'date', + dateFormat: 'YYYY-MM-DD', + valueFormat: 'x', + } + }, + tableForm: { + disabled:true, + type: 'FormDate', + dateFormat: 'YYYY-MM-DD', + valueFormat: 'x', + } + }, + { + label: '替代批次', + field: 'altBatch', + sort: 'custom', + table: { + width: 150 + }, + isTableForm: false, + isForm: false, + tableForm:{ + disabled:true + } + }, + { + label: '到货日期', + field: 'arriveDate', + formatter: dateFormatter2, + detail: { + dateFormat: 'YYYY-MM-DD' + }, + sort: 'custom', + table: { + width: 180 + }, + isForm: false, + form: { + component: 'DatePicker', + componentProps: { + disabled:true, + style: {width: '100%'}, + type: 'date', + dateFormat: 'YYYY-MM-DD', + valueFormat: 'x', + } + }, + isTableForm: false, + tableForm: { + disabled:true, + type: 'FormDate', + dateFormat: 'YYYY-MM-DD', + valueFormat: 'x', + } + }, + { + label: '过期日期', + field: 'expireDate', + formatter: dateFormatter2, + detail: { + dateFormat: 'YYYY-MM-DD', + }, + sort: 'custom', + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + disabled:true, + style: {width: '100%'}, + type: 'date', + dateFormat: 'YYYY-MM-DD', + valueFormat: 'x', + } + }, + tableForm: { + disabled:true, + type: 'FormDate', + dateFormat: 'YYYY-MM-DD', + valueFormat: 'x', + } + }, + { + label: '订单号', + field: 'poNumber', + sort: 'custom', + table: { + width: 150 + }, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + disabled:true, + isSearchList: false, + searchListPlaceholder: '请选择订单号', + searchField: 'number', + searchTitle: '要货计划信息', + searchAllSchemas: PurchasePlanDetail.allSchemas, + searchPage: PurchasePlanDetailApi.getPurchasePlanDetailPage, + searchCondition: [ + { + key: 'number', + value: 'ppNumber', + message: '请填写要货计划单号！', + isMainValue: true + }, + { + key: 'available', + value: 'TRUE', + isMainValue: false + } + + ] + } + }, + tableForm: { + isInpuFocusShow: false, + disabled:true, + searchListPlaceholder: '请选择订单号', + searchField: 'number', + searchTitle: '要货计划信息', + searchAllSchemas: PurchasePlanDetail.allSchemas, + searchPage: PurchasePlanDetailApi.getPurchasePlanDetailPage, + searchCondition: [ + { + key: 'number', + value: 'ppNumber', + message: '请填写要货计划单号！', + isMainValue: true + }, + { + key: 'available', + value: 'TRUE', + isMainValue: false + }] + } + }, + { + label: '订单行', + field: 'poLine', + sort: 'custom', + table: { + width: 150 + }, + form: { + componentProps: { + disabled: true + } + }, + tableForm: { + disabled: true + } + }, + { + label: '订单数量', + field: 'orderQty', + table: { + width: 150 + }, + form: { + component: 'InputNumber', + componentProps: { + disabled: true, + min: 0, + precision: 6 + } + }, + tableForm: { + disabled: true, + type: 'InputNumber', + min: 0, + precision: 6 + } + }, + + { + label: '供应商计量数量', + field: 'supplierPackQty', + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'InputNumber', + componentProps: { + disabled:true, + min: 1, + precision: 6 + } + }, + isTableForm: false, + isForm: false, + tableForm: { + disabled:true, + type: 'InputNumber', + min: 1, + precision: 6 + } + }, + { + label: '供应商计量单位', + field: 'supplierPackUnit', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + isTableForm: false, + isForm: false, + tableForm: { + disabled:true, + type: 'Select' + } + }, + { + label: '转换率', + field: 'convertRate', + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'InputNumber', + componentProps: { + min: 0 + } + }, + isTableForm: false, + isForm: false, + tableForm: { + disabled:true, + type: 'InputNumber', + min: 0 + } + }, + { + label: '单据号', + field: 'number', + sort: 'custom', + table: { + width: 180 + }, + isTableForm: false, + form: { + componentProps: { + disabled: true + } + } + }, + { + label: '物料代码', + field: 'itemCode', + sort: 'custom', + table: { + width: 150 + }, + form: { + componentProps: { + disabled: true + } + }, + tableForm: { + disabled: true + } + }, + { + label: '计量单位', + field: 'uom', + sort: 'custom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isSearch: true, + isTable: true, + table: { + width: 150 + }, + tableForm: { + disabled:true, + type: 'Select' + } + }, + { + label: '数量', + field: 'qty', + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'InputNumber', + componentProps: { + disabled:true, + min: 1, + precision: 6 + } + }, + tableForm: { + disabled:true, + type: 'InputNumber', + min: 1, + precision: 6 + } + }, + { + label: '包装数量', + field: 'packQty', + sort: 'custom', + table: { + width: 150 + }, + form: { + componentProps: { + disabled:true, + isSearchList: false, + searchListPlaceholder: '请选择包装', + searchField: 'packQty', + searchTitle: '物品包装信息', + searchAllSchemas: Itempackaging.allSchemas, + searchPage: ItemPackageApi.getItempackagingPageBySupplierdeliver, + searchCondition: [ + { + key: 'itemCode', + value: 'itemCode', + message: '请选择订单行', + isMainValue: true + }, + { + key: 'available', + value: 'TRUE', + isMainValue: false + } + + ] + } + }, + tableForm: { + isInpuFocusShow: false, + disabled:true, + searchListPlaceholder: '请选择包装', + searchField: 'packQty', + searchTitle: '物品包装信息', + searchAllSchemas: Itempackaging.allSchemas, + searchPage: ItemPackageApi.getItempackagingPageBySupplierdeliver, + searchCondition: [ + { + key: 'itemCode', + value: 'itemCode', + message: '请选择订单行', + isMainValue: true + }, + { + key: 'available', + value: 'TRUE', + isMainValue: false + }] + } + }, + { + label: '包装规格', + field: 'packUnit', + isTable: true, + sort: 'custom', + table: { + width: 150, + componentProps: { + disabled: true + } + }, + tableForm: { + disabled: true, + } + }, + { + label: '物料名称', + field: 'itemName', + sort: 'custom', + table: { + width: 150 + }, + isTableForm: false, + isForm: false + }, + { + label: '物料描述1', + field: 'itemDesc1', + sort: 'custom', + table: { + width: 150 + }, + isTableForm: false, + isForm: false + }, + { + label: '物料描述2', + field: 'itemDesc2', + sort: 'custom', + table: { + width: 150 + }, + isTableForm: false, + isForm: false + }, + { + label: '项目代码', + field: 'projectCode', + sort: 'custom', + table: { + width: 150 + }, + isTableForm: false, + isForm: false + }, +])) \ No newline at end of file