Browse Source

问题修复

hella_online_20240829
wangyufei 5 months ago
parent
commit
dfbfc0f87c
  1. 28
      src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue
  2. 3
      src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts
  3. 2
      src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue
  4. 17
      src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
  5. 2
      src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMainDifference/supplierinvoiceRecordMain.data.ts
  6. 2
      src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
  7. 18
      src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts

28
src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue

@ -114,17 +114,27 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
if (type == 'tableForm') { if (type == 'tableForm') {
// //
if (formField == 'packingNumber') { if (formField == 'packingNumber') {
let itemCodes = []
val.forEach(item=>{ val.forEach(item=>{
const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) const findIndex = tableData.value.findIndex(valItem=>valItem['itemCode']==item.itemCode&&valItem['batch']==item.batch&&valItem['packingNumber']==item.packingNumber)
newRow['packingNumber'] = item['packingNumber'] if(findIndex == -1){
newRow['containerNumber'] = item['containerNumber'] const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
newRow['batch'] = item['batch'] newRow['packingNumber'] = item['packingNumber']
newRow['uom'] = item['uom'] newRow['containerNumber'] = item['containerNumber']
newRow['inventoryStatus'] = item['inventoryStatus'] newRow['batch'] = item['batch']
newRow['fromLocationCode'] = item['locationCode'] newRow['uom'] = item['uom']
newRow['itemCode'] = item['itemCode'] newRow['inventoryStatus'] = item['inventoryStatus']
tableData.value.push(newRow) newRow['fromLocationCode'] = item['locationCode']
newRow['itemCode'] = item['itemCode']
tableData.value.push(newRow)
}else{
itemCodes.push(item['packingNumber'])
}
}) })
if(itemCodes.length>0){
message.warning(`${t('ts.包装号')}${itemCodes.join(',')}${t('ts.已经存在')}`);
}
} else { } else {
row[formField] = val[0][searchField] row[formField] = val[0][searchField]
} }

3
src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts

@ -619,8 +619,9 @@ export const TransferissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
width: 150 width: 150
}, },
tableForm:{ tableForm:{
disabled:true,
multiple:true, multiple:true,
isInpuFocusShow: true, // 开启查询弹窗 // isInpuFocusShow: true, // 开启查询弹窗
searchListPlaceholder: '请选择包装号', searchListPlaceholder: '请选择包装号',
searchField: 'packingNumber', searchField: 'packingNumber',
searchTitle: '库存余额信息', searchTitle: '库存余额信息',

2
src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue

@ -236,6 +236,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
newRow[formField] = item[searchField] newRow[formField] = item[searchField]
tableData.value.push(newRow) tableData.value.push(newRow)
}) })
}else{
row[formField] = val[0][searchField]
} }
} else { } else {
const setV = {} const setV = {}

17
src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts

@ -667,7 +667,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
}, },
{ {
label: '采购价格审批人', label: '采购价格审批人',
field: 'procurementCreator', field: 'procurementCreatorName',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
@ -943,7 +943,7 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive<CrudSchem
}, },
{ {
label: '采购价格审批人', label: '采购价格审批人',
field: 'procurementCreator', field: 'procurementCreatorName',
sortTableDefault: 1003, sortTableDefault: 1003,
isForm: false, isForm: false,
isTable: false, isTable: false,
@ -1156,6 +1156,19 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive<CrudSchem
isSearch: false, isSearch: false,
isDetail: true, isDetail: true,
}, },
{
label: '创建时间',
field: 'createTime',
formatter: dateFormatter,
sortTableDefault:1000,
detail: {
dateFormat: 'YYYY-MM-DD HH:mm:ss'
},
isForm: false,
isTable: false,
isSearch: false,
isDetail: true,
}
])) ]))
//表单校验 //表单校验
export const SupplierinvoiceRecordMainRules = reactive({ export const SupplierinvoiceRecordMainRules = reactive({

2
src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMainDifference/supplierinvoiceRecordMain.data.ts

@ -981,7 +981,7 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive<CrudSchem
}, },
{ {
label: '采购价格审批人', label: '采购价格审批人',
field: 'procurementCreator', field: 'procurementCreatorName',
sortTableDefault: 1003, sortTableDefault: 1003,
isForm: false, isForm: false,
isTable: false, isTable: false,

2
src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue

@ -115,7 +115,7 @@
<template #searchTableSelectionsActions="{selections}"> <template #searchTableSelectionsActions="{selections}">
<div style="text-align: left;margin-right:10px"> <div style="text-align: left;margin-right:10px">
系统未税金额:{{selections.selections.reduce((prev, item) => prev + Number(Number(Number(Number(item['purchasePrice']).toFixed(2))*item['invoicableQuantity']).toFixed(2)),0)}} 系统未税金额:{{Number(selections.selections.reduce((prev, item) => prev + Number(Number(Number(Number(item['purchasePrice']).toFixed(2))*item['invoicableQuantity']).toFixed(2)),0)).toFixed(2)}}
</div> </div>
</template> </template>
<!-- <template #foorter> <!-- <template #foorter>

18
src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts

@ -765,7 +765,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
}, },
{ {
label: '采购价格审批人', label: '采购价格审批人',
field: 'procurementCreator', field: 'procurementCreatorName',
table: { table: {
width: 150 width: 150
}, },
@ -1219,7 +1219,7 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
}, },
{ {
label: '采购价格审批人', label: '采购价格审批人',
field: 'procurementCreator', field: 'procurementCreatorName',
sortTableDefault: 1003, sortTableDefault: 1003,
isForm: false, isForm: false,
isTable: false, isTable: false,
@ -1432,6 +1432,20 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
isSearch: false, isSearch: false,
isDetail: true, isDetail: true,
}, },
{
label: '创建时间',
field: 'createTime',
formatter: dateFormatter,
sortTableDefault:1000,
detail: {
dateFormat: 'YYYY-MM-DD HH:mm:ss'
},
isForm: false,
isTable: false,
isSearch: false,
isDetail: true,
},
])) ]))
const singlePriceFormart = (row, column, cellValue) => { const singlePriceFormart = (row, column, cellValue) => {
cellValue= Number(cellValue).toFixed(2) cellValue= Number(cellValue).toFixed(2)

Loading…
Cancel
Save