From d46f5cfcd52a864682fce9b6c47837f56827ad12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E8=83=9C=E6=A5=A0?= <2792649152@qq.com> Date: Mon, 13 Nov 2023 16:42:31 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=86=85=E4=BD=9C=E4=B8=9A=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventoryinitRequestMain/index.vue | 34 ++-- .../inventoryinitRequestMain.data.ts | 187 ++++++++++++++++-- .../scrap/scrapRequestMain/index.vue | 44 ++--- .../scrapRequestMain/scrapRequestMain.data.ts | 92 +++++++-- .../transferissueRequestMain/index.vue | 48 +++-- .../transferissueRequestMain.data.ts | 154 ++++++++++++--- .../unplannedissueRequestMain/index.vue | 48 +++-- .../unplannedissueRequestMain.data.ts | 91 +++++++-- .../unplannedreceiptRequestMain/index.vue | 56 +++--- .../unplannedreceiptRequestMain.data.ts | 124 ++++++++++-- 10 files changed, 673 insertions(+), 205 deletions(-) diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue index eb9af9f68..eaf565e19 100644 --- a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue @@ -44,7 +44,6 @@ @success="getList" :rules="InventoryinitRequestMainRules" :formAllSchemas="InventoryinitRequestMain.allSchemas" - :searchTableParams="searchTableParams" :tableAllSchemas="InventoryinitRequestDetail.allSchemas" :tableFormRules="InventoryinitRequestDetailRules" :tableData="tableData" @@ -64,12 +63,12 @@ :allSchemas="InventoryinitRequestMain.allSchemas" :detailAllSchemas="InventoryinitRequestDetail.allSchemas" :detailAllSchemasRules="InventoryinitRequestDetailRules" - :searchTableParams="searchTableParams" :apiCreate="InventoryinitRequestDetailApi.createInventoryinitRequestDetail" :apiUpdate="InventoryinitRequestDetailApi.updateInventoryinitRequestDetail" :apiPage="InventoryinitRequestDetailApi.getInventoryinitRequestDetailPage" :apiDelete="InventoryinitRequestDetailApi.deleteInventoryinitRequestDetail" :Echo="Echo" + @searchTableSuccessDetail="searchTableSuccessDetail" /> @@ -99,32 +98,12 @@ const updataTableColumns = (val) => { tableColumns.value = val } -// 查询列表页面参数设置 -const searchTableParams = ref([ -//{ -// formField: 'productItemCode', -// searchTableTitle: '物料信息', -// searchTableAllSchemas: Itembasic.allSchemas, -// searchTablePage: ItembasicApi.getItembasicPage -//} -]) - // 查询页面返回 const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => { nextTick(() => { if (type == 'tableForm') { // 明细查询页赋值 - //row[formField] = val[0][searchField] - //row['poLine'] = val[0]['poLine'] - //row['batch'] = val[0]['toBatch'] - //row['altBatch'] = val[0]['altBatch'] - //row['itemCode'] = val[0]['itemCode'] - //row['itemName'] = val[0]['itemName'] - //row['itemDesc1'] = val[0]['itemDesc1'] - //row['itemDesc2'] = val[0]['itemDesc2'] - //row['projectCode'] = val[0]['projectCode'] - //row['qty'] = val[0]['qty'] - //row['uom'] = val[0]['uom'] + row[formField] = val[0][searchField] } else { const setV = {} setV[formField] = val[0][searchField] @@ -134,6 +113,15 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => } }) } +// 查询页面返回——详情 +const searchTableSuccessDetail = (formField, searchField, val, formRef ) => { + nextTick(() => { + const setV = {} + setV[formField] = val[0][searchField] + formRef.setValues(setV) + }) +} + // 子表新增的时候选择表格之后需要会显得字段 // const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom'] const Echo = [] diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts index b16bb36af..12e412df0 100644 --- a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts @@ -1,8 +1,21 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' import { dateFormatter } from '@/utils/formatTime' -const { t } = useI18n() // 国际化 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 ItembasicApi from '@/api/wms/itembasic' +import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data' + +import * as OwnerApi from '@/api/wms/owner' +import { Owner } from '@/views/wms/basicDataManage/orderManage/owner/owner.data' + +const { t } = useI18n() // 国际化 + // 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值 const queryParams = { pageSize:10, @@ -29,6 +42,17 @@ export const InventoryinitRequestMain = useCrudSchemas(reactive([ width: 150 }, isSearch: true, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择仓库代码', // 输入框占位文本 + searchField: 'code', // 查询弹窗赋值字段 + searchTitle: '仓库信息', // 查询弹窗标题 + searchAllSchemas: Warehouse.allSchemas, // 查询弹窗所需类 + searchPage: WarehouseApi.getWarehousePage // 查询弹窗所需分页方法 + } + } }, { label: '单据号', @@ -39,6 +63,7 @@ export const InventoryinitRequestMain = useCrudSchemas(reactive([ fixed: 'left' }, isSearch: true, + isForm: false, }, { label: '业务类型', @@ -52,7 +77,8 @@ export const InventoryinitRequestMain = useCrudSchemas(reactive([ componentProps: { disabled: true } - } + }, + isForm: false, }, { label: '备注', @@ -77,6 +103,7 @@ export const InventoryinitRequestMain = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { + style: {width:'100%'}, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', @@ -107,11 +134,13 @@ export const InventoryinitRequestMain = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { + style: {width:'100%'}, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', } }, + isForm: false, }, { label: '截止时间', @@ -127,6 +156,7 @@ export const InventoryinitRequestMain = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { + style: {width:'100%'}, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', @@ -179,6 +209,7 @@ export const InventoryinitRequestMain = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { + style: {width:'100%'}, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', @@ -307,9 +338,9 @@ export const InventoryinitRequestMainRules = reactive({ directCreateRecord: [ { required: true, message: '请选择是否跳过任务直接生成记录', trigger: 'change' } ], - businessType: [ - { required: true, message: '请输入业务类型', trigger: 'blur' } - ], + // businessType: [ + // { required: true, message: '请输入业务类型', trigger: 'blur' } + // ], }) /** @@ -323,6 +354,25 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive( table: { width: 150 }, + tableForm:{ + isInpuFocusShow: true, // 开启查询弹窗 + searchListPlaceholder: '请选择货主代码', + searchField: 'code', + searchTitle: '货主信息', + searchAllSchemas: Owner.allSchemas, + searchPage: OwnerApi.getOwnerPage + }, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择货主代码', + searchField: 'code', + searchTitle: '货主信息', + searchAllSchemas: Owner.allSchemas, + searchPage: OwnerApi.getOwnerPage + } + } }, { label: '包装号', @@ -370,11 +420,17 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive( form: { component: 'DatePicker', componentProps: { + style: {width:'100%'}, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', } }, + tableForm: { + type: 'FormDateTime', + format: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } }, { label: '生产日期', @@ -390,11 +446,17 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive( form: { component: 'DatePicker', componentProps: { + style: {width:'100%'}, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', } }, + tableForm: { + type: 'FormDateTime', + format: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } }, { label: '过期日期', @@ -410,11 +472,17 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive( form: { component: 'DatePicker', componentProps: { + style: {width:'100%'}, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', } }, + tableForm: { + type: 'FormDateTime', + format: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } }, { label: '库存状态', @@ -426,6 +494,9 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive( table: { width: 150 }, + tableForm: { + type: 'Select' + } }, { label: '库位代码', @@ -434,6 +505,25 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive( table: { width: 150 }, + tableForm:{ + isInpuFocusShow: true, // 开启查询弹窗 + searchListPlaceholder: '请选择库位代码', + searchField: 'code', + searchTitle: '库位信息', + searchAllSchemas: Location.allSchemas, + searchPage: LocationApi.getLocationPage + }, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择库位代码', + searchField: 'code', + searchTitle: '库位信息', + searchAllSchemas: Location.allSchemas, + searchPage: LocationApi.getLocationPage + } + } }, { label: '库位组代码', @@ -442,6 +532,8 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive( table: { width: 150 }, + isTableForm: false, + isForm: false, }, { label: '库区代码', @@ -450,6 +542,8 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive( table: { width: 150 }, + isTableForm: false, + isForm: false, }, { label: '标包数量', @@ -460,7 +554,18 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive( }, form: { component: 'InputNumber', - } + componentProps: { + min: 1, + precision: 6 + } + }, + tableForm: { + type: 'InputNumber', + min: 1, + precision: 6 + }, + isTableForm: false, + isForm: false, }, { label: '标包单位', @@ -472,6 +577,11 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive( table: { width: 150 }, + tableForm: { + type: 'Select' + }, + isTableForm: false, + isForm: false, }, { label: '单据号', @@ -494,6 +604,25 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive( table: { width: 150 }, + tableForm:{ + isInpuFocusShow: true, // 开启查询弹窗 + searchListPlaceholder: '请选择物品代码', + searchField: 'code', + searchTitle: '物品基础信息', + searchAllSchemas: Itembasic.allSchemas, + searchPage: ItembasicApi.getItembasicPage + }, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择物品代码', + searchField: 'code', + searchTitle: '物品基础信息', + searchAllSchemas: Itembasic.allSchemas, + searchPage: ItembasicApi.getItembasicPage + } + } }, { label: '备注', @@ -517,6 +646,7 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive( form: { component: 'DatePicker', componentProps: { + style: {width:'100%'}, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', @@ -542,6 +672,8 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive( table: { width: 150 }, + isTableForm: false, + isForm: false }, { label: '物品描述1', @@ -550,6 +682,8 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive( table: { width: 150 }, + isTableForm: false, + isForm: false }, { label: '物品描述2', @@ -558,6 +692,8 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive( table: { width: 150 }, + isTableForm: false, + isForm: false }, { label: '项目代码', @@ -566,6 +702,8 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive( table: { width: 150 }, + isTableForm: false, + isForm: false }, { label: '数量', @@ -576,6 +714,15 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive( }, form: { component: 'InputNumber', + componentProps: { + min: 1, + precision: 6 + } + }, + tableForm: { + type: 'InputNumber', + min: 1, + precision: 6 } }, { @@ -588,6 +735,9 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive( table: { width: 150 }, + tableForm: { + type: 'Select' + } }, { label: '最后更新时间', @@ -603,6 +753,7 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive( form: { component: 'DatePicker', componentProps: { + style: {width:'100%'}, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', @@ -657,18 +808,18 @@ export const InventoryinitRequestDetailRules = reactive({ locationCode: [ { required: true, message: '请选择库位代码', trigger: 'change' } ], - locationGroupCode: [ - { required: true, message: '请选择库位组代码', trigger: 'change' } - ], - areaCode: [ - { required: true, message: '请选择库区代码', trigger: 'change' } - ], - stdPackQty: [ - { required: true, message: '请输入标包数量', trigger: 'blur' } - ], - stdPackUnit: [ - { required: true, message: '请选择标包单位', trigger: 'change' } - ], + // locationGroupCode: [ + // { required: true, message: '请选择库位组代码', trigger: 'change' } + // ], + // areaCode: [ + // { required: true, message: '请选择库区代码', trigger: 'change' } + // ], + // stdPackQty: [ + // { required: true, message: '请输入标包数量', trigger: 'blur' } + // ], + // stdPackUnit: [ + // { required: true, message: '请选择标包单位', trigger: 'change' } + // ], itemCode: [ { required: true, message: '请选择物品代码', trigger: 'change' } ], diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue index 3de523dbd..b9b0366c2 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue @@ -44,7 +44,6 @@ @success="getList" :rules="ScrapRequestMainRules" :formAllSchemas="ScrapRequestMain.allSchemas" - :searchTableParams="searchTableParams" :tableAllSchemas="ScrapRequestDetail.allSchemas" :tableFormRules="ScrapRequestDetailRules" :tableData="tableData" @@ -64,12 +63,12 @@ :allSchemas="ScrapRequestMain.allSchemas" :detailAllSchemas="ScrapRequestDetail.allSchemas" :detailAllSchemasRules="ScrapRequestDetailRules" - :searchTableParams="searchTableParams" :apiCreate="ScrapRequestDetailApi.createScrapRequestDetail" :apiUpdate="ScrapRequestDetailApi.updateScrapRequestDetail" :apiPage="ScrapRequestDetailApi.getScrapRequestDetailPage" :apiDelete="ScrapRequestDetailApi.deleteScrapRequestDetail" :Echo="Echo" + @searchTableSuccessDetail="searchTableSuccessDetail" /> @@ -99,41 +98,36 @@ const updataTableColumns = (val) => { tableColumns.value = val } -// 查询列表页面参数设置 -const searchTableParams = ref([ -//{ -// formField: 'productItemCode', -// searchTableTitle: '物料信息', -// searchTableAllSchemas: Itembasic.allSchemas, -// searchTablePage: ItembasicApi.getItembasicPage -//} -]) - // 查询页面返回 const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => { nextTick(() => { if (type == 'tableForm') { // 明细查询页赋值 - //row[formField] = val[0][searchField] - //row['poLine'] = val[0]['poLine'] - //row['batch'] = val[0]['toBatch'] - //row['altBatch'] = val[0]['altBatch'] - //row['itemCode'] = val[0]['itemCode'] - //row['itemName'] = val[0]['itemName'] - //row['itemDesc1'] = val[0]['itemDesc1'] - //row['itemDesc2'] = val[0]['itemDesc2'] - //row['projectCode'] = val[0]['projectCode'] - //row['qty'] = val[0]['qty'] - //row['uom'] = val[0]['uom'] + row[formField] = val[0][searchField] + row['packingNumber'] = val[0]['packingNumber'] + row['batch'] = val[0]['batch'] + row['fromLocationCode'] = val[0]['locationCode'] + row['itemCode'] = val[0]['itemCode'] } else { const setV = {} setV[formField] = val[0][searchField] - //setV['ppNumber'] = val[0]['ppNumber'] - //setV['supplierCode'] = val[0]['supplierCode'] formRef.setValues(setV) } }) } +// 查询页面返回——详情 +const searchTableSuccessDetail = (formField, searchField, val, formRef ) => { + nextTick(() => { + const setV = {} + setV[formField] = val[0][searchField] + setV['packingNumber'] = val[0]['packingNumber'] + setV['batch'] = val[0]['batch'] + setV['fromLocationCode'] = val[0]['locationCode'] + setV['itemCode'] = val[0]['itemCode'] + formRef.setValues(setV) + }) +} + // 子表新增的时候选择表格之后需要会显得字段 // const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom'] const Echo = [] diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts index d6176a76d..985413945 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts @@ -1,8 +1,12 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' import { dateFormatter } from '@/utils/formatTime' -const { t } = useI18n() // 国际化 import * as getRequestsettingApi from '@/api/wms/requestsetting/index' +import * as BalanceApi from '@/api/wms/balance' +import { Balance } from '@/views/wms/inventoryManage/balance/balance.data' + +const { t } = useI18n() // 国际化 + // 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值 const queryParams = { pageSize:10, @@ -29,6 +33,7 @@ export const ScrapRequestMain = useCrudSchemas(reactive([ width: 150 }, isSearch: true, + isForm: false, }, { label: '从库位类型范围', @@ -41,6 +46,7 @@ export const ScrapRequestMain = useCrudSchemas(reactive([ width: 150 }, isSearch: true, + isForm: false, }, { label: '从库区代码范围', @@ -49,6 +55,7 @@ export const ScrapRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + isForm: false, }, { label: '单据号', @@ -73,7 +80,8 @@ export const ScrapRequestMain = useCrudSchemas(reactive([ componentProps: { disabled: true } - } + }, + isForm: false, }, { label: '备注', @@ -98,6 +106,7 @@ export const ScrapRequestMain = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { + style: {width: '100%'}, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', @@ -128,11 +137,13 @@ export const ScrapRequestMain = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { + style: {width: '100%'}, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', } }, + isForm: false, }, { label: '截止时间', @@ -148,6 +159,7 @@ export const ScrapRequestMain = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { + style: {width: '100%'}, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', @@ -200,6 +212,7 @@ export const ScrapRequestMain = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { + style: {width: '100%'}, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', @@ -310,15 +323,15 @@ export const ScrapRequestMain = useCrudSchemas(reactive([ //表单校验 export const ScrapRequestMainRules = reactive({ - fromWarehouseCode: [ - { required: true, message: '请选择从仓库代码', trigger: 'change' } - ], - fromLocationTypes: [ - { required: true, message: '请选择从库位类型范围', trigger: 'change' } - ], - fromAreaCodes: [ - { required: true, message: '请选择从库区代码范围', trigger: 'change' } - ], + // fromWarehouseCode: [ + // { required: true, message: '请选择从仓库代码', trigger: 'change' } + // ], + // fromLocationTypes: [ + // { required: true, message: '请选择从库位类型范围', trigger: 'change' } + // ], + // fromAreaCodes: [ + // { required: true, message: '请选择从库区代码范围', trigger: 'change' } + // ], departmentCode: [ { required: true, message: '请输入部门', trigger: 'blur' } ], @@ -334,9 +347,9 @@ export const ScrapRequestMainRules = reactive({ directCreateRecord: [ { required: true, message: '请选择是否跳过任务直接生成记录', trigger: 'change' } ], - businessType: [ - { required: true, message: '请输入业务类型', trigger: 'blur' } - ], + // businessType: [ + // { required: true, message: '请输入业务类型', trigger: 'blur' } + // ], }) /** @@ -350,6 +363,8 @@ export const ScrapRequestDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTableForm: false, + isForm: false, }, { label: '包装号', @@ -358,6 +373,25 @@ export const ScrapRequestDetail = useCrudSchemas(reactive([ table: { width: 150 }, + tableForm:{ + isInpuFocusShow: true, // 开启查询弹窗 + searchListPlaceholder: '请选择包装号', + searchField: 'packingNumber', + searchTitle: '库存余额信息', + searchAllSchemas: Balance.allSchemas, + searchPage: BalanceApi.getBalancePage + }, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择包装号', + searchField: 'packingNumber', + searchTitle: '库存余额信息', + searchAllSchemas: Balance.allSchemas, + searchPage: BalanceApi.getBalancePage + } + } }, { label: '器具号', @@ -393,6 +427,11 @@ export const ScrapRequestDetail = useCrudSchemas(reactive([ table: { width: 150 }, + tableForm: { + type: 'Select', + }, + isTableForm: false, + isForm: false, }, { label: '原因', @@ -404,6 +443,9 @@ export const ScrapRequestDetail = useCrudSchemas(reactive([ table: { width: 150 }, + tableForm: { + type: 'Select' + } }, { label: '物品名称', @@ -412,6 +454,8 @@ export const ScrapRequestDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTableForm: false, + isForm: false, }, { label: '物品描述1', @@ -420,6 +464,8 @@ export const ScrapRequestDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTableForm: false, + isForm: false, }, { label: '物品描述2', @@ -428,6 +474,8 @@ export const ScrapRequestDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTableForm: false, + isForm: false, }, { label: '数量', @@ -438,6 +486,15 @@ export const ScrapRequestDetail = useCrudSchemas(reactive([ }, form: { component: 'InputNumber', + componentProps: { + min: 1, + precision: 6 + } + }, + tableForm: { + type: 'InputNumber', + min: 1, + precision: 6 } }, { @@ -447,6 +504,8 @@ export const ScrapRequestDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTableForm: false, + isForm: false, }, { label: '计量单位', @@ -458,6 +517,9 @@ export const ScrapRequestDetail = useCrudSchemas(reactive([ table: { width: 150 }, + tableForm: { + type: 'Select' + } }, { label: '最后更新时间', @@ -473,6 +535,7 @@ export const ScrapRequestDetail = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { + style: {width: '100%'}, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', @@ -535,6 +598,7 @@ export const ScrapRequestDetail = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { + style: {width: '100%'}, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', diff --git a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue index 12881027c..e03e12eb2 100644 --- a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue @@ -44,7 +44,6 @@ @success="getList" :rules="TransferissueRequestMainRules" :formAllSchemas="TransferissueRequestMain.allSchemas" - :searchTableParams="searchTableParams" :tableAllSchemas="TransferissueRequestDetail.allSchemas" :tableFormRules="TransferissueRequestDetailRules" :tableData="tableData" @@ -64,12 +63,12 @@ :allSchemas="TransferissueRequestMain.allSchemas" :detailAllSchemas="TransferissueRequestDetail.allSchemas" :detailAllSchemasRules="TransferissueRequestDetailRules" - :searchTableParams="searchTableParams" :apiCreate="TransferissueRequestDetailApi.createTransferissueRequestDetail" :apiUpdate="TransferissueRequestDetailApi.updateTransferissueRequestDetail" :apiPage="TransferissueRequestDetailApi.getTransferissueRequestDetailPage" :apiDelete="TransferissueRequestDetailApi.deleteTransferissueRequestDetail" :Echo="Echo" + @searchTableSuccessDetail="searchTableSuccessDetail" /> @@ -99,41 +98,40 @@ const updataTableColumns = (val) => { tableColumns.value = val } -// 查询列表页面参数设置 -const searchTableParams = ref([ -//{ -// formField: 'productItemCode', -// searchTableTitle: '物料信息', -// searchTableAllSchemas: Itembasic.allSchemas, -// searchTablePage: ItembasicApi.getItembasicPage -//} -]) - // 查询页面返回 const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => { nextTick(() => { if (type == 'tableForm') { // 明细查询页赋值 - //row[formField] = val[0][searchField] - //row['poLine'] = val[0]['poLine'] - //row['batch'] = val[0]['toBatch'] - //row['altBatch'] = val[0]['altBatch'] - //row['itemCode'] = val[0]['itemCode'] - //row['itemName'] = val[0]['itemName'] - //row['itemDesc1'] = val[0]['itemDesc1'] - //row['itemDesc2'] = val[0]['itemDesc2'] - //row['projectCode'] = val[0]['projectCode'] - //row['qty'] = val[0]['qty'] - //row['uom'] = val[0]['uom'] + row[formField] = val[0][searchField] + row['packingNumber'] = val[0]['packingNumber'] + row['containerNumber'] = val[0]['containerNumber'] + row['batch'] = val[0]['batch'] + row['inventoryStatus'] = val[0]['inventoryStatus'] + row['toLocationCode'] = val[0]['locationCode'] + row['itemCode'] = val[0]['itemCode'] } else { const setV = {} setV[formField] = val[0][searchField] - //setV['ppNumber'] = val[0]['ppNumber'] - //setV['supplierCode'] = val[0]['supplierCode'] formRef.setValues(setV) } }) } +// 查询页面返回——详情 +const searchTableSuccessDetail = (formField, searchField, val, formRef ) => { + nextTick(() => { + const setV = {} + setV[formField] = val[0][searchField] + setV['packingNumber'] = val[0]['packingNumber'] + setV['containerNumber'] = val[0]['containerNumber'] + setV['batch'] = val[0]['batch'] + setV['inventoryStatus'] = val[0]['inventoryStatus'] + setV['toLocationCode'] = val[0]['locationCode'] + setV['itemCode'] = val[0]['itemCode'] + formRef.setValues(setV) + }) +} + // 子表新增的时候选择表格之后需要会显得字段 // const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom'] const Echo = [] diff --git a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts index f0dc0d4c4..cc72e633b 100644 --- a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts @@ -1,8 +1,18 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' import { dateFormatter } from '@/utils/formatTime' -const { t } = useI18n() // 国际化 import * as getRequestsettingApi from '@/api/wms/requestsetting/index' +import * as CarrierApi from '@/api/wms/carrier' +import { Carrier } from '@/views/wms/basicDataManage/orderManage/carrier/carrier.data' + +import * as DockApi from '@/api/wms/dock' +import { Dock } from '@/views/wms/basicDataManage/factoryModeling/dock/dock.data' + +import * as BalanceApi from '@/api/wms/balance' +import { Balance } from '@/views/wms/inventoryManage/balance/balance.data' + +const { t } = useI18n() // 国际化 + // 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值 const queryParams = { pageSize:10, @@ -28,6 +38,17 @@ export const TransferissueRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择承运商代码', // 输入框占位文本 + searchField: 'code', // 查询弹窗赋值字段 + searchTitle: '承运商信息', // 查询弹窗标题 + searchAllSchemas: Carrier.allSchemas, // 查询弹窗所需类 + searchPage: CarrierApi.getCarrierPage // 查询弹窗所需分页方法 + } + } }, { label: '运输方式', @@ -53,6 +74,7 @@ export const TransferissueRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + isForm: false, }, { label: '到仓库代码', @@ -61,6 +83,7 @@ export const TransferissueRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + isForm: false, }, { label: '从库位类型范围', @@ -73,6 +96,7 @@ export const TransferissueRequestMain = useCrudSchemas(reactive([ width: 150 }, isSearch: true, + isForm: false, }, { label: '到库位类型范围', @@ -84,6 +108,7 @@ export const TransferissueRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + isForm: false, }, { label: '从库区代码范围', @@ -92,6 +117,7 @@ export const TransferissueRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + isForm: false, }, { label: '到库区代码范围', @@ -100,6 +126,7 @@ export const TransferissueRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + isForm: false, }, { label: '从月台代码', @@ -108,6 +135,17 @@ export const TransferissueRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择从月台代码', // 输入框占位文本 + searchField: 'code', // 查询弹窗赋值字段 + searchTitle: '月台信息', // 查询弹窗标题 + searchAllSchemas: Dock.allSchemas, // 查询弹窗所需类 + searchPage: DockApi.getDockPage // 查询弹窗所需分页方法 + } + } }, { label: '单据号', @@ -132,7 +170,8 @@ export const TransferissueRequestMain = useCrudSchemas(reactive([ componentProps: { disabled: true } - } + }, + isForm: false, }, { label: '备注', @@ -157,6 +196,7 @@ export const TransferissueRequestMain = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { + style: {width: '100%'}, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', @@ -187,11 +227,13 @@ export const TransferissueRequestMain = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { + style: {width: '100%'}, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', } }, + isForm: false, }, { label: '截止时间', @@ -207,6 +249,7 @@ export const TransferissueRequestMain = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { + style: {width: '100%'}, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', @@ -259,6 +302,7 @@ export const TransferissueRequestMain = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { + style: {width: '100%'}, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', @@ -369,24 +413,24 @@ export const TransferissueRequestMain = useCrudSchemas(reactive([ //表单校验 export const TransferissueRequestMainRules = reactive({ - fromWarehouseCode: [ - { required: true, message: '请选择从仓库代码', trigger: 'change' } - ], - fromLocationTypes: [ - { required: true, message: '请选择从库位类型范围', trigger: 'change' } - ], - fromAreaCode: [ - { required: true, message: '请选择从库区代码', trigger: 'change' } - ], - toWarehouseCode: [ - { required: true, message: '请选择到仓库代码', trigger: 'change' } - ], - toLocationTypes: [ - { required: true, message: '请选择到库位类型范围', trigger: 'change' } - ], - toAreaCodes: [ - { required: true, message: '请选择到库区代码范围', trigger: 'change' } - ], + // fromWarehouseCode: [ + // { required: true, message: '请选择从仓库代码', trigger: 'change' } + // ], + // fromLocationTypes: [ + // { required: true, message: '请选择从库位类型范围', trigger: 'change' } + // ], + // fromAreaCode: [ + // { required: true, message: '请选择从库区代码', trigger: 'change' } + // ], + // toWarehouseCode: [ + // { required: true, message: '请选择到仓库代码', trigger: 'change' } + // ], + // toLocationTypes: [ + // { required: true, message: '请选择到库位类型范围', trigger: 'change' } + // ], + // toAreaCodes: [ + // { required: true, message: '请选择到库区代码范围', trigger: 'change' } + // ], departmentCode: [ { required: true, message: '请输入部门', trigger: 'blur' } ], @@ -402,9 +446,9 @@ export const TransferissueRequestMainRules = reactive({ directCreateRecord: [ { required: true, message: '请选择是否跳过任务直接生成记录', trigger: 'change' } ], - businessType: [ - { required: true, message: '请输入业务类型', trigger: 'blur' } - ], + // businessType: [ + // { required: true, message: '请输入业务类型', trigger: 'blur' } + // ], }) /** @@ -418,6 +462,25 @@ export const TransferissueRequestDetail = useCrudSchemas(reactive( table: { width: 150 }, + tableForm:{ + isInpuFocusShow: true, // 开启查询弹窗 + searchListPlaceholder: '请选择包装号', + searchField: 'packingNumber', + searchTitle: '库存余额信息', + searchAllSchemas: Balance.allSchemas, + searchPage: BalanceApi.getBalancePage + }, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择包装号', + searchField: 'packingNumber', + searchTitle: '库存余额信息', + searchAllSchemas: Balance.allSchemas, + searchPage: BalanceApi.getBalancePage + } + } }, { label: '器具号', @@ -426,6 +489,9 @@ export const TransferissueRequestDetail = useCrudSchemas(reactive( table: { width: 150 }, + tableForm: { + disabled: true + } }, { label: '批次', @@ -434,6 +500,9 @@ export const TransferissueRequestDetail = useCrudSchemas(reactive( table: { width: 150 }, + tableForm: { + disabled: true + } }, { label: '库存状态', @@ -445,6 +514,10 @@ export const TransferissueRequestDetail = useCrudSchemas(reactive( table: { width: 150 }, + tableForm: { + disabled: true, + type: 'Select' + } }, { label: '从货主代码', @@ -453,6 +526,8 @@ export const TransferissueRequestDetail = useCrudSchemas(reactive( table: { width: 150 }, + isTableForm: false, + isForm: false, }, { label: '到货主代码', @@ -461,6 +536,8 @@ export const TransferissueRequestDetail = useCrudSchemas(reactive( table: { width: 150 }, + isTableForm: false, + isForm: false, }, { label: '到库位代码', @@ -469,6 +546,9 @@ export const TransferissueRequestDetail = useCrudSchemas(reactive( table: { width: 150 }, + tableForm: { + disabled: true, + } }, { label: '单据号', @@ -491,6 +571,7 @@ export const TransferissueRequestDetail = useCrudSchemas(reactive( table: { width: 150 }, + isTable: false, }, { label: '创建者', @@ -516,6 +597,7 @@ export const TransferissueRequestDetail = useCrudSchemas(reactive( form: { component: 'DatePicker', componentProps: { + style: {width: '100%'}, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', @@ -531,6 +613,9 @@ export const TransferissueRequestDetail = useCrudSchemas(reactive( table: { width: 150 }, + tableForm: { + disabled: true + } }, { label: '物品名称', @@ -539,6 +624,8 @@ export const TransferissueRequestDetail = useCrudSchemas(reactive( table: { width: 150 }, + isTableForm: false, + isForm: false }, { label: '物品描述1', @@ -547,6 +634,8 @@ export const TransferissueRequestDetail = useCrudSchemas(reactive( table: { width: 150 }, + isTableForm: false, + isForm: false }, { label: '物品描述2', @@ -555,6 +644,8 @@ export const TransferissueRequestDetail = useCrudSchemas(reactive( table: { width: 150 }, + isTableForm: false, + isForm: false }, { label: '项目代码', @@ -563,6 +654,8 @@ export const TransferissueRequestDetail = useCrudSchemas(reactive( table: { width: 150 }, + isTableForm: false, + isForm: false }, { label: '数量', @@ -573,7 +666,16 @@ export const TransferissueRequestDetail = useCrudSchemas(reactive( }, form: { component: 'InputNumber', - } + componentProps: { + min: 1, + precision: 6, + } + }, + tableForm: { + type: 'InputNumber', + min: 1, + precision: 6, + }, }, { label: '计量单位', @@ -585,6 +687,9 @@ export const TransferissueRequestDetail = useCrudSchemas(reactive( table: { width: 150 }, + tableForm: { + type: 'Select' + } }, { label: '最后更新者', @@ -610,6 +715,7 @@ export const TransferissueRequestDetail = useCrudSchemas(reactive( form: { component: 'DatePicker', componentProps: { + style: {width: '100%'}, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue index b9dec009b..3831ca8d5 100644 --- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue @@ -44,7 +44,6 @@ @success="getList" :rules="UnplannedissueRequestMainRules" :formAllSchemas="UnplannedissueRequestMain.allSchemas" - :searchTableParams="searchTableParams" :tableAllSchemas="UnplannedissueRequestDetail.allSchemas" :tableFormRules="UnplannedissueRequestDetailRules" :tableData="tableData" @@ -64,12 +63,12 @@ :allSchemas="UnplannedissueRequestMain.allSchemas" :detailAllSchemas="UnplannedissueRequestDetail.allSchemas" :detailAllSchemasRules="UnplannedissueRequestDetailRules" - :searchTableParams="searchTableParams" :apiCreate="UnplannedissueRequestDetailApi.createUnplannedissueRequestDetail" :apiUpdate="UnplannedissueRequestDetailApi.updateUnplannedissueRequestDetail" :apiPage="UnplannedissueRequestDetailApi.getUnplannedissueRequestDetailPage" :apiDelete="UnplannedissueRequestDetailApi.deleteUnplannedissueRequestDetail" :Echo="Echo" + @searchTableSuccessDetail="searchTableSuccessDetail" /> @@ -99,41 +98,40 @@ const updataTableColumns = (val) => { tableColumns.value = val } -// 查询列表页面参数设置 -const searchTableParams = ref([ -//{ -// formField: 'productItemCode', -// searchTableTitle: '物料信息', -// searchTableAllSchemas: Itembasic.allSchemas, -// searchTablePage: ItembasicApi.getItembasicPage -//} -]) - // 查询页面返回 const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => { nextTick(() => { if (type == 'tableForm') { // 明细查询页赋值 - //row[formField] = val[0][searchField] - //row['poLine'] = val[0]['poLine'] - //row['batch'] = val[0]['toBatch'] - //row['altBatch'] = val[0]['altBatch'] - //row['itemCode'] = val[0]['itemCode'] - //row['itemName'] = val[0]['itemName'] - //row['itemDesc1'] = val[0]['itemDesc1'] - //row['itemDesc2'] = val[0]['itemDesc2'] - //row['projectCode'] = val[0]['projectCode'] - //row['qty'] = val[0]['qty'] - //row['uom'] = val[0]['uom'] + row[formField] = val[0][searchField] + row['packingNumber'] = val[0]['packingNumber'] + row['containerNumber'] = val[0]['containerNumber'] + row['batch'] = val[0]['batch'] + row['inventoryStatus'] = val[0]['inventoryStatus'] + row['fromLocationCode'] = val[0]['locationCode'] + row['itemCode'] = val[0]['itemCode'] } else { const setV = {} setV[formField] = val[0][searchField] - //setV['ppNumber'] = val[0]['ppNumber'] - //setV['supplierCode'] = val[0]['supplierCode'] formRef.setValues(setV) } }) } +// 查询页面返回——详情 +const searchTableSuccessDetail = (formField, searchField, val, formRef ) => { + nextTick(() => { + const setV = {} + setV[formField] = val[0][searchField] + setV['packingNumber'] = val[0]['packingNumber'] + setV['containerNumber'] = val[0]['containerNumber'] + setV['batch'] = val[0]['batch'] + setV['inventoryStatus'] = val[0]['inventoryStatus'] + setV['fromLocationCode'] = val[0]['locationCode'] + setV['itemCode'] = val[0]['itemCode'] + formRef.setValues(setV) + }) +} + // 子表新增的时候选择表格之后需要会显得字段 // const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom'] const Echo = [] diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts index 21f02c527..614eaf778 100644 --- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts @@ -1,8 +1,12 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' import { dateFormatter } from '@/utils/formatTime' -const { t } = useI18n() // 国际化 import * as getRequestsettingApi from '@/api/wms/requestsetting/index' +import * as BalanceApi from '@/api/wms/balance' +import { Balance } from '@/views/wms/inventoryManage/balance/balance.data' + +const { t } = useI18n() // 国际化 + // 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值 const queryParams = { pageSize:10, @@ -28,6 +32,7 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + isForm: false, }, { label: '从库位类型范围', @@ -40,6 +45,7 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive([ width: 150 }, isSearch: true, + isForm: false, }, { label: '从库区代码范围', @@ -49,6 +55,7 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive([ width: 150 }, isSearch: true, + isForm: false, }, { label: '单据号', @@ -73,7 +80,8 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive([ componentProps: { disabled: true } - } + }, + isForm: false, }, { label: '备注', @@ -98,6 +106,7 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { + style: {width:'100%'}, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', @@ -128,6 +137,7 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { + style: {width:'100%'}, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', @@ -148,6 +158,7 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { + style: {width:'100%'}, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', @@ -200,6 +211,7 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { + style: {width:'100%'}, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', @@ -310,15 +322,15 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive([ //表单校验 export const UnplannedissueRequestMainRules = reactive({ - fromWarehouseCode: [ - { required: true, message: '请选择从仓库代码', trigger: 'change' } - ], - fromLocationTypes: [ - { required: true, message: '请选择从库位类型范围', trigger: 'change' } - ], - fromAreaCodes: [ - { required: true, message: '请选择从库区代码范围', trigger: 'change' } - ], + // fromWarehouseCode: [ + // { required: true, message: '请选择从仓库代码', trigger: 'change' } + // ], + // fromLocationTypes: [ + // { required: true, message: '请选择从库位类型范围', trigger: 'change' } + // ], + // fromAreaCodes: [ + // { required: true, message: '请选择从库区代码范围', trigger: 'change' } + // ], departmentCode: [ { required: true, message: '请输入部门', trigger: 'blur' } ], @@ -350,6 +362,25 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive table: { width: 150 }, + tableForm:{ + isInpuFocusShow: true, // 开启查询弹窗 + searchListPlaceholder: '请选择包装号', + searchField: 'packingNumber', + searchTitle: '库存余额信息', + searchAllSchemas: Balance.allSchemas, + searchPage: BalanceApi.getBalancePage + }, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择包装号', + searchField: 'packingNumber', + searchTitle: '库存余额信息', + searchAllSchemas: Balance.allSchemas, + searchPage: BalanceApi.getBalancePage + } + } }, { label: '器具号', @@ -377,6 +408,9 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive table: { width: 150 }, + tableForm: { + type: 'Select' + } }, { label: '从货主代码', @@ -385,6 +419,8 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive table: { width: 150 }, + isForm: false, + isTableForm: false }, { label: '原因', @@ -396,6 +432,9 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive table: { width: 150 }, + tableForm: { + type: 'Select' + } }, { label: '从库位代码', @@ -451,6 +490,7 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive form: { component: 'DatePicker', componentProps: { + style: {width:'100%'}, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', @@ -474,6 +514,8 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive table: { width: 150 }, + isTableForm: false, + isForm: false, }, { label: '物品描述1', @@ -482,6 +524,8 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive table: { width: 150 }, + isTableForm: false, + isForm: false, }, { label: '物品描述2', @@ -490,6 +534,8 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive table: { width: 150 }, + isTableForm: false, + isForm: false, }, { label: '项目代码', @@ -498,6 +544,8 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive table: { width: 150 }, + isTableForm: false, + isForm: false, }, { label: '数量', @@ -508,6 +556,15 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive }, form: { component: 'InputNumber', + componentProps: { + min: 1, + precision: 6, + } + }, + tableForm: { + type: 'InputNumber', + min: 1, + precision: 6, } }, { @@ -520,6 +577,9 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive table: { width: 150 }, + tableForm: { + type: 'Select' + } }, { label: '最后更新者', @@ -542,6 +602,15 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive table: { width: 180 }, + form: { + component: 'DatePicker', + componentProps: { + style: {width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + }, isTableForm: false, isForm: false }, diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue index 57a09fbf4..6a890a23f 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue @@ -44,7 +44,6 @@ @success="getList" :rules="UnplannedreceiptRequestMainRules" :formAllSchemas="UnplannedreceiptRequestMain.allSchemas" - :searchTableParams="searchTableParams" :tableAllSchemas="UnplannedreceiptRequestDetail.allSchemas" :tableFormRules="UnplannedreceiptRequestDetailRules" :tableData="tableData" @@ -64,12 +63,12 @@ :allSchemas="UnplannedreceiptRequestMain.allSchemas" :detailAllSchemas="UnplannedreceiptRequestDetail.allSchemas" :detailAllSchemasRules="UnplannedreceiptRequestDetailRules" - :searchTableParams="searchTableParams" :apiCreate="UnplannedreceiptRequestDetailApi.createUnplannedreceiptRequestDetail" :apiUpdate="UnplannedreceiptRequestDetailApi.updateUnplannedreceiptRequestDetail" :apiPage="UnplannedreceiptRequestDetailApi.getUnplannedreceiptRequestDetailPage" :apiDelete="UnplannedreceiptRequestDetailApi.deleteUnplannedreceiptRequestDetail" :Echo="Echo" + @searchTableSuccessDetail="searchTableSuccessDetail" /> @@ -99,41 +98,48 @@ const updataTableColumns = (val) => { tableColumns.value = val } -// 查询列表页面参数设置 -const searchTableParams = ref([ -//{ -// formField: 'productItemCode', -// searchTableTitle: '物料信息', -// searchTableAllSchemas: Itembasic.allSchemas, -// searchTablePage: ItembasicApi.getItembasicPage -//} -]) - // 查询页面返回 const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => { nextTick(() => { if (type == 'tableForm') { // 明细查询页赋值 - //row[formField] = val[0][searchField] - //row['poLine'] = val[0]['poLine'] - //row['batch'] = val[0]['toBatch'] - //row['altBatch'] = val[0]['altBatch'] - //row['itemCode'] = val[0]['itemCode'] - //row['itemName'] = val[0]['itemName'] - //row['itemDesc1'] = val[0]['itemDesc1'] - //row['itemDesc2'] = val[0]['itemDesc2'] - //row['projectCode'] = val[0]['projectCode'] - //row['qty'] = val[0]['qty'] - //row['uom'] = val[0]['uom'] + row[formField] = val[0][searchField] + row['packingNumber'] = val[0]['packingNumber'] + row['containerNumber'] = val[0]['containerNumber'] + row['batch'] = val[0]['batch'] + row['altBatch'] = val[0]['altBatch'] + row['arriveDate'] = val[0]['arriveDate'] + row['produceDate'] = val[0]['produceDate'] + row['expireDate'] = val[0]['expireDate'] + row['inventoryStatus'] = val[0]['inventoryStatus'] + row['toLocationCode'] = val[0]['locationCode'] + row['itemCode'] = val[0]['itemCode'] } else { const setV = {} setV[formField] = val[0][searchField] - //setV['ppNumber'] = val[0]['ppNumber'] - //setV['supplierCode'] = val[0]['supplierCode'] formRef.setValues(setV) } }) } +// 查询页面返回——详情 +const searchTableSuccessDetail = (formField, searchField, val, formRef ) => { + nextTick(() => { + const setV = {} + setV[formField] = val[0][searchField] + setV['packingNumber'] = val[0]['packingNumber'] + setV['containerNumber'] = val[0]['containerNumber'] + setV['batch'] = val[0]['batch'] + setV['altBatch'] = val[0]['altBatch'] + setV['arriveDate'] = val[0]['arriveDate'] + setV['produceDate'] = val[0]['produceDate'] + setV['expireDate'] = val[0]['expireDate'] + setV['inventoryStatus'] = val[0]['inventoryStatus'] + setV['toLocationCode'] = val[0]['locationCode'] + setV['itemCode'] = val[0]['itemCode'] + formRef.setValues(setV) + }) +} + // 子表新增的时候选择表格之后需要会显得字段 // const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom'] const Echo = [] diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts index f0c7bc7be..d011dd204 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts @@ -1,8 +1,12 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' import { dateFormatter } from '@/utils/formatTime' -const { t } = useI18n() // 国际化 import * as getRequestsettingApi from '@/api/wms/requestsetting/index' +import * as BalanceApi from '@/api/wms/balance' +import { Balance } from '@/views/wms/inventoryManage/balance/balance.data' + +const { t } = useI18n() // 国际化 + // 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值 const queryParams = { pageSize:10, @@ -28,6 +32,7 @@ export const UnplannedreceiptRequestMain = useCrudSchemas(reactive table: { width: 150 }, + isForm: false, }, { label: '到库位类型范围', @@ -40,6 +45,7 @@ export const UnplannedreceiptRequestMain = useCrudSchemas(reactive table: { width: 150 }, + isForm: false, }, { label: '到库区代码范围', @@ -49,6 +55,7 @@ export const UnplannedreceiptRequestMain = useCrudSchemas(reactive width: 150 }, isSearch: true, + isForm: false, }, { label: '单据号', @@ -73,7 +80,8 @@ export const UnplannedreceiptRequestMain = useCrudSchemas(reactive componentProps: { disabled: true } - } + }, + isForm: false, }, { label: '备注', @@ -98,6 +106,7 @@ export const UnplannedreceiptRequestMain = useCrudSchemas(reactive form: { component: 'DatePicker', componentProps: { + style: {width:'100%'}, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', @@ -128,11 +137,13 @@ export const UnplannedreceiptRequestMain = useCrudSchemas(reactive form: { component: 'DatePicker', componentProps: { + style: {width:'100%'}, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', } }, + isForm: false, }, { label: '截止时间', @@ -148,6 +159,7 @@ export const UnplannedreceiptRequestMain = useCrudSchemas(reactive form: { component: 'DatePicker', componentProps: { + style: {width:'100%'}, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', @@ -310,15 +322,15 @@ export const UnplannedreceiptRequestMain = useCrudSchemas(reactive //表单校验 export const UnplannedreceiptRequestMainRules = reactive({ - toWarehouseCode: [ - { required: true, message: '请选择到仓库代码', trigger: 'change' } - ], - toLocationTypes: [ - { required: true, message: '请选择到库位类型范围', trigger: 'change' } - ], - toAreaCodes: [ - { required: true, message: '请选择到库区代码范围', trigger: 'change' } - ], + // toWarehouseCode: [ + // { required: true, message: '请选择到仓库代码', trigger: 'change' } + // ], + // toLocationTypes: [ + // { required: true, message: '请选择到库位类型范围', trigger: 'change' } + // ], + // toAreaCodes: [ + // { required: true, message: '请选择到库区代码范围', trigger: 'change' } + // ], departmentCode: [ { required: true, message: '请输入部门', trigger: 'blur' } ], @@ -334,9 +346,9 @@ export const UnplannedreceiptRequestMainRules = reactive({ directCreateRecord: [ { required: true, message: '请选择是否跳过任务直接生成记录', trigger: 'change' } ], - businessType: [ - { required: true, message: '请输入业务类型', trigger: 'blur' } - ], + // businessType: [ + // { required: true, message: '请输入业务类型', trigger: 'blur' } + // ], }) /** @@ -350,6 +362,25 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive