订单回退接口联调

Co-authored-by: Copilot <copilot@github.com>

src/views/productionManagement/returnManagement/components/preserve.vue

@@ -148,30 +148,24 @@ export default {
       this.$emit('updateDataChange', this.cardNo);
       getByCardNoByPlanAll({ cardNo: this.cardNo })
         .then(res => {
+          console.log(res.data, 'res.data');
           // this.cardNo = '';
           // if (Object.keys(res.data.data).length != 0) {
-          //   this.data = res.data.data;
+
           //   this.loading = false;
           // } else {
           //   this.loading = false;
           //   this.$message.error('未找到该流程卡号！');
           // }
-          res.data.data.forEach(item => {
+          this.data = res.data.data;
-            if (item.receiveMan.userId) {
+          this.loading = false;
-              item.receive = true;
-            } else {
-              item.receive = false;
-            }
-            this.plantList.push(item);
-          });
-          this.prWorkOrder = this.plantList[0].prWorkOrder;
           this.$message.success('操作成功');
         })
         .catch(err => {
           this.loading = false;
         });
     },
-    returnThisProcess() {
+    returnThisProcess(wpId) {
       this.$prompt('确定将订单退回至此工序,并输入退回理由:', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',

src/views/productionManagement/returnManagement/components/preserveLog.vue

@@ -105,6 +105,13 @@ export default {
             sortable: false,
             span: 12,
             searchOrder: 20,
+            searchRules: [
+              {
+                required: true,
+                message: '请选择配套日期',
+                trigger: 'blur',
+              },
+            ],
           },
           {
             label: '零件号',
@@ -136,7 +143,7 @@ export default {
           },
           {
             label: '回退人',
-            prop: 'ldapName',
+            prop: 'updateName',
             search: true,
             sortable: false,
             span: 12,
@@ -209,7 +216,7 @@ export default {
     onLoad(page, params = {}) {
       this.loading = true;
       getWorkPlanPreserve(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-        this.data = res.data.data.records;
+        this.data = res.data.data;
         this.loading = false;
         this.page.total = res.data.data.total;
       }).catch(err=>{