计划管理缺陷修复

src/views/equiptManagement/workwearManagement/index.vue

@@ -169,6 +169,22 @@ export default {
       }
       
     },
+    currentChange(currentPage){
+      this.page.currentPage = currentPage;
+      if(this.tabPosition == "feiBaSet"){
+        this.getFeiBa();
+      }else{
+        this.getRackSet();
+      }
+    },
+    sizeChange(pageSize){
+      this.page.pageSize = pageSize;
+      if(this.tabPosition == "feiBaSet"){
+        this.getFeiBa();
+      }else{
+        this.getRackSet();
+      }
+    },
     // 重置
     searchReset() {
       if (this.tabPosition == "feiBaSet") {

src/views/orderManagement/planYieIdOrder.vue

@@ -204,6 +204,7 @@ export default {
             label: '计划单号',
             prop: 'ypCode',
             search: true,
+            searchOrder:5,
             sortable: true,
             width: 150,
             span: 12,
@@ -223,6 +224,7 @@ export default {
             search: true,
             sortable: true,
             width: 150,
+            searchOrder:4,
             span: 12,
             headerAlign: 'center',
             align: 'center',
@@ -239,6 +241,7 @@ export default {
             prop: 'partCode',
             search: true,
             sortable: true,
+            searchOrder:2,
             width: 180,
             span: 12,
             headerAlign: 'center',
@@ -309,6 +312,7 @@ export default {
             label: '流程卡号',
             prop: 'cardNo',
             search: true,
+            searchOrder:3,
             sortable: true,
             width: 150,
             span: 12,
@@ -649,6 +653,7 @@ export default {
           {
             label: '接收状态',
             prop: 'receiveStatus',
+            type: 'select',
             search: true,
             sortable: true,
             span: 12,
@@ -668,6 +673,16 @@ export default {
               },
             ],
           },
+          {
+            label:"接收人",
+            prop: 'receiveUserName',
+            width: '140',
+          },
+          {
+            label:"接收时间",
+            prop: 'receiveTime',
+            width: '140',
+          },
           {
             label: '备注',
             prop: 'memo',
@@ -1075,10 +1090,17 @@ export default {
     async onLoad(page, params = {}) {
       this.loading = true;
       try {
+        let param = {
+          ...this.query,
+          releaseDateStart:this.query.releaseDate && this.query.releaseDate.length != 0 ? this.$dayjs(this.query.releaseDate[0]).format('YYYY-MM-DD') : null,
+          releaseDateEnd:this.query.releaseDate && this.query.releaseDate.length != 0 ? this.$dayjs(this.query.releaseDate[1]).format('YYYY-MM-DD') : null,
+        }
+        if(param.releaseDate) delete param.releaseDate;
+        console.log('para-----------',param)
         const res = await getHotOrderList({
           current:this.page.currentPage,
           size:this.page.pageSize,
-          ...this.query,
+          ...param,
         });
         this.data = res.data.data.records;
         this.page.total = res.data.data.total;

src/views/orderManagement/sinTerYieIdOrder.vue

@@ -248,6 +248,7 @@ export default {
             label: '计划单号',
             prop: 'ypCode',
             search: true,
+            searchOrder:5,
             sortable: true,
             width: 150,
             span: 12,
@@ -266,6 +267,7 @@ export default {
             prop: 'yoCode',
             search: true,
             sortable: true,
+            searchOrder:4,
             width: 150,
             span: 12,
             headerAlign: 'center',
@@ -282,6 +284,7 @@ export default {
             label: '零件号',
             prop: 'partCode',
             search: true,
+            searchOrder:2,
             sortable: true,
             width: 180,
             span: 12,
@@ -355,6 +358,7 @@ export default {
             prop: 'cardNo',
             search: true,
             sortable: true,
+            searchOrder:3,
             width: 150,
             span: 12,
             headerAlign: 'center',
@@ -736,6 +740,39 @@ export default {
               },
             ],
           },
+          {
+            label: '接收状态',
+            prop: 'receiveStatus',
+            type: 'select',
+            search: true,
+            sortable: true,
+            span: 12,
+            width: '140',
+            display: false,
+            // RECEIVE_STATUS_NO( name:"未接收",
+// RECEIVE_STATUS_YES(name:"已接收",
+// code:11000),code:11001)
+            dicData: [
+              {
+                value: 11000,
+                label: '未接收',
+              },
+              {
+                value: 11001,
+                label: '已接收',
+              },
+            ],
+          },
+          {
+            label:"接收人",
+            prop: 'receiveUserName',
+            width: '140',
+          },
+          {
+            label:"接收时间",
+            prop: 'receiveTime',
+            width: '140',
+          },
           {
             label: '备注',
             prop: 'memo',
@@ -1127,10 +1164,17 @@ export default {
     async onLoad(page, params = {}) {
       this.loading = true;
       try {
+        let param = {
+          ...this.query,
+          releaseDateStart:this.query.releaseDate && this.query.releaseDate.length != 0 ? this.$dayjs(this.query.releaseDate[0]).format('YYYY-MM-DD') : null,
+          releaseDateEnd:this.query.releaseDate && this.query.releaseDate.length != 0 ? this.$dayjs(this.query.releaseDate[1]).format('YYYY-MM-DD') : null,
+        }
+        if(param.releaseDate) delete param.releaseDate;
+      console.log('para-----------',param)
         const res = await getSinterOrderList({
           current:this.page.currentPage,
           size:this.page.pageSize,
-          ...this.query
+          ...param
         })
         this.data = res.data.data.records;
         this.page.total = res.data.data.total;