后:iam

src/dashoo.cn/backend/api/business/iamlogin/IamLoginService.go

@@ -69,6 +69,6 @@ func (s *IamLoginService) HandleIamLogin(appCode string, secret string, code str
 	log.Println("resp.Body= ", body)
 	var iamJson iam
 	json.Unmarshal(body, &iamJson)
-
+	log.Println("Result= ", iamJson.Result)
 	return iamJson
 }

src/dashoo.cn/backend/api/controllers/iamlogin/iamLogin.go

@@ -50,19 +50,26 @@ func (this *IamLoginController) IamLogin() {
 	var user userRole.Base_User
 
 	userName := ""
+	log.Println("userName= ", userName)
 	if iamJson.Code != 200 {
 		this.Abort("777" + iamJson.Msg)
 	}
 	if iamJson.Result.UserAD != "" {
 		userName = iamJson.Result.UserAD
+		log.Println("userName1= ", userName)
+
 	} else {
 		if iamJson.Result.UserNo != "" {
 			var userEntity userRole.Base_User
 			svc := userRole.GetUserService(utils.DBE)
 			svc.GetEntity (&userEntity, "UserNo = '" + iamJson.Result.UserNo + "'")
 			userName = userEntity.Username
+			log.Println("userName2= ", userName)
+
 		}
 	}
+	log.Println("userName3= ", userName)
+
 	if userName != "yanshi" {
 		//sql := " UserName='" + user4CreateToken.Username + "'"
 		var baseUser userRole.Base_User

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

@@ -38,7 +38,9 @@
             </el-dropdown>
           </el-form-item>
           <el-form-item>
-            <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" v-if="formData.CatalogType == '7'">申请</el-button>
+            <router-link :to="'/oilsupplier/oilcatalogsub/add/incomeedit'">
+              <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" v-if="formData.CatalogType == '7'">申请</el-button>
+            </router-link>
             <el-button type="primary" size="mini" @click="addOilcatalog" v-if="showBtn">添加</el-button>
             <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" @click="exportExcel">导出</el-button>
             <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" @click="importExcel" v-if="showBtn">导入</el-button>