Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

廖井涛

8 天以前 ceb1dea2b24d5c3216816f42fd0e514613656416

 north-glass-erp/northglass-erp/src/stores/sd/order/orderInfo.js

@@ -14,6 +14,7 @@
        reportingWorkDate:ref(["",""]),
        qualityInspectionDate:ref(["",""]),
        brokenDate:ref(["",""]),
        yieldDate:ref(["",""]),
        searchOrderListFilter:ref([]),//订单首页筛选]
        searchOrderFilter:{
            list:ref([]),
@@ -51,6 +52,11 @@
            }

        },
        searchDeliverFilter:{
            list:ref([]),
            data:{}

        },
        projectNo:ref(),
        optimizeData:{
            optimalResults:'',
@@ -81,9 +87,26 @@
            this.reportFormDate=["",""]
            this.workOrderDate=["",""]
            this.reportingWorkDate=["",""]
            this.qualityInspectionDate=["",""]
            this.brokenDate=["",""]
            this.yieldDate=["",""]
            this.searchOrderFilter={
                list:[],
                data:{}
            }
            this.selectReportingWorksFilter={
                list:ref([]),
                    data:{
                    order: {
                        project: '',
                            batch:''
                    },
                    orderGlassDetail: {
                        completedArea:'',
                            wornArea:''
                    }
                }

            }
            this.selectProcessCardFilter={
                list:[],
@@ -99,6 +122,10 @@
                    }
                }
            }
            this.searchDeliverFilter={
                list:[],
                data:{}
            }
            this.projectNo=null
            this.optimizeData={
                optimalResults:null,