system-clients 3.2.6 → 3.2.7-rongcheng

package/src/components/server/ModifyPw.vue

@@ -18,15 +18,14 @@
             </div>
           </div>
           <div class="has-feedback form-group"
-               :class="{'has-warning':$v.newpassword.required,'has-error':($v.newpassword.numbersAndLetter8to16 || $v.newpassword.minlength)&& !$v.newpassword.required && !$v.newpassword.chinesePassword,
-          'has-success': !$v.newpassword.required && !$v.newpassword.numbersAndLetter8to16&&!$v.newpassword.minlength  && !$v.newpassword.chinesePassword}">
+               :class="{'has-warning':$v.newpassword.required,'has-error':$v.newpassword.strongpassword && !($v.newpassword.required),
+          'has-success': !$v.newpassword.required && !$v.newpassword.strongpassword }">
             <label for="newpassword" class="col-sm-4 col-sm-offset-1 control-label">新的密码:&nbsp;&nbsp;</label>
             <div class="col-sm-4">
-              <input type="password" v-model="deliver.newpassword" class="form-control" id="newpassword" v-validate:newpassword='{required:true, numbersAndLetter8to16: true, minlength: 6,chinesePassword: true}'>
-              <span class="glyphicon glyphicon-ok form-control-feedback" v-if="!$v.newpassword.required && !$v.newpassword.minlength && !($v.newpassword.numbersAndLetter8to16 && !($v.newpassword.required)) && !($v.newpassword.chinesePassword) "></span>
+              <input type="password" v-model="deliver.newpassword" class="form-control" id="newpassword" v-validate:newpassword='{required:true, strongpassword: true}'>
+              <span class="glyphicon glyphicon-ok form-control-feedback" v-if="!$v.newpassword.required && !($v.newpassword.strongpassword && !($v.newpassword.required))"></span>
               <span v-if="$v.newpassword.required">不能为空</span>
-              <span v-if="($v.newpassword.numbersAndLetter8to16||$v.newpassword.minlength) && !($v.newpassword.required&&$v.newpassword.minlength)">密码必须是8~16位数字与字母组合</span>
-              <span v-if="$v.newpassword.chinesePassword">密码不能包含中文</span>
+              <span v-if="$v.newpassword.strongpassword && !($v.newpassword.required)">密码必须包含英文大小写、阿拉伯数字、字符</span>
             </div>
           </div>
           <div class="has-feedback form-group"
@@ -62,17 +61,13 @@
     // 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 }, {resolveMsg: null,rejectMsg: null})
+    let res = yield self.$resetpost('/rs/user/modifypwd', {data: self.deliver })
     self.$login.f.password = self.deliver.newpassword
-    console.log(res.data)
-    if (res.data == true) {
-      self.$showAlert('修改成功!', 'success', 2000)
+    if (res.data) {
       self.deliver.password = ''
       self.deliver.newpassword = ''
       self.deliver.affirmpassword = ''
       self.show = false
-    } else {
-      self.$showMessage(res.data)
     }
   }
   export default {

package/src/components/server/ResSelect.vue

@@ -3,7 +3,6 @@
             :value.sync="selectres"
             :multiple="isMul"
             search="true"
-            :disabled="mustselect"
             :close-on-select="!isMul"
             @change="resChange"
   >
@@ -34,10 +33,6 @@
         type: Array,
         default() { return [] },
       },
-      mustselect: {
-        type: Boolean,
-        default: false
-      },
     },
     data () {
       return {

package/src/components/server/RightTree.vue

@@ -26,323 +26,238 @@
   <v-select v-if="islist"
             placeholder='请选择'
             :options='childrenOptions'
-            :disabled="mustselect"
             @change="selectclick"
             :value-single="true"
             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;
+  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
     }
-  }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]){
-        //默认加载如果已选中的和传入参数相等会取消选择，这种操作不应该被允许
-        if(self.orgids==item.id){
-          self.initdataone(item);
-          return;
-        }
-        self.selectclick(item);
-        self.isselect = true;
-        return;
-      }
+    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)
     })
-    //如果没有找到公司，说明是选择的是大区
-    if(!self.isselect){
-      self.childrenregionOption.forEach((item) => {
-        if(item.id == null && item.value !=null ){
-          item = item.value;
-        }
+    // 给资源添加父关系
+    ldapHelper.procParent(self.model)
+    // 树转列
+    if (self.islist) {
+      self.treetoList(self.model)
+    }
+    if(self.initresid&&self.initresid.length>0){
+      self.initTreetoList(self.model)
+      self.childrenOptions.forEach((item) => {
         if(item.id==self.initresid[0]){
-          //默认加载如果已选中的和传入参数相等会取消选择，这种操作不应该被允许
-          if(self.orgids==item.id){
-            self.initdataone(item);
-            return;
-          }
-          self.selectclick(item);
-          return;
+          self.model=[]
+          self.model.push(item)
+          self.selectclick(item)
         }
       })
     }
+    self.selectRes()
   }
-  //self.selectRes()
-}
-export default {
-  title: '资源树',
-  props: {
-    searchText:'',
-    strsign:'',
-    source: {
-      type: String,
-      require: true,
-      default:`tool.getFullTree(this.getRights().where(row.getType() == $organization$))`
-    },
-    //资源初始化数据
-    initresid: {
-      type: Array,
-      default() { return [] },
-    },
-    resid: {
-    },
-    islist: {
-      type: Boolean,
-      default: false
-    },
-    //是否有查看上级的权限
-    Url:{
-      type: String,
-      default:''
-    },
-    mustselect: {
-      type: Boolean,
-      default: false
-    },
-    width:{
-      type:String,
-      default:'60%'
-    }
-  },
-  data () {
-    return {
-      resobj:{res:this.$login.f.orgs, resids:this.$login.f.orgid},
-      userid: this.$login.f.id,
-      resname:[this.$login.f.orgs],
-      orgnames : "请选择",
-      //单选点击 返回所有子
-      orgids : null,
-      orgobj:null,
-      model: [
-
-      ],
-      childrenOptions: [],
-      childrenregionOption:[],
-      isselect: false
-    }
-  },
-  methods: {
-    selectRes () {
-      let newobj={
-        "res": [this.resname],
-        "resids": [this.orgids],
-      }
-      this.$emit('re-res', newobj)
-    },
-    //树形结构变成list
-    initTreetoList(val) {
-      for (let value of val) {
-        this.initErgodicList(value)
+  export default {
+    title: '资源树',
+    props: {
+      searchText:'',
+      strsign:'',
+      source: {
+        type: String,
+        require: true,
+        default:`tool.getFullTree(this.getRights().where(row.getType() == $organization$))`
+      },
+      //资源初始化数据
+      initresid: {
+        type: Array,
+        default() { return [] },
+      },
+      resid: {
+      },
+      islist: {
+        type: Boolean,
+        default: false
+      },
+      //是否有查看上级的权限
+      Url:{
+        type: String,
+        default:''
+      },
+      width:{
+        type:String,
+        default:'60%'
       }
     },
-    //找到跟节点
-    initErgodicList (val) {
-      if(val.children.length > 0){
-        this.childrenOptions.push(val)
-        this.treetoList(val.children)
-      }else{
-        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;
-        }
-      })
+    data () {
+      return {
+        resobj:{res:this.$login.f.orgs, resids:this.$login.f.orgid},
+        userid: this.$login.f.id,
+        resname:[this.$login.f.orgs],
+        orgnames : "请选择",
+        //单选点击 返回所有子
+        orgids : null,
+        orgobj:null,
+        model: [
 
+        ],
+        childrenOptions: []
+      }
     },
-    async buluer (val) {
-      this.strsign=val
-      await new Promise(resolve => {
-        this.$nextTick(() => {
-          resolve()
-        })
-      })
-    },
-    //点击资源的方法
-    selectclick (row) {
-      if(this.orgids==row.id){
-        //取消点击
-        this.orgnames="请选择"
-        this.orgids=null
-        this.orgobj=null
+    methods: {
+      selectRes () {
         let newobj={
-          "res": [],
-          "resids": [],
-          "orgobj": [],
+          "res": [this.resname],
+          "resids": [this.orgids],
         }
         this.$emit('re-res', newobj)
-      }else{
-        //点中点击
-        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,
+      },
+      //树形结构变成list
+      initTreetoList(val) {
+        for (let value of val) {
+          this.initErgodicList(value)
         }
-        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){
-        Object.keys(val.children).forEach((key) => {
-          this.addResChild(val.children[key],objs)
+      },
+      //找到跟节点
+      initErgodicList (val) {
+        if(val.children.length > 0){
+          this.childrenOptions.push(val)
+          this.treetoList(val.children)
+        }else{
+          this.childrenOptions.push(val)
+        }
+      },
+      async buluer (val) {
+        this.strsign=val
+        await new Promise(resolve => {
+          this.$nextTick(() => {
+            resolve()
+          })
         })
-      }
-      return objs
-    },
-    //检查是否显示对勾
-    isSelect(val) {
-      if(this.orgids==val){
-        return true
-      }else{
-        return false
-      }
-    },
-    //树形结构变成list
-    treetoList(val) {
-      for (let value of val) {
-        this.ergodicList(value)
+      },
+      //点击资源的方法
+      selectclick (row) {
+        if(this.orgids==row.id){
+          //取消点击
+          this.orgnames="请选择"
+          this.orgids=null
+          this.orgobj=null
+          let newobj={
+            "res": [],
+            "resids": [],
+            "orgobj": [],
+          }
+          this.$emit('re-res', newobj)
+        }else{
+          //点中点击
+          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){
+          Object.keys(val.children).forEach((key) => {
+            this.addResChild(val.children[key],objs)
+          })
+        }
+        return objs
+      },
+      //检查是否显示对勾
+      isSelect(val) {
+        if(this.orgids==val){
+          return true
+        }else{
+          return false
+        }
+      },
+      //树形结构变成list
+      treetoList(val) {
+        for (let value of val) {
+          this.ergodicList(value)
+        }
+      },
+      //找到跟节点
+      ergodicList (val) {
+        val.children.length > 0 ? this.treetoList(val.children) : this.childrenOptions.push({label: val.name, value: val})
+      },
+      //处理显示默认值
+      dealResObj (val) {
+        try{
+          var arr=val.res.split(".")
+          //截取最后一个分公司名字
+          this.resname=arr[arr.length-1].toString()
+          this.orgnames=arr[arr.length-1].toString()
+          this.resid = val.resids
+          this.orgids = val.resids
+        }catch (e){
+          this.resname='请选择组织'
+        }
+      },
+      judgBoundary(){
+        //判断是否超出边界，超出移动
+        if(document.documentElement.offsetWidth< this.$els.dropdown.getBoundingClientRect().right){
+          this.left = document.documentElement.offsetWidth - this.$els.dropdown.getBoundingClientRect().right - 25
+        }
       }
     },
-    //找到跟节点
-    ergodicList (val) {
-      val.children.length > 0 ? this.treetoList(val.children) : this.childrenOptions.push({label: val.name, value: val})
+    events: {
+
     },
-    //处理显示默认值
-    dealResObj (val) {
-      try{
-        var arr=val.res.split(".")
-        //截取最后一个分公司名字
-        this.resname=arr[arr.length-1].toString()
-        this.orgnames=arr[arr.length-1].toString()
-        this.resid = val.resids
-        this.orgids = val.resids
-      }catch (e){
-        this.resname='请选择组织'
-      }
+    ready () {
+      // this.dealResObj (this.resobj)
+      let gen = saveGen(this)
+      return co(gen)
     },
-    judgBoundary(){
-      //判断是否超出边界，超出移动
-      if(document.documentElement.offsetWidth< this.$els.dropdown.getBoundingClientRect().right){
-        this.left = document.documentElement.offsetWidth - this.$els.dropdown.getBoundingClientRect().right - 25
-      }
+    watch: {
     }
-  },
-  events: {
-
-  },
-  ready () {
-    this.dealResObj (this.resobj)
-    let gen = saveGen(this)
-    return co(gen)
-  },
-  watch: {
   }
-}
 </script>
 <style lang="less">
-#res-tree {
-  .list-group-item {
-    background-color: #FFF;
-    color: #000;
-    padding: 5px 10px;
-    border:0px;
-    white-space: nowrap;
+  #res-tree {
+    .list-group-item {
+      background-color: #FFF;
+      color: #000;
+      padding: 5px 10px;
+      border:0px;
+      white-space: nowrap;
+    }
+  }
+  #res-tree .list-group {
+    width: auto;
+    min-width: 100%;
+  }
+  .hide-text-overflow{
+    overflow: hidden;
+    text-overflow: ellipsis
+  }
+  .select-style {
+    border: 0px;
+    /*border-bottom: 2px solid #C9CCCF;*/
+    border: 1px solid #93B2D3;
+    border-radius: 0px;
+    color: #555;
   }
-}
-#res-tree .list-group {
-  width: auto;
-  min-width: 100%;
-}
-.hide-text-overflow{
-  overflow: hidden;
-  text-overflow: ellipsis
-}
-.select-style {
-  border: 0px;
-  /*border-bottom: 2px solid #C9CCCF;*/
-  border: 1px solid #93B2D3;
-  border-radius: 0px;
-  color: #555;
-}
 </style>