合并

resources/views/personnel/menu.blade.php

@@ -8,7 +8,7 @@
                 </li> @endcan
             @can('人事管理')
                 <li class="nav-item">
-                    <a class="nav-link" href="{{url('personnel/checking-in/createReplenishClock')}}" :class="{active:isActive('checking-in',2)}">考勤</a>
+                    <a class="nav-link" href="{{url('personnel/checking-in/createReplenishClock')}}" :class="{active:isActive('checking-in',2)}">打卡相关</a>
                 </li> @endcan
             <li class="nav-item">
                 <a class="nav-link text-dark" href="{{url('personnel/relating')}}" :class="{active:isActive('relating',2)}">相关设置</a>

resources/views/process/create.blade.php

@@ -481,8 +481,8 @@
                     }
                 },
                 //删除按钮的显示
-                update_delBtn(type,wms_code,commodity_id,type){
-                    if (type) this.$set(this.is_delBtn,wms_code+'_'+commodity_id+'_'+type,true);
+                update_delBtn(is_type,wms_code,commodity_id,type){
+                    if (is_type) this.$set(this.is_delBtn,wms_code+'_'+commodity_id+'_'+type,true);
                     else this.$set(this.is_delBtn,wms_code+'_'+commodity_id+'_'+type,false);
                 },
             },

resources/views/process/edit.blade.php

@@ -418,8 +418,8 @@
                     });
                 },
                 //删除按钮的显示
-                update_delBtn(type,wms_code,commodity_id,type){
-                    if (type) this.$set(this.is_delBtn,wms_code+'_'+commodity_id+'_'+type,true);
+                update_delBtn(is_type,wms_code,commodity_id,type){
+                    if (is_type) this.$set(this.is_delBtn,wms_code+'_'+commodity_id+'_'+type,true);
                     else this.$set(this.is_delBtn,wms_code+'_'+commodity_id+'_'+type,false);
                 },
             },