system-clients 3.2.2 → 3.2.3-aodeToV4

package/src/components/server/ModifyPw.vue

@@ -61,13 +61,19 @@
     // let res = yield self.$post('rs/db/modifypassword', {data: self.deliver})
     // let res = yield self.$resetpost('/rs/db/modifypwd', {data: self.deliver})
     //  Util.f.password = self.deliver.newpassword
-    let res = yield self.$resetpost('/rs/user/modifypwd', {data: self.deliver })
+    let res = yield self.$resetpost('/rs/user/modifypwd', {data: self.deliver }, { resolveMsg: null, rejectMsg: '请求错误，修改密码失败!' })
     self.$login.f.password = self.deliver.newpassword
     if (res.data) {
-      self.deliver.password = ''
-      self.deliver.newpassword = ''
-      self.deliver.affirmpassword = ''
-      self.show = false
+      console.log("修改密码返回：" , res.data)
+      if (res.data===true || res.data==='true') {
+        self.deliver.password = ''
+        self.deliver.newpassword = ''
+        self.deliver.affirmpassword = ''
+        self.show = false
+        self.$showAlert("修改密码成功", 'success', 2000)
+      } else {
+        self.$showAlert("修改密码失败，原因：" + res.data.msg, 'warning', 2000)
+      }
     }
   }
   export default {

package/src/components/server/NewResSelectGroup.vue

@@ -0,0 +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.initres.dep = [this.$login.f.depids]
+    }
+    if(this.$login.r.includes('人员默认选中')&& this.selectin){
+      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 =  plugin.convertToIn(this.depresid);
+      else
+        condition =  this.$login.f.orgid;
+      if(this.userresid.length > 0){
+        condition +=  plugin.convertToIn(this.userresid);
+      } else {
+        if (limit) {
+          let depids = []
+          for (let row of this.$refs.department.resoptions) {
+            depids.push(row.value)
+          }
+          let depid = depids.length ? plugin.convertToIn(depids) : `('')`
+          condition +=  depid;
+        }
+      }
+      if(ids && ids.length > 0){
+        condition +=  plugin.convertToIn(ids);
+      }
+      if(this.slice_area.length>0){
+        condition += "'" + 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/components/server/ResSelect.vue

@@ -70,6 +70,9 @@
       //找到跟节点
       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 {

package/src/components/server/ResSelectGroup.vue

@@ -1,10 +1,10 @@
 <template>
-  <div :class="style">
+  <div :class="style" v-show="companyshow">
     <label class="font_normal_body">公&emsp;&emsp;司</label>
     <right-tree @re-res="getorg"
                 :initresid='initres.org'></right-tree>
   </div>
-  <div :class="style">
+  <div :class="style" v-show="departmentshow">
     <label class="font_normal_body">部&emsp;&emsp;门</label>
     <res-select restype='department'
                 @res-select="getdep"
@@ -13,7 +13,7 @@
                 :is-mul="mul">
     </res-select>
   </div>
-  <div :class="style">
+  <div :class="style" v-show="operatorshow">
     <label class="font_normal_body">人&emsp;&emsp;员</label>
     <res-select restype='user'
                 @res-select="getuser"
@@ -22,7 +22,7 @@
                 :is-mul="mul">
     </res-select>
   </div>
-  <div :class="style " >
+  <div :class="style " v-show="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"
@@ -49,6 +49,9 @@
         type: Object,
         default: null,
       },
+      showComponent:{
+        default:['company','department','operator','slicearea']
+      }
     },
     data () {
       return {
@@ -57,7 +60,10 @@
         userresid:[],
         sliceArea: [],
         slice_area:[],
-
+        companyshow:false,
+        departmentshow:false,
+        operatorshow:false,
+        sliceareashow:false,
         obj:{
           orgnames:[],
           depnames:[],
@@ -67,10 +73,21 @@
     },
     ready () {
       console.log('开始获取组织结构。。。')
+      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) {

package/src/components/server/RightTree.vue

@@ -31,39 +31,80 @@
             close-on-select></v-select>
 </template>
 <script>
+  import Vue from 'vue';
   import co from 'co'
   import { PagedList, HttpResetClass } from 'vue-client'
   import * as ldapHelper from '../../util/LdapHelper'
-
   let saveGen = function * (self) {
     //获取分公司树
     let data = {
       source: self.source,
       userid: self.userid
     }
+    // if(self.$treeorg==null || (self.$treeorg!=null&&self.$treeorg.length==0)){
     let http = new HttpResetClass()
     let ret = yield http.load('POST', `${self.Url}/rs/search`, data, {resolveMsg: null, rejectMsg: null})
     // 去掉前面的两层节点
     ret.data[0].children[0].children.forEach((item) => {
       self.model.push(item)
     })
+    Vue.$treeorg = Vue.prototype.$treeorg = self.model;
+    // }
+    //if(self.$treeorg!=null){
+    //  self.model = self.$treeorg;
+    //}
     // 给资源添加父关系
     ldapHelper.procParent(self.model)
     // 树转列
     if (self.islist) {
       self.treetoList(self.model)
     }
+    if(self.initresid.length>0){
+      if(self.initresid[0] == ''){
+        self.initresid[0] = self.$login.f.orgid;
+      }
+    }else{
+      self.initresid = [];
+      self.initresid[0] = self.$login.f.orgid;
+    }
     if(self.initresid&&self.initresid.length>0){
+      self.isselect = false;
       self.initTreetoList(self.model)
+      self.initregion(self.childrenOptions)
       self.childrenOptions.forEach((item) => {
+        if(item.id == null && item.value !=null ){
+          item = item.value
+        }
         if(item.id==self.initresid[0]){
-          self.model=[]
-          self.model.push(item)
-          self.selectclick(item)
+          //默认加载如果已选中的和传入参数相等会取消选择，这种操作不应该被允许
+          if(self.orgids==item.id){
+            self.initdataone(item);
+            return;
+          }
+          self.selectclick(item);
+          self.isselect = true;
+          return;
         }
       })
+      //如果没有找到公司，说明是选择的是大区
+      if(!self.isselect){
+        self.childrenregionOption.forEach((item) => {
+          if(item.id == null && item.value !=null ){
+            item = item.value;
+          }
+          if(item.id==self.initresid[0]){
+            //默认加载如果已选中的和传入参数相等会取消选择，这种操作不应该被允许
+            if(self.orgids==item.id){
+              self.initdataone(item);
+              return;
+            }
+            self.selectclick(item);
+            return;
+          }
+        })
+      }
     }
-    self.selectRes()
+    //self.selectRes()
   }
   export default {
     title: '资源树',
@@ -108,7 +149,9 @@
         model: [
 
         ],
-        childrenOptions: []
+        childrenOptions: [],
+        childrenregionOption:[],
+        isselect: false
       }
     },
     methods: {
@@ -134,6 +177,23 @@
           this.childrenOptions.push(val)
         }
       },
+      initregion(val){
+        if(val ==null ) return;
+        val.forEach((item)=>{
+          if(item.name != null){
+            if(item.name.includes("公司")){
+              return;
+            }else{
+              this.initregion(item.children)
+              this.childrenregionOption.push({label:"",value:item})
+              //return item;
+            }
+          }else{
+            return;
+          }
+        })
+
+      },
       async buluer (val) {
         this.strsign=val
         await new Promise(resolve => {
@@ -176,6 +236,26 @@
           this.$emit('re-res', newobj)
         }
       },
+      initdataone(row){
+        //点中点击
+        this.orgnames=row.name
+        this.orgids=row.id
+        this.orgobj=row
+        let objs=[]
+        let objids=[]
+        let objnames=[]
+        this.addResChild(row,objs)
+        objs.forEach((item) => {
+          objids.push(item.id)
+          objnames.push(item.name)
+        })
+        let newobj={
+          "res": objnames,
+          "resids": objids,
+          "orgobj": objs,
+        }
+        this.$emit('re-res', newobj)
+      },
       addResChild(val,objs){
         objs.push(val)
         if(val.children && val.children.length>0){

package/src/components/server/RoleSelector.vue

@@ -55,6 +55,7 @@
         .then(res => {
           console.log('res-->' + JSON.stringify(res))
           this.allUsers = res.data
+          this.filterUser([this.$login.f.orgid])
         })
     },
     methods: {
@@ -65,9 +66,9 @@
         this.$dispatch('re-res',obj)
       },
       filterUser(resids) {
-        // 处理第一次进入页面值异常问题 
+        // 处理第一次进入页面值异常问题
         if(resids.length > 0 && typeof resids[0] == "object"){
-          resids = resids[0]
+            resids = resids[0]
         }
         this.users = []
         this.allUsers.forEach(user => {
@@ -86,4 +87,4 @@
 
 <style scoped>
 
-</style>
+</style>

package/src/components/server/TestResSelectGroup.vue

@@ -42,7 +42,7 @@
 
                   <export-excel :data="$parent.$parent.getCondition"
                                 :field="$parent.$parent.getfield"
-                                sqlurl="rs/logic/exportfile" sql-name="chargeQuery" template-name='收费查询导出'
+                                sqlurl="api/af-revenue/logic/exportfile" sql-name="chargeQuery" template-name='收费查询导出'
                                 :choose-col="true"></export-excel>
 
                   <print-data :model="$parent.model" :field="$parent.$parent.getfield"
@@ -342,7 +342,7 @@
         gasproperties:[],
         showinfo: false,
         data: {},
-        model: new PagedList('rs/sql/chargeQuery', 20, {}, {
+        model: new PagedList('api/af-system/sql/chargeQuery', 20, {}, {
           f_pregas: 0,
           f_preamount: 0,
           f_delaypay: 0,

package/src/plugins/EncryptUtil.js

@@ -0,0 +1,53 @@
+import AesEncryptJS from "crypto-js"
+import RsaEncryptJS from 'jsencrypt'
+
+export default {
+  /**
+   * AES加密
+   * @param word
+   * @returns {*}
+   */
+  AESEncrypt(word, encryKey){
+    var key = AesEncryptJS.enc.Utf8.parse(encryKey);
+    var srcs = AesEncryptJS.enc.Utf8.parse(word);
+    var encrypted = AesEncryptJS.AES.encrypt(srcs, key, {mode:AesEncryptJS.mode.ECB,padding: AesEncryptJS.pad.Pkcs7});
+    return encrypted.toString();
+  },
+  /**
+   * AES解密
+   * @param word
+   * @returns {*}
+   */
+  AESDecrypt(word, encryKey){
+    var key = AesEncryptJS.enc.Utf8.parse(encryKey);
+    var decrypt = AesEncryptJS.AES.decrypt(word, key, {mode:AesEncryptJS.mode.ECB,padding: AesEncryptJS.pad.Pkcs7});
+    var ret = AesEncryptJS.enc.Utf8.stringify(decrypt).toString();
+    try{
+      return JSON.parse(ret) ;
+    }catch (e){
+      return ret
+    }
+  },
+  /**
+   * RSA加密
+   * @param word
+   * @returns {*}
+   */
+  RSAEncrypt(word){
+    let encrypt = new RsaEncryptJS();
+    encrypt.setPublicKey('MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCqPvovSfXcwBbW8cKMCgwqNpsYuzF8RPAPFb7LGsnVo44JhM/xxzDyzoYtdfNmtbIuKVi9PzIsyp6rg+09gbuI6UGwBZ5DWBDBMqv5MPdOF5dCQkB2Bbr5yPfURPENypUz+pBFBg41d+BC+rwRiXELwKy7Y9caD/MtJyHydj8OUwIDAQAB');
+    let resdata = encrypt.encrypt(word);
+    return resdata.toString();
+  },
+  /**
+   * RSA解密
+   * @param word
+   * @returns {*}
+   */
+  RSADecrypt(word){
+    let encrypt = new RsaEncryptJS();
+    encrypt.setPrivateKey('MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAKo++i9J9dzAFtbxwowKDCo2mxi7MXxE8A8VvssaydWjjgmEz/HHMPLOhi1182a1si4pWL0/MizKnquD7T2Bu4jpQbAFnkNYEMEyq/kw904Xl0JCQHYFuvnI99RE8Q3KlTP6kEUGDjV34EL6vBGJcQvArLtj1xoP8y0nIfJ2Pw5TAgMBAAECgYAGGB8IllMwxceLhjf6n1l0IWRH7FuHIUieoZ6k0p6rASHSgWiYNRMxfecbtX8zDAoG0QAWNi7rn40ygpR5gS1fWDAKhmnhKgQIT6wW0VmD4hraaeyP78iy8BLhlvblri2nCPIhDH5+l96v7D47ZZi3ZSOzcj89s1eS/k7/N4peEQJBAPEtGGJY+lBoCxQMhGyzuzDmgcS1Un1ZE2pt+XNCVl2b+T8fxWJH3tRRR8wOY5uvtPiK1HM/IjT0T5qwQeH8Yk0CQQC0tcv3d/bDb7bOe9QzUFDQkUSpTdPWAgMX2OVPxjdq3Sls9oA5+fGNYEy0OgyqTjde0b4iRzlD1O0OhLqPSUMfAkEAh5FIvqezdRU2/PsYSR4yoAdCdLdT+h/jGRVefhqQ/6eYUJJkWp15tTFHQX3pIe9/s6IeT/XyHYAjaxmevxAmlQJBAKSdhvQjf9KAjZKDEsa7vyJ/coCXuQUWSCMNHbcR5aGfXgE4e45UtUoIE1eKGcd6AM6LWhx3rR6xdFDpb9je8BkCQB0SpevGfOQkMk5i8xkEt9eeYP0fi8nv6eOUcK96EXbzs4jV2SAoQJ9oJegPtPROHbhIvVUmNQTbuP10Yjg59+8=');
+    let resdata = encrypt.decrypt(word);
+    return JSON.parse(resdata.toString()) ;
+  },
+}