From a38cdfdd1f32f5a99eb64089cbd15719a37bb810 Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Wed, 30 Oct 2024 09:46:41 +0800 Subject: [PATCH 01/15] =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=8D=A2=E8=B4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchaseBarterRequest/index.vue | 19 ++++++++----------- .../purchaseBarterRequestMain.data.ts | 3 +++ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRequest/index.vue b/src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRequest/index.vue index f2ebbc2fa..922eb890a 100644 --- a/src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRequest/index.vue +++ b/src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRequest/index.vue @@ -59,7 +59,6 @@ @tableSelectionDelete="tableSelectionDelete" @searchTableSuccess="searchTableSuccess" @submitForm="submitForm" - @inputNumberChange="inputNumberChange" @tableFormSelectOnBlur="tableFormSelectOnBlur" > @@ -76,7 +75,6 @@ :Echo="Echo" @searchTableSuccessDetail="searchTableSuccessDetail" :detailValidate="detailValidate" - @detailOpenForm="detailOpenForm" @onBlur="onBlur" /> @@ -490,6 +488,10 @@ const submitForm = async (formType, submitData) => { data.id = data.masterId } data.subList = tableData.value // 拼接子表数据参数 + const cmdExists = data.subList.some(filter => + parseFloat(filter.inventoryQty) < parseFloat(filter.qty) + ); + try { if (formType === 'create') { if(data.subList.length == 0){ @@ -507,6 +509,10 @@ const submitForm = async (formType, submitData) => { if(flag){ return } + if(cmdExists){ + message.warning("换货数量不能大于库存数量") + return + } formRef.value.formLoading = true await PurchaseBarterRequestMainApi.createPurchaseBarterRequestMain(data) message.success(t('common.createSuccess')) @@ -566,14 +572,6 @@ const searchFormClick = (searchData) => { getList() // 刷新当前列表 } -// 创建标签 -const inputNumberChange = (field, index, row, val) => { - if(field == 'qty' || field == 'singlePrice'){ - row.amount = row.qty * row.singlePrice - } -} - - let validityDays = 0 const detailOpenForm = (type, row)=>{ console.log('detailOpenForm',row) @@ -607,7 +605,6 @@ const tableFormSelectOnBlur = (field, val, row, index) => { tableData.value[index][field] = val.target.value } } - /** 初始化 **/ onMounted(async () => { getList() diff --git a/src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRequest/purchaseBarterRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRequest/purchaseBarterRequestMain.data.ts index 2639dbbfc..b724fb19f 100644 --- a/src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRequest/purchaseBarterRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRequest/purchaseBarterRequestMain.data.ts @@ -297,4 +297,7 @@ export const PurchaseBarterRequestDetailRules = reactive({ qty:[ { validator:validateQty, message: '换货数量必须是一个正数', trigger: 'change'} ], + itemCode: [ + { required: true, message: '请输入物料代码', trigger: 'blur' } + ], }) From 5755f2d92c12956f62144451d87d01bc7e16d3d0 Mon Sep 17 00:00:00 2001 From: songguoqiang <765017469@qq.com> Date: Wed, 30 Oct 2024 10:25:47 +0800 Subject: [PATCH 02/15] =?UTF-8?q?YT-563=EF=BC=9A=E9=9A=94=E7=A6=BB?= =?UTF-8?q?=E8=BD=AC=E7=BA=BF=E8=BE=B9=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventorymoveRequestMainHOLDWIP/index.vue | 39 ++++++++++++++++++- .../inventorymoveRequestMain.data.ts | 8 +++- 2 files changed, 44 insertions(+), 3 deletions(-) diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainHOLDWIP/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainHOLDWIP/index.vue index 4d9f82d06..0bf4677a0 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainHOLDWIP/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainHOLDWIP/index.vue @@ -91,6 +91,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons' import { formatDate } from '@/utils/formatTime' import { usePageLoading } from '@/hooks/web/usePageLoading' import {importTemplateHoldOk} from "@/api/wms/inventorymoveRequestMain"; +import * as ruleApi from '@/api/wms/rule/index' const { loadStart, loadDone } = usePageLoading() // 隔离转线边申请HoldtoWipRequestMain // 只有隔离转线边申请在使用的 @@ -288,7 +289,8 @@ InventorymoveRequestDetail.allSchemas.tableFormColumns.map(item => { const updataTableColumns = (val) => { tableColumns.value = val } - +const fromManagementPrecision = ref('') +const toManagementPrecision = ref('') // 查询页面返回 const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => { nextTick(() => { @@ -310,6 +312,34 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => newRow['toInventoryStatus'] = "OK" //HoldtoWipRequestMain 隔离转线边 tableData.value.push(newRow) }) + }else if(formField == 'toLocationCode'){//到库位代码 + debugger + //从批次 + await ruleApi.getManagementPrecision({ + itemCodes: [row['itemCode']], + locationCode:row['fromLocationCode'] + }).then((res) => { + fromManagementPrecision.value = res[0].ManagementPrecision + }) + + if (fromManagementPrecision.value == 'BY_QUANTITY') {//如果从批次+物料管理精度是按数量 + //到批次 + await ruleApi.getManagementPrecision({ + itemCodes: [row['itemCode']], + locationCode:row['locationCode'] + }).then((res) => { + toManagementPrecision.value = res[0].ManagementPrecision + }) + if (toManagementPrecision.value != 'BY_QUANTITY') {//到批次+物料管理精度非数量需要添加批次 + if(newRow['fromBatch']==''){ + newRow['fromBatch'] = getFormattedDate(); // 获取 YYYYMMDD 格式的日期 + } + newRow['fromBatchFormItemType'] = 'FormDate' + newRow['disabled_fromBatch'] = false + }else { + newRow['fromBatchFormItemType'] = '' + newRow['disabled_fromBatch'] = true + } } else { row[formField] = val[0][searchField] } @@ -708,4 +738,11 @@ onMounted(async () => { importTemplateData.templateUrl = await InventorymoveRequestMainApi.importTemplateExceptMove() }) +const getFormattedDate = () =>{ + const a = new Date(); + const year = a.getFullYear(); + const month = String(a.getMonth() + 1).padStart(2, '0'); + const day = String(a.getDate()).padStart(2, '0'); + return `${year}${month}${day}`; + } diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainHOLDWIP/inventorymoveRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainHOLDWIP/inventorymoveRequestMain.data.ts index f3fcbde3c..f46e14827 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainHOLDWIP/inventorymoveRequestMain.data.ts +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainHOLDWIP/inventorymoveRequestMain.data.ts @@ -557,11 +557,15 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive( width: 150 }, tableForm: { - disabled: true + disabled: true, + placeholder: '请选择从批次', + valueFormat: 'YYYYMMDD', + format: 'YYYYMMDD', }, form: { componentProps: { - disabled: true + disabled: true, + valueFormat: 'YYYYMMDD', } } }, From 388b833467b3473a78e8233af4a63369efdf3a55 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Wed, 30 Oct 2024 10:37:34 +0800 Subject: [PATCH 03/15] =?UTF-8?q?=E9=9A=94=E7=A6=BB=E8=BD=AC=E7=BA=BF?= =?UTF-8?q?=E8=BE=B9=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventorymoveRequestMainHOLDWIP/index.vue | 59 ++++++++++--------- 1 file changed, 30 insertions(+), 29 deletions(-) diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainHOLDWIP/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainHOLDWIP/index.vue index 0bf4677a0..1a7b895a6 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainHOLDWIP/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainHOLDWIP/index.vue @@ -293,13 +293,14 @@ const fromManagementPrecision = ref('') const toManagementPrecision = ref('') // 查询页面返回 const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => { - nextTick(() => { + nextTick(async () => { + console.log(formField) if (type == 'tableForm') { - if(formField == 'fromPackingNumber'){ - val = val.filter(item=>!tableData.value.find(item1=>item1['itemCode']==item['itemCode']&&item1['fromBatch']==item['batch']&&item1['fromPackingNumber']==item['packingNumber']&&item1['fromLocationCode']==item['locationCode']&&item1['fromInventoryStatus']==item['inventoryStatus'])) - if(val.length==0) return - val.forEach(item=>{ - const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) + if (formField == 'fromPackingNumber') { + val = val.filter(item => !tableData.value.find(item1 => item1['itemCode'] == item['itemCode'] && item1['fromBatch'] == item['batch'] && item1['fromPackingNumber'] == item['packingNumber'] && item1['fromLocationCode'] == item['locationCode'] && item1['fromInventoryStatus'] == item['inventoryStatus'])) + if (val.length == 0) return + val.forEach(item => { + const newRow = JSON.parse(JSON.stringify({ ...tableFormKeys, ...item })) newRow['fromPackingNumber'] = item['packingNumber'] newRow['fromContainerNumber'] = item['containerNumber'] newRow['itemCode'] = item['itemCode'] @@ -308,16 +309,15 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => newRow['fromLocationCode'] = item['locationCode'] newRow['uom'] = item['uom'] newRow['qty'] = item['qty'] - + newRow['toInventoryStatus'] = "OK" //HoldtoWipRequestMain 隔离转线边 tableData.value.push(newRow) }) - }else if(formField == 'toLocationCode'){//到库位代码 - debugger - //从批次 - await ruleApi.getManagementPrecision({ - itemCodes: [row['itemCode']], - locationCode:row['fromLocationCode'] + } else if (formField == 'toLocationCode') {//到库位代码 + //从批次 + await ruleApi.getManagementPrecision({ + itemCodes: [row['itemCode']], + locationCode: row['fromLocationCode'] }).then((res) => { fromManagementPrecision.value = res[0].ManagementPrecision }) @@ -325,23 +325,24 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => if (fromManagementPrecision.value == 'BY_QUANTITY') {//如果从批次+物料管理精度是按数量 //到批次 await ruleApi.getManagementPrecision({ - itemCodes: [row['itemCode']], - locationCode:row['locationCode'] - }).then((res) => { - toManagementPrecision.value = res[0].ManagementPrecision - }) - if (toManagementPrecision.value != 'BY_QUANTITY') {//到批次+物料管理精度非数量需要添加批次 - if(newRow['fromBatch']==''){ - newRow['fromBatch'] = getFormattedDate(); // 获取 YYYYMMDD 格式的日期 + itemCodes: [row['itemCode']], + locationCode: row['locationCode'] + }).then((res) => { + toManagementPrecision.value = res[0].ManagementPrecision + }) + if (toManagementPrecision.value != 'BY_QUANTITY') {//到批次+物料管理精度非数量需要添加批次 + if (row['fromBatch'] == '') { + row['fromBatch'] = getFormattedDate(); // 获取 YYYYMMDD 格式的日期 + } + row['fromBatchFormItemType'] = 'FormDate' + row['disabled_fromBatch'] = false + } else { + row['fromBatchFormItemType'] = '' + row['disabled_fromBatch'] = true } - newRow['fromBatchFormItemType'] = 'FormDate' - newRow['disabled_fromBatch'] = false - }else { - newRow['fromBatchFormItemType'] = '' - newRow['disabled_fromBatch'] = true - } - } else { - row[formField] = val[0][searchField] + } else { + row[formField] = val[0][searchField] + } } } else { const setV = {} From e2002fc295a5f6ee1a978d077e1418b3e9838196 Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Wed, 30 Oct 2024 11:07:53 +0800 Subject: [PATCH 04/15] =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=8D=A2=E8=B4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchaseBarterRequest/index.vue | 15 +++++++++++---- .../purchaseBarterRequestMain.data.ts | 2 +- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRequest/index.vue b/src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRequest/index.vue index 922eb890a..1e8500eca 100644 --- a/src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRequest/index.vue +++ b/src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRequest/index.vue @@ -160,6 +160,10 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => }) } const handleDetailSubmitForm = async (formType, data) => { + if(data.qty > data.inventoryQty){ + message.warning("换货数量不能大于库存数量") + return + } if (formType === 'create') { await PurchaseBarterRequestDetailApi.createPurchaseBarterRequestDetail(data) message.success(t('common.createSuccess')) @@ -169,7 +173,7 @@ const handleDetailSubmitForm = async (formType, data) => { message.success(t('common.updateSuccess')) } detailRef.value.submitUpdateList() - + getList() } // 查询页面返回——详情 const searchTableSuccessDetail = (formField, searchField, val, formRef ) => { @@ -179,9 +183,12 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => { if(formField == 'itemCode'){ setV['itemCode'] = val[0]['itemCode'] setV['itemName'] = val[0]['itemName'] - setV['uom'] = val[0]['supplierUom'] - setV['packUnit'] = val[0]['packUnit'] - setV['batch'] = formatTime(new Date(), 'yyyyMMdd') + setV['uom'] = val[0]['uom'] + setV['batch'] = val[0]['batch'] + setV['location'] = val[0]['batch'] + setV['inventoryQty'] = val[0]['qty'] + setV['locationCode'] = val[0]['locationCode'] + setV['inventoryStatus'] = val[0]['inventoryStatus'] } formRef.setValues(setV) }) diff --git a/src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRequest/purchaseBarterRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRequest/purchaseBarterRequestMain.data.ts index b724fb19f..2da4e98ce 100644 --- a/src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRequest/purchaseBarterRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRequest/purchaseBarterRequestMain.data.ts @@ -153,7 +153,7 @@ export const PurchaseBarterRequestDetail = useCrudSchemas(reactive isFormModel:true, // filters中添加筛选的数据--取于formModel required:true, // 前置添加必有，和isFormModel结合使用 isSearch: true, - isMainValue: false + isMainValue: true }], verificationParams: [ { From 0fd600337e55387ac4c8d299c54ffcb6d22993b5 Mon Sep 17 00:00:00 2001 From: songguoqiang <765017469@qq.com> Date: Wed, 30 Oct 2024 13:41:20 +0800 Subject: [PATCH 05/15] =?UTF-8?q?YT-563:=E9=9A=94=E7=A6=BB=E8=BD=AC?= =?UTF-8?q?=E7=BA=BF=E8=BE=B9=E7=94=B3=E8=AF=B7=E5=88=9B=E5=BB=BA=E4=B8=8D?= =?UTF-8?q?=E6=88=90=E5=8A=9F=EF=BC=8C=E6=8F=90=E7=A4=BA=20=E4=B8=9A?= =?UTF-8?q?=E5=8A=A1=E7=B1=BB=E5=9E=8B=E4=B8=8D=E5=AD=98=E5=9C=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventorymove/inventorymoveRequestMainHOLDWIP/index.vue | 3 ++- .../inventorymoveRequestMain.data.ts | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainHOLDWIP/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainHOLDWIP/index.vue index 1a7b895a6..c11f9b414 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainHOLDWIP/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainHOLDWIP/index.vue @@ -326,7 +326,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => //到批次 await ruleApi.getManagementPrecision({ itemCodes: [row['itemCode']], - locationCode: row['locationCode'] + locationCode: val[0][searchField] }).then((res) => { toManagementPrecision.value = res[0].ManagementPrecision }) @@ -340,6 +340,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => row['fromBatchFormItemType'] = '' row['disabled_fromBatch'] = true } + row[formField] = val[0][searchField] } else { row[formField] = val[0][searchField] } diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainHOLDWIP/inventorymoveRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainHOLDWIP/inventorymoveRequestMain.data.ts index f46e14827..357a9e070 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainHOLDWIP/inventorymoveRequestMain.data.ts +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainHOLDWIP/inventorymoveRequestMain.data.ts @@ -936,9 +936,9 @@ export const InventorymoveRequestDetailRules = reactive({ fromLocationCode: [ { required: true, message: '请选择从库位代码', trigger: 'change' } ], - fromPackingNumber: [ - { required: true, message: '请选择从包装号', trigger: 'change' } - ], + // fromPackingNumber: [ + // { required: true, message: '请选择从包装号', trigger: 'change' } + // ], fromInventoryStatus: [ { required: true, message: '请选择从库存状态', trigger: 'change' } ], From 5b064706073829946b64be17444a82bb9abf8a1b Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Wed, 30 Oct 2024 15:25:50 +0800 Subject: [PATCH 06/15] =?UTF-8?q?YT-550=E5=BA=94=E5=8A=A0=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=EF=BC=9A=E7=94=9F=E6=95=88=E6=97=B6=E9=97=B4=E3=80=81?= =?UTF-8?q?=E5=A4=B1=E6=95=88=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../itemSyntheticRelation.data.ts | 51 +++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/src/views/wms/basicDataManage/itemManage/itemSyntheticRelation/itemSyntheticRelation.data.ts b/src/views/wms/basicDataManage/itemManage/itemSyntheticRelation/itemSyntheticRelation.data.ts index c06a468ed..cb338d498 100644 --- a/src/views/wms/basicDataManage/itemManage/itemSyntheticRelation/itemSyntheticRelation.data.ts +++ b/src/views/wms/basicDataManage/itemManage/itemSyntheticRelation/itemSyntheticRelation.data.ts @@ -1,6 +1,7 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' import {Itembasic} from "@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data"; import * as ItembasicApi from "@/api/wms/itembasic"; +import {dateFormatter} from "@/utils/formatTime"; // 表单校验 export const ItemSyntheticRelationRules = reactive({ @@ -76,6 +77,56 @@ export const ItemSyntheticRelation = useCrudSchemas(reactive([ isSearch: false, isForm:false, }, + { + label: '生效时间', + field: 'effectiveDate', + sort: 'custom', + formatter: dateFormatter, + isSearch: false, + isTable: true, + isForm: true, + isDetail: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')] + } + }, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + valueFormat: 'x' + } + }, + }, + { + label: '失效时间', + field: 'expirationDate', + sort: 'custom', + formatter: dateFormatter, + isSearch: false, + isTable: true, + isForm: true, + isDetail: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')] + } + }, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + valueFormat: 'x' + } + }, + }, { label: '备注', field: 'remark', From 1e185ab99951601d88b6d0a18679c193aed5b504 Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Wed, 30 Oct 2024 16:03:33 +0800 Subject: [PATCH 07/15] =?UTF-8?q?YT-507=E5=A4=87=E6=96=99=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../preparetoissueMain.data.ts | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts index 2d31acb18..016dd1a3f 100644 --- a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts +++ b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts @@ -293,15 +293,16 @@ export const PreparetoissueMain = useCrudSchemas(reactive([ } } }, - // { - // label: '备注', - // field: 'remark', - // sort: 'custom', - // table: { - // width: 150 - // }, - // isTable: false - // }, + { + label: '备注', + field: 'remark', + sort: 'custom', + table: { + width: 150 + }, + isTable: true, + isForm:false, + }, { label: '是否可用', field: 'available', From cfe10e78c5452ef0c15cac8b0652104fb395b279 Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Wed, 30 Oct 2024 19:45:02 +0800 Subject: [PATCH 08/15] =?UTF-8?q?YT-511=E7=BB=B4=E4=BF=AE=E5=A4=87?= =?UTF-8?q?=E4=BB=B6=E6=94=B6=E8=B4=A7=E7=94=B3=E8=AF=B7=E5=8F=AA=E5=8F=AF?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=A1=A5=E7=BB=99=E5=93=81=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E7=9A=84=E7=89=A9=E6=96=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sparereceiptRequestMain.data.ts | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts index 95425975f..0d02d5313 100644 --- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts @@ -658,7 +658,14 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive Date: Wed, 30 Oct 2024 19:59:24 +0800 Subject: [PATCH 09/15] =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E8=A6=81=E8=B4=A7=E8=AE=A1=E5=88=92=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchaseMain/purchaseMain.data.ts | 20 + .../purchasePlanMain/purchasePlanMain.data.ts | 1710 +++++++++-------- 2 files changed, 889 insertions(+), 841 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts index d58f4181d..b2202fea1 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts @@ -549,6 +549,26 @@ export const PurchaseDetail = useCrudSchemas(reactive([ precision: 6 }, }, + { + label: '默认收货库区', + field: 'defaultAreaCode', + table: { + width: 150 + }, + isTableForm: false, + isForm: false, + isTable: true, + }, + { + label: '库区描述', + field: 'areaDescription', + table: { + width: 150 + }, + isTableForm: false, + isForm: false, + isTable: true, + }, // { // label: 'ERP库位', // field: 'erpLocationCode', diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts index 15301f1f6..efa4b84dc 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts @@ -1,913 +1,947 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' -import { dateFormatter,dateFormatter2 } from '@/utils/formatTime' +import { dateFormatter, dateFormatter2 } from '@/utils/formatTime' import * as SupplierApi from '@/api/wms/supplier' import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data' import * as PurchaseMainApi from '@/api/wms/purchaseMain' import * as PurchaseDetailApi from '@/api/wms/purchaseDetail' import { PurchaseDetail, PurchaseMain } from '../purchaseMain/purchaseMain.data' -import {getPurchaseDetailPagePoNumber} from "@/api/wms/purchaseDetail"; +import { getPurchaseDetailPagePoNumber } from '@/api/wms/purchaseDetail' import * as ItembasicApi from '@/api/wms/itembasic' -import {Itembasic} from "@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data"; +import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data' const { t } = useI18n() // 国际化 /** * @returns {Array} 要货计划主表 */ -export const PurchasePlanMain = useCrudSchemas(reactive([ - { - label: '要货计划单号', - field: 'number', - sort: 'custom', - isForm: false, - table: { - width: 180, - fixed: 'left' - }, - sortTableDefault:1, - sortSearchDefault:4, - isSearch: true - }, - { - label: '状态', - field: 'status', - sort: 'custom', - dictType: DICT_TYPE.PURCHASE_PLAN_STATUS, - dictClass: 'string', - isTable: true, - isForm:false, - isSearch: true, - table: { - width: 150 - }, - sortTableDefault:2, - sortSearchDefault:6, - search:{ - value:[], - componentProps: { - multiple:true +export const PurchasePlanMain = useCrudSchemas( + reactive([ + { + label: '要货计划单号', + field: 'number', + sort: 'custom', + isForm: false, + table: { + width: 180, + fixed: 'left' + }, + sortTableDefault: 1, + sortSearchDefault: 4, + isSearch: true + }, + { + label: '状态', + field: 'status', + sort: 'custom', + dictType: DICT_TYPE.PURCHASE_PLAN_STATUS, + dictClass: 'string', + isTable: true, + isForm: false, + isSearch: true, + table: { + width: 150 + }, + sortTableDefault: 2, + sortSearchDefault: 6, + search: { + value: [], + componentProps: { + multiple: true + } + }, + form: { + value: '1', + componentProps: { + disabled: true + } } }, - form: { - value: '1', - componentProps: { - disabled: true + { + label: '供应商代码', + field: 'supplierCode', + sort: 'custom', + table: { + width: 150 + }, + isSearch: true, + sortTableDefault: 3, + sortSearchDefault: 1, + form: { + labelMessage: '影响明细中物料代码，需在供应商物料中维护', + componentProps: { + enterSearch: true, + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择供应商代码', // 输入框占位文本 + searchField: 'code', // 查询弹窗赋值字段 + searchTitle: '供应商信息', // 查询弹窗标题 + searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类 + searchPage: SupplierApi.getSupplierPageSCP, // 查询弹窗所需分页方法 + searchCondition: [ + { + key: 'available', + value: 'TRUE', + isMainValue: false + } + ], + verificationParams: [ + { + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: 'true', + isFormModel: true + } + ] // 失去焦点校验参数 + } + }, + search: { + componentProps: { + enterSearch: true, + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择供应商代码', // 输入框占位文本 + searchField: 'code', // 查询弹窗赋值字段 + searchTitle: '供应商信息', // 查询弹窗标题 + searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类 + searchPage: SupplierApi.getSupplierPageSCP, // 查询弹窗所需分页方法 + searchCondition: [ + { + key: 'available', + value: 'TRUE', + isMainValue: false + } + ] + } } - } - }, - { - label: '供应商代码', - field: 'supplierCode', - sort: 'custom', - table: { - width: 150, - }, - isSearch: true, - sortTableDefault:3, - sortSearchDefault:1, - form: { - labelMessage: '影响明细中物料代码，需在供应商物料中维护', - componentProps: { - enterSearch: true, - isSearchList: true, // 开启查询弹窗 - searchListPlaceholder: '请选择供应商代码', // 输入框占位文本 - searchField: 'code', // 查询弹窗赋值字段 - searchTitle: '供应商信息', // 查询弹窗标题 - searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类 - searchPage: SupplierApi.getSupplierPageSCP, // 查询弹窗所需分页方法 - searchCondition: [{ - key: 'available', - value: 'TRUE', - isMainValue: false - }], - verificationParams: [{ - key: 'code', - action: '==', - value: '', - isMainValue: false, - isSearch: 'true', - isFormModel: true - }], // 失去焦点校验参数 + }, + { + label: '供应商名称', + field: 'supplierName', + table: { + width: 150 + }, + sortTableDefault: 4, + sortSearchDefault: 1, + isTable: true, + isForm: false + }, + //仅是主列表页面的筛选搜索条件 + { + label: '送达日期', + field: 'deliveryDate', + sort: 'custom', + isDetail: false, + isTable: false, + isForm: false, + isTableForm: false, + isSearch: true, + sortSearchDefault: 3, + formatter: dateFormatter2, + search: { + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD HH:mm:ss', + // type: 'datetimerange', + type: 'daterange', + defaultTime: [new Date('1 '), new Date('1 ')] + } } }, - search: { - componentProps: { - enterSearch: true, - isSearchList: true, // 开启查询弹窗 - searchListPlaceholder: '请选择供应商代码', // 输入框占位文本 - searchField: 'code', // 查询弹窗赋值字段 - searchTitle: '供应商信息', // 查询弹窗标题 - searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类 - searchPage: SupplierApi.getSupplierPageSCP, // 查询弹窗所需分页方法 - searchCondition: [{ - key: 'available', - value: 'TRUE', - isMainValue: false - }] + { + label: '采购订单', + field: 'poNumber', + sort: 'custom', + sortSearchDefault: 11, + formatter: dateFormatter2, + table: { + width: 150 + }, + isTable: false, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + enterSearch: true, + dialogWidth: '1085px', //搜索出来弹窗的宽度 + isSearchList: true, + searchListPlaceholder: '请选择采购订单', + searchField: 'number', + searchTitle: '采购订单信息', + searchAllSchemas: PurchaseMain.allSchemas, + searchPage: PurchaseMainApi.getPurchaseMainPage, + searchCondition: [ + { + key: 'type', + value: 'SCHEDULE', + isMainValue: false + }, + { + key: 'available', + value: 'TRUE', + isMainValue: false + }, + { + key: 'supplierCode', + value: 'supplierCode', + message: '请填写供应商代码！', + isMainValue: true + }, + { + key: 'status', + value: 2, + isMainValue: false + } + ], + verificationParams: [ + { + key: 'number', + action: '==', + value: '', + isMainValue: false, + isSearch: 'true', + isFormModel: true + } + ] // 失去焦点校验参数 + } } - } - }, - { - label: '供应商名称', - field: 'supplierName', - table: { - width: 150 - }, - sortTableDefault:4, - sortSearchDefault:1, - isTable:true, - isForm: false - }, - //仅是主列表页面的筛选搜索条件 - { - label: '送达日期', - field: 'deliveryDate', - sort: 'custom', - isDetail:false, - isTable: false, - isForm:false, - isTableForm:false, - isSearch:true, - sortSearchDefault:3, - formatter: dateFormatter2, - search: { - component: 'DatePicker', - componentProps: { - valueFormat: 'YYYY-MM-DD HH:mm:ss', - // type: 'datetimerange', - type: 'daterange', - defaultTime: [new Date('1 '), new Date('1 ')] + }, + { + label: '送达日期', + field: 'deliveryDate', + table: { + width: 180 + }, + formatter: dateFormatter2, + sortTableDefault: 13, + form: { + component: 'DatePicker', + componentProps: { + type: 'date', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x' + } + }, + detail: { + dateFormat: 'YYYY-MM-DD' } }, - }, - { - label: '采购订单', - field: 'poNumber', - sort: 'custom', - sortSearchDefault:11, - formatter: dateFormatter2, - table: { - width: 150 - }, - isTable:false, - form: { - // labelMessage: '信息提示说明！！！', - componentProps: { - enterSearch:true, - dialogWidth:'1085px',//搜索出来弹窗的宽度 - isSearchList: true, - searchListPlaceholder: '请选择采购订单', - searchField: 'number', - searchTitle: '采购订单信息', - searchAllSchemas: PurchaseMain.allSchemas, - searchPage: PurchaseMainApi.getPurchaseMainPage, - searchCondition: [{ - key: 'type', - value: 'SCHEDULE', - isMainValue: false - },{ - key: 'available', - value: 'TRUE', - isMainValue: false - },{ - key: 'supplierCode', - value: 'supplierCode', - message: '请填写供应商代码！', - isMainValue: true - },{ - key: 'status', - value: 2, - isMainValue: false - }], - verificationParams: [{ - key: 'number', - action: '==', - value: '', - isMainValue: false, - isSearch: 'true', - isFormModel: true - }], // 失去焦点校验参数 + { + label: '采购订单类型', + field: 'type', + sort: 'custom', + sortTableDefault: 13, + dictType: DICT_TYPE.PURCHASE_ORDER_TYPE, + dictClass: 'string', + isTable: true, + isForm: true, + table: { + width: 150 + }, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + disabled: true + } } - } - }, - { - label: '送达日期', - field: 'deliveryDate', - table: { - width: 180 - }, - formatter: dateFormatter2, - sortTableDefault:13, - form: { - component: 'DatePicker', - componentProps: { - type: 'date', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', + }, + { + label: '收货人', + field: 'contacts', + isTable: false, + table: { + width: 150 + }, + form: { + componentProps: { + disabled: false + } } }, - detail: { - dateFormat: 'YYYY-MM-DD' - }, - }, - { - label: '采购订单类型', - field: 'type', - sort: 'custom', - sortTableDefault:13, - dictType: DICT_TYPE.PURCHASE_ORDER_TYPE, - dictClass: 'string', - isTable: true, - isForm:true, - table: { - width: 150 - }, - form: { - // labelMessage: '信息提示说明！！！', - componentProps: { - disabled: true + { + label: '联系电话', + field: 'phone', + isTable: false, + table: { + width: 150 + }, + form: { + componentProps: { + disabled: false + } } - } - }, - { - label: '收货人', - field: 'contacts', - isTable:false, - table: { - width: 150 - }, - form: { - componentProps: { - disabled: false + }, + + { + label: '时间窗口', + field: 'timeWindow', + table: { + width: 150 + }, + isTable: false, + isForm: false + }, + { + label: '开始时间', + field: 'beginTime', + sort: 'custom', + table: { + width: 150 + }, + isTable: false, + isForm: false, + isDetail: false, + form: { + component: 'TimePicker', + componentProps: { + format: 'HH:mm' + } } - } - }, - { - label: '联系电话', - field: 'phone', - isTable:false, - table: { - width: 150 - }, - form: { - componentProps: { - disabled: false + }, + { + label: '结束时间', + field: 'endTime', + sort: 'custom', + table: { + width: 150 + }, + isTable: false, + isForm: false, + isDetail: false, + form: { + component: 'TimePicker', + componentProps: { + format: 'HH:mm' + } } - } - }, - - { - label: '时间窗口', - field: 'timeWindow', - table: { - width: 150 - }, - isTable:false, - isForm: false - }, - { - label: '开始时间', - field: 'beginTime', - sort: 'custom', - table: { - width: 150 - }, - isTable:false, - isForm:false, - isDetail:false, - form:{ - component:"TimePicker", - componentProps: { - format:"HH:mm", + }, + { + label: '仓库代码', + field: 'warehouseCode', + sort: 'custom', + table: { + width: 150 + }, + isTable: false, + isForm: false + }, + { + label: '月台代码', + field: 'dockCode', + sort: 'custom', + table: { + width: 150 + }, + isForm: false, + isTable: false + }, + { + label: '业务类型', + field: 'businessType', + sort: 'custom', + table: { + width: 150 + }, + isForm: false, + isTable: false, + form: { + value: 'PurchaseReceipt', + componentProps: { + disabled: true + } } - } - }, - { - label: '结束时间', - field: 'endTime', - sort: 'custom', - table: { - width: 150 - }, - isTable:false, - isForm:false, - isDetail:false, - form:{ - component:"TimePicker", - componentProps: { - format:"HH:mm", + }, + + // { + // label: '自动发布', + // field: 'autoPublish', + // dictType: DICT_TYPE.TRUE_FALSE, + // dictClass: 'string', + // isTable: true, + // sort: 'custom', + // table: { + // width: 150 + // }, + // form: { + // component: 'Switch', + // value: "TRUE", + // componentProps: { + // inactiveValue: 'FALSE', + // activeValue: 'TRUE' + // } + // } + // }, + // { + // label: '自动接收', + // field: 'autoAccept', + // dictType: DICT_TYPE.TRUE_FALSE, + // dictClass: 'string', + // isTable: true, + // sort: 'custom', + // table: { + // width: 150 + // }, + // form: { + // component: 'Switch', + // value: "TRUE", + // componentProps: { + // inactiveValue: 'FALSE', + // activeValue: 'TRUE' + // } + // } + // }, + // { + // label: '是否可用', + // field: 'available', + // dictType: DICT_TYPE.TRUE_FALSE, + // dictClass: 'string', + // isTable: true, + // sort: 'custom', + // table: { + // width: 150 + // }, + // form: { + // component: 'Switch', + // value: 'TRUE', + // componentProps: { + // inactiveValue: 'FALSE', + // activeValue: 'TRUE', + // disabled: true + // } + // }, + // isSearch: true, + // }, + { + label: '创建者', + field: 'creator', + sort: 'custom', + isForm: false, + isTable: false, + table: { + width: 150 } - } - }, - { - label: '仓库代码', - field: 'warehouseCode', - sort: 'custom', - table: { - width: 150 - }, - isTable:false, - isForm: false, - }, - { - label: '月台代码', - field: 'dockCode', - sort: 'custom', - table: { - width: 150 - }, - isForm: false, - isTable:false, - }, - { - label: '业务类型', - field: 'businessType', - sort: 'custom', - table: { - width: 150 - }, - isForm: false, - isTable:false, - form: { - value: 'PurchaseReceipt', - componentProps: { - disabled: true + }, + { + label: '创建时间', + field: 'createTime', + isTable: true, + isForm: false, + formatter: dateFormatter, + sortTableDefault: 13, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sort: 'custom', + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + style: { width: '100%' }, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x' + } + }, + 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')] + } } - } - }, - - - // { - // label: '自动发布', - // field: 'autoPublish', - // dictType: DICT_TYPE.TRUE_FALSE, - // dictClass: 'string', - // isTable: true, - // sort: 'custom', - // table: { - // width: 150 - // }, - // form: { - // component: 'Switch', - // value: "TRUE", - // componentProps: { - // inactiveValue: 'FALSE', - // activeValue: 'TRUE' - // } - // } - // }, - // { - // label: '自动接收', - // field: 'autoAccept', - // dictType: DICT_TYPE.TRUE_FALSE, - // dictClass: 'string', - // isTable: true, - // sort: 'custom', - // table: { - // width: 150 - // }, - // form: { - // component: 'Switch', - // value: "TRUE", - // componentProps: { - // inactiveValue: 'FALSE', - // activeValue: 'TRUE' - // } - // } - // }, - // { - // label: '是否可用', - // field: 'available', - // dictType: DICT_TYPE.TRUE_FALSE, - // dictClass: 'string', - // isTable: true, - // sort: 'custom', - // table: { - // width: 150 - // }, - // form: { - // component: 'Switch', - // value: 'TRUE', - // componentProps: { - // inactiveValue: 'FALSE', - // activeValue: 'TRUE', - // disabled: true - // } - // }, - // isSearch: true, - // }, - { - label: '创建者', - field: 'creator', - sort: 'custom', - isForm: false, - isTable:false, - table: { - width: 150 - }, - }, - { - label: '创建时间', - field: 'createTime', - isTable:true, - isForm: false, - formatter: dateFormatter, - sortTableDefault:13, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - sort: 'custom', - table: { - width: 180 - }, - form: { - component: 'DatePicker', - componentProps: { - style: { width: '100%' }, - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', + }, + { + label: '最后更新者', + field: 'updater', + sort: 'custom', + isForm: false, + isTable: false, + table: { + width: 150 } }, - 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')] + { + label: '最后更新时间', + field: 'updateTime', + isTable: false, + isForm: false, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sort: 'custom', + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + style: { width: '100%' }, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x' + } } }, - }, - { - label: '最后更新者', - field: 'updater', - sort: 'custom', - isForm: false, - isTable:false, - table: { - width: 150 - }, - }, - { - label: '最后更新时间', - field: 'updateTime', - isTable: false, - isForm: false, - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - sort: 'custom', - table: { - width: 180 - }, - form: { - component: 'DatePicker', - componentProps: { - style: { width: '100%' }, - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', + { + label: '备注', + field: 'remark', + sort: 'custom', + table: { + width: 150 + }, + isTable: false, + isForm: false, + isDetail: false + }, + { + label: '操作', + field: 'action', + isDetail: false, + isForm: false, + table: { + width: 250, + fixed: 'right' } } - }, - { - label: '备注', - field: 'remark', - sort: 'custom', - table: { - width: 150 - }, - isTable: false, - isForm:false, - isDetail:false, - }, - { - label: '操作', - field: 'action', - isDetail: false, - isForm: false, - table: { - width: 250, - fixed: 'right' - } - } -])) + ]) +) //表单校验 export const PurchasePlanMainRules = reactive({ - available: [ - { required: true, message: '请选择是否可用', trigger: 'change' } - ], - supplierCode: [ - { required: true, message: '请选择供应商代码', trigger: 'change' } - ], - poNumber: [ - { required: true, message: '请选择采购订单号', trigger: 'change' } - ], - deliveryDate: [ - { required: true, message: '请选择送达时间', trigger: 'change' } - ], - 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' } - ], + available: [{ required: true, message: '请选择是否可用', trigger: 'change' }], + supplierCode: [{ required: true, message: '请选择供应商代码', trigger: 'change' }], + poNumber: [{ required: true, message: '请选择采购订单号', trigger: 'change' }], + deliveryDate: [{ required: true, message: '请选择送达时间', trigger: 'change' }], + 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' }] }) /** * @returns {Array} 要货计划子表 */ -export const PurchasePlanDetail = useCrudSchemas(reactive([ - { - label: '采购订单号', - field: 'poNumber', - isSearch:true, - isTable:true, - sortTableDefault:11, - sortSearchDefault:11, - isForm:false, - isTableForm:false, - table: { - width: 150 - }, - search: { - // labelMessage: '信息提示说明！！！', - componentProps: { - dialogWidth:'1085px',//搜索出来弹窗的宽度 - isSearchList: true, - enterSearch: true, - searchListPlaceholder: '请选择采购订单', - searchField: 'number', - searchTitle: '采购订单信息', - searchAllSchemas: PurchaseMain.allSchemas, - searchPage: PurchaseMainApi.getPurchaseMainPage, - searchCondition: [{ - key: 'available', - value: 'TRUE', - isMainValue: false - },{ - key: 'supplierCode', - value: 'supplierCode', - message: '请填写供应商代码！', - isMainValue: true - },{ - key: 'status', - value: 2, - isMainValue: false - }] +export const PurchasePlanDetail = useCrudSchemas( + reactive([ + { + label: '采购订单号', + field: 'poNumber', + isSearch: true, + isTable: true, + sortTableDefault: 11, + sortSearchDefault: 11, + isForm: false, + isTableForm: false, + table: { + width: 150 + }, + search: { + // labelMessage: '信息提示说明！！！', + componentProps: { + dialogWidth: '1085px', //搜索出来弹窗的宽度 + isSearchList: true, + enterSearch: true, + searchListPlaceholder: '请选择采购订单', + searchField: 'number', + searchTitle: '采购订单信息', + searchAllSchemas: PurchaseMain.allSchemas, + searchPage: PurchaseMainApi.getPurchaseMainPage, + searchCondition: [ + { + key: 'available', + value: 'TRUE', + isMainValue: false + }, + { + key: 'supplierCode', + value: 'supplierCode', + message: '请填写供应商代码！', + isMainValue: true + }, + { + key: 'status', + value: 2, + isMainValue: false + } + ] + } } - } - }, - { - label: '订单行', - field: 'poLine', - sort: 'custom', - table: { - width: 150 - }, - sortTableDefault:12, - form: { - // labelMessage: '信息提示说明！！！', - componentProps: { + }, + { + label: '订单行', + field: 'poLine', + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault: 12, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + disabled: true, + isSearchList: false, + searchListPlaceholder: '请选择订单行', + searchField: 'lineNumber', + searchTitle: '采购订单信息', + searchAllSchemas: PurchaseDetail.allSchemas, + searchPage: PurchaseDetailApi.getPurchaseDetailPagePoNumber, + searchCondition: [ + { + key: 'number', + value: 'poNumber', + message: '请填写订单号！', + isMainValue: true + }, + { + key: 'available', + value: 'TRUE', + isMainValue: false + } + ] + } + }, + tableForm: { + multiple: true, disabled: true, - isSearchList: false, + isInpuFocusShow: false, searchListPlaceholder: '请选择订单行', searchField: 'lineNumber', searchTitle: '采购订单信息', searchAllSchemas: PurchaseDetail.allSchemas, searchPage: PurchaseDetailApi.getPurchaseDetailPagePoNumber, - searchCondition: [{ - key: 'number', - value: 'poNumber', - message: '请填写订单号！', - isMainValue: true - },{ - key: 'available', - value: 'TRUE', - isMainValue: false - }] + searchCondition: [ + { + key: 'number', + value: 'poNumber', + message: '请填写订单号！', + isMainValue: true + }, + { + key: 'available', + value: 'TRUE', + isMainValue: false + } + ] } }, - tableForm: { - multiple:true, - disabled: true, - isInpuFocusShow: false, - searchListPlaceholder: '请选择订单行', - searchField: 'lineNumber', - searchTitle: '采购订单信息', - searchAllSchemas: PurchaseDetail.allSchemas, - searchPage: PurchaseDetailApi.getPurchaseDetailPagePoNumber, - searchCondition: [{ - key: 'number', - value: 'poNumber', - message: '请填写订单号！', - isMainValue: true - },{ - key: 'available', - value: 'TRUE', - isMainValue: false - }] - } - }, - { - label: '品番', - field: 'itemCode', - sort: 'custom', - table: { - width: 150 - }, - sortTableDefault:5, - sortSearchDefault:5, - isSearch:true, - form: { - componentProps: { + { + label: '品番', + field: 'itemCode', + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault: 5, + sortSearchDefault: 5, + isSearch: true, + form: { + componentProps: { + disabled: true + } + }, + tableForm: { disabled: true + }, + search: { + // labelMessage: '信息提示说明！！！', + componentProps: { + multiple: true, + enterSearch: true, + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择物料代码', // 输入框占位文本 + searchField: 'code', // 查询弹窗赋值字段 + searchTitle: '物料基础信息', // 查询弹窗标题 + searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类 + searchPage: ItembasicApi.getItembasicPage, // 查询弹窗所需分页方法 + searchCondition: [ + { + key: 'supplierCode', + value: 'supplierCode', + message: '请填写供应商代码！', + isMainValue: true + }, + { + key: 'available', + value: 'TRUE', + isMainValue: false + } + ] + } } }, - tableForm: { - disabled: true - }, - search: { - // labelMessage: '信息提示说明！！！', - componentProps: { - multiple: true, - enterSearch: true, - isSearchList: true, // 开启查询弹窗 - searchListPlaceholder: '请选择物料代码', // 输入框占位文本 - searchField: 'code', // 查询弹窗赋值字段 - searchTitle: '物料基础信息', // 查询弹窗标题 - searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类 - searchPage: ItembasicApi.getItembasicPage, // 查询弹窗所需分页方法 - searchCondition: [{ - key: 'supplierCode', - value: 'supplierCode', - message: '请填写供应商代码！', - isMainValue: true, - },{ - key: 'available', - value: 'TRUE', - isMainValue: false - }] - } - } - }, - { - label: '受入地', - field: 'receivedLocation', - sort: 'custom', - sortTableDefault:6, - sortSearchDefault:6, - table: { - width: 150 - }, - isTableForm: true, - isForm: true, - form: { - componentProps: { + { + label: '物料状态', + field: 'itemStatus', + sort: 'custom', + dictType: DICT_TYPE.ITEM_STATUS, + dictClass: 'string', + isTable: true, + sortTableDefault: 10, + sortSearchDefault: 10, + table: { + width: 150 + }, + form: { + componentProps: { + disabled: true + } + }, + tableForm: { + type: 'Select', disabled: true } }, - tableForm: { - type: 'Select', - disabled:true, - }, - }, - { - label: '受入号', - field: 'receivedNumber', - sort: 'custom', - sortTableDefault:7, - sortSearchDefault:7, - table: { - width: 150 - }, - isTableForm: true, - isForm: true, - form: { - componentProps: { + { + label: '默认收货库区', + field: 'defaultAreaCode', + table: { + width: 150 + }, + sortTableDefault: 7, + isTableForm: true, + isForm: true, + isTable: true + }, + { + label: '库区描述', + field: 'areaDescription', + table: { + width: 150 + }, + isTableForm: true, + isForm: true, + isTable: true + }, + { + label: '受入号', + field: 'receivedNumber', + sort: 'custom', + sortTableDefault: 7, + sortSearchDefault: 7, + table: { + width: 150 + }, + isTableForm: true, + isForm: true, + form: { + componentProps: { + disabled: true + } + }, + tableForm: { + type: 'Select', disabled: true } }, - tableForm: { - type: 'Select', - disabled:true, - }, - }, - { - label: '订单数量', - field: 'orderQty', - sort: 'custom', - sortTableDefault:8, - sortSearchDefault:8, - table: { - width: 150 - }, - form: { - componentProps: { + { + label: '订单数量', + field: 'orderQty', + sort: 'custom', + sortTableDefault: 8, + sortSearchDefault: 8, + table: { + width: 150 + }, + form: { + componentProps: { + disabled: true + } + }, + tableForm: { disabled: true } }, - tableForm: { - disabled: true - } - - }, - { - label: '计划数量', - field: 'planQty', - sort: 'custom', -    sortTableDefault:9, -    sortSearchDefault:9, - table: { - width: 150 - }, - tableForm: { - type: 'InputNumber', - precision: 6 - }, - form: { - component: 'InputNumber', - componentProps: { - min: 0, + { + label: '计划数量', + field: 'planQty', + sort: 'custom', + sortTableDefault: 9, + sortSearchDefault: 9, + table: { + width: 150 + }, + tableForm: { + type: 'InputNumber', precision: 6 + }, + form: { + component: 'InputNumber', + componentProps: { + min: 0, + precision: 6 + } } - } - }, - { - label: '已发货数量', - field: 'shippedQty', - sort: 'custom', - table: { - width: 150 - }, - isTableForm: false, - isForm: false, - isTable: false, - }, + }, + { + label: '已发货数量', + field: 'shippedQty', + sort: 'custom', + table: { + width: 150 + }, + isTableForm: false, + isForm: false, + isTable: false + }, - { - label: '在途数量', - field: 'notReceiveQty', - sort: 'custom', - table: { - width: 150 - }, - isTableForm: false, - isForm: false, - isTable: false, - sortTableDefault:7, - }, - { - label: '计量单位', - field: 'uom', - sort: 'custom', - dictType: DICT_TYPE.UOM, - dictClass: 'string', - isTable: true, -    sortTableDefault:10, -    sortSearchDefault:10, - table: { - width: 150 - }, - form: { - componentProps: { + { + label: '在途数量', + field: 'notReceiveQty', + sort: 'custom', + table: { + width: 150 + }, + isTableForm: false, + isForm: false, + isTable: false, + sortTableDefault: 7 + }, + { + label: '计量单位', + field: 'uom', + sort: 'custom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isTable: true, + sortTableDefault: 10, + sortSearchDefault: 10, + table: { + width: 150 + }, + form: { + componentProps: { + disabled: true + } + }, + tableForm: { + type: 'Select', disabled: true } }, - tableForm: { - type: 'Select', - disabled:true, - } - }, - { - label: '要货计划单号', - field: 'number', - sort: 'custom', - isTableForm: false, - hiddenInMain:true, - table: { - width: 180 - }, - form: { - componentProps: { - disabled: true + { + label: '要货计划单号', + field: 'number', + sort: 'custom', + isTableForm: false, + hiddenInMain: true, + table: { + width: 180 + }, + form: { + componentProps: { + disabled: true + } } - } - }, - { - label: '已收货数量', - field: 'receivedQty', - sort: 'custom', - table: { - width: 150 - }, - - isTableForm: false, - isForm: false, - isTable: false, - sortTableDefault:6, - }, - { - label: '是否可用', - field: 'available', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', - isTable: true, - isTableForm:false, - isForm:false, - hiddenInMain:true, - sort: 'custom', - table: { - width: 150 - }, - tableForm: { - type: 'Select', - inactiveValue: 'FALSE', - disabled: true - }, - form: { - component: 'Switch', - value: 'TRUE', - componentProps: { + }, + { + label: '已收货数量', + field: 'receivedQty', + sort: 'custom', + table: { + width: 150 + }, + + isTableForm: false, + isForm: false, + isTable: false, + sortTableDefault: 6 + }, + { + label: '是否可用', + field: 'available', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isTable: true, + isTableForm: false, + isForm: false, + hiddenInMain: true, + sort: 'custom', + table: { + width: 150 + }, + tableForm: { + type: 'Select', inactiveValue: 'FALSE', - activeValue: 'TRUE' + disabled: true + }, + form: { + component: 'Switch', + value: 'TRUE', + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE' + } } - } - }, - { - label: '最后更新者', - field: 'updater', - sort: 'custom', - isTableForm: false, - hiddenInMain:true, - table: { - width: 150 - }, - isForm: false, - }, - { - label: '最后更新时间', - field: 'updateTime', - sort: 'custom', - isTableForm: false, - hiddenInMain:true, - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - table: { - width: 180 - }, - isForm: false, - form: { - component: 'DatePicker', - componentProps: { - style: { width: '100%' }, - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', + }, + { + label: '最后更新者', + field: 'updater', + sort: 'custom', + isTableForm: false, + hiddenInMain: true, + table: { + width: 150 + }, + isForm: false + }, + { + label: '最后更新时间', + field: 'updateTime', + sort: 'custom', + isTableForm: false, + hiddenInMain: true, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + table: { + width: 180 + }, + isForm: false, + form: { + component: 'DatePicker', + componentProps: { + style: { width: '100%' }, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x' + } + } + }, + { + label: '备注', + field: 'remark', + sort: 'custom', + hiddenInMain: true, + isTableForm: false, + table: { + width: 150 } + }, + { + label: '操作', + field: 'action', + isDetail: false, + isForm: false, + hiddenInMain: true, + table: { + width: 150, + fixed: 'right' + }, + isTableForm: false } - }, - { - label: '备注', - field: 'remark', - sort: 'custom', - hiddenInMain:true, - isTableForm:false, - table: { - width: 150 - }, - }, - { - label: '操作', - field: 'action', - isDetail: false, - isForm: false, - hiddenInMain:true, - table: { - width: 150, - fixed: 'right' - }, - isTableForm: false, - } -])) + ]) +) const validatePlanQty = (rule, value, callback) => { - console.log('validatePlanQty',value) + console.log('validatePlanQty', value) const numReg = /^[\d]+$/ - if (numReg.test(value)&&value>=0) { - callback() + if (numReg.test(value) && value >= 0) { + callback() } else { - callback(new Error('计划数量不能小于0')) + callback(new Error('计划数量不能小于0')) } } //表单校验 @@ -915,17 +949,11 @@ export const PurchasePlanDetailRules = reactive({ // available: [ // { required: true, message: '请选择是否可用', trigger: 'change' } // ], - shippedQty: [ - { required: true, message: '请输入已发货数量', trigger: 'blur' } - ], - uom: [ - { required: true, message: '请选择计量单位', trigger: 'change' } - ], + shippedQty: [{ required: true, message: '请输入已发货数量', trigger: 'blur' }], + uom: [{ required: true, message: '请选择计量单位', trigger: 'change' }], planQty: [ { required: true, message: '请输入计划数量', trigger: 'blur' }, - { validator:validatePlanQty, message: '计划数量不能小于0', trigger: 'blur'} - ], - remark: [ - { max: 50, message: '不得超过50个字符', trigger: 'blur' } + { validator: validatePlanQty, message: '计划数量不能小于0', trigger: 'blur' } ], + remark: [{ max: 50, message: '不得超过50个字符', trigger: 'blur' }] }) From 767baeb7d512a1670976f0c6e115d5a1d4dc04ae Mon Sep 17 00:00:00 2001 From: "YEJIAXING-PC\\lenovo" <591141169@qq.com> Date: Thu, 31 Oct 2024 11:51:28 +0800 Subject: [PATCH 10/15] =?UTF-8?q?=E5=BA=93=E5=AD=98=E4=BD=99=E9=A2=9D?= =?UTF-8?q?=EF=BC=8C=E6=A0=87=E7=AD=BE=E4=BF=A1=E6=81=AF=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E9=9A=90=E8=97=8F=20=20YT-569?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/inventoryManage/balance/index.vue | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/views/wms/inventoryManage/balance/index.vue b/src/views/wms/inventoryManage/balance/index.vue index 7ef12fb88..82b8fc876 100644 --- a/src/views/wms/inventoryManage/balance/index.vue +++ b/src/views/wms/inventoryManage/balance/index.vue @@ -250,17 +250,17 @@ const handleSelectionPoint = async () => { } // 列表-操作按钮 const butttondata = [ - { - label: '标签信息', - name: 'bqxx', - hide: false, - type: 'primary', - icon: '', - color: '', - link: true, - float: 'right', - hasPermi: '' - }, + // { + // label: '标签信息', + // name: 'bqxx', + // hide: false, + // type: 'primary', + // icon: '', + // color: '', + // link: true, + // float: 'right', + // hasPermi: '' + // }, defaultButtons.mainListPointBtn(null) // 标签打印 // defaultButtons.mainListEditBtn({hasPermi:'wms:balance:update'}), // 编辑 // defaultButtons.mainListDeleteBtn({hasPermi:'wms:balance:delete'}), // 删除 From 5188b68c1e8c369395bfd8999391349a40bc8cac Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Thu, 31 Oct 2024 13:11:16 +0800 Subject: [PATCH 11/15] =?UTF-8?q?YT-582=E8=AE=A1=E5=88=92=E5=A4=96?= =?UTF-8?q?=E5=85=A5=E5=BA=93=EF=BC=8C=E6=98=AF=E5=90=A6=E7=9B=B4=E6=8E=A5?= =?UTF-8?q?=E7=94=9F=E6=88=90=E8=AE=A1=E5=88=92=E5=BC=80=E5=85=B3=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E5=85=B3=EF=BC=8C=E6=89=B9=E6=AC=A1=E5=BA=94=E5=8F=AF?= =?UTF-8?q?=E4=BB=A5=E9=80=89=E6=8B=A9=E6=97=A5=E6=9C=9F=EF=BC=8C=E5=BA=94?= =?UTF-8?q?=E5=8F=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../unplannedreceiptRequestMain.data.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts index 05419185b..5522488a9 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts @@ -530,7 +530,7 @@ export const UnplannedreceiptRequestMain = useCrudSchemas(reactive }, form: { component: 'Switch', - value: requestsettingData.directCreateRecord, + value: 'FALSE', componentProps: { inactiveValue: 'FALSE', activeValue: 'TRUE' @@ -804,9 +804,9 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive Date: Thu, 31 Oct 2024 14:13:37 +0800 Subject: [PATCH 12/15] =?UTF-8?q?YT-592=E9=87=87=E8=B4=AD=E6=8D=A2?= =?UTF-8?q?=E8=B4=A7=E8=AE=B0=E5=BD=95=E5=88=97=E8=A1=A8=E8=AE=A1=E9=87=8F?= =?UTF-8?q?=E5=8D=95=E4=BD=8D=E6=98=BE=E7=A4=BA=E4=B8=8D=E6=AD=A3=E7=A1=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchaseBarterRecord/purchaseBarterRecordMain.data.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRecord/purchaseBarterRecordMain.data.ts b/src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRecord/purchaseBarterRecordMain.data.ts index d7ce5ff33..f68daaa9e 100644 --- a/src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRecord/purchaseBarterRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRecord/purchaseBarterRecordMain.data.ts @@ -66,6 +66,8 @@ export const PurchaseBarterRecordDetail = useCrudSchemas(reactive( field: 'uom', sort: 'custom', isSearch: false, + dictType: DICT_TYPE.UOM, + dictClass: 'string', }, { label: '批次', From 75c9ac713afe756d44d4015f78a1809d44a6e16a Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Thu, 31 Oct 2024 14:44:31 +0800 Subject: [PATCH 13/15] =?UTF-8?q?YT-593=E9=87=87=E8=B4=AD=E6=8D=A2?= =?UTF-8?q?=E8=B4=A7=E8=AE=B0=E5=BD=95=E9=A1=B5=E9=9D=A2=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E5=8E=BB=E6=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchaseBarterRecord/purchaseBarterRecordMain.data.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRecord/purchaseBarterRecordMain.data.ts b/src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRecord/purchaseBarterRecordMain.data.ts index f68daaa9e..d26cfcc86 100644 --- a/src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRecord/purchaseBarterRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRecord/purchaseBarterRecordMain.data.ts @@ -26,7 +26,7 @@ export const PurchaseBarterRecordMain = useCrudSchemas(reactive([ label: '状态', field: 'status', sort: 'custom', - isSearch: true, + isSearch: false, isForm: false, dictType: DICT_TYPE.REQUEST_STATUS, dictClass: 'string', From 6e31ca6545f632dc3bcb18da4adac1c737c93c38 Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Thu, 31 Oct 2024 15:29:36 +0800 Subject: [PATCH 14/15] =?UTF-8?q?YT-595=E9=9A=94=E7=A6=BB=E8=BD=AC?= =?UTF-8?q?=E5=90=88=E6=A0=BC=EF=BC=8C=E6=96=B0=E5=A2=9E=EF=BC=8C=E6=95=B0?= =?UTF-8?q?=E9=87=8F=E6=94=B9=E4=B8=BA=E5=8F=AF=E4=BB=A5=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventorymoveRequestMain/index.vue | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue index ce08198d0..9bb29c449 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue @@ -384,6 +384,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => newRow['fromLocationCode'] = item['locationCode'] newRow['uom'] = item['uom'] newRow['qty'] = item['qty'] + newRow['inventoryQty'] = item['qty'] if(routeName.value == 'NoktoholdRequestMain'){ newRow['toInventoryStatus'] = "HOLD" }else if ( routeName.value == 'HoldtookRequestMain') { @@ -606,11 +607,11 @@ const buttonTableClick = async (val, row) => { /** 添加/修改操作 */ const formRef = ref() const openForm =async (type: string, row?: number) => { - InventorymoveRequestDetail.allSchemas.tableFormColumns.forEach(item=>{ - if(item.field == 'qty'){ - item.tableForm.disabled = routeName.value == "HoldtookRequestMain" - } - }) + // InventorymoveRequestDetail.allSchemas.tableFormColumns.forEach(item=>{ + // if(item.field == 'qty'){ + // item.tableForm.disabled = routeName.value == "HoldtookRequestMain" + // } + // }) tableData.value = [] // 重置明细数据 formRef.value.open(type, row) } @@ -768,6 +769,13 @@ const submitForm = async (formType, submitData) => { } formRef.value.formLoading = true try { + const cmdExists = data.subList.some(filter => + parseFloat(filter.inventoryQty) < parseFloat(filter.qty) + ); + if(cmdExists){ + message.warning("数量不能大于库存数量") + return + } if (formType === 'create') { await InventorymoveRequestMainApi.createInventorymoveRequestMain(data) message.success(t('common.createSuccess')) From 6c4126b306c956e6583caa1933ca857567061128 Mon Sep 17 00:00:00 2001 From: songguoqiang <765017469@qq.com> Date: Thu, 31 Oct 2024 16:12:34 +0800 Subject: [PATCH 15/15] =?UTF-8?q?YT-275=EF=BC=9A=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=A8=A1=E5=85=B7=E5=88=86=E6=91=8A=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/customer/index.ts | 5 +++ .../src/ImportCustomerStatementForm.vue | 3 +- .../customerStatementMain.data.ts | 44 ++++++++++++------- .../customerStatement/index.vue | 5 ++- .../supplierinvoiceRequestMain/index.vue | 2 +- 5 files changed, 40 insertions(+), 19 deletions(-) diff --git a/src/api/wms/customer/index.ts b/src/api/wms/customer/index.ts index 0a82231a0..1077fd5e0 100644 --- a/src/api/wms/customer/index.ts +++ b/src/api/wms/customer/index.ts @@ -35,6 +35,11 @@ export const getCustomerPage = async (params) => { export const getCustomerList = async (params) => { return await request.get({ url: `/wms/customer/list`, params }) } + +// 查询客户列表 +export const getCustomerListPc = async (params) => { + return await request.get({ url: `/wms/customer/listPc`, params }) +} // 查询客户详情 export const getCustomer = async (id: number) => { return await request.get({ url: `/wms/customer/get?id=` + id }) diff --git a/src/components/ImportForm/src/ImportCustomerStatementForm.vue b/src/components/ImportForm/src/ImportCustomerStatementForm.vue index b7763482d..19c30616e 100644 --- a/src/components/ImportForm/src/ImportCustomerStatementForm.vue +++ b/src/components/ImportForm/src/ImportCustomerStatementForm.vue @@ -318,7 +318,6 @@ const verifyData = async () => { // buttonBaseClick('refresh',null) } catch { //取消走的 - alert(123); } }else if(data.status==3){ await message.alertWarning('已存在相同客户编号及年月的对账单，且已提交，无法导入。') @@ -438,7 +437,7 @@ const queryParams = reactive({ const getCustomerList = async () => {//获取客户列表 var param ={} - const list = await CustomerApi.getCustomerList(param); + const list = await CustomerApi.getCustomerListPc(param); customerList.value = list; } diff --git a/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/customerStatementMain.data.ts b/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/customerStatementMain.data.ts index d1bdb6506..c4729e2f4 100644 --- a/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/customerStatementMain.data.ts +++ b/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/customerStatementMain.data.ts @@ -62,15 +62,15 @@ export const CustomerStatementMain = useCrudSchemas(reactive([ } }, }, - { - label: '年月', - field: 'yearsMonthStr', - sort: 'custom', - detail: { - dateFormat: 'YYYY-MM' - }, - isForm:false, - }, + // { + // label: '年月', + // field: 'yearsMonthStr', + // sort: 'custom', + // detail: { + // dateFormat: 'YYYY-MM' + // }, + // isForm:false, + // }, { label: '状态', field: 'status', @@ -92,12 +92,26 @@ export const CustomerStatementMain = useCrudSchemas(reactive([ { label: '创建时间', field: 'createTime', - sort: 'custom', + isTable:true, formatter: dateFormatter, - isSearch: false, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' }, + sort: 'custom', + isForm: false, + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + style: {width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + }, + isSearch: true, search: { component: 'DatePicker', componentProps: { @@ -106,7 +120,6 @@ export const CustomerStatementMain = useCrudSchemas(reactive([ defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] } }, - isForm: false, }, { label: '操作', @@ -283,9 +296,10 @@ export const CustomerStatementReconciliation = useCrudSchemas(reactive { hide: isShowMainButton(row, ['3', '4', '5']) }), // 退回 defaultButtons.mainListCancelBtn({ - hasPermi: 'wms:customer-statement-main:publish', + hasPermi: 'wms:customer-statement-main:nodeAbrogate', hide: isShowMainButton(row, ['2', '3', '4', '5']) }) // 作废 ] @@ -432,7 +432,10 @@ const searchFormClick = (searchData) => { /** 初始化 **/ onMounted(async () => { getList() + //客户对账单 importTemplateData.templateUrl = await CustomerStatementMainApi.importTemplate() + //模具分摊对账单 + importShareTemplateData.templateUrl = await CustomerStatementMainApi.importShareTemplate() }) //点击重新比对方法 const tapRematch = async (id: number) => { diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue index da7d1e0fe..899bf6789 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue @@ -882,7 +882,7 @@ const openForm = async (type: string, row?: any) => { if ( item.field == 'taxRate' || item.field == 'procurementCreator' || - item.field == 'beforeTaxAmount' || + // item.field == 'beforeTaxAmount' || item.field == 'totalTaxAmount' || item.field == 'goldenTaxInvoiceNumber' || item.field == 'invoiceTime' ||