后退数据反馈

src/views/goodStore/goodsCost/index.vue

@@ -40,8 +40,8 @@
                 :value="brandid"
                 :disabled="false"
                 :size="'mini'"
-                :isDetail="false"
-                :names="''"
+                :isDetail="true"
+                :names="parmValue.supplierName"
                 :placeholder="'商品品牌'"
                 @searchChange="brandidsearchChange"
               />
@@ -238,12 +238,8 @@
         >
           <i
             class="el-icon-view tb-icon"
-            @click="
-              routeGoto('goodsCostDetail', {
-                id: scope.row.spuCode,
-                type: 'view',
-              })
-            "
+            
+            @click="getRouter('goodsCostDetail', scope.row.spuCode )"
           ></i>
         </el-tooltip>
         <el-tooltip
@@ -475,12 +471,61 @@ export default {
     };
   },
   mounted() {
+    const { back } = this.$route.query;
+    if (back) {
+      this.parmValue = JSON.parse(back);
+      console.log(this.parmValue)
+      const {page,size}=this.parmValue;
+      // this.parmValue.start = start || last_start;
+      // this.parmValue.end = end || last_end;
+      if(this.parmValue.brandid.length>0){
+        this.brandid = [this.parmValue.brandid] ;
+      }
+      
+       this.pageInfo= {
+        size: size,
+        curr: page,
+        total: 0,
+      }
+      //多选条件
+    this.select = this.parmValue.select;
+    // this.sselect = this.parmValue.sselect;
+    this.sinput = this.parmValue.sinput
+
+    }else{
+       this.select = "1";
+      //  this.sselect = "创建时间"
+    }
     this.select = "1";
     this.supplierNo = [];
-    this.brandid = [];
+    
     this.searchList();
   },
   methods: {
+    getRouter(toRouter, queryId){
+      if (toRouter && queryId) {
+        let model = {
+          id: queryId,
+          type: 'view',
+        };
+
+        //有多选框的条件
+        this.parmValue.select = this.select ;
+        // this.parmValue.sselect = this.sselect ;
+        this.parmValue.sinput= this.sinput;
+        //
+        console.log(this.parmValue)
+         let routerModel = {
+          options: JSON.parse(JSON.stringify(this.parmValue)),
+          router: this.$route.path,
+        };
+        model.preModel = JSON.stringify(routerModel);
+        
+        this.routeGoto(toRouter, model);
+      } else {
+        this.$message.warning("暂未找到相关流程！");
+      }
+    },
     restSearch() {
       this.select = "1";
       this.supplierNo = [];
@@ -554,13 +599,18 @@ export default {
     },
     //商品品牌选择
     async brandidsearchChange(e) {
+     
       const { id, code, label } = e;
       if (id) {
         this.brandid = [id];
+        this.parmValue.brandid = id;
+        this.parmValue.supplierName = label;
       } else {
         this.brandid = [];
+        this.parmValue.brandid = "";
+        this.parmValue.supplierName = "";
       }
-      this.parmValue.brandid = this.brandid.toString();
+      // this.parmValue.brandid = this.brandid.toString();
       this.pageInfo.curr = 1;
       this.parmValue.page = 1;
       await this.searchList();
@@ -681,11 +731,11 @@ export default {
         return;
       }
       this.loading = true;
-      this.parmValue.spucode = this.select === "1" ? this.sinput : "";
-      this.parmValue.good_name = this.select === "2" ? this.sinput : "";
-      this.parmValue.companyNo = this.select === "3" ? this.sinput : "";
-      this.parmValue.supplierNo = this.select === "4" ? this.sinput : "";
       let item = JSON.parse(JSON.stringify(this.parmValue));
+      item.spucode = this.select === "1" ? this.sinput : "";
+      item.good_name = this.select === "2" ? this.sinput : "";
+      item.companyNo = this.select === "3" ? this.sinput : "";
+      item.supplierNo = this.select === "4" ? this.sinput : "";
       item.cat_id =
         item.cat_id.length > 0 ? item.cat_id[item.cat_id.length - 1] : "";
       const res = await asyncRequest.list(item);

src/views/sellOut/returnOrder/index.vue

@@ -379,7 +379,7 @@ export default {
       this.loading = true;
       this.parmValue.post_code =
         this.select === "expressNo" ? this.s_input : "";
-      this.parmValue.customer_code = this.parmValue.return_code =
+     this.parmValue.return_code =
         this.select === "serviceNo" ? this.s_input : "";
       this.parmValue.out_code =
         this.select === "outOrderNo" ? this.s_input : "";

src/views/sellOut/sellReturn/index.vue

@@ -139,9 +139,8 @@
           >
             <i
               class="el-icon-view tb-icon"
-              @click="
-                routeGoto('sellReturnDetail', { id: scope.row.returnCode })
-              "
+              
+               @click="getRouter('sellReturnDetail', scope.row.returnCode )"
             ></i>
           </el-tooltip>
         </template>
@@ -229,10 +228,58 @@ export default {
     };
   },
   mounted() {
+    const { back } = this.$route.query;
+    if (back) {
+      this.parmValue = JSON.parse(back);
+      console.log(this.parmValue)
+      const {page,size}=this.parmValue;
+      // this.parmValue.start = start || last_start;
+      // this.parmValue.end = end || last_end;
+      // if(this.parmValue.companyNo.length>0){
+      //     this.customerCode = [this.parmValue.companyNo] ;
+      // }
+      
+       this.pageInfo= {
+        size: size,
+        curr: page,
+        total: 0,
+      }
+      //多选条件
+    this.select = this.parmValue.select;
+    // this.sselect = this.parmValue.sselect;
+    this.s_input = this.parmValue.s_input
+
+    }else{
+       this.select = "returnCode";
+      //  this.sselect = "创建时间"
+    }
     this.searchList();
   },
 
   methods: {
+    getRouter(toRouter, queryId){
+      if (toRouter && queryId) {
+        let model = {
+          id: queryId,
+          // type: 'view',
+        };
+
+        //有多选框的条件
+        this.parmValue.select = this.select ;
+        // this.parmValue.sselect = this.sselect ;
+        this.parmValue.s_input= this.s_input;
+        //
+         let routerModel = {
+          options: JSON.parse(JSON.stringify(this.parmValue)),
+          router: this.$route.path,
+        };
+        model.preModel = JSON.stringify(routerModel);
+        
+        this.routeGoto(toRouter, model);
+      } else {
+        this.$message.warning("暂未找到相关流程！");
+      }
+    },
     restSearch() {
       this.s_input = ""; //清除输入框内容
       this.select = ""; //清除下拉框选中项

src/views/sellOut/zxDiffOrder/index.vue

@@ -143,7 +143,8 @@
           >
             <i
               class="el-icon-view tb-icon"
-              @click="routeGoto('zxDiffOrderDetail', { id: scope.row.id })"
+             
+              @click="getRouter('zxDiffOrderDetail', scope.row.id )"
             ></i>
           </el-tooltip>
         </template>
@@ -239,10 +240,58 @@ export default {
     };
   },
   mounted() {
+    const { back } = this.$route.query;
+    if (back) {
+      this.parmValue = JSON.parse(back);
+      console.log(this.parmValue)
+      const {page,size}=this.parmValue;
+      // this.parmValue.start = start || last_start;
+      // this.parmValue.end = end || last_end;
+      // if(this.parmValue.companyNo.length>0){
+      //     this.customerCode = [this.parmValue.companyNo] ;
+      // }
+      
+       this.pageInfo= {
+        size: size,
+        curr: page,
+        total: 0,
+      }
+      //多选条件
+    this.select = this.parmValue.select;
+    // this.sselect = this.parmValue.sselect;
+    this.s_input = this.parmValue.s_input
+
+    }else{
+       this.select = "1";
+      //  this.sselect = "创建时间"
+    }
     this.searchList();
   },
 
   methods: {
+    getRouter(toRouter, queryId){
+      if (toRouter && queryId) {
+        let model = {
+          id: queryId,
+          // type: 'view',
+        };
+
+        //有多选框的条件
+        this.parmValue.select = this.select ;
+        // this.parmValue.sselect = this.sselect ;
+        this.parmValue.s_input= this.s_input;
+        //
+         let routerModel = {
+          options: JSON.parse(JSON.stringify(this.parmValue)),
+          router: this.$route.path,
+        };
+        model.preModel = JSON.stringify(routerModel);
+        
+        this.routeGoto(toRouter, model);
+      } else {
+        this.$message.warning("暂未找到相关流程！");
+      }
+    },
     async timeReturned(e) {
       if (e.startTime !== "") {
         this.parmValue.start = e.startTime;