diff --git a/src/api/home/index.ts b/src/api/home/index.ts index aa8cb1388..dee170023 100644 --- a/src/api/home/index.ts +++ b/src/api/home/index.ts @@ -20,3 +20,40 @@ export const getProductData = async () => { return await request.get({ url: `/wms/index/indexProduct` }) } +// 超期库存预警 +export const getOverdueBalance = async (params) => { + return await request.get({ url: `/wms/index/pageOverdueBalance`,params }) +} + +// 呆滞库存预警 +export const getStagnantBalance = async (params) => { + return await request.get({ url: `/wms/index/pageStagnantBalance` ,params}) +} +// 高低储预警 +export const getWarningBalance = async (params) => { + return await request.get({ url: `/wms/index/pageWarningBalance` ,params}) +} + +// 本月退货明细 +export const getPurchasereturnRecordMonth = async (params) => { + return await request.get({ url: `/wms/index/pagePurchasereturnRecordMonth`,params }) +} + +// 本月索赔明细 +export const getPurchaseclaimRecordMonth = async (params) => { + return await request.get({ url: `/wms/index/pagePurchaseclaimRecordMonth`,params }) +} + +// 今日生产计划 +export const getProductionToday = async (params) => { + return await request.get({ url: `/wms/index/pageProductionToday`,params }) +} + +// 线边安全库存 +export const getSafeLocation = async (params) => { + return await request.get({ url: `/wms/index/pageSafeLocation`,params }) +} +// 待上架成品库存 +export const getProductputawayJobDetail = async (params) => { + return await request.get({ url: `/wms/index/pageProductputawayJobDetail`,params }) +} \ No newline at end of file diff --git a/src/api/wms/inventoryinitRecordDetail/index.ts b/src/api/wms/inventoryinitRecordDetail/index.ts index c789ca497..fe2d27f22 100644 --- a/src/api/wms/inventoryinitRecordDetail/index.ts +++ b/src/api/wms/inventoryinitRecordDetail/index.ts @@ -72,4 +72,9 @@ export const exportInventoryinitRecordDetail = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/inventoryinit-record-detail/get-import-template' }) +} + +// 批量打印 +export const printLabelBatchByIdSelection = async (data: any) => { + return await request.post({ url: `/wms/inventoryinit-record-main/printLabelBatchById` ,data}) } \ No newline at end of file diff --git a/src/api/wms/unplannedissueRecordDetail/index.ts b/src/api/wms/unplannedissueRecordDetail/index.ts index b72dd7835..9e508c4ae 100644 --- a/src/api/wms/unplannedissueRecordDetail/index.ts +++ b/src/api/wms/unplannedissueRecordDetail/index.ts @@ -38,6 +38,9 @@ export const getUnplannedissueRecordDetailPage = async (params) => { 'action':'==', 'value':'1' } + if(!data.filters){ + data.filters = [] + } data.filters.push(dataTypeCondition) return await request.post({ url: '/wms/unplannedissue-record-detail/senior', data }) } else { diff --git a/src/api/wms/unplannedissueRequestDetail/index.ts b/src/api/wms/unplannedissueRequestDetail/index.ts index be5249f00..99adb86f7 100644 --- a/src/api/wms/unplannedissueRequestDetail/index.ts +++ b/src/api/wms/unplannedissueRequestDetail/index.ts @@ -33,6 +33,9 @@ export const getUnplannedissueRequestDetailPage = async (params) => { 'action':'==', 'value':'1' } + if(!data.filters){ + data.filters = []; + } data.filters.push(dataTypeCondition) return await request.post({ url: '/wms/unplannedissue-request-detail/senior', data }) } else { diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue index 716e2006a..c34237694 100644 --- a/src/components/BasicForm/src/BasicForm.vue +++ b/src/components/BasicForm/src/BasicForm.vue @@ -130,6 +130,7 @@ import ButtonBase from '@/components/XButton/src/ButtonBase.vue' import TableForm from '@/components/TableForm/src/TableForm.vue' import TableFormCountPlan from '@/components/TableFormCountPlan/src/TableFormCountPlan.vue' import { DICT_TYPE, getStrDictOptions } from '@/utils/dict' +import { debounce } from 'lodash-es' const props = defineProps({ // 显示窗口宽度设置 @@ -565,7 +566,9 @@ const buttonBaseClick = (val) => { } // 保存 else if (val == 'save') { - submitForm() + debounce(() => { + submitForm() + }, 2000)() } // 关闭 else if (val == 'close') { diff --git a/src/config/axios/config.ts b/src/config/axios/config.ts index 811650873..9bf0a928a 100644 --- a/src/config/axios/config.ts +++ b/src/config/axios/config.ts @@ -16,7 +16,7 @@ const config: { /** * 接口请求超时时间 */ - request_timeout: 30000, + request_timeout: 300000, /** * 默认接口请求类型 diff --git a/src/utils/disposition/defaultButtons.ts b/src/utils/disposition/defaultButtons.ts index 77d1d6bb5..522bd47f7 100644 --- a/src/utils/disposition/defaultButtons.ts +++ b/src/utils/disposition/defaultButtons.ts @@ -492,7 +492,19 @@ export function mainListOrderPubBtn(option:any) { hasPermi: '' }) } - +// 主列表-订单流程-批量发布按钮 +export function mainListSelectionOrderPubBtn(option:any) { + return __defaultBtnOption(option,{ + label: t(`ts.发布`).replace('ts.', ''), + name: 'mainOrderSelectionPub', + hide: false, + type: 'primary', + color: '', + float:'left', + link: false, // 文本展现按钮 + hasPermi: '' + }) +} // 主列表-订单流程-关闭按钮 export function mainListOrderCloBtn(option:any) { return __defaultBtnOption(option,{ diff --git a/src/views/wms/basicDataManage/factoryModeling/dock/dock.data.ts b/src/views/wms/basicDataManage/factoryModeling/dock/dock.data.ts index 3e4336b4b..dc7067c81 100644 --- a/src/views/wms/basicDataManage/factoryModeling/dock/dock.data.ts +++ b/src/views/wms/basicDataManage/factoryModeling/dock/dock.data.ts @@ -80,6 +80,7 @@ export const Dock = useCrudSchemas(reactive([ form: { // labelMessage: '信息提示说明!!!', componentProps: { + enterSearch:true, isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择库位代码', // 输入框占位文本 searchField: 'code', // 查询弹窗赋值字段 diff --git a/src/views/wms/basicDataManage/factoryModeling/dock/index.vue b/src/views/wms/basicDataManage/factoryModeling/dock/index.vue index c1b8ee9e8..4a806e1d0 100644 --- a/src/views/wms/basicDataManage/factoryModeling/dock/index.vue +++ b/src/views/wms/basicDataManage/factoryModeling/dock/index.vue @@ -48,6 +48,7 @@ :apiCreate="DockApi.createDock" @searchTableSuccess="searchTableSuccess" :isBusiness="false" + @onEnter="onEnter" /> @@ -66,6 +67,8 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons' import TableHead from '@/components/TableHead/src/TableHead.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue' import Detail from '@/components/Detail/src/Detail.vue' +import * as LocationApi from '@/api/wms/location' +import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data' defineOptions({ name: 'Dock' }) @@ -164,6 +167,26 @@ const openForm = (type: string, row?: any) => { } basicFormRef.value.open(type, row) } +const onEnter = async (field,value)=>{ + console.log('onEnter',field,value) + if('defaultLocationCode'==field){ + //物料代码 + basicFormRef.value.opensearchTable('itemCode', 'code', '库位信息', Location.allSchemas, LocationApi.getLocationPage,[{ + key: 'available', + value: 'TRUE', + action: '==', + isSearch: true, + isMainValue: false + },{ + key: 'code', + value: value, + action: '==', + isSearch: true, + isMainValue: false + }]) + + } +} // 查询页面返回 const searchTableSuccess = (formField, searchField, val, formRef) => { diff --git a/src/views/wms/basicDataManage/orderManage/team/team.data.ts b/src/views/wms/basicDataManage/orderManage/team/team.data.ts index f2e67fdcc..c3b374686 100644 --- a/src/views/wms/basicDataManage/orderManage/team/team.data.ts +++ b/src/views/wms/basicDataManage/orderManage/team/team.data.ts @@ -76,8 +76,8 @@ export const Team = useCrudSchemas(reactive([ field: 'available', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, - isSearch: true, + isTable: false, + isSearch: false, sort: 'custom', form: { component: 'Switch', diff --git a/src/views/wms/basicDataManage/subject/subjectAccount/subjectAccount.data.ts b/src/views/wms/basicDataManage/subject/subjectAccount/subjectAccount.data.ts index ecbea2fd0..277aafb1d 100644 --- a/src/views/wms/basicDataManage/subject/subjectAccount/subjectAccount.data.ts +++ b/src/views/wms/basicDataManage/subject/subjectAccount/subjectAccount.data.ts @@ -152,6 +152,15 @@ export const SubjectAccount = useCrudSchemas(reactive([ defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] } }, + form: { + component: 'DatePicker', + componentProps: { + style: {width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + }, isForm: false, }, { diff --git a/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts b/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts index ce3dc3ce0..32950081e 100644 --- a/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts +++ b/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts @@ -24,15 +24,15 @@ export const CountadjustRecordMain = useCrudSchemas(reactive([ }, isSearch: true }, - { - label: '盘点记录单号', - field: 'countRecordNumber', - sort: 'custom', - table: { - width: 180 - }, - isSearch: true - }, + // { + // label: '盘点记录单号', + // field: 'countRecordNumber', + // sort: 'custom', + // table: { + // width: 180 + // }, + // isSearch: true + // }, { label: '仓库代码', field: 'warehouseCode', @@ -214,7 +214,7 @@ export const CountadjustRecordMain = useCrudSchemas(reactive([ field: 'available', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isSearch: true, + isSearch: false, isTable: true, form: { component: 'Switch', diff --git a/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts b/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts index 1f92d5613..32cfaf266 100644 --- a/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts +++ b/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts @@ -55,16 +55,16 @@ export const CountadjustRequestMain = useCrudSchemas(([ }, }, - { - label: '申请单号', - field: 'requestNumber', - sort: 'custom', - table: { - width: 150 - }, - isSearch: true, - isForm: false, - }, + // { + // label: '申请单号', + // field: 'requestNumber', + // sort: 'custom', + // table: { + // width: 150 + // }, + // isSearch: true, + // isForm: false, + // }, { label: '盘点记录单号', field: 'countRecordNumber', diff --git a/src/views/wms/inventoryManage/balance/index.vue b/src/views/wms/inventoryManage/balance/index.vue index bc9a950bc..c546435e2 100644 --- a/src/views/wms/inventoryManage/balance/index.vue +++ b/src/views/wms/inventoryManage/balance/index.vue @@ -173,8 +173,14 @@ const handleSelectionPoint = async ()=>{ rows = [...rows,...item.selectionRows.map(item1=>item1.packingNumber)] }) console.log('批量打印',rows.join(',')) + let getLoading = ElLoading.service({ + lock: true, + text: 'loading...', + background: 'rgba(0, 0, 0, 0.7)' + }) PackageApi.getBalanceToPackageSelection(rows).then(res => { console.log('res',res); + getLoading?.close() if(res.zzLabel){ //制造标签 const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken()) @@ -188,6 +194,7 @@ const handleSelectionPoint = async ()=>{ }).catch(err => { console.log(err) + getLoading?.close() }) // window.open(srcPoint.value+'&relateNumber='+rows.join(',')) } diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/index.vue b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/index.vue index a7125d120..96032625d 100644 --- a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/index.vue +++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/index.vue @@ -1,7 +1,7 @@