diff --git a/src/components/Search/src/Search.vue b/src/components/Search/src/Search.vue index 72ad3a8c6..6fa772bb9 100644 --- a/src/components/Search/src/Search.vue +++ b/src/components/Search/src/Search.vue @@ -377,7 +377,7 @@ defineExpose({setFormValues,search}) // 提供 open 方法，用于打开弹窗 .dateSearch ::v-deep(.el-form-item) { margin-right: 1%; min-width: 320px; - width:30%; + width:32%; } .search ::v-deep(.el-form-item:nth-last-child(1)) { margin-right: 0px; diff --git a/src/views/wms/basicDataManage/itemPull/index.vue b/src/views/wms/basicDataManage/itemPull/index.vue index 95f4f83fa..0882d6a2d 100644 --- a/src/views/wms/basicDataManage/itemPull/index.vue +++ b/src/views/wms/basicDataManage/itemPull/index.vue @@ -225,7 +225,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '物料拉动配置导入模版.xlsx' + templateTitle: '品番拉动配置导入模版.xlsx' }) // 导入成功之后 const importSuccess = () => { diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts index a1b25eb86..439dc58bf 100644 --- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts @@ -1,975 +1,1024 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' 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 { Warehouse } from '@/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data' +import * as LocationApi from '@/api/wms/location' +import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data' import * as ItempackagingApi from '@/api/wms/itempackage' import { Itempackaging } from '@/views/wms/basicDataManage/itemManage/itempackage/itempackage.data' -import * as BalanceApi from '@/api/wms/balance' +import * as BalanceApi from '@/api/wms/balance' import { BalancePopWindow } from '@/views/wms/inventoryManage/balance/balance.data' // 获取自动提交自动通过自动执行，跳过任务直接生成记录的默认值 const queryParams = { - pageSize:10, - pageNo:1, - code:'PackageOverRequest' + pageSize: 10, + pageNo: 1, + code: 'PackageOverRequest' } - const data = await getRequestsettingApi.getRequestsettingPage(queryParams) - const requestsettingData =data?.list[0]||{} +const data = await getRequestsettingApi.getRequestsettingPage(queryParams) +const requestsettingData = data?.list[0] || {} - // 获取当前操作人的部门 - import { useUserStore } from '@/store/modules/user' - import { TableColumn } from '@/types/table' - const userStore = useUserStore() - const userDept = userStore.userSelfInfo.dept - // id 转str 否则form回显匹配不到 - userDept.id = userDept.id.toString() - const userDeptArray:any = [userDept] +// 获取当前操作人的部门 +import { useUserStore } from '@/store/modules/user' +import { TableColumn } from '@/types/table' +const userStore = useUserStore() +const userDept = userStore.userSelfInfo.dept +// id 转str 否则form回显匹配不到 +userDept.id = userDept.id.toString() +const userDeptArray: any = [userDept] -export const PackageoverRequestMain = useCrudSchemas(reactive([ - { - label: '单据号', - field: 'number', - sort: 'custom', - table: { - width: 180, - fixed: 'left' - }, - isForm: false, - isSearch: true, - }, - { - label: '状态', - field: 'status', - dictType: DICT_TYPE.REQUEST_STATUS, - dictClass: 'string', - isSearch: true, - isTable: true, - isForm: false, - sort: 'custom', - table: { - width: 150 - }, - form: { - value: '1', - componentProps: { - disabled: true - } - } - }, - { - label: '申请时间', - field: 'requestTime', - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - sort: 'custom', - table: { - width: 180 - }, - form: { - component: 'DatePicker', - componentProps: { - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', +export const PackageoverRequestMain = useCrudSchemas( + reactive([ + { + label: '单据号', + field: 'number', + sort: 'custom', + table: { + width: 180, + fixed: 'left' + }, + isForm: false, + isSearch: true + }, + { + label: '状态', + field: 'status', + dictType: DICT_TYPE.REQUEST_STATUS, + dictClass: 'string', + isSearch: true, + isTable: true, + isForm: false, + sort: 'custom', + table: { + width: 150 + }, + form: { + value: '1', + componentProps: { + disabled: true + } } }, - isTable: false, - isForm: false, - }, - { - label: '截止时间', - field: 'dueTime', - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - sort: 'custom', - table: { - width: 180 - }, - form: { - component: 'DatePicker', - componentProps: { - style:{width:'100%'}, - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', - } + { + label: '申请时间', + field: 'requestTime', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sort: 'custom', + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x' + } + }, + isTable: false, + isForm: false + }, + { + label: '截止时间', + field: 'dueTime', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sort: 'custom', + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + style: { width: '100%' }, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x' + } + }, + isTable: false }, - isTable: false, - }, - { - 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: '从库区类型范围', - field: 'fromAreaTypes', - dictType: DICT_TYPE.AREA_TYPE, - dictClass: 'string', - isSearch: true, - isTable: false, - sort: 'custom', - table: { - width: 150 - }, - isForm: false, - }, - { - label: '到库区类型范围', - field: 'toAreaTypes', - dictType: DICT_TYPE.AREA_TYPE, - dictClass: 'string', - isTable: false, - sort: 'custom', - table: { - width: 150 - }, - isForm: false - }, - { - label: '从库区代码范围', - field: 'fromAreaCodes', - sort: 'custom', - table: { - width: 150 - }, - isTable: false, - isForm: false - }, - { - label: '到库区代码范围', - field: 'toAreaCodes', - sort: 'custom', - table: { - width: 150 - }, - isTable: false, - isForm: false - }, - { - label: '入库库存状态范围', - field: 'inInventoryStatuses', - sort: 'custom', - isTable: false, - isForm: false - }, - { - label: '出库库存状态范围', - field: 'outInventoryStatuses', - sort: 'custom', - isTable: false, - isForm: false - }, - { - label: '部门', - field: 'departmentCode', - sort: 'custom', - isForm: false, - isTable: false, - table: { - width: 150 - }, - formatter: (_: Recordable, __: TableColumn, cellValue: number) => { - return userDeptArray.find((account) => account.id == cellValue)?.name - }, - form: { - value: userDept.id, - component: 'Select', - api: () => userDeptArray, - componentProps: { - disabled: true, - optionsAlias: { - labelField: 'name', - valueField: 'id' + + { + label: '从库位代码', + field: 'fromLocationCode', + sort: 'custom', + isForm: true, + isTable: true, + isDetail: true, + table: { + width: 150 + }, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + enterSearch: true, + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择从库位代码', + searchField: 'code', + searchTitle: '库位信息', + searchAllSchemas: Location.allSchemas, + searchPage: LocationApi.selectBusinessTypeToLocation, + searchCondition: [ + { + key: 'businessType', + value: 'HoldToOk', + isMainValue: false + }, + { + key: 'isIn', + value: 'out', + isMainValue: false + } + ], + verificationParams: [ + { + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true + } + ] // 失去焦点校验参数 } } - } - }, - { - label: '备注', - field: 'remark', - sort: 'custom', - table: { - width: 150 - }, - isTable: false, - }, - { - label: '业务类型', - field: 'businessType', - sort: 'custom', - isTable: false, - table: { - width: 150 - }, - form: { - value: 'OverPackage', - componentProps: { - disabled: true - } }, - isForm: false - }, - { - label: '自动提交', - field: 'autoCommit', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', - isTable: false, - isForm: false, - sort: 'custom', - table: { - width: 150 - }, - form: { - component: 'Switch', - value: requestsettingData.autoCommit, - componentProps: { - inactiveValue: 'FALSE', - activeValue: 'TRUE', + { + label: '到库位代码', + field: 'toLocationCode', + sort: 'custom', + table: { + width: 150 + }, + tableForm: { disabled: true + }, + form: { + componentProps: { + disabled: true + } } - } - }, - { - label: '自动通过', - field: 'autoAgree', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', - isTable: false, - isForm: false, - sort: 'custom', - table: { - width: 150 - }, - form: { - component: 'Switch', - value: requestsettingData.autoAgree, - componentProps: { - inactiveValue: 'FALSE', - activeValue: '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: '从库区类型范围', + field: 'fromAreaTypes', + dictType: DICT_TYPE.AREA_TYPE, + dictClass: 'string', + isSearch: true, + isTable: false, + sort: 'custom', + table: { + width: 150 + }, + isForm: false + }, + { + label: '到库区类型范围', + field: 'toAreaTypes', + dictType: DICT_TYPE.AREA_TYPE, + dictClass: 'string', + isTable: false, + sort: 'custom', + table: { + width: 150 + }, + isForm: false + }, + { + label: '从库区代码范围', + field: 'fromAreaCodes', + sort: 'custom', + table: { + width: 150 + }, + isTable: false, + isForm: false + }, + { + label: '到库区代码范围', + field: 'toAreaCodes', + sort: 'custom', + table: { + width: 150 + }, + isTable: false, + isForm: false + }, + { + label: '入库库存状态范围', + field: 'inInventoryStatuses', + sort: 'custom', + isTable: false, + isForm: false + }, + { + label: '出库库存状态范围', + field: 'outInventoryStatuses', + sort: 'custom', + isTable: false, + isForm: false + }, + { + label: '部门', + field: 'departmentCode', + sort: 'custom', + isForm: false, + isTable: false, + table: { + width: 150 + }, + formatter: (_: Recordable, __: TableColumn, cellValue: number) => { + return userDeptArray.find((account) => account.id == cellValue)?.name + }, + form: { + value: userDept.id, + component: 'Select', + api: () => userDeptArray, + componentProps: { + disabled: true, + optionsAlias: { + labelField: 'name', + valueField: 'id' + } + } } - } - }, - { - label: '自动执行', - field: 'autoExecute', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', - isForm: false, - isTable: false, - sort: 'custom', - table: { - width: 150 - }, - form: { - component: 'Switch', - value: requestsettingData.autoExecute, - componentProps: { - inactiveValue: 'FALSE', - activeValue: 'TRUE', - disabled: true + }, + { + label: '备注', + field: 'remark', + sort: 'custom', + table: { + width: 150 + }, + isTable: false + }, + { + label: '业务类型', + field: 'businessType', + sort: 'custom', + isTable: false, + table: { + width: 150 + }, + form: { + value: 'OverPackage', + componentProps: { + disabled: true + } + }, + isForm: false + }, + { + label: '自动提交', + field: 'autoCommit', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isTable: false, + isForm: false, + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'Switch', + value: requestsettingData.autoCommit, + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE', + disabled: true + } } - } - }, - { - 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: '自动通过', + field: 'autoAgree', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isTable: false, + isForm: false, + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'Switch', + value: requestsettingData.autoAgree, + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE', + disabled: true + } } - } - }, - { - label: '创建时间', - field: 'createTime', - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - isTable: false, - sort: 'custom', - table: { - width: 180 - }, - form: { - component: 'DatePicker', - componentProps: { - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', + }, + { + label: '自动执行', + field: 'autoExecute', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isForm: false, + isTable: false, + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'Switch', + value: requestsettingData.autoExecute, + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE', + disabled: true + } } }, - isForm: false, - isSearch: true, - search: { - component: 'DatePicker', - componentProps: { - valueFormat: 'YYYY-MM-DD HH:mm:ss', - type: 'daterange', - defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + { + 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: '创建者', - field: 'creator', - sort: 'custom', - table: { - width: 150 - }, - isTable: false, - isForm: false, - }, - { - label: '最后更新时间', - field: 'updateTime', - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - sort: 'custom', - table: { - width: 180 - }, - isTable: false, - form: { - component: 'DatePicker', - componentProps: { - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', + { + label: '创建时间', + field: 'createTime', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + isTable: false, + sort: 'custom', + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x' + } + }, + isForm: false, + isSearch: true, + search: { + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'daterange', + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + } } }, - isForm: false, - }, - { - label: '最后更新者', - field: 'updater', - sort: 'custom', - table: { - width: 150 - }, - isTable: false, - isForm: false, - }, - { - label: '操作', - field: 'action', - isForm: false, - table: { - width: 180, - fixed: 'right' + { + label: '创建者', + field: 'creator', + sort: 'custom', + table: { + width: 150 + }, + isTable: false, + isForm: false + }, + { + label: '最后更新时间', + field: 'updateTime', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sort: 'custom', + table: { + width: 180 + }, + isTable: false, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x' + } + }, + isForm: false + }, + { + label: '最后更新者', + field: 'updater', + sort: 'custom', + table: { + width: 150 + }, + isTable: false, + isForm: false + }, + { + label: '操作', + field: 'action', + isForm: false, + table: { + width: 180, + fixed: 'right' + } } - } -])) + ]) +) // 表单校验 export const PackageoverRequestMainRules = reactive({ - fromWarehouseCode: [ - { required: true, message: '请选择仓库代码', trigger: 'change' } - ], + fromWarehouseCode: [{ required: true, message: '请选择仓库代码', trigger: 'change' }] }) -export const PackageoverRequestDetail = useCrudSchemas(reactive([ - { - label: '单据号', - field: 'number', - sort: 'custom', - table: { - width: 180 - }, - isTable: false, - isTableForm: false, - form: { - componentProps: { - disabled: true +export const PackageoverRequestDetail = useCrudSchemas( + reactive([ + { + label: '单据号', + field: 'number', + sort: 'custom', + table: { + width: 180 + }, + isTable: false, + isTableForm: false, + form: { + componentProps: { + disabled: true + } } - } - }, - { - label: '品番', - field: 'itemCode', - sort: 'custom', - table: { - width: 150 - }, - form: { - // labelMessage: '信息提示说明！！！', - componentProps: { - isSearchList: true, // 开启查询弹窗 + }, + { + label: '品番', + field: 'itemCode', + sort: 'custom', + table: { + width: 150 + }, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择品番', // 输入框占位文本 + searchField: 'itemCode', // 查询弹窗赋值字段 + searchTitle: '库存余额信息', // 查询弹窗标题 + searchAllSchemas: BalancePopWindow.allSchemas, // 查询弹窗所需类 + searchPage: BalanceApi.getBalancePage, // 查询弹窗所需分页方法 + searchCondition: [ + { + key: 'warehouseCode', + value: 'fromWarehouseCode', + message: '请填写从仓库代码！', + isMainValue: true + }, + { + key: 'inventoryStatus', + value: 'OK', + isMainValue: false + } + ] + } + }, + tableForm: { + multiple: true, + isInpuFocusShow: true, searchListPlaceholder: '请选择品番', // 输入框占位文本 searchField: 'itemCode', // 查询弹窗赋值字段 searchTitle: '库存余额信息', // 查询弹窗标题 searchAllSchemas: BalancePopWindow.allSchemas, // 查询弹窗所需类 searchPage: BalanceApi.getBalancePage, // 查询弹窗所需分页方法 - searchCondition:[ + searchCondition: [ + { + key: 'warehouseCode', + value: 'fromWarehouseCode', + message: '请填写从仓库代码！', + isMainValue: true + }, { - key: 'warehouseCode', - value: 'fromWarehouseCode', - message: '请填写从仓库代码！', - isMainValue: true - }, - { - key: 'inventoryStatus', - value: 'OK', - isMainValue: false - }] + key: 'inventoryStatus', + value: 'OK', + isMainValue: false + } + ] } }, - tableForm:{ - multiple:true, - isInpuFocusShow: true, - searchListPlaceholder: '请选择品番', // 输入框占位文本 - searchField: 'itemCode', // 查询弹窗赋值字段 - searchTitle: '库存余额信息', // 查询弹窗标题 - searchAllSchemas: BalancePopWindow.allSchemas, // 查询弹窗所需类 - searchPage: BalanceApi.getBalancePage, // 查询弹窗所需分页方法 - searchCondition:[ - { - key: 'warehouseCode', - value: 'fromWarehouseCode', - message: '请填写从仓库代码！', - isMainValue: true - }, - { - key: 'inventoryStatus', - value: 'OK', - isMainValue: false - }] - }, - }, - { - label: '品名', - field: 'itemName', - sort: 'custom', - table: { - width: 150 - }, - isTableForm: false, - isForm: false - }, - { - label: '背番', - field: 'itemDesc1', - sort: 'custom', - table: { - width: 150 - }, - isTableForm: false, - isForm: false - }, - { - label: '描述', - field: 'itemDesc2', - sort: 'custom', - table: { - width: 150 - }, - isTableForm: false, - isForm: false - }, - { - label: '项目代码', - field: 'projectCode', - sort: 'custom', - table: { - width: 150 - }, - isTableForm: false, - isForm: false - }, - { - label: '数量', - field: 'qty', - sort: 'custom', - table: { - width: 100 - }, - tableForm: { - type: 'InputNumber', - min: 0, - precision: 6 - }, - form: { - component: 'InputNumber', - componentProps: { + { + label: '品名', + field: 'itemName', + sort: 'custom', + table: { + width: 150 + }, + isTableForm: false, + isForm: false + }, + { + label: '背番', + field: 'itemDesc1', + sort: 'custom', + table: { + width: 150 + }, + isTableForm: false, + isForm: false + }, + { + label: '描述', + field: 'itemDesc2', + sort: 'custom', + table: { + width: 150 + }, + isTableForm: false, + isForm: false + }, + { + label: '项目代码', + field: 'projectCode', + sort: 'custom', + table: { + width: 150 + }, + isTableForm: false, + isForm: false + }, + { + label: '数量', + field: 'qty', + sort: 'custom', + table: { + width: 100 + }, + tableForm: { + type: 'InputNumber', min: 0, precision: 6 + }, + form: { + component: 'InputNumber', + componentProps: { + min: 0, + precision: 6 + } } - } - }, - { - label: '计量单位', - field: 'uom', - dictType: DICT_TYPE.UOM, - dictClass: 'string', - isTable: true, - sort: 'custom', - table: { - width: 120 - }, - tableForm:{ - type: 'Select', - disabled: true - }, - form: { - componentProps: { + }, + { + label: '计量单位', + field: 'uom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 120 + }, + tableForm: { + type: 'Select', disabled: true + }, + form: { + componentProps: { + disabled: true + } } - } - }, - { - label: '从包装规格', - field: 'fromPackUnit', - sort: 'custom', - isSearch: true, - table: { - width: 120 - }, - tableForm:{ - enterSearch:true, - isInpuFocusShow: true, - isSearchList: true, // 开启查询弹窗 - searchListPlaceholder: '请选择包装规格', // 输入框占位文本 - searchField: 'packUnit', // 查询弹窗赋值字段 - searchTitle: '物料包装信息', // 查询弹窗标题 - searchAllSchemas: Itempackaging.allSchemas, // 查询弹窗所需类 - searchPage: ItempackagingApi.getItempackagingPage, // 查询弹窗所需分页方法 - searchCondition: [{ - key: 'available', - value: 'TRUE', - isMainValue: false - },{ - key: 'itemCode', - value: 'itemCode', - isMainValue: true - }], - // 失去焦点校验参数 - verificationParams: [{ - key: 'packUnit', - action: '==', - value: '', - isMainValue: false, - isSearch: 'true', - isFormModel: true, - }] - }, - form: { - // labelMessage: '信息提示说明！！！', - componentProps: { + }, + { + label: '从包装规格', + field: 'fromPackUnit', + sort: 'custom', + isSearch: true, + table: { + width: 120 + }, + tableForm: { + enterSearch: true, + isInpuFocusShow: true, isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择包装规格', // 输入框占位文本 searchField: 'packUnit', // 查询弹窗赋值字段 searchTitle: '物料包装信息', // 查询弹窗标题 searchAllSchemas: Itempackaging.allSchemas, // 查询弹窗所需类 searchPage: ItempackagingApi.getItempackagingPage, // 查询弹窗所需分页方法 - searchCondition: [{ - key: 'available', - value: 'TRUE', - isMainValue: false - },{ - key: 'itemCode', - value: 'itemCode', - message: '请先选择品番！', // 当前置条件为空时 弹出信息提示 - isMainValue: true - }], + searchCondition: [ + { + key: 'available', + value: 'TRUE', + isMainValue: false + }, + { + key: 'itemCode', + value: 'itemCode', + isMainValue: true + } + ], // 失去焦点校验参数 - verificationParams: [{ - key: 'packUnit', - action: '==', - value: '', - isMainValue: false, - isSearch: 'true', - isFormModel: true, - }] + verificationParams: [ + { + key: 'packUnit', + action: '==', + value: '', + isMainValue: false, + isSearch: 'true', + isFormModel: true + } + ] + }, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择包装规格', // 输入框占位文本 + searchField: 'packUnit', // 查询弹窗赋值字段 + searchTitle: '物料包装信息', // 查询弹窗标题 + searchAllSchemas: Itempackaging.allSchemas, // 查询弹窗所需类 + searchPage: ItempackagingApi.getItempackagingPage, // 查询弹窗所需分页方法 + searchCondition: [ + { + key: 'available', + value: 'TRUE', + isMainValue: false + }, + { + key: 'itemCode', + value: 'itemCode', + message: '请先选择品番！', // 当前置条件为空时 弹出信息提示 + isMainValue: true + } + ], + // 失去焦点校验参数 + verificationParams: [ + { + key: 'packUnit', + action: '==', + value: '', + isMainValue: false, + isSearch: 'true', + isFormModel: true + } + ] + } } - } - }, - { - label: '到包装规格', - field: 'toPackUnit', - sort: 'custom', - isSearch: true, - table: { - width: 120 - }, - tableForm:{ - enterSearch:true, - isInpuFocusShow: true, - isSearchList: true, // 开启查询弹窗 - searchListPlaceholder: '请选择包装规格', // 输入框占位文本 - searchField: 'packUnit', // 查询弹窗赋值字段 - searchTitle: '物料包装信息', // 查询弹窗标题 - searchAllSchemas: Itempackaging.allSchemas, // 查询弹窗所需类 - searchPage: ItempackagingApi.getItempackagingPage, // 查询弹窗所需分页方法 - searchCondition: [{ - key: 'available', - value: 'TRUE', - isMainValue: false - },{ - key: 'itemCode', - value: 'itemCode', - message: '请先选择品番！', // 当前置条件为空时 弹出信息提示 - isMainValue: true - }], - // 失去焦点校验参数 - verificationParams: [{ - key: 'packUnit', - action: '==', - value: '', - isMainValue: false, - isSearch: 'true', - isFormModel: true, - }] - }, - form: { - // labelMessage: '信息提示说明！！！', - componentProps: { + }, + { + label: '到包装规格', + field: 'toPackUnit', + sort: 'custom', + isSearch: true, + table: { + width: 120 + }, + tableForm: { + enterSearch: true, + isInpuFocusShow: true, isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择包装规格', // 输入框占位文本 searchField: 'packUnit', // 查询弹窗赋值字段 searchTitle: '物料包装信息', // 查询弹窗标题 searchAllSchemas: Itempackaging.allSchemas, // 查询弹窗所需类 searchPage: ItempackagingApi.getItempackagingPage, // 查询弹窗所需分页方法 - searchCondition: [{ - key: 'available', - value: 'TRUE', - isMainValue: false - },{ - key: 'itemCode', - value: 'itemCode', - isMainValue: true - }], + searchCondition: [ + { + key: 'available', + value: 'TRUE', + isMainValue: false + }, + { + key: 'itemCode', + value: 'itemCode', + message: '请先选择品番！', // 当前置条件为空时 弹出信息提示 + isMainValue: true + } + ], // 失去焦点校验参数 - verificationParams: [{ - key: 'packUnit', - action: '==', - value: '', - isMainValue: false, - isSearch: 'true', - isFormModel: true, - }] - } - } - }, - { - label: '从标包数量', - field: 'fromPackQty', - sort: 'custom', - table: { - width: 120 - }, - tableForm:{ - disabled: true - }, - form: { - componentProps: { - disabled: true - } - } - }, - { - label: '到标包数量', - field: 'toPackQty', - sort: 'custom', - table: { - width: 120 - }, - tableForm:{ - disabled: true - }, - form: { - componentProps: { - disabled: true - } - } - }, - { - label: '批次', - field: 'batch', - sort: 'custom', - table: { - width: 120 - }, - tableForm:{ - disabled: true - }, - form: { - componentProps: { - disabled: true + verificationParams: [ + { + key: 'packUnit', + action: '==', + value: '', + isMainValue: false, + isSearch: 'true', + isFormModel: true + } + ] + }, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择包装规格', // 输入框占位文本 + searchField: 'packUnit', // 查询弹窗赋值字段 + searchTitle: '物料包装信息', // 查询弹窗标题 + searchAllSchemas: Itempackaging.allSchemas, // 查询弹窗所需类 + searchPage: ItempackagingApi.getItempackagingPage, // 查询弹窗所需分页方法 + searchCondition: [ + { + key: 'available', + value: 'TRUE', + isMainValue: false + }, + { + key: 'itemCode', + value: 'itemCode', + isMainValue: true + } + ], + // 失去焦点校验参数 + verificationParams: [ + { + key: 'packUnit', + action: '==', + value: '', + isMainValue: false, + isSearch: 'true', + isFormModel: true + } + ] + } } - } - }, - { - label: '从库位代码', - field: 'fromLocationCode', - sort: 'custom', - table: { - width: 150 - }, - tableForm:{ - disabled: true - }, - form: { - componentProps: { + }, + { + label: '从标包数量', + field: 'fromPackQty', + sort: 'custom', + table: { + width: 120 + }, + tableForm: { disabled: true + }, + form: { + componentProps: { + disabled: true + } } - } - }, - { - label: '到库位代码', - field: 'toLocationCode', - sort: 'custom', - table: { - width: 150 - }, - tableForm:{ - disabled: true - }, - form: { - componentProps: { + }, + { + label: '到标包数量', + field: 'toPackQty', + sort: 'custom', + table: { + width: 120 + }, + tableForm: { disabled: true + }, + form: { + componentProps: { + disabled: true + } } - } - }, - { - label: '从库位组代码', - field: 'fromLocationGroupCode', - sort: 'custom', - table: { - width: 150 - }, - tableForm:{ - disabled: true - }, - form: { - componentProps: { + }, + { + label: '批次', + field: 'batch', + sort: 'custom', + table: { + width: 120 + }, + tableForm: { disabled: true + }, + form: { + componentProps: { + disabled: true + } } - } - }, - { - label: '到库位组代码', - field: 'toLocationGroupCode', - sort: 'custom', - table: { - width: 150 - }, - tableForm:{ - disabled: true - }, - form: { - componentProps: { + }, + + { + label: '从库位组代码', + field: 'fromLocationGroupCode', + sort: 'custom', + table: { + width: 150 + }, + tableForm: { disabled: true + }, + form: { + componentProps: { + disabled: true + } } - } - }, - { - label: '从库区代码', - field: 'fromAreaCode', - sort: 'custom', - table: { - width: 150 - }, - tableForm:{ - disabled: true - }, - form: { - componentProps: { + }, + { + label: '到库位组代码', + field: 'toLocationGroupCode', + sort: 'custom', + table: { + width: 150 + }, + tableForm: { disabled: true + }, + form: { + componentProps: { + disabled: true + } } - } - }, - { - label: '到库区代码', - field: 'toAreaCode', - sort: 'custom', - table: { - width: 150 - }, - tableForm:{ - disabled: true - }, - form: { - componentProps: { + }, + { + label: '从库区代码', + field: 'fromAreaCode', + sort: 'custom', + table: { + width: 150 + }, + tableForm: { disabled: true + }, + form: { + componentProps: { + disabled: true + } } - } - }, - { - label: '库存状态', - field: 'inventoryStatus', - dictType: DICT_TYPE.INVENTORY_STATUS, - dictClass: 'string', - isTable: true, - sort: 'custom', - table: { - width: 110 - }, - tableForm: { - type: 'Select', - disabled: true - }, - form: { - componentProps: { + }, + { + label: '到库区代码', + field: 'toAreaCode', + sort: 'custom', + table: { + width: 150 + }, + tableForm: { disabled: true - } - } - }, - { - label: '备注', - field: 'remark', - sort: 'custom', - table: { - width: 150 - }, - isTable: false, - }, - { - label: '创建时间', - field: 'createTime', - sort: 'custom', - isForm: false, - isTable: true, - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - table: { - width: 180 - }, - form: { - component: 'DatePicker', - componentProps: { - style: {width:'100%'}, - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', + }, + form: { + componentProps: { + disabled: true + } } }, - isTableForm: false, - }, - { - label: '创建者', - field: 'creator', - isTable: true, - table: { - width: 150 - }, - isTableForm: false, - isForm: false - }, - { - label: '最后更新时间', - field: 'updateTime', - sort: 'custom', - isForm: false, - isTable: true, - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - table: { - width: 180 - }, - form: { - component: 'DatePicker', - componentProps: { - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', + { + label: '库存状态', + field: 'inventoryStatus', + dictType: DICT_TYPE.INVENTORY_STATUS, + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 110 + }, + tableForm: { + type: 'Select', + disabled: true + }, + form: { + componentProps: { + disabled: true + } } }, - isTableForm: false, - }, - { - label: '最后更新者', - field: 'updater', - isForm: false, - isTable: true, - table: { - width: 150 - }, - isTableForm: false, - } -])) + { + label: '备注', + field: 'remark', + sort: 'custom', + table: { + width: 150 + }, + isTable: false + }, + { + label: '创建时间', + field: 'createTime', + sort: 'custom', + isForm: false, + isTable: true, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + style: { width: '100%' }, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x' + } + }, + isTableForm: false + }, + { + label: '创建者', + field: 'creator', + isTable: true, + table: { + width: 150 + }, + isTableForm: false, + isForm: false + }, + { + label: '最后更新时间', + field: 'updateTime', + sort: 'custom', + isForm: false, + isTable: true, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x' + } + }, + isTableForm: false + }, + { + label: '最后更新者', + field: 'updater', + isForm: false, + isTable: true, + table: { + width: 150 + }, + isTableForm: false + } + ]) +) // 表单校验 export const PackageoverRequestDetailRules = reactive({ - itemCode: [ - { required: true, message: '请选择品番', trigger: 'change' } - ], - fromPackUnit: [ - { required: true, message: '请选择从包装规格', trigger: 'change' } - ], - toPackUnit: [ - { required: true, message: '请选择到包装规格', trigger: 'change' } - ], + itemCode: [{ required: true, message: '请选择品番', trigger: 'change' }], + fromPackUnit: [{ required: true, message: '请选择从包装规格', trigger: 'change' }], + toPackUnit: [{ required: true, message: '请选择到包装规格', trigger: 'change' }] }) diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/unplannedissueJobMain.data.ts b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/unplannedissueJobMain.data.ts index b48205f26..b53dc8837 100644 --- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/unplannedissueJobMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/unplannedissueJobMain.data.ts @@ -154,7 +154,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive([ }, }, { - label: '领用原因代码', + label: '预算科目', field: 'reasonCodeRequisition', sort: 'custom', table: { @@ -162,9 +162,9 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive([ }, tableForm: { isInpuFocusShow: true, // 开启查询弹窗 - searchListPlaceholder: '请选择成领用原因代码', + searchListPlaceholder: '请选择成预算科目', searchField: 'code', - searchTitle: '领用原因代码', + searchTitle: '预算科目', searchAllSchemas: SubjectAccount.allSchemas, searchPage: SubjectAccountApi.getSubjectAccountPage, searchCondition: [{ @@ -184,7 +184,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive([ isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择成本中心代码', // 输入框占位文本 searchField: 'code', // 查询弹窗赋值字段 - searchTitle: '领用原因代码', // 查询弹窗标题 + searchTitle: '预算科目', // 查询弹窗标题 searchAllSchemas: SubjectAccount.allSchemas, // 查询弹窗所需类 searchPage: SubjectAccountApi.getSubjectAccountPage, // 查询弹窗所需分页方法 searchCondition: [{ @@ -211,7 +211,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive([ isInpuFocusShow: true, // 开启查询弹窗 searchListPlaceholder: '请选择QAD项目信息', searchField: 'projectCode', - searchTitle: '领用原因代码', + searchTitle: '预算科目', searchAllSchemas: QadProject.allSchemas, searchPage: QadProjectApi.getQadProjectPage }, @@ -221,7 +221,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive([ isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择QAD项目信息', // 输入框占位文本 searchField: 'projectCode', // 查询弹窗赋值字段 - searchTitle: '领用原因代码', // 查询弹窗标题 + searchTitle: '预算科目', // 查询弹窗标题 searchAllSchemas: QadProject.allSchemas, // 查询弹窗所需类 searchPage: QadProjectApi.getQadProjectPage, // 查询弹窗所需分页方法 searchCondition: [{ diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts index c117f7278..f41b69cf6 100644 --- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts @@ -197,7 +197,7 @@ export const UnplannedissueRecordMain = useCrudSchemas(reactive([ }, }, { - label: '领用原因代码', + label: '预算科目', field: 'reasonCodeRequisition', sort: 'custom', table: { @@ -205,9 +205,9 @@ export const UnplannedissueRecordMain = useCrudSchemas(reactive([ }, tableForm: { isInpuFocusShow: true, // 开启查询弹窗 - searchListPlaceholder: '请选择成领用原因代码', + searchListPlaceholder: '请选择成预算科目', searchField: 'code', - searchTitle: '领用原因代码', + searchTitle: '预算科目', searchAllSchemas: SubjectAccount.allSchemas, searchPage: SubjectAccountApi.getSubjectAccountPage, searchCondition: [{ @@ -227,7 +227,7 @@ export const UnplannedissueRecordMain = useCrudSchemas(reactive([ isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择成本中心代码', // 输入框占位文本 searchField: 'code', // 查询弹窗赋值字段 - searchTitle: '领用原因代码', // 查询弹窗标题 + searchTitle: '预算科目', // 查询弹窗标题 searchAllSchemas: SubjectAccount.allSchemas, // 查询弹窗所需类 searchPage: SubjectAccountApi.getSubjectAccountPage, // 查询弹窗所需分页方法 searchCondition: [{ @@ -254,7 +254,7 @@ export const UnplannedissueRecordMain = useCrudSchemas(reactive([ isInpuFocusShow: true, // 开启查询弹窗 searchListPlaceholder: '请选择QAD项目信息', searchField: 'projectCode', - searchTitle: '领用原因代码', + searchTitle: '预算科目', searchAllSchemas: QadProject.allSchemas, searchPage: QadProjectApi.getQadProjectPage }, @@ -264,7 +264,7 @@ export const UnplannedissueRecordMain = useCrudSchemas(reactive([ isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择QAD项目信息', // 输入框占位文本 searchField: 'projectCode', // 查询弹窗赋值字段 - searchTitle: '领用原因代码', // 查询弹窗标题 + searchTitle: '预算科目', // 查询弹窗标题 searchAllSchemas: QadProject.allSchemas, // 查询弹窗所需类 searchPage: QadProjectApi.getQadProjectPage, // 查询弹窗所需分页方法 searchCondition: [{ @@ -681,28 +681,28 @@ export const UnplannedissueRecordDetail = useCrudSchemas(reactive( width: 150 }, }, - { - label: '单价', - field: 'singlePrice', - sort: 'custom', - table: { - width: 150 - }, - form: { - component: 'InputNumber', - } - }, - { - label: '金额', - field: 'amount', - sort: 'custom', - table: { - width: 150 - }, - form: { - component: 'InputNumber', - } - }, + // { + // label: '单价', + // field: 'singlePrice', + // sort: 'custom', + // table: { + // width: 150 + // }, + // form: { + // component: 'InputNumber', + // } + // }, + // { + // label: '金额', + // field: 'amount', + // sort: 'custom', + // table: { + // width: 150 + // }, + // form: { + // component: 'InputNumber', + // } + // }, { label: '库存状态', field: 'inventoryStatus', diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts index d24b7e72c..d9477af69 100644 --- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts @@ -189,7 +189,7 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive([ }, }, { - label: '领用原因代码', + label: '预算科目', field: 'reasonCodeRequisition', sort: 'custom', table: { @@ -198,9 +198,9 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive([ tableForm: { enterSearch: true, isInpuFocusShow: true, // 开启查询弹窗 - searchListPlaceholder: '请选择成领用原因代码', + searchListPlaceholder: '请选择成预算科目', searchField: 'code', - searchTitle: '领用原因代码', + searchTitle: '预算科目', searchAllSchemas: SubjectAccount.allSchemas, searchPage: SubjectAccountApi.getSubjectAccountPage, searchCondition: [{ @@ -230,9 +230,9 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive([ componentProps: { enterSearch: true, isSearchList: true, // 开启查询弹窗 - searchListPlaceholder: '请选择领用原因代码', // 输入框占位文本 + searchListPlaceholder: '请选择预算科目', // 输入框占位文本 searchField: 'code', // 查询弹窗赋值字段 - searchTitle: '领用原因代码', // 查询弹窗标题 + searchTitle: '预算科目', // 查询弹窗标题 searchAllSchemas: SubjectAccount.allSchemas, // 查询弹窗所需类 searchPage: SubjectAccountApi.getSubjectAccountPage, // 查询弹窗所需分页方法 searchCondition: [{ @@ -270,7 +270,7 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive([ isInpuFocusShow: true, // 开启查询弹窗 searchListPlaceholder: '请选择QAD项目信息', searchField: 'projectCode', - searchTitle: '领用原因代码', + searchTitle: '预算科目', searchAllSchemas: QadProject.allSchemas, searchPage: QadProjectApi.getQadProjectPage, verificationParams: [{ @@ -289,7 +289,7 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive([ isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择QAD项目信息', // 输入框占位文本 searchField: 'projectCode', // 查询弹窗赋值字段 - searchTitle: '领用原因代码', // 查询弹窗标题 + searchTitle: '预算科目', // 查询弹窗标题 searchAllSchemas: QadProject.allSchemas, // 查询弹窗所需类 searchPage: QadProjectApi.getQadProjectPage, // 查询弹窗所需分页方法 searchCondition: [{ @@ -677,7 +677,7 @@ export const UnplannedissueRequestMainRules = reactive({ { required: false, message: '请输入成本中心类型', trigger: 'blur' } ], reasonCodeRequisition: [ - { required: true, message: '请输入领用原因代码', trigger: 'blur' } + { required: true, message: '请输入预算科目', trigger: 'blur' } ], projectCode: [ { required: false, message: '请输入项目代码', trigger: 'blur' } diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts index 6f40ec328..05520b362 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts @@ -661,28 +661,28 @@ export const UnplannedreceiptRecordDetail = useCrudSchemas(reactive } if (formField == 'productionLineCode') { //生产线 - let res = await WorkstationApi.getWorkstationPage({ - productionLineCode: val[0][searchField], - pageSize: 20, - pageNo: 1 - }) - if(res&&res.list&&res.list.length>0){ - setV['workStationCode'] = res.list[0].code - } + // let res = await WorkstationApi.getWorkstationPage({ + // productionLineCode: val[0][searchField], + // pageSize: 20, + // pageNo: 1 + // }) + // if(res&&res.list&&res.list.length>0){ + // setV['workStationCode'] = res.list[0].code + // } tableData.value =[] } if (formField == 'workStationCode') { diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue index f7c6a612f..8d3ebdc53 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue +++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue @@ -265,7 +265,7 @@ function addDay(date: Date | number, addDay: number) { } // 查询页面返回 const searchTableSuccess = (formField, searchField, val, formRef, type, row) => { - nextTick(() => { + nextTick(async() => { if (type == 'tableForm') { if (formField == 'secondPackUnit') { row['secondPackUnit'] = val[0]['packUnit'] @@ -282,6 +282,29 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) => } const index1 = 0 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 { row[formField] = val[0][searchField] } diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts index 944c9e269..b05c0f139 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts +++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts @@ -1113,6 +1113,9 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive table: { width: 150 }, + tableForm: { + disabled: false + } }, { label: '品名', diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue index 471af50a7..aaca13711 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue @@ -159,6 +159,8 @@ import * as WorkshopApi from '@/api/wms/workshop' import * as ConfigApi from '@/api/infra/config' import { usePageLoading } from '@/hooks/web/usePageLoading' 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() // 装配收货申请 // 号口品收货申请 @@ -226,7 +228,7 @@ const onChange = (field, cur) => { // 查询页面返回 const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => { console.log('searchTableSuccess',formField, searchField, val, formRef, type, row) - nextTick(() => { + nextTick(async() => { if (type == 'tableForm') { if (formField == 'secondPackUnit') { row['secondPackUnit'] = val[0]['packUnit'] @@ -243,7 +245,30 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => } const index1 = 0 setTableFormsValues(val, index1) - } else{ + } 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{ row[formField] = val[0][searchField] } } else { diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts index 9c93172af..56b90b895 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts @@ -1170,6 +1170,9 @@ export const ProductreceiptRequestDetail = useCrudSchemas( sortTableDefault: 1006, table: { width: 150 + }, + tableForm: { + disabled:false } }, { diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts index 065d08724..7e741db42 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts @@ -2645,13 +2645,14 @@ export const PurchasereceiptRequestPackage = useCrudSchemas(reactive{ getList() importTemplateData.templateUrl = await PurchasePlanMainApi.importTemplate() nextTick(()=>{ - tableColumns.value=tableColumns.value.filter(item=>item.field!='shippedQty') + // tableColumns.value=tableColumns.value.filter(item=>item.field!='shippedQty') }) }) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue index 8df74c883..191820308 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue @@ -8,6 +8,7 @@ ]" @search="setSearchParams" @reset="setSearchParams" + :formClassNames="['dateSearch']" />