页面修饰

app/Http/Controllers/ProcessController.php

@@ -707,7 +707,13 @@ class ProcessController extends Controller
      */
     public function edit($id)
     {
-        //
+        $process=Process::with(['processesContents'=>function($query){
+            return $query->with(['commodity'=>function($query){
+                return $query->with('barcodes');
+            }]);
+        }])->find($id);
+        $processMethods=ProcessMethod::get();
+        return view('process.edit',['process'=>$process,'processMethods'=>$processMethods]);
     }
 
     /**
@@ -719,7 +725,56 @@ class ProcessController extends Controller
      */
     public function update(Request $request, $id)
     {
-        //
+
+        if(!Gate::allows('二次加工管理-录入')){ return redirect(url('/'));  }
+        $errors=$this->validatorProcess($request)->errors();
+        if (count($errors)>0)return ['error'=>$errors,'data'=>"process"];
+        $errors=[];
+        foreach ($request->input('processContents') as $processContent){
+            if ($processContent['addBtnShow'])continue;
+            $error=$this->validatorProcessContent($processContent)->errors();
+            if (count($error)>0)$errors[$processContent['wms_code']]=$error;
+        }
+        if (count($errors)>0)return ['error'=>$errors];
+        $process=Process::find($id);
+        $process->owner_id=$request->input('owner_id');
+        $process->process_method_id=$request->input('process_method_id');
+        $process->unit_price=$request->input('unit_price');
+        $process->remark=$request->input('remark');
+        $process->amount=$request->input('amount');
+        $process->update();
+        $this->log(__METHOD__,"编辑二次加工单".__FUNCTION__,json_encode($process),Auth::user()['id']);
+        foreach ($request->input('processContents') as $processContent){
+            if ($processContent['addBtnShow'])continue;
+            if (!isset($processContent['id'])){
+                $processContentOne=new ProcessesContent([
+                    'process_id'=>$process->id,
+                    'bill_type'=>$processContent['bill_type'],
+                    'commodity_id'=>$processContent['commodity_id'],
+                    'wms_code'=>$processContent['wms_code'],
+                    'amount'=>$processContent['amount'],
+                ]);
+                $processContentOne->save();
+                $this->log(__METHOD__,"录入二次加工单内容单".__FUNCTION__,json_encode($processContentOne),Auth::user()['id']);
+                continue;
+            }
+            $processContentOne=ProcessesContent::find($processContent['id']);
+            $processContentOne->bill_type=$processContent['bill_type'];
+            $processContentOne->commodity_id=$processContent['commodity_id'];
+            $processContentOne->wms_code=$processContent['wms_code'];
+            $processContentOne->amount=$processContent['amount'];
+            $processContentOne->update();
+            $this->log(__METHOD__,"编辑二次加工单内容单".__FUNCTION__,json_encode($processContentOne),Auth::user()['id']);
+        }
+        return;
+    }
+
+    //删除二次加工内容单
+    public function deleteProcessContent($id){
+        $processContent=ProcessesContent::find($id);
+        if (!$processContent) return ['success'=>false,'data'=>'为找到对应二次加工内容单'];
+        $processContent->delete();
+        return ['success'=>true];
     }
 
     /**
@@ -805,7 +860,6 @@ class ProcessController extends Controller
     public function validatorProcessContent(array $processContent){
         $validator=Validator::make($processContent,[
             'wms_code'=>['required'],
-            'owner_id'=>['required','integer'],
             'commodity_id'=>['required','integer'],
             'bill_type'=>['required'],
             'amount'=>['required','min:0','max:999999','integer']
@@ -815,7 +869,6 @@ class ProcessController extends Controller
             'integer'=>':attribute 必须为整数',
             'max'=>':attribute 输入值过大',
         ],[
-            'owner_id'=>'货主',
             'wms_code'=>'单据号',
             'commodity_id'=>'商品',
             'bill_type'=>'单据类型',

app/Http/Controllers/api/thirdPart/flux/ProcessController.php

@@ -20,11 +20,22 @@ class ProcessController extends Controller
                 'name'=>'TestCommodityName',
                 'barcode'=>'TestCommodityBarcode',
                 'sku'=>'TestCommoditySKU',
+                'barcodes'=>[[
+                    'code'=>'test01',
+                    'commodity_id'=>1
+                ]]
             ],[
                 'id'=>'2',
                 'name'=>'TestCommodityName1',
                 'barcode'=>'TestCommodityBarcode1',
                 'sku'=>'TestCommoditySKU1',
+                'barcodes'=>[[
+                    'code'=>'asddddddddddddddddddddddddddddddddd',
+                    'commodity_id'=>2
+                ],[
+                    'code'=>'56464899999999999999999999999999',
+                    'commodity_id'=>2
+                ]]
             ]],
             'bill_type'=>'移库单',
             'amount'=>'50',

resources/views/process/create.blade.php

@@ -9,9 +9,9 @@
             <div class="card-body">
                 <div class="form-group row">
                     <label class="col-3 col-form-label text-right" >单据号</label>
-                    <input v-model="process.wms_code" class="form-control col-6" :class="error.wms_code.length>0 ? 'is-invalid' :''">&nbsp;&nbsp;&nbsp;
+                    <input v-model="process.wms_code" class="form-control col-6" :class="error.wms_code && error.wms_code.length>0 ? 'is-invalid' :''">&nbsp;&nbsp;&nbsp;
                     <input class="btn btn-info col-2" type="button" @click="addProcessContent()" value="新增库单据">
-                    <span v-if="error.wms_code.length>0" class="invalid-feedback col-7 offset-3 mt-0" role="alert">
+                    <span v-if="error.wms_code && error.wms_code.length>0" class="invalid-feedback col-7 offset-3 mt-0" role="alert">
                         <strong>@{{ error.wms_code[0] }}</strong>
                     </span>
                 </div>
@@ -26,8 +26,11 @@
                             <span class=" col-9 input-group" style="max-height: 150px; overflow-y: scroll;border-radius:5px;opacity:1.5;text-align: center;">
                                 <ul class="list-group tooltipTarget" title="双击选择商品" style="width: 100%" onselectstart="return false;">
                                     <li v-for="commodity in processContent.commodities" :id="commodity.id" class="list-group-item list-group-item-action p-0 m-0"
-                                         @dblclick="selectedCommodity(commodity,processContent.wms_code)" :class="processContent.commodity_id==commodity.id ? 'active' :''">
-                                        <p class="form-inline" style="cursor: default;"><small class="text-left col-6">@{{ commodity.name }}</small><small class="text-left  col-6">@{{ commodity.barcode }}</small></p></li>
+                                        @dblclick="selectedCommodity(commodity,processContent.wms_code)" :class="processContent.commodity_id==commodity.id ? 'active' :''">
+                                        <p class="form-inline" style="cursor: default;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;"><small class="text-left text-info col-6">@{{ commodity.name }}</small>
+                                            <small class="text-left  col-6" >
+                                                <a v-for="barcode in commodity.barcodes">@{{ barcode.code }}&nbsp;&nbsp;&nbsp;</a>
+                                            </small></p></li>
                                 </ul>
                             </span>
                         </div>
@@ -37,7 +40,9 @@
                         </div>
                         <div class="row pt-2">
                             <label class="col-3 col-form-label text-right">条码</label>
-                            <b  class="col-7">@{{ processContent.commodity_barcode }}</b>
+                            <ul class="p-0 m-0 ml-2 list-unstyled list-inline" v-if="processContent.commodity_barcodes && processContent.commodity_barcodes.length>0">
+                                <li v-for="barcode in processContent.commodity_barcodes"><small>@{{ barcode.code }}</small></li>
+                            </ul>
                         </div>
 
                         <div class="row pt-2">
@@ -71,28 +76,28 @@
                 </div>
                 <div class="form-group row">
                     <label class="col-3 col-form-label text-right" >货主</label>
-                    <input readonly v-if="processContents.length>0" :value="processContents[processContents.length-1].owner_name" class="form-control col-7" :class="error.owner_id.length>0 ? 'is-invalid' :''">
-                    <span v-if="error.owner_id.length>0" class="invalid-feedback col-7 offset-3 mt-0" role="alert">
+                    <input readonly v-if="processContents.length>0" :value="processContents[processContents.length-1].owner_name" class="form-control col-7" :class="error.owner_id && error.owner_id.length>0 ? 'is-invalid' :''">
+                    <span v-if="error.owner_id && error.owner_id.length>0" class="invalid-feedback col-7 offset-3 mt-0" role="alert">
                         <strong>@{{ error.owner_id[0] }}</strong>
                     </span>
                 </div>
                 <div class="form-group row">
                     <label class="col-3 col-form-label text-right" >加工类型</label>
-                    <select v-model="process.process_method_id" class="form-control col-7" :class="error.process_method_id.length>0 ? 'is-invalid' :''">
+                    <select v-model="process.process_method_id" class="form-control col-7" :class="error.process_method_id && error.process_method_id.length>0 ? 'is-invalid' :''">
                         <option  v-for="processMethod in processMethods" :value="processMethod.id">@{{ processMethod.name }}</option>
                     </select>
                 </div>
                 <div class="form-group row">
                     <label class="col-3 col-form-label text-right" >加工数量</label>
-                    <input v-model="process.amount" type="text" class="form-control col-7" :class="error.amount.length>0 ? 'is-invalid' :''">
-                    <span v-if="error.amount.length>0" class="invalid-feedback col-7 offset-3 mt-0" role="alert">
+                    <input v-model="process.amount" type="text" class="form-control col-7" :class="error.amount && error.amount.length>0 ? 'is-invalid' :''">
+                    <span v-if="error.amount && error.amount.length>0" class="invalid-feedback col-7 offset-3 mt-0" role="alert">
                         <strong>@{{ error.amount[0] }}</strong>
                     </span>
                 </div>
                 <div class="form-group row">
                     <label class="col-3 col-form-label text-right" >单价</label>
-                    <input v-model="process.unit_price" type="text" class="form-control col-7" :class="error.unit_price.length>0 ? 'is-invalid' :''">
-                    <span v-if="error.unit_price.length>0" class="invalid-feedback col-7 offset-3 mt-0" role="alert">
+                    <input v-model="process.unit_price" type="text" class="form-control col-7" :class="error.unit_price && error.unit_price.length>0 ? 'is-invalid' :''">
+                    <span v-if="error.unit_price && error.unit_price.length>0" class="invalid-feedback col-7 offset-3 mt-0" role="alert">
                         <strong>@{{ error.unit_price[0] }}</strong>
                     </span>
                 </div>
@@ -183,7 +188,7 @@
                             processContent['commodities']=response.data.commodities;
                             processContent['commodity_id']='';
                             processContent['commodity_name']='';
-                            processContent['commodity_barcode']='';
+                            processContent['commodity_barcodes']=[];
                             processContent['commodity_sku']='';
                             processContent['bill_type']=response.data.bill_type;
                             processContent['amount']=response.data.amount;
@@ -251,7 +256,7 @@
                        if (processContent.wms_code==wms_code){
                            processContent.commodity_id=commodity.id;
                            processContent.commodity_name=commodity.name;
-                           processContent.commodity_barcode=commodity.barcode;
+                           processContent.commodity_barcodes=commodity.barcodes;
                            processContent.commodity_sku=commodity.sku;
                            return false;
                        }

resources/views/process/edit.blade.php

@@ -0,0 +1,302 @@
+@extends('layouts.app')
+
+@section('content')
+    <div id="nav2">
+        @component('process.menu')
+            <li class="nav-item">
+                <a class="nav-link" href="{{URL::current()}}" :class="{active:isActive('edit',3)}">编辑</a>
+            </li>
+        @endcomponent
+    </div>
+    <div class="container-fluid mt-3" id="list">
+        <div class="card col-md-8 offset-md-2">
+            <div class="card-body">
+                <div class="form-group row">
+                    <label class="col-3 col-form-label text-right" >单据号</label>
+                    <input v-model="process.wms_code" class="form-control col-6" :class="error.wms_code && error.wms_code.length>0 ? 'is-invalid' :''">&nbsp;&nbsp;&nbsp;
+                    <input class="btn btn-info col-2" type="button" @click="addProcessContent()" value="新增库单据">
+                    <span v-if="error.wms_code && error.wms_code.length>0" class="invalid-feedback col-7 offset-3 mt-0" role="alert">
+                        <strong>@{{ error.wms_code[0] }}</strong>
+                    </span>
+                </div>
+                <div class="form-group row">
+                    <label class="col-3 col-form-label text-right" >任务号</label>
+                    <input disabled :value="process.code" class="form-control col-7">
+                </div>
+                <div class="form-group row" v-if="processContents.length>0" v-for="processContent in processContents">
+                    <div class="col-8 offset-md-3 pl-0 pt-2 border  rounded">
+                        <div class="row pt-2">
+                            <label class="col-3 col-form-label text-right">单据号@{{ processContent.i }}</label>
+                            <b class="col-7">@{{ processContent.wms_code }}</b>
+                        </div>
+                        <div class="row pt-2" v-if="processContent.addBtnShow">
+                            <label class="col-3 col-form-label text-right">选择商品</label>
+                            <span class=" col-9 input-group" style="max-height: 150px; overflow-y: scroll;border-radius:5px;opacity:1.5;text-align: center;">
+                                <ul class="list-group tooltipTarget" title="双击选择商品" style="width: 100%" onselectstart="return false;">
+                                    <li v-for="commodity in processContent.commodities" :id="commodity.id" class="list-group-item list-group-item-action p-0 m-0"
+                                         @dblclick="selectedCommodity(commodity,processContent.wms_code)" :class="processContent.commodity_id==commodity.id ? 'active' :''">
+                                        <p class="form-inline" style="cursor: default;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;"><small class="text-left text-info col-6">@{{ commodity.name }}</small>
+                                            <small class="text-left  col-6" >
+                                                <a v-for="barcode in commodity.barcodes">@{{ barcode.code }}&nbsp;&nbsp;&nbsp;</a>
+                                            </small></p></li>
+                                </ul>
+                            </span>
+                        </div>
+                        <div class="row pt-2">
+                            <label class="col-3 col-form-label text-right">商品名</label>
+                            <b  class="col-7">@{{ processContent.commodity_name }}</b>
+                        </div>
+                        <div class="row pt-2">
+                            <label class="col-3 col-form-label text-right">条码</label>
+                            <ul class="p-0 m-0 ml-2 list-unstyled list-inline" v-if="processContent.commodity_barcodes && processContent.commodity_barcodes.length>0">
+                                <li v-for="barcode in processContent.commodity_barcodes"><small>@{{ barcode.code }}</small></li>
+                            </ul>
+                        </div>
+
+                        <div class="row pt-2">
+                            <label class="col-3 col-form-label text-right">SKU</label>
+                            <b  class="col-7">@{{ processContent.commodity_sku }}</b>
+                        </div>
+                        <div class="row pt-2">
+                            <label class="col-3 col-form-label text-right">单据类型</label>
+                            <select  v-model="processContent.bill_type" class="col-7 form-control"
+                                     :class="processContentError[processContent.wms_code] && processContentError[processContent.wms_code].bill_type ? 'is-invalid' :''">
+                                <option value="移库单">移库单</option>
+                                <option value="入库单">入库单</option>
+                                <option value="出库单">出库单</option>
+                            </select>
+                        </div>
+                        <div  class="row pt-2">
+                            <label class="col-3 col-form-label text-right">数量</label>
+                            <input v-model="processContent.amount" type="text" class="form-control col-7"
+                                   :class="processContentError[processContent.wms_code] && processContentError[processContent.wms_code].amount ? 'is-invalid' :''">
+                            <span v-if="processContentError[processContent.wms_code] && processContentError[processContent.wms_code].amount" class="invalid-feedback col-7 offset-3 mt-0" role="alert">
+                                <strong>@{{ processContentError[processContent.wms_code].amount[0] }}</strong>
+                            </span>
+                        </div>
+                        <div class="col-8 offset-2 pt-2" v-if="processContent.addBtnShow">
+                            <input type="button" @click="confirmStore(processContent.wms_code,processContent.commodity_id,processContent.amount)" value="确定新增" class="btn btn-primary form-control">
+                        </div>
+                        <div class="col-8 offset-2 pt-2 pb-2">
+                            <input type="button" @click="deleteProcessContent(processContent)" value="删除" class="btn btn-danger form-control">
+                        </div>
+                    </div>
+                </div>
+                <div class="form-group row">
+                    <label class="col-3 col-form-label text-right" >货主</label>
+                    <input readonly v-if="processContents.length>0" :value="processContents[processContents.length-1].owner_name??process.owner_name" class="form-control col-7" :class="error.owner_id && error.owner_id.length>0 ? 'is-invalid' :''">
+                    <span v-if="error.owner_id && error.owner_id.length>0" class="invalid-feedback col-7 offset-3 mt-0" role="alert">
+                        <strong>@{{ error.owner_id[0] }}</strong>
+                    </span>
+                </div>
+                <div class="form-group row">
+                    <label class="col-3 col-form-label text-right" >加工类型</label>
+                    <select v-model="process.process_method_id" class="form-control col-7" :class="error.process_method_id && error.process_method_id.length>0 ? 'is-invalid' :''">
+                        <option  v-for="processMethod in processMethods" :value="processMethod.id">@{{ processMethod.name }}</option>
+                    </select>
+                </div>
+                <div class="form-group row">
+                    <label class="col-3 col-form-label text-right" >加工数量</label>
+                    <input v-model="process.amount" type="text" class="form-control col-7" :class="error.amount && error.amount.length>0 ? 'is-invalid' :''">
+                    <span v-if="error.amount && error.amount.length>0" class="invalid-feedback col-7 offset-3 mt-0" role="alert">
+                        <strong>@{{ error.amount[0] }}</strong>
+                    </span>
+                </div>
+                <div class="form-group row">
+                    <label class="col-3 col-form-label text-right" >单价</label>
+                    <input v-model="process.unit_price" type="text" class="form-control col-7" :class="error.unit_price && error.unit_price.length>0 ? 'is-invalid' :''">
+                    <span v-if="error.unit_price && error.unit_price.length>0" class="invalid-feedback col-7 offset-3 mt-0" role="alert">
+                        <strong>@{{ error.unit_price[0] }}</strong>
+                    </span>
+                </div>
+                <div class="form-group row">
+                    <label class="col-3 col-form-label text-right" >备注(选填)</label>
+                    <textarea v-model="process.remark" type="text" class="form-control col-7"></textarea>
+                </div>
+                <div class="form-group row">
+                    <div class="col-8 offset-2">
+                        <input type="button" @click="submit()" class="btn btn-success form-control" value="提交更改">
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+@endsection
+
+@section('lastScript')
+    <script>
+        let vueList=new Vue({
+            el:'#list',
+            data:{
+                process:{id:'{{$process->id}}',code:'{{$process->code}}',wms_code:'',owner_id:'{{$process->owner_id}}',amount:'{{$process->amount}}',owner_name:'{{$process->owner_name}}',owner_id:'{{$process->owner_id}}',
+                    process_method_id:'{{$process->process_method_id}}',unit_price:'{{$process->unit_price}}',remark:'{{$process->remark}}'},
+                error:{wms_code:[],owner_id:[],process_method_id:[],unit_price:[],amount:[]},
+                processContentError:[],
+                processContents:[
+                    @foreach($process->processesContents as $processesContent)
+                    {id:'{{$processesContent->id}}',wms_code:'{{$processesContent->wms_code}}',commodity_name:'{{$processesContent->commodity?$processesContent->commodity->name:""}}',@if($processesContent->commodity) commodity_barcodes:{!! $processesContent->commodity->barcodes !!},@endif
+                    commodity_id:'{{$processesContent->commodity_id}}',commodity_sku:'{{$processesContent->commodity?$processesContent->commodity->sku:""}}',bill_type:'{{$processesContent->bill_type}}',amount:'{{$processesContent->amount}}',addBtnShow:false},
+                    @endforeach
+                ],
+                processMethods:[
+                    @foreach($processMethods as $processMethod)
+                    {!! $processMethod !!},
+                    @endforeach
+                ],
+                tutorials:[],
+                selectedTutorials:[],
+            },
+            watch:{
+                processContents:{
+                    handler(){
+                        if (this.processContents.length===1){
+                            this.process.owner_id=this.processContents[(this.processContents.length)-1].owner_id;
+                        }
+                    }
+                },
+            },
+            methods:{
+                //新增库单据
+                addProcessContent(){
+                    let _this=this;
+                    let wms_code=_this.process.wms_code;
+                    if (!wms_code){
+                        tempTip.setDuration(3000);
+                        tempTip.show('未输入单据号！');
+                        return;
+                    }
+                    if (_this.processContents.length>0 && _this.processContents[_this.processContents.length-1].addBtnShow) return;
+                    let isUnique=true;
+                    _this.processContents.every(function (processContent) {
+                        if (processContent.wms_code==wms_code){
+                            isUnique=false;
+                            return false;
+                        }
+                        return  true;
+                    });
+                    if (!isUnique){
+                        tempTip.setDuration(3000);
+                        tempTip.show('下方已添加该单据！');
+                        return;
+                    }
+                    axios.post('{{url("api/thirdPart/flux/process/getProcessContent")}}',{wms_code:wms_code})
+                        .then(function (response) {
+                            let processContent={};
+                            processContent['wms_code']=response.data.wms_code;
+                            processContent['owner_name']=response.data.owner_name;
+                            processContent['owner_id']=response.data.owner_id;
+                            processContent['commodities']=response.data.commodities;
+                            processContent['commodity_id']='';
+                            processContent['commodity_name']='';
+                            processContent['commodity_barcodes']=[];
+                            processContent['commodity_sku']='';
+                            processContent['bill_type']=response.data.bill_type;
+                            processContent['amount']=response.data.amount;
+                            processContent['addBtnShow']=true;
+                            _this.processContents.unshift(processContent);
+                        }).catch(function (err) {
+                            tempTip.setDuration(3000);
+                            tempTip.show('查询单据号失败！网络错误：'+err);
+                        });
+                },
+                //确定新增
+                confirmStore(wms_code,commodity_id,amount){
+                    if (!commodity_id) {
+                        tempTip.setDuration(2000);
+                        tempTip.show("尚未选择商品！");
+                        return;
+                    }
+                    if (!amount) {
+                        tempTip.setDuration(2000);
+                        tempTip.show("尚未填写数量！");
+                        return;
+                    }
+                    let _this=this;
+                    _this.processContents.every(function (processContent) {
+                        if (processContent.wms_code==wms_code) {
+                            processContent.addBtnShow=false;
+                            return false;
+                        }
+                        return  true;
+                    });
+                },
+                //删除新增
+                deleteProcessContent(processContent){
+                    let _this=this;
+                    let wms_code=processContent.wms_code;
+                    if (processContent.id){
+                        if(!confirm("确定要删除该二次加工内容单“"+wms_code+"“吗？")){return}
+                        axios.post('{{url("process/deleteProcessContent")}}/'+processContent.id)
+                            .then((response)=>{
+                                if (!response.data.success){
+                                    tempTip.setDuration(3000);
+                                    tempTip.show(response.data.data);
+                                    return;
+                                }
+                            }).catch((err)=>{
+                            tempTip.setDuration(3000);
+                            tempTip.show('删除失败！网络错误：'+err);
+                            return;
+                            });
+                    }
+                    _this.processContents.every(function (processContent,i) {
+                        if (processContent.wms_code==wms_code) {
+                            _this.processContents.splice(i,1);
+                            return false;
+                        }
+                        return  true;
+                    });
+                },
+                //选择商品
+                selectedCommodity(commodity,wms_code){
+                    let _this=this;
+                    _this.processContents.every(function (processContent) {
+                       if (processContent.wms_code==wms_code){
+                           processContent.commodity_id=commodity.id;
+                           processContent.commodity_name=commodity.name;
+                           processContent.commodity_barcodes=commodity.barcodes;
+                           processContent.commodity_sku=commodity.sku;
+                           return false;
+                       }
+                       return  true;
+                    });
+                },
+                //异补提交
+                submit(){
+                    let _this=this;
+                    let owner_id=_this.process.owner_id;
+                    let process_method_id=_this.process.process_method_id;
+                    let unit_price=_this.process.unit_price;
+                    let remark=_this.process.remark;
+                    let amount=_this.process.amount;
+                    if (!owner_id || !process_method_id || !unit_price || !amount) {
+                        tempTip.setDuration(3000);
+                        tempTip.show('请确认您信息输入的完整性！');
+                        return;
+                    }
+                    _this.processContentError=[];
+                    axios.put('{{url("process")}}/'+_this.process.id,{
+                        owner_id:owner_id,process_method_id:process_method_id,unit_price:unit_price,
+                        remark:remark,amount:amount,processContents:_this.processContents
+                    }).then(function (response) {
+                        console.log(response.data);
+                        if (response.data.error && response.data.data=="process"){
+                            _this.error=response.data.error;
+                            return;
+                        }
+                        _this.error={wms_code:[],owner_id:[],process_method_id:[],unit_price:[],amount:[]};
+                        if (response.data.error){
+                            _this.processContentError=response.data.error;
+                            return;
+                        }
+                        location.href="{{url('process')}}";
+                    }).catch(function (err) {
+                        tempTip.setDuration(3000);
+                        tempTip.show('提交失败！网络错误：'+err);
+                    });
+                },
+            },
+
+        });
+    </script>
+@endsection

resources/views/process/index.blade.php

@@ -271,6 +271,7 @@
                         <p v-if="!processOne.openProcessHour && processOne.status=='驳回'" class="text-muted">已驳回</p>
                         <p v-if="!processOne.openProcessHour && processOne.status=='已完成'" class="text-success">已完成</p>
                         @can("二次加工管理-接单与驳回")
+                        <button v-if="!processOne.openProcessHour && processOne.status=='待接单'" @click="processEdit(processOne.id)" class="btn-sm btn-outline-info pull-left">编辑</button>
                         <button v-if="!processOne.openProcessHour && processOne.status=='待接单'" @click="processReject(processOne.id)" class="btn-sm btn-outline-dark pull-left">驳回</button>
                         <button v-if="!processOne.openProcessHour && processOne.status=='待接单'"  @click="processReceive(processOne.id)" class="btn-sm btn-outline-primary pull-left">接单</button>@endcan
                         @can("二次加工管理-登记工时")<button v-if="(processOne.status=='加工中' || processOne.status=='待加工') && !processOne.openProcessHour"
@@ -321,8 +322,8 @@
                     <td class="text-muted">@{{ processOne.bill_type }}</td>
                     <td class="text-muted">@{{ processOne.wms_code }}</td>
                     <td class="text-muted">@{{ processOne.thisAmount }}</td>
-                    <td class="text-muted" v-if="processOne.commodity_barcodes">
-                        <ul class="p-0 m-0 list-unstyled list-inline">
+                    <td class="text-muted">
+                        <ul class="p-0 m-0 list-unstyled list-inline" v-if="processOne.commodity_barcodes">
                             <li v-for="barcode in processOne.commodity_barcodes"><small>@{{ barcode.code }}</small></li>
                         </ul>
                     </td>
@@ -1224,6 +1225,9 @@
                         tempTip.show('删除教程失败!'+'网络错误：' + err);
                     }   );
                 },
+                processEdit(id){
+                    location.href = "{{url('process')}}/"+id+"/edit";
+                }
             },
         });
     </script>

resources/views/process/menu.blade.php

@@ -10,6 +10,7 @@
             <li class="nav-item">
                 <a class="nav-link" href="{{url('process/create')}}" :class="{active:isActive('create',2)}">录入</a>
             </li> @endcan
+            {{$slot}}
             @can('二次加工管理-查询')
                 <li class="nav-item">
                     <a class="nav-link" href="{{url('process/statistic')}}" :class="{active:isActive('statistic',2)}">统计</a>

routes/web.php

@@ -173,6 +173,8 @@ Route::post('process/storeClockAudit','ProcessController@storeClockAudit');
 Route::post('process/isException','ProcessController@isException');
 //任务审核
 Route::post('process/storeMissionAudit','ProcessController@storeMissionAudit');
+//删除二次加工内容单
+Route::post('process/deleteProcessContent/{id}','ProcessController@deleteProcessContent');
 /**
  *  用户打卡
  */