xs-common-plugins 1.1.3 → 1.1.7

package/README.md

@@ -258,4 +258,24 @@
 ```
    1.1.3
    1. common.js 文件增加报表操作相关公用方法（查询配置信息， 查询列表数据）
+```
+```
+   1.1.4
+   1. common.js 增加  common.updateData() 修改数据后， 刷新列表页函数
+   2. dic 字段， 移除 '0' 字符串 0 的 参数
+   3. 移除 common.getReportList() 获取列表页数据 函数 空数据入参
+```
+```
+   1.1.5
+   1. common.js common.exportExcel （报表导出） 方法， 移除空条件
+```
+```
+   1.1.6
+   1. 增加多租户却换
+   2. 兼容相同路由跳转警告问题
+   3. common.js 增加公用方法 this.$common.dic() 用于查询字典单条/多条数据
+```
+```
+   1.1.7
+   1. 多余显示移除
 ```

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xs-common-plugins",
-  "version": "1.1.3",
+  "version": "1.1.7",
   "private": false,
   "description": "向上公共代码部分",
   "author": "祝玲云 <1902733517@qq.com>",

package/src/common/common.js

@@ -4,6 +4,7 @@ import router from '@/router/index'
 import store from '@/store/index'
 import {OrgEnum} from '@/utils/enum'
 import filterRules from '@/utils/filterRules'
+import request from "xs-request";
 
 const common = {}
 
@@ -139,15 +140,23 @@ common.updateById = (that, url, query, callBack) => {
     })
 }
 /**
- * 判断多条数据
- * @param {*} that 
- * @param {*} row 要判断的数据 
- * @param {*} title 无数据/ 提示操作的 关键字
- * @param {*} check  默认 true  二次弹窗确认即将要做的提醒
+ * 判断多条数据  返回 true/false 或者 重新拼接好的 ids []
+ * @param {Object} that  传 this
+ * @param {Array} row 要判断的数据 
+ * @param {String} title 无数据/ 提示操作的 关键字
+ * @param {String} prop 默认 id  要取出数组中哪个字段汇成新数组 
+ * @param {Boolean} check  默认 true  二次弹窗确认即将要做的提醒
+ * 
+ * 使用场景 （列表页上批量操作数据后刷新列表页）
+ *  async updateRows () {
+ *      let ids = await this.$common.checkRows(this, this.selectRows, 'xxx')
+ *      if(!ids) retuen
+ *      this.$common.updateData(that, 'ask.xxx.xxx', {保存对象})
+ * }
  */
  common.checkRows = async (that, row, title, prop = "id", check = true) => {
     if(row.length == 0) { 
-        common.message(that, `无${title}的数据`, 'error'); 
+        common.message(that, `请选择数据`, 'error'); 
         return false;
     }
     if(check) {
@@ -157,9 +166,28 @@ common.updateById = (that, url, query, callBack) => {
         } catch (error) {
             return false
         }
+    } else {
+        return true
     }
 }
 
+/**
+ * 修改数据后， 刷新列表页
+ * @param {Object} that  传值 this
+ * @param {String} url  api 地址
+ * @param {Object} query  接口参数
+ * @param {Function} callBack 接口响应成功后， 界面上自行处理返回事件， 不传， 默认执行页面 getList 方法 (刷新列表页)
+ */
+common.updateData = (that, url, query, callBack) => {
+    let request = common.getObject(url)
+    request(Object.assign({}, query)).then(res => {
+        if(res.code !== 0) return
+        common.message(that, res.message)
+        if(callBack) callBack(res)
+        else that.getList && that.getList()
+    })
+}
+
 
 /**
  * 消息弹窗---自动消失
@@ -323,6 +351,10 @@ common.clone = (obj) => {
  common.exportExcel = async (url, query, fileName = 'demo', headers = { responseType: 'arraybuffer' }) => {
     let newQuery = JSON.parse(JSON.stringify(query)) 
     delete newQuery.data
+    for (const key in newQuery) {
+        if(newQuery[key] == null || newQuery[key] === '') 
+        delete newQuery[key]
+    }
     const httpRequest = common.getObject(url)
     const response = await httpRequest(newQuery, headers)
     const blob = new Blob([response], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8' })
@@ -428,6 +460,11 @@ common.getReportList = (that, url, query, callBack) => {
     else {
        let obj = Object.assign({}, that.data)
        delete obj.data
+       // 移除空项查询条件
+       for (const key in obj) {
+            if(obj[key] == null || obj[key] === '') 
+            delete obj[key]
+        }
        newQuery = Object.assign(obj, {report: that.reportCfgVal})
     }
     let request = common.getObject(url)
@@ -437,4 +474,49 @@ common.getReportList = (that, url, query, callBack) => {
     })
 }
 
+
+/**
+ * 字典表 里通过Id 查 name, 或者查询多条数据
+ * @param {Array} props  ['服务名', '表名', '字段名']
+ * @param {String, Number, Array} val 值， 传入id, 或者 [id1, id2, ...]
+ * 
+ * 使用案例  (异步方法)
+ *  async getValue () {
+ *     await this.$common.dic(['qccuser', 'Brand'], '10010')
+ *  }
+ *   
+ */
+
+common.dic = async (props, val) => {
+    let isArray = Array.isArray(val)
+    let server = props[0] || ''
+    let tableName = props[1] || ''
+    let prop = props[2] || 'name'
+    let key = server + tableName
+    if(store.getters.dic[key]) {
+        if(isArray) return await getDicVal()
+        let row =  store.getters.dic[key].find(item => item.id == val)
+        if(row && (row.isNull || row[prop] === null)) { return '' }
+        if(row) return row[prop]
+        if(!row) return await getDicVal()
+        
+    } else {
+        return await getDicVal()
+    }
+    async function getDicVal () {
+        let servers = props[0] || "";
+        let tableName = props[1] || "";
+        let key = servers + tableName;
+        let url = servers + "/UserAll/Search/Dic/" + tableName;
+        let res = await request.post(url, isArray ? val : [val])
+        if (res.code !== 0) return;
+        store.commit("dic/SET_ASK", { key, val: res.data });
+        if(isArray) return res.data
+        else {
+            let row = res.data.find(item => item.id == val)
+            return row ? row[prop] : ''
+        }
+    }
+}
+
 export default common

package/src/router/index.js

@@ -3,6 +3,10 @@ import VueRouter from 'vue-router'
 import autoRouter from '../automatically/router'
 Vue.use(VueRouter)
 
+const originalPush = VueRouter.prototype.push;
+VueRouter.prototype.push = function push(location) {
+  return originalPush.call(this, location).catch(err => err)
+}
 const routes = [
   {
     path: '/',

package/src/store/modules/dic.js

@@ -22,7 +22,7 @@
  let dicing = [];
  const actions = {
    GET_ASK({ state, commit }, { props, value }) {
-    if (!value) return;
+    if (!value || value == '0') return;
      let servers = props[0] || "";
      let tableName = props[1] || "";
      let key = servers + tableName;

package/src/utils/getMenu.js

@@ -77,6 +77,7 @@ function getApis () {
 
 export {
 
-  main
+  main,
+  initMenu
   
 }

package/src/views/layout/components/Navbar.vue

@@ -31,6 +31,7 @@
       <AllSearch />
       <div class="is-dot">
         <el-badge
+          style="margin: 0 3px;"
           v-if="isShowKF === 'isv' || isShowKF === 'erp'"
           is-dot
           class="item"
@@ -45,7 +46,7 @@
         </el-badge>
       </div>
       <div>
-        <el-tag>{{
+        <el-tag style="margin: 0 3px;">{{
           userProfile &&
           userProfile.hasOwnProperty("real_name") &&
           userProfile.real_name
@@ -61,6 +62,17 @@
               : "--未绑定--"
           }}
         </el-tag>
+      </div> 
+      <!-- 租户 -->
+      <div class="tenant" v-if="userProfile.TId">
+        <el-dropdown @command="changeTenant">
+          <span class="el-dropdown-link">
+            {{tenantList && tenantList[userProfile.TId]}}
+          </span>
+          <el-dropdown-menu slot="dropdown">
+            <el-dropdown-item v-for="(value, key) in tenantList" :key="key" :command="key">{{value}}</el-dropdown-item>
+          </el-dropdown-menu>
+        </el-dropdown>
       </div>
       <el-dropdown class="avatar-container" trigger="click">
         <div class="avatar-wrapper">
@@ -107,7 +119,9 @@ import AllSearch from "./AllSearch";
 import { getConfig } from "@/utils/global-config";
 import { getToken, removeToken, removeLocalToken } from "@/utils/auth"; // get token from cookie
 import ImCom from "@/components/im";
-import { getLocalStorage } from "@/utils/localStorage";
+import { getLocalStorage, setLocalStorage } from "@/utils/localStorage";
+import { setToken } from "@/utils/auth"; // get token from cookie
+import { initMenu } from '@/utils/getMenu'
 
 export default {
   components: {
@@ -136,6 +150,7 @@ export default {
       LoginName: false,
       isShowKF: getConfig("GROUP"),
       defaultParentId: "887904812217cca9bc2b9adb875daf42",
+      tenantList: [], // 租户列表
     };
   },
   computed: {
@@ -146,8 +161,29 @@ export default {
     if (userName === "admin") {
       this.LoginName = true;
     }
+    if(this.userProfile.TId) this.getTenantList()
   },
   methods: {
+    changeTenant (id) {
+       if(id === this.userProfile.TId) return
+        this.$router.push("/home")
+        this.$ask.ucmng.api.sysmng.Tenant.SwitchTenant({clientId: getConfig('CLIENT_ID'), newTId: id}).then(res => {
+          let newuser = this.userProfile
+          newuser.TId = id
+          setLocalStorage('userProfile', newuser)
+          this.userProfile = getLocalStorage('userProfile')
+          let user = res.data
+            setToken(user.accessToken);
+            localStorage.setItem("token", user.accessToken);
+            initMenu()
+            
+        })
+    },
+    getTenantList () {
+      this.$ask.ucmng.api.sysmng.Tenant.GetTenants().then(res => {
+        this.tenantList = res.data
+      })
+    },
     toggleSideBar() {
       this.$store.dispatch("app/toggleSideBar");
     },
@@ -279,6 +315,10 @@ export default {
     }
   }
 
+  .tenant {
+    padding: 0 10px;
+  }
+
   .breadcrumb-container {
     float: left;
   }