yanjinhui
2025-12-01 2b49f7643d15b74889d190f216630559006ed93a
н¨Îļþ¼Ð/WMS/src/views/inbound/inboundOrder_Hty.vue
@@ -49,19 +49,17 @@
                        field: "order_type",
                        type: "select",
                        dataKey: "order_type",
                        data: [],
                        data: []
                    },
                ],
                [
                    {
                        title: "表头状态",
                        field: "odrderStatus",
                        title: "库房号",
                        field: "warehouse_no",
                        type: "select",
                        dataKey: "odrderStatus",
                        data: [],
                    },
                    { title: "供应商名称", field: "supplier_name", type: "like" },
                    { title: "入库记账时间", field: "account_tiem", type: "datetime" },
                        dataKey: "warehouseNuber",
                        data: []
                    },
                ],
            ]);
            const columns = ref([
@@ -119,7 +117,7 @@
                    type: 'string',
                    width: 100,
                    align: 'left',
                    bind: { key: "warehouse", data: [] }
                    bind: { key: "warehouseNuber", data: [] },
                },
                {
                    field: 'account_tiem',
@@ -136,13 +134,13 @@
                    align: 'left',
                    bind: { key: "odrderStatus", data: [] }
                },
                {
                    field: 'creater',
                    title: '创建人',
                    type: 'string',
                    width: 90,
                    align: 'left'
                },
                // {
                //     field: 'creater',
                //     title: '创建人',
                //     type: 'string',
                //     width: 90,
                //     align: 'left'
                // },
                {
                    field: 'createDate',
                    title: '创建时间',
@@ -151,26 +149,28 @@
                    align: 'left',
                    sort: true
                },
                {
                    field: 'modifier',
                    title: '修改人',
                    type: 'string',
                    width: 100,
                    align: 'left'
                },
                {
                    field: 'modifyDate',
                    title: '修改时间',
                    type: 'datetime',
                    width: 160,
                    align: 'left',
                    sort: true
                }
                // {
                //     field: 'modifier',
                //     title: '修改人',
                //     type: 'string',
                //     width: 100,
                //     align: 'left'
                // },
                // {
                //     field: 'modifyDate',
                //     title: '修改时间',
                //     type: 'datetime',
                //     width: 160,
                //     align: 'left',
                //     sort: true
                // }
            ]);
            const detail = ref({
                cnName: "历史入库单明细",
                table: "CabinOrderDetailHty",
                url: "/CabinOrderDetailHty/",
                parentField: "orderId",  // æ˜Žç»†è¡¨ä¸­å…³è”主表的字段
                parentKey: "sourceId",   // ä¸»è¡¨ä¸­å¯¹åº”的字段
                columns: [
                    {
                        field: 'id',
@@ -182,12 +182,22 @@
                        require: true,
                        align: 'left'
                    },
                    {
                        field: 'sourceId',
                        title: '原主键',
                        type: 'int',
                        width: 100,
                        align: 'left'
                    },
                     // æ·»åŠ è¿™ä¸ªå…³è”å­—æ®µ - å…³é”®ä¿®å¤
                    {
                    field: 'orderId',  // ä½¿ç”¨ OrderId è€Œä¸æ˜¯ SourceId
                    title: '关联入库单ID',
                    type: 'int',
                    width: 90,
                    align: 'left',
                    hidden: true  // éšè—ä½†å¿…须存在
                    },
                    {
                        field: 'reservoirarea',
@@ -196,6 +206,16 @@
                        width: 120,
                        align: 'left',
                        bind: { key: "warehouseNuber", data: [] }
                    },
                        {
                        field: "goods_no",
                        title: "物料名称",
                        type: "string",
                        width: 150,
                        align: "left",
                        required: true,
                        edit:{type:""},
                        bind: { key: "MaterielNames", data: [] },
                    },
                    {
                        field: 'goods_no',
@@ -281,7 +301,8 @@
                    }
                ],
                sortName: "id",
                key: "id"
                key: "id",
            });
            return {
                table,