system-clients 3.1.99 → 3.1.100-aode

package/src/components/server/ModifyPw.vue

@@ -1,106 +1,112 @@
-<template>
-  <div>
-    <validator name="v">
-      <modal :show.sync="show" v-ref:modal  backdrop="false">
-        <header slot="modal-header" class="modal-header">
-          <button type="button" class="close" @click="rest"><span>&times;</span></button>
-          <h4 class="modal-title">修改密码</h4>
-        </header>
-        <article slot="modal-body" class="modal-body modifystyle auto form-horizontal">
-          <div class="has-feedback form-group"
-               :class="{'has-warning':$v.password.required,'has-error': $v.password.required,
-          'has-success':!$v.password.required}">
-            <label for="password" class="col-sm-4 col-sm-offset-1 control-label">原始密码:&nbsp;&nbsp;</label>
-            <div class="col-sm-4">
-              <input type="password" v-model="deliver.password" class="form-control" id="password" v-validate:password="{ required: true}">
-              <span class="glyphicon glyphicon-ok form-control-feedback" v-if="!$v.password.required"></span>
-              <span v-if="$v.password.required">不能为空</span>
-            </div>
-          </div>
-          <div class="has-feedback form-group"
-               :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, 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.strongpassword && !($v.newpassword.required)">密码必须包含英文大小写、阿拉伯数字、字符</span>
-            </div>
-          </div>
-          <div class="has-feedback form-group"
-               :class="{'has-warning':$v.affirmpassword.required,'has-error':$v.affirmpassword.equalValid && !($v.affirmpassword.required),
-          'has-success': !$v.affirmpassword.required && !($v.affirmpassword.equalValid && !($v.affirmpassword.required))}">
-            <label for="affirmpassword" class="col-sm-4 col-sm-offset-1 control-label">确认密码:&nbsp;&nbsp;</label>
-            <div class="col-sm-4">
-              <input type="password" v-model="deliver.affirmpassword" class="form-control" id="affirmpassword" v-validate:affirmpassword="{ required: true, equalValid: deliver.newpassword }">
-              <span class="glyphicon glyphicon-ok form-control-feedback" v-if="!$v.affirmpassword.required && !($v.affirmpassword.equalValid && !($v.affirmpassword.required))"></span>
-              <span v-if="$v.affirmpassword.required">不能为空</span>
-              <span v-if="$v.affirmpassword.equalValid && !($v.affirmpassword.required)">两次密码不一致 !!</span>
-            </div>
-          </div>
-        </article>
-
-        <footer slot="modal-footer" class="modal-footer">
-          <button  type="button" class="btn btn-success" @click='confirm' :disabled="!$v.valid">确认</button>
-          <button  type="button" class="btn btn-default" @click='rest'>取消</button>
-        </footer>
-      </modal>
-    </validator>
-  </div>
-
-
-</template>
-<script>
-  import co from 'co'
-  import validator from '../../plugins/validation';
-
-  let saveGen = function * (self) {
-    self.deliver.ename = self.functions.ename
-    // let res = yield self.$post('rs/user/entity', {data: self.deliver})
-    // 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 })
-    self.$login.f.password = self.deliver.newpassword
-    if (res.data) {
-      self.deliver.password = ''
-      self.deliver.newpassword = ''
-      self.deliver.affirmpassword = ''
-      self.show = false
-    }
-  }
-  export default {
-    title: '系统管理-密码修改',
-    data () {
-      return {
-        deliver: {
-          password: '',
-          newpassword: '',
-          affirmpassword: ''
-        },
-        functions: this.$login.f
-      }
-    },
-    props: ['show'],
-    methods: {
-      confirm () {
-        let gen = saveGen(this)
-        co(gen)
-      },
-      rest () {
-        this.show = false
-        this.deliver = {password: '', newpassword: '', affirmpassword: ''}
-      }
-    }
-  }
-</script>
-<style>
-  /*修改密码body界面样式*/
-  .modifystyle {
-    background: #FCFEEE;
-  }
-  .modifystyle span{
-    color: red;
-  }
-</style>
+<template>
+  <div>
+    <validator name="v">
+      <modal :show.sync="show" v-ref:modal  backdrop="false">
+        <header slot="modal-header" class="modal-header">
+          <button type="button" class="close" @click="rest"><span>&times;</span></button>
+          <h4 class="modal-title">修改密码</h4>
+        </header>
+        <article slot="modal-body" class="modal-body modifystyle auto form-horizontal">
+          <div class="has-feedback form-group"
+               :class="{'has-warning':$v.password.required,'has-error': $v.password.required,
+          'has-success':!$v.password.required}">
+            <label for="password" class="col-sm-4 col-sm-offset-1 control-label">原始密码:&nbsp;&nbsp;</label>
+            <div class="col-sm-4">
+              <input type="password" v-model="deliver.password" class="form-control" id="password" v-validate:password="{ required: true}">
+              <span class="glyphicon glyphicon-ok form-control-feedback" v-if="!$v.password.required"></span>
+              <span v-if="$v.password.required">不能为空</span>
+            </div>
+          </div>
+          <div class="has-feedback form-group"
+               :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, 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.strongpassword && !($v.newpassword.required)">密码必须包含英文大小写、阿拉伯数字、字符</span>
+            </div>
+          </div>
+          <div class="has-feedback form-group"
+               :class="{'has-warning':$v.affirmpassword.required,'has-error':$v.affirmpassword.equalValid && !($v.affirmpassword.required),
+          'has-success': !$v.affirmpassword.required && !($v.affirmpassword.equalValid && !($v.affirmpassword.required))}">
+            <label for="affirmpassword" class="col-sm-4 col-sm-offset-1 control-label">确认密码:&nbsp;&nbsp;</label>
+            <div class="col-sm-4">
+              <input type="password" v-model="deliver.affirmpassword" class="form-control" id="affirmpassword" v-validate:affirmpassword="{ required: true, equalValid: deliver.newpassword }">
+              <span class="glyphicon glyphicon-ok form-control-feedback" v-if="!$v.affirmpassword.required && !($v.affirmpassword.equalValid && !($v.affirmpassword.required))"></span>
+              <span v-if="$v.affirmpassword.required">不能为空</span>
+              <span v-if="$v.affirmpassword.equalValid && !($v.affirmpassword.required)">两次密码不一致 !!</span>
+            </div>
+          </div>
+        </article>
+
+        <footer slot="modal-footer" class="modal-footer">
+          <button  type="button" class="btn btn-success" @click='confirm' :disabled="!$v.valid">确认</button>
+          <button  type="button" class="btn btn-default" @click='rest'>取消</button>
+        </footer>
+      </modal>
+    </validator>
+  </div>
+
+
+</template>
+<script>
+  import co from 'co'
+  import validator from '../../plugins/validation';
+
+  let saveGen = function * (self) {
+    self.deliver.ename = self.functions.ename
+    // let res = yield self.$post('rs/user/entity', {data: self.deliver})
+    // 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: '请求错误，修改密码失败!' })
+    self.$login.f.password = self.deliver.newpassword
+    if (res.data) {
+      console.log("修改密码返回：" , res.data)
+      if (res.data.code === 200) {
+        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 {
+    title: '系统管理-密码修改',
+    data () {
+      return {
+        deliver: {
+          password: '',
+          newpassword: '',
+          affirmpassword: ''
+        },
+        functions: this.$login.f
+      }
+    },
+    props: ['show'],
+    methods: {
+      confirm () {
+        let gen = saveGen(this)
+        co(gen)
+      },
+      rest () {
+        this.show = false
+        this.deliver = {password: '', newpassword: '', affirmpassword: ''}
+      }
+    }
+  }
+</script>
+<style>
+  /*修改密码body界面样式*/
+  .modifystyle {
+    background: #FCFEEE;
+  }
+  .modifystyle span{
+    color: red;
+  }
+</style>

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/ResSelectGroup.vue

@@ -2,40 +2,27 @@
   <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 restype='department'
                 @res-select="getdep"
                 :parentresid="depresid"
                 :initresid='initres.dep'
-                :mustselect="mustselect"
                 :is-mul="mul">
     </res-select>
   </div>
-  <div :class="style" v-show="operatorshow && (!cascade)">
+  <div :class="style" v-show="operatorshow">
     <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" >
+  <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"
@@ -44,153 +31,129 @@
   </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
-    },
-    //初始值
-    initres: {
-      type: Object,
-      default: null,
-    },
-    showComponent:{
-      default:['company','department','operator','slicearea']
-    },
-    //人员是否和部门关联
-    cascade: {
-      type: Boolean,
-      default: true
-    },
-    selectin: {
-      type: Boolean,
-      default: false
-    }
-  },
-  data () {
-    return {
-      orgresid:[this.$login.f.orgid],
-      depresid:[],
-      userresid:[],
-      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) => {
-          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}})
-        })
+  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
+      },
+      //初始值
+      initres: {
+        type: Object,
+        default: null,
+      },
+      showComponent:{
+        default:['company','department','operator','slicearea']
       }
     },
-    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) {
-          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;
+    data () {
+      return {
+        orgresid:[this.$login.f.orgid],
+        depresid:[],
+        userresid:[],
+        sliceArea: [],
+        slice_area:[],
+        companyshow:false,
+        departmentshow:false,
+        operatorshow:false,
+        sliceareashow:false,
+        obj:{
+          orgnames:[],
+          depnames:[],
+          operatornames:[]
         }
       }
-      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) {
-      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) {
-      this.obj.operatornames = obj
-      this.returnOrg(obj);
+    ready () {
+      console.log('开始获取组织结构。。。')
+      this.initComponent();
+      this.initAreas(this.$login.f.orgid)
     },
-    getarea(val) {
-      this.slice_area=val
-      if(this.obj.operatornames){
-        this.returnOrg(this.obj.operatornames);
-      }else{
+    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) => {
+            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: {
+    },
+    watch: {
 
+    }
   }
-}
 </script>