二次加工管理-录入与编辑原料与成品关联增删

app/Http/Controllers/ProcessController.php

@@ -545,9 +545,10 @@ class ProcessController extends Controller
             'remark'=>$request->input('remark'),
             'amount'=>$request->input('amount'),
         ]);
+        $process->save();
         $processContents=[];
         foreach ($request->input('processContents') as $processContent){
-            $wmsCode_commoditySku=$processContent['wms_code'].'_'.$processContent['commodity_sku'];
+            $wmsCode_commoditySku=$processContent['wms_code'].'_'.$processContent['commodity_sku'].'_'.$processContent['is_full'];
             array_push($processContents,$wmsCode_commoditySku);
         }
         $removeDuplicateProcessContents=array_unique($processContents);
@@ -563,12 +564,11 @@ class ProcessController extends Controller
                     'wms_code'=>$processContent['wms_code'],
                     'amount'=>$processContent['amount'],
                 ]);
-                if ($processContent['is_full'])$processContent->is_full='Y';
+                if ($processContent['is_full'])$processContentOne->is_full='Y';
                 $processContentOne->save();
                 $this->log(__METHOD__,"录入二次加工单内容单".__FUNCTION__,json_encode($processContentOne),Auth::user()['id']);
             }
         }
-        $process->save();
         $process->code='P'.date ("Ymd").str_pad($process->id,3,"0",STR_PAD_LEFT);
         $process->update();
         $processStatistic=new ProcessStatistic([
@@ -618,7 +618,7 @@ class ProcessController extends Controller
     public function update(Request $request, $id)
     {
 
-        if(!Gate::allows('二次加工管理-录入')){ return redirect(url('/'));  }
+        if(!Gate::allows('二次加工管理-编辑')){ return redirect(url('/'));  }
         $errors=$this->validatorProcess($request)->errors();
         if (count($errors)>0)return ['error'=>$errors,'data'=>"process"];
         $errors=[];
@@ -645,28 +645,20 @@ class ProcessController extends Controller
         if (count($processContents)>count($removeDuplicateProcessContents)){
             return ['success'=>false,'data'=>'录入商品不可重复！'];
         }else{
+            ProcessesContent::where('process_id',$process->id)->delete();
             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'],
-                    ]);
-                    if ($processContent['is_full'])$processContentOne->is_full='Y';
-                    $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']);
+                $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'],
+                ]);
+                if ($processContent['is_full'])$processContentOne->is_full='Y';
+                $processContentOne->save();
+                $this->log(__METHOD__,"录入二次加工单内容单".__FUNCTION__,json_encode($processContentOne),Auth::user()['id']);
+
             }
         }
         return;

app/Http/Controllers/TestController.php

@@ -196,5 +196,15 @@ class TestController extends Controller
             $authority->delete();
         });
     }
+    function test(){
+        $a=Unit::all();
+        dd($a);
+        $a=new Unit([
+            "created_at"=>date('Y-m-d H:i:s')
+        ]);
+        $a->name='58448484';
+        $a->save();
+        dd($a);
+    }
 
 }

resources/views/process/create.blade.php

@@ -23,7 +23,7 @@
                                     <span class=" col-11 offset-1 input-group" style=" border-radius: 5px; opacity: 1.5; text-align: center;">
                                         <ul onselectstart="return false;" class="list-group tooltipTarget" style="width: 100%; max-height: 130px; overflow-y: scroll;">
                                             <li  v-for="commodity in processContents[0].commodities" :id="commodity.id"  :style="{'background-color':processContents[0].commodity_id==commodity.id ? '#9fcdff':''}"
-                                                @dblclick="selectedCommodity(commodity,processContents[0].wms_code)" class="list-group-item list-group-item-action p-0 m-0">
+                                                @dblclick="selectedCommodity(commodity,processContents[0].wms_code,false)" class="list-group-item list-group-item-action p-0 m-0">
                                                 <div class="form-inline" style="cursor: default; white-space: nowrap; overflow: hidden; text-overflow: ellipsis;">
                                                     <small :title="commodity.name" class="text-left text-primary col-6 tooltipTarget"  style="overflow: hidden;">@{{ commodity.name }}</small>
                                                     <small class="text-left  col-6"><a v-for="barcode in commodity.barcodes">@{{ barcode.code }}&nbsp;&nbsp;&nbsp;</a></small>
@@ -54,18 +54,18 @@
                                 </div>
                                 <div class="col-8 offset-2 pt-2 pb-2">
                                     <input type="button" v-if="processContents.length>0 && processContents[0].addBtnShow && !processContents[0].is_full"
-                                           @click="confirmStore(processContents[0].wms_code,processContents[0].commodity_id,processContents[0].amount)"
+                                           @click="confirmStore(processContents[0].wms_code,processContents[0].commodity_id,processContents[0].amount,false)"
                                            value="确定新增" class="btn btn-primary btn-sm form-control form-control-sm">
                                 </div>
                                 <div class="col-8 offset-2 pt-2 pb-2">
-                                    <input v-if="processContents.length>0 && processContents[0].addBtnShow && !processContents[0].is_full" type="button" @click="deleteProcessContent(processContents[0].wms_code)" value="删除" class="btn btn-danger form-control">
+                                    <input v-if="processContents.length>0 && processContents[0].addBtnShow && !processContents[0].is_full" type="button" @click="deleteProcessContent(processContents[0].wms_code,processContents[0].commodity_id,false)" value="删除" class="btn btn-danger form-control">
                                 </div>
                             </div>
                         </div>
                         <div class="form-group row">
                             <div class="col-10 offset-1 p-1 border rounded bg-light" v-for="processContent in processContents" v-if="!processContent.addBtnShow && !processContent.is_full">
                                 <div class="col-12 border">
-                                    <div class="row small"  @mouseover="update_delBtn(true,processContent.wms_code,processContent.commodity_id)" @mouseleave="update_delBtn(false,processContent.wms_code,processContent.commodity_id)">
+                                    <div class="row small"  @mouseover="update_delBtn(true,processContent.wms_code,processContent.commodity_id,false)" @mouseleave="update_delBtn(false,processContent.wms_code,processContent.commodity_id,false)">
                                         <span class="font-weight-bold">单据号：</span>
                                         <span class="font-weight-bold">@{{ processContent.wms_code }}</span>
                                         <span class="ml-2 text-muted">单据类型：</span>
@@ -79,7 +79,7 @@
                                         <span class="ml-2 text-muted">条码：</span>
                                         <span class="text-muted"><small v-if="processContent.commodity_barcodes && processContent.commodity_barcodes.length>0"
                                                                         v-for="barcode in processContent.commodity_barcodes">@{{ barcode.code }}</small></span>
-                                        <button v-if="is_delBtn[processContent.wms_code+'_'+processContent.commodity_id]" @click="deleteProcessContent(processContent.wms_code,processContent.commodity_id)" class="btn btn-sm btn-danger" style="position: absolute;right: 0;bottom: 0">删除</button>
+                                        <button v-if="is_delBtn[processContent.wms_code+'_'+processContent.commodity_id+'_'+false]" @click="deleteProcessContent(processContent.wms_code,processContent.commodity_id,false)" class="btn btn-sm btn-danger" style="position: absolute;right: 0;bottom: 0">删除</button>
                                     </div>
                                 </div>
                             </div>
@@ -100,7 +100,7 @@
                                     <span class=" col-11 offset-1 input-group" style=" border-radius: 5px; opacity: 1.5; text-align: center;">
                                         <ul onselectstart="return false;" class="list-group tooltipTarget" style="width: 100%; max-height: 130px; overflow-y: scroll;">
                                             <li  v-for="commodity in processContents[0].commodities" :id="commodity.id" :style="{'background-color':processContents[0].commodity_id==commodity.id ? '#9fcdff':''}"
-                                                 @dblclick="selectedCommodity(commodity,processContents[0].wms_code)" class="list-group-item list-group-item-action p-0 m-0">
+                                                 @dblclick="selectedCommodity(commodity,processContents[0].wms_code,true)" class="list-group-item list-group-item-action p-0 m-0">
                                                 <div class="form-inline" style="cursor: default; white-space: nowrap; overflow: hidden; text-overflow: ellipsis;">
                                                     <small :title="commodity.name" class="text-left text-info col-6" style="overflow: hidden;">@{{ commodity.name }}</small>
                                                     <small class="text-left  col-6"><a v-for="barcode in commodity.barcodes">@{{ barcode.code }}&nbsp;&nbsp;&nbsp;</a></small>
@@ -131,18 +131,18 @@
                                 </div>
                                 <div class="col-8 offset-2 pt-2 pb-2">
                                     <input type="button" v-if="processContents.length>0 && processContents[0].addBtnShow && processContents[0].is_full"
-                                           @click="confirmStore(processContents[0].wms_code,processContents[0].commodity_id,processContents[0].amount)"
+                                           @click="confirmStore(processContents[0].wms_code,processContents[0].commodity_id,processContents[0].amount,true)"
                                            value="确定新增" class="btn btn-primary btn-sm form-control form-control-sm">
                                 </div>
                                 <div class="col-8 offset-2 pt-2 pb-2">
-                                    <input v-if="processContents.length>0 && processContents[0].addBtnShow && processContents[0].is_full" type="button" @click="deleteProcessContent(processContents[0].wms_code)" value="删除" class="btn btn-danger form-control">
+                                    <input v-if="processContents.length>0 && processContents[0].addBtnShow && processContents[0].is_full" type="button" @click="deleteProcessContent(processContents[0].wms_code,processContents[0].commodity_id,true)" value="删除" class="btn btn-danger form-control">
                                 </div>
                             </div>
                         </div>
                         <div class="form-group row">
                             <div class="col-10 offset-1 p-1 border rounded bg-light" v-for="processContent in processContents" v-if="!processContent.addBtnShow && processContent.is_full">
                                 <div class="col-12 border">
-                                    <div class="row small" style="position: relative" @mouseover="update_delBtn(true,processContent.wms_code,processContent.commodity_id)" @mouseleave="update_delBtn(false,processContent.wms_code,processContent.commodity_id)">
+                                    <div class="row small" style="position: relative" @mouseover="update_delBtn(true,processContent.wms_code,processContent.commodity_id,true)" @mouseleave="update_delBtn(false,processContent.wms_code,processContent.commodity_id,true)">
                                         <span class="font-weight-bold">单据号：</span>
                                         <span class="font-weight-bold">@{{ processContent.wms_code }}</span>
                                         <span class="ml-2 text-muted">单据类型：</span>
@@ -156,7 +156,7 @@
                                         <span class="ml-2 text-muted">条码：</span>
                                         <span class="text-muted"><small v-if="processContent.commodity_barcodes && processContent.commodity_barcodes.length>0"
                                                                         v-for="barcode in processContent.commodity_barcodes">@{{ barcode.code }}</small></span>
-                                        <button v-if="is_delBtn[processContent.wms_code+'_'+processContent.commodity_id]" @click="deleteProcessContent(processContent.wms_code,processContent.commodity_id)" class="btn btn-sm btn-danger" style="position: absolute;right: 0;bottom: 0">删除</button>
+                                        <button v-if="is_delBtn[processContent.wms_code+'_'+processContent.commodity_id+'_'+true]" @click="deleteProcessContent(processContent.wms_code,processContent.commodity_id,true)" class="btn btn-sm btn-danger" style="position: absolute;right: 0;bottom: 0">删除</button>
                                     </div>
                                 </div>
                             </div>
@@ -267,19 +267,6 @@
                         tempTip.show('请先确定或删除操作中单据！');
                         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;
-                    // }
                     if (_this.msg){
                         tempTip.setDuration(999999);
                         tempTip.waitingTip("数据读取中......请稍后！");
@@ -319,7 +306,7 @@
                         });
                 },
                 //确定新增
-                confirmStore(wms_code,commodity_id,amount){
+                confirmStore(wms_code,commodity_id,amount,is_full){
                     if (!commodity_id) {
                         tempTip.setDuration(2000);
                         tempTip.show("尚未选择商品！");
@@ -336,25 +323,40 @@
                         return;
                     }
                     let _this=this;
-                    _this.processContents.every(function (processContent) {
-                        if (processContent.wms_code==wms_code) {
-                            _this.commodityIds.push(processContent.commodity_id);
+                    let sign=true;
+                    let processContentTemp={};
+                    _this.processContents.some(function (processContent) {
+                        if (processContent.wms_code==wms_code && processContent.commodity_id==commodity_id && processContent.is_full==is_full) {
+                            _this.commodityIds.push(processContent.commodity_id+"_"+is_full);
                             processContent.addBtnShow=false;
-                            return false;
+                            processContentTemp=Object.assign({},processContent);
                         }
-                        return  true;
+                        if (processContent.wms_code==wms_code && processContent.commodity_id==commodity_id && processContent.is_full==!is_full)sign=false;
                     });
+
+                    if (!is_full && sign){
+                        _this.commodityIds.push(processContentTemp.commodity_id+"_"+!is_full);
+                        processContentTemp['is_full']=true;
+                        _this.processContents.unshift(processContentTemp);
+                    }
                 },
                 //删除新增
-                deleteProcessContent(wms_code,commodity_id){
+                deleteProcessContent(wms_code,commodity_id,is_full){
                     let _this=this;
-                    _this.processContents.every(function (processContent,i) {
-                        if (processContent.wms_code===wms_code&&processContent.commodity_id===commodity_id) {
-                            _this.processContents.splice(i,1);
-                            _this.commodityIds.splice(_this.commodityIds.indexOf(processContent.commodity_id),1);
-                            return false;
+                    let deleteData=[];
+                    _this.processContents.some(function (processContent,i) {
+                        if (processContent.wms_code===wms_code && processContent.commodity_id===commodity_id && processContent.is_full===is_full) {
+                            deleteData.unshift(i);
+                            _this.commodityIds.splice(_this.commodityIds.indexOf(processContent.commodity_id+"_"+is_full),1);
+                            if (is_full) return true;
                         }
-                        return  true;
+                        if (!is_full && processContent.wms_code===wms_code && processContent.commodity_id===commodity_id && processContent.is_full===!is_full){
+                            deleteData.unshift(i);
+                            _this.commodityIds.splice(_this.commodityIds.indexOf(processContent.commodity_id+"_"+!is_full),1);
+                        }
+                    });
+                    deleteData.forEach(function (data) {
+                        _this.processContents.splice(data,1);
                     });
                 },
                 //获取教程
@@ -376,10 +378,10 @@
                         });
                 },
                 //选择商品
-                selectedCommodity(commodity,wms_code){
+                selectedCommodity(commodity,wms_code,is_full){
                     let _this=this;
                     _this.processContents.every(function (processContent) {
-                        if (_this.commodityIds.includes(commodity.id)){
+                        if (_this.commodityIds.includes(commodity.id+"_"+is_full)){
                             tempTip.setDuration(3000);
                             tempTip.show('该单据已被添加至下边！');
                             return;
@@ -461,7 +463,7 @@
                             tempTip.showSuccess('提交成功');
                             setTimeout(function () {
                                 location.href="{{url('process')}}";
-                            },1000)
+                            },100)
                         }
                     }).catch(function (err) {
                         tempTip.setDuration(5000);
@@ -479,9 +481,9 @@
                     }
                 },
                 //删除按钮的显示
-                update_delBtn(type,wms_code,commodity_id){
-                    if (type) this.$set(this.is_delBtn,wms_code+'_'+commodity_id,true);
-                    else this.$set(this.is_delBtn,wms_code+'_'+commodity_id,false);
+                update_delBtn(type,wms_code,commodity_id,is_full){
+                    if (type) this.$set(this.is_delBtn,wms_code+'_'+commodity_id+'_'+is_full,true);
+                    else this.$set(this.is_delBtn,wms_code+'_'+commodity_id+'_'+is_full,false);
                 },
             },
         });

resources/views/process/edit.blade.php

@@ -27,7 +27,7 @@
                                     <span class=" col-11 offset-1 input-group" style=" border-radius: 5px; opacity: 1.5; text-align: center;">
                                         <ul onselectstart="return false;" class="list-group tooltipTarget" style="width: 100%; max-height: 130px; overflow-y: scroll;">
                                             <li  v-for="commodity in processContents[0].commodities" :id="commodity.id"  :style="{'background-color':processContents[0].commodity_id==commodity.id ? '#9fcdff':''}"
-                                                 @dblclick="selectedCommodity(commodity,processContents[0].wms_code)" class="list-group-item list-group-item-action p-0 m-0">
+                                                @dblclick="selectedCommodity(commodity,processContents[0].wms_code,false)" class="list-group-item list-group-item-action p-0 m-0">
                                                 <div class="form-inline" style="cursor: default; white-space: nowrap; overflow: hidden; text-overflow: ellipsis;">
                                                     <small :title="commodity.name" class="text-left text-primary col-6 tooltipTarget"  style="overflow: hidden;">@{{ commodity.name }}</small>
                                                     <small class="text-left  col-6"><a v-for="barcode in commodity.barcodes">@{{ barcode.code }}&nbsp;&nbsp;&nbsp;</a></small>
@@ -58,18 +58,18 @@
                                 </div>
                                 <div class="col-8 offset-2 pt-2 pb-2">
                                     <input type="button" v-if="processContents.length>0 && processContents[0].addBtnShow && !processContents[0].is_full"
-                                           @click="confirmStore(processContents[0].wms_code,processContents[0].commodity_id,processContents[0].amount)"
+                                           @click="confirmStore(processContents[0].wms_code,processContents[0].commodity_id,processContents[0].amount,false)"
                                            value="确定新增" class="btn btn-primary btn-sm form-control form-control-sm">
                                 </div>
                                 <div class="col-8 offset-2 pt-2 pb-2">
-                                    <input v-if="processContents.length>0 && processContents[0].addBtnShow && !processContents[0].is_full" type="button" @click="deleteProcessContent(processContents[0])" value="删除" class="btn btn-danger form-control">
+                                    <input v-if="processContents.length>0 && processContents[0].addBtnShow && !processContents[0].is_full" type="button" @click="deleteProcessContent(processContents[0].wms_code,processContents[0].commodity_id,false)" value="删除" class="btn btn-danger form-control">
                                 </div>
                             </div>
                         </div>
                         <div class="form-group row">
                             <div class="col-10 offset-1 p-1 border rounded bg-light" v-for="processContent in processContents" v-if="!processContent.addBtnShow && !processContent.is_full">
                                 <div class="col-12 border">
-                                    <div class="row small"  @mouseover="update_delBtn(true,processContent.wms_code,processContent.commodity_id)" @mouseleave="update_delBtn(false,processContent.wms_code,processContent.commodity_id)">
+                                    <div class="row small"  @mouseover="update_delBtn(true,processContent.wms_code,processContent.commodity_id,false)" @mouseleave="update_delBtn(false,processContent.wms_code,processContent.commodity_id,false)">
                                         <span class="font-weight-bold">单据号：</span>
                                         <span class="font-weight-bold">@{{ processContent.wms_code }}</span>
                                         <span class="ml-2 text-muted">单据类型：</span>
@@ -83,7 +83,7 @@
                                         <span class="ml-2 text-muted">条码：</span>
                                         <span class="text-muted"><small v-if="processContent.commodity_barcodes && processContent.commodity_barcodes.length>0"
                                                                         v-for="barcode in processContent.commodity_barcodes">@{{ barcode.code }}</small></span>
-                                        <button v-if="is_delBtn[processContent.wms_code+'_'+processContent.commodity_id]" @click="deleteProcessContent(processContent)" class="btn btn-sm btn-danger" style="position: absolute;right: 0;bottom: 0">删除</button>
+                                        <button v-if="is_delBtn[processContent.wms_code+'_'+processContent.commodity_id+'_'+false]" @click="deleteProcessContent(processContent.wms_code,processContent.commodity_id,false)" class="btn btn-sm btn-danger" style="position: absolute;right: 0;bottom: 0">删除</button>
                                     </div>
                                 </div>
                             </div>
@@ -104,7 +104,7 @@
                                     <span class=" col-11 offset-1 input-group" style=" border-radius: 5px; opacity: 1.5; text-align: center;">
                                         <ul onselectstart="return false;" class="list-group tooltipTarget" style="width: 100%; max-height: 130px; overflow-y: scroll;">
                                             <li  v-for="commodity in processContents[0].commodities" :id="commodity.id" :style="{'background-color':processContents[0].commodity_id==commodity.id ? '#9fcdff':''}"
-                                                 @dblclick="selectedCommodity(commodity,processContents[0].wms_code)" class="list-group-item list-group-item-action p-0 m-0">
+                                                 @dblclick="selectedCommodity(commodity,processContents[0].wms_code,true)" class="list-group-item list-group-item-action p-0 m-0">
                                                 <div class="form-inline" style="cursor: default; white-space: nowrap; overflow: hidden; text-overflow: ellipsis;">
                                                     <small :title="commodity.name" class="text-left text-info col-6" style="overflow: hidden;">@{{ commodity.name }}</small>
                                                     <small class="text-left  col-6"><a v-for="barcode in commodity.barcodes">@{{ barcode.code }}&nbsp;&nbsp;&nbsp;</a></small>
@@ -135,18 +135,18 @@
                                 </div>
                                 <div class="col-8 offset-2 pt-2 pb-2">
                                     <input type="button" v-if="processContents.length>0 && processContents[0].addBtnShow && processContents[0].is_full"
-                                           @click="confirmStore(processContents[0].wms_code,processContents[0].commodity_id,processContents[0].amount)"
+                                           @click="confirmStore(processContents[0].wms_code,processContents[0].commodity_id,processContents[0].amount,true)"
                                            value="确定新增" class="btn btn-primary btn-sm form-control form-control-sm">
                                 </div>
                                 <div class="col-8 offset-2 pt-2 pb-2">
-                                    <input v-if="processContents.length>0 && processContents[0].addBtnShow && processContents[0].is_full" type="button" @click="deleteProcessContent(processContents[0])" value="删除" class="btn btn-danger form-control">
+                                    <input v-if="processContents.length>0 && processContents[0].addBtnShow && processContents[0].is_full" type="button" @click="deleteProcessContent(processContents[0].wms_code,processContents[0].commodity_id,true)" value="删除" class="btn btn-danger form-control">
                                 </div>
                             </div>
                         </div>
                         <div class="form-group row">
                             <div class="col-10 offset-1 p-1 border rounded bg-light" v-for="processContent in processContents" v-if="!processContent.addBtnShow && processContent.is_full">
                                 <div class="col-12 border">
-                                    <div class="row small" style="position: relative" @mouseover="update_delBtn(true,processContent.wms_code,processContent.commodity_id)" @mouseleave="update_delBtn(false,processContent.wms_code,processContent.commodity_id)">
+                                    <div class="row small" style="position: relative" @mouseover="update_delBtn(true,processContent.wms_code,processContent.commodity_id,true)" @mouseleave="update_delBtn(false,processContent.wms_code,processContent.commodity_id,true)">
                                         <span class="font-weight-bold">单据号：</span>
                                         <span class="font-weight-bold">@{{ processContent.wms_code }}</span>
                                         <span class="ml-2 text-muted">单据类型：</span>
@@ -160,7 +160,7 @@
                                         <span class="ml-2 text-muted">条码：</span>
                                         <span class="text-muted"><small v-if="processContent.commodity_barcodes && processContent.commodity_barcodes.length>0"
                                                                         v-for="barcode in processContent.commodity_barcodes">@{{ barcode.code }}</small></span>
-                                        <button v-if="is_delBtn[processContent.wms_code+'_'+processContent.commodity_id]" @click="deleteProcessContent(processContent)" class="btn btn-sm btn-danger" style="position: absolute;right: 0;bottom: 0">删除</button>
+                                        <button v-if="is_delBtn[processContent.wms_code+'_'+processContent.commodity_id+'_'+true]" @click="deleteProcessContent(processContent.wms_code,processContent.commodity_id,true)" class="btn btn-sm btn-danger" style="position: absolute;right: 0;bottom: 0">删除</button>
                                     </div>
                                 </div>
                             </div>
@@ -224,7 +224,8 @@
                 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,is_full:'{{$processesContent->is_full=='Y'?true:false}}'},
+                    commodity_id:'{{$processesContent->commodity_id}}',commodity_sku:'{{$processesContent->commodity?$processesContent->commodity->sku:""}}',bill_type:'{{$processesContent->bill_type}}',amount:'{{$processesContent->amount}}',
+                    addBtnShow:false,is_full:'{{$processesContent->is_full}}'},
                     @endforeach
                 ],
                 processMethods:[
@@ -239,19 +240,20 @@
             },
             mounted:function(){
                 let _this=this;
-                _this.processContents.every(function (processContent) {
+                _this.processContents.some(function (processContent) {
+                    processContent.is_full=processContent.is_full==='Y'?true:false;
                     if (!processContent.addBtnShow) {
-                        _this.commodityIds.push(parseInt(processContent.commodity_id));
-                        return true;
+                        _this.commodityIds.push(processContent.commodity_id+'_'+processContent.is_full);
                     }
-                    return  false;
                 });
+                console.log(this.process);
             },
             watch:{
                 processContents:{
                     handler(){
-                        if (this.processContents.length===1){
+                        if (this.processContents.length===1 && this.processContents[(this.processContents.length)-1].owner_id){
                             this.process.owner_id=this.processContents[(this.processContents.length)-1].owner_id;
+                            this.process.owner_name=this.processContents[(this.processContents.length)-1].owner_name;
                         }
                     }
                 },
@@ -272,20 +274,6 @@
                         tempTip.show('新增单据操作中不能继续新增！');
                         return;
                     }
-                    let isUnique=true;
-                    _this.processContents.every(function (processContent) {
-                        if (processContent.wms_code==wms_code){
-                            _this.commodityIds.push(processContent.commodity_id);
-                            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) {
                             if (response.data.error){
@@ -304,6 +292,7 @@
                             processContent['commodity_sku']='';
                             processContent['bill_type']=response.data.bill_type;
                             processContent['amount']='';
+                            processContent['lineNo']='';
                             processContent['addBtnShow']=true;
                             processContent['is_full']=is_full;
                             _this.processContents.unshift(processContent);
@@ -313,7 +302,7 @@
                         });
                 },
                 //确定新增
-                confirmStore(wms_code,commodity_id,amount){
+                confirmStore(wms_code,commodity_id,amount,is_full){
                     if (!commodity_id) {
                         tempTip.setDuration(2000);
                         tempTip.show("尚未选择商品！");
@@ -325,49 +314,48 @@
                         return;
                     }
                     let _this=this;
-                    _this.processContents.every(function (processContent) {
-                        if (processContent.wms_code==wms_code) {
-                            _this.commodityIds.push(processContent.commodity_id);
+                    let sign=true;
+                    let processContentTemp={};
+                    _this.processContents.some(function (processContent) {
+                        if (processContent.wms_code==wms_code && processContent.commodity_id==commodity_id && processContent.is_full==is_full) {
+
+                            _this.commodityIds.push(processContent.commodity_id+"_"+is_full);
                             processContent.addBtnShow=false;
-                            return false;
+                            processContentTemp=Object.assign({},processContent);
                         }
-                        return  true;
+                        if (processContent.wms_code==wms_code && processContent.commodity_id==commodity_id && processContent.is_full==!is_full)sign=false;
                     });
+
+                    if (!is_full && sign){
+                        _this.commodityIds.push(processContentTemp.commodity_id+"_"+!is_full);
+                        processContentTemp['is_full']=true;
+                        _this.processContents.unshift(processContentTemp);
+                    }
                 },
                 //删除新增
-                deleteProcessContent(processContent){
+                deleteProcessContent(wms_code,commodity_id,is_full){
                     let _this=this;
-                    let wms_code=processContent.wms_code;
-                    let commodity_id=processContent.commodity_id;
-                    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 && processContent.commodity_id==commodity_id) {
-                            _this.processContents.splice(i,1);
-                            _this.commodityIds.splice(_this.commodityIds.indexOf(processContent.commodity_id),1);
-                            return false;
+                    let deleteData=[];
+                    _this.processContents.some(function (processContent,i) {
+                        if (processContent.wms_code===wms_code && processContent.commodity_id===commodity_id && processContent.is_full===is_full) {
+                            deleteData.unshift(i);
+                            _this.commodityIds.splice(_this.commodityIds.indexOf(processContent.commodity_id+"_"+is_full),1);
+                            if (is_full) return true;
                         }
-                        return  true;
+                        if (!is_full && processContent.wms_code===wms_code && processContent.commodity_id===commodity_id && processContent.is_full===!is_full){
+                            deleteData.unshift(i);
+                            _this.commodityIds.splice(_this.commodityIds.indexOf(processContent.commodity_id+"_"+!is_full),1);
+                        }
+                    });
+                    deleteData.forEach(function (data) {
+                        _this.processContents.splice(data,1);
                     });
                 },
                 //选择商品
-                selectedCommodity(commodity,wms_code){
+                selectedCommodity(commodity,wms_code,is_full){
                     let _this=this;
                     _this.processContents.every(function (processContent) {
-                        if (_this.commodityIds.includes(commodity.id)){
+                        if (_this.commodityIds.includes(commodity.id+"_"+is_full)){
                             tempTip.setDuration(3000);
                             tempTip.show('该单据已被添加至下边！');
                             return;
@@ -377,6 +365,7 @@
                            processContent.commodity_barcodes=commodity.barcodes;
                            processContent.commodity_sku=commodity.sku;
                            processContent.amount=commodity.amount;
+                           processContent.lineNo=commodity.lineNo;
                            return false;
                        }
                        return  true;
@@ -395,7 +384,6 @@
                     let unit_price=_this.process.unit_price;
                     let remark=_this.process.remark;
                     let amount=_this.process.amount;
-                    console.log(owner_id,process_method_id,unit_price,amount);
                     if (!owner_id || !process_method_id || !unit_price || !amount) {
                         tempTip.setDuration(3000);
                         tempTip.show('请确认您信息输入的完整性！');
@@ -430,10 +418,11 @@
                         tempTip.show('提交失败！网络错误：'+err);
                     });
                 },
-                update_delBtn(type,wms_code,commodity_id){
-                    if (type) this.$set(this.is_delBtn,wms_code+'_'+commodity_id,true);
-                    else this.$set(this.is_delBtn,wms_code+'_'+commodity_id,false);
-                }
+                //删除按钮的显示
+                update_delBtn(type,wms_code,commodity_id,is_full){
+                    if (type) this.$set(this.is_delBtn,wms_code+'_'+commodity_id+'_'+is_full,true);
+                    else this.$set(this.is_delBtn,wms_code+'_'+commodity_id+'_'+is_full,false);
+                },
             },
 
         });