system-clients 3.2.90 → 3.2.93

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "system-clients",
-  "version": "3.2.90",
+  "version": "3.2.93",
   "description": "系统基础框架",
   "main": "src/index.js",
   "directories": {

package/src/components/Main.vue

@@ -259,7 +259,6 @@ let createWaterMark = function (userName) {
         qrCode:false,
         isManger: false,
         show: false,
-        orgpathnames: `${this.$login.f.orgs}-${this.$login.f.deps}-${this.$login.f.name}`,
         systemname: '客服系统',
         date: this.$login.toStandardDateString(),
         tabs: [],       //已初始化页签数组
@@ -611,6 +610,17 @@ let createWaterMark = function (userName) {
     }
   },
   computed: {
+    orgpathnames(){
+      let names = this.$login.f.name
+      if(this.$login.f.deps){
+          names = `${this.$login.f.deps}-${names}`
+      }
+      if(this.$login.f.orgs){
+          names = `${this.$login.f.orgs}-${names}`
+      }
+      return names
+    },
+
     nowDate() {
       return this.$login.getNowDate()
     }

package/src/components/server/ResSelect.vue

@@ -80,6 +80,9 @@
       //找到跟节点
       ergodicList (val,parentname) {
         if(val.children.length > 0 ){
+          if (val.name !== '组织机构'){
+            this.resoptions.push({label: parentname === '组织机构' ? val.name : val.name+' - '+parentname, value: val.id})
+          }
           parentname=parentname+val.name
           this.treetoList(val,parentname)
         }else {

package/src/components/server/ResSelectGroup.vue

@@ -167,7 +167,7 @@ export default {
           for (let row of this.$refs.department.resoptions) {
             depids.push(row.value)
           }
-          let depid = depids.length ? plugin.convertToIn(depids) : ('')
+          let depid = depids.length ? plugin.convertToIn(depids) : `('')`
           condition += " and f_depid in " + depid;
         }
       }