Merge branch 'master' of http://115.159.85.185:8098/r/ZhiHuiQiCe/FangCangZh...

yanjinhui

6 天以前 5b8bf171b9afda52fa366a72e54eedbd9e6d4d17

 н¨Îļþ¼Ð/WMS/src/views/inbound/inboundOrder_Hty.vue

@@ -22,12 +22,12 @@
    export default defineComponent({
        setup() {
            const table = ref({
                key: 'historyId',
                key: 'id',
                footer: "Foots",
                cnName: '历史入库单',
                name: 'CabinOrderHty',
                url: "/CabinOrderHty/",
                sortName: "historyId"
                sortName: "id"
            });
            const editFormFields = ref({});
            const editFormOptions = ref([]);
@@ -49,24 +49,22 @@
                        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([
                {
                    field: 'historyId',
                    field: 'id',
                    title: '历史记录主键',
                    type: 'int',
                    width: 120,
@@ -76,7 +74,7 @@
                    align: 'left'
                },
                {
                    field: 'id',
                    field: 'sourceId',
                    title: '原主键',
                    type: 'int',
                    width: 100,
@@ -96,6 +94,7 @@
                    type: 'string',
                    width: 120,
                    align: 'left',
                    // bind: { Key: "order_type", data: [] }
                    bind: { key: "order_type", data: [] }
                },
                {
@@ -118,7 +117,7 @@
                    type: 'string',
                    width: 100,
                    align: 'left',
                    bind: { key: "warehouse", data: [] }
                    bind: { key: "warehouseNuber", data: [] },
                },
                {
                    field: 'account_tiem',
@@ -135,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: '创建时间',
@@ -150,21 +149,21 @@
                    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: "历史入库单明细",
@@ -172,7 +171,7 @@
                url: "/CabinOrderDetailHty/",
                columns: [
                    {
                        field: 'historyId',
                        field: 'id',
                        title: '历史记录主键',
                        type: 'int',
                        width: 120,
@@ -182,7 +181,7 @@
                        align: 'left'
                    },
                    {
                        field: 'id',
                        field: 'sourceId',
                        title: '原主键',
                        type: 'int',
                        width: 100,
@@ -195,6 +194,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',
@@ -213,7 +222,7 @@
                    },
                    {
                        field: 'order_Inqty',
                        title: '入库完成数量',
                        title: '完成数量',
                        type: 'decimal',
                        width: 120,
                        align: 'left'
@@ -279,8 +288,8 @@
                        sort: true
                    }
                ],
                sortName: "historyId",
                key: "historyId"
                sortName: "id",
                key: "id"
            });
            return {
                table,