跳转登陆页

src/dashoo.cn/backend/api/controllers/oilsupplier/annualaudit.go

@@ -633,55 +633,6 @@ func (this *AnnualAuditController) AddEntity() {
 		this.Data["json"] = &errInfo
 		this.ServeJSON()
 	}
-	//annualId := model.Id
-	//svcActiviti := workflow.GetActivitiService(utils.DBE)
-	////启动工作流
-	//businessKey := utils.ToStr(annualId) + "-" + strconv.Itoa(model.AuditIndex)
-	//result := strconv.Itoa(this.User.IsCompanyUser)
-	//processInstanceId := svcActiviti.StartProcess2(workflow.OIL_AUDIT_APPLY, businessKey, this.User.Id, result, model.SupplierTypeName, model.SupplierName)
-	//var ActiComplete workflow.ActiCompleteVM
-	//ActiComplete.ProcessKey = workflow.OIL_AUDIT_APPLY
-	//ActiComplete.BusinessKey = businessKey
-	//ActiComplete.UserNames = firstAudit
-	//ActiComplete.UserId = this.User.Id
-	//ActiComplete.Result = "1"
-	//ActiComplete.Remarks = model.Remark
-	//ActiComplete.CallbackUrl = ""
-	//提交给二级单位初审
-	//receiveVal := svcActiviti.TaskComplete(ActiComplete)
-	//var auditmodel annualaudit.OilAnnualAudit
-	//auditmodel.WorkflowId = processInstanceId
-	//auditmodel.FirstAudit, _ = strconv.Atoi(firstAudit)
-	//auditmodel.AuditIndex = model.AuditIndex
-	//auditmodel.BusinessKey = businessKey
-	//cols := []string{
-	//	"Id",
-	//	"WorkflowId",
-	//	"FirstAudit",
-	//	"AuditIndex",
-	//	"BusinessKey",
-	//}
-	//if receiveVal == "true" {
-	//_, err = svc.UpdateEntityByIdCols(annualId, auditmodel, cols)
-	//if err == nil {
-	//	//新增
-	//	errinfo.Message = "添加成功！"
-	//	errinfo.Code = 0
-	//	errinfo.Item = model.Id
-	//	this.Data["json"] = &errinfo
-	//	this.ServeJSON()
-	//} else {
-	//	errinfo.Message = "添加失败！" + utils.AlertProcess(err.Error())
-	//	errinfo.Code = -1
-	//	this.Data["json"] = &errinfo
-	//	this.ServeJSON()
-	//}
-	//} else {
-	//	errinfo.Message = "工作流异常，请联系管理员！"
-	//	errinfo.Code = -1
-	//	this.Data["json"] = &errinfo
-	//	this.ServeJSON()
-	//}
 }
 
 func (this *AnnualAuditController) getTimeSub(t1, t2 time.Time) int {

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

@@ -508,9 +508,9 @@
       }
     },
     created () {
-      // if(this.authUser.Profile.IsCompanyUser==1){
-      //    this.$router.push('/oilsupplier/supplier') //跳转到登录页
-      // }
+      if (this.authUser.Profile.IsCompanyUser == 1) {
+        this.$router.push('/oilsupplier/supplier') // 跳转到登录页
+      }
       this.initDatas()
     },
     methods: {

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

@@ -1629,8 +1629,6 @@ export default {
           console.error(err)
         })
     },
-
-
     changeTypeCode () {
       let params = {
         Type: this.importData.Type
@@ -1720,11 +1718,11 @@ export default {
         })
         return false
       }
-      if (row.SupplierTypeCode === '01') { //物资类
+      if (row.SupplierTypeCode === '01') { // 物资类
         this.$router.push('/oilsupplier/supplier/' + row.Id + '/goodsedit?certid=' + row.CertId + '&showcy=true')
-      } else if (row.SupplierTypeCode === '02') { //服务类
+      } else if (row.SupplierTypeCode === '02') { // 服务类
         this.$router.push('/oilsupplier/supplier/' + row.Id + '/techedit?certid=' + row.CertId + '&showcy=true')
-      } else if (row.SupplierTypeCode === '03') { //物资类
+      } else if (row.SupplierTypeCode === '03') { // 物资类
         this.$router.push('/oilsupplier/supplier/' + row.Id + '/basisedit?certid=' + row.CertId + '&showcy=true')
       }
     },
@@ -1736,7 +1734,7 @@ export default {
         console.log(err)
       })
     },
-    getDictOptions2() {
+    getDictOptions2 () {
       let params = {
       }
       oapi.getDictListByStatus(params, this.$axios).then(res => {
@@ -1992,8 +1990,8 @@ export default {
           console.error(err)
         })
     },
-    //预留接口
-    ssearch(){
+    // 预留接口
+    ssearch () {
       let params = {
         Spesearch: this.Spesearch
       }
@@ -2037,10 +2035,11 @@ export default {
     clearSearch () {
       Object.assign(this.searchForm, this.searchFormReset)
       this.CityAry = []
-      this.SetupTime = '';
-      this.auditorg = '',
-      this.selectDept = '',
-      (this.LinkCityAry = []), (this.currentPage = 1)
+      this.SetupTime = ''
+      this.auditorg = ''
+      this.selectDept = ''
+      this.LinkCityAry = []
+      this.currentPage = 1
       this.initDatas()
     },
     formatDateTime (date) {