system-clients 4.0.12 → 4.0.13

package/package.json

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

package/src/components/server/ModifyPw.vue

@@ -63,7 +63,7 @@
     // let res = yield self.$resetpost('/rs/db/modifypwd', {data: self.deliver})
     //  Util.f.password = self.deliver.newpassword
     // todo v4
-    let res = yield self.$resetpost('/rs/user/modifypwd', {data: self.deliver }, {resolveMsg: null,rejectMsg: null})
+    let res = yield self.$resetpost('/api/af-system/user/modifypwd', {data: self.deliver }, {resolveMsg: null,rejectMsg: null})
     self.$login.f.password = self.deliver.newpassword
     if (res.data) {
       console.log("修改密码返回：" , res.data)

package/src/components/server/ResSelect.vue

@@ -1,186 +1,186 @@
-<template>
-  <v-select :options='resoptions' placeholder='请选择'
-            :value.sync="selectres"
-            :multiple="isMul"
-            search="true"
-            :disabled="mustselect"
-            :close-on-select="!isMul"
-            @change="resChange"
-  >
-  </v-select>
-</template>
-<script>
-  import {HttpResetClass} from 'vue-client'
-
-  export default {
-    title: '资源选择',
-    props: {
-
-      //资源类型
-      restype:'',
-      //是否只查询营业厅
-      specialquery: {
-        type: Boolean,
-        default: false
-      },
-      //资源数据
-      resObj:{},
-      isMul: {
-        type: Boolean,
-        default: true
-      },
-      //资源初始化数据
-      initresid: {
-        type: Array,
-        default() { return [] },
-      },
-      //父层id
-      parentresid: {
-        type: Array,
-        default() { return [] },
-      },
-      mustselect: {
-        type: Boolean,
-        default: false
-      },
-    },
-    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 ){
-          if (val.name !== '组织机构' && parentname !== '资源管理'){
-            this.resoptions.push({label: parentname === '组织机构' ? val.name : val.name+' - '+parentname, value: val.id})
-          }
-          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 if (this.restype == 'department') {
-            if (this.specialquery) {
-              if (val.f_dep_type === '营业厅') {
-                this.resoptions.push({label: val.name, value: val.id})
-              }
-            } else {
-              if (this.$login.r.includes('部门默认选中') && this.$login.r.includes('限制查询当前部门')) {
-                if (val.id == this.initresid[0]) {
-                  this.resoptions.push({label: val.name, value: val.id})
-                }
-              } else {
-                this.resoptions.push({label: val.name, 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()
-      },
-      initresid: {
-        handler(newVal, oldVal) {
-          // 避免重复触发
-          if (JSON.stringify(newVal) === JSON.stringify(oldVal)) {
-            return;
-          }
-          this.dealdata();
-        },
-      }
-    }
-  }
-</script>
+<template>
+  <v-select :options='resoptions' placeholder='请选择'
+            :value.sync="selectres"
+            :multiple="isMul"
+            search="true"
+            :disabled="mustselect"
+            :close-on-select="!isMul"
+            @change="resChange"
+  >
+  </v-select>
+</template>
+<script>
+  import {HttpResetClass} from 'vue-client'
+
+  export default {
+    title: '资源选择',
+    props: {
+
+      //资源类型
+      restype:'',
+      //是否只查询营业厅
+      specialquery: {
+        type: Boolean,
+        default: false
+      },
+      //资源数据
+      resObj:{},
+      isMul: {
+        type: Boolean,
+        default: true
+      },
+      //资源初始化数据
+      initresid: {
+        type: Array,
+        default() { return [] },
+      },
+      //父层id
+      parentresid: {
+        type: Array,
+        default() { return [] },
+      },
+      mustselect: {
+        type: Boolean,
+        default: false
+      },
+    },
+    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 ){
+          if (val.name !== '组织机构' && parentname !== '资源管理'){
+            this.resoptions.push({label: parentname === '组织机构' ? val.name : val.name+' - '+parentname, value: val.id})
+          }
+          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 if (this.restype == 'department') {
+            if (this.specialquery) {
+              if (val.f_dep_type === '营业厅') {
+                this.resoptions.push({label: val.name, value: val.id})
+              }
+            } else {
+              if (this.$login.r.includes('部门默认选中') && this.$login.r.includes('限制查询当前部门')) {
+                if (val.id == this.initresid[0]) {
+                  this.resoptions.push({label: val.name, value: val.id})
+                }
+              } else {
+                this.resoptions.push({label: val.name, 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()
+      },
+      initresid: {
+        handler(newVal, oldVal) {
+          // 避免重复触发
+          if (JSON.stringify(newVal) === JSON.stringify(oldVal)) {
+            return;
+          }
+          this.dealdata();
+        },
+      }
+    }
+  }
+</script>

package/src/components/server/ResSelectGroup.vue

@@ -1,211 +1,211 @@
-<template>
-  <div :class="style" v-show="companyshow">
-    <label class="font_normal_body">公&emsp;&emsp;司</label>
-    <right-tree @re-res="getorg"
-                :mustselect="mustselect"
-                :initresid='initres.org'></right-tree>
-  </div>
-  <div :class="style" v-show="departmentshow">
-    <label class="font_normal_body">部&emsp;&emsp;门</label>
-    <res-select restype='department' v-ref:department
-                @res-select="getdep"
-                :parentresid="depresid"
-                :specialquery="specialquery"
-                :initresid='initres.dep'
-                :mustselect="mustselect"
-                :is-mul="mul">
-    </res-select>
-  </div>
-  <div :class="style" v-show="operatorshow && (!cascade)">
-    <label class="font_normal_body">人&emsp;&emsp;员</label>
-    <res-select restype='user'
-                @res-select="getuser"
-                :parentresid="depresid"
-                :initresid='initres.user'
-                :mustselect="mustselect"
-                :is-mul="mul">
-    </res-select>
-  </div>
-  <div :class="style" v-show="operatorshow && cascade">
-    <label class="font_normal_body">人&emsp;&emsp;员</label>
-    <res-select restype='user'
-                @res-select="getuser"
-                :parentresid="userresid"
-                :initresid='initres.user'
-                :mustselect="mustselect"
-                :is-mul="mul">
-    </res-select>
-  </div>
-  <div :class="style " v-if="sliceareashow" >
-    <label class="font_normal_body">片&emsp;&emsp;区</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'
-import { HttpResetClass } from 'vue-client'
-export default {
-  title: '资源选择测试',
-  props: {
-    style: {
-      type: String,
-      default: 'col-sm-2 form-group'
-    },
-    mul: {
-      type: Boolean,
-      default: true
-    },
-    //是否只查询营业厅
-    specialquery: {
-      type: Boolean,
-      default: false
-    },
-    //初始值
-    initres: {
-      type: Object,
-      default: null,
-    },
-    showComponent:{
-      default:['company','department','operator','slicearea']
-    },
-    //人员是否和部门关联
-    cascade: {
-      type: Boolean,
-      default: true
-    },
-    selectin: {
-      type: Boolean,
-      default: true
-    }
-  },
-  data () {
-    return {
-      orgresid:[this.$login.f.orgid],
-      depresid:[],
-      userresid:[],
-      operatorsid: [],
-      sliceArea: [],
-      slice_area:[],
-      companyshow:false,
-      departmentshow:false,
-      operatorshow:false,
-      sliceareashow:false,
-      mustselect:false,
-      obj:{
-        orgnames:[],
-        depnames:[],
-        operatornames:[]
-      }
-    }
-  },
-  ready () {
-    if(this.$login.r.includes('部门默认选中')&& this.selectin && this.showComponent.includes('department')){
-      this.initres.dep = [this.$login.f.depids]
-    }
-    if(this.$login.r.includes('人员默认选中')&& this.selectin && this.showComponent.includes('operator')){
-      this.initres.user = [this.$login.f.id]
-      if(this.$login.r.includes('人员强制选中')){
-        this.mustselect = true
-      }
-    }
-    this.initComponent();
-    this.initAreas(this.$login.f.orgid)
-  },
-  methods:{
-    initComponent(){
-      let self=this;
-      this.showComponent.find((item)=>{
-        switch(item){
-          case 'company': self.companyshow=true; break;
-          case 'department': self.departmentshow=true; break;
-          case 'operator': self.operatorshow=true; break;
-          case 'slicearea': self.sliceareashow=true; break;
-        }
-      })
-    },
-    // 初始化片区
-    async initAreas (val) {
-      if (val) {
-        let http = new HttpResetClass()
-        let getAllArea = await http.load('POST', '/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) => {
-          if(Array.isArray(val)){
-            for (let i = 0; i <val.length ; i++) {
-              if(res.parentid == val[i]){
-                return true
-              }
-            }
-          }
-          return res.parentid == val
-        })
-        this.sliceArea = []
-        this.slice_area = []
-        arr.forEach((res) => {
-          this.sliceArea.push({label: res.name, value: {name: res.name, code:res.number}})
-        })
-      }
-    },
-    returnOrg(ids){
-      let limit = this.$login.r.includes('数据授权限定')
-
-      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);
-      } else {
-        if (limit && this.departmentshow && this.$refs.department) {
-          let depids = []
-          for (let row of this.$refs.department.resoptions) {
-            depids.push(row.value)
-          }
-          let depid = depids.length ? plugin.convertToIn(depids) : `('')`
-          condition += " and f_depid in " + depid;
-        }
-      }
-      if(ids && ids.length > 0 && this.operatorshow){
-        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) {
-      this.depresid=obj.resids
-      this.obj.orgnames = obj.res
-      this.initAreas(obj.resids)
-      this.returnOrg();
-    },
-    getdep(obj,val) {
-      this.obj.depnames = val
-      this.userresid=obj
-      this.returnOrg();
-    },
-    getuser(obj,val) {
-      this.obj.operatornames = val
-      this.operatorsid = obj
-      this.returnOrg(obj);
-    },
-    getarea(val) {
-      this.slice_area=val
-      if(this.operatorsid){
-        this.returnOrg(this.operatorsid);
-      }else{
-        this.returnOrg();
-      }
-    }
-  },
-  watch: {
-
-  }
-}
-</script>
+<template>
+  <div :class="style" v-show="companyshow">
+    <label class="font_normal_body">公&emsp;&emsp;司</label>
+    <right-tree @re-res="getorg"
+                :mustselect="mustselect"
+                :initresid='initres.org'></right-tree>
+  </div>
+  <div :class="style" v-show="departmentshow">
+    <label class="font_normal_body">部&emsp;&emsp;门</label>
+    <res-select restype='department' v-ref:department
+                @res-select="getdep"
+                :parentresid="depresid"
+                :specialquery="specialquery"
+                :initresid='initres.dep'
+                :mustselect="mustselect"
+                :is-mul="mul">
+    </res-select>
+  </div>
+  <div :class="style" v-show="operatorshow && (!cascade)">
+    <label class="font_normal_body">人&emsp;&emsp;员</label>
+    <res-select restype='user'
+                @res-select="getuser"
+                :parentresid="depresid"
+                :initresid='initres.user'
+                :mustselect="mustselect"
+                :is-mul="mul">
+    </res-select>
+  </div>
+  <div :class="style" v-show="operatorshow && cascade">
+    <label class="font_normal_body">人&emsp;&emsp;员</label>
+    <res-select restype='user'
+                @res-select="getuser"
+                :parentresid="userresid"
+                :initresid='initres.user'
+                :mustselect="mustselect"
+                :is-mul="mul">
+    </res-select>
+  </div>
+  <div :class="style " v-if="sliceareashow" >
+    <label class="font_normal_body">片&emsp;&emsp;区</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'
+import { HttpResetClass } from 'vue-client'
+export default {
+  title: '资源选择测试',
+  props: {
+    style: {
+      type: String,
+      default: 'col-sm-2 form-group'
+    },
+    mul: {
+      type: Boolean,
+      default: true
+    },
+    //是否只查询营业厅
+    specialquery: {
+      type: Boolean,
+      default: false
+    },
+    //初始值
+    initres: {
+      type: Object,
+      default: null,
+    },
+    showComponent:{
+      default:['company','department','operator','slicearea']
+    },
+    //人员是否和部门关联
+    cascade: {
+      type: Boolean,
+      default: true
+    },
+    selectin: {
+      type: Boolean,
+      default: true
+    }
+  },
+  data () {
+    return {
+      orgresid:[this.$login.f.orgid],
+      depresid:[],
+      userresid:[],
+      operatorsid: [],
+      sliceArea: [],
+      slice_area:[],
+      companyshow:false,
+      departmentshow:false,
+      operatorshow:false,
+      sliceareashow:false,
+      mustselect:false,
+      obj:{
+        orgnames:[],
+        depnames:[],
+        operatornames:[]
+      }
+    }
+  },
+  ready () {
+    if(this.$login.r.includes('部门默认选中')&& this.selectin && this.showComponent.includes('department')){
+      this.initres.dep = [this.$login.f.depids]
+    }
+    if(this.$login.r.includes('人员默认选中')&& this.selectin && this.showComponent.includes('operator')){
+      this.initres.user = [this.$login.f.id]
+      if(this.$login.r.includes('人员强制选中')){
+        this.mustselect = true
+      }
+    }
+    this.initComponent();
+    this.initAreas(this.$login.f.orgid)
+  },
+  methods:{
+    initComponent(){
+      let self=this;
+      this.showComponent.find((item)=>{
+        switch(item){
+          case 'company': self.companyshow=true; break;
+          case 'department': self.departmentshow=true; break;
+          case 'operator': self.operatorshow=true; break;
+          case 'slicearea': self.sliceareashow=true; break;
+        }
+      })
+    },
+    // 初始化片区
+    async initAreas (val) {
+      if (val) {
+        let http = new HttpResetClass()
+        let getAllArea = await http.load('POST', '/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) => {
+          if(Array.isArray(val)){
+            for (let i = 0; i <val.length ; i++) {
+              if(res.parentid == val[i]){
+                return true
+              }
+            }
+          }
+          return res.parentid == val
+        })
+        this.sliceArea = []
+        this.slice_area = []
+        arr.forEach((res) => {
+          this.sliceArea.push({label: res.name, value: {name: res.name, code:res.number}})
+        })
+      }
+    },
+    returnOrg(ids){
+      let limit = this.$login.r.includes('数据授权限定')
+
+      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);
+      } else {
+        if (limit && this.departmentshow && this.$refs.department) {
+          let depids = []
+          for (let row of this.$refs.department.resoptions) {
+            depids.push(row.value)
+          }
+          let depid = depids.length ? plugin.convertToIn(depids) : `('')`
+          condition += " and f_depid in " + depid;
+        }
+      }
+      if(ids && ids.length > 0 && this.operatorshow){
+        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) {
+      this.depresid=obj.resids
+      this.obj.orgnames = obj.res
+      this.initAreas(obj.resids)
+      this.returnOrg();
+    },
+    getdep(obj,val) {
+      this.obj.depnames = val
+      this.userresid=obj
+      this.returnOrg();
+    },
+    getuser(obj,val) {
+      this.obj.operatornames = val
+      this.operatorsid = obj
+      this.returnOrg(obj);
+    },
+    getarea(val) {
+      this.slice_area=val
+      if(this.operatorsid){
+        this.returnOrg(this.operatorsid);
+      }else{
+        this.returnOrg();
+      }
+    }
+  },
+  watch: {
+
+  }
+}
+</script>

package/src/filiale/yuncheng/ResSelect.vue

@@ -1,189 +1,189 @@
-<template>
-  <v-select :options='resoptions' placeholder='请选择'
-            :value.sync="selectres"
-            :multiple="isMul"
-            search="true"
-            :disabled="mustselect"
-            :close-on-select="!isMul"
-            @change="resChange"
-  >
-  </v-select>
-</template>
-<script>
-import {HttpResetClass} from 'vue-client'
-
-export default {
-  title: '资源选择',
-  props: {
-
-    //资源类型
-    restype: '',
-    //是否只查询营业厅
-    specialquery: {
-      type: Boolean,
-      default: false
-    },
-    //资源数据
-    resObj: {},
-    isMul: {
-      type: Boolean,
-      default: true
-    },
-    //资源初始化数据
-    initresid: {
-      type: Array,
-      default() {
-        return []
-      },
-    },
-    //父层id
-    parentresid: {
-      type: Array,
-      default() {
-        return []
-      },
-    },
-    mustselect: {
-      type: Boolean,
-      default: false
-    },
-  },
-  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 if (this.restype == 'department') {
-          if (this.specialquery) {
-            if (val.f_dep_type === '营业厅') {
-              this.resoptions.push({label: val.name, value: val.id})
-            }
-          } else {
-            if (this.$login.r.includes('部门默认选中') && this.$login.r.includes('限制查询当前部门')) {
-              if (val.id == this.initresid[0]) {
-                this.resoptions.push({label: val.name, value: val.id})
-              }
-            } else {
-              this.resoptions.push({label: val.name, 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()
-    },
-    initresid: {
-      handler(newVal, oldVal) {
-        // 避免重复触发
-        if (JSON.stringify(newVal) === JSON.stringify(oldVal)) {
-          return;
-        }
-        this.dealdata();
-      },
-    }
-  }
-}
-</script>
+<template>
+  <v-select :options='resoptions' placeholder='请选择'
+            :value.sync="selectres"
+            :multiple="isMul"
+            search="true"
+            :disabled="mustselect"
+            :close-on-select="!isMul"
+            @change="resChange"
+  >
+  </v-select>
+</template>
+<script>
+import {HttpResetClass} from 'vue-client'
+
+export default {
+  title: '资源选择',
+  props: {
+
+    //资源类型
+    restype: '',
+    //是否只查询营业厅
+    specialquery: {
+      type: Boolean,
+      default: false
+    },
+    //资源数据
+    resObj: {},
+    isMul: {
+      type: Boolean,
+      default: true
+    },
+    //资源初始化数据
+    initresid: {
+      type: Array,
+      default() {
+        return []
+      },
+    },
+    //父层id
+    parentresid: {
+      type: Array,
+      default() {
+        return []
+      },
+    },
+    mustselect: {
+      type: Boolean,
+      default: false
+    },
+  },
+  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 if (this.restype == 'department') {
+          if (this.specialquery) {
+            if (val.f_dep_type === '营业厅') {
+              this.resoptions.push({label: val.name, value: val.id})
+            }
+          } else {
+            if (this.$login.r.includes('部门默认选中') && this.$login.r.includes('限制查询当前部门')) {
+              if (val.id == this.initresid[0]) {
+                this.resoptions.push({label: val.name, value: val.id})
+              }
+            } else {
+              this.resoptions.push({label: val.name, 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()
+    },
+    initresid: {
+      handler(newVal, oldVal) {
+        // 避免重复触发
+        if (JSON.stringify(newVal) === JSON.stringify(oldVal)) {
+          return;
+        }
+        this.dealdata();
+      },
+    }
+  }
+}
+</script>

package/src/filiale/yuncheng/system.js

@@ -1,6 +1,6 @@
-// 分公司特殊组件页面注册
-
-let specialComp = {
-  'res-select': (resolve) => require(['./ResSelect.vue'], resolve)
-}
-exports.specialComp = specialComp
+// 分公司特殊组件页面注册
+
+let specialComp = {
+  'res-select': (resolve) => require(['./ResSelect.vue'], resolve)
+}
+exports.specialComp = specialComp

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +0,0 @@
-#Thu Apr 17 15:32:17 CST 2025
-gradle.version=3.5.1

package/.gradle/buildOutputCleanup/cache.properties.lock

@@ -1 +0,0 @@
-