Browse Source

Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella

hella_online_20240829
ljlong_2630 2 months ago
parent
commit
b495948db3
  1. 39
      src/components/BasicForm/src/BasicForm.vue
  2. 20
      src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts
  3. 2
      src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts
  4. 2
      src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
  5. 11
      src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
  6. 54
      src/views/wms/purchasereceiptManage/putaway/putawayJobMain/putawayJobMain.data.ts
  7. 114
      src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/putawayRecordMain.data.ts
  8. 66
      src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts

39
src/components/BasicForm/src/BasicForm.vue

@ -134,8 +134,7 @@
:showSearchTableQueryFields="showSearchTableQueryFields"
@searchTableSuccess="searchTableSuccess"
>
<template v-for="name in Object.keys($slots)" :key="name" #[name]="{selections}">
<template v-for="name in Object.keys($slots)" :key="name" #[name]="{ selections }">
<slot :name="name" :selections="selections"></slot>
</template>
</SearchTable>
@ -843,18 +842,25 @@ const onChange = (field, cur) => {
const onBlur = async (field, e) => {
isExecute.value = false
let formSchemaObj = formSchema.value.find((item) => item.field == field)?.componentProps
if (formSchemaObj?.enterSearch) {
await FormBlur(field, e, routeName.value, formRef.value, props.detailData, formSchemaObj, (list) => {
emit('searchTableSuccess', field, formSchemaObj.searchField, list, formRef.value, 'form')
})
await FormBlur(
field,
e,
routeName.value,
formRef.value,
props.detailData,
formSchemaObj,
(list) => {
emit('searchTableSuccess', field, formSchemaObj.searchField, list, formRef.value, 'form')
}
)
} else {
emit('onBlur', field, e)
}
isExecute.value = true
}
//
const batchAdd = async (val) => {
const row = {}
@ -921,8 +927,23 @@ const inputStringBlur = async (headerItem, val, row, index) => {
* @param field 当前操作字段
* @param e
*/
const onEnter = (field, value, e) => {
emit('onEnter', field, value, e)
const onEnter = async (field, value, e) => {
let formSchemaObj = formSchema.value.find((item) => item.field == field)?.componentProps
if (formSchemaObj?.enterSearch && formSchemaObj?.isEnter ) {
await FormBlur(
field,
value,
routeName.value,
formRef.value,
props.detailData,
formSchemaObj,
(list) => {
emit('onEnter', field, value, e)
}
)
} else {
emit('onEnter', field, value, e)
}
}
//

20
src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts

@ -612,7 +612,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
table: {
width: 180
},
hiddeInMain: true,
hiddenInMain: true,
isTableForm: false,
form: {
componentProps: {
@ -627,7 +627,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
table: {
width: 150
},
hiddeInMain: true,
hiddenInMain: true,
},
{
label: '创建时间',
@ -640,7 +640,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
table: {
width: 180
},
hiddeInMain: true,
hiddenInMain: true,
form: {
component: 'DatePicker',
componentProps: {
@ -659,7 +659,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
table: {
width: 150
},
hiddeInMain: true,
hiddenInMain: true,
isTableForm: false,
isForm: false
},
@ -671,7 +671,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
table: {
width: 150
},
hiddeInMain: true,
hiddenInMain: true,
isTableForm: false,
isForm: false
},
@ -682,7 +682,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
table: {
width: 150
},
hiddeInMain: true,
hiddenInMain: true,
isTableForm: false,
isForm: false
},
@ -693,7 +693,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
table: {
width: 150
},
hiddeInMain: true,
hiddenInMain: true,
isTableForm: false,
isForm: false
},
@ -704,7 +704,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
table: {
width: 150
},
hiddeInMain: true,
hiddenInMain: true,
form: {
component: 'InputNumber',
componentProps: {
@ -726,7 +726,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
table: {
width: 150
},
hiddeInMain: true,
hiddenInMain: true,
isTableForm: false,
isForm: false
},
@ -737,7 +737,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
table: {
width: 150
},
hiddeInMain: true,
hiddenInMain: true,
isTableForm: false,
isForm: false
},

2
src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts

@ -724,7 +724,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
isDetail: false,
isForm: false ,
table: {
width: 150,
width: 220,
fixed: 'right'
},
isTableForm:true,

2
src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts

@ -1068,11 +1068,11 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
isDetail: false,
isForm: false ,
hiddenInMain:true,
isTableForm:false,
table: {
width: 150,
fixed: 'right'
},
hiddeInMain:true,
tableForm: {
type: 'action',
buttonText: 'Bom',

11
src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts

@ -68,6 +68,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
searchDetailSchemas:PurchaseDetail.allSchemas,
searchAllSchemas: PurchaseMain.allSchemas, // 查询弹窗所需类
searchPage: PurchaseDetailApi.getPurchaseDetailPageWMS, // 查询弹窗所需分页方法
isEnter:true,
searchCondition: [{
key:'status',
value:'2',
@ -80,7 +81,15 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
action: '==', // 查询拼接条件
isSearch: true, // 使用自定义拼接条件
isMainValue: false // 拼接条件必须要 false 同时不能与 isMainValue: true 同用
}]
}],
verificationParams: [{
key: 'number',
action: '==',
value: '',
isMainValue: false,
isSearch: true,
isFormModel: true,
}], // 失去焦点校验参数
}
},
isForm: true,

54
src/views/wms/purchasereceiptManage/putaway/putawayJobMain/putawayJobMain.data.ts

@ -793,15 +793,15 @@ export const PutawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
},
hiddenInMain: true,
},
{
label: '项目代码',
field: 'projectCode',
sort: 'custom',
table: {
width: 150
},
hiddenInMain: true,
},
// {
// label: '项目代码',
// field: 'projectCode',
// sort: 'custom',
// table: {
// width: 150
// },
// hiddenInMain: true,
// },
{
label: '数量',
field: 'qty',
@ -844,24 +844,24 @@ export const PutawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
},
hiddenInMain: true,
},
{
label: '从货主代码',
field: 'fromOwnerCode',
sort: 'custom',
table: {
width: 150
},
hiddenInMain: true,
},
{
label: '到货主代码',
field: 'toOwnerCode',
sort: 'custom',
table: {
width: 150
},
hiddenInMain: true,
},
// {
// label: '从货主代码',
// field: 'fromOwnerCode',
// sort: 'custom',
// table: {
// width: 150
// },
// hiddenInMain: true,
// },
// {
// label: '到货主代码',
// field: 'toOwnerCode',
// sort: 'custom',
// table: {
// width: 150
// },
// hiddenInMain: true,
// },
{
label: '创建时间',
field: 'createTime',

114
src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/putawayRecordMain.data.ts

@ -513,15 +513,15 @@ export const PutawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
},
sortTableDefault:3,
},
{
label: '从货主代码',
field: 'fromOwnerCode',
sort: 'custom',
table: {
width: 150
},
hiddenInMain:true,
},
// {
// label: '从货主代码',
// field: 'fromOwnerCode',
// sort: 'custom',
// table: {
// width: 150
// },
// hiddenInMain:true,
// },
{
label: '从库位代码',
field: 'fromLocationCode',
@ -549,15 +549,15 @@ export const PutawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
},
hiddenInMain:true,
},
{
label: '到货主代码',
field: 'toOwnerCode',
sort: 'custom',
table: {
width: 150
},
hiddenInMain:true,
},
// {
// label: '到货主代码',
// field: 'toOwnerCode',
// sort: 'custom',
// table: {
// width: 150
// },
// hiddenInMain:true,
// },
{
label: '到库位代码',
field: 'toLocationCode',
@ -671,15 +671,15 @@ export const PutawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
},
hiddenInMain:true,
},
{
label: '项目代码',
field: 'projectCode',
sort: 'custom',
table: {
width: 150
},
hiddenInMain:true,
},
// {
// label: '项目代码',
// field: 'projectCode',
// sort: 'custom',
// table: {
// width: 150
// },
// hiddenInMain:true,
// },
{
label: '数量',
field: 'qty',
@ -701,18 +701,18 @@ export const PutawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
// width: 150
// },
// },
{
label: '接口类型',
field: 'interfaceType',
dictType: DICT_TYPE.INTERFACE_TYPE,
dictClass: 'string',
isTable: true,
sort: 'custom',
table: {
width: 150
},
hiddenInMain:true,
},
// {
// label: '接口类型',
// field: 'interfaceType',
// dictType: DICT_TYPE.INTERFACE_TYPE,
// dictClass: 'string',
// isTable: true,
// sort: 'custom',
// table: {
// width: 150
// },
// hiddenInMain:true,
// },
// {
// label: '任务明细ID',
// field: 'jobDetailId',
@ -721,24 +721,24 @@ export const PutawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
// width: 150
// },
// },
{
label: '从器具号',
field: 'fromContainerNumber',
sort: 'custom',
table: {
width: 150
},
hiddenInMain:true,
},
{
label: '到器具号',
field: 'toContainerNumber',
sort: 'custom',
table: {
width: 150
},
hiddenInMain:true,
},
// {
// label: '从器具号',
// field: 'fromContainerNumber',
// sort: 'custom',
// table: {
// width: 150
// },
// hiddenInMain:true,
// },
// {
// label: '到器具号',
// field: 'toContainerNumber',
// sort: 'custom',
// table: {
// width: 150
// },
// hiddenInMain:true,
// },
{
label: '操作',
hiddenInMain:true,

66
src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts

@ -810,17 +810,17 @@ export const PutawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
isTableForm: false,
isForm: false
},
{
label: '项目代码',
field: 'projectCode',
sort: 'custom',
table: {
width: 150
},
hiddenInMain:true,
isTableForm: false,
isForm: false
},
// {
// label: '项目代码',
// field: 'projectCode',
// sort: 'custom',
// table: {
// width: 150
// },
// hiddenInMain:true,
// isTableForm: false,
// isForm: false
// },
{
label: '数量',
field: 'qty',
@ -843,28 +843,28 @@ export const PutawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
}
},
{
label: '从货主代码',
field: 'fromOwnerCode',
sort: 'custom',
table: {
width: 150
},
isTableForm: false,
isForm: false,
hiddenInMain:true,
},
{
label: '到货主代码',
field: 'toOwnerCode',
sort: 'custom',
table: {
width: 150
},
hiddenInMain:true,
isTableForm: false,
isForm: false
},
// {
// label: '从货主代码',
// field: 'fromOwnerCode',
// sort: 'custom',
// table: {
// width: 150
// },
// isTableForm: false,
// isForm: false,
// hiddenInMain:true,
// },
// {
// label: '到货主代码',
// field: 'toOwnerCode',
// sort: 'custom',
// table: {
// width: 150
// },
// hiddenInMain:true,
// isTableForm: false,
// isForm: false
// },
{
label: '操作',
hiddenInMain:true,

Loading…
Cancel
Save