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

计划外入库修改

master_hella_20240701
zhaoxuebing 5 months ago
parent
c47ca13640
commit
38a701088f
4 changed files with 428 additions and 37 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. 141
      src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/unplannedissueJobMain.data.ts
  2. 11
      src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue
  3. 311
      src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts
  4. 2
      src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts

141
src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/unplannedissueJobMain.data.ts
View File

@ -2,6 +2,15 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
import { dateFormatter } from '@/utils/formatTime' import { dateFormatter } from '@/utils/formatTime'
import { TableColumn } from '@/types/table' import { TableColumn } from '@/types/table'
import { QadCostcentre } from '@/views/wms/basicDataManage/subject/qadCostcentre/qadCostcentre.data'
import * as QadCostcentreApi from '@/api/wms/qadCostcentre/index'
import { QadProject } from '@/views/wms/basicDataManage/subject/qadProject/qadProject.data'
import * as QadProjectApi from '@/api/wms/qadProject'
import * as SubjectAccountApi from '@/api/wms/subjectAccount'
import { SubjectAccount } from '@/views/wms/basicDataManage/subject/subjectAccount/subjectAccount.data'
/** /**
* @returns {Array} 计划外出库任务主表 * @returns {Array} 计划外出库任务主表
*/ */
@ -95,6 +104,138 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
} }
}, },
}, },
{
label: '成本中心代码',
field: 'costCenterCode',
sort: 'custom',
table: {
width: 150
},
tableForm: {
isInpuFocusShow: true, // 开启查询弹窗
searchListPlaceholder: '请选择成本中心代码',
searchField: 'costcentreCode',
searchTitle: '成本中心代码',
searchAllSchemas: QadCostcentre.allSchemas,
searchPage: QadCostcentreApi.getQadCostcentrePage
},
form: {
// labelMessage: '信息提示说明！！！',
componentProps: {
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择成本中心代码', // 输入框占位文本
searchField: 'costcentreCode', // 查询弹窗赋值字段
searchTitle: '成本中心代码', // 查询弹窗标题
searchAllSchemas: QadCostcentre.allSchemas, // 查询弹窗所需类
searchPage: QadCostcentreApi.getQadCostcentrePage, // 查询弹窗所需分页方法
searchCondition: [{
key: 'available',
value: 'TRUE',
isMainValue: false
}]
}
}
},
{
label: '成本中心类型',
field: 'costCenterType',
sort: 'custom',
table: {
width: 150
},
form: {
componentProps: {
disabled: true
}
},
},
{
label: '领用原因代码',
field: 'reasonCodeRequisition',
sort: 'custom',
table: {
width: 150
},
tableForm: {
isInpuFocusShow: true, // 开启查询弹窗
searchListPlaceholder: '请选择成领用原因代码',
searchField: 'code',
searchTitle: '领用原因代码',
searchAllSchemas: SubjectAccount.allSchemas,
searchPage: SubjectAccountApi.getSubjectAccountPage,
searchCondition: [{
key: 'available',
value: 'TRUE',
isMainValue: false
},{
key: 'costcentreType',
value: 'costCenterType',
message: '成本中心类型不能为空!',
isMainValue: true
}]
},
form: {
// labelMessage: '信息提示说明！！！',
componentProps: {
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择成本中心代码', // 输入框占位文本
searchField: 'code', // 查询弹窗赋值字段
searchTitle: '领用原因代码', // 查询弹窗标题
searchAllSchemas: SubjectAccount.allSchemas, // 查询弹窗所需类
searchPage: SubjectAccountApi.getSubjectAccountPage, // 查询弹窗所需分页方法
searchCondition: [{
key: 'available',
value: 'TRUE',
isMainValue: false
},{
key: 'costcentreType',
value: 'costCenterType',
message: '成本中心类型不能为空!',
isMainValue: true
}]
}
}
},
{
label: '项目代码',
field: 'projectCode',
sort: 'custom',
table: {
width: 150
},
tableForm: {
isInpuFocusShow: true, // 开启查询弹窗
searchListPlaceholder: '请选择QAD项目信息',
searchField: 'projectCode',
searchTitle: '领用原因代码',
searchAllSchemas: QadProject.allSchemas,
searchPage: QadProjectApi.getQadProjectPage
},
form: {
// labelMessage: '信息提示说明！！！',
componentProps: {
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择QAD项目信息', // 输入框占位文本
searchField: 'projectCode', // 查询弹窗赋值字段
searchTitle: '领用原因代码', // 查询弹窗标题
searchAllSchemas: QadProject.allSchemas, // 查询弹窗所需类
searchPage: QadProjectApi.getQadProjectPage, // 查询弹窗所需分页方法
searchCondition: [{
key: 'available',
value: 'TRUE',
isMainValue: false
}]
}
}
},
{
label: '工作中心',
field: 'workCenter',
sort: 'custom',
table: {
width: 150
},
},
{ {
label: '过期时间', label: '过期时间',
field: 'expiredTime', field: 'expiredTime',

11
src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue
View File

@ -120,6 +120,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
row['fromLocationCode'] = val[0]['locationCode'] row['fromLocationCode'] = val[0]['locationCode']
row['itemCode'] = val[0]['itemCode'] row['itemCode'] = val[0]['itemCode']
row['uom'] = val[0]['uom'] row['uom'] = val[0]['uom']
row['qty'] = val[0]['qty']
} }
if(formField === 'costcentreCode'){ if(formField === 'costcentreCode'){
row['costcentreCode'] = val[0]['costcentreCode'] row['costcentreCode'] = val[0]['costcentreCode']
@ -133,6 +134,16 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
setV['usageDescription'] = val[0]['usageDescription'] setV['usageDescription'] = val[0]['usageDescription']
setV['usageCode'] = val[0]['code'] setV['usageCode'] = val[0]['code']
} }
if(formField === 'costCenterCode'){
setV['costcentreCode'] = val[0]['costcentreCode']
setV['costCenterType'] = val[0]['costcentreType']
}
if(formField === 'reasonCodeRequisition'){
setV['reasonCodeRequisition'] = val[0]['code']
}
if(formField === 'projectCode'){
setV['projectCode'] = val[0]['projectCode']
}
setV[formField] = val[0][searchField] setV[formField] = val[0][searchField]
formRef.setValues(setV) formRef.setValues(setV)
} }

311
src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts
View File

@ -5,6 +5,12 @@ import * as getRequestsettingApi from '@/api/wms/requestsetting/index'
import * as BalanceApi from '@/api/wms/balance' import * as BalanceApi from '@/api/wms/balance'
import { Balance } from '@/views/wms/inventoryManage/balance/balance.data' import { Balance } from '@/views/wms/inventoryManage/balance/balance.data'
import { QadCostcentre } from '@/views/wms/basicDataManage/subject/qadCostcentre/qadCostcentre.data'
import * as QadCostcentreApi from '@/api/wms/qadCostcentre/index'
import { QadProject } from '@/views/wms/basicDataManage/subject/qadProject/qadProject.data'
import * as QadProjectApi from '@/api/wms/qadProject'
import * as SubjectAccountApi from '@/api/wms/subjectAccount' import * as SubjectAccountApi from '@/api/wms/subjectAccount'
import { SubjectAccount } from '@/views/wms/basicDataManage/subject/subjectAccount/subjectAccount.data' import { SubjectAccount } from '@/views/wms/basicDataManage/subject/subjectAccount/subjectAccount.data'
@ -69,6 +75,7 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTableForm:false,
isForm: false, isForm: false,
isTable:false, isTable:false,
}, },
@ -76,6 +83,9 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
label: '领用描述', label: '领用描述',
field: 'usageDescription', field: 'usageDescription',
sort: 'custom', sort: 'custom',
isTableForm:false,
isForm: false,
isTable:false,
table: { table: {
width: 150 width: 150
}, },
@ -99,6 +109,9 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
formatter: (_: Recordable, __: TableColumn, cellValue: number) => { formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
return cellValue return cellValue
}, },
isTableForm:false,
isForm: false,
isTable:false,
table: { table: {
width: 150 width: 150
}, },
@ -112,6 +125,138 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
filterable: true filterable: true
} }
}, },
{
label: '成本中心代码',
field: 'costCenterCode',
sort: 'custom',
table: {
width: 150
},
tableForm: {
isInpuFocusShow: true, // 开启查询弹窗
searchListPlaceholder: '请选择成本中心代码',
searchField: 'costcentreCode',
searchTitle: '成本中心代码',
searchAllSchemas: QadCostcentre.allSchemas,
searchPage: QadCostcentreApi.getQadCostcentrePage
},
form: {
// labelMessage: '信息提示说明！！！',
componentProps: {
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择成本中心代码', // 输入框占位文本
searchField: 'costcentreCode', // 查询弹窗赋值字段
searchTitle: '成本中心代码', // 查询弹窗标题
searchAllSchemas: QadCostcentre.allSchemas, // 查询弹窗所需类
searchPage: QadCostcentreApi.getQadCostcentrePage, // 查询弹窗所需分页方法
searchCondition: [{
key: 'available',
value: 'TRUE',
isMainValue: false
}]
}
}
},
{
label: '成本中心类型',
field: 'costCenterType',
sort: 'custom',
table: {
width: 150
},
form: {
componentProps: {
disabled: true
}
},
},
{
label: '领用原因代码',
field: 'reasonCodeRequisition',
sort: 'custom',
table: {
width: 150
},
tableForm: {
isInpuFocusShow: true, // 开启查询弹窗
searchListPlaceholder: '请选择成领用原因代码',
searchField: 'code',
searchTitle: '领用原因代码',
searchAllSchemas: SubjectAccount.allSchemas,
searchPage: SubjectAccountApi.getSubjectAccountPage,
searchCondition: [{
key: 'available',
value: 'TRUE',
isMainValue: false
},{
key: 'costcentreType',
value: 'costCenterType',
message: '成本中心类型不能为空!',
isMainValue: true
}]
},
form: {
// labelMessage: '信息提示说明！！！',
componentProps: {
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择成本中心代码', // 输入框占位文本
searchField: 'code', // 查询弹窗赋值字段
searchTitle: '领用原因代码', // 查询弹窗标题
searchAllSchemas: SubjectAccount.allSchemas, // 查询弹窗所需类
searchPage: SubjectAccountApi.getSubjectAccountPage, // 查询弹窗所需分页方法
searchCondition: [{
key: 'available',
value: 'TRUE',
isMainValue: false
},{
key: 'costcentreType',
value: 'costCenterType',
message: '成本中心类型不能为空!',
isMainValue: true
}]
}
}
},
{
label: '项目代码',
field: 'projectCode',
sort: 'custom',
table: {
width: 150
},
tableForm: {
isInpuFocusShow: true, // 开启查询弹窗
searchListPlaceholder: '请选择QAD项目信息',
searchField: 'projectCode',
searchTitle: '领用原因代码',
searchAllSchemas: QadProject.allSchemas,
searchPage: QadProjectApi.getQadProjectPage
},
form: {
// labelMessage: '信息提示说明！！！',
componentProps: {
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择QAD项目信息', // 输入框占位文本
searchField: 'projectCode', // 查询弹窗赋值字段
searchTitle: '领用原因代码', // 查询弹窗标题
searchAllSchemas: QadProject.allSchemas, // 查询弹窗所需类
searchPage: QadProjectApi.getQadProjectPage, // 查询弹窗所需分页方法
searchCondition: [{
key: 'available',
value: 'TRUE',
isMainValue: false
}]
}
}
},
{
label: '工作中心',
field: 'workCenter',
sort: 'custom',
table: {
width: 150
},
},
{ {
label: '申请时间', label: '申请时间',
field: 'requestTime', field: 'requestTime',
@ -119,6 +264,9 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
detail: { detail: {
dateFormat: 'YYYY-MM-DD HH:mm:ss' dateFormat: 'YYYY-MM-DD HH:mm:ss'
}, },
isTableForm:false,
isForm: false,
isTable:false,
sort: 'custom', sort: 'custom',
table: { table: {
width: 180 width: 180
@ -140,6 +288,9 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
detail: { detail: {
dateFormat: 'YYYY-MM-DD HH:mm:ss' dateFormat: 'YYYY-MM-DD HH:mm:ss'
}, },
isTableForm:false,
isForm: false,
isTable:false,
sort: 'custom', sort: 'custom',
table: { table: {
width: 180 width: 180
@ -173,7 +324,7 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isSearch: true, isSearch: false,
isForm: false, isForm: false,
}, },
{ {
@ -183,7 +334,7 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isSearch: true, isSearch: false,
isForm: false, isForm: false,
}, },
{ {
@ -290,27 +441,6 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
} }
} }
}, },
{
label: '直接生成记录',
field: 'directCreateRecord',
dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string',
isForm: false,
isTable: false,
sort: 'custom',
table: {
width: 150
},
form: {
component: 'Switch',
value: requestsettingData.directCreateRecord,
componentProps: {
inactiveValue: 'FALSE',
activeValue: 'TRUE',
disabled: true
}
}
},
{ {
label: '备注', label: '备注',
field: 'remark', field: 'remark',
@ -320,6 +450,26 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
}, },
isTable: false, isTable: false,
}, },
// {
// label: '直接生成记录',
// field: 'directCreateRecord',
// dictType: DICT_TYPE.TRUE_FALSE,
// dictClass: 'string',
// isForm: true,
// isTable: true,
// sort: 'custom',
// table: {
// width: 150
// },
// form: {
// component: 'Switch',
// value: requestsettingData.directCreateRecord,
// componentProps: {
// inactiveValue: 'TRUE',
// activeValue: 'TRUE'
// }
// }
// },
{ {
label: '创建时间', label: '创建时间',
field: 'createTime', field: 'createTime',
@ -427,6 +577,15 @@ export const UnplannedissueRequestMainRules = reactive({
usageDescription:[ usageDescription:[
{ required: true, message: '请选择领用描述', trigger: 'blur' } { required: true, message: '请选择领用描述', trigger: 'blur' }
], ],
costCenterCode: [
{ required: true, message: '请输入成本中心代码', trigger: 'blur' }
],
costCenterType: [
{ required: true, message: '请输入成本中心类型', trigger: 'blur' }
],
reasonCodeRequisition: [
{ required: true, message: '请输入领用原因代码', trigger: 'blur' }
],
}) })
/** /**
@ -461,7 +620,26 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
searchField: 'packingNumber', searchField: 'packingNumber',
searchTitle: '库存余额信息', searchTitle: '库存余额信息',
searchAllSchemas: Balance.allSchemas, searchAllSchemas: Balance.allSchemas,
searchPage: BalanceApi.getBalanceItemPage searchPage: BalanceApi.getBalanceItemPage,
searchCondition: [{
key: 'available',
value: 'TRUE',
action: '==',
isSearch: true,
isMainValue: false
},{
key: 'businessType',
value: 'UnplannedDeliver',
action: '==',
isSearch: true,
isMainValue: false
},{
key: 'inOrOut',
value: 'out',
action: '==',
isSearch: true,
isMainValue: false
}]
}, },
form: { form: {
// labelMessage: '信息提示说明！！！', // labelMessage: '信息提示说明！！！',
@ -471,7 +649,26 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
searchField: 'packingNumber', searchField: 'packingNumber',
searchTitle: '库存余额信息', searchTitle: '库存余额信息',
searchAllSchemas: Balance.allSchemas, searchAllSchemas: Balance.allSchemas,
searchPage: BalanceApi.getBalanceItemPage searchPage: BalanceApi.getBalanceItemPage,
searchCondition: [{
key: 'available',
value: 'TRUE',
action: '==',
isSearch: true,
isMainValue: false
},{
key: 'businessType',
value: 'UnplannedDeliver',
action: '==',
isSearch: true,
isMainValue: false
},{
key: 'inOrOut',
value: 'out',
action: '==',
isSearch: true,
isMainValue: false
}]
} }
} }
}, },
@ -512,6 +709,14 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
table: { table: {
width: 150 width: 150
}, },
form: {
componentProps: {
disabled: true
}
},
tableForm: {
disabled:true
}
}, },
{ {
label: '包装号', label: '包装号',
@ -520,6 +725,14 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
table: { table: {
width: 150 width: 150
}, },
tableForm: {
disabled:true
},
form: {
componentProps: {
disabled: true
}
}
}, },
{ {
label: '器具号', label: '器具号',
@ -563,7 +776,13 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
width: 150 width: 150
}, },
tableForm: { tableForm: {
type: 'Select' type: 'Select',
disabled:true
},
form: {
componentProps: {
disabled: true
}
} }
}, },
{ {
@ -577,7 +796,13 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
width: 150 width: 150
}, },
tableForm: { tableForm: {
type: 'Select' type: 'Select',
disabled: true
},
form: {
componentProps: {
disabled: true
}
} }
}, },
{ {
@ -587,6 +812,14 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
table: { table: {
width: 150 width: 150
}, },
form: {
componentProps: {
disabled: true
}
},
tableForm: {
disabled:true
}
}, },
{ {
label: '成本中心代码', label: '成本中心代码',
@ -595,6 +828,9 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
table: { table: {
width: 150 width: 150
}, },
isTable:false,
isDetail:false,
isTableForm:false,
tableForm:{ tableForm:{
isInpuFocusShow: true, // 开启查询弹窗 isInpuFocusShow: true, // 开启查询弹窗
searchListPlaceholder: '选择成本中心', searchListPlaceholder: '选择成本中心',
@ -634,6 +870,9 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
table: { table: {
width: 150 width: 150
}, },
isTable:false,
isDetail:false,
isTableForm:false,
tableForm:{ tableForm:{
isInpuFocusShow: true, // 开启查询弹窗 isInpuFocusShow: true, // 开启查询弹窗
searchListPlaceholder: '选择科目代码', searchListPlaceholder: '选择科目代码',
@ -792,14 +1031,14 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
//表单校验 //表单校验
export const UnplannedissueRequestDetailRules = reactive({ export const UnplannedissueRequestDetailRules = reactive({
packingNumber: [ // packingNumber: [
{ required: true, message: '请输入包装号', trigger: 'change' }, // { required: true, message: '请输入包装号', trigger: 'change' },
{ max: 50, message: '不得超过50个字符', trigger: 'blur' } // { max: 50, message: '不得超过50个字符', trigger: 'blur' }
], // ],
batch: [ // batch: [
{ required: true, message: '请输入批次', trigger: 'blur' }, // { required: true, message: '请输入批次', trigger: 'blur' },
{ max: 50, message: '不得超过50个字符', trigger: 'blur' } // { max: 50, message: '不得超过50个字符', trigger: 'blur' }
], // ],
containerNumber: [ containerNumber: [
{ max: 50, message: '不得超过50个字符', trigger: 'blur' } { max: 50, message: '不得超过50个字符', trigger: 'blur' }
], ],
@ -823,4 +1062,4 @@ export const UnplannedissueRequestDetailRules = reactive({
qadProjectCode:[ qadProjectCode:[
{ required: true, message: '请选择科目代码', trigger: 'change' } { required: true, message: '请选择科目代码', trigger: 'change' }
] ]
}) })

2
src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts
View File

@ -460,7 +460,7 @@ export const UnplannedreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>
component: 'Switch', component: 'Switch',
value: requestsettingData.directCreateRecord, value: requestsettingData.directCreateRecord,
componentProps: { componentProps: {
inactiveValue: 'FALSE', inactiveValue: 'TRUE',
activeValue: 'TRUE', activeValue: 'TRUE',
} }
} }

Write Preview
Loading…
Cancel
Save