diff --git a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue index 0311d8b2e..777c111db 100644 --- a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue +++ b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue @@ -29,7 +29,7 @@ nextTick(() => { if (type == 'tableForm') { if (formField == 'itemCode') { - row['itemCode'] = val[0]['itemCode'] - row['uom'] = val[0]['uom'] - row['qty'] = val[0]['qty'] - row['fromBatch'] = val[0]['batch'] - row['fromPackingNumber'] = val[0]['packingNumber'] - row['toBatch'] = val[0]['batch'] - row['toPackingNumber'] = val[0]['packingNumber'] - row['fromLocationCode'] = val[0]['locationCode'] - row['inventoryStatus'] = val[0]['inventoryStatus'] + val.forEach(item=>{ + const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) + newRow['itemCode'] = item['itemCode'] + newRow['uom'] = item['uom'] + newRow['qty'] = item['qty'] + newRow['fromBatch'] = item['batch'] + newRow['fromPackingNumber'] = item['packingNumber'] + newRow['toBatch'] = item['batch'] + newRow['toPackingNumber'] = item['packingNumber'] + newRow['fromLocationCode'] = item['locationCode'] + newRow['inventoryStatus'] = item['inventoryStatus'] + tableData.value.push(newRow) + }) + } else if (formField == 'downItemCode') { row['downItemCode'] = val[0]['code'] } else if (formField == 'toLocationCode') { diff --git a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts index c759b61b6..9111450eb 100644 --- a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts +++ b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts @@ -59,6 +59,7 @@ export const RelegateRequestMain = useCrudSchemas(reactive([ form: { // labelMessage: '信息提示说明！！！', componentProps: { + enterSearch: true, isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择仓库代码', // 输入框占位文本 searchField: 'code', // 查询弹窗赋值字段 @@ -318,6 +319,7 @@ export const RelegateRequestDetail = useCrudSchemas(reactive([ } }, tableForm:{ + multiple:true, isInpuFocusShow: true, searchListPlaceholder: '请选择物料代码', // 输入框占位文本 searchField: 'itemCode', // 查询弹窗赋值字段 diff --git a/src/views/wms/basicDataManage/systemSetting/supplierUser/index.vue b/src/views/wms/basicDataManage/systemSetting/supplierUser/index.vue index cb66c5960..c8d92b883 100644 --- a/src/views/wms/basicDataManage/systemSetting/supplierUser/index.vue +++ b/src/views/wms/basicDataManage/systemSetting/supplierUser/index.vue @@ -55,11 +55,11 @@ - { } } - + // 查询列表页面参数设置 const searchTableParams = ref([ @@ -184,6 +184,9 @@ const searchTableSuccess = (formField, searchField, val, formRef) => { nextTick(() => { const setV = {} setV[formField] = val[0][searchField] + if(formField == 'userName'){ + setV['userId'] = val[0]['id'] + } formRef.setValues(setV) }) } diff --git a/src/views/wms/basicDataManage/systemSetting/supplierUser/supplierUser.data.ts b/src/views/wms/basicDataManage/systemSetting/supplierUser/supplierUser.data.ts index 1e5c4a94e..94a3317c8 100644 --- a/src/views/wms/basicDataManage/systemSetting/supplierUser/supplierUser.data.ts +++ b/src/views/wms/basicDataManage/systemSetting/supplierUser/supplierUser.data.ts @@ -15,7 +15,7 @@ export const User = useCrudSchemas(reactive([ }, { label: '用户名称', - field: 'username', + field: 'userName', sort: 'custom', table: { width: 150 @@ -58,7 +58,8 @@ export const User = useCrudSchemas(reactive([ // 表单校验 export const SupplierUserRules = reactive({ - userId: [required], + // userId: [required], + userName: [required], supplierCode: [required], status: [required], concurrencyStamp: [required], @@ -75,11 +76,37 @@ export const SupplierUser = useCrudSchemas(reactive([ label: '用户ID', field: 'userId', sort: 'custom', + isForm: false, isSearch: true, + // tableForm:{ + // isInpuFocusShow: true, + // searchListPlaceholder: '请选用户信息', + // searchField: 'username', + // searchTitle: '用户信息', + // searchAllSchemas: User.allSchemas, + // searchPage: UserApi.getUserPage + // }, + // form: { + // // labelMessage: '信息提示说明！！！', + // componentProps: { + // dialogWidth:'1025px',//搜索出来弹窗的宽度 + // isSearchList: true, + // searchListPlaceholder: '请选用户信息', + // searchField: 'username', + // searchTitle: '用户信息', + // searchAllSchemas: User.allSchemas, + // searchPage: UserApi.getUserPage + // } + // } + }, + { + label: '用户账号', + field: 'userName', + sort: 'custom', tableForm:{ isInpuFocusShow: true, searchListPlaceholder: '请选用户信息', - searchField: 'id', + searchField: 'username', searchTitle: '用户信息', searchAllSchemas: User.allSchemas, searchPage: UserApi.getUserPage @@ -90,18 +117,13 @@ export const SupplierUser = useCrudSchemas(reactive([ dialogWidth:'1025px',//搜索出来弹窗的宽度 isSearchList: true, searchListPlaceholder: '请选用户信息', - searchField: 'id', + searchField: 'username', searchTitle: '用户信息', searchAllSchemas: User.allSchemas, searchPage: UserApi.getUserPage } - } - }, - { - label: '用户账号', - field: 'userName', - sort: 'custom', - isForm: false, + }, + isSearch: true, }, { label: '用户昵称', diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue index afac9f2f0..f34280f34 100644 --- a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue +++ b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue @@ -42,7 +42,7 @@ nextTick(() => { if (type == 'tableForm') { if(formField == 'soLine') { - row['soLine'] = val[0]['lineNumber'] - row['soNumber'] = val[0]['number'] - row['itemCode'] = val[0]['itemCode'] - row['projectCode'] = val[0]['projectCode'] - row['uom'] = val[0]['uom'] + val.forEach(item=>{ + const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) + newRow['soLine'] = item['lineNumber'] + newRow['soNumber'] = item['number'] + newRow['itemCode'] = item['itemCode'] + newRow['projectCode'] = item['projectCode'] + newRow['uom'] = item['uom'] + tableData.value.push(newRow) + }) + }else if(formField == 'fromLocationCode'){ row['fromLocationCode'] = val[0]['defaultLocationCode'] } diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts index 08d9752d6..139f6b6f4 100644 --- a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts +++ b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts @@ -339,6 +339,7 @@ export const SaleShipmentDetail = useCrudSchemas(reactive([ width: 150 }, tableForm:{ + multiple: true, isInpuFocusShow: true, // 开启查询弹窗 searchListPlaceholder: '请选择销售订单行', searchField: 'lineNumber', diff --git a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/containerMainRequest.data.ts b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/containerMainRequest.data.ts index ed1f59bfd..dabab54a5 100644 --- a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/containerMainRequest.data.ts +++ b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/containerMainRequest.data.ts @@ -357,6 +357,7 @@ export const ContainerDetailRequest = useCrudSchemas(reactive([ field: 'containerNumber', sort: 'custom', tableForm:{ + multiple:true, isInpuFocusShow: true, // 开启查询弹窗 searchListPlaceholder: '请选择器具号', searchField: 'itemCode', diff --git a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue index 250cf0c72..6226545d9 100644 --- a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue +++ b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue @@ -42,6 +42,8 @@ nextTick(() => { if (type == 'tableForm') { if(formField == 'containerNumber') { - row['containerNumber'] = val[0]['itemCode'] - row['uom'] = val[0]['uom'] - row['fromLocationCode'] = val[0]['locationCode'] - row['fromInventoryStatus'] = val[0]['inventoryStatus'] + + val.forEach(item=>{ + const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) + newRow['containerNumber'] = item['itemCode'] + newRow['uom'] = item['uom'] + newRow['fromLocationCode'] = item['locationCode'] + newRow['fromInventoryStatus'] = item['inventoryStatus'] + tableData.value.push(newRow) + }) }else if(formField == 'toLocationCode'){ row['toLocationCode'] = val[0]['code'] }else { diff --git a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue index a8b9799b5..80a5ba071 100644 --- a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue +++ b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue @@ -42,6 +42,8 @@ nextTick(() => { if (type == 'tableForm') { if(formField == 'containerNumber') { - row['containerNumber'] = val[0]['code'] - row['uom'] = val[0]['uom'] - row['toInventoryStatus'] = 'OK' - }else if(formField == 'toLocationCode'){ - row['toLocationCode'] = val[0]['code'] - }else { - row[formField] = val[0][searchField] - } + val.forEach(item=>{ + const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) + newRow['containerNumber'] = item['code'] + newRow['uom'] = item['uom'] + newRow['toInventoryStatus'] = 'OK' + tableData.value.push(newRow) + }) + + }else if(formField == 'toLocationCode'){ + row['toLocationCode'] = val[0]['code'] + }else { + row[formField] = val[0][searchField] + } } const setV = {} setV[formField] = val[0][searchField] diff --git a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/initialContainerMainRequest.data.ts b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/initialContainerMainRequest.data.ts index 42a132c15..97a6dc837 100644 --- a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/initialContainerMainRequest.data.ts +++ b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/initialContainerMainRequest.data.ts @@ -358,6 +358,7 @@ export const ContainerDetailRequest = useCrudSchemas(reactive([ field: 'containerNumber', sort: 'custom', tableForm:{ + multiple:true, isInpuFocusShow: true, // 开启查询弹窗 searchListPlaceholder: '请选择器具号', searchField: 'itemCode', diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue index 342766d7c..391bc45ec 100644 --- a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue @@ -42,6 +42,8 @@ nextTick(() => { if (type == 'tableForm') { // 明细查询页赋值 - row[formField] = val[0][searchField] if(formField=='itemCode'){ //物料代码 - row['uom'] = val[0]['uom'] + val.forEach(item=>{ + const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) + newRow[formField] = item[searchField] + newRow['uom'] = item['uom'] + tableData.value.push(newRow) + }) + }else if(formField=='packUnit'){ //包装规格1 + row[formField] = val[0][searchField] row['packUnit'] = val[0]['packUnit'] row['packQty'] = val[0]['packQty'] }else if(formField=='secondPackUnit'){ //包装规格2 + row[formField] = val[0][searchField] row['secondPackUnit'] = val[0]['packUnit'] row['secondPackQty'] = val[0]['packQty'] }else if(formField == 'balancePackUnit'){ // 入库存包装规格 + row[formField] = val[0][searchField] row['balancePackUnit'] = val[0]['packUnit'] } } else { diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts index 8f7b40872..7ea15a22d 100644 --- a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts @@ -394,6 +394,7 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive( width: 150 }, tableForm:{ + multiple:true, enterSearch:true, isInpuFocusShow: true, // 开启查询弹窗 searchListPlaceholder: '请选择物料代码', diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue index 788f4465e..dab4cf2b7 100644 --- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue @@ -42,6 +42,8 @@ if (type == 'tableForm') { // 明细查询页赋值 if (formField == 'itemCode') { - row['itemCode'] = val[0]['itemCode'] - row['uom'] = val[0]['uom'] - row['qty'] = val[0]['qty'] - row['batch'] = val[0]['batch'] - row['fromLocationCode'] = val[0]['locationCode'] - row['toLocationCode'] = val[0]['locationCode'] - row['fromLocationGroupCode'] = val[0]['locationGroupCode'] - row['toLocationGroupCode'] = val[0]['locationGroupCode'] - row['fromAreaCode'] = val[0]['areaCode'] - row['toAreaCode'] = val[0]['areaCode'] - row['inventoryStatus'] = val[0]['inventoryStatus'] - row['fromPackUnit'] = val[0]['packUnit'] - row['fromPackQty'] = val[0]['packQty'] + + val.forEach(item=>{ + const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) + newRow['itemCode'] = item['itemCode'] + newRow['uom'] = item['uom'] + newRow['qty'] = item['qty'] + newRow['batch'] = item['batch'] + newRow['fromLocationCode'] = item['locationCode'] + newRow['toLocationCode'] = item['locationCode'] + newRow['fromLocationGroupCode'] = item['locationGroupCode'] + newRow['toLocationGroupCode'] = item['locationGroupCode'] + newRow['fromAreaCode'] = item['areaCode'] + newRow['toAreaCode'] = item['areaCode'] + newRow['inventoryStatus'] = item['inventoryStatus'] + newRow['fromPackUnit'] = item['packUnit'] + newRow['fromPackQty'] = item['packQty'] + tableData.value.push(newRow) + }) + } else if (formField == 'toPackUnit') { row['toPackUnit'] = val[0]['packUnit'] row['toPackQty'] = val[0]['packQty'] diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts index ad67b4e19..91bbeb867 100644 --- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts @@ -452,6 +452,7 @@ export const PackageoverRequestDetail = useCrudSchemas(reactive([ } }, tableForm:{ + multiple:true, isInpuFocusShow: true, searchListPlaceholder: '请选择物料代码', // 输入框占位文本 searchField: 'itemCode', // 查询弹窗赋值字段 diff --git a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue index ae1397bce..c10f1bcc4 100644 --- a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue @@ -42,6 +42,8 @@ if (type == 'tableForm') { // 明细查询页赋值 if (formField == 'packingNumber') { - row['packingNumber'] = val[0]['packingNumber'] - row['containerNumber'] = val[0]['containerNumber'] - row['batch'] = val[0]['batch'] - row['uom'] = val[0]['uom'] - row['inventoryStatus'] = val[0]['inventoryStatus'] - row['fromLocationCode'] = val[0]['locationCode'] - row['itemCode'] = val[0]['itemCode'] + val.forEach(item=>{ + const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) + newRow['packingNumber'] = item['packingNumber'] + newRow['containerNumber'] = item['containerNumber'] + newRow['batch'] = item['batch'] + newRow['uom'] = item['uom'] + newRow['inventoryStatus'] = item['inventoryStatus'] + newRow['fromLocationCode'] = item['locationCode'] + newRow['itemCode'] = item['itemCode'] + tableData.value.push(newRow) + }) } else { row[formField] = val[0][searchField] } diff --git a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts index 4c5170a52..1d3630a91 100644 --- a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts @@ -619,6 +619,7 @@ export const TransferissueRequestDetail = useCrudSchemas(reactive( width: 150 }, tableForm:{ + multiple:true, isInpuFocusShow: true, // 开启查询弹窗 searchListPlaceholder: '请选择包装号', searchField: 'packingNumber', diff --git a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts index e12e661d9..37a24c678 100644 --- a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts +++ b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts @@ -642,8 +642,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive([ sortSearchDefault:1000, isSearch: true, sortTableDefault:1100, - // isTableForm: false, - + isTableForm: false, }, // { @@ -881,9 +880,9 @@ export const RepleinshRequestDetailRules = reactive({ // inventoryStatus: [ // { required: true, message: '请选择库存状态', trigger: 'change' } // ], - toLocationCode: [ - { required: true, message: '请输入到库位代码', trigger: 'blur' } - ], + // toLocationCode: [ + // { required: true, message: '请输入到库位代码', trigger: 'blur' } + // ], itemCode: [ { required: true, message: '请输入物料代码', trigger: 'blur' } ], diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue index 143b2f135..aefda2d5c 100644 --- a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue +++ b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue @@ -53,6 +53,8 @@ if(formField=='toOwnerCode'){ //到货主代码 row['toOwnerCode'] = val[0]['code'] - }else{ - row[formField] = val[0][searchField] - row['fromPackingNumber'] = val[0]['packingNumber'] - row['toPackingNumber'] = val[0]['packingNumber'] - row['fromBatch'] = val[0]['batch'] - row['toBatch'] = val[0]['batch'] - row['fromInventoryStatus'] = val[0]['inventoryStatus'] - row['toInventoryStatus'] = val[0]['inventoryStatus'] - row['fromContainerNumber'] = val[0]['containerNumber'] - row['toContainerNumber'] = val[0]['containerNumber'] - row['fromQty'] = val[0]['qty'] - row['toQty'] = val[0]['qty'] - row['fromOwnerCode'] = val[0]['ownerCode'] - row['fromAltBatch'] = val[0]['altBatch'] - row['toAltBatch'] = val[0]['altBatch'] - row['fromArriveDate'] = val[0]['arriveDate'] - row['toArriveDate'] = val[0]['arriveDate'] - row['fromProduceDate'] = val[0]['produceDate'] - row['toProduceDate'] = val[0]['produceDate'] - row['fromExpireDate'] = val[0]['expireDate'] - row['toExpireDate'] = val[0]['expireDate'] - row['itemCode'] = val[0]['itemCode'] - row['locationCode'] = val[0]['locationCode'] - row['uom'] = val[0]['uom'] + }else if(formField == 'fromPackingNumber'){ + val.forEach(item=>{ + const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) + newRow[formField] = item[searchField] + newRow['fromPackingNumber'] = item['packingNumber'] + newRow['toPackingNumber'] = item['packingNumber'] + newRow['fromBatch'] = item['batch'] + newRow['toBatch'] = item['batch'] + newRow['fromInventoryStatus'] = item['inventoryStatus'] + newRow['toInventoryStatus'] = item['inventoryStatus'] + newRow['fromContainerNumber'] = item['containerNumber'] + newRow['toContainerNumber'] = item['containerNumber'] + newRow['fromQty'] = item['qty'] + newRow['toQty'] = item['qty'] + newRow['fromOwnerCode'] = item['ownerCode'] + newRow['fromAltBatch'] = item['altBatch'] + newRow['toAltBatch'] = item['altBatch'] + newRow['fromArriveDate'] = item['arriveDate'] + newRow['toArriveDate'] = item['arriveDate'] + newRow['fromProduceDate'] = item['produceDate'] + newRow['toProduceDate'] = item['produceDate'] + newRow['fromExpireDate'] = item['expireDate'] + newRow['toExpireDate'] = item['expireDate'] + newRow['itemCode'] = item['itemCode'] + newRow['locationCode'] = item['locationCode'] + newRow['uom'] = item['uom'] + tableData.value.push(newRow) + }) } } else { diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts index 74acc42bd..b6e8cc592 100644 --- a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts +++ b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts @@ -383,6 +383,7 @@ export const InventorychangeRequestDetail = useCrudSchemas(reactive nextTick(() => { if (type == 'tableForm') { if(formField == 'fromPackingNumber'){ - row['fromPackingNumber'] = val[0]['packingNumber'] - row['fromContainerNumber'] = val[0]['containerNumber'] - row['itemCode'] = val[0]['itemCode'] - row['fromBatch'] = val[0]['batch'] - row['fromInventoryStatus'] = val[0]['inventoryStatus'] - row['fromLocationCode'] = val[0]['locationCode'] - row['uom'] = val[0]['uom'] - if(routeName.value == 'OktoholdRequestMain'){ - row['toInventoryStatus'] = "HOLD" - }else if ( routeName.value == 'HoldtookRequestMain') { - row['toInventoryStatus'] = "OK" - }else if ( routeName.value == 'HoldtoscrapRequestMain') { - row['toInventoryStatus'] = "SCRAP" - }else if ( routeName.value == 'OktoscrapRequestMain') { - row['toInventoryStatus'] = "SCRAP" - }else if ( routeName.value == 'ScraptoholdRequestMain') { - row['toInventoryStatus'] = "HOLD" - }else{ - row['toInventoryStatus'] = val[0]['inventoryStatus'] - } + + val.forEach(item=>{ + const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) + newRow['fromPackingNumber'] = item['packingNumber'] + newRow['fromContainerNumber'] = item['containerNumber'] + newRow['itemCode'] = item['itemCode'] + newRow['fromBatch'] = item['batch'] + newRow['fromInventoryStatus'] = item['inventoryStatus'] + newRow['fromLocationCode'] = item['locationCode'] + newRow['uom'] = item['uom'] + if(routeName.value == 'OktoholdRequestMain'){ + newRow['toInventoryStatus'] = "HOLD" + }else if ( routeName.value == 'HoldtookRequestMain') { + newRow['toInventoryStatus'] = "OK" + }else if ( routeName.value == 'HoldtoscrapRequestMain') { + newRow['toInventoryStatus'] = "SCRAP" + }else if ( routeName.value == 'OktoscrapRequestMain') { + newRow['toInventoryStatus'] = "SCRAP" + }else if ( routeName.value == 'ScraptoholdRequestMain') { + newRow['toInventoryStatus'] = "HOLD" + }else{ + newRow['toInventoryStatus'] = item['inventoryStatus'] + } + tableData.value.push(newRow) + }) } else { row[formField] = val[0][searchField] } diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts index 8a52a684d..d22558b36 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts @@ -545,6 +545,7 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive( width: 150 }, tableForm:{ + multiple:true, isInpuFocusShow: true, // 开启查询弹窗 searchListPlaceholder: '请选择从包装号', searchField: 'packingNumber', diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue index d2ea9d461..86e5bbba9 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue @@ -125,6 +125,9 @@ import * as SupplierinvoiceRecordDetailApi from '@/api/wms/supplierinvoiceRecord import * as defaultButtons from '@/utils/disposition/defaultButtons' import { CACHE_KEY, useCache } from '@/hooks/web/useCache' import * as SupplierinvoiceRequestDetailApi from '@/api/wms/supplierinvoiceRequestDetail' +import * as PackageApi from "@/api/wms/package"; +import {getAccessToken} from "@/utils/auth"; +import {getJmreportBaseUrl} from "@/utils/systemParam"; // 供应商发票记录主 defineOptions({ name: 'SupplierinvoiceRecordMain' }) @@ -151,7 +154,7 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ defaultButtons.defaultExportBtn({hasPermi:'wms:supplierinvoice-record-main:export'}), // 导出 - // defaultButtons.mainLisSelectiontPointBtn(null), // 批量打印 + defaultButtons.mainLisSelectiontPointBtn(null), // 批量打印 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 @@ -180,28 +183,26 @@ const buttonBaseClick = (val, item) => { getList() } } else if (val == 'filtrate') { // 筛选 - } else { // 其他按钮 + }else { // 其他按钮 console.log('其他按钮', item) } } + +const BASE_URL = getJmreportBaseUrl() +const srcPoint = ref(BASE_URL + '/jmreport/view/970564557155733504?token=' + getAccessToken()) const handleSelectionPoint = async ()=>{ let rows:any = [] selectionRows.value.forEach(item=>{ rows = [...rows,...item.selectionRows.map(item1=>item1.id)] }) if(rows.length==0){ + message.warning('至少选择一条数据！') return } console.log('批量打印',rows.join(',')) - // let getLoading = ElLoading.service({ - // lock: true, - // text: 'loading...', - // background: 'rgba(0, 0, 0, 0.7)' - // }) - // getLoading?.close() - - + window.open(srcPoint.value+'&ids='+rows.join(',')) } + // 列表-操作按钮 const butttondata = (row,$index) => { return [ @@ -310,4 +311,4 @@ onMounted(async () => { color:var(--el-color-danger); font-weight:700; } - \ No newline at end of file +