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

主子表合并

master_hella_20240701
yufei0306 5 months ago
parent
6de82dfa0a
commit
aafb817be3
8 changed files with 326 additions and 66 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 91
      src/views/wms/deliversettlementManage/stockup/stockupMainJob/stockupMainJob.data.ts
  2. 62
      src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts
  3. 15
      src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue
  4. 58
      src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts
  5. 16
      src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
  6. 59
      src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
  7. 19
      src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue
  8. 60
      src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts

91
src/views/wms/deliversettlementManage/stockup/stockupMainJob/stockupMainJob.data.ts
View File

@ -17,7 +17,7 @@ export const StockupMainJob = useCrudSchemas(reactive<CrudSchema[]>([
},
},
{
label: '发货记录单号',
label: '发货计划单号',
field: 'deliverPlanNumber',
sort: 'custom',
isForm: false,
@ -33,24 +33,27 @@ export const StockupMainJob = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 180
},
isTable: false
},
{
label: '从仓库代码',
label: '从仓库',
field: 'fromWarehouseCode',
sort: 'custom',
isForm: false,
table: {
width: 150
},
sortTableDefault:1000
},
{
label: '到仓库代码',
label: '到仓库',
field: 'toWarehouseCode',
sort: 'custom',
isForm: false,
table: {
width: 150
},
sortTableDefault:1000
},
{
label: '状态',
@ -58,7 +61,7 @@ export const StockupMainJob = useCrudSchemas(reactive<CrudSchema[]>([
dictType: DICT_TYPE.REQUEST_STATUS,
dictClass: 'string',
isSearch: true,
isTable: true,
isTable: false,
sort: 'custom',
table: {
width: 150
@ -73,6 +76,7 @@ export const StockupMainJob = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 180
},
isTable: false,
search: {
component: 'DatePicker',
componentProps: {
@ -97,6 +101,7 @@ export const StockupMainJob = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 180
},
isTable: false,
search: {
component: 'DatePicker',
componentProps: {
@ -122,6 +127,7 @@ export const StockupMainJob = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 180
},
isTable: false,
search: {
component: 'DatePicker',
componentProps: {
@ -142,11 +148,13 @@ export const StockupMainJob = useCrudSchemas(reactive<CrudSchema[]>([
label: '部门',
field: 'departmentCode',
sort: 'custom',
isTable: false,
},
{
label: '承接人用户名',
field: 'acceptUserName',
sort: 'custom',
isTable: false,
table: {
width: 150
},
@ -159,6 +167,7 @@ export const StockupMainJob = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 180
},
isTable: false,
search: {
component: 'DatePicker',
componentProps: {
@ -182,6 +191,7 @@ export const StockupMainJob = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable: false,
},
{
label: '完成时间',
@ -191,6 +201,7 @@ export const StockupMainJob = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 180
},
isTable: false,
search: {
component: 'DatePicker',
componentProps: {
@ -212,7 +223,7 @@ export const StockupMainJob = useCrudSchemas(reactive<CrudSchema[]>([
field: 'fromAreaTypes',
dictType: DICT_TYPE.AREA_TYPE,
dictClass: 'string',
isTable: true,
isTable: false,
sort: 'custom',
table: {
width: 150
@ -224,7 +235,7 @@ export const StockupMainJob = useCrudSchemas(reactive<CrudSchema[]>([
field: 'toAreaTypes',
dictType: DICT_TYPE.AREA_TYPE,
dictClass: 'string',
isTable: true,
isTable: false,
sort: 'custom',
table: {
width: 150
@ -235,6 +246,7 @@ export const StockupMainJob = useCrudSchemas(reactive<CrudSchema[]>([
label: '业务类型',
field: 'businessType',
sort: 'custom',
isTable: false,
form: {
component: 'SelectV2'
},
@ -246,6 +258,7 @@ export const StockupMainJob = useCrudSchemas(reactive<CrudSchema[]>([
label: '备注',
field: 'remark',
sort: 'custom',
isTable: false,
},
{
label: '自动完成',
@ -254,6 +267,7 @@ export const StockupMainJob = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 120
},
isTable: false,
},
{
label: '允许修改库位',
@ -262,6 +276,7 @@ export const StockupMainJob = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable: false,
},
{
label: '允许修改数量',
@ -270,6 +285,7 @@ export const StockupMainJob = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable: false,
},
{
label: '允许大于推荐数量',
@ -278,6 +294,7 @@ export const StockupMainJob = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 180
},
isTable: false,
},
{
label: '允许小于推荐数量',
@ -286,6 +303,7 @@ export const StockupMainJob = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 180
},
isTable: false,
},
{
label: '允许修改库存状态',
@ -294,6 +312,7 @@ export const StockupMainJob = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 180
},
isTable: false,
form: {
component: 'Radio'
},
@ -305,6 +324,7 @@ export const StockupMainJob = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable: false,
},
{
label: '允许部分完成',
@ -313,6 +333,7 @@ export const StockupMainJob = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable: false,
},
{
label: '允许修改批次',
@ -321,6 +342,7 @@ export const StockupMainJob = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable: false,
},
{
label: '允许修改箱码',
@ -329,6 +351,7 @@ export const StockupMainJob = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable: false,
},
{
label: '从库区代码范围',
@ -337,6 +360,7 @@ export const StockupMainJob = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable: false,
},
{
label: '到库区代码范围',
@ -345,6 +369,7 @@ export const StockupMainJob = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable: false,
},
{
label: '入库库存状态范围',
@ -353,6 +378,7 @@ export const StockupMainJob = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 180
},
isTable: false,
},
{
label: '出库库存状态范围',
@ -361,6 +387,7 @@ export const StockupMainJob = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 180
},
isTable: false,
},
{
label: '创建者',
@ -369,6 +396,7 @@ export const StockupMainJob = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 120
},
isTable: false,
},
{
label: '创建时间',
@ -378,6 +406,7 @@ export const StockupMainJob = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 180
},
isTable: false,
search: {
component: 'DatePicker',
componentProps: {
@ -412,6 +441,7 @@ export const StockupDetailJob = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
hiddenInMain:true
},
{
label: '包装号',
@ -421,6 +451,7 @@ export const StockupDetailJob = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
hiddenInMain:true
},
{
label: '批次',
@ -430,6 +461,7 @@ export const StockupDetailJob = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
hiddenInMain:true
},
{
label: '库存状态',
@ -439,6 +471,7 @@ export const StockupDetailJob = useCrudSchemas(reactive<CrudSchema[]>([
form: {
component: 'Radio'
},
hiddenInMain:true,
table: {
width: 120
},
@ -451,6 +484,7 @@ export const StockupDetailJob = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 120
},
hiddenInMain:true,
},
{
label: '器具号',
@ -460,27 +494,11 @@ export const StockupDetailJob = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 120
},
hiddenInMain:true,
},
{
label: '从库位代码',
field: 'fromLocationCode',
sort: 'custom',
isSearch: true,
table: {
width: 120
},
},
{
label: '到库位代码',
field: 'toLocationCode',
sort: 'custom',
isSearch: true,
table: {
width: 120
},
},
{
label: '物品代码',
label: '物料代码',
field: 'itemCode',
sort: 'custom',
isSearch: true,
@ -505,6 +523,7 @@ export const StockupDetailJob = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 120
},
hiddenInMain:true,
},
{
label: '物品描述2',
@ -514,6 +533,7 @@ export const StockupDetailJob = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 120
},
hiddenInMain:true,
},
{
label: '项目代码',
@ -523,6 +543,7 @@ export const StockupDetailJob = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 120
},
hiddenInMain:true,
},
{
label: '数量',
@ -550,11 +571,30 @@ export const StockupDetailJob = useCrudSchemas(reactive<CrudSchema[]>([
}
}
},
{
label: '从库位',
field: 'fromLocationCode',
sort: 'custom',
isSearch: true,
table: {
width: 120
},
},
{
label: '到库位',
field: 'toLocationCode',
sort: 'custom',
isSearch: true,
table: {
width: 120
},
},
{
label: '备注',
field: 'remark',
sort: 'custom',
isSearch: true,
hiddenInMain:true,
},
{
label: '创建时间',
@ -562,6 +602,7 @@ export const StockupDetailJob = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom',
formatter: dateFormatter,
isSearch: true,
hiddenInMain:true,
search: {
component: 'DatePicker',
componentProps: {

62
src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts
View File

@ -17,7 +17,7 @@ export const StockupMainRecord = useCrudSchemas(reactive<CrudSchema[]>([
},
},
{
label: '发货记录单号',
label: '发货计划单号',
field: 'deliverPlanNumber',
sort: 'custom',
isForm: false,
@ -33,6 +33,7 @@ export const StockupMainRecord = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 180
},
isTable: false,
},
{
label: '任务单号',
@ -42,22 +43,25 @@ export const StockupMainRecord = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 180
},
isTable: false,
},
{
label: '从仓库代码',
label: '从仓库',
field: 'fromWarehouseCode',
sort: 'custom',
table: {
width: 150
},
sortTableDefault:1000
},
{
label: '到仓库代码',
label: '到仓库',
field: 'toWarehouseCode',
sort: 'custom',
table: {
width: 150
},
sortTableDefault:1000
},
{
label: '出库事务类型',
@ -65,7 +69,7 @@ export const StockupMainRecord = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom',
dictType: DICT_TYPE.AREA_TYPE,
dictClass: 'string',
isTable: true,
isTable: false,
table: {
width: 150
},
@ -76,7 +80,7 @@ export const StockupMainRecord = useCrudSchemas(reactive<CrudSchema[]>([
field: 'inTransactionType',
dictType: DICT_TYPE.AREA_TYPE,
dictClass: 'string',
isTable: true,
isTable: false,
sort: 'custom',
table: {
width: 150
@ -88,7 +92,7 @@ export const StockupMainRecord = useCrudSchemas(reactive<CrudSchema[]>([
field: 'fromAreaTypes',
dictType: DICT_TYPE.AREA_TYPE,
dictClass: 'string',
isTable: true,
isTable: false,
sort: 'custom',
table: {
width: 180
@ -99,6 +103,7 @@ export const StockupMainRecord = useCrudSchemas(reactive<CrudSchema[]>([
field: 'fromAreaCodes',
sort: 'custom',
isSearch: true,
isTable: false,
table: {
width: 180
},
@ -108,7 +113,7 @@ export const StockupMainRecord = useCrudSchemas(reactive<CrudSchema[]>([
field: 'toAreaTypes',
dictType: DICT_TYPE.AREA_TYPE,
dictClass: 'string',
isTable: true,
isTable: false,
sort: 'custom',
table: {
width: 180
@ -118,6 +123,7 @@ export const StockupMainRecord = useCrudSchemas(reactive<CrudSchema[]>([
label: '到库区代码范围',
field: 'toAreaCodes',
sort: 'custom',
isTable: false,
table: {
width: 180
},
@ -138,6 +144,7 @@ export const StockupMainRecord = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 180
},
isTable: false,
form: {
component: 'DatePicker',
componentProps: {
@ -157,6 +164,7 @@ export const StockupMainRecord = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 180
},
isTable: false,
form: {
component: 'DatePicker',
componentProps: {
@ -174,6 +182,7 @@ export const StockupMainRecord = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 180
},
isTable: false,
form: {
component: 'DatePicker',
componentProps: {
@ -199,6 +208,7 @@ export const StockupMainRecord = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 180
},
isTable: false,
form: {
component: 'DatePicker',
componentProps: {
@ -223,6 +233,7 @@ export const StockupMainRecord = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 180
},
isTable: false,
isForm: false,
},
{
@ -232,13 +243,14 @@ export const StockupMainRecord = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable: false,
},
{
label: '接口类型',
field: 'interfaceType',
dictType: DICT_TYPE.INTERFACE_TYPE,
dictClass: 'string',
isTable: true,
isTable: false,
sort: 'custom',
table: {
width: 150
@ -251,13 +263,14 @@ export const StockupMainRecord = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable: false,
},
{
label: '是否可用',
field: 'available',
dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string',
isTable: true,
isTable: false,
sort: 'custom',
table: {
width: 150
@ -278,6 +291,7 @@ export const StockupMainRecord = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 100
},
isTable: false,
},
{
label: '操作',
@ -303,6 +317,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 180
},
hiddenInMain: true
},
{
label: '包装号',
@ -312,6 +327,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
hiddenInMain: true
},
{
label: '批次',
@ -321,6 +337,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
hiddenInMain: true
},
{
label: '从器具号',
@ -330,9 +347,10 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
hiddenInMain: true
},
{
label: '物品代码',
label: '物料代码',
field: 'itemCode',
sort: 'custom',
isSearch: true,
@ -357,6 +375,8 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
hiddenInMain: true
},
{
label: '物品描述2',
@ -366,6 +386,8 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
hiddenInMain: true
},
{
label: '项目代码',
@ -375,6 +397,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
hiddenInMain: true
},
{
label: '数量',
@ -406,6 +429,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
hiddenInMain: true
},
{
label: '从货主代码',
@ -415,9 +439,10 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
hiddenInMain: true
},
{
label: '从库位代码',
label: '从库位',
field: 'fromLocationCode',
sort: 'custom',
isSearch: true,
@ -433,6 +458,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
hiddenInMain: true
},
{
label: '从库区代码',
@ -442,6 +468,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
hiddenInMain: true
},
{
label: '到货主代码',
@ -451,6 +478,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
hiddenInMain: true
},
{
label: '到器具号',
@ -460,9 +488,10 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
hiddenInMain: true
},
{
label: '到库位代码',
label: '到库位',
field: 'toLocationCode',
sort: 'custom',
isSearch: true,
@ -475,6 +504,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
field: 'toLocationGroupCode',
sort: 'custom',
isSearch: true,
hiddenInMain: true,
table: {
width: 150
},
@ -484,6 +514,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
field: 'toAreaCode',
sort: 'custom',
isSearch: true,
hiddenInMain: true,
table: {
width: 150
},
@ -493,6 +524,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
field: 'singlePrice',
sort: 'custom',
isSearch: true,
hiddenInMain: true,
table: {
width: 150
},
@ -502,6 +534,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
field: 'amount',
sort: 'custom',
isSearch: true,
hiddenInMain: true,
table: {
width: 150
},
@ -512,6 +545,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
dictType: DICT_TYPE.INTERFACE_TYPE,
dictClass: 'string',
isTable: true,
hiddenInMain: true,
sort: 'custom',
table: {
width: 150
@ -524,6 +558,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
dictClass: 'string',
isSearch: true,
isTable: true,
hiddenInMain: true,
sort: 'custom',
table: {
width: 150
@ -546,6 +581,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 180
},
hiddenInMain: true,
search: {
component: 'DatePicker',
componentProps: {
@ -561,6 +597,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
field: 'remark',
sort: 'custom',
isSearch: true,
hiddenInMain: true,
table: {
width: 150
},
@ -569,6 +606,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
label: '操作',
field: 'action',
isForm: false,
hiddenInMain: true,
table: {
width: 150,
fixed: 'right'

15
src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue
View File

@ -43,6 +43,8 @@
<!-- 表单弹窗：添加/修改 -->
<BasicForm
ref="formRef"
:isOpenSearchTable="true"
fieldTableColumn = "itemCode"
@success="getList"
:rules="StockupMainRequestRules"
:formAllSchemas="StockupMainRequest.allSchemas"
@ -119,9 +121,18 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
const setV = {}
setV[formField] = val[0][searchField]
if (type == 'tableForm') {
// if(formField == 'itemCode') {
// row['itemCode'] = val[0]['code']
// row['uom'] = val[0]['uom']
// }
if(formField == 'itemCode') {
row['itemCode'] = val[0]['code']
row['uom'] = val[0]['uom']
val.forEach(item=>{
if(tableData.value.find(item1=>item1['id'] == item['id'])) return
const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
newRow['uom'] = item['uom']
newRow['itemCode'] = item['code']
tableData.value.push(newRow)
})
}
if(formField == 'toLocationCode'){
row['toLocationCode'] = val[0]['code']

58
src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts
View File

@ -81,13 +81,14 @@ export const StockupMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
}
},
{
label: '从仓库代码',
label: '从仓库',
field: 'fromWarehouseCode',
sort: 'custom',
isSearch: false,
table: {
width: 120
},
sortTableDefault:1000,
// form: {
// // labelMessage: '信息提示说明！！！',
// componentProps: {
@ -107,7 +108,7 @@ export const StockupMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
isForm: false
},
{
label: '到仓库代码',
label: '到仓库',
field: 'toWarehouseCode',
sort: 'custom',
isSearch: false,
@ -115,13 +116,15 @@ export const StockupMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
width: 120
},
isForm: false,
sortTableDefault:1000,
},
{
label: '从库区类型范围',
field: 'fromAreaTypes',
dictType: DICT_TYPE.AREA_TYPE,
dictClass: 'string',
isTable: true,
isTable: false,
sort: 'custom',
table: {
width: 150
@ -136,6 +139,7 @@ export const StockupMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 160
},
isTable: false,
isForm: false
},
{
@ -143,6 +147,7 @@ export const StockupMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
field: 'businessType',
sort: 'custom',
isSearch: false,
isTable: false,
form: {
value: 'Stockup',
componentProps: {
@ -168,6 +173,7 @@ export const StockupMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
}
},
isTable: false,
table: {
width: 180
},
@ -179,6 +185,7 @@ export const StockupMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom',
formatter: dateFormatter,
isSearch: false,
isTable: false,
search: {
component: 'DatePicker',
componentProps: {
@ -204,6 +211,7 @@ export const StockupMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom',
formatter: dateFormatter,
isSearch: false,
isTable: false,
search: {
component: 'DatePicker',
componentProps: {
@ -229,6 +237,7 @@ export const StockupMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom',
formatter: dateFormatter,
isSearch: false,
isTable: false,
search: {
component: 'DatePicker',
componentProps: {
@ -255,6 +264,7 @@ export const StockupMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable: false,
formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
return userDeptArray.find((account) => account.id == cellValue)?.name
},
@ -278,7 +288,7 @@ export const StockupMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
dictClass: 'string',
isSearch: true,
isForm: false,
isTable: true,
isTable: false,
sort: 'custom',
table: {
width: 150
@ -289,13 +299,14 @@ export const StockupMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
field: 'remark',
sort: 'custom',
isSearch: false,
isTable: false,
},
{
label: '自动提交',
field: 'autoCommit',
dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string',
isTable: true,
isTable: false,
isForm: false,
sort: 'custom',
table: {
@ -316,7 +327,7 @@ export const StockupMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
field: 'autoAgree',
dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string',
isTable: true,
isTable: false,
isForm: false,
sort: 'custom',
table: {
@ -337,7 +348,7 @@ export const StockupMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
field: 'autoExecute',
dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string',
isTable: true,
isTable: false,
isForm: false,
sort: 'custom',
table: {
@ -379,7 +390,7 @@ export const StockupMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
field: 'toAreaTypes',
dictType: DICT_TYPE.AREA_TYPE,
dictClass: 'string',
isTable: true,
isTable: false,
sort: 'custom',
table: {
width: 150
@ -394,6 +405,7 @@ export const StockupMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable: false,
isForm: false
},
{
@ -405,7 +417,7 @@ export const StockupMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
},
dictType: DICT_TYPE.INVENTORY_STATUS,
dictClass: 'string',
isTable: true,
isTable: false,
sort: 'custom',
tableForm: {
disabled: true,
@ -424,7 +436,7 @@ export const StockupMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
},
dictType: DICT_TYPE.INVENTORY_STATUS,
dictClass: 'string',
isTable: true,
isTable: false,
tableForm: {
disabled: true,
type: 'Select',
@ -477,6 +489,7 @@ export const StockupDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 180
},
hiddenInMain: true
},
// {
// label: '包装号',
@ -565,7 +578,7 @@ export const StockupDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
// }
// },
{
label: '物品代码',
label: '物料代码',
field: 'itemCode',
sort: 'custom',
isSearch: true,
@ -573,7 +586,7 @@ export const StockupDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
width: 150
},
tableForm:{
isInpuFocusShow: true, // 开启查询弹窗
isInpuFocusShow: false, // 开启查询弹窗
searchListPlaceholder: '请选择物料代码',
searchField: 'code',
searchTitle: '物料基础信息',
@ -620,6 +633,7 @@ export const StockupDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 120
},
hiddenInMain: true
},
{
label: '物品描述2',
@ -630,6 +644,7 @@ export const StockupDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 120
},
hiddenInMain: true
},
{
label: '项目代码',
@ -640,12 +655,18 @@ export const StockupDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 120
},
hiddenInMain: true
},
{
label: '数量',
field: 'qty',
sort: 'custom',
isSearch: true,
tableForm: {
type: 'InputNumber',
min: 1,
precision: 6
},
},
{
label: '计量单位',
@ -668,7 +689,15 @@ export const StockupDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
}
},
{
label: '到库位代码',
label: '从库位',
field: 'fromLocationCode',
sort: 'custom',
table: {
width: 150
},
},
{
label: '到库位',
field: 'toLocationCode',
sort: 'custom',
isSearch: true,
@ -719,6 +748,7 @@ export const StockupDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
field: 'remark',
sort: 'custom',
isSearch: true,
hiddenInMain: true
},
{
label: '创建时间',
@ -729,6 +759,7 @@ export const StockupDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 120
},
hiddenInMain: true,
search: {
component: 'DatePicker',
componentProps: {
@ -748,6 +779,7 @@ export const StockupDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
width: 150,
fixed: 'right'
},
hiddenInMain: true,
isTableForm:false,
}
]))

16
src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
View File

@ -55,7 +55,15 @@
@handleDeleteTable="handleDeleteTable"
@searchTableSuccess="searchTableSuccess"
@submitForm="submitForm"
/>
>
<template v-slot="{row}">
<el-date-picker v-bind:modelValue="row['expireTime']?addDay(row['produceDate'],row['expireTime']):dayjs('2099-12-31').valueOf()"
:clearable="true"
style="width: 100%"
:disabled="true"
placeholder="选择日期"/>
</template>
</BasicForm>
<!-- 详情 -->
<Detail
@ -190,6 +198,9 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
if (formField == 'secondPackUnit') {
row['secondPackUnit'] = val[0]['packUnit']
row['secondPackQty'] = val[0]['packQty']
}else if (formField == 'itemCode') {
row['uom'] = val[0]['uom']
row['produceDate'] = dayjs().valueOf()
}
// 明细查询页赋值
row[formField] = val[0][searchField]
@ -544,6 +555,9 @@ const handleDeleteTable = (item, index) => {
// 主子数据 提交
const submitForm = async (formType, data) => {
tableData.value.forEach((row, index) => {
row['expireDate'] = row['expireTime']?addDay(row['produceDate'],row['expireTime']).valueOf():dayjs('2099-12-31').valueOf()
})
data.type = 'predict'
data.subList = tableData.value // 拼接子表数据参数
if(data.subList.find(item => (item.qty <= 0))) {

59
src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
View File

@ -122,6 +122,54 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
}
}
},
{
label: '生产线代码',
field: 'productionLineCode',
sort: 'custom',
table: {
width: 150
},
isTable: false,
tableForm:{
isInpuFocusShow: true,
searchListPlaceholder: '请选择生产线代码',
searchField: 'code',
searchTitle: '生产线信息',
searchAllSchemas: Productionline.allSchemas,
searchPage: ProductionlineApi.getProductionlinePage,
searchCondition: [{
key: 'available',
value: 'TRUE',
isMainValue: false
},{
key: 'workshopCode',
value: 'workshopCode',
message: '请填写车间代码！',
isMainValue: true
}]
},
form: {
// labelMessage: '信息提示说明！！！',
componentProps: {
isSearchList: true,
searchListPlaceholder: '请选择生产线代码',
searchField: 'code',
searchTitle: '生产线信息',
searchAllSchemas: Productionline.allSchemas,
searchPage: ProductionlineApi.getProductionlinePage,
searchCondition: [{
key: 'available',
value: 'TRUE',
isMainValue: false
},{
key: 'workshopCode',
value: 'workshopCode',
message: '请填写车间代码！',
isMainValue: true
}]
}
}
},
{
label: '班组',
field: 'team',
@ -515,6 +563,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
table: {
width: 150
},
isTableForm: false,
tableForm:{
isInpuFocusShow: true,
searchListPlaceholder: '请选择生产线代码',
@ -990,9 +1039,13 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
table: {
width: 180
},
tableForm: {
type: 'FormDate',
valueFormat: 'x',
// tableForm: {
// type: 'FormDate',
// valueFormat: 'x',
// },
tableForm:{
type: 'slot',
disabled: true
},
form: {
component: 'DatePicker',

19
src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue
View File

@ -55,7 +55,15 @@
@handleDeleteTable="handleDeleteTable"
@searchTableSuccess="searchTableSuccess"
@submitForm="submitForm"
/>
>
<template v-slot="{row}">
<el-date-picker v-bind:modelValue="row['expireTime']?addDay(row['produceDate'],row['expireTime']):dayjs('2099-12-31').valueOf()"
:clearable="true"
style="width: 100%"
:disabled="true"
placeholder="选择日期"/>
</template>
</BasicForm>
<!-- 详情 -->
<Detail
@ -118,6 +126,8 @@
</template>
<script setup lang="ts">
import dayjs from 'dayjs'
import { addDay } from '@/utils/formatTime'
import download from '@/utils/download'
import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
import { ProductreceiptRequestMain,ProductreceiptRequestMainRules,ProductreceiptRequestDetail,
@ -183,11 +193,15 @@ const updataTableColumns = (val) => {
// 查询页面返回
const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
console.log('searchTableSuccess',formField, searchField, val, formRef, type, row)
nextTick(() => {
if (type == 'tableForm') {
if (formField == 'secondPackUnit') {
row['secondPackUnit'] = val[0]['packUnit']
row['secondPackQty'] = val[0]['packQty']
}else if (formField == 'itemCode') {
row['uom'] = val[0]['uom']
row['produceDate'] = dayjs().valueOf()
}
// 明细查询页赋值
row[formField] = val[0][searchField]
@ -542,6 +556,9 @@ const handleDeleteTable = (item, index) => {
// 主子数据 提交
const submitForm = async (formType, data) => {
tableData.value.forEach((row, index) => {
row['expireDate'] = row['expireTime']?addDay(row['produceDate'],row['expireTime']).valueOf():dayjs('2099-12-31').valueOf()
})
data.type = 'assemble'
data.subList = tableData.value // 拼接子表数据参数
if(data.subList.find(item => (item.qty <= 0))) {

60
src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts
View File

@ -122,6 +122,54 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
}
}
},
{
label: '生产线代码',
field: 'productionLineCode',
sort: 'custom',
table: {
width: 150
},
isTable:false,
tableForm:{
isInpuFocusShow: true,
searchListPlaceholder: '请选择生产线代码',
searchField: 'code',
searchTitle: '生产线信息',
searchAllSchemas: Productionline.allSchemas,
searchPage: ProductionlineApi.getProductionlinePage,
searchCondition: [{
key: 'available',
value: 'TRUE',
isMainValue: false
},{
key: 'workshopCode',
value: 'workshopCode',
message: '请填写车间代码！',
isMainValue: true
}]
},
form: {
// labelMessage: '信息提示说明！！！',
componentProps: {
isSearchList: true,
searchListPlaceholder: '请选择生产线代码',
searchField: 'code',
searchTitle: '生产线信息',
searchAllSchemas: Productionline.allSchemas,
searchPage: ProductionlineApi.getProductionlinePage,
searchCondition: [{
key: 'available',
value: 'TRUE',
isMainValue: false
},{
key: 'workshopCode',
value: 'workshopCode',
message: '请填写车间代码！',
isMainValue: true
}]
}
}
},
{
label: '班组',
field: 'team',
@ -129,6 +177,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
sortTableDefault: 1001,
form: {
// labelMessage: '信息提示说明！！！',
componentProps: {
@ -515,6 +564,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
table: {
width: 150
},
isTableForm: false,
tableForm:{
isInpuFocusShow: true,
searchListPlaceholder: '请选择生产线代码',
@ -990,9 +1040,13 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
table: {
width: 180
},
tableForm: {
type: 'FormDate',
valueFormat: 'x',
// tableForm: {
// type: 'FormDate',
// valueFormat: 'x',
// },
tableForm:{
type: 'slot',
disabled: true
},
form: {
component: 'DatePicker',

Write Preview
Loading…
Cancel
Save