Browse Source

Merge remote-tracking branch 'origin/master_hella' into master_hella

hella_online_20240829
gaojs 4 months ago
parent
commit
c8913883a3
  1. 25
      src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue
  2. 2
      src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts
  3. 3
      src/views/wms/basicDataManage/systemSetting/supplierUser/index.vue
  4. 42
      src/views/wms/basicDataManage/systemSetting/supplierUser/supplierUser.data.ts
  5. 17
      src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue
  6. 1
      src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts
  7. 1
      src/views/wms/inventoryjobManage/containermanage/containerMainRequest/containerMainRequest.data.ts
  8. 15
      src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue
  9. 13
      src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue
  10. 1
      src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/initialContainerMainRequest.data.ts
  11. 14
      src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue
  12. 1
      src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts
  13. 34
      src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue
  14. 1
      src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts
  15. 20
      src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue
  16. 1
      src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts
  17. 9
      src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts
  18. 54
      src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue
  19. 1
      src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts
  20. 33
      src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue
  21. 1
      src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts
  22. 21
      src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue

25
src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue

@ -29,7 +29,7 @@
<!-- 表单弹窗添加/修改 --> <!-- 表单弹窗添加/修改 -->
<BasicForm ref="basicFormRef" <BasicForm ref="basicFormRef"
:isOpenSearchTable="false" :isOpenSearchTable="true"
fieldTableColumn="itemCode" fieldTableColumn="itemCode"
@success="getList" @success="getList"
:rules="RelegateRequestMainRules" :rules="RelegateRequestMainRules"
@ -93,15 +93,20 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
nextTick(() => { nextTick(() => {
if (type == 'tableForm') { if (type == 'tableForm') {
if (formField == 'itemCode') { if (formField == 'itemCode') {
row['itemCode'] = val[0]['itemCode'] val.forEach(item=>{
row['uom'] = val[0]['uom'] const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
row['qty'] = val[0]['qty'] newRow['itemCode'] = item['itemCode']
row['fromBatch'] = val[0]['batch'] newRow['uom'] = item['uom']
row['fromPackingNumber'] = val[0]['packingNumber'] newRow['qty'] = item['qty']
row['toBatch'] = val[0]['batch'] newRow['fromBatch'] = item['batch']
row['toPackingNumber'] = val[0]['packingNumber'] newRow['fromPackingNumber'] = item['packingNumber']
row['fromLocationCode'] = val[0]['locationCode'] newRow['toBatch'] = item['batch']
row['inventoryStatus'] = val[0]['inventoryStatus'] newRow['toPackingNumber'] = item['packingNumber']
newRow['fromLocationCode'] = item['locationCode']
newRow['inventoryStatus'] = item['inventoryStatus']
tableData.value.push(newRow)
})
} else if (formField == 'downItemCode') { } else if (formField == 'downItemCode') {
row['downItemCode'] = val[0]['code'] row['downItemCode'] = val[0]['code']
} else if (formField == 'toLocationCode') { } else if (formField == 'toLocationCode') {

2
src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts

@ -59,6 +59,7 @@ export const RelegateRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
form: { form: {
// labelMessage: '信息提示说明!!!', // labelMessage: '信息提示说明!!!',
componentProps: { componentProps: {
enterSearch: true,
isSearchList: true, // 开启查询弹窗 isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择仓库代码', // 输入框占位文本 searchListPlaceholder: '请选择仓库代码', // 输入框占位文本
searchField: 'code', // 查询弹窗赋值字段 searchField: 'code', // 查询弹窗赋值字段
@ -318,6 +319,7 @@ export const RelegateRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
} }
}, },
tableForm:{ tableForm:{
multiple:true,
isInpuFocusShow: true, isInpuFocusShow: true,
searchListPlaceholder: '请选择物料代码', // 输入框占位文本 searchListPlaceholder: '请选择物料代码', // 输入框占位文本
searchField: 'itemCode', // 查询弹窗赋值字段 searchField: 'itemCode', // 查询弹窗赋值字段

3
src/views/wms/basicDataManage/systemSetting/supplierUser/index.vue

@ -184,6 +184,9 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
nextTick(() => { nextTick(() => {
const setV = {} const setV = {}
setV[formField] = val[0][searchField] setV[formField] = val[0][searchField]
if(formField == 'userName'){
setV['userId'] = val[0]['id']
}
formRef.setValues(setV) formRef.setValues(setV)
}) })
} }

42
src/views/wms/basicDataManage/systemSetting/supplierUser/supplierUser.data.ts

@ -15,7 +15,7 @@ export const User = useCrudSchemas(reactive<CrudSchema[]>([
}, },
{ {
label: '用户名称', label: '用户名称',
field: 'username', field: 'userName',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
@ -58,7 +58,8 @@ export const User = useCrudSchemas(reactive<CrudSchema[]>([
// 表单校验 // 表单校验
export const SupplierUserRules = reactive({ export const SupplierUserRules = reactive({
userId: [required], // userId: [required],
userName: [required],
supplierCode: [required], supplierCode: [required],
status: [required], status: [required],
concurrencyStamp: [required], concurrencyStamp: [required],
@ -75,11 +76,37 @@ export const SupplierUser = useCrudSchemas(reactive<CrudSchema[]>([
label: '用户ID', label: '用户ID',
field: 'userId', field: 'userId',
sort: 'custom', sort: 'custom',
isForm: false,
isSearch: true, 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:{ tableForm:{
isInpuFocusShow: true, isInpuFocusShow: true,
searchListPlaceholder: '请选用户信息', searchListPlaceholder: '请选用户信息',
searchField: 'id', searchField: 'username',
searchTitle: '用户信息', searchTitle: '用户信息',
searchAllSchemas: User.allSchemas, searchAllSchemas: User.allSchemas,
searchPage: UserApi.getUserPage searchPage: UserApi.getUserPage
@ -90,18 +117,13 @@ export const SupplierUser = useCrudSchemas(reactive<CrudSchema[]>([
dialogWidth:'1025px',//搜索出来弹窗的宽度 dialogWidth:'1025px',//搜索出来弹窗的宽度
isSearchList: true, isSearchList: true,
searchListPlaceholder: '请选用户信息', searchListPlaceholder: '请选用户信息',
searchField: 'id', searchField: 'username',
searchTitle: '用户信息', searchTitle: '用户信息',
searchAllSchemas: User.allSchemas, searchAllSchemas: User.allSchemas,
searchPage: UserApi.getUserPage searchPage: UserApi.getUserPage
} }
}
}, },
{ isSearch: true,
label: '用户账号',
field: 'userName',
sort: 'custom',
isForm: false,
}, },
{ {
label: '用户昵称', label: '用户昵称',

17
src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue

@ -42,7 +42,7 @@
<!-- 表单弹窗添加/修改 --> <!-- 表单弹窗添加/修改 -->
<BasicForm <BasicForm
ref="basicFormRef" ref="basicFormRef"
:isOpenSearchTable="false" :isOpenSearchTable="true"
fieldTableColumn="soLine" fieldTableColumn="soLine"
@success="getList" @success="getList"
:rules="SaleShipmentMainRules" :rules="SaleShipmentMainRules"
@ -111,11 +111,16 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
nextTick(() => { nextTick(() => {
if (type == 'tableForm') { if (type == 'tableForm') {
if(formField == 'soLine') { if(formField == 'soLine') {
row['soLine'] = val[0]['lineNumber'] val.forEach(item=>{
row['soNumber'] = val[0]['number'] const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
row['itemCode'] = val[0]['itemCode'] newRow['soLine'] = item['lineNumber']
row['projectCode'] = val[0]['projectCode'] newRow['soNumber'] = item['number']
row['uom'] = val[0]['uom'] newRow['itemCode'] = item['itemCode']
newRow['projectCode'] = item['projectCode']
newRow['uom'] = item['uom']
tableData.value.push(newRow)
})
}else if(formField == 'fromLocationCode'){ }else if(formField == 'fromLocationCode'){
row['fromLocationCode'] = val[0]['defaultLocationCode'] row['fromLocationCode'] = val[0]['defaultLocationCode']
} }

1
src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts

@ -339,6 +339,7 @@ export const SaleShipmentDetail = useCrudSchemas(reactive<CrudSchema[]>([
width: 150 width: 150
}, },
tableForm:{ tableForm:{
multiple: true,
isInpuFocusShow: true, // 开启查询弹窗 isInpuFocusShow: true, // 开启查询弹窗
searchListPlaceholder: '请选择销售订单行', searchListPlaceholder: '请选择销售订单行',
searchField: 'lineNumber', searchField: 'lineNumber',

1
src/views/wms/inventoryjobManage/containermanage/containerMainRequest/containerMainRequest.data.ts

@ -357,6 +357,7 @@ export const ContainerDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
field: 'containerNumber', field: 'containerNumber',
sort: 'custom', sort: 'custom',
tableForm:{ tableForm:{
multiple:true,
isInpuFocusShow: true, // 开启查询弹窗 isInpuFocusShow: true, // 开启查询弹窗
searchListPlaceholder: '请选择器具号', searchListPlaceholder: '请选择器具号',
searchField: 'itemCode', searchField: 'itemCode',

15
src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue

@ -42,6 +42,8 @@
<!-- 表单弹窗添加/修改 --> <!-- 表单弹窗添加/修改 -->
<BasicForm <BasicForm
ref="basicFormRef" ref="basicFormRef"
:isOpenSearchTable="true"
fieldTableColumn="containerNumber"
@success="getList" @success="getList"
:rules="ContainerMainRequestRules" :rules="ContainerMainRequestRules"
:formAllSchemas="ContainerMainRequest.allSchemas" :formAllSchemas="ContainerMainRequest.allSchemas"
@ -155,10 +157,15 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
nextTick(() => { nextTick(() => {
if (type == 'tableForm') { if (type == 'tableForm') {
if(formField == 'containerNumber') { if(formField == 'containerNumber') {
row['containerNumber'] = val[0]['itemCode']
row['uom'] = val[0]['uom'] val.forEach(item=>{
row['fromLocationCode'] = val[0]['locationCode'] const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
row['fromInventoryStatus'] = val[0]['inventoryStatus'] newRow['containerNumber'] = item['itemCode']
newRow['uom'] = item['uom']
newRow['fromLocationCode'] = item['locationCode']
newRow['fromInventoryStatus'] = item['inventoryStatus']
tableData.value.push(newRow)
})
}else if(formField == 'toLocationCode'){ }else if(formField == 'toLocationCode'){
row['toLocationCode'] = val[0]['code'] row['toLocationCode'] = val[0]['code']
}else { }else {

13
src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue

@ -42,6 +42,8 @@
<!-- 表单弹窗添加/修改 --> <!-- 表单弹窗添加/修改 -->
<BasicForm <BasicForm
ref="basicFormRef" ref="basicFormRef"
:isOpenSearchTable="true"
fieldTableColumn="containerNumber"
@success="getList" @success="getList"
:rules="ContainerMainRequestRules" :rules="ContainerMainRequestRules"
:formAllSchemas="ContainerMainRequest.allSchemas" :formAllSchemas="ContainerMainRequest.allSchemas"
@ -130,9 +132,14 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
nextTick(() => { nextTick(() => {
if (type == 'tableForm') { if (type == 'tableForm') {
if(formField == 'containerNumber') { if(formField == 'containerNumber') {
row['containerNumber'] = val[0]['code'] val.forEach(item=>{
row['uom'] = val[0]['uom'] const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
row['toInventoryStatus'] = 'OK' newRow['containerNumber'] = item['code']
newRow['uom'] = item['uom']
newRow['toInventoryStatus'] = 'OK'
tableData.value.push(newRow)
})
}else if(formField == 'toLocationCode'){ }else if(formField == 'toLocationCode'){
row['toLocationCode'] = val[0]['code'] row['toLocationCode'] = val[0]['code']
}else { }else {

1
src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/initialContainerMainRequest.data.ts

@ -358,6 +358,7 @@ export const ContainerDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
field: 'containerNumber', field: 'containerNumber',
sort: 'custom', sort: 'custom',
tableForm:{ tableForm:{
multiple:true,
isInpuFocusShow: true, // 开启查询弹窗 isInpuFocusShow: true, // 开启查询弹窗
searchListPlaceholder: '请选择器具号', searchListPlaceholder: '请选择器具号',
searchField: 'itemCode', searchField: 'itemCode',

14
src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue

@ -42,6 +42,8 @@
<!-- 表单弹窗添加/修改 --> <!-- 表单弹窗添加/修改 -->
<BasicForm <BasicForm
ref="formRef" ref="formRef"
:isOpenSearchTable="true"
fieldTableColumn="itemCode"
@success="getList" @success="getList"
:rules="InventoryinitRequestMainRules" :rules="InventoryinitRequestMainRules"
:formAllSchemas="InventoryinitRequestMain.allSchemas" :formAllSchemas="InventoryinitRequestMain.allSchemas"
@ -111,20 +113,28 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
nextTick(() => { nextTick(() => {
if (type == 'tableForm') { if (type == 'tableForm') {
// //
row[formField] = val[0][searchField]
if(formField=='itemCode'){ 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'){ }else if(formField=='packUnit'){
//1 //1
row[formField] = val[0][searchField]
row['packUnit'] = val[0]['packUnit'] row['packUnit'] = val[0]['packUnit']
row['packQty'] = val[0]['packQty'] row['packQty'] = val[0]['packQty']
}else if(formField=='secondPackUnit'){ }else if(formField=='secondPackUnit'){
//2 //2
row[formField] = val[0][searchField]
row['secondPackUnit'] = val[0]['packUnit'] row['secondPackUnit'] = val[0]['packUnit']
row['secondPackQty'] = val[0]['packQty'] row['secondPackQty'] = val[0]['packQty']
}else if(formField == 'balancePackUnit'){ }else if(formField == 'balancePackUnit'){
// //
row[formField] = val[0][searchField]
row['balancePackUnit'] = val[0]['packUnit'] row['balancePackUnit'] = val[0]['packUnit']
} }
} else { } else {

1
src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts

@ -394,6 +394,7 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
width: 150 width: 150
}, },
tableForm:{ tableForm:{
multiple:true,
enterSearch:true, enterSearch:true,
isInpuFocusShow: true, // 开启查询弹窗 isInpuFocusShow: true, // 开启查询弹窗
searchListPlaceholder: '请选择物料代码', searchListPlaceholder: '请选择物料代码',

34
src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue

@ -42,6 +42,8 @@
<!-- 表单弹窗添加/修改 --> <!-- 表单弹窗添加/修改 -->
<BasicForm <BasicForm
ref="formRef" ref="formRef"
:isOpenSearchTable="true"
fieldTableColumn="itemCode"
@success="getList" @success="getList"
:rules="PackageoverRequestMainRules" :rules="PackageoverRequestMainRules"
:formAllSchemas="PackageoverRequestMain.allSchemas" :formAllSchemas="PackageoverRequestMain.allSchemas"
@ -105,19 +107,25 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
if (type == 'tableForm') { if (type == 'tableForm') {
// //
if (formField == 'itemCode') { if (formField == 'itemCode') {
row['itemCode'] = val[0]['itemCode']
row['uom'] = val[0]['uom'] val.forEach(item=>{
row['qty'] = val[0]['qty'] const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
row['batch'] = val[0]['batch'] newRow['itemCode'] = item['itemCode']
row['fromLocationCode'] = val[0]['locationCode'] newRow['uom'] = item['uom']
row['toLocationCode'] = val[0]['locationCode'] newRow['qty'] = item['qty']
row['fromLocationGroupCode'] = val[0]['locationGroupCode'] newRow['batch'] = item['batch']
row['toLocationGroupCode'] = val[0]['locationGroupCode'] newRow['fromLocationCode'] = item['locationCode']
row['fromAreaCode'] = val[0]['areaCode'] newRow['toLocationCode'] = item['locationCode']
row['toAreaCode'] = val[0]['areaCode'] newRow['fromLocationGroupCode'] = item['locationGroupCode']
row['inventoryStatus'] = val[0]['inventoryStatus'] newRow['toLocationGroupCode'] = item['locationGroupCode']
row['fromPackUnit'] = val[0]['packUnit'] newRow['fromAreaCode'] = item['areaCode']
row['fromPackQty'] = val[0]['packQty'] newRow['toAreaCode'] = item['areaCode']
newRow['inventoryStatus'] = item['inventoryStatus']
newRow['fromPackUnit'] = item['packUnit']
newRow['fromPackQty'] = item['packQty']
tableData.value.push(newRow)
})
} else if (formField == 'toPackUnit') { } else if (formField == 'toPackUnit') {
row['toPackUnit'] = val[0]['packUnit'] row['toPackUnit'] = val[0]['packUnit']
row['toPackQty'] = val[0]['packQty'] row['toPackQty'] = val[0]['packQty']

1
src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts

@ -452,6 +452,7 @@ export const PackageoverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
} }
}, },
tableForm:{ tableForm:{
multiple:true,
isInpuFocusShow: true, isInpuFocusShow: true,
searchListPlaceholder: '请选择物料代码', // 输入框占位文本 searchListPlaceholder: '请选择物料代码', // 输入框占位文本
searchField: 'itemCode', // 查询弹窗赋值字段 searchField: 'itemCode', // 查询弹窗赋值字段

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

@ -42,6 +42,8 @@
<!-- 表单弹窗添加/修改 --> <!-- 表单弹窗添加/修改 -->
<BasicForm <BasicForm
ref="formRef" ref="formRef"
:isOpenSearchTable="true"
fieldTableColumn="packingNumber"
@success="getList" @success="getList"
:rules="TransferissueRequestMainRules" :rules="TransferissueRequestMainRules"
:formAllSchemas="TransferissueRequestMain.allSchemas" :formAllSchemas="TransferissueRequestMain.allSchemas"
@ -112,13 +114,17 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
if (type == 'tableForm') { if (type == 'tableForm') {
// //
if (formField == 'packingNumber') { if (formField == 'packingNumber') {
row['packingNumber'] = val[0]['packingNumber'] val.forEach(item=>{
row['containerNumber'] = val[0]['containerNumber'] const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
row['batch'] = val[0]['batch'] newRow['packingNumber'] = item['packingNumber']
row['uom'] = val[0]['uom'] newRow['containerNumber'] = item['containerNumber']
row['inventoryStatus'] = val[0]['inventoryStatus'] newRow['batch'] = item['batch']
row['fromLocationCode'] = val[0]['locationCode'] newRow['uom'] = item['uom']
row['itemCode'] = val[0]['itemCode'] newRow['inventoryStatus'] = item['inventoryStatus']
newRow['fromLocationCode'] = item['locationCode']
newRow['itemCode'] = item['itemCode']
tableData.value.push(newRow)
})
} else { } else {
row[formField] = val[0][searchField] row[formField] = val[0][searchField]
} }

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

@ -619,6 +619,7 @@ export const TransferissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
width: 150 width: 150
}, },
tableForm:{ tableForm:{
multiple:true,
isInpuFocusShow: true, // 开启查询弹窗 isInpuFocusShow: true, // 开启查询弹窗
searchListPlaceholder: '请选择包装号', searchListPlaceholder: '请选择包装号',
searchField: 'packingNumber', searchField: 'packingNumber',

9
src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts

@ -642,8 +642,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
sortSearchDefault:1000, sortSearchDefault:1000,
isSearch: true, isSearch: true,
sortTableDefault:1100, sortTableDefault:1100,
// isTableForm: false, isTableForm: false,
}, },
// { // {
@ -881,9 +880,9 @@ export const RepleinshRequestDetailRules = reactive({
// inventoryStatus: [ // inventoryStatus: [
// { required: true, message: '请选择库存状态', trigger: 'change' } // { required: true, message: '请选择库存状态', trigger: 'change' }
// ], // ],
toLocationCode: [ // toLocationCode: [
{ required: true, message: '请输入到库位代码', trigger: 'blur' } // { required: true, message: '请输入到库位代码', trigger: 'blur' }
], // ],
itemCode: [ itemCode: [
{ required: true, message: '请输入物料代码', trigger: 'blur' } { required: true, message: '请输入物料代码', trigger: 'blur' }
], ],

54
src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue

@ -53,6 +53,8 @@
<!-- 表单弹窗添加/修改 --> <!-- 表单弹窗添加/修改 -->
<BasicForm <BasicForm
ref="formRef" ref="formRef"
:isOpenSearchTable="true"
fieldTableColumn="fromPackingNumber"
@success="getList" @success="getList"
:rules="InventorychangeRequestMainRules" :rules="InventorychangeRequestMainRules"
:formAllSchemas="InventorychangeRequestMain.allSchemas" :formAllSchemas="InventorychangeRequestMain.allSchemas"
@ -130,30 +132,34 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
if(formField=='toOwnerCode'){ if(formField=='toOwnerCode'){
// //
row['toOwnerCode'] = val[0]['code'] row['toOwnerCode'] = val[0]['code']
}else{ }else if(formField == 'fromPackingNumber'){
row[formField] = val[0][searchField] val.forEach(item=>{
row['fromPackingNumber'] = val[0]['packingNumber'] const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
row['toPackingNumber'] = val[0]['packingNumber'] newRow[formField] = item[searchField]
row['fromBatch'] = val[0]['batch'] newRow['fromPackingNumber'] = item['packingNumber']
row['toBatch'] = val[0]['batch'] newRow['toPackingNumber'] = item['packingNumber']
row['fromInventoryStatus'] = val[0]['inventoryStatus'] newRow['fromBatch'] = item['batch']
row['toInventoryStatus'] = val[0]['inventoryStatus'] newRow['toBatch'] = item['batch']
row['fromContainerNumber'] = val[0]['containerNumber'] newRow['fromInventoryStatus'] = item['inventoryStatus']
row['toContainerNumber'] = val[0]['containerNumber'] newRow['toInventoryStatus'] = item['inventoryStatus']
row['fromQty'] = val[0]['qty'] newRow['fromContainerNumber'] = item['containerNumber']
row['toQty'] = val[0]['qty'] newRow['toContainerNumber'] = item['containerNumber']
row['fromOwnerCode'] = val[0]['ownerCode'] newRow['fromQty'] = item['qty']
row['fromAltBatch'] = val[0]['altBatch'] newRow['toQty'] = item['qty']
row['toAltBatch'] = val[0]['altBatch'] newRow['fromOwnerCode'] = item['ownerCode']
row['fromArriveDate'] = val[0]['arriveDate'] newRow['fromAltBatch'] = item['altBatch']
row['toArriveDate'] = val[0]['arriveDate'] newRow['toAltBatch'] = item['altBatch']
row['fromProduceDate'] = val[0]['produceDate'] newRow['fromArriveDate'] = item['arriveDate']
row['toProduceDate'] = val[0]['produceDate'] newRow['toArriveDate'] = item['arriveDate']
row['fromExpireDate'] = val[0]['expireDate'] newRow['fromProduceDate'] = item['produceDate']
row['toExpireDate'] = val[0]['expireDate'] newRow['toProduceDate'] = item['produceDate']
row['itemCode'] = val[0]['itemCode'] newRow['fromExpireDate'] = item['expireDate']
row['locationCode'] = val[0]['locationCode'] newRow['toExpireDate'] = item['expireDate']
row['uom'] = val[0]['uom'] newRow['itemCode'] = item['itemCode']
newRow['locationCode'] = item['locationCode']
newRow['uom'] = item['uom']
tableData.value.push(newRow)
})
} }
} else { } else {

1
src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts

@ -383,6 +383,7 @@ export const InventorychangeRequestDetail = useCrudSchemas(reactive<CrudSchema[]
width: 150 width: 150
}, },
tableForm:{ tableForm:{
multiple:true,
isInpuFocusShow: true, // 开启查询弹窗 isInpuFocusShow: true, // 开启查询弹窗
searchListPlaceholder: '请选择从包装号', searchListPlaceholder: '请选择从包装号',
searchField: 'packingNumber', searchField: 'packingNumber',

33
src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue

@ -42,6 +42,8 @@
<!-- 表单弹窗添加/修改 --> <!-- 表单弹窗添加/修改 -->
<BasicForm <BasicForm
ref="formRef" ref="formRef"
:isOpenSearchTable="true"
fieldTableColumn="fromPackingNumber"
@success="getList" @success="getList"
:rules="InventorymoveRequestMainRules" :rules="InventorymoveRequestMainRules"
:formAllSchemas="InventorymoveRequestMain.allSchemas" :formAllSchemas="InventorymoveRequestMain.allSchemas"
@ -329,26 +331,31 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
nextTick(() => { nextTick(() => {
if (type == 'tableForm') { if (type == 'tableForm') {
if(formField == 'fromPackingNumber'){ if(formField == 'fromPackingNumber'){
row['fromPackingNumber'] = val[0]['packingNumber']
row['fromContainerNumber'] = val[0]['containerNumber'] val.forEach(item=>{
row['itemCode'] = val[0]['itemCode'] const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
row['fromBatch'] = val[0]['batch'] newRow['fromPackingNumber'] = item['packingNumber']
row['fromInventoryStatus'] = val[0]['inventoryStatus'] newRow['fromContainerNumber'] = item['containerNumber']
row['fromLocationCode'] = val[0]['locationCode'] newRow['itemCode'] = item['itemCode']
row['uom'] = val[0]['uom'] newRow['fromBatch'] = item['batch']
newRow['fromInventoryStatus'] = item['inventoryStatus']
newRow['fromLocationCode'] = item['locationCode']
newRow['uom'] = item['uom']
if(routeName.value == 'OktoholdRequestMain'){ if(routeName.value == 'OktoholdRequestMain'){
row['toInventoryStatus'] = "HOLD" newRow['toInventoryStatus'] = "HOLD"
}else if ( routeName.value == 'HoldtookRequestMain') { }else if ( routeName.value == 'HoldtookRequestMain') {
row['toInventoryStatus'] = "OK" newRow['toInventoryStatus'] = "OK"
}else if ( routeName.value == 'HoldtoscrapRequestMain') { }else if ( routeName.value == 'HoldtoscrapRequestMain') {
row['toInventoryStatus'] = "SCRAP" newRow['toInventoryStatus'] = "SCRAP"
}else if ( routeName.value == 'OktoscrapRequestMain') { }else if ( routeName.value == 'OktoscrapRequestMain') {
row['toInventoryStatus'] = "SCRAP" newRow['toInventoryStatus'] = "SCRAP"
}else if ( routeName.value == 'ScraptoholdRequestMain') { }else if ( routeName.value == 'ScraptoholdRequestMain') {
row['toInventoryStatus'] = "HOLD" newRow['toInventoryStatus'] = "HOLD"
}else{ }else{
row['toInventoryStatus'] = val[0]['inventoryStatus'] newRow['toInventoryStatus'] = item['inventoryStatus']
} }
tableData.value.push(newRow)
})
} else { } else {
row[formField] = val[0][searchField] row[formField] = val[0][searchField]
} }

1
src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts

@ -545,6 +545,7 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
width: 150 width: 150
}, },
tableForm:{ tableForm:{
multiple:true,
isInpuFocusShow: true, // 开启查询弹窗 isInpuFocusShow: true, // 开启查询弹窗
searchListPlaceholder: '请选择从包装号', searchListPlaceholder: '请选择从包装号',
searchField: 'packingNumber', searchField: 'packingNumber',

21
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 * as defaultButtons from '@/utils/disposition/defaultButtons'
import { CACHE_KEY, useCache } from '@/hooks/web/useCache' import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
import * as SupplierinvoiceRequestDetailApi from '@/api/wms/supplierinvoiceRequestDetail' 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' }) defineOptions({ name: 'SupplierinvoiceRecordMain' })
@ -151,7 +154,7 @@ const { getList, setSearchParams } = tableMethods
// //
const HeadButttondata = [ const HeadButttondata = [
defaultButtons.defaultExportBtn({hasPermi:'wms:supplierinvoice-record-main:export'}), // defaultButtons.defaultExportBtn({hasPermi:'wms:supplierinvoice-record-main:export'}), //
// defaultButtons.mainLisSelectiontPointBtn(null), // defaultButtons.mainLisSelectiontPointBtn(null), //
defaultButtons.defaultFreshBtn(null), // defaultButtons.defaultFreshBtn(null), //
defaultButtons.defaultFilterBtn(null), // defaultButtons.defaultFilterBtn(null), //
defaultButtons.defaultSetBtn(null), // defaultButtons.defaultSetBtn(null), //
@ -180,28 +183,26 @@ const buttonBaseClick = (val, item) => {
getList() getList()
} }
} else if (val == 'filtrate') { // } else if (val == 'filtrate') { //
} else { // }else { //
console.log('其他按钮', item) console.log('其他按钮', item)
} }
} }
const BASE_URL = getJmreportBaseUrl()
const srcPoint = ref(BASE_URL + '/jmreport/view/970564557155733504?token=' + getAccessToken())
const handleSelectionPoint = async ()=>{ const handleSelectionPoint = async ()=>{
let rows:any = [] let rows:any = []
selectionRows.value.forEach(item=>{ selectionRows.value.forEach(item=>{
rows = [...rows,...item.selectionRows.map(item1=>item1.id)] rows = [...rows,...item.selectionRows.map(item1=>item1.id)]
}) })
if(rows.length==0){ if(rows.length==0){
message.warning('至少选择一条数据!')
return return
} }
console.log('批量打印',rows.join(',')) console.log('批量打印',rows.join(','))
// let getLoading = ElLoading.service({ window.open(srcPoint.value+'&ids='+rows.join(','))
// lock: true,
// text: 'loading...',
// background: 'rgba(0, 0, 0, 0.7)'
// })
// getLoading?.close()
} }
// - // -
const butttondata = (row,$index) => { const butttondata = (row,$index) => {
return [ return [

Loading…
Cancel
Save