4.0.65 修改app单点登录地址 部门管理增加隐藏部门

package.json

@@ -1,7 +1,7 @@
 {
   "name": "client-base-v4",
   "description": "Leanwo Prodog Client",
-  "version": "4.0.64",
+  "version": "4.0.65",
   "author": "yangzhijie1488 <yangzhijie1488@163.com>",
   "scripts": {
     "dev": "cross-env webpack serve --config ./webpack.dev.js",

src/App.vue

@@ -124,6 +124,22 @@ export default {
           count = 1;
         }
 
+        if (path.indexOf('/CheckVouchImport/') >= 0) {
+          count = 1;
+        }
+
+        if (path.indexOf('/repertoryCheckWork/') >= 0) {
+          count = 1;
+        }
+
+        if (path.indexOf('/repertoryCheck/') >= 0) {
+          count = 1;
+        }
+
+        if (path.indexOf('/CheckVouchsImport/') >= 0) {
+          count = 1;
+        }
+
         if (window.top !== window.self) {
           count = 1;
         }

src/client/Archive.vue

@@ -235,7 +235,7 @@ export default {
      * 下载文件
      */
     download: function (item, type) {
-      var url = Common.getHostPageBaseURL() + item.reportUrl + type;
+      var url = Common.getHostPageBaseURL() + '/' + item.reportUrl + type;
       window.open(url);
     },
 

src/client/CasLogin.vue

@@ -83,7 +83,7 @@ export default {
                 Common.getRootPath() + '/#/desktop/dashboard';
             } else if (_self.internet === 'mobile') {
               window.location.href =
-                Common.getRootPath() + '/app.html#/desktop/moduleSelect';
+                Common.getRootPath() + '/app.html#/desktop/appMenu';
             } else {
               window.location.href =
                 Common.getRootPath() + '/propass.html#/propassapp/menu';

src/client/OrganizationEditPanel.vue

@@ -128,6 +128,14 @@
       >
         {{ $t("lang.OrganizationEditPanel.save") }}
       </a-button>
+      <a-button
+        v-if="!isCreate"
+        danger
+        style="margin-left: 8px"
+        @click="hiddenDepartment(organization)"
+      >
+        隐藏部门
+      </a-button>
     </template>
   </a-drawer>
   <a-drawer
@@ -305,6 +313,28 @@ const createOrganization = () => {
   organization.value.parentName = null;
 };
 
+// 隐藏部门
+const hiddenDepartment = info => {
+  $.ajax({
+    url: Common.getApiURL('organizationResource/concealOrganization'),
+    type: 'post',
+    beforeSend: function (request) {
+      Common.addTokenToRequest(request);
+    },
+    data: JSON.stringify(info),
+    contentType: 'application/json; charset=utf-8',
+    processData: false,
+    success: function (data) {
+      editVisible.value = false;
+      message.success(`${info.name}隐藏成功。`);
+      refreshData();
+    },
+    error: function (XMLHttpRequest, textStatus, errorThrown) {
+      Common.processException(XMLHttpRequest, textStatus, errorThrown);
+    },
+  });
+};
+
 // 创建按钮
 const createNew = organization => {
   organization.clientId = id.value;
@@ -496,7 +526,7 @@ const fetchUserList = (search, loading) => {
 
 // 上级部门change事件
 const parentOrganizationValueChanged = (value, label) => {
-  if(!value && label.length == 0){
+  if (!value && label.length == 0) {
     organization.value.parentId = null;
     organization.value.parentName = null;
     return;

src/client/SamlLogin.vue

@@ -75,7 +75,7 @@ export default {
                 Common.getRootPath() + '/#/desktop/dashboard';
             } else if (_self.internet === 'mobile') {
               window.location.href =
-                Common.getRootPath() + '/app.html#/desktop/moduleSelect';
+                Common.getRootPath() + '/app.html#/desktop/appMenu';
             } else {
               window.location.href =
                 Common.getRootPath() + '/propass.html#/propassapp/menu';