system-clients 3.2.4 → 3.2.6

package/src/components/server/ModifyPw.vue

@@ -18,14 +18,15 @@
             </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 }">
+               :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}">
             <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>
+              <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>
               <span v-if="$v.newpassword.required">不能为空</span>
-              <span v-if="$v.newpassword.strongpassword && !($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>
             </div>
           </div>
           <div class="has-feedback form-group"
@@ -61,13 +62,17 @@
     // 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: null})
     self.$login.f.password = self.deliver.newpassword
-    if (res.data) {
+    console.log(res.data)
+    if (res.data == true) {
+      self.$showAlert('修改成功!', 'success', 2000)
       self.deliver.password = ''
       self.deliver.newpassword = ''
       self.deliver.affirmpassword = ''
       self.show = false
+    } else {
+      self.$showMessage(res.data)
     }
   }
   export default {

package/src/components/server/PcdBuildingSelect.vue

@@ -0,0 +1,241 @@
+<template>
+  <div :class="style" v-show="show.pcdShow">
+    <label class="font_normal_body">省&nbsp;市&nbsp;区&nbsp;</label>
+    <v-select :value.sync="model.f_pcd"
+              class="select_list select"
+              enter-push
+              v-model="model.f_pcd"
+              style="width: 60%"
+              :multiple="mul"
+              @change="pcdChange"
+              :options='arrays.pcd' placeholder='选择省市区'
+              close-on-select v-el:cc>
+    </v-select>
+  </div>
+  <div :class="style" v-show="show.streetShow">
+    <label class="font_normal_body">街&emsp;&emsp;道</label>
+    <v-select :value.sync="model.f_street"
+              class="select_list select"
+              enter-push
+              v-model="model.f_street"
+              @change="streetChange"
+              style="width: 60%"
+              :multiple="mul"
+              :options='arrays.street' placeholder='选择街道'
+              close-on-select v-el:cc>
+    </v-select>
+  </div>
+  <div :class="style" v-show="show.areaShow">
+    <label class="font_normal_body">小&ensp;&ensp;&ensp;&ensp;区</label>
+    <v-select :value.sync="model.f_residential_area"
+              class="select_list select"
+              enter-push
+              v-model="model.f_residential_area"
+              style="width: 60%"
+              :multiple="mul"
+              @change="areaChange()"
+              :options='arrays.area' placeholder='选择小区'
+              close-on-select v-el:cc>
+    </v-select>
+  </div>
+  <div :class="style" v-show="show.buildingShow">
+    <label class="font_normal_body">楼&emsp;&emsp;栋</label>
+    <v-select :value.sync="model.f_building"
+              class="select_list select"
+              enter-push
+              v-model="model.f_building"
+              style="width: 60%"
+              :multiple="mul"
+              :options='arrays.building' placeholder='选择楼栋'
+              close-on-select v-el:cc>
+    </v-select>
+  </div>
+</template>
+<script>
+  import plugin from '../../plugins/GetLoginInfoService'
+  import { HttpResetClass } from 'vue-client'
+  let readyGen = async function (self) {
+    self.showComponent.find((item)=>{
+      switch(item){
+        case 'pcd': self.show.pcdShow=true; break;
+        case 'street': self.show.streetShow=true; break;
+        case 'area': self.show.areaShow=true; break;
+        case 'building': self.show.buildingShow=true; break;
+      }
+    })
+    self.arrays.pcd=[{label:'全部',value:''}]
+    if(self.show.pcdShow){
+      let HttpReset = new HttpResetClass()
+      var pcd = await HttpReset.load('POST', 'rs/sql/singleTable_OrderBy', {
+        data: {
+          items: 'f_pcd',
+          tablename: 't_pcd',
+          condition: `f_pcd is not null group by f_pcd`,
+          orderitem: 'f_pcd'
+        }
+      }, {resolveMsg: null, rejectMsg: '获取省市区出错!'})
+      for(var i=0;i<pcd.data.length;i++){
+        self.arrays.pcd.push({label:pcd.data[i].f_pcd,value:pcd.data[i].f_pcd})
+      }
+    }else if(self.show.streetShow){
+      console.log("------------查街道")
+      let HttpReset = new HttpResetClass()
+      var street = await HttpReset.load('POST', 'rs/sql/singleTable_OrderBy', {
+        data: {
+          items: 'f_street',
+          tablename: 't_street',
+          condition: `f_filialeid = '${self.$login.f.orgid}' and f_street is not null group by f_street`,
+          orderitem: 'f_street'
+        }
+      }, {resolveMsg: null, rejectMsg: '获取街道出错!'})
+      for(var i=0;i<street.data.length;i++){
+        self.arrays.street.push({label:street.data[i].f_street,value:street.data[i].f_street})
+      }
+    }else if(self.show.areaShow){
+      let HttpReset = new HttpResetClass()
+      var area = await HttpReset.load('POST', 'rs/sql/singleTable_OrderBy', {
+        data: {
+          items: 'f_residential_area',
+          tablename: 't_area',
+          condition: `f_filialeid = '${self.$login.f.orgid}' and f_residential_area is not null group by f_residential_area`,
+          orderitem: 'f_residential_area'
+        }
+      }, {resolveMsg: null, rejectMsg: '获取小区出错!'})
+      for(var i=0;i<area.data.length;i++){
+        self.arrays.area.push({label:area.data[i].f_residential_area,value:area.data[i].f_residential_area})
+      }
+    }
+
+
+  }
+  export default {
+    title: '省市区级联选择',
+    props: {
+      style: {
+        type: String,
+        default: 'col-sm-2 form-group'
+      },
+      mul: {
+        type: Boolean,
+        default: false
+      },
+      showComponent:{
+        default:['pcd','street','area','building']
+      }
+
+    },
+    data () {
+      return {
+        condition:'',
+        show:{
+          pcdShow:false,
+          streetShow:false,
+          areaShow:false,
+          buildingShow:false
+        },
+        arrays:{
+          pcd:[{label: '全部', value: ''}],
+          street:[{label: '全部', value: ''}],
+          area:[{label: '全部', value: ''}],
+          building:[{label: '全部', value: ''}]
+        },
+        model:{
+          f_pcd:[],
+          f_street:[],
+          f_residential_area:[],
+          f_building:[]
+        }
+
+      }
+    },
+    ready () {
+      readyGen(this)
+    },
+    methods:{
+      async pcdChange(){
+        this.arrays.street=[{label:'全部',value:''}]
+        var condition = `f_filialeid = '${this.$login.f.orgid}' and f_street is not null group by f_street`
+        let street = await this.$resetpost('rs/sql/singleTable_OrderBy', {
+          data: {
+            items: 'f_street',
+            tablename: 't_street',
+            condition: condition,
+            orderitem: 'f_street'
+          }
+        }, {resolveMsg: null, rejectMsg: '获取街道出错'})
+        for(var i=0;i<street.data.length;i++){
+          this.arrays.street.push({label:street.data[i].f_street,value:street.data[i].f_street})
+        }
+        this.returnCondition()
+      },
+      async streetChange(){
+        this.arrays.area=[{label:'全部',value:''}]
+        var condition = `f_street = '${this.model.f_street?this.model.f_street:null}' and f_residential_area is not null group by f_residential_area`
+        let area = await this.$resetpost('rs/sql/singleTable_OrderBy', {
+          data: {
+            items: 'f_residential_area',
+            tablename: 't_area',
+            condition: condition,
+            orderitem: 'f_residential_area'
+          }
+        }, {resolveMsg: null, rejectMsg: '获取小区出错'})
+        for(var i=0;i<area.data.length;i++){
+          this.arrays.area.push({label:area.data[i].f_residential_area,value:area.data[i].f_residential_area})
+        }
+        this.returnCondition()
+      },
+      async areaChange(){
+        this.building = [{label:'全部',value:''}]
+        var condition=''
+        if(this.show.areaShow){
+          condition = `f_residential_area = '${this.model.f_residential_area?this.model.f_residential_area:null}' and f_building is not null group by f_building`
+        }else{
+          condition = `f_filialeid = '${this.$login.f.orgid}' and f_building is not null group by f_building`
+        }
+        let build = await this.$resetpost('rs/sql/singleTable_OrderBy', {
+          data: {
+            items: 'f_building',
+            tablename: 't_user_address',
+            condition: condition,
+            orderitem: 'f_building'
+          }
+        }, {resolveMsg: null, rejectMsg: '获取楼栋出错'})
+        for(var i=0;i<build.data.length;i++){
+          this.arrays.building.push({label:build.data[i].f_building,value:build.data[i].f_building})
+        }
+        this.returnCondition()
+      },
+
+      returnCondition(){
+        this.condition=''
+        if(this.model.f_pcd){
+          if(this.model.f_pcd.length>0){
+            this.condition+=` and f_pcd = '${this.model.f_pcd[0]}'`
+          }
+        }
+        if(this.model.f_street) {
+          if (this.model.f_street.length > 0) {
+            this.condition += ` and f_street = '${this.model.f_street[0]}'`
+          }
+        }
+        if(this.model.f_area) {
+          if (this.model.f_area.length > 0) {
+            this.condition += ` and f_area = '${this.model.f_area[0]}'`
+          }
+        }
+        if(this.model.f_building) {
+          if (this.model.f_building.length > 0) {
+            this.condition += ` and f_building = '${this.model.f_building[0]}'`
+          }
+        }
+        // this.$parent.setCon(this.condition)
+        this.$dispatch('setcon',this.condition)
+      }
+    },
+    watch: {
+      // 'condition'(val){
+      //
+      // }
+    }
+  }
+</script>

package/src/components/server/ResSelect.vue

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

package/src/components/server/ResSelectGroup.vue

@@ -1,28 +1,41 @@
 <template>
-  <div :class="style">
+  <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">
+  <div :class="style" v-show="departmentshow">
     <label class="font_normal_body">部&emsp;&emsp;门</label>
-    <res-select restype='department'
+    <res-select restype='department' v-ref:department
                 @res-select="getdep"
                 :parentresid="depresid"
                 :initresid='initres.dep'
+                :mustselect="mustselect"
                 :is-mul="mul">
     </res-select>
   </div>
-  <div :class="style">
+  <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 " >
+  <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"
@@ -31,112 +44,155 @@
   </div>
 </template>
 <script>
-  import plugin from '../../plugins/GetLoginInfoService'
-  import { HttpResetClass } from 'vue-client'
-  export default {
-    title: '资源选择测试',
-    props: {
-      style: {
-        type: String,
-        default: 'col-sm-2'
-      },
-      mul: {
-        type: Boolean,
-        default: true
-      },
-      //初始值
-      initres: {
-        type: Object,
-        default: null,
-      },
+import plugin from '../../plugins/GetLoginInfoService'
+import { HttpResetClass } from 'vue-client'
+export default {
+  title: '资源选择测试',
+  props: {
+    style: {
+      type: String,
+      default: 'col-sm-2 form-group'
     },
-    data () {
-      return {
-        orgresid:[this.$login.f.orgid],
-        depresid:[],
-        userresid:[],
-        sliceArea: [],
-        slice_area:[],
-
-        obj:{
-          orgnames:[],
-          depnames:[],
-          operatornames:[]
-        }
-      }
+    mul: {
+      type: Boolean,
+      default: true
     },
-    ready () {
-      console.log('开始获取组织结构。。。')
-      this.initAreas(this.$login.f.orgid)
+    //初始值
+    initres: {
+      type: Object,
+      default: null,
     },
-    methods:{
-
-      // 初始化片区
-      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}})
-          })
+    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:[],
+      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;
         }
-      },
-      returnOrg(ids){
+      })
+    },
+    // 初始化片区
+    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}})
+        })
+      }
+    },
+    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);
-        }
-        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();
+      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;
         }
       }
+      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)
     },
-    watch: {
-
+    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>