Merge branch 'sit'

src/views/goodStore/active/index.vue

@@ -173,12 +173,8 @@
         >
           <i
             class="el-icon-view tb-icon"
-            @click="
-              routeGoto('activeDetail', {
-                id: scope.row.activity_code,
-                type: 'view',
-              })
-            "
+           
+            @click="getRouter('activeDetail', scope.row.activity_code, )"
           ></i>
         </el-tooltip>
       </template>
@@ -266,9 +262,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.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.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.pageInfo = {

src/views/goodStore/dealGoodsPool/index.vue

@@ -163,6 +163,7 @@
           placement="top"
         >
           <i class="el-icon-view tb-icon" @click="show_view(scope.row)"></i>
+           
         </el-tooltip>
       </template>
     </ex-table>

src/views/interest/handover/index.vue

@@ -52,7 +52,8 @@
                   <search-account
                     :value="resign_uid"
                     :disabled="false"
-                    :is-detail="false"
+                    :is-detail="true"
+                    :names="parmValue.supplierName"
                     :size="searchSize"
                     :placeholder="'离职人姓名'"
                     @searchChange="handleResignName"
@@ -100,7 +101,8 @@
                     :value="hand_uid"
                     :size="searchSize"
                     :disabled="false"
-                    :is-detail="false"
+                    :is-detail="true"
+                    :names="parmValue.supplierName_js"
                     :placeholder="'接受人姓名'"
                     @searchChange="handleHandoverName"
                   />
@@ -159,7 +161,7 @@
           >
             <i
               class="el-icon-view tb-icon"
-              @click="routeGoto('handoverDetail', { id: scope.row.id })"
+               @click="getRouter('handoverDetail', scope.row.id  )"
             ></i>
           </el-tooltip>
         </template>
@@ -284,9 +286,62 @@ 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.resign_uid.length>0){
+        this.resign_uid = [this.parmValue.resign_uid] ;
+      }
+      if(this.parmValue.hand_uid.length>0){
+        this.hand_uid = [this.parmValue.hand_uid] ;
+      }
+      
+      
+       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.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.parmValue = {
         start: "", //开始 end结束时间
@@ -337,6 +392,7 @@ export default {
     async handleResignName(e) {
       this.parmValue.resign_uid = e && e.id ? e.id : "";
       this.resign_uid = e && e.id ? [e.id] : [];
+      this.parmValue.supplierName = e && e.label ? e.label : "";
       this.parmValue.page = 1;
       await this.searchList();
     },
@@ -344,6 +400,7 @@ export default {
     async handleHandoverName(e) {
       this.parmValue.hand_uid = e && e.id ? e.id : "";
       this.hand_uid = e && e.id ? [e.id] : [];
+      this.parmValue.supplierName_js = e && e.label ? e.label : "";
       this.parmValue.page = 1;
       await this.searchList();
     },

src/views/orderEntry/orderEnter/index.vue

@@ -275,7 +275,7 @@
           >
             <i
               class="el-icon-view tb-icon"
-              @click="wantGo(scope.row.id, scope.row.status)"
+               @click="getRouter('orderConfirm', scope.row.id, scope.row.status)"
             ></i>
           </el-tooltip>
           <el-tooltip
@@ -429,11 +429,64 @@ export default {
     },
   },
   mounted() {
-    this.select = "1";
+     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.inputValue = this.parmValue.inputValue
+
+    }else{
+       this.select = "1";
+      //  this.sselect = "创建时间"
     this.tableData = [];
+    }
+    this.select = "1";
     this.searchList();
   },
   methods: {
+     getRouter(toRouter,queryId, status) {
+      if (status === "1") {
+        this.$message.warning(`脚本验证中的数据能查看详情！`);
+        return;
+      }
+      if (toRouter && queryId) {
+        let model = {
+          id: queryId,
+          type: 'view',
+        };
+
+        //有多选框的条件
+        this.parmValue.select = this.select ;
+        // this.parmValue.sselect = this.sselect ;
+        this.parmValue.inputValue= this.inputValue;
+        //
+        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("暂未找到相关流程！");
+      }
+    },
     //初始化请求
     async searchList() {
       if (
@@ -538,16 +591,7 @@ export default {
       this.parmValue.platform_time_end = e.endTime || "";
       await this.searchList();
     },
-    wantGo(id, status) {
-      if (status === "1") {
-        this.$message.warning(`脚本验证中的数据能查看详情！`);
-        return;
-      }
-      this.routeGoto("orderConfirm", {
-        id: id,
-        type: "view",
-      });
-    },
+   
     //批量关联库存规则判断
     selectStockIf() {
       if (this.changeList.length <= 0) {

src/views/serviceParam/supplier/index.vue

@@ -194,12 +194,8 @@
         >
           <i
             class="el-icon-view tb-icon"
-            @click="
-              routeGoto('supplierDetail', {
-                id: scope.row.id,
-                type: 'view',
-              })
-            "
+            
+             @click="getRouter('supplierDetail', scope.row.id )"
           ></i>
         </el-tooltip>
         <el-tooltip
@@ -399,9 +395,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.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.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.pageInfo = {