排产分析页面逻辑调整

src/views/productionSchedulingPlan/statisticalAnalysis/components/orderDialog.vue

@@ -57,6 +57,10 @@ export default {
       type: String,
       default: '',
     },
+    searchQuery: {
+      type: Object,
+      default: () => {},
+    },
   },
   data() {
     return {
@@ -144,6 +148,15 @@ export default {
             format: 'YYYY-MM-DD',
             valueFormat: 'YYYY-MM-DD',
           },
+          {
+            label: '异常原因',
+            prop: 'errorInfo',
+            search: false,
+            sortable: true,
+            hide:true,
+            width: 250,
+            span: 12,
+          },
           {
             label: '调度员',
             prop: 'dispatcher',
@@ -302,17 +315,38 @@ export default {
   },
   mounted() {
     this.openShow = this.showDialog;
+    console.log(this.showType);
+    
     if(this.showAll=='all'){
       this.option.column[0].search = true;
       this.option.column[1].search = true;
       this.option.header=true
       // this.option.column[0].search = true;
+      if(this.searchQuery.cycledate && this.searchQuery.cycledate.length>0){
+        this.query.cycledate = [ this.searchQuery.cycledate[0], this.searchQuery.cycledate[1]];
+        this.query.startTime = this.searchQuery.cycledate[0];
+        this.query.endTime = this.searchQuery.cycledate[1];
+
+      }
 
+    }else{
+      this.query.workCenterId = this.rowData.workCenterId;
+    }
+    if(this.showType=='10006'){
+       this.option.column.forEach((item)=>{
+         if(item.prop=='errorInfo'){
+           item.hide = false;
+         }
+       })
+      this.option.column[3].hide = true;
     }
-    this.query.workCenterId = this.rowData.workCenterId;
+    
     this.onLoad(this.page, this.query);
   },
   methods: {
+    submit(){
+      this.closeDialog()
+    },
     closeDialog() {
       this.openShow = false;
       this.$emit('closeDialog');
@@ -357,10 +391,18 @@ export default {
     onLoad(page, params = {}) {
       this.loading = true;
       this.data = [];
-      if (!!params.cycledate) {
+      
-        this.query.startTime = params.cycledate[0];
+     
-        this.query.endTime = params.cycledate[1];
+      if(this.searchQuery.cycledate && this.searchQuery.cycledate.length>0){
+        this.query.startTime = this.searchQuery.cycledate[0];
+        this.query.endTime = this.searchQuery.cycledate[1];
       }
+      // if (!!params.cycledate) {
+      //   this.query.startTime = params.cycledate[0];
+      //   this.query.endTime = params.cycledate[1];
+      // }
+        
+   
 
       getYieldOrderList(
         page.currentPage,

src/views/productionSchedulingPlan/statisticalAnalysis/index.vue

@@ -86,6 +86,7 @@
       @close="closeDialog"
       :rowData="rowData"
       :showAll="showAll"
+      :searchQuery="searchQuery"
     />
   </basic-container>
 </template>
@@ -219,6 +220,7 @@ export default {
       showType: '',
       rowData: {},
       columnWidthsData: [],
+      searchQuery:{}
     };
   },
   methods: {
@@ -255,6 +257,8 @@ export default {
     showOrderDetail(row, type, all) {
       this.rowData = row;
       this.showDialog = true;
+      this.searchQuery = {...this.query}
+      console.log(9999,this.query)
       this.showAll=all
       // 总订单
       if (type == 'totalCount') {