待办任务状态整理

src/dashoo.cn/backend/api/business/oilsupplier/suppliercert/oilsuppliercert.go

@@ -158,7 +158,7 @@ const (
 	PAYING_AUDIT_STATUS    string = "6"   //待交费
 	STOREING_STATUS        string = "7"   //待入库
 	STORE_STATUS           string = "8"   //已入库
-	LAW_AUDIT_STATUS	   string = "9"	  //企管法规处通过
+	LAW_AUDIT_STATUS	   string = "9"	  //企管法规处审批
 	FEN_TRIAL_STATUS       string = "10"  //二级单位分办
 	NOPASS_STATUS          string = "-1"  // 初审未通过
 	NO_SECOND_TRIAL_STATUS string = "-2"  // 复审未通过
@@ -166,7 +166,7 @@ const (
 	NO_PROF_AUDIT_STATUS   string = "-4"  // 专业处室未通过
 	NO_CENT_AUDIT_STATUS   string = "-5"  // 集中评审未通过
 	NO_STOREING_STATUS     string = "-7"  //待入库未通过
-	NO_LAW_AUDIT_STATUS	   string = "9"	  // 企管法规处未通过
+	NO_LAW_AUDIT_STATUS	   string = "-9"  // 企管法规处未通过
 	NO_FEN_TRIAL_STATUS    string = "-10" //二级单位分办未通过
 	ALL_PASE_STATUS        string = "11"  //审核完成
 

src/dashoo.cn/backend/api/business/todolist/todolist.go

@@ -24,7 +24,7 @@ const (
 	ANNUALAUDIT string = "3" // 年审
 	INFOCHANGE  string = "4" // 信息变更
 	REGISTER    string = "5" // 注册
-	STORAGE string = "7" // 入库
+	// STORAGE string = "7" // 入库
 	INVOICE string = "8" //待开发票
 	INCOME  string = "9" // 收入业务
 )

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

@@ -58,7 +58,7 @@
               <span v-if="scope.row.Type=='3'" style="color:#E6A23C">年审-{{scope.row.TaskName}}</span>
               <span v-if="scope.row.Type=='4'" style="color:#E6A23C">信息变更-{{scope.row.TaskName}}</span>
               <span v-if="scope.row.Type=='5'" style="color:#E6A23C">企业注册-待审批</span>
-              <span v-if="scope.row.Type=='7'" style="color:#E6A23C">准入-{{scope.row.TaskName}}</span>
+              <!-- <span v-if="scope.row.Type=='7'" style="color:#E6A23C">准入-{{scope.row.TaskName}}</span> -->
               <span v-if="scope.row.Type=='8'" style="color:#E6A23C">发票</span>
               <span v-if="scope.row.Type=='9'" style="color:#E6A23C">目录申请-{{scope.row.TaskName}}</span>
             </template>
@@ -167,7 +167,7 @@
 
             <el-table-column label="操作" width="130" align="center" fixed="right">
               <template slot-scope="scope">
-                <el-button type="text" title="打开"  icon="el-icon-edit" size="mini" @click="rowClick(scope.row)">打开</el-button>
+                <el-button type="text" title="打开"  icon="el-icon-edit" size="mini" @click="rowFinishedClick(scope.row)">打开</el-button>
                 <!--<el-button type="text" title="编辑"  icon="el-icon-s-promotion" size="mini">跟踪</el-button>-->
               </template>
             </el-table-column>
@@ -585,20 +585,22 @@
         }
       },
       rowClick (val) {
-        console.log('分流路由')
+        console.log('待办-分流路由')
         let SupplierType = ''
-        if (val.Status === '7' && val.Type === '1') {
-          // 待入库状态时直接跳转单独的入库审批页面,.信息变更入库不需要区分类型, 直接审批。
-          if (val.SupplierTypeCode === '01') {
-            SupplierType = 'goodsedit'
-          } else if (val.SupplierTypeCode === '02') {
-            SupplierType = 'basisedit'
+
+        if (val.Type == '1') { //准入
+          if (val.Status === '7') {
+            // 待入库状态时直接跳转单独的入库审批页面,.信息变更入库不需要区分类型, 直接审批。
+            if (val.SupplierTypeCode === '01') {
+              SupplierType = 'goodsedit'
+            } else if (val.SupplierTypeCode === '02') {
+              SupplierType = 'basisedit'
+            } else {
+              SupplierType = 'techedit'
+            }
+            this.$router.push('oilsupplier/supplierstorage/' + val.Id + '/' + SupplierType + '?certid=' + val.CertId + '&applytype=' + val.Type)
           } else {
-            SupplierType = 'techedit'
-          }
-          this.$router.push('oilsupplier/supplierstorage/' + val.Id + '/' + SupplierType + '?certid=' + val.CertId + '&applytype=' + val.Type)
-        } else {
-          if (val.Type === '1') {
+            // 到详情页面
             if (val.SupplierTypeCode === '01') {
               SupplierType = 'goodsedit'
             } else if (val.SupplierTypeCode === '02') {
@@ -612,54 +614,126 @@
             } else {
               this.$router.push('oilsupplier/supplieraudit/' + val.Id + '/' + SupplierType + '?certid=' + val.CertId)
             }
-          } else if (val.Type === '2') {
-            let appendId = ''
+          }
+
+        } else if (val.Type == '2') { //增项
+          let appendId = ''
+          if (val.SupplierTypeCode === '01') {
+            SupplierType = 'goodsdataopera'
+            appendId = '1'
+          } else if (val.SupplierTypeCode === '02') {
+            appendId = '2'
+            SupplierType = 'basisdataopera'
+          } else {
+            appendId = '3'
+            SupplierType = 'techdataopera'
+          }
+          if (Number(val.Status) <= 0) {
+            this.$router.push('oilsupplier/supplierappend/' + appendId + '/' + SupplierType + '?Id=' + val.Id + '&editFlag=1&sId=' + val.SupplierId)
+          }
+          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'
+          }
+          if (Number(val.Status) <= 0) {
+            this.$router.push('oilsupplier/annualaudit/' + val.SupplierId + '/' + SupplierType + '?certid=' + val.CertId + '&WorkflowId=' + val.WorkflowId + '&Status=' + val.Status + '&Step=' + val.Step + '&annualId=' + val.Id)
+          } else {
+            this.$router.push('oilsupplier/annualaudit/' + val.SupplierId + '/' + SupplierType + '?certid=' + val.CertId + '&WorkflowId=' + val.WorkflowId + '&AnnualStatus=' + val.Status + '&annualId=' + val.Id + '&Step=' + val.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)
+
+        } else if (val.Type == '9') { //目录申请
+          this.$router.push('/oilsupplier/oilcatalogsub/' + val.Id + '/incomeedit')
+        }
+      },
+      rowFinishedClick (val) {
+        console.log('已办-分流路由')
+        let SupplierType = ''
+
+        if (val.Type == '1') { //准入
+          if (val.TaskName == '企管法规处编号、入库') {
+            // 待入库状态时直接跳转单独的入库审批页面,.信息变更入库不需要区分类型, 直接审批。
             if (val.SupplierTypeCode === '01') {
-              SupplierType = 'goodsdataopera'
-              appendId = '1'
+              SupplierType = 'goodsedit'
             } else if (val.SupplierTypeCode === '02') {
-              appendId = '2'
-              SupplierType = 'basisdataopera'
+              SupplierType = 'basisedit'
             } else {
-              appendId = '3'
-              SupplierType = 'techdataopera'
-            }
-            if (Number(val.Status) <= 0) {
-              this.$router.push('oilsupplier/supplierappend/' + appendId + '/' + SupplierType + '?Id=' + val.Id + '&editFlag=1&sId=' + val.SupplierId)
+              SupplierType = 'techedit'
             }
-            this.$router.push('oilsupplier/addtionaudit/' + val.Id + '/' + SupplierType)
-          } else if (val.Type === '3') {
+            this.$router.push('oilsupplier/supplierstorage/' + val.Id + '/' + SupplierType + '?certid=' + val.CertId + '&applytype=' + val.Type)
+          } else {
+            // 到详情页面
             if (val.SupplierTypeCode === '01') {
-              SupplierType = 'auditoperation'
+              SupplierType = 'goodsedit'
             } else if (val.SupplierTypeCode === '02') {
-              SupplierType = 'basicauditoperation'
-            } else {
-              SupplierType = 'techoperation'
-            }
-            if (Number(val.Status) <= 0) {
-              this.$router.push('oilsupplier/annualaudit/' + val.SupplierId + '/' + SupplierType + '?certid=' + val.CertId + '&WorkflowId=' + val.WorkflowId + '&Status=' + val.Status + '&Step=' + val.Step + '&annualId=' + val.Id)
-            } else {
-              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 = '待开发票'
+              SupplierType = 'basisedit'
             } else {
-              this.invoicetitle = '已开发票'
+              SupplierType = 'techedit'
             }
-            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.$router.push('oilsupplier/supplieraudit/' + val.Id + '/' + SupplierType + '?certid=' + val.CertId)
           }
+
+        } else if (val.Type == '2') { //增项
+          let appendId = ''
+          if (val.SupplierTypeCode === '01') {
+            SupplierType = 'goodsdataopera'
+            appendId = '1'
+          } else if (val.SupplierTypeCode === '02') {
+            appendId = '2'
+            SupplierType = 'basisdataopera'
+          } else {
+            appendId = '3'
+            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)
+
+        } 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)
+
+        } else if (val.Type == '9') { //目录申请
+          this.$router.push('/oilsupplier/oilcatalogsub/' + val.Id + '/incomeedit')
         }
       },
+
       initInvoiceDatas (Id) {
         let params = {
           Id: Id
@@ -811,72 +885,81 @@
           console.error(err)
         })
       },
+      /** statusStr (val, type) {
+        if (type == '1') { //准入
+          this.statusApplyStr()
+        } else if (type == '2') { //增项
+          this.statusApplyStr()
+        } else if (type == '3') { //年审
+
+        } else if (type == '4') { //信息变更
+
+        } else if (type == '5') { //企业注册
+
+        } else if (type == '8') { //发票
+
+        } else if (type == '9') { //目录申请
+
+        }
+      },*/
       statusStr (val, type) {
         switch (val) {
-          case 1:
-            return '审核通过'
-          case 2:
-            return '审核未通过'
           case '':
             return '待提交'
           case '0':
             return '待提交'
           case '1':
-            if (type == '6') {
-              return '审核通过'
-            } else {
-              return '待初审'
-            }
-          case '-1':
-            return '初审未通过'
+            return '待初审'
           case '2':
-            if (type == '6') {
-              return '审核未通过'
-            } else {
-              return '待复审'
-            }
-          case '-2':
-            return '复审未通过'
+            return '待复审'
           case '3':
             return '待专业处室分办'
           case '4':
             return '待专业处室审批'
-          case '-4':
-            return '专业处室审批未通过'
           case '5':
-            if (type == '4') {
+            if (type == '3') { //年审
               return '待企业法规处审批'
-            } else if (type == '9') {
+            } else if (type == '4') { //信息变更
               return '待企业法规处审批'
-            } else if (type == '3') {
+            } else if (type == '9') { //目录申请
               return '待企业法规处审批'
             } else {
               return '待集中评审'
             }
-          case '-5':
-            if (type == '4') {
-              return '企业法规处审批未通过'
-            } else if (type == '9') {
-              return '待企业法规处审批'
-            } else {
-              return '集中评审未通过'
-            }
           case '6':
             return '待交费'
           case '7':
             return '待入库'
-          case '-7':
-            return '待入库未通过'
           case '8':
             return '已入库'
           case '9':
-            return '未通过'
+            return '待企管法规处审批'
           case '10':
             return '分办'
-          case '-10':
-            return '分办未通过'
           case '11':
             return '审核完成'
+          case '-1':
+            return '初审未通过'
+          case '-2':
+            return '复审未通过'
+          case '-3':
+            return '专业处室分办未通过'
+          case '-4':
+            return '专业处室审批未通过'
+          case '-5':
+            if (type == '4') { //信息变更
+              return '企管法规处审批未通过'
+            } else if (type == '9') { //目录申请
+              return '待企管法规处审批'
+            } else {
+              return '集中评审未通过'
+            }
+          case '-7':
+            return '入库未通过'
+          case '-9':
+            return '企管法规处审批未通过'
+          case '-10':
+            return '二级单位分办未通过'
           default:
             return val
         }
@@ -888,6 +971,8 @@
           return '年审交费'
         } else if (val === '3') {
           return '增项交费'
+        }  else if (val === '7') {
+          return '信息变更交费'
         } else {
           return val
         }