Browse Source

上架申请修改

master_hella_20240701
zhaoxuebing 6 months ago
parent
commit
45dd1ce4e7
  1. 5
      src/api/wms/putawayRequestDetail/index.ts
  2. 59
      src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue
  3. 420
      src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts

5
src/api/wms/putawayRequestDetail/index.ts

@ -65,3 +65,8 @@ export const exportPutawayRequestDetail = async (params) => {
export const importTemplate = () => { export const importTemplate = () => {
return request.download({ url: '/wms/putaway-request-detail/get-import-template' }) return request.download({ url: '/wms/putaway-request-detail/get-import-template' })
} }
// 查询上架申请子列表--子包装数据
export const getPutawayRequestDetailPageChildPackingNumber = async (params) => {
return await request.get({ url: `/wms/putaway-request-detail/pageChildPackingNumber`, params })
}

59
src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue

@ -70,17 +70,38 @@
fromeWhere="putawayRequest" fromeWhere="putawayRequest"
@searchTableSuccessDetail="searchTableSuccessDetail" @searchTableSuccessDetail="searchTableSuccessDetail"
:detailButtonIsShowAdd="false" :detailButtonIsShowAdd="false"
:buttondataTable="buttondataTable"
@tableFormButton="tableFormButton"
/> />
<!-- 导入 --> <!-- 导入 -->
<ImportForm ref="importFormRef" url="/wms/putaway-request-main/import" :importTemplateData="importTemplateData" <ImportForm ref="importFormRef" url="/wms/putaway-request-main/import" :importTemplateData="importTemplateData"
@success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" /> @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" />
<!-- 子包装弹窗 -->
<BasicForm
ref="detailParenPackingRef"
@success="getList"
:tableAllSchemas="PutawayRequestDetailChildPackingNumber.allSchemas"
:tableFormRules="PutawayRequestDetailRules"
:tableData="packingDetatableData.tableList"
:isBusiness="true"
:isShowButton="false"
:isShowReduceButton="false"
:isShowFooterButtton="false"
/>
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import download from '@/utils/download' import download from '@/utils/download'
import { CACHE_KEY, useCache } from '@/hooks/web/useCache' import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
import { PutawayRequestMain,PutawayRequestMainRules,PutawayRequestDetail,PutawayRequestDetailRules } from './putawayRequestMain.data' import { PutawayRequestMain,
PutawayRequestMainRules,
PutawayRequestDetail,
PutawayRequestDetailRules,
PutawayRequestDetailChildPackingNumber } from './putawayRequestMain.data'
import * as PutawayRequestMainApi from '@/api/wms/putawayRequestMain' import * as PutawayRequestMainApi from '@/api/wms/putawayRequestMain'
import * as PutawayRequestDetailApi from '@/api/wms/putawayRequestDetail' import * as PutawayRequestDetailApi from '@/api/wms/putawayRequestDetail'
import * as defaultButtons from '@/utils/disposition/defaultButtons' import * as defaultButtons from '@/utils/disposition/defaultButtons'
@ -202,8 +223,6 @@ const butttondata = (row) => {
] ]
} }
// - // -
const buttonTableClick = async (val, row) => { const buttonTableClick = async (val, row) => {
if (val == 'mainClose') { // if (val == 'mainClose') { //
@ -223,6 +242,7 @@ const buttonTableClick = async (val, row) => {
} }
} }
/** 添加/修改操作 */ /** 添加/修改操作 */
const formRef = ref() const formRef = ref()
const openForm =async (type: string, row?: number) => { const openForm =async (type: string, row?: number) => {
@ -312,6 +332,13 @@ const handleSubmit = async (id: number) => {
} }
} }
//
const detailParenPackingRef = ref()
const { tableObject: packingDetatableData, tableMethods: packDetatableMethods } = useTable({
getListApi: PutawayRequestDetailApi.getPutawayRequestDetailPageChildPackingNumber
})
const { getList:queryDetailList } = packDetatableMethods
// //
const { wsCache } = useCache() const { wsCache } = useCache()
/** 详情操作 */ /** 详情操作 */
@ -322,6 +349,32 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
detailRef.value.openDetail(row, titleName, titleValue,'requestPutawayMain') detailRef.value.openDetail(row, titleName, titleValue,'requestPutawayMain')
} }
// table
const buttondataTable = ref([{
label: '查看其他包装规格',
name: 'viewParentPickingNumber',
hide: false,
type: 'primary',
icon: '',
color: '',
hasPermi: '',
link: true, //
}])
//
const tableFormButton = async (val , row) => {
if (val == 'viewParentPickingNumber') { //
packingDetatableData.params = {
masterId:row.masterId,
parentPackingNumber:row.packingNumber
}
await queryDetailList()
detailParenPackingRef.value.open('create', row, null,'viewDetail')//
}
}
/** 删除按钮操作 */ /** 删除按钮操作 */
const handleDelete = async (id: number) => { const handleDelete = async (id: number) => {
try { try {

420
src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts

@ -768,12 +768,11 @@ export const PutawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
field: 'action', field: 'action',
isDetail: false, isDetail: false,
isForm: false, isForm: false,
isTable: false,
table: { table: {
width: 150, width: 150,
fixed: 'right' fixed: 'right'
}, },
isTableForm: false, isTableForm: true,
} }
])) ]))
@ -795,3 +794,420 @@ export const PutawayRequestDetailRules = reactive({
{ required: true, message: '请输入物料代码', trigger: 'blur' } { required: true, message: '请输入物料代码', trigger: 'blur' }
], ],
}) })
/**
* @returns {Array} --
*/
export const PutawayRequestDetailChildPackingNumber = useCrudSchemas(reactive<CrudSchema[]>([
{
label: '包装号',
field: 'packingNumber',
sort: 'custom',
table: {
width: 150
},
isTableForm: false,
isForm: false,
form: {
componentProps: {
disabled:true
}
},
tableForm: {
disabled: true,
}
},
{
label: '器具号',
field: 'containerNumber',
sort: 'custom',
table: {
width: 150
},
isTableForm: false,
isForm: false,
form: {
componentProps: {
disabled:true
}
},
tableForm: {
disabled: true,
}
},
{
label: '批次',
field: 'batch',
sort: 'custom',
table: {
width: 150
},
form: {
componentProps: {
disabled:true
}
},
tableForm: {
disabled: true,
}
},
{
label: '库存状态',
field: 'inventoryStatus',
dictType: DICT_TYPE.INVENTORY_STATUS,
dictClass: 'string',
isTable: true,
sort: 'custom',
table: {
width: 150
},
tableForm: {
disabled: true,
type: 'Select'
},
form: {
componentProps: {
disabled:true
}
},
},
{
label: '物料代码',
field: 'itemCode',
sort: 'custom',
table: {
width: 150
},
tableForm: {
disabled: true,
isInpuFocusShow: false,
earchListPlaceholder: '请选择包装号',
searchField: 'packingNumber',
searchTitle: '库存余额信息',
searchAllSchemas: Balance.allSchemas,
searchPage: BalanceApi.getBalancePagePutaway,
searchCondition: [{
key: 'available',
value: 'TRUE',
isMainValue: false
}, {
key: 'workshopCode',
value: 'workshopCode',
isMainValue: true
}]
},
},
{
label: '计量单位',
field: 'uom',
dictType: DICT_TYPE.UOM,
dictClass: 'string',
isTable: true,
sort: 'custom',
table: {
width: 150
},
tableForm: {
disabled: true,
type: 'Select'
}
},
{
label: '订单号',
field: 'poNumber',
sort: 'custom',
table: {
width: 150
},
form: {
// labelMessage: '信息提示说明!!!',
componentProps: {
isSearchList: false,
searchListPlaceholder: '请选择订单号',
searchField: 'number',
searchTitle: '采购订单信息',
searchAllSchemas: PurchaseDetail.allSchemas,
searchPage: PurchaseDetailApi.getPurchaseMainPage
}
},
tableForm: {
disabled: true,
isInpuFocusShow: false,
searchListPlaceholder: '请选择订单号',
searchField: 'number',
searchTitle: '采购订单信息',
searchAllSchemas: PurchaseDetail.allSchemas,
searchPage: PurchaseMainApi.getPurchaseMainPage
}
},
{
label: '订单行',
field: 'poLine',
sort: 'custom',
table: {
width: 150
},
form: {
// labelMessage: '信息提示说明!!!',
componentProps: {
isSearchList: false,
searchListPlaceholder: '请选择订单行',
searchField: 'lineNumber',
searchTitle: '采购订单信息',
searchAllSchemas: PurchaseDetail.allSchemas,
searchPage: PurchaseDetailApi.getPurchaseDetailPage
}
},
tableForm: {
disabled: true,
isInpuFocusShow: false,
searchListPlaceholder: '请选择订单行',
searchField: 'lineNumber',
searchTitle: '采购订单信息',
searchAllSchemas: PurchaseDetail.allSchemas,
searchPage: PurchaseDetailApi.getPurchaseDetailPage
}
},
{
label: '从库位代码',
field: 'fromLocationCode',
sort: 'custom',
table: {
width: 150
},
tableForm: {
disabled: true,
isInpuFocusShow: false,
searchListPlaceholder: '请选择从库位代码',
searchField: 'code',
searchTitle: '库位基础信息',
searchAllSchemas: Location.allSchemas,
searchPage: LocationApi.getLocationPage
},
form: {
// labelMessage: '信息提示说明!!!',
componentProps: {
disabled: true,
isSearchList: false,
searchListPlaceholder: '请选择从库位代码',
searchField: 'code',
searchTitle: '库位基础信息',
searchAllSchemas: Location.allSchemas,
searchPage: LocationApi.getLocationPage
}
}
},
{
label: '单据号',
field: 'number',
sort: 'custom',
table: {
width: 180
},
isTableForm: false,
form: {
componentProps: {
disabled: true
}
},
tableForm: {
disabled: true,
}
},
{
label: '备注',
field: 'remark',
sort: 'custom',
table: {
width: 150
},
form: {
componentProps: {
disabled:true
}
},
tableForm: {
disabled: true,
}
},
{
label: '创建时间',
field: 'createTime',
formatter: dateFormatter,
detail: {
dateFormat: 'YYYY-MM-DD HH:mm:ss'
},
sort: 'custom',
table: {
width: 180
},
form: {
component: 'DatePicker',
componentProps: {
disabled:true,
style: { width: '100%' },
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
}
},
isTableForm: false,
isForm: false,
tableForm: {
disabled: true,
type:'FormDateTime',
valueFormat:'YYYY-MM-DDTHH:mm:ss'
}
},
{
label: '创建者',
field: 'creator',
sort: 'custom',
table: {
width: 150
},
isTableForm: false,
isForm: false,
form: {
componentProps: {
disabled:true
}
},
tableForm: {
disabled: true,
}
},
{
label: '物料名称',
field: 'itemName',
sort: 'custom',
table: {
width: 150
},
isTableForm: false,
isForm: false,
form: {
componentProps: {
disabled:true
}
},
tableForm: {
disabled: true,
}
},
{
label: '物料描述1',
field: 'itemDesc1',
sort: 'custom',
table: {
width: 150
},
isTableForm: false,
isForm: false,
form: {
componentProps: {
disabled:true
}
},
tableForm: {
disabled: true,
}
},
{
label: '物料描述2',
field: 'itemDesc2',
sort: 'custom',
table: {
width: 150
},
isTableForm: false,
isForm: false,
form: {
componentProps: {
disabled:true
}
},
tableForm: {
disabled: true,
}
},
{
label: '项目代码',
field: 'projectCode',
sort: 'custom',
table: {
width: 150
},
isTableForm: false,
isForm: false,
form: {
componentProps: {
disabled:true
}
},
tableForm: {
disabled: true,
}
},
{
label: '数量',
field: 'qty',
sort: 'custom',
table: {
width: 150
},
form: {
component: 'InputNumber',
componentProps: {
disabled:true,
min: 1,
precision: 6
},
},
tableForm: {
disabled: true,
type: 'InputNumber',
min: 1,
precision: 6
}
},
{
label: '从货主代码',
field: 'fromOwnerCode',
sort: 'custom',
table: {
width: 150
},
isTableForm: false,
isForm: false,
form: {
componentProps: {
disabled:true
}
},
tableForm: {
disabled: true,
}
},
{
label: '到货主代码',
field: 'toOwnerCode',
sort: 'custom',
table: {
width: 150
},
isTableForm: false,
isForm: false,
form: {
componentProps: {
disabled:true
}
},
tableForm: {
disabled: true,
}
}
]))
Loading…
Cancel
Save