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

BUG修改

hella_online_20240829
添砖-JAVA\Administrator 3 months ago
parent
5435b69f4a
commit
8dd9ef4070
2 changed files with 540 additions and 512 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. 6
      src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue
  2. 146
      src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts

6
src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue
View File

@ -197,9 +197,9 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
if(item.field == 'qty' && Number(val[0]['qty'])>item.tableForm.min) {
item.tableForm.max = Number(val[0]['qty'])
}
if(item.field == 'batch') {
item.tableForm.disabled = false
}
// if(item.field == 'batch') {
// item.tableForm.disabled = false
// }
})
}
} else if(formField == 'workStationCode') {

146
src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts
View File

@ -21,7 +21,8 @@ const { t } = useI18n() // 国际化
/**
* @returns {Array} 生产退料申请子表
*/
export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
export const ProductionreturnRequestDetail = useCrudSchemas(
reactive<CrudSchema[]>([
{
label: '生产线代码',
field: 'productionLineCode',
@ -40,36 +41,42 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
searchTitle: '生产线信息', // 查询弹窗标题
searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
searchPage: ProductionlineApi.getProductionlinePage, // 查询弹窗所需分页方法
searchCondition:[{
searchCondition: [
{
key: 'available',
value: 'TRUE',
isMainValue: false
},{
},
{
key: 'workshopCode',
value: 'workshopCode',
message: '请选择车间信息！', // 当前置条件为空时 弹出信息提示
isMainValue: true
}]
}
]
}
},
tableForm:{
tableForm: {
isInpuFocusShow: true,
searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
searchField: 'code', // 查询弹窗赋值字段
searchTitle: '生产线信息', // 查询弹窗标题
searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
searchPage: ProductionlineApi.getProductionlinePage, // 查询弹窗所需分页方法
searchCondition:[{
searchCondition: [
{
key: 'available',
value: 'TRUE',
isMainValue: false
},{
},
{
key: 'workshopCode',
value: 'workshopCode',
message: '请选择车间信息！', // 当前置条件为空时 弹出信息提示
isMainValue: true
}]
},
}
]
}
},
{
label: '工位代码',
@ -87,60 +94,69 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
searchTitle: '工位信息', // 查询弹窗标题
searchAllSchemas: Workstation.allSchemas, // 查询弹窗所需类
searchPage: WorkstationApi.getWorkstationPage, // 查询弹窗所需分页方法
searchCondition:[{
searchCondition: [
{
key: 'available',
value: 'TRUE',
isMainValue: false
},{
},
{
key: 'workshopCode',
value: 'workshopCode',
message: '请选择车间信息！',
isMainValue: true
},{
},
{
key: 'productionLineCode',
value: 'productionLineCode',
message: '请选择生产线信息！',
isMainValue: true
}]
}
]
}
},
tableForm:{
tableForm: {
multiple: true,
disabled:true,
disabled: true,
// isInpuFocusShow: true,
searchListPlaceholder: '请选择工位代码', // 输入框占位文本
searchField: 'code', // 查询弹窗赋值字段
searchTitle: '工位信息', // 查询弹窗标题
searchAllSchemas: Workstation.allSchemas, // 查询弹窗所需类
searchPage: WorkstationApi.getWorkstationPage, // 查询弹窗所需分页方法
searchCondition:[{
searchCondition: [
{
key: 'available',
value: 'TRUE',
isMainValue: false
},{
},
{
key: 'workshopCode',
value: 'workshopCode',
message: '请选择车间信息！',
isMainValue: true
},{
},
{
key: 'productionLineCode',
value: 'productionLineCode',
message: '请选择生产线信息！',
isMainValue: true
}],
}
],
verificationPage: WorkstationApi.getWorkstationByCodes, // 校验数去焦点输入是否正确的方法
isShowTableFormSearch: true,
isRepeat: true,//是否可以重复添加该条数据
verificationParams: [{
isRepeat: true, //是否可以重复添加该条数据
verificationParams: [
{
key: 'code',
action: '==',
value: '',
isMainValue: false,
isSearch: true,
isFormModel: true,
}], // 失去焦点校验参数
},
isFormModel: true
}
] // 失去焦点校验参数
}
},
{
@ -159,26 +175,29 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
searchTitle: '库存余额信息', // 查询弹窗标题
searchAllSchemas: Balance.allSchemas, // 查询弹窗所需类
searchPage: BalanceApi.getBalancePage, // 查询弹窗所需分页方法
searchCondition:[{
searchCondition: [
{
key: 'locationCode',
value: 'fromLocationCode',
message: '请填写从库位代码！',
isMainValue: true
},{
},
{
key: 'inventoryStatus',
value: 'OK',
isMainValue: false
}]
}
]
}
},
tableForm:{
tableForm: {
isInpuFocusShow: true,
searchListPlaceholder: '请选择物料代码', // 输入框占位文本
searchField: 'itemCode', // 查询弹窗赋值字段
searchTitle: '库存余额信息', // 查询弹窗标题
searchAllSchemas: Balance.allSchemas, // 查询弹窗所需类
searchPage: BalanceApi.getBalancePage, // 查询弹窗所需分页方法
searchCondition:[
searchCondition: [
{
key: 'locationCode',
value: 'fromLocationCode',
@ -189,12 +208,14 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
key: 'inventoryStatus',
value: 'OK',
isMainValue: false
},{
},
{
key: 'businessType',
value: 'ReturnToHold', // 隔离退料
isMainValue: false
}]
},
}
]
}
},
// {
// label: '包装号',
@ -236,7 +257,7 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
width: 150
},
isTableForm: false,
isForm: false,
isForm: false
},
{
label: '物料描述1',
@ -247,7 +268,7 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
},
hiddenInMain: true,
isTableForm: false,
isForm: false,
isForm: false
},
{
label: '物料描述2',
@ -258,7 +279,7 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
},
hiddenInMain: true,
isTableForm: false,
isForm: false,
isForm: false
},
{
label: '批次',
@ -268,11 +289,11 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
width: 150
},
tableForm: {
disabled: false
disabled: true
},
form: {
componentProps: {
disabled: false
disabled: true
}
}
},
@ -344,7 +365,7 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
table: {
width: 150
},
isTableForm:false,
isTableForm: false,
tableForm: {
disabled: true
},
@ -363,7 +384,7 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
},
hiddenInMain: true,
isTableForm: false,
isForm: false,
isForm: false
},
{
label: '到货主',
@ -374,7 +395,7 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
},
hiddenInMain: true,
isTableForm: false,
isForm: false,
isForm: false
},
{
label: '项目代码',
@ -385,7 +406,7 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
},
hiddenInMain: true,
isTableForm: false,
isForm: false,
isForm: false
},
{
label: '单据号',
@ -409,7 +430,7 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
table: {
width: 150
},
hiddenInMain: true,
hiddenInMain: true
},
{
label: '创建者',
@ -438,15 +459,15 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
form: {
component: 'DatePicker',
componentProps: {
style: {width:'100%'},
style: { width: '100%' },
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
valueFormat: 'x'
}
},
isTableForm: false,
isForm: false,
isTable: true,
isTable: true
},
{
label: '包装规格',
@ -457,7 +478,7 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
width: 120
},
isTable: false,
tableForm:{
tableForm: {
isInpuFocusShow: true,
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择包装规格', // 输入框占位文本
@ -465,16 +486,19 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
searchTitle: '物料包装信息', // 查询弹窗标题
searchAllSchemas: Itempackaging.allSchemas, // 查询弹窗所需类
searchPage: ItempackagingApi.getItempackagingPage, // 查询弹窗所需分页方法
searchCondition: [{
searchCondition: [
{
key: 'available',
value: 'TRUE',
isMainValue: false
},{
},
{
key: 'itemCode',
value: 'itemCode',
message: '请先选择物料代码！',
isMainValue: true
}]
}
]
},
form: {
// labelMessage: '信息提示说明！！！',
@ -485,16 +509,19 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
searchTitle: '物料包装信息', // 查询弹窗标题
searchAllSchemas: Itempackaging.allSchemas, // 查询弹窗所需类
searchPage: ItempackagingApi.getItempackagingPage, // 查询弹窗所需分页方法
searchCondition: [{
searchCondition: [
{
key: 'available',
value: 'TRUE',
isMainValue: false
},{
},
{
key: 'itemCode',
value: 'itemCode',
message: '请先选择物料代码！', // 当前置条件为空时 弹出信息提示
isMainValue: true
}]
}
]
}
}
},
@ -506,7 +533,7 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
width: 120
},
isTable: false,
tableForm:{
tableForm: {
disabled: true
},
form: {
@ -548,10 +575,10 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
form: {
component: 'DatePicker',
componentProps: {
style: {width:'100%'},
style: { width: '100%' },
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
valueFormat: 'x'
}
},
isTableForm: false,
@ -572,14 +599,15 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
label: '操作',
field: 'action',
isDetail: false,
isForm: false ,
isForm: false,
table: {
width: 250,
fixed: 'right'
},
isTableForm:false,
isTableForm: false
}
]))
])
)
//表单校验
export const ProductionreturnRequestDetailRules = reactive({

Write Preview
Loading…
Cancel
Save