待办任务列表-办理按钮跳转判断

src/dashoo.cn/frontend_web/src/pages/index.vue

@@ -584,39 +584,8 @@
       },
       rowClick (val) {
         let SupplierType = ''
-        if (val.Type === '1') {
-          if (val.SupplierTypeCode === '01') {
-            SupplierType = 'goodsedit'
-          } else if (val.SupplierTypeCode === '02') {
-            SupplierType = 'basisedit'
-          } else {
-            SupplierType = 'techedit'
-          }
-          this.$router.push('oilsupplier/supplieraudit/' + val.Id + '/' + SupplierType + '?certid=' + val.CertId)
-        } else if (val.Type === '2') {
-          if (val.SupplierTypeCode === '01') {
-            SupplierType = 'goodsdataopera'
-          } else if (val.SupplierTypeCode === '02') {
-            SupplierType = 'basisdataopera'
-          } else {
-            SupplierType = 'techdataopera'
-          }
-          this.$router.push('oilsupplier/addtionaudit/' + val.Id + '/' + SupplierType)
-        } else if (val.Type === '3') {
-          if (val.SupplierTypeCode === '01') {
-            SupplierType = 'auditoperation'
-          } else if (val.SupplierTypeCode === '02') {
-            SupplierType = 'basicauditoperation'
-          } else {
-            SupplierType = 'techoperation'
-          }
-          this.$router.push('oilsupplier/annualaudit/' + val.SupplierId + '/' + SupplierType + '?certid=' + val.CertId + '&WorkflowId=' + val.WorkflowId + '&AnnualStatus=' + val.Status + '&annualId=' + val.Id + '&Step=' + val.Step)
-          // /oilsupplier/annualaudit/' + scope.row.SupplierId + '/auditoperation?certid=' + scope.row.CerId +'&WorkflowId='+scope.row.WorkflowId+'&AnnualStatus='+scope.row.Status+'&annualId='+scope.row.Id+'&Step='+scope.row.Step
-        } else if (val.Type === '4') {
-          this.$router.push('/oilsupplier/infochangech/' + val.Id + '/auditoperation?InfoStatus='+ val.Status+'&SupId='+val.SupplierId)
-        } else if (val.Type === '5') {
-          this.initDataregister(val.Id)
-        } else if (val.Type === '7') {
+        if (val.Status === '7' && val.Type !== '04') {
+          // 待入库状态时直接跳转单独的入库审批页面,.信息变更入库不需要区分类型, 直接审批。
           if (val.SupplierTypeCode === '01') {
             SupplierType = 'goodsedit'
           } else if (val.SupplierTypeCode === '02') {
@@ -625,17 +594,51 @@
             SupplierType = 'techedit'
           }
           this.$router.push('oilsupplier/supplierstorage/' + val.Id + '/' + SupplierType + '?certid=' + val.CertId)
-        } else if (val.Type === '8') {
-          if (val.Status === '未开') {
-            this.invoicetitle = '待开发票'
-          } else {
-            this.invoicetitle = '已开发票'
+        } else {
+          if (val.Type === '1') {
+            if (val.SupplierTypeCode === '01') {
+              SupplierType = 'goodsedit'
+            } else if (val.SupplierTypeCode === '02') {
+              SupplierType = 'basisedit'
+            } else {
+              SupplierType = 'techedit'
+            }
+            this.$router.push('oilsupplier/supplieraudit/' + val.Id + '/' + SupplierType + '?certid=' + val.CertId)
+          } else if (val.Type === '2') {
+            if (val.SupplierTypeCode === '01') {
+              SupplierType = 'goodsdataopera'
+            } else if (val.SupplierTypeCode === '02') {
+              SupplierType = 'basisdataopera'
+            } else {
+              SupplierType = 'techdataopera'
+            }
+            this.$router.push('oilsupplier/addtionaudit/' + val.Id + '/' + SupplierType)
+          } else if (val.Type === '3') {
+            if (val.SupplierTypeCode === '01') {
+              SupplierType = 'auditoperation'
+            } else if (val.SupplierTypeCode === '02') {
+              SupplierType = 'basicauditoperation'
+            } else {
+              SupplierType = 'techoperation'
+            }
+            this.$router.push('oilsupplier/annualaudit/' + val.SupplierId + '/' + SupplierType + '?certid=' + val.CertId + '&WorkflowId=' + val.WorkflowId + '&AnnualStatus=' + val.Status + '&annualId=' + val.Id + '&Step=' + val.Step)
+            // /oilsupplier/annualaudit/' + scope.row.SupplierId + '/auditoperation?certid=' + scope.row.CerId +'&WorkflowId='+scope.row.WorkflowId+'&AnnualStatus='+scope.row.Status+'&annualId='+scope.row.Id+'&Step='+scope.row.Step
+          } else if (val.Type === '4') {
+            this.$router.push('/oilsupplier/infochangech/' + val.Id + '/auditoperation?InfoStatus=' + val.Status + '&SupId=' + val.SupplierId)
+          } else if (val.Type === '5') {
+            this.initDataregister(val.Id)
+          } else if (val.Type === '8') {
+            if (val.Status === '未开') {
+              this.invoicetitle = '待开发票'
+            } else {
+              this.invoicetitle = '已开发票'
+            }
+            this.initInvoiceDatas(val.Id)
+            this.invoiceVisible = true
+          } else if (val.Type === '9') {
+            // /oilsupplier/oilcatalogsub/2/incomeedit
+            this.$router.push('/oilsupplier/oilcatalogsub/' + val.Id + '/incomeedit')
           }
-          this.initInvoiceDatas(val.Id)
-          this.invoiceVisible = true
-        } else if (val.Type === '9') {
-          // /oilsupplier/oilcatalogsub/2/incomeedit
-          this.$router.push('/oilsupplier/oilcatalogsub/' + val.Id + '/incomeedit')
         }
       },
       initInvoiceDatas (Id) {