From 57dec795c73e103e9f0e864601ec587034f1fc1c Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Sat, 14 Dec 2024 15:23:43 +0800 Subject: [PATCH] =?UTF-8?q?YT-1651WMS26.=E4=BE=BF=E6=AC=A1=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/locales/en-US.ts | 2 +- src/locales/zh-CN.ts | 2 +- .../purchasePlanMain/index.vue | 3 ++- .../purchasePlanMain/purchasePlanMain.data.ts | 20 ++++++++++------ .../supplierdeliverRecordMain.data.ts | 15 ++++++++++++ .../supplierdeliverBasicForm.vue | 2 ++ .../supplierdeliverRequestMain.data.ts | 23 +++++++++++++++++++ 7 files changed, 57 insertions(+), 10 deletions(-) diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts index 29c4bc725..bc8fa1baa 100644 --- a/src/locales/en-US.ts +++ b/src/locales/en-US.ts @@ -1024,7 +1024,7 @@ export default { 审批通过:'Approve', 要货预测主:'Demand forecast master data', 要货预测主导入模版:'Demand forecast master data leads into the template', - 创建供应商发货申请:'Create a supplier shipping request', + 创建发货申请:'Create a shipping request', '是否重新打开所选中数据？':'Do you want to reopen the selected data?', '请先上传自检报告!':'Please upload the self-test report first!', '提交审批成功!':'Submitted for approval!', diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts index d899399f8..308e02305 100644 --- a/src/locales/zh-CN.ts +++ b/src/locales/zh-CN.ts @@ -1029,7 +1029,7 @@ export default { 审批通过:'审批通过', 要货预测主:'要货预测主', 要货预测主导入模版:'要货预测主导入模版', - 创建供应商发货申请:'创建供应商发货申请', + 创建发货申请:'创建发货申请', '是否重新打开所选中数据？':'是否重新打开所选中数据？', '请先上传自检报告!':'请先上传自检报告!', '提交审批成功!':'提交审批成功!', diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue index 4be71a753..5a5676cdc 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue @@ -470,7 +470,7 @@ const isShowMainButton1 = (row, val) => { defaultButtons.mainListEditBtn({ hide: isShowMainButton1(row, ['1','3','5']), hasPermi: 'wms:purchase-plan-main:edit' }), // 编辑 // defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchase-plan-main:delete'}), // 删除 { - label: t('ts.创建供应商发货申请'), + label: t('ts.创建发货申请'), name: 'supplierdeliver', hide: isShowMainButton(row, ['4']), type: 'primary', @@ -506,6 +506,7 @@ const isShowMainButton1 = (row, val) => { } else if (val == 'supplierdeliver') { // 创建供应商发货申请 supplierdeliverFormRef.value.openFormByCreate({ number:row.number, //要货单号 + deliNo:row.deliNo, //便次 poNumber:row.poNumber, //采购订单号 supplierCode:row.supplierCode, //供应商代码 endTime:row.endTime, //结束时间 diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts index 6305da7ea..161e0294c 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts @@ -8,7 +8,7 @@ import { PurchaseDetail, PurchaseMain } from '../purchaseMain/purchaseMain.data' import { getPurchaseDetailPagePoNumber } from '@/api/wms/purchaseDetail' import * as ItembasicApi from '@/api/wms/itembasic' import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data' -import { validatePositiveNumber0 } from "@/utils/validator"; +import { validatePositiveNumber0, validateInteger } from "@/utils/validator"; const { t } = useI18n() // 国际化 /** @@ -340,14 +340,18 @@ export const PurchasePlanMain = useCrudSchemas( label: '便次', field: 'deliNo', sort: 'custom', - isTable: false, - isForm: false, sortTableDefault: 13, table: { width: 150 }, + form: { + component: 'InputNumber', + componentProps: { + min: 1, + }, + } }, - + { label: '预测版本', @@ -577,7 +581,11 @@ export const PurchasePlanMainRules = reactive({ status: [{ required: true, message: '请选择状态', trigger: 'change' }], number: [{ required: true, message: '请输入单据号', trigger: 'blur' }], businessType: [{ required: true, message: '请输入业务类型', trigger: 'blur' }], - remark: [{ max: 50, message: '不得超过50个字符', trigger: 'blur' }] + remark: [{ max: 50, message: '不得超过50个字符', trigger: 'blur' }], + deliNo: [ + { required: true, message: '请输入便次', trigger: 'blur' }, + { validator: validateInteger, message: '请输入正确的正整数', trigger: ['change', 'blur'] }, + ], }) /** @@ -954,8 +962,6 @@ export const PurchasePlanDetail = useCrudSchemas( table: { width: 150 }, - - hiddenInMain: true, isTableForm: false, isForm: false, isTable: true, diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts index f4d120f08..53f178584 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts @@ -32,6 +32,21 @@ export const SupplierdeliverRecordMain = useCrudSchemas(reactive([ width: 180 }, }, + { + label: '便次', + field: 'deliNo', + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'InputNumber', + componentProps: { + min: 1, + disabled: true + }, + }, + }, { label: '申请单号', field: 'requestNumber', diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue index 7051eea7d..83a967479 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue @@ -109,6 +109,7 @@ const openFormByCreate = async ( data ) => { setV['supplierCode'] = data['supplierCode'] // 供应商代码 setV['poNumber'] = data['poNumber'] //采购订单 setV['ppNumber'] = data['number'] // 要货单号 + setV['deliNo'] = data['deliNo'] // 要货单号 searchPage: SupplierApi.getSupplierPage //新增--选择完要货计划，自动展示明细 getSearchTableData(data['number'],'ppNumber','number',0) @@ -254,6 +255,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) => //新增--选择完要货计划，自动展示明细 setV['poNumber'] = val[0]['poNumber'] //采购订单 + setV['deliNo'] = val[0]['deliNo'] getSearchTableData(val[0]['number'],formField,searchField,0) // 设置计划到货时间 diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts index d956c8356..bad3ebbd7 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts @@ -220,6 +220,26 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive( sortDetailDefault: 4, } }, + { + label: '便次', + field: 'deliNo', + sort: 'custom', + sortTableDefault: 4, + table: { + width: 150 + }, + form: { + component: 'InputNumber', + componentProps: { + min: 1, + disabled: true + }, + }, + detail: { + sortDetailDefault: 4, + } + }, + { label: '要求到货时间', field: 'arriveTime', @@ -1337,6 +1357,9 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive