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

yanjinhui

6 天以前 5b8bf171b9afda52fa366a72e54eedbd9e6d4d17

 н¨Îļþ¼Ð/WMS/src/views/outbound/outboundOrder.vue

@@ -72,8 +72,8 @@
                    {
                        title: "库房号",
                        field: "warehouse_no",
                        type: "string",
                        dataKey: "warehouse",
                        type: "select",
                        dataKey: "warehouseNuber",
                        data: [],
                        width: 100
                    },
@@ -110,6 +110,7 @@
                [
                    { title: "出库单号", field: "out_no", type: "like" },
                    { title: "客户代码", field: "client_no", type: "like" },
                    { title: "库房号", field: "warehouse_no", type: "select", dataKey: "warehouseNuber", data: [] },
                    {
                        title: "出库单类型",
                        field: "out_type",
@@ -119,13 +120,13 @@
                    },
                ],
                [
                    {
                        title: "状态",
                        field: "outStatus",
                        type: "select",
                        dataKey: "outStatus",
                        data: [],
                    },
                    // {
                    //     title: "状态",
                    //     field: "outStatus",
                    //     type: "select",
                    //     dataKey: "outStatus",
                    //     data: [],
                    // },
                    { title: "客户名称", field: "client_name", type: "like" },
                    { title: "出库记账时间", field: "account_time", type: "datetime" },
                ]
@@ -181,7 +182,7 @@
                    type: 'string',
                    width: 100,
                    align: 'left',
                    bind: { key: "warehouse", data: [] }
                    bind: { key: "warehouseNuber", data: [] }
                },
                {
                    field: 'account_time',
@@ -199,13 +200,13 @@
                    // bind: { key: "outStatus", data: [] }
                    // edit:{type:""}
                },
                {
                    field: 'creater',
                    title: '创建人',
                    type: 'string',
                    width: 90,
                    align: 'left'
                },
                // {
                //     field: 'creater',
                //     title: '创建人',
                //     type: 'string',
                //     width: 90,
                //     align: 'left'
                // },
                {
                    field: 'createDate',
                    title: '创建时间',
@@ -214,13 +215,13 @@
                    align: 'left',
                    sort: true
                },
                {
                    field: 'modifier',
                    title: '修改人',
                    type: 'string',
                    width: 100,
                    align: 'left'
                },
                // {
                //     field: 'modifier',
                //     title: '修改人',
                //     type: 'string',
                //     width: 100,
                //     align: 'left'
                // },
                {
                    field: 'modifyDate',
                    title: '修改时间',
@@ -263,8 +264,18 @@
                        width: 120,
                        align: 'left',
                        bind: { key: "warehouseNuber", data: [] },
                        edit:{type:""}
                        // edit:{type:""}

                    },
                    {
                        field: "goods_no",
                        title: "物料名称",
                        type: "string",
                        width: 150,
                        align: "left",
                        required: true,
                        // edit:{type:""},
                        bind: { key: "MaterielNames", data: [] },
                    },
                    {
                        field: 'goods_no',
@@ -274,7 +285,7 @@
                        require: true,
                        align: 'left',
                        bind: { key: "medicineGoods", data: [] },
                        edit:{type:""}
                        // edit:{type:""}
                    },
                    {
                        field: 'order_qty',
@@ -283,7 +294,7 @@
                        width: 100,
                        require: true,
                        align: 'left',
                        edit:{type:"number"}
                        // edit:{type:"number"}
                    },
                       {
                        field: 'order_Outqty',
@@ -292,7 +303,7 @@
                        width: 100,
                        require: true,
                        align: 'left',
                        edit:{type:"number"}
                        // edit:{type:"number"}
                    },
                    {
                        field: 'batch_num',
@@ -301,7 +312,7 @@
                        width: 120,
                        require: true,
                        align: 'left',
                        edit:{type:""}
                        // edit:{type:""}
                    },
                    {
                        field: 'exp_date',
@@ -309,7 +320,7 @@
                        type: 'string',
                        width: 120,
                        align: 'left',
                        edit:{type:""}
                        // edit:{type:""}
                    },
                    {
                        field: 'ootDetailStatus',
@@ -317,7 +328,7 @@
                        type: 'string',
                        width: 120,
                        align: 'left',
                        edit:{type:""}
                        // edit:{type:""}
                    },
                    {
                        field: 'status',
@@ -326,7 +337,7 @@
                        width: 120,
                        align: 'left',
                        bind: { key: "syncStatus", data: [] },
                        edit:{type:'select',dataKey:'syncStatus',data:[]}
                        // edit:{type:'select',dataKey:'syncStatus',data:[]}
                    },
                    {
                        field: 'creater',