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

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

intex_online20250427
songguoqiang 6 days ago
parent
8a37143dc9 b221f79316
commit
6dae17755d
15 changed files with 1079 additions and 974 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. 2
      src/components/Search/src/Search.vue
  2. 2
      src/views/wms/basicDataManage/itemPull/index.vue
  3. 281
      src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts
  4. 12
      src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/unplannedissueJobMain.data.ts
  5. 56
      src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts
  6. 16
      src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts
  7. 44
      src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts
  8. 16
      src/views/wms/issueManage/issue/issueRequestMain/index.vue
  9. 25
      src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
  10. 3
      src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
  11. 27
      src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue
  12. 3
      src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts
  13. 19
      src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
  14. 2
      src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
  15. 1
      src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue

2
src/components/Search/src/Search.vue
View File

@ -377,7 +377,7 @@ defineExpose({setFormValues,search}) // 提供 open 方法，用于打开弹窗
.dateSearch ::v-deep(.el-form-item) { .dateSearch ::v-deep(.el-form-item) {
margin-right: 1%; margin-right: 1%;
min-width: 320px; min-width: 320px;
width:30%; width:32%;
} }
.search ::v-deep(.el-form-item:nth-last-child(1)) { .search ::v-deep(.el-form-item:nth-last-child(1)) {
margin-right: 0px; margin-right: 0px;

2
src/views/wms/basicDataManage/itemPull/index.vue
View File

@ -225,7 +225,7 @@ const handleImport = () => {
// 导入附件弹窗所需的参数 // 导入附件弹窗所需的参数
const importTemplateData = reactive({ const importTemplateData = reactive({
templateUrl: '', templateUrl: '',
templateTitle: '物料拉动配置导入模版.xlsx' templateTitle: '品番拉动配置导入模版.xlsx'
}) })
// 导入成功之后 // 导入成功之后
const importSuccess = () => { const importSuccess = () => {

281
src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts
View File

@ -2,8 +2,8 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
import { dateFormatter } from '@/utils/formatTime' import { dateFormatter } from '@/utils/formatTime'
import * as getRequestsettingApi from '@/api/wms/requestsetting/index' import * as getRequestsettingApi from '@/api/wms/requestsetting/index'
import * as WarehouseApi from '@/api/wms/warehouse' import * as LocationApi from '@/api/wms/location'
import { Warehouse } from '@/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data' import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
import * as ItempackagingApi from '@/api/wms/itempackage' import * as ItempackagingApi from '@/api/wms/itempackage'
import { Itempackaging } from '@/views/wms/basicDataManage/itemManage/itempackage/itempackage.data' import { Itempackaging } from '@/views/wms/basicDataManage/itemManage/itempackage/itempackage.data'
@ -29,7 +29,8 @@ const queryParams = {
userDept.id = userDept.id.toString() userDept.id = userDept.id.toString()
const userDeptArray: any = [userDept] const userDeptArray: any = [userDept]
export const PackageoverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([ export const PackageoverRequestMain = useCrudSchemas(
reactive<CrudSchema[]>([
{ {
label: '单据号', label: '单据号',
field: 'number', field: 'number',
@ -39,7 +40,7 @@ export const PackageoverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
fixed: 'left' fixed: 'left'
}, },
isForm: false, isForm: false,
isSearch: true, isSearch: true
}, },
{ {
label: '状态', label: '状态',
@ -76,11 +77,11 @@ export const PackageoverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
componentProps: { componentProps: {
type: 'datetime', type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss', dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x', valueFormat: 'x'
} }
}, },
isTable: false, isTable: false,
isForm: false, isForm: false
}, },
{ {
label: '截止时间', label: '截止时间',
@ -99,60 +100,122 @@ export const PackageoverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
style: { width: '100%' }, style: { width: '100%' },
type: 'datetime', type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss', dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x', valueFormat: 'x'
} }
}, },
isTable: false, isTable: false
}, },
{ {
label: '从仓库代码', label: '从库位代码',
field: 'fromWarehouseCode', field: 'fromLocationCode',
sort: 'custom', sort: 'custom',
isForm: true,
isTable: true,
isDetail: true,
table: { table: {
width: 150 width: 150
}, },
isTable: false,
form: { form: {
// labelMessage: '信息提示说明！！！', // labelMessage: '信息提示说明！！！',
componentProps: { componentProps: {
enterSearch: true, enterSearch: true,
isSearchList: true, // 开启查询弹窗 isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择仓库代码', // 输入框占位文本 searchListPlaceholder: '请选择从库位代码',
searchField: 'code', // 查询弹窗赋值字段 searchField: 'code',
searchTitle: '仓库信息', // 查询弹窗标题 searchTitle: '库位信息',
searchAllSchemas: Warehouse.allSchemas, // 查询弹窗所需类 searchAllSchemas: Location.allSchemas,
searchPage: WarehouseApi.getWarehousePage, // 查询弹窗所需分页方法 searchPage: LocationApi.selectBusinessTypeToLocation,
searchCondition: [{ searchCondition: [
key: 'available', {
value: 'TRUE', key: 'businessType',
value: 'HoldToOk',
isMainValue: false isMainValue: false
}], },
// 失去焦点校验参数 {
verificationParams: [{ key: 'isIn',
value: 'out',
isMainValue: false
}
],
verificationParams: [
{
key: 'code', key: 'code',
action: '==', action: '==',
value: '', value: '',
isMainValue: false, isMainValue: false,
isSearch: 'true', isSearch: true,
isFormModel: true, isFormModel: true
}] }
] // 失去焦点校验参数
} }
} }
}, },
{ {
label: '到仓库代码', label: '到库位代码',
field: 'toWarehouseCode', field: 'toLocationCode',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
}, },
isTable: false, tableForm: {
disabled: true
},
form: { form: {
componentProps: { componentProps: {
disabled: true disabled: true
} }
} }
}, },
// {
// label: '从仓库代码',
// field: 'fromWarehouseCode',
// sort: 'custom',
// table: {
// width: 150
// },
// isTable: false,
// form: {
// // labelMessage: '信息提示说明！！！',
// componentProps: {
// enterSearch: true,
// isSearchList: true, // 开启查询弹窗
// searchListPlaceholder: '请选择仓库代码', // 输入框占位文本
// searchField: 'code', // 查询弹窗赋值字段
// searchTitle: '仓库信息', // 查询弹窗标题
// searchAllSchemas: Warehouse.allSchemas, // 查询弹窗所需类
// searchPage: WarehouseApi.getWarehousePage, // 查询弹窗所需分页方法
// searchCondition: [{
// key: 'available',
// value: 'TRUE',
// isMainValue: false
// }],
// // 失去焦点校验参数
// verificationParams: [{
// key: 'code',
// action: '==',
// value: '',
// isMainValue: false,
// isSearch: 'true',
// isFormModel: true,
// }]
// }
// }
// },
// {
// label: '到仓库代码',
// field: 'toWarehouseCode',
// sort: 'custom',
// table: {
// width: 150
// },
// isTable: false,
// form: {
// componentProps: {
// disabled: true
// }
// }
// },
{ {
label: '从库区类型范围', label: '从库区类型范围',
field: 'fromAreaTypes', field: 'fromAreaTypes',
@ -164,7 +227,7 @@ export const PackageoverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isForm: false, isForm: false
}, },
{ {
label: '到库区类型范围', label: '到库区类型范围',
@ -244,7 +307,7 @@ export const PackageoverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false, isTable: false
}, },
{ {
label: '业务类型', label: '业务类型',
@ -363,7 +426,7 @@ export const PackageoverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
componentProps: { componentProps: {
type: 'datetime', type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss', dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x', valueFormat: 'x'
} }
}, },
isForm: false, isForm: false,
@ -375,7 +438,7 @@ export const PackageoverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
type: 'daterange', type: 'daterange',
defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
} }
}, }
}, },
{ {
label: '创建者', label: '创建者',
@ -385,7 +448,7 @@ export const PackageoverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
width: 150 width: 150
}, },
isTable: false, isTable: false,
isForm: false, isForm: false
}, },
{ {
label: '最后更新时间', label: '最后更新时间',
@ -404,10 +467,10 @@ export const PackageoverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
componentProps: { componentProps: {
type: 'datetime', type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss', dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x', valueFormat: 'x'
} }
}, },
isForm: false, isForm: false
}, },
{ {
label: '最后更新者', label: '最后更新者',
@ -417,7 +480,7 @@ export const PackageoverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
width: 150 width: 150
}, },
isTable: false, isTable: false,
isForm: false, isForm: false
}, },
{ {
label: '操作', label: '操作',
@ -428,16 +491,16 @@ export const PackageoverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
fixed: 'right' fixed: 'right'
} }
} }
])) ])
)
// 表单校验 // 表单校验
export const PackageoverRequestMainRules = reactive({ export const PackageoverRequestMainRules = reactive({
fromWarehouseCode: [ fromWarehouseCode: [{ required: true, message: '请选择仓库代码', trigger: 'change' }]
{ required: true, message: '请选择仓库代码', trigger: 'change' }
],
}) })
export const PackageoverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([ export const PackageoverRequestDetail = useCrudSchemas(
reactive<CrudSchema[]>([
{ {
label: '单据号', label: '单据号',
field: 'number', field: 'number',
@ -480,7 +543,8 @@ export const PackageoverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
key: 'inventoryStatus', key: 'inventoryStatus',
value: 'OK', value: 'OK',
isMainValue: false isMainValue: false
}] }
]
} }
}, },
tableForm: { tableForm: {
@ -502,8 +566,9 @@ export const PackageoverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
key: 'inventoryStatus', key: 'inventoryStatus',
value: 'OK', value: 'OK',
isMainValue: false isMainValue: false
}] }
}, ]
}
}, },
{ {
label: '品名', label: '品名',
@ -602,24 +667,29 @@ export const PackageoverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
searchTitle: '物料包装信息', // 查询弹窗标题 searchTitle: '物料包装信息', // 查询弹窗标题
searchAllSchemas: Itempackaging.allSchemas, // 查询弹窗所需类 searchAllSchemas: Itempackaging.allSchemas, // 查询弹窗所需类
searchPage: ItempackagingApi.getItempackagingPage, // 查询弹窗所需分页方法 searchPage: ItempackagingApi.getItempackagingPage, // 查询弹窗所需分页方法
searchCondition: [{ searchCondition: [
{
key: 'available', key: 'available',
value: 'TRUE', value: 'TRUE',
isMainValue: false isMainValue: false
},{ },
{
key: 'itemCode', key: 'itemCode',
value: 'itemCode', value: 'itemCode',
isMainValue: true isMainValue: true
}], }
],
// 失去焦点校验参数 // 失去焦点校验参数
verificationParams: [{ verificationParams: [
{
key: 'packUnit', key: 'packUnit',
action: '==', action: '==',
value: '', value: '',
isMainValue: false, isMainValue: false,
isSearch: 'true', isSearch: 'true',
isFormModel: true, isFormModel: true
}] }
]
}, },
form: { form: {
// labelMessage: '信息提示说明！！！', // labelMessage: '信息提示说明！！！',
@ -630,25 +700,30 @@ export const PackageoverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
searchTitle: '物料包装信息', // 查询弹窗标题 searchTitle: '物料包装信息', // 查询弹窗标题
searchAllSchemas: Itempackaging.allSchemas, // 查询弹窗所需类 searchAllSchemas: Itempackaging.allSchemas, // 查询弹窗所需类
searchPage: ItempackagingApi.getItempackagingPage, // 查询弹窗所需分页方法 searchPage: ItempackagingApi.getItempackagingPage, // 查询弹窗所需分页方法
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
}], }
],
// 失去焦点校验参数 // 失去焦点校验参数
verificationParams: [{ verificationParams: [
{
key: 'packUnit', key: 'packUnit',
action: '==', action: '==',
value: '', value: '',
isMainValue: false, isMainValue: false,
isSearch: 'true', isSearch: 'true',
isFormModel: true, isFormModel: true
}] }
]
} }
} }
}, },
@ -669,25 +744,30 @@ export const PackageoverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
searchTitle: '物料包装信息', // 查询弹窗标题 searchTitle: '物料包装信息', // 查询弹窗标题
searchAllSchemas: Itempackaging.allSchemas, // 查询弹窗所需类 searchAllSchemas: Itempackaging.allSchemas, // 查询弹窗所需类
searchPage: ItempackagingApi.getItempackagingPage, // 查询弹窗所需分页方法 searchPage: ItempackagingApi.getItempackagingPage, // 查询弹窗所需分页方法
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
}], }
],
// 失去焦点校验参数 // 失去焦点校验参数
verificationParams: [{ verificationParams: [
{
key: 'packUnit', key: 'packUnit',
action: '==', action: '==',
value: '', value: '',
isMainValue: false, isMainValue: false,
isSearch: 'true', isSearch: 'true',
isFormModel: true, isFormModel: true
}] }
]
}, },
form: { form: {
// labelMessage: '信息提示说明！！！', // labelMessage: '信息提示说明！！！',
@ -698,24 +778,29 @@ export const PackageoverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
searchTitle: '物料包装信息', // 查询弹窗标题 searchTitle: '物料包装信息', // 查询弹窗标题
searchAllSchemas: Itempackaging.allSchemas, // 查询弹窗所需类 searchAllSchemas: Itempackaging.allSchemas, // 查询弹窗所需类
searchPage: ItempackagingApi.getItempackagingPage, // 查询弹窗所需分页方法 searchPage: ItempackagingApi.getItempackagingPage, // 查询弹窗所需分页方法
searchCondition: [{ searchCondition: [
{
key: 'available', key: 'available',
value: 'TRUE', value: 'TRUE',
isMainValue: false isMainValue: false
},{ },
{
key: 'itemCode', key: 'itemCode',
value: 'itemCode', value: 'itemCode',
isMainValue: true isMainValue: true
}], }
],
// 失去焦点校验参数 // 失去焦点校验参数
verificationParams: [{ verificationParams: [
{
key: 'packUnit', key: 'packUnit',
action: '==', action: '==',
value: '', value: '',
isMainValue: false, isMainValue: false,
isSearch: 'true', isSearch: 'true',
isFormModel: true, isFormModel: true
}] }
]
} }
} }
}, },
@ -767,38 +852,7 @@ export const PackageoverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
} }
} }
}, },
{
label: '从库位代码',
field: 'fromLocationCode',
sort: 'custom',
table: {
width: 150
},
tableForm:{
disabled: true
},
form: {
componentProps: {
disabled: true
}
}
},
{
label: '到库位代码',
field: 'toLocationCode',
sort: 'custom',
table: {
width: 150
},
tableForm:{
disabled: true
},
form: {
componentProps: {
disabled: true
}
}
},
{ {
label: '从库位组代码', label: '从库位组代码',
field: 'fromLocationGroupCode', field: 'fromLocationGroupCode',
@ -890,7 +944,7 @@ export const PackageoverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false, isTable: false
}, },
{ {
label: '创建时间', label: '创建时间',
@ -911,10 +965,10 @@ export const PackageoverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
style: { width: '100%' }, style: { width: '100%' },
type: 'datetime', type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss', dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x', valueFormat: 'x'
} }
}, },
isTableForm: false, isTableForm: false
}, },
{ {
label: '创建者', label: '创建者',
@ -944,10 +998,10 @@ export const PackageoverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
componentProps: { componentProps: {
type: 'datetime', type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss', dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x', valueFormat: 'x'
} }
}, },
isTableForm: false, isTableForm: false
}, },
{ {
label: '最后更新者', label: '最后更新者',
@ -957,19 +1011,14 @@ export const PackageoverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTableForm: false, isTableForm: false
} }
])) ])
)
// 表单校验 // 表单校验
export const PackageoverRequestDetailRules = reactive({ export const PackageoverRequestDetailRules = reactive({
itemCode: [ itemCode: [{ required: true, message: '请选择品番', trigger: 'change' }],
{ required: true, message: '请选择品番', trigger: 'change' } fromPackUnit: [{ required: true, message: '请选择从包装规格', trigger: 'change' }],
], toPackUnit: [{ required: true, message: '请选择到包装规格', trigger: 'change' }]
fromPackUnit: [
{ required: true, message: '请选择从包装规格', trigger: 'change' }
],
toPackUnit: [
{ required: true, message: '请选择到包装规格', trigger: 'change' }
],
}) })

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

@ -154,7 +154,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
}, },
}, },
{ {
label: '领用原因代码', label: '预算科目',
field: 'reasonCodeRequisition', field: 'reasonCodeRequisition',
sort: 'custom', sort: 'custom',
table: { table: {
@ -162,9 +162,9 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
}, },
tableForm: { tableForm: {
isInpuFocusShow: true, // 开启查询弹窗 isInpuFocusShow: true, // 开启查询弹窗
searchListPlaceholder: '请选择成领用原因代码', searchListPlaceholder: '请选择成预算科目',
searchField: 'code', searchField: 'code',
searchTitle: '领用原因代码', searchTitle: '预算科目',
searchAllSchemas: SubjectAccount.allSchemas, searchAllSchemas: SubjectAccount.allSchemas,
searchPage: SubjectAccountApi.getSubjectAccountPage, searchPage: SubjectAccountApi.getSubjectAccountPage,
searchCondition: [{ searchCondition: [{
@ -184,7 +184,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
isSearchList: true, // 开启查询弹窗 isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择成本中心代码', // 输入框占位文本 searchListPlaceholder: '请选择成本中心代码', // 输入框占位文本
searchField: 'code', // 查询弹窗赋值字段 searchField: 'code', // 查询弹窗赋值字段
searchTitle: '领用原因代码', // 查询弹窗标题 searchTitle: '预算科目', // 查询弹窗标题
searchAllSchemas: SubjectAccount.allSchemas, // 查询弹窗所需类 searchAllSchemas: SubjectAccount.allSchemas, // 查询弹窗所需类
searchPage: SubjectAccountApi.getSubjectAccountPage, // 查询弹窗所需分页方法 searchPage: SubjectAccountApi.getSubjectAccountPage, // 查询弹窗所需分页方法
searchCondition: [{ searchCondition: [{
@ -211,7 +211,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
isInpuFocusShow: true, // 开启查询弹窗 isInpuFocusShow: true, // 开启查询弹窗
searchListPlaceholder: '请选择QAD项目信息', searchListPlaceholder: '请选择QAD项目信息',
searchField: 'projectCode', searchField: 'projectCode',
searchTitle: '领用原因代码', searchTitle: '预算科目',
searchAllSchemas: QadProject.allSchemas, searchAllSchemas: QadProject.allSchemas,
searchPage: QadProjectApi.getQadProjectPage searchPage: QadProjectApi.getQadProjectPage
}, },
@ -221,7 +221,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
isSearchList: true, // 开启查询弹窗 isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择QAD项目信息', // 输入框占位文本 searchListPlaceholder: '请选择QAD项目信息', // 输入框占位文本
searchField: 'projectCode', // 查询弹窗赋值字段 searchField: 'projectCode', // 查询弹窗赋值字段
searchTitle: '领用原因代码', // 查询弹窗标题 searchTitle: '预算科目', // 查询弹窗标题
searchAllSchemas: QadProject.allSchemas, // 查询弹窗所需类 searchAllSchemas: QadProject.allSchemas, // 查询弹窗所需类
searchPage: QadProjectApi.getQadProjectPage, // 查询弹窗所需分页方法 searchPage: QadProjectApi.getQadProjectPage, // 查询弹窗所需分页方法
searchCondition: [{ searchCondition: [{

56
src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts
View File

@ -197,7 +197,7 @@ export const UnplannedissueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
}, },
}, },
{ {
label: '领用原因代码', label: '预算科目',
field: 'reasonCodeRequisition', field: 'reasonCodeRequisition',
sort: 'custom', sort: 'custom',
table: { table: {
@ -205,9 +205,9 @@ export const UnplannedissueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
}, },
tableForm: { tableForm: {
isInpuFocusShow: true, // 开启查询弹窗 isInpuFocusShow: true, // 开启查询弹窗
searchListPlaceholder: '请选择成领用原因代码', searchListPlaceholder: '请选择成预算科目',
searchField: 'code', searchField: 'code',
searchTitle: '领用原因代码', searchTitle: '预算科目',
searchAllSchemas: SubjectAccount.allSchemas, searchAllSchemas: SubjectAccount.allSchemas,
searchPage: SubjectAccountApi.getSubjectAccountPage, searchPage: SubjectAccountApi.getSubjectAccountPage,
searchCondition: [{ searchCondition: [{
@ -227,7 +227,7 @@ export const UnplannedissueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
isSearchList: true, // 开启查询弹窗 isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择成本中心代码', // 输入框占位文本 searchListPlaceholder: '请选择成本中心代码', // 输入框占位文本
searchField: 'code', // 查询弹窗赋值字段 searchField: 'code', // 查询弹窗赋值字段
searchTitle: '领用原因代码', // 查询弹窗标题 searchTitle: '预算科目', // 查询弹窗标题
searchAllSchemas: SubjectAccount.allSchemas, // 查询弹窗所需类 searchAllSchemas: SubjectAccount.allSchemas, // 查询弹窗所需类
searchPage: SubjectAccountApi.getSubjectAccountPage, // 查询弹窗所需分页方法 searchPage: SubjectAccountApi.getSubjectAccountPage, // 查询弹窗所需分页方法
searchCondition: [{ searchCondition: [{
@ -254,7 +254,7 @@ export const UnplannedissueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
isInpuFocusShow: true, // 开启查询弹窗 isInpuFocusShow: true, // 开启查询弹窗
searchListPlaceholder: '请选择QAD项目信息', searchListPlaceholder: '请选择QAD项目信息',
searchField: 'projectCode', searchField: 'projectCode',
searchTitle: '领用原因代码', searchTitle: '预算科目',
searchAllSchemas: QadProject.allSchemas, searchAllSchemas: QadProject.allSchemas,
searchPage: QadProjectApi.getQadProjectPage searchPage: QadProjectApi.getQadProjectPage
}, },
@ -264,7 +264,7 @@ export const UnplannedissueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
isSearchList: true, // 开启查询弹窗 isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择QAD项目信息', // 输入框占位文本 searchListPlaceholder: '请选择QAD项目信息', // 输入框占位文本
searchField: 'projectCode', // 查询弹窗赋值字段 searchField: 'projectCode', // 查询弹窗赋值字段
searchTitle: '领用原因代码', // 查询弹窗标题 searchTitle: '预算科目', // 查询弹窗标题
searchAllSchemas: QadProject.allSchemas, // 查询弹窗所需类 searchAllSchemas: QadProject.allSchemas, // 查询弹窗所需类
searchPage: QadProjectApi.getQadProjectPage, // 查询弹窗所需分页方法 searchPage: QadProjectApi.getQadProjectPage, // 查询弹窗所需分页方法
searchCondition: [{ searchCondition: [{
@ -681,28 +681,28 @@ export const UnplannedissueRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
width: 150 width: 150
}, },
}, },
{ // {
label: '单价', // label: '单价',
field: 'singlePrice', // field: 'singlePrice',
sort: 'custom', // sort: 'custom',
table: { // table: {
width: 150 // width: 150
}, // },
form: { // form: {
component: 'InputNumber', // component: 'InputNumber',
} // }
}, // },
{ // {
label: '金额', // label: '金额',
field: 'amount', // field: 'amount',
sort: 'custom', // sort: 'custom',
table: { // table: {
width: 150 // width: 150
}, // },
form: { // form: {
component: 'InputNumber', // component: 'InputNumber',
} // }
}, // },
{ {
label: '库存状态', label: '库存状态',
field: 'inventoryStatus', field: 'inventoryStatus',

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

@ -189,7 +189,7 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
}, },
}, },
{ {
label: '领用原因代码', label: '预算科目',
field: 'reasonCodeRequisition', field: 'reasonCodeRequisition',
sort: 'custom', sort: 'custom',
table: { table: {
@ -198,9 +198,9 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
tableForm: { tableForm: {
enterSearch: true, enterSearch: true,
isInpuFocusShow: true, // 开启查询弹窗 isInpuFocusShow: true, // 开启查询弹窗
searchListPlaceholder: '请选择成领用原因代码', searchListPlaceholder: '请选择成预算科目',
searchField: 'code', searchField: 'code',
searchTitle: '领用原因代码', searchTitle: '预算科目',
searchAllSchemas: SubjectAccount.allSchemas, searchAllSchemas: SubjectAccount.allSchemas,
searchPage: SubjectAccountApi.getSubjectAccountPage, searchPage: SubjectAccountApi.getSubjectAccountPage,
searchCondition: [{ searchCondition: [{
@ -230,9 +230,9 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
componentProps: { componentProps: {
enterSearch: true, enterSearch: true,
isSearchList: true, // 开启查询弹窗 isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择领用原因代码', // 输入框占位文本 searchListPlaceholder: '请选择预算科目', // 输入框占位文本
searchField: 'code', // 查询弹窗赋值字段 searchField: 'code', // 查询弹窗赋值字段
searchTitle: '领用原因代码', // 查询弹窗标题 searchTitle: '预算科目', // 查询弹窗标题
searchAllSchemas: SubjectAccount.allSchemas, // 查询弹窗所需类 searchAllSchemas: SubjectAccount.allSchemas, // 查询弹窗所需类
searchPage: SubjectAccountApi.getSubjectAccountPage, // 查询弹窗所需分页方法 searchPage: SubjectAccountApi.getSubjectAccountPage, // 查询弹窗所需分页方法
searchCondition: [{ searchCondition: [{
@ -270,7 +270,7 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
isInpuFocusShow: true, // 开启查询弹窗 isInpuFocusShow: true, // 开启查询弹窗
searchListPlaceholder: '请选择QAD项目信息', searchListPlaceholder: '请选择QAD项目信息',
searchField: 'projectCode', searchField: 'projectCode',
searchTitle: '领用原因代码', searchTitle: '预算科目',
searchAllSchemas: QadProject.allSchemas, searchAllSchemas: QadProject.allSchemas,
searchPage: QadProjectApi.getQadProjectPage, searchPage: QadProjectApi.getQadProjectPage,
verificationParams: [{ verificationParams: [{
@ -289,7 +289,7 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
isSearchList: true, // 开启查询弹窗 isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择QAD项目信息', // 输入框占位文本 searchListPlaceholder: '请选择QAD项目信息', // 输入框占位文本
searchField: 'projectCode', // 查询弹窗赋值字段 searchField: 'projectCode', // 查询弹窗赋值字段
searchTitle: '领用原因代码', // 查询弹窗标题 searchTitle: '预算科目', // 查询弹窗标题
searchAllSchemas: QadProject.allSchemas, // 查询弹窗所需类 searchAllSchemas: QadProject.allSchemas, // 查询弹窗所需类
searchPage: QadProjectApi.getQadProjectPage, // 查询弹窗所需分页方法 searchPage: QadProjectApi.getQadProjectPage, // 查询弹窗所需分页方法
searchCondition: [{ searchCondition: [{
@ -677,7 +677,7 @@ export const UnplannedissueRequestMainRules = reactive({
{ required: false, message: '请输入成本中心类型', trigger: 'blur' } { required: false, message: '请输入成本中心类型', trigger: 'blur' }
], ],
reasonCodeRequisition: [ reasonCodeRequisition: [
{ required: true, message: '请输入领用原因代码', trigger: 'blur' } { required: true, message: '请输入预算科目', trigger: 'blur' }
], ],
projectCode: [ projectCode: [
{ required: false, message: '请输入项目代码', trigger: 'blur' } { required: false, message: '请输入项目代码', trigger: 'blur' }

44
src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts
View File

@ -661,28 +661,28 @@ export const UnplannedreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]
width: 150 width: 150
}, },
}, },
{ // {
label: '单价', // label: '单价',
field: 'singlePrice', // field: 'singlePrice',
sort: 'custom', // sort: 'custom',
table: { // table: {
width: 150 // width: 150
}, // },
form: { // form: {
component: 'InputNumber', // component: 'InputNumber',
} // }
}, // },
{ // {
label: '金额', // label: '金额',
field: 'amount', // field: 'amount',
sort: 'custom', // sort: 'custom',
table: { // table: {
width: 150 // width: 150
}, // },
form: { // form: {
component: 'InputNumber', // component: 'InputNumber',
} // }
}, // },
{ {
label: '到库位代码', label: '到库位代码',
field: 'toLocationCode', field: 'toLocationCode',

16
src/views/wms/issueManage/issue/issueRequestMain/index.vue
View File

@ -240,14 +240,14 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
} }
if (formField == 'productionLineCode') { if (formField == 'productionLineCode') {
//生产线 //生产线
let res = await WorkstationApi.getWorkstationPage({ // let res = await WorkstationApi.getWorkstationPage({
productionLineCode: val[0][searchField], // productionLineCode: val[0][searchField],
pageSize: 20, // pageSize: 20,
pageNo: 1 // pageNo: 1
}) // })
if(res&&res.list&&res.list.length>0){ // if(res&&res.list&&res.list.length>0){
setV['workStationCode'] = res.list[0].code // setV['workStationCode'] = res.list[0].code
} // }
tableData.value =[] tableData.value =[]
} }
if (formField == 'workStationCode') { if (formField == 'workStationCode') {

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

@ -265,7 +265,7 @@ function addDay(date: Date | number, addDay: number) {
} }
// 查询页面返回 // 查询页面返回
const searchTableSuccess = (formField, searchField, val, formRef, type, row) => { const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
nextTick(() => { nextTick(async() => {
if (type == 'tableForm') { if (type == 'tableForm') {
if (formField == 'secondPackUnit') { if (formField == 'secondPackUnit') {
row['secondPackUnit'] = val[0]['packUnit'] row['secondPackUnit'] = val[0]['packUnit']
@ -282,6 +282,29 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
} }
const index1 = 0 const index1 = 0
setTableFormsValues(val, index1) setTableFormsValues(val, index1)
} else if (formField == 'workStationCode') {
// 获取管理精度
const res = await ruleApi.getManagementPrecision({
itemCodes: [row['itemCode']],
locationCode:val[0]['fgLocationCode']
})
if (res[0].ManagementPrecision == 'BY_BATCH') {
row['batch'] = formatTime(new Date(), 'yyyyMMdd')
ProductreceiptRequestDetail.allSchemas.tableFormColumns.forEach(item => {
if(item.field == 'batch')
item.tableForm.disabled = false
})
ProductreceiptRequestDetailRules.batch[0].required = true
// 按数量管理批次清空不可输入
} else if (res[0].ManagementPrecision == 'BY_QUANTITY') {
ProductreceiptRequestDetail.allSchemas.tableFormColumns.forEach(item => {
if(item.field == 'batch')
item.tableForm.disabled = true
})
row['batch'] = ''
ProductreceiptRequestDetailRules.batch[0].required = false
}
row[formField] = val[0][searchField]
} else { } else {
row[formField] = val[0][searchField] row[formField] = val[0][searchField]
} }

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

@ -1113,6 +1113,9 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
table: { table: {
width: 150 width: 150
}, },
tableForm: {
disabled: false
}
}, },
{ {
label: '品名', label: '品名',

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

@ -159,6 +159,8 @@ import * as WorkshopApi from '@/api/wms/workshop'
import * as ConfigApi from '@/api/infra/config' import * as ConfigApi from '@/api/infra/config'
import { usePageLoading } from '@/hooks/web/usePageLoading' import { usePageLoading } from '@/hooks/web/usePageLoading'
import * as ruleApi from '@/api/wms/rule/index' import * as ruleApi from '@/api/wms/rule/index'
import * as AreaApi from '@/api/wms/areabasic'
import * as LocationApi from '@/api/wms/location'
const { loadStart, loadDone } = usePageLoading() const { loadStart, loadDone } = usePageLoading()
// 装配收货申请 // 装配收货申请
// 号口品收货申请 // 号口品收货申请
@ -226,7 +228,7 @@ const onChange = (field, cur) => {
// 查询页面返回 // 查询页面返回
const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => { const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
console.log('searchTableSuccess',formField, searchField, val, formRef, type, row) console.log('searchTableSuccess',formField, searchField, val, formRef, type, row)
nextTick(() => { nextTick(async() => {
if (type == 'tableForm') { if (type == 'tableForm') {
if (formField == 'secondPackUnit') { if (formField == 'secondPackUnit') {
row['secondPackUnit'] = val[0]['packUnit'] row['secondPackUnit'] = val[0]['packUnit']
@ -243,6 +245,29 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
} }
const index1 = 0 const index1 = 0
setTableFormsValues(val, index1) setTableFormsValues(val, index1)
} else if (formField == 'workStationCode') {
// 获取管理精度
const res = await ruleApi.getManagementPrecision({
itemCodes: [row['itemCode']],
locationCode:val[0]['fgLocationCode']
})
if (res[0].ManagementPrecision == 'BY_BATCH') {
row['batch'] = formatTime(new Date(), 'yyyyMMdd')
ProductreceiptRequestDetail.allSchemas.tableFormColumns.forEach(item => {
if(item.field == 'batch')
item.tableForm.disabled = false
})
ProductreceiptRequestDetailRules.batch[0].required = true
// 按数量管理批次清空不可输入
} else if (res[0].ManagementPrecision == 'BY_QUANTITY') {
ProductreceiptRequestDetail.allSchemas.tableFormColumns.forEach(item => {
if(item.field == 'batch')
item.tableForm.disabled = true
})
row['batch'] = ''
ProductreceiptRequestDetailRules.batch[0].required = false
}
row[formField] = val[0][searchField]
} else{ } else{
row[formField] = val[0][searchField] row[formField] = val[0][searchField]
} }

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

@ -1170,6 +1170,9 @@ export const ProductreceiptRequestDetail = useCrudSchemas(
sortTableDefault: 1006, sortTableDefault: 1006,
table: { table: {
width: 150 width: 150
},
tableForm: {
disabled:false
} }
}, },
{ {

19
src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
View File

@ -2645,13 +2645,14 @@ export const PurchasereceiptRequestPackage = useCrudSchemas(reactive<CrudSchema[
disabled: true disabled: true
} }
}, },
{ // {
label: '品番类型', // label: '品番类型',
field: 'itemType', // field: 'itemType',
sort: 'custom', // sort: 'custom',
isTableForm: false, // isTableForm: false,
tableForm: { // isForm: false,
disabled: true // tableForm: {
} // disabled: true
}, // }
// },
])) ]))

2
src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
View File

@ -1067,7 +1067,7 @@ const handleSelectionPublish = async ()=>{
getList() getList()
importTemplateData.templateUrl = await PurchasePlanMainApi.importTemplate() importTemplateData.templateUrl = await PurchasePlanMainApi.importTemplate()
nextTick(()=>{ nextTick(()=>{
tableColumns.value=tableColumns.value.filter(item=>item.field!='shippedQty') // tableColumns.value=tableColumns.value.filter(item=>item.field!='shippedQty')
}) })
}) })
</script> </script>

1
src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
View File

@ -8,6 +8,7 @@
]" ]"
@search="setSearchParams" @search="setSearchParams"
@reset="setSearchParams" @reset="setSearchParams"
:formClassNames="['dateSearch']"
/> />
</ContentWrap> </ContentWrap>

Write Preview
Loading…
Cancel
Save