Merge branch 'dev-cme-1216' into 'release'

立即申请按钮添加状态 codereviewer: 杨广俊

立即申请按钮添加状态 codereviewer: 杨广俊

See merge request !3

src/views/merge-detail.vue

@@ -332,7 +332,14 @@ export default {
             permCode: "009014"
           };
           rocNative.checkPermissions(params);
-        } else if (res.code == "219012") {
+        } 
+        // else if (res.code == "219012") {
+        //   this.dialogContent = res.message;
+        //   this.cancleBtnText = "我知道了";
+        //   this.isShowDialog = true;
+        //   this.isSingle = true;
+        // }
+        else {
           this.dialogContent = res.message;
           this.cancleBtnText = "我知道了";
           this.isShowDialog = true;