hu hao 4 лет назад
Родитель
Сommit
ffeef5a5d0

+ 15 - 0
app/Http/Controllers/RejectedController.php

@@ -275,6 +275,21 @@ class RejectedController extends Controller
         app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
         return ['success'=>'false','fail_info'=>'数据更新失败'];
     }
+    public function cancelCheck(Request $request)
+    {
+        if(!Gate::allows('退货管理-审核')){ return ['success'=>'false','fail_info'=>"没有权限"]; }
+        $rejected=RejectedBill::query()->find($request->input('id')??'');
+        if ($rejected){
+            $rejected->is_checked=0;
+            $rejected->checked_numbers=null;
+            $re=$rejected->update();
+            if ($re){
+                return ['success'=>'true','id'=>$request->input('id')];
+            }
+        }
+        app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
+        return ['success'=>'false','fail_info'=>'数据更新失败'];
+    }
     public function ajaxCheckAll(Request $request)
     {
         if(!Gate::allows('退货管理-审核')){ return ['success'=>'false','fail_info'=>"没有权限"];  }

+ 45 - 7
resources/views/rejected/search/general.blade.php

@@ -54,13 +54,17 @@
                         <td class="text-nowrap">
                             <span class="text-muted" style="opacity:0.7">@{{ i+1 }}</span> <span v-if="rejectedBill.order_issue_rejected_bill" class="badge badge-pill badge-danger">问题件</span>
                         </td>
-                        <td class="text-muted">
-                            <span>
-                                <span v-if="rejectedBill.is_checked==1" class="text-success">
-                                    <span class="fa fa-check-square"></span> @{{ rejectedBill.checked_numbers }}
+                        <td class="text-muted" @mouseover="showCancelBtn(rejectedBill)"
+                            @mouseleave="blankCancelBtn(rejectedBill)">
+                            <span class="text-center">
+                            <span v-if="rejectedBill.is_checked==1">
+                                <span @click="cancelCheck(rejectedBill.id)" class="btn btn-sm btn-outline-secondary" v-if="rejectedBill.isShowCancelBtn">取消审核</span>
+                                <span  class="text-success" v-if="!(rejectedBill.isShowCancelBtn)">
+                                    <span class="fa fa-check-square" ></span> @{{ rejectedBill.checked_numbers }}
                                 </span>
-                                <span v-else>未审核</span>
                             </span>
+                            <span v-else>未审核</span>
+                                </span>
                         </td>
                         <td class="" :class="[rejectedBill.is_finished==1?'text-success':'text-muted']">@{{rejectedBill.is_finished | yesNo}}</td>
                         <td class="" :class="[rejectedBill.is_loaded==1?'text-success':'text-muted']">
@@ -195,6 +199,8 @@
                 ],
                 selectTr:'',
                 upList:{},
+                cancelCheckedHover:null,
+                isShowCancelBtn:false,
             },
             mounted:function(){
                 $(".up").slideUp();
@@ -229,7 +235,7 @@
                 this.form.init();
                 let column = [
                     {name:'index',value: '序号', neglect: true},
-                    {name:'checked_numbers',value: '是否审核', neglect: true},
+                    {name:'checked_numbers',value: '是否审核', },
                     {name: 'is_finished', value: '是否完结',neglect: true},
                     {name: 'is_loaded', value: '是否入库', neglect: true},
                     {name:'created_at',value: '创建时间'},
@@ -265,8 +271,40 @@
                     data: this.rejectedBills,
                     fixedTop:($('#form_div').height())+2,
                 }).init();
+                this.rejectedBills.forEach(function(rejectedBill){
+                    rejectedBill.isShowCancelBtn=false;
+                });
             },
             methods:{
+                showCancelBtn(a){
+                    a.isShowCancelBtn=true;
+                    this.$forceUpdate();
+                },
+                blankCancelBtn(a){
+                    a.isShowCancelBtn=false;
+                    this.$forceUpdate();
+                },
+                cancelCheck(id){
+                    let _this=this;
+                    let url= '{{url("rejected/index/cancelCheck")}}';
+                    axios.post(url,{'id':id}).then(function (response) {
+                        if(response.data.success){
+                           _this.rejectedBills.forEach(function (rejectedBill){
+                                if (rejectedBill.id==response.data.id){
+                                    rejectedBill.is_checked=0;
+                                }
+                           })
+                            tempTip.setDuration(2000);
+                            tempTip.showSuccess('取消审核成功');
+                        }else{
+                            tempTip.setDuration(3000);
+                            tempTip.show('取消审核失败!'+response.data.fail_info);
+                        }
+                    }).catch(function (err) {
+                        tempTip.setDuration(3000);
+                        tempTip.show('取消审核失败!网络异常:'+err);
+                    });
+                },
                 unfold(id){
                     this.$set(this.upList,id,this.upList[id] ? !this.upList[id] : true);
                     $("#rejected-"+id).slideToggle();
@@ -507,7 +545,7 @@
             filters:{
                 yesNo:function (val) {
                     if(!val||val===0||val==='0'){return '否'}
-                    return ''
+                    return '完结'
                 },
                 yesNoIsLoaded:function (val) {
                     switch(val){

+ 1 - 0
routes/web.php

@@ -372,6 +372,7 @@ Route::group(['prefix'=>'rejected'],function(){
         Route::any('general','RejectedController@index');
         Route::any('analyze','RejectedController@indexAnalyze');
         Route::get('import', 'RejectedController@import');
+        Route::post('cancelCheck', 'RejectedController@cancelCheck');
     });
     /** 分析 */
     Route::group(['prefix'=>'analyze'],function(){