diff --git a/src/views/jhzx/ydjhzxCX.vue b/src/views/jhzx/ydjhzxCX.vue
index 9adc4fc..fa93621 100644
--- a/src/views/jhzx/ydjhzxCX.vue
+++ b/src/views/jhzx/ydjhzxCX.vue
@@ -146,6 +146,7 @@ export default {
         zt: ''
       },
       list: [],
+      allList_mx:[],
       list1: [],
       checkedList: [],
       heads: { token: getToken() },
@@ -781,6 +782,7 @@ export default {
       this.dateTime=XEUtils.toDateString(XEUtils.getWhatDay(new Date(), 0, 'first'),'yyyy/MM/dd')
     },
     changeData(){
+      this.dataChange_mx(this.allList_mx)
       this.dataChange(this.allList)
     },
     dataChange(arr){
@@ -800,7 +802,27 @@ export default {
             this.list1.push(item)
           }
         })
-      }    },
+      }
+      },
+    dataChange_mx(arr){
+      this.list=[]
+      //判断是否展示全部数据 已完成 未完成
+      if(this.wgqk=='0'){ this.list=arr}
+      if(this.wgqk=='1'){
+        arr.forEach(item=>{
+          if (item.qgfkry||item.qgfkrq){
+            this.list.push(item)
+          }
+        })
+      }
+      if(this.wgqk=='2'){
+        arr.forEach(item=>{
+          if (!item.qgfkry||!item.qgfkrq){
+            this.list.push(item)
+          }
+        })
+      }
+    },
     formatWorker({cellValue}){
       return this.workers[cellValue]
     },
@@ -1028,7 +1050,10 @@ export default {
         this.activeName = 'second'
         const zyqColumn=this.$refs.xGrid.getColumnByField('zyq')
         zyqColumn.editRender.options=this.zyqList
-        this.list = res.data
+        //明细——根据切割反馈人或时间有没有判断
+        this.allList_mx= res.data
+        this.dataChange_mx(this.allList_mx)
+
       })
     },
   }