Merge branch 'master' of ssh://was.baoshi56.com:10022/var/git/bswas

app/Http/Controllers/UserController.php

@@ -22,12 +22,7 @@ use Illuminate\Support\Facades\Validator;
 class UserController extends Controller
 {
     use AsyncResponse;
-    /**
-     * Display a listing of the resource.
-     *
-     * @param Request $request
-     * @return Response
-     */
+
     public function index(Request $request)
     {
         if(!Gate::allows('用户-查询')){ return redirect(url('/'));  }

resources/views/equipment/_detailInfo.blade.php

@@ -42,10 +42,14 @@
                             设备高度/M：<input class="form-control" min="0" type="number" step="0.01" :class="error['children['+i+'].height'] ? 'is-invalid' : ''" v-model="item.height"></input>
                         </div>
                         <div class="col-4">
-                            库位行数：<input class="form-control" min="0" :disabled="current.eqId!==undefined" type="number" step="1" :class="error['children['+i+'].row'] ? 'is-invalid' : ''" v-model="item.row"></input>
+                            库位行数：<input class="form-control" min="0" :disabled="current.eqId!==undefined" type="number" step="1"
+                                        :style="[item.row ? {color:'red'} : '',item.row ? {fontWeight:'bold'} : '']"
+                                        :class="error['children['+i+'].row'] ? 'is-invalid' : ''" v-model="item.row"></input>
                         </div>
                         <div class="col-4">
-                            库位列数：<input class="form-control" min="0" :disabled="current.eqId!==undefined" type="number" step="1" :class="error['children['+i+'].column'] ? 'is-invalid' : ''" v-model="item.column"></input>
+                            库位列数：<input class="form-control" min="0" :disabled="current.eqId!==undefined" type="number" step="1"
+                                        :style="[item.row ? {color:'red'} : '',item.row ? {fontWeight:'bold'} : '']"
+                                        :class="error['children['+i+'].column'] ? 'is-invalid' : ''" v-model="item.column"></input>
                         </div>
                     </div>
                 </div>

resources/views/maintenance/user/index.blade.php

@@ -176,7 +176,7 @@
                         this._updateOwnerShow(!this.switchStatus);
                     }else{
                         this.owners.forEach(owner=>{
-                            owner.hide = !(this.isExist(this.user.owners,owner.name) && this.switchStatus);
+                            owner.hide = this.switchStatus && !(this.isExist(this.user.owners,owner.name) && this.switchStatus);
                         });
                         this.$forceUpdate();
                     }
@@ -191,7 +191,7 @@
                     let val = e.target.value;
                     this.owners.forEach(owner=>{
                         if (owner.value.indexOf(val) > -1){
-                            owner.hide = (this.switchStatus && !this.isExist(this.user.owners,owner.name)) || !this.switchStatus;
+                            owner.hide = !((this.switchStatus && this.isExist(this.user.owners,owner.name)) || !this.switchStatus);
                         }else{
                             owner.hide = true;
                         }