system-clients 3.1.88-5-liaoyuan → 3.1.88-xianyang

package/src/components/server/ModifyPw.vue

@@ -18,14 +18,13 @@
             </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.required,
+          'has-success': !$v.newpassword.required }">
             <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}'>
+              <span class="glyphicon glyphicon-ok form-control-feedback" v-if="!$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"

package/src/components/server/ResSelect.vue

@@ -2,7 +2,7 @@
   <v-select :options='resoptions' placeholder='请选择'
             :value.sync="selectres"
             :multiple="isMul"
-            search="true"
+            :search="search"
             :close-on-select="!isMul"
             @change="resChange"
   >
@@ -23,6 +23,10 @@
         type: Boolean,
         default: true
       },
+      search:{
+        type: Boolean,
+        default: true
+      },
       //资源初始化数据
       initresid: {
         type: Array,

package/src/components/server/ResSelectGroup.vue

@@ -13,7 +13,7 @@
                 :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"
@@ -22,16 +22,7 @@
                 :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'
-                :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"
@@ -60,11 +51,6 @@
       },
       showComponent:{
         default:['company','department','operator','slicearea']
-      },
-      //人员是否和部门关联
-      cascade: {
-        type: Boolean,
-        default: false
       }
     },
     data () {
@@ -115,7 +101,6 @@
           })
           console.log('过滤之后的片区', arr)
           this.sliceArea = []
-          this.slice_area = []
           arr.forEach((res) => {
             this.sliceArea.push({label: res.name, value: {name: res.name, code:res.number}})
           })
@@ -129,7 +114,7 @@
         else
           condition = " and f_orgid = " + this.$login.f.orgid;
         if(this.userresid.length > 0){
-          condition += " and f_depid in " + plugin.convertToIn(this.userresid);
+          condition += " and f_depname in " + plugin.convertToIn(this.obj.depnames);
         }
         if(ids && ids.length > 0){
           condition += " and f_operatorid in " + plugin.convertToIn(ids);