diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts index 98bad9367..e26dc5738 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts @@ -996,7 +996,8 @@ export const DeliverRequestDetail = useCrudSchemas(reactive([ min: 0, max:999999, // precision: 6 - } + }, + isTableForm:false, }, { label: '班次', @@ -1013,6 +1014,7 @@ export const DeliverRequestDetail = useCrudSchemas(reactive([ type: 'Select', disabled: true }, + isTableForm: false, }, { label: '包装号', diff --git a/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts index 54d906965..7cb520ca5 100644 --- a/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts @@ -693,7 +693,8 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ field: 'classes', dictType: DICT_TYPE.CLASS_ITEM, dictClass: 'string', - isTable: false, + isTable: true, + isDetail: true, sort: 'custom', table: { width: 150 diff --git a/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/index.vue b/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/index.vue index ff1d50afb..89b9d5738 100644 --- a/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/index.vue +++ b/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/index.vue @@ -305,7 +305,11 @@ const handleCreate = async (type : string, row?: object) => { item.value = 'InducedProduct' } }) - tableData.value = [] + + if (type == 'create') { + tableData.value = [] + } + formRef.value.open(type,row) } diff --git a/src/views/wms/inventoryManage/balance/index.vue b/src/views/wms/inventoryManage/balance/index.vue index d4b4d477c..74ed90f3d 100644 --- a/src/views/wms/inventoryManage/balance/index.vue +++ b/src/views/wms/inventoryManage/balance/index.vue @@ -353,11 +353,12 @@ const handlePoint = async (row) => { const row1 = cloneDeep(row) await getLabelDetailPage(row1, false) console.log(row1) - labelPointFormRef.value.open('create', row1, null, 'createLabel') //创建标签页面 createLabel 标题 } const searchTableRef = ref() const enableBuyOrenableMake = ref()//是可制造还是可采购 +const enableMake = ref('')//可制造 +const enableBuy = ref('')//可采购 const getLabelDetailPage = async (row, useToPackingNumber) => { ////英泰项目没有包装号 所以只能通过物料号，批次，到库位代码去查询对应的包装 // let defaultParams = { @@ -391,50 +392,55 @@ const getLabelDetailPage = async (row, useToPackingNumber) => { if (res.list.length > 0) { // 判断物料 可采购 detailListTableColumnsRules.value = cloneDeep(detailListTableColumnsRules) - enableBuyOrenableMake.value = res.list[0].enableBuy == "TRUE" ? 'enableBuy' : res.list[0].enableMake == "TRUE" ? 'enableMake' :'' - if (res.list[0].enableBuy == "TRUE") { - detailListTableColumns.tableFormColumns = BalancePackage.allSchemas.tableFormColumns.filter(item=>item.field != 'productionLineCodePackage') - delete detailListTableColumnsRules.value.productionLineCodePackage - // 修改 tableform 属性 - await SupplieritemApi.getSupplieritemPage({ - pageSize: 10, - pageNo: 1, - itemCode: row.itemCode, - sort: '', - by: 'ASC', - }).then(response => { - detailListTableColumns.tableFormColumns.map(itemColumns => { - if(itemColumns.field == 'supplierItemCode') { - row.supplierItemCode = response?.list[0]?.supplierCode - } - }) - - }) - } - // 判断物料 可制造 - if (res.list[0].enableMake == "TRUE") { - // 修改 tableform 属性 - detailListTableColumns.tableFormColumns = BalancePackage.allSchemas.tableFormColumns.filter(item => item.field != 'supplierItemCode') - delete detailListTableColumnsRules.value.supplierItemCode - await ProductionlineitemApi.getProductionlineitemPage({ - pageNo: 1, - itemCode: row.itemCode, - sort: '', - by: 'ASC', - }).then(response => { - detailListTableColumns.tableFormColumns.map(itemColumns => { - if(itemColumns.field == 'productionLineCodePackage') { - row.productionLineCodePackage = response?.list[0]?.productionLineCode - } - }) - }) - } + enableBuyOrenableMake.value = res.list[0].enableBuy == "TRUE" ? 'enableBuy' : res.list[0].enableMake == "TRUE" ? 'enableMake' : '' + enableBuy.value = res.list[0].enableBuy + enableMake.value = res.list[0].enableMake + } else { message.warning('没有查询到物料代码：【' + row.itemCode + '】') return } }) + if (enableBuy.value == "TRUE" && enableMake.value == "FALSE") { + detailListTableColumns.tableFormColumns = BalancePackage.allSchemas.tableFormColumns.filter(item=>item.field != 'productionLineCodePackage') + delete detailListTableColumnsRules.value.productionLineCodePackage + // 修改 tableform 属性 + await SupplieritemApi.getSupplieritemPage({ + pageSize: 10, + pageNo: 1, + itemCode: row.itemCode, + sort: '', + by: 'ASC', + }).then(response => { + detailListTableColumns.tableFormColumns.map(itemColumns => { + if(itemColumns.field == 'supplierItemCode') { + row.supplierItemCode = response?.list[0]?.supplierCode + } + }) + }) + }// 判断物料 可制造 + else if (enableMake.value == "TRUE"&& enableBuy.value == "FALSE") { + // 修改 tableform 属性 + detailListTableColumns.tableFormColumns = BalancePackage.allSchemas.tableFormColumns.filter(item => item.field != 'supplierItemCode') + delete detailListTableColumnsRules.value.supplierItemCode + await ProductionlineitemApi.getProductionlineitemPage({ + pageNo: 1, + itemCode: row.itemCode, + sort: '', + by: 'ASC', + }).then(response => { + detailListTableColumns.tableFormColumns.map(itemColumns => { + if(itemColumns.field == 'productionLineCodePackage') { + row.productionLineCodePackage = response?.list[0]?.productionLineCode + } + }) + }) + } else { + message.error('物料基础信息错误，不可以创建标签') + console.log(1111) + return + } detatableData1.value=[]//不走打印详情接口,用主数据 detatableData1.value.push(row) @@ -447,7 +453,9 @@ const getLabelDetailPage = async (row, useToPackingNumber) => { item['disabled_batch'] = false } }) - // searchTableRef.value.openData('标签信息', tableObjectPrint, { tableColumns }, true) + console.log(1111) + + labelPointFormRef.value.open('create', row, null, 'createLabel') //创建标签页面 createLabel 标题 } // 批量打印--预生产收货 @@ -576,7 +584,9 @@ const pointLabel = async () => { // printQty:item.printQty, // } // }) - const obj = { + labelPointFormRef.value.formLoading = true + try { + const obj = { itemCode:detatableData1.value[0].itemCode, batch:detatableData1.value[0].batch, printQty:detatableData1.value[0].printQty, @@ -596,7 +606,7 @@ const pointLabel = async () => { // src.value = BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken()+'&asn_number='+res//制造标签模板 if (enableBuyOrenableMake.value == 'enableBuy') { - src.value = BASE_URL + '/jmreport/view/1021666059319578624?token=' + getAccessToken()+'&asn_number='+res//采购标签模板 + src.value = BASE_URL + '/jmreport/view/1022349139354537984?token=' + getAccessToken()+'&asn_number='+res//采购标签模板 } else if(enableBuyOrenableMake.value == 'enableMake') { src.value = BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken()+'&asn_number='+res//制造标签模板 } @@ -605,6 +615,10 @@ const pointLabel = async () => { console.log(err) message.error('创建标签失败') }) + } finally { + labelPointFormRef.value.formLoading = false + } + } /** 初始化 **/ onMounted(async () => { diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue index 01f7a54c2..b5512d576 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue @@ -92,6 +92,9 @@ @detailBasicFormOnChange="qtyOnChange" :detailValidate="detailValidate" @onBlur="onBlur" + :detailButtonIsShowAdd="false" + :detailButtonIsShowEdit="false" + :detailButtonIsShowDelete="false" /> @@ -588,6 +591,11 @@ const openForm = async (type: string, row?: any) => { item.componentProps.isSearchList = true item.componentProps.disabled = false } + if (item.field == 'fromWarehouseCode') { + item.componentProps.enterSearch = true + item.componentProps.isSearchList = true + item.componentProps.disabled = false + } }) } else { if (row.q1Number) { @@ -641,6 +649,13 @@ const openForm = async (type: string, row?: any) => { } }) } + ScrapRequestMain.allSchemas.formSchema.forEach((item) => { + if (item.field == 'fromWarehouseCode') { + item.componentProps.enterSearch = false + item.componentProps.isSearchList = false + item.componentProps.disabled = true + } + }) } tableData.value = [] // 重置明细数据 diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/index.vue index a84c7e501..5cd26d295 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/index.vue @@ -340,12 +340,12 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => }).then((res) => { toManagementPrecision.value = res[0].ManagementPrecision }) - if (fromManagementPrecision.value == 'BY_QUANTITY' && toManagementPrecision.value == 'BY_BATCH') { - row['fromBatchFormItemType'] = 'FormDate' - row['disabled_fromBatch'] = false - } else { - row['fromBatchFormItemType'] = '' - row['disabled_fromBatch'] = true + if (toManagementPrecision.value == 'BY_BATCH') { + row['toBatchFormItemType'] = 'FormDate' + row['disabled_toBatch'] = false + } else if (toManagementPrecision.value == 'BY_QUANTITY') { + row['toBatchFormItemType'] = '' + row['disabled_toBatch'] = true } } else { row[formField] = val[0][searchField] @@ -701,10 +701,10 @@ const submitForm = async (formType, submitData) => { message.warning('从库位和到库位不能相同') return } - let batchList = tableData.value.filter(item=>item.fromBatchFormItemType&&item.fromBatchFormItemType == 'FormDate') - let noBatch = batchList.some(item => !item.fromBatch) + let batchList = tableData.value.filter(item=>item.toBatchFormItemType&&item.toBatchFormItemType == 'FormDate') + let noBatch = batchList.some(item => !item.toBatch) if(noBatch){ - message.warning('请选择从批次') + message.warning('请选择到批次') return } data.subList = tableData.value // 拼接子表数据参数 diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/inventorymoveRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/inventorymoveRequestMain.data.ts index e24af8017..5d000afc4 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/inventorymoveRequestMain.data.ts +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/inventorymoveRequestMain.data.ts @@ -561,33 +561,7 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive( isTableForm: false, isForm: false, }, - { - label: '生产日期', - field: 'produceDate', - formatter: dateFormatter2, - detail: { - dateFormat: 'YYYY-MM-DD' - }, - sort: 'custom', - table: { - width: 180 - }, - sortTableDefault:7, - form: { - component: 'DatePicker', - componentProps: { - style: {width: '100%'}, - type: 'date', - format: 'YYYY-MM-DD', - valueFormat: 'x', - } - }, - tableForm: { - type: 'FormDate', - dateFormat: 'YYYY-MM-DD', - valueFormat: 'x', - } - }, + { label: '从批次', field: 'fromBatch', @@ -595,7 +569,7 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive( table: { width: 150 }, - isTable:false, + isTable:true, tableForm: { disabled: true, placeholder: '请选择从批次', @@ -621,8 +595,14 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive( table: { width: 150 }, - isTableForm: false, + isTableForm: true, isForm: false, + tableForm: { + disabled: true, + placeholder: '请选择从批次', + valueFormat: 'YYYYMMDD', + format: 'YYYYMMDD', + }, }, { label: '从包装号', diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue index 4a4966bca..3ab14a670 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue @@ -85,6 +85,9 @@ :buttondataTable="buttondataTable" @tableFormButton="tableFormButton" :detailValidate="detailValidate" + :detailButtonIsShowAdd="false" + :detailButtonIsShowEdit="false" + :detailButtonIsShowDelete="false" /> diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue index 05ba7a993..963d0b55f 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue @@ -1186,7 +1186,7 @@ const clearInput = async (field, row, index) => { } const BASE_URL = getJmreportBaseUrl() -const src = ref(BASE_URL + '/jmreport/view/1016548504713515008?token=' + getAccessToken()) +const src = ref(BASE_URL + '/jmreport/view/1022297965884559360?token=' + getAccessToken()) getListApi: PurchasePlanDetailApi.getPurchasePlanDetailPage // 分页接口 // 标签打印