sfms3.0
/
sfms3.0-ui
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

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

linshi20240813
gaojs 3 months ago
parent
c58914547e 07233b60b6
commit
a8d3956001
3 changed files with 152 additions and 140 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      src/views/wms/inventoryManage/package/index.vue
  2. 273
      src/views/wms/inventoryManage/package/package.data.ts
  3. 9
      src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue

10
src/views/wms/inventoryManage/package/index.vue
View File

@ -86,9 +86,8 @@ const updataTableColumns = (val) => {
// 查询列表页面参数设置 // 查询列表页面参数设置
const searchTableParams = ref([ const searchTableParams = ref([
]) ])
// 查询页面返回 // 查询页面返回
const searchTableSuccess = (formField, searchField, val, basicFormRef, type, row ) => { const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
nextTick(() => { nextTick(() => {
const setV = {} const setV = {}
setV[formField] = val[0][searchField] setV[formField] = val[0][searchField]
@ -98,8 +97,6 @@ const searchTableSuccess = (formField, searchField, val, basicFormRef, type, row
setV['itemDesc2'] = val[0]['desc2'] setV['itemDesc2'] = val[0]['desc2']
setV['uom'] = val[0]['uom'] setV['uom'] = val[0]['uom']
setV['altUom'] = val[0]['altUom'] setV['altUom'] = val[0]['altUom']
setV['packUnit'] = null
setV['packQty'] = null
} }
else if (formField == 'packUnit'){ else if (formField == 'packUnit'){
setV['packQty'] = val[0]['packQty'] setV['packQty'] = val[0]['packQty']
@ -108,10 +105,9 @@ const searchTableSuccess = (formField, searchField, val, basicFormRef, type, row
setV['toLocationCode'] = null setV['toLocationCode'] = null
} }
else if(formField == 'supplierCode'){ else if(formField == 'supplierCode'){
setV['supplierItemCode'] = null setV['supplierItemCode'] = val[0]['supplierItemCode']
} }
basicFormRef.setValues(setV) formRef.setValues(setV)
basicFormRef.setValues(setV)
}) })
} }

273
src/views/wms/inventoryManage/package/package.data.ts
View File

@ -15,6 +15,8 @@ import * as SupplierApi from "@/api/wms/supplier";
import {Itempackaging} from "@/views/wms/basicDataManage/itemManage/itempackage/itempackage.data"; import {Itempackaging} from "@/views/wms/basicDataManage/itemManage/itempackage/itempackage.data";
import * as ItempackagingApi from "@/api/wms/itempackage"; import * as ItempackagingApi from "@/api/wms/itempackage";
import * as SupplieritemApi from "@/api/wms/supplieritem"; import * as SupplieritemApi from "@/api/wms/supplieritem";
import { formatTime } from '@/utils/index'
import { import {
Supplieritem Supplieritem
} from "@/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data"; } from "@/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data";
@ -121,6 +123,9 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
field: 'batch', field: 'batch',
sort: 'custom', sort: 'custom',
isSearch: true, isSearch: true,
form:{
value: formatTime(new Date(), 'yyyyMMdd')
},
table: { table: {
width: 150, width: 150,
}, },
@ -160,6 +165,7 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
}, },
form: { form: {
component: 'DatePicker', component: 'DatePicker',
value: formatTime(new Date(), 'yyyy-MM-dd'),
componentProps: { componentProps: {
style: {width: '100%'}, style: {width: '100%'},
type: 'date', type: 'date',
@ -290,20 +296,21 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
enterSearch:true, enterSearch:true,
isSearch:true, isSearch:true,
isSearchList: true, // 开启查询弹窗 isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择包装规格', // 输入框占位文本 searchListPlaceholder: '请选择物料代码',
searchField: 'itemCode', // 查询弹窗赋值字段 searchField: 'packUnit',
searchTitle: '物料包装信息', // 查询弹窗标题 searchTitle: '物料包装信息',
searchAllSchemas: Itempackaging.allSchemas, // 查询弹窗所需类 searchAllSchemas: Itempackaging.allSchemas,
searchPage: ItempackagingApi.getItempackagingPage, // 查询弹窗所需分页方法 searchPage: ItempackagingApi.getItempackagingPageTree,
searchCondition: [{ searchCondition: [{
key: 'available', key: 'available',
value: 'TRUE', value: 'TRUE',
isMainValue: false isMainValue: false
},{ },{
key: 'itemCode', key:'itemCode', // 查询列表中字段
value: 'itemCode', value:'itemCode', // 指主表某字段
message: '请填写物料代码！', message: '请选择物料代码！', // 当前置条件为空时 弹出信息提示
isMainValue: true isMainValue: true, // 表示查询条件是主表的字段的值
action: '==', // 查询拼接条件
}], }],
verificationParams: [{ verificationParams: [{
key: 'packUnit', key: 'packUnit',
@ -313,6 +320,7 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
isSearch: true, isSearch: true,
isFormModel: true, isFormModel: true,
}], // 失去焦点校验参数 }], // 失去焦点校验参数
} }
} }
}, },
@ -329,9 +337,90 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
} }
}, },
}, },
// {
// label: '仓库代码',
// field: 'toWarehouseCode',
// sort: 'custom',
// table: {
// width: 150,
// },
// form: {
// // labelMessage: '信息提示说明！！！',
// componentProps: {
// enterSearch:true,
// isSearch:true,
// isSearchList: true, // 开启查询弹窗
// searchListPlaceholder: '请选择仓库代码', // 输入框占位文本
// searchField: 'code', // 查询弹窗赋值字段
// searchTitle: '仓库信息', // 查询弹窗标题
// searchAllSchemas: Warehouse.allSchemas, // 查询弹窗所需类
// searchPage: WarehouseApi.getWarehousePage, // 查询弹窗所需分页方法
// searchCondition: [{
// key: 'available',
// value: 'TRUE',
// isMainValue: false
// }]
// }
// }
// },
// {
// label: '月台代码',
// field: 'toDockCode',
// sort: 'custom',
// table: {
// width: 150,
// },
// form: {
// // labelMessage: '信息提示说明！！！',
// componentProps: {
// enterSearch: true,
// isSearchList: true,
// searchListPlaceholder: '请选择月台代码',
// searchField: 'code',
// searchTitle: '客户月台',
// searchAllSchemas: Dock.allSchemas,
// searchPage: DockApi.getDockPage,
// searchCondition: [{
// key: 'available',
// value: 'TRUE',
// isMainValue: false
// }],
// }
// }
// },
// {
// label: '库位代码',
// field: 'toLocationCode',
// sort: 'custom',
// table: {
// width: 150,
// },
// form: {
// // labelMessage: '信息提示说明！！！',
// componentProps: {
// enterSearch: true,
// isSearchList: true,
// searchListPlaceholder: '请选择库位代码',
// searchField: 'code',
// searchTitle: '库位信息',
// searchAllSchemas: Location.allSchemas,
// searchPage: LocationApi.getLocationPage,
// searchCondition: [{
// key: 'available',
// value: 'TRUE',
// isMainValue: false
// },{
// key: 'warehouseCode',
// value: 'toWarehouseCode',
// message: '请填写仓库代码！',
// isMainValue: true
// }],
// }
// }
// },
{ {
label: '仓库代码', label: '供应商代码',
field: 'toWarehouseCode', field: 'supplierCode',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150, width: 150,
@ -340,102 +429,22 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
// labelMessage: '信息提示说明！！！', // labelMessage: '信息提示说明！！！',
componentProps: { componentProps: {
enterSearch:true, enterSearch:true,
isSearch:true, isInpuFocusShow: true,
searchListPlaceholder: '请选择物料代码', // 输入框占位文本
searchField: 'supplierCode', // 查询弹窗赋值字段
searchTitle: '供应商物料信息',
isSearchList: true, // 开启查询弹窗 isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择仓库代码', // 输入框占位文本 searchAllSchemas: Supplieritem.allSchemas, // 查询弹窗所需类
searchField: 'code', // 查询弹窗赋值字段 searchPage: SupplieritemApi.getSupplieritemPage, // 查询弹窗所需分页方法
searchTitle: '仓库信息', // 查询弹窗标题 searchCondition:[{
searchAllSchemas: Warehouse.allSchemas, // 查询弹窗所需类 key: 'itemCode',
searchPage: WarehouseApi.getWarehousePage, // 查询弹窗所需分页方法 value: 'itemCode',
searchCondition: [{ message: '请填写物料代码！',
key: 'available',
value: 'TRUE',
isMainValue: false
}]
}
}
},
{
label: '月台代码',
field: 'toDockCode',
sort: 'custom',
table: {
width: 150,
},
form: {
// labelMessage: '信息提示说明！！！',
componentProps: {
enterSearch: true,
isSearchList: true,
searchListPlaceholder: '请选择月台代码',
searchField: 'code',
searchTitle: '客户月台',
searchAllSchemas: Dock.allSchemas,
searchPage: DockApi.getDockPage,
searchCondition: [{
key: 'available',
value: 'TRUE',
isMainValue: false
}],
}
}
},
{
label: '库位代码',
field: 'toLocationCode',
sort: 'custom',
table: {
width: 150,
},
form: {
// labelMessage: '信息提示说明！！！',
componentProps: {
enterSearch: true,
isSearchList: true,
searchListPlaceholder: '请选择库位代码',
searchField: 'code',
searchTitle: '库位信息',
searchAllSchemas: Location.allSchemas,
searchPage: LocationApi.getLocationPage,
searchCondition: [{
key: 'available',
value: 'TRUE',
isMainValue: false
},{
key: 'warehouseCode',
value: 'toWarehouseCode',
message: '请填写仓库代码！',
isMainValue: true isMainValue: true
}], }],
}
}
},
{
label: '供应商代码',
field: 'supplierCode',
sort: 'custom',
table: {
width: 150,
},
form: {
componentProps: {
enterSearch: true,
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择供应商', // 输入框占位文本
searchField: 'code', // 查询弹窗赋值字段
searchTitle: '供应商信息', // 查询弹窗标题
searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类
searchPage: SupplierApi.getSupplierPage, // 查询弹窗所需分页方法
searchCondition: [
{
key: 'available',
value: 'TRUE',
isMainValue: false
}
],
verificationParams: [ verificationParams: [
{ {
key: 'code', key: 'supplierCode',
action: '==', action: '==',
value: '', value: '',
isMainValue: false, isMainValue: false,
@ -443,6 +452,7 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
isFormModel: true isFormModel: true
} }
] // 失去焦点校验参数 ] // 失去焦点校验参数
} }
} }
}, },
@ -455,35 +465,36 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
}, },
form: { form: {
componentProps: { componentProps: {
enterSearch: true, disabled: true
isSearchList: true, // 开启查询弹窗 // enterSearch: true,
searchListPlaceholder: '请选择供应商物料', // 输入框占位文本 // isSearchList: true, // 开启查询弹窗
searchField: 'supplierItemCode', // 查询弹窗赋值字段 // searchListPlaceholder: '请选择供应商物料', // 输入框占位文本
searchTitle: '供应商信息', // 查询弹窗标题 // searchField: 'supplierItemCode', // 查询弹窗赋值字段
searchAllSchemas: Supplieritem.allSchemas, // 查询弹窗所需类 // searchTitle: '供应商信息', // 查询弹窗标题
searchPage: SupplieritemApi.getSupplieritemPage, // 查询弹窗所需分页方法 // searchAllSchemas: Supplieritem.allSchemas, // 查询弹窗所需类
searchCondition: [ // searchPage: SupplieritemApi.getSupplieritemPage, // 查询弹窗所需分页方法
{ // searchCondition: [
key: 'available', // {
value: 'TRUE', // key: 'available',
isMainValue: false // value: 'TRUE',
},{ // isMainValue: false
key: 'supplierCode', // },{
value: 'supplierCode', // key: 'supplierCode',
message: '请填写物料代码！', // value: 'supplierCode',
isMainValue: true // message: '请填写物料代码！',
} // isMainValue: true
], // }
verificationParams: [ // ],
{ // verificationParams: [
key: 'code', // {
action: '==', // key: 'code',
value: '', // action: '==',
isMainValue: false, // value: '',
isSearch: true, // isMainValue: false,
isFormModel: true // isSearch: true,
} // isFormModel: true
] // 失去焦点校验参数 // }
// ] // 失去焦点校验参数
} }
} }
}, },

9
src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<ContentWrap> <ContentWrap>
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<Search :schema="[...InventorymoveRecordMainNew.allSchemas.searchSchema,...InventorymoveRecordDetailNew.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" /> <Search :schema="[...InventorymoveRecordMainNew.allSchemas.searchSchema,...InventorymoveRecordDetailNew.allSchemas.searchSchema]" @search="setSearchParams({'business_type':'Move'})" @reset="setSearchParams({'business_type':'Move'})" />
</ContentWrap> </ContentWrap>
<!-- 列表头部 --> <!-- 列表头部 -->
@ -117,6 +117,7 @@ const updataTableColumns = (val) => {
} }
const { tableObject, tableMethods } = useTable({ const { tableObject, tableMethods } = useTable({
defaultParams:{'business_type':'Move'},
getListApi: InventorymoveRecordDetailApi.getInventorymoveRecordDetailPage // 分页接口 getListApi: InventorymoveRecordDetailApi.getInventorymoveRecordDetailPage // 分页接口
}) })
@ -407,7 +408,11 @@ const importSuccess = () => {
const searchFormClick = (searchData) => { const searchFormClick = (searchData) => {
tableObject.params = { tableObject.params = {
isSearch: true, isSearch: true,
filters: searchData.filters filters: [...searchData.filters,{
action: "==",
column: "business_type",
value: "Move"
}]
} }
getList() // 刷新当前列表 getList() // 刷新当前列表
} }

Write Preview
Loading…
Cancel
Save