Browse Source

修改

master_hella_20240701
zhaoxuebing 8 months ago
parent
commit
d660fb9e6c
  1. 5
      src/api/wms/putawayRecordDetail/index.ts
  2. 57
      src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/index.vue
  3. 276
      src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/putawayRecordMain.data.ts

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

@ -73,4 +73,9 @@ export const exportPutawayRecordDetail = async (params) => {
// 下载用户导入模板
export const importTemplate = () => {
return request.download({ url: '/wms/putaway-record-detail/get-import-template' })
}
// 查询上架记录子列表--子包装数据
export const getPutawayJobDetailPageChildPackingNumber = async (params) => {
return await request.get({ url: `/wms/putaway-record-detail/pageChildPackingNumber`, params })
}

57
src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/index.vue

@ -57,12 +57,35 @@
:detailAllSchemas="PutawayRecordDetail.allSchemas"
:detailAllSchemasRules="PutawayRecordDetailRules"
:apiPage="PutawayRecordDetailApi.getPutawayRecordDetailPage"
:detailButtonIsShowAdd="false"
:detailButtonIsShowEdit="false"
:detailButtonIsShowDelete="false"
:buttondataTable="buttondataTable"
@tableFormButton="tableFormButton"
/>
<!-- 子包装弹窗 -->
<BasicForm
ref="detailParenPackingRef"
@success="getList"
:tableAllSchemas="PutawayRecordDetailChildPackingNumber.allSchemas"
:tableFormRules="PutawayRecordDetailRules"
:tableData="packingDetatableData.tableList"
:isBusiness="true"
:isShowButton="false"
:isShowReduceButton="false"
:isShowFooterButtton="false"
/>
</template>
<script setup lang="ts">
import download from '@/utils/download'
import { PutawayRecordMain,PutawayRecordMainRules,PutawayRecordDetail,PutawayRecordDetailRules } from './putawayRecordMain.data'
import { PutawayRecordMain,
PutawayRecordMainRules,
PutawayRecordDetail,
PutawayRecordDetailRules,
PutawayRecordDetailChildPackingNumber } from './putawayRecordMain.data'
import * as PutawayRecordMainApi from '@/api/wms/putawayRecordMain'
import * as PutawayRecordDetailApi from '@/api/wms/putawayRecordDetail'
import * as defaultButtons from '@/utils/disposition/defaultButtons'
@ -133,12 +156,44 @@ const butttondata = (row) => {
const buttonTableClick = async (val, row) => {
}
//
const detailParenPackingRef = ref()
const { tableObject: packingDetatableData, tableMethods: packDetatableMethods } = useTable({
getListApi: PutawayRecordDetailApi.getPutawayJobDetailPageChildPackingNumber
})
const { getList:queryDetailList } = packDetatableMethods
/** 详情操作 */
const detailRef = ref()
const openDetail = (row: any, titleName: any, titleValue: any) => {
detailRef.value.openDetail(row, titleName, titleValue,'recordPutawayMain')
}
// 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 exportLoading = ref(false) //
const handleExport = async () => {

276
src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/putawayRecordMain.data.ts

@ -613,6 +613,17 @@ export const PutawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
width: 150
},
},
{
label: '操作',
field: 'action',
isDetail: false,
isForm: false ,
table: {
width: 150,
fixed: 'right'
},
isTableForm:true,
}
]))
//表单校验
@ -662,4 +673,267 @@ export const PutawayRecordDetailRules = reactive({
creator: [
{ required: true, message: '请输入创建者', trigger: 'blur' }
],
})
})
/**
* @returns {Array} --
*/
export const PutawayRecordDetailChildPackingNumber = useCrudSchemas(reactive<CrudSchema[]>([
{
label: '从包装号',
field: 'fromPackingNumber',
sort: 'custom',
table: {
width: 150
},
},
{
label: '到包装号',
field: 'toPackingNumber',
sort: 'custom',
table: {
width: 150
},
},
{
label: '从批次',
field: 'fromBatch',
sort: 'custom',
table: {
width: 150
},
},
{
label: '到批次',
field: 'toBatch',
sort: 'custom',
table: {
width: 150
},
},
{
label: '库存状态',
field: 'inventoryStatus',
dictType: DICT_TYPE.INVENTORY_STATUS,
dictClass: 'string',
isTable: true,
sort: 'custom',
table: {
width: 150
},
},
{
label: '订单号',
field: 'poNumber',
sort: 'custom',
table: {
width: 150
},
},
{
label: '订单行',
field: 'poLine',
sort: 'custom',
table: {
width: 150
},
},
{
label: '从货主代码',
field: 'fromOwnerCode',
sort: 'custom',
table: {
width: 150
},
},
{
label: '从库位代码',
field: 'fromLocationCode',
sort: 'custom',
table: {
width: 150
},
},
{
label: '从库位组代码',
field: 'fromLocationGroupCode',
sort: 'custom',
table: {
width: 150
},
},
{
label: '从库区代码',
field: 'fromAreaCode',
sort: 'custom',
table: {
width: 150
},
},
{
label: '到货主代码',
field: 'toOwnerCode',
sort: 'custom',
table: {
width: 150
},
},
{
label: '到库位代码',
field: 'toLocationCode',
sort: 'custom',
table: {
width: 150
},
},
{
label: '到库位组代码',
field: 'toLocationGroupCode',
sort: 'custom',
table: {
width: 150
},
},
{
label: '到库区代码',
field: 'toAreaCode',
sort: 'custom',
table: {
width: 150
},
},
{
label: '单据号',
field: 'number',
sort: 'custom',
table: {
width: 180
},
},
{
label: '物料代码',
field: 'itemCode',
sort: 'custom',
table: {
width: 150
},
},
{
label: '备注',
field: 'remark',
sort: 'custom',
table: {
width: 150
},
},
{
label: '创建时间',
field: 'createTime',
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',
}
},
},
{
label: '创建者',
field: 'creator',
sort: 'custom',
table: {
width: 150
},
},
{
label: '物料名称',
field: 'itemName',
sort: 'custom',
table: {
width: 150
},
},
{
label: '物料描述1',
field: 'itemDesc1',
sort: 'custom',
table: {
width: 150
},
},
{
label: '物料描述2',
field: 'itemDesc2',
sort: 'custom',
table: {
width: 150
},
},
{
label: '项目代码',
field: 'projectCode',
sort: 'custom',
table: {
width: 150
},
},
{
label: '数量',
field: 'qty',
sort: 'custom',
table: {
width: 150
},
form: {
component: 'InputNumber',
}
},
{
label: '计量单位',
field: 'uom',
dictType: DICT_TYPE.UOM,
dictClass: 'string',
isTable: true,
sort: 'custom',
table: {
width: 150
},
},
{
label: '接口类型',
field: 'interfaceType',
dictType: DICT_TYPE.INTERFACE_TYPE,
dictClass: 'string',
isTable: true,
sort: 'custom',
table: {
width: 150
},
},
{
label: '从器具号',
field: 'fromContainerNumber',
sort: 'custom',
table: {
width: 150
},
},
{
label: '到器具号',
field: 'toContainerNumber',
sort: 'custom',
table: {
width: 150
},
},
]))
Loading…
Cancel
Save