Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn

hutongqing

2025-01-11 ecd1c9119991888c6ffeac9d1d228d7bce88deb9

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSClient/src/views/check/checkOrder.vue

@@ -31,11 +31,28 @@
            });
            const editFormFields = ref({});
            const editFormOptions = ref([]);
            const searchFormFields = ref({});
            const searchFormOptions = ref([]);
            const columns = ref([{field:'checkOrderId',title:'主键',type:'int',width:110,hidden:true,readonly:true,require:true,align:'left'},
                       {field:'checkOrderNo',title:'检验单号',type:'string',width:110,require:true,align:'left',sort:true},
                       {field:'receiveOrderNo',title:'收货单号',type:'string',width:110,require:true,align:'left'},
            const searchFormFields = ref({
                checkOrderNo:"",
                receiveOrderNo:"",
                checkOrderStatus:"",
                auditStatus:""
            });
            const searchFormOptions = ref([
                [
                    {title:"检验单号", field:"checkOrderNo",type:"like"},
                    {title:"收货单号", field:"receiveOrderNo",type:"like"},
                    {title:"质检单状态", field:"checkOrderStatus",type:"select",dataKey:"",data:[]},
                    {title:"审批状态", field:"auditStatus",type:"select",dataKey:"",data:[]},
                ],
                [
                    {title:"收货单明细行号", field:"receiveDetailRowNo",type:"like"},
                    {title:"物料编号", field:"materielCode",type:"like"},
                    {title:"检验结果", field:"result",type:"like"},
                ]
            ]);
            const columns = ref([{field:'checkOrderId',title:'主键',type:'int',width:150,hidden:true,readonly:true,require:true,align:'left'},
                       {field:'checkOrderNo',title:'检验单号',type:'string',width:160,require:true,align:'left',sort:true},
                       {field:'receiveOrderNo',title:'收货单号',type:'string',width:160,require:true,align:'left'},
                       {field:'checkOrderStatus',title:'质检单状态',type:'int',width:110,require:true,align:'left'},
                       {field:'auditStatus',title:'审批状态',type:'int',width:110,require:true,align:'left'},
                       {field:'receiveDetailRowNo',title:'收货单明细行号',type:'int',width:110,require:true,align:'left'},
@@ -53,11 +70,22 @@
                       {field:'modifier',title:'修改人',type:'string',width:100,align:'left'},
                       {field:'modifyDate',title:'修改日期',type:'datetime',width:150,align:'left',sort:true}]);
            const detail = ref({
                cnName: "#detailCnName",
                table: "#detailTable",
                columns: [],
                sortName: "",
                key: ""
                cnName: "检验结果",
                table: "CheckOrderResult",
                columns: [
                    {field:'id',title:'主键',type:'int',width:110,hidden:true,readonly:true,require:true,align:'left'},
                    {field:'checkOrderId',title:'检验单主键',type:'int',width:110,require:true,align:'left',sort:true},
                    {field:'defectCode',title:'缺陷代码',type:'string',width:110,require:true,align:'left'},
                    {field:'result',title:'检验结果',type:'string',width:110,require:true,align:'left'},
                    {field:'quantity',title:'数量',type:'float',width:110,require:true,align:'left'},
                    {field:'note',title:'备注',type:'string',width:220,align:'left'},
                    {field:'creater',title:'创建者',type:'string',width:110,require:true,align:'left'},
                    {field:'createDate',title:'创建时间',type:'datetime',width:150,require:true,align:'left',sort:true},
                    {field:'modifier',title:'修改人',type:'string',width:100,align:'left'},
                    {field:'modifyDate',title:'修改日期',type:'datetime',width:150,align:'left',sort:true}
                ],
                sortName: "id",
                key: "id"
            });
            return {
                table,