system-clients 3.0.47-fanxian → 3.0.48-fanxian

package/src/components/server/ResSelect.vue

@@ -1,150 +1,150 @@
-<template>
-  <v-select :options='resoptions' placeholder='请选择'
-            :value.sync="selectres"
-            :multiple="isMul"
-            search="true"
-            :close-on-select="!isMul"
-            @change="resChange"
-  >
-  </v-select>
-</template>
-<script>
-  import {HttpResetClass} from 'vue-client'
-
-  export default {
-    title: '资源选择',
-    props: {
-
-      //资源类型
-      restype:'',
-      //资源数据
-      resObj:{},
-      isMul: {
-        type: Boolean,
-        default: true
-      },
-      //资源初始化数据
-      initresid: {
-        type: Array,
-        default() { return [] },
-      },
-      //父层id
-      parentresid: {
-        type: Array,
-        default() { return [] },
-      },
-    },
-    data () {
-      return {
-        //资源数据
-        resObj:{},
-        //资源数据列表
-        resoptions:[],
-        //选中资源数据
-        selectres: [],
-      }
-    },
-    ready () {
-      //获取资源列表
-      this.getResList()
-    },
-    methods:{
-      //树形结构变成list
-      findById(val) {
-        if(val){
-          if(this.checkidres(val)){
-            this.treetoList(val,'')
-          }else if(val.children.length>0){
-            for (let value of val.children) {
-              this.findById(value)
-            }
-          }
-        }
-      },
-      //树形结构变成list
-      treetoList(val,parentname) {
-        for (let value of val.children) {
-          this.ergodicList(value,parentname)
-        }
-      },
-      //找到跟节点
-      ergodicList (val,parentname) {
-        if(val.children.length > 0 ){
-          parentname=parentname+val.name
-          this.treetoList(val,parentname)
-        }else {
-          //截取组织机构【组织机构】
-          if(this.restype=='organization'){
-            parentname=parentname.replace("组织机构","")
-            this.resoptions.push({label: val.name+' - '+parentname, value: val.id})
-          }else{
-            this.resoptions.push({label: val.name, value: val.id})
-          }
-        }
-      },
-      //检查id是否存在
-      checkidres(val){
-        let flag=false
-        //如果没传值得话 不过滤
-        if(this.parentresid.length==0&&this.restype=='organization'){
-          flag=true
-        }
-        this.parentresid.forEach((item) => {
-          if(item==val.id){
-            flag=true
-          }
-        })
-        return flag;
-      },
-      //资源改变
-      resChange(val){
-        let orgnames=[]
-        Object.keys(this.resoptions).forEach((key) => {
-          if(this.selectres.includes(this.resoptions[key].value))
-            orgnames.push(this.resoptions[key].label)
-        })
-        console.log('资源改变。。', val, orgnames)
-        this.$dispatch('res-select', this.selectres, orgnames)
-      },
-      //获取资源数据
-      async getResList() {
-
-        let http = new HttpResetClass()
-
-        let req = await http.load('POST', '/rs/search', {data: {
-            source: `tool.getFullTree(this.getRights().where(row.getType()==$${this.restype}$))`,
-            userid: this.$login.f.id
-          }}, {resolveMsg: null, rejectMsg: '获取组织结构数据出错'})
-        this.resObj=req.data[0]
-        this.dealdata()
-      },
-      dealdata(){
-        this.resoptions=[]
-        this.findById(this.resObj);
-        //赋值资源数据
-        let arryselect=[]
-        this.resoptions.forEach((item) => {
-          if(this.initresid.length>0){
-            this.initresid.forEach((init) => {
-              if(item.value==init){
-                arryselect.push(item.value)
-              }
-            })
-          }
-        })
-        //赋值资源选中初始值
-        this.selectres=arryselect
-      }
-    },
-    watch: {
-      //监听初始化资源id
-      'initresid.length'(){
-        this.dealdata()
-      },
-      //监听初始化资源id
-      'parentresid'(){
-        this.dealdata()
-      },
-    },
-  }
-</script>
+<template>
+  <v-select :options='resoptions' placeholder='请选择'
+            :value.sync="selectres"
+            :multiple="isMul"
+            search="true"
+            :close-on-select="!isMul"
+            @change="resChange"
+  >
+  </v-select>
+</template>
+<script>
+  import {HttpResetClass} from 'vue-client'
+
+  export default {
+    title: '资源选择',
+    props: {
+
+      //资源类型
+      restype:'',
+      //资源数据
+      resObj:{},
+      isMul: {
+        type: Boolean,
+        default: true
+      },
+      //资源初始化数据
+      initresid: {
+        type: Array,
+        default() { return [] },
+      },
+      //父层id
+      parentresid: {
+        type: Array,
+        default() { return [] },
+      },
+    },
+    data () {
+      return {
+        //资源数据
+        resObj:{},
+        //资源数据列表
+        resoptions:[],
+        //选中资源数据
+        selectres: [],
+      }
+    },
+    ready () {
+      //获取资源列表
+      this.getResList()
+    },
+    methods:{
+      //树形结构变成list
+      findById(val) {
+        if(val){
+          if(this.checkidres(val)){
+            this.treetoList(val,'')
+          }else if(val.children.length>0){
+            for (let value of val.children) {
+              this.findById(value)
+            }
+          }
+        }
+      },
+      //树形结构变成list
+      treetoList(val,parentname) {
+        for (let value of val.children) {
+          this.ergodicList(value,parentname)
+        }
+      },
+      //找到跟节点
+      ergodicList (val,parentname) {
+        if(val.children.length > 0 ){
+          parentname=parentname+val.name
+          this.treetoList(val,parentname)
+        }else {
+          //截取组织机构【组织机构】
+          if(this.restype=='organization'){
+            parentname=parentname.replace("组织机构","")
+            this.resoptions.push({label: val.name+' - '+parentname, value: val.id})
+          }else{
+            this.resoptions.push({label: val.name, value: val.id})
+          }
+        }
+      },
+      //检查id是否存在
+      checkidres(val){
+        let flag=false
+        //如果没传值得话 不过滤
+        if(this.parentresid.length==0&&this.restype=='organization'){
+          flag=true
+        }
+        this.parentresid.forEach((item) => {
+          if(item==val.id){
+            flag=true
+          }
+        })
+        return flag;
+      },
+      //资源改变
+      resChange(val){
+        let orgnames=[]
+        Object.keys(this.resoptions).forEach((key) => {
+          if(this.selectres.includes(this.resoptions[key].value))
+            orgnames.push(this.resoptions[key].label)
+        })
+        console.log('资源改变。。', val, orgnames)
+        this.$dispatch('res-select', this.selectres, orgnames)
+      },
+      //获取资源数据
+      async getResList() {
+
+        let http = new HttpResetClass()
+
+        let req = await http.load('POST', '/rs/search', {data: {
+            source: `tool.getFullTree(this.getRights().where(row.getType()==$${this.restype}$))`,
+            userid: this.$login.f.id
+          }}, {resolveMsg: null, rejectMsg: '获取组织结构数据出错'})
+        this.resObj=req.data[0]
+        this.dealdata()
+      },
+      dealdata(){
+        this.resoptions=[]
+        this.findById(this.resObj);
+        //赋值资源数据
+        let arryselect=[]
+        this.resoptions.forEach((item) => {
+          if(this.initresid.length>0){
+            this.initresid.forEach((init) => {
+              if(item.value==init){
+                arryselect.push(item.value)
+              }
+            })
+          }
+        })
+        //赋值资源选中初始值
+        this.selectres=arryselect
+      }
+    },
+    watch: {
+      //监听初始化资源id
+      'initresid.length'(){
+        this.dealdata()
+      },
+      //监听初始化资源id
+      'parentresid'(){
+        this.dealdata()
+      },
+    },
+  }
+</script>

package/src/components/server/ResSelectGroup.vue

@@ -1,140 +1,140 @@
-<template>
-  <div :class="style">
-    <label class="font_normal_body">&nbsp;&nbsp;&nbsp;公司&nbsp;&nbsp;&nbsp;</label>
-    <right-tree @re-res="getorg"
-                :initresid='initres.org'></right-tree>
-  </div>
-  <div :class="style">
-    <label class="font_normal_body">&nbsp;&nbsp;&nbsp;部门&nbsp;&nbsp;&nbsp;</label>
-    <res-select restype='department'
-                @res-select="getdep"
-                :parentresid="depresid"
-                :initresid='initres.dep'
-                :is-mul="mul">
-    </res-select>
-  </div>
-  <div :class="style">
-    <label class="font_normal_body">&nbsp;&nbsp;&nbsp;人员&nbsp;&nbsp;&nbsp;</label>
-    <res-select restype='user'
-                @res-select="getuser"
-                :parentresid="userresid"
-                :initresid='initres.user'
-                :is-mul="mul">
-    </res-select>
-  </div>
-  <div :class="style " >
-    <label class="font_normal_body">&nbsp;&nbsp;&nbsp;片区&nbsp;&nbsp;&nbsp;</label>
-    <v-select :value.sync="slice_area" v-model="slice_area"  @change='getarea'
-              :options='sliceArea' placeholder='片区/管理站' filer-key="name"
-              close-on-select v-ref:slice>
-    </v-select>
-  </div>
-</template>
-<script>
-  import plugin from '../../plugins/GetLoginInfoService'
-  export default {
-    title: '资源选择测试',
-    props: {
-      style: {
-        type: String,
-        default: 'col-sm-2'
-      },
-      mul: {
-        type: Boolean,
-        default: true
-      },
-      //初始值
-      initres: {
-        type: Object,
-        default: null,
-      },
-    },
-    data () {
-      return {
-        orgresid:[this.$login.f.orgid],
-        depresid:[],
-        userresid:[],
-        sliceArea: [],
-        slice_area:[],
-
-        obj:{
-          orgnames:[],
-          depnames:[],
-          operatornames:[]
-        }
-      }
-    },
-    ready () {
-      console.log('开始获取组织结构。。。')
-      this.initAreas(this.$login.f.orgid)
-    },
-    methods:{
-
-      // 初始化片区
-      async initAreas (val) {
-        if (val) {
-          let getAllArea = await this.$resetpost('/rs/search', {
-            source: 'this.getParentByType($organization$).getAllChildrens().where(row.getType() == $zone$)',
-            userid: this.$login.f.id
-          }, {resolveMsg: null, rejectMsg: '获取片区出错！！！'})
-          let arr = getAllArea.data.filter((res) => {
-            return res.parentid == val
-          })
-          console.log('过滤之后的片区', arr)
-          this.sliceArea = []
-          arr.forEach((res) => {
-            this.sliceArea.push({label: res.name, value: {name: res.name, code:res.number}})
-          })
-        }
-      },
-      returnOrg(ids){
-
-        let condition;
-        if(this.depresid.length > 0)
-          condition = " and f_orgid in " + plugin.convertToIn(this.depresid);
-        else
-          condition = " and f_orgid = " + this.$login.f.orgid;
-        if(this.userresid.length > 0){
-          condition += " and f_depid in " + plugin.convertToIn(this.userresid);
-        }
-        if(ids && ids.length > 0){
-          condition += " and f_operatorid in " + plugin.convertToIn(ids);
-        }
-        if(this.slice_area.length>0){
-          condition += " and f_zones = '" + this.slice_area[0].name+"'"
-        }
-        this.$dispatch('re-res',condition,this.obj)
-      },
-      getorg (obj) {
-        console.log("选中公司的数据11",obj.resids)
-        this.depresid=obj.resids
-        this.obj.orgnames = obj.res
-        this.initAreas(obj.resids)
-        this.returnOrg();
-      },
-      getdep(obj,val) {
-        console.log("选中部门的数据22",obj)
-        this.obj.depnames = val
-        this.userresid=obj
-        this.returnOrg();
-      },
-      getuser(obj) {
-        this.obj.operatornames = obj
-        console.log("选中用户的数据33",obj)
-        this.returnOrg(obj);
-      },
-      getarea(val) {
-        this.slice_area=val
-        console.log("选中的大区",val)
-        if(this.obj.operatornames){
-          this.returnOrg(this.obj.operatornames);
-        }else{
-          this.returnOrg();
-        }
-      }
-    },
-    watch: {
-
-    }
-  }
-</script>
+<template>
+  <div :class="style">
+    <label class="font_normal_body">&nbsp;&nbsp;&nbsp;公司&nbsp;&nbsp;&nbsp;</label>
+    <right-tree @re-res="getorg"
+                :initresid='initres.org'></right-tree>
+  </div>
+  <div :class="style">
+    <label class="font_normal_body">&nbsp;&nbsp;&nbsp;部门&nbsp;&nbsp;&nbsp;</label>
+    <res-select restype='department'
+                @res-select="getdep"
+                :parentresid="depresid"
+                :initresid='initres.dep'
+                :is-mul="mul">
+    </res-select>
+  </div>
+  <div :class="style">
+    <label class="font_normal_body">&nbsp;&nbsp;&nbsp;人员&nbsp;&nbsp;&nbsp;</label>
+    <res-select restype='user'
+                @res-select="getuser"
+                :parentresid="userresid"
+                :initresid='initres.user'
+                :is-mul="mul">
+    </res-select>
+  </div>
+  <div :class="style " >
+    <label class="font_normal_body">&nbsp;&nbsp;&nbsp;片区&nbsp;&nbsp;&nbsp;</label>
+    <v-select :value.sync="slice_area" v-model="slice_area"  @change='getarea'
+              :options='sliceArea' placeholder='片区/管理站' filer-key="name"
+              close-on-select v-ref:slice>
+    </v-select>
+  </div>
+</template>
+<script>
+  import plugin from '../../plugins/GetLoginInfoService'
+  export default {
+    title: '资源选择测试',
+    props: {
+      style: {
+        type: String,
+        default: 'col-sm-2'
+      },
+      mul: {
+        type: Boolean,
+        default: true
+      },
+      //初始值
+      initres: {
+        type: Object,
+        default: null,
+      },
+    },
+    data () {
+      return {
+        orgresid:[this.$login.f.orgid],
+        depresid:[],
+        userresid:[],
+        sliceArea: [],
+        slice_area:[],
+
+        obj:{
+          orgnames:[],
+          depnames:[],
+          operatornames:[]
+        }
+      }
+    },
+    ready () {
+      console.log('开始获取组织结构。。。')
+      this.initAreas(this.$login.f.orgid)
+    },
+    methods:{
+
+      // 初始化片区
+      async initAreas (val) {
+        if (val) {
+          let getAllArea = await this.$resetpost('/rs/search', {
+            source: 'this.getParentByType($organization$).getAllChildrens().where(row.getType() == $zone$)',
+            userid: this.$login.f.id
+          }, {resolveMsg: null, rejectMsg: '获取片区出错！！！'})
+          let arr = getAllArea.data.filter((res) => {
+            return res.parentid == val
+          })
+          console.log('过滤之后的片区', arr)
+          this.sliceArea = []
+          arr.forEach((res) => {
+            this.sliceArea.push({label: res.name, value: {name: res.name, code:res.number}})
+          })
+        }
+      },
+      returnOrg(ids){
+
+        let condition;
+        if(this.depresid.length > 0)
+          condition = " and f_orgid in " + plugin.convertToIn(this.depresid);
+        else
+          condition = " and f_orgid = " + this.$login.f.orgid;
+        if(this.userresid.length > 0){
+          condition += " and f_depid in " + plugin.convertToIn(this.userresid);
+        }
+        if(ids && ids.length > 0){
+          condition += " and f_operatorid in " + plugin.convertToIn(ids);
+        }
+        if(this.slice_area.length>0){
+          condition += " and f_zones = '" + this.slice_area[0].name+"'"
+        }
+        this.$dispatch('re-res',condition,this.obj)
+      },
+      getorg (obj) {
+        console.log("选中公司的数据11",obj.resids)
+        this.depresid=obj.resids
+        this.obj.orgnames = obj.res
+        this.initAreas(obj.resids)
+        this.returnOrg();
+      },
+      getdep(obj,val) {
+        console.log("选中部门的数据22",obj)
+        this.obj.depnames = val
+        this.userresid=obj
+        this.returnOrg();
+      },
+      getuser(obj) {
+        this.obj.operatornames = obj
+        console.log("选中用户的数据33",obj)
+        this.returnOrg(obj);
+      },
+      getarea(val) {
+        this.slice_area=val
+        console.log("选中的大区",val)
+        if(this.obj.operatornames){
+          this.returnOrg(this.obj.operatornames);
+        }else{
+          this.returnOrg();
+        }
+      }
+    },
+    watch: {
+
+    }
+  }
+</script>