Procházet zdrojové kódy

提示无法提交,费用没有计算
教程的后缀被改成ZIP

Zhouzhendong před 5 roky
rodič
revize
6b92c6d815

+ 7 - 6
app/Http/Controllers/ProcessController.php

@@ -235,9 +235,10 @@ class ProcessController extends Controller
                 $total_cost += ($processDailyParticipant->hour_count)*($processDailyParticipant->hour_price);
             }
         };
+        if (!$revenue || !$total_cost)return ['success'=>false,'data'=>'该单未产生费用,无法计算毛利率!'];
         $gross_profit=$revenue-$total_cost; //毛利润
-        if ($gross_profit<=0)return ['success'=>false,'data'=>'该单未产生费用,无法计算毛利率!'];
-        $gross_profit_rate=$gross_profit/$revenue;  //毛利率
+        if ($gross_profit!=0)$gross_profit_rate=$gross_profit/$revenue;  //毛利率;
+        else $gross_profit_rate=0;
         $processStatistic=ProcessStatistic::find($process->id);
         $processStatistic->revenue=$revenue;
         $processStatistic->duration_days=$duration_days;
@@ -499,7 +500,7 @@ class ProcessController extends Controller
     {
         if(!Gate::allows('二次加工管理-录入')){ return redirect(url('/'));  }
         $processMethods=ProcessMethod::get();
-        return view('process/create',['processMethods'=>$processMethods]);
+        return view('process/create',['processMethods'=>$processMethods,'process'=>null]);
     }
 
     //货主ID获取教程
@@ -582,8 +583,8 @@ class ProcessController extends Controller
         ]);
         $processStatistic->save();
         $this->log(__METHOD__,"录入二次加工单".__FUNCTION__,json_encode($request->input()),Auth::user()['id']);
-        if ($request->input('tutorials'))$process->tutorials()->sync($request->input('tutorials'));
-        return;
+        //if ($request->input('tutorials'))$process->tutorials()->sync($request->input('tutorials'));
+        return ['success'=>true];
     }
     //修改价格
     function updateUnitPrice(Request $request){
@@ -683,7 +684,7 @@ class ProcessController extends Controller
             }]);
         }])->find($id);
         $processMethods=ProcessMethod::get();
-        return view('process.edit',['process'=>$process,'processMethods'=>$processMethods]);
+        return view('process.create',['process'=>$process,'processMethods'=>$processMethods]);
     }
 
     public function show($id){

+ 1 - 1
app/Http/Controllers/TutorialController.php

@@ -113,7 +113,7 @@ class TutorialController extends Controller
      * Remove the specified resource from storage.
      *
      * @param  int  $id
-     * @return \Illuminate\Http\Response
+     * @return array
      */
     public function destroy($id)
     {

+ 41 - 0
app/library/trix/TrixAttachmentController.php

@@ -0,0 +1,41 @@
+<?php
+
+namespace App\library\trix;
+
+
+
+use Illuminate\Http\Request;
+use Illuminate\Http\Response;
+use Illuminate\Routing\Controller;
+use Illuminate\Support\Facades\Storage;
+use Illuminate\Support\Facades\Validator;
+use Ramsey\Uuid\Uuid;
+use Te7aHoudini\LaravelTrix\Models\TrixAttachment;
+
+class TrixAttachmentController extends Controller
+{
+    public function store(Request $request)
+    {
+        $validator = Validator::make($request->all(), [
+            'file' => 'required|file',
+            'modelClass' => 'required',
+            'field' => 'required',
+        ]);
+
+        if ($validator->fails()) {
+            return response()->json(['errors'=>$validator->errors()], Response::HTTP_UNPROCESSABLE_ENTITY);
+        }
+        $fileName = date('Ymd').Uuid::uuid1().".".$request->file->getClientOriginalExtension();
+        $attachment = $request->file->storeAs('/',$fileName, $request->disk ?? config('laravel-trix.storage_disk'));
+        $url = Storage::disk($request->disk ?? config('laravel-trix.storage_disk'))->url($attachment);
+
+        TrixAttachment::create([
+            'field' => $request->field,
+            'attachable_type' => $request->modelClass,
+            'attachment' => $attachment,
+            'disk' => $request->disk ?? config('laravel-trix.storage_disk'),
+        ]);
+
+        return response()->json(['url' => $url], Response::HTTP_CREATED);
+    }
+}

+ 1 - 1
config/laravel-trix.php

@@ -3,7 +3,7 @@
 return [
     'storage_disk' => env('LARAVEL_TRIX_STORAGE_DISK','public'),
 
-    'store_attachment_action' => Te7aHoudini\LaravelTrix\Http\Controllers\TrixAttachmentController::class.'@store',
+    'store_attachment_action' => App\library\trix\TrixAttachmentController::class.'@store',
 
     'destroy_attachment_action' => Te7aHoudini\LaravelTrix\Http\Controllers\TrixAttachmentController::class.'@destroy',
 ];

+ 2 - 2
public/js/app.js

@@ -61974,8 +61974,8 @@ module.exports = tempTip;
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
-__webpack_require__(/*! D:\Reald\desktop\BsWAS\src\resources\js\app.js */"./resources/js/app.js");
-module.exports = __webpack_require__(/*! D:\Reald\desktop\BsWAS\src\resources\sass\app.scss */"./resources/sass/app.scss");
+__webpack_require__(/*! D:\Demo\bswas\resources\js\app.js */"./resources/js/app.js");
+module.exports = __webpack_require__(/*! D:\Demo\bswas\resources\sass\app.scss */"./resources/sass/app.scss");
 
 
 /***/ }),

+ 19 - 13
resources/js/queryForm/header.js

@@ -48,30 +48,37 @@ window.Header = function getHeader(object) {
             if (column.customization){
                 _parentNode.append(column.dom);
             }else{
-                let _td = "<th id='sort_"+column.name+"' style='";
+                let _td = "<th id='dom_"+column.name+"' style='";
                 if(!column.neglect){
                     _td += "cursor: pointer;"
                 }
                 if (column.style) _td += column.style;
                 _td += "'>";
                 if(!column.neglect){
-                    _td += "<span class='fa fa-sort'></span>";
+                    _td += "<span id='sort_"+column.name+"' class='fa fa-sort'></span>";
                 }
-                _td += column.value;
+                _td += "<span style='display: inline-block'>"+column.value+"</span>";
                 _td += "</th>";
                 _parentNode.append(_td);
-                let column_dom = $('#sort_'+column.name);
+                let column_dom = $('#dom_'+column.name);
                 let column_dom_temp = column_dom.clone();
-                column_dom_temp.attr('id','#sort_'+column.name+"_temp");
-                column_dom_temp.width(column_dom.width());
+                let columnNameDom = column_dom_temp.children()[0];
+                if (!column.neglect){
+                    column_dom_temp.children()[0].id = 'sort_'+column.name+"_temp";
+                    columnNameDom = column_dom_temp.children()[1];
+                }
+                console.log(columnNameDom);
+                column_dom_temp.attr('id','dom_'+column.name+"_temp");
+                $(columnNameDom).css('width',column_dom.width());
                 _parentNodeTemp.append(column_dom_temp);
                 if (!column.neglect){
+                    let column_sort = $('#sort_'+column.name);
                     let rule=function () {
                         if (!sortType[column.name]){
                             sortType[column.name] = 'asc';
                             columnArr.push(column.name);
-                            column_dom.removeClass('fa-sort').addClass('fa-sort-asc');
-                            column_dom_temp.removeClass('fa-sort').addClass('fa-sort-asc');
+                            column_sort.removeClass('fa-sort').addClass('fa-sort-asc');
+                            column_dom_temp.children()[0].className = 'fa fa-sort-asc';
                             let columnArrTemp = [];
                             columnArrTemp.push.apply(columnArrTemp,columnArr);
                             window.sort.sort(_this._data,columnArrTemp,sortType);
@@ -79,8 +86,8 @@ window.Header = function getHeader(object) {
                         }
                         if (sortType[column.name] === 'asc'){
                             sortType[column.name] = 'desc';
-                            column_dom.removeClass('fa-sort-asc').addClass('fa-sort-desc');
-                            column_dom_temp.removeClass('fa-sort-asc').addClass('fa-sort-desc');
+                            column_sort.removeClass('fa-sort-asc').addClass('fa-sort-desc');
+                            column_dom_temp.children()[0].className = 'fa fa-sort-desc';
                             let columnArrTemp = [];
                             columnArrTemp.push.apply(columnArrTemp,columnArr);
                             window.sort.sort(_this._data,columnArrTemp,sortType);
@@ -94,8 +101,8 @@ window.Header = function getHeader(object) {
                                     return true;
                                 }
                             });
-                            column_dom.removeClass('fa-sort-desc').addClass('fa-sort');
-                            column_dom_temp.removeClass('fa-sort-desc').addClass('fa-sort');
+                            column_sort.removeClass('fa-sort-desc').addClass('fa-sort');
+                            column_dom_temp.children()[0].className = 'fa fa-sort';
                             if (columnArr.length === 0){
                                 //希尔排序
                                 let arr = [];
@@ -130,7 +137,6 @@ window.Header = function getHeader(object) {
                             let columnArrTemp = [];
                             columnArrTemp.push.apply(columnArrTemp,columnArr);
                             window.sort.sort(_this._data,columnArrTemp,sortType);
-                            return ;
                         }
                     };
                     column_dom.on('click',rule);

+ 3 - 0
resources/sass/text.scss

@@ -48,3 +48,6 @@
     -ms-user-select: none; /* Internet Explorer/Edge */
     user-select: none;
 }
+.fa-sort{
+    opacity: 0.3;
+}

+ 80 - 31
resources/views/process/create.blade.php

@@ -2,7 +2,13 @@
 @section('title')录入二次加工单@endsection
 @section('content')
     <div id="nav2">
-        @component('process.menu')@endcomponent
+        @component('process.menu')
+            @if($process)
+            <li class="nav-item">
+                <a class="nav-link" href="{{URL::current()}}" :class="{active:isActive('edit',3)}">修改</a>
+            </li>
+            @endif
+        @endcomponent
     </div>
     <div class="container-fluid d-none" id="list">
         <div class="card col-md-8 offset-md-2">
@@ -36,14 +42,14 @@
                 </div>
                 <div class="row">
                     <div class="col-6  rounded mb-2 border" style="background: #efe3d9;">
-                        <div class="form-group row mt-2">
+                        <div class="form-group row mt-2" v-if="!is_hide">
                             <label class="col-2 text-right mt-2">原料单据</label>
                             <input class="form-control col-6" v-model="process.wms_code">&nbsp;&nbsp;&nbsp;
                             <button class="btn btn-info btn-sm col-2"  type="button" @click="addProcessContent(false)"> 新增库单据</button>
                             <button class="btn btn-sm btn-dark col-1 ml-1"
                                     @click="showPasteDataModal()"><small>外部导入</small></button>
                         </div>
-                        <div class="form-group row">
+                        <div class="form-group row" v-if="!is_hide">
                             <div class="col-10 offset-1 pl-0 pt-2 border rounded bg-light">
                                 <div class="row pt-2 small"><label class="col-3 text-right" >单据号</label>
                                     <b class="col-8" v-if="processContents.length>0 && processContents[0].addBtnShow && !processContents[0].type">@{{ processContents[0].wms_code }}</b></div> <!---->
@@ -204,36 +210,40 @@
                         </div>
                     </div>
                 </div>
+                <div class="form-group row" v-if="process.id">
+                    <label class="col-3 col-form-label text-right" >任务号</label>
+                    <input disabled :value="process.code" class="form-control col-8">
+                </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-8" :class="error.owner_id && error.owner_id.length>0 ? 'is-invalid' :''">
+                    <input readonly v-if="processContents.length>0" :value="process.owner_name ? process.owner_name : processContents[processContents.length-1].owner_name" class="form-control col-8" :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-8 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-8" :class="error.process_method_id && error.process_method_id.length>0 ? 'is-invalid' :''">
+                    <select :disabled="is_hide" v-model="process.process_method_id" class="form-control col-8" :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" :placeholder="'自动计算数量为“' + sum +'”请填写实际数'" class="form-control col-8" :class="error.amount && error.amount.length>0 ? 'is-invalid' :''">
+                    <input :readonly="is_hide" v-model="process.amount" type="text" :placeholder="'自动计算数量为“' + sum +'”请填写实际数'" class="form-control col-8" :class="error.amount && error.amount.length>0 ? 'is-invalid' :''">
                     <span v-if="error.amount && error.amount.length>0" class="invalid-feedback col-8 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-8" :class="error.unit_price && error.unit_price.length>0 ? 'is-invalid' :''">
+                    <input :readonly="is_hide" v-model="process.unit_price" type="text" class="form-control col-8" :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-8 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-8"></textarea>
+                    <textarea :readonly="is_hide" v-model="process.remark" type="text" class="form-control col-8"></textarea>
                 </div>
                 {{--<div class="form-group row">
                     <label class="col-3 col-form-label text-right" >引用教程(选填)</label>
@@ -264,16 +274,28 @@
         let vueList=new Vue({
             el:'#list',
             data:{
-                process:{wms_code:'',owner_id:'',process_method_id:'',unit_price:'',remark:'',amount:'',wms_code_full:''},
+                process:{id:'{{old('id')??($process->id??'')}}',code:'{{old('code')??($process->code??'')}}',
+                    wms_code:'',owner_id:'{{old('owner_id')??($process->owner_id??'')}}',
+                    amount:'{{old('amount')??($process->amount??'')}}',owner_name:'{{old('owner_name')??($process->owner_name??'')}}',
+                    process_method_id:'{{old('process_method_id')??($process->process_method_id??'')}}',
+                    unit_price:'{{old('unit_price')??($process->unit_price??'')}}',remark:'{{old('remark')??($process->remark??'')}}',
+                    wms_code_full:'',status:'{{$process->status??''}}'},
                 error:{wms_code:[],owner_id:[],process_method_id:[],unit_price:[],amount:[]},
-                processContentError:[],
-                processContents:[],
+                processContents:[
+                    @if($process)
+                        @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,type:'{{$processesContent->type}}'},
+                        @endforeach
+                    @endif
+                ],
                 processMethods:[
                     @foreach($processMethods as $processMethod)
                     {!! $processMethod !!},
                     @endforeach
                 ],
-                tutorials:[],
+                //tutorials:[],
                 selectedTutorials:[],
                 msg:false,
                 commodityIds:[],
@@ -282,6 +304,7 @@
                 pasteData:'',
                 rows:['货主','单据号','品名','SKU','条码','数量'],
                 popoverContent:'',
+                is_hide:false,
             },
             watch:{
                 processContents:{
@@ -294,8 +317,18 @@
                 },
             },
             mounted:function(){
+                if (this.process.status==='加工中' || this.process.status==='待加工')this.is_hide=true;
                 $(".tooltipTarget").tooltip({'trigger':'hover'});
                 $("#list").removeClass('d-none');
+                let _this=this;
+                if (_this.processContents.length > 0){
+                    _this.processContents.forEach(function (processContent) {
+                        processContent.type=processContent.type==='成品单';
+                        if (!processContent.addBtnShow) {
+                            _this._addSignCommodity(processContent.wms_code,processContent.commodity_id,processContent.type);
+                        }
+                    });
+                }
             },
             methods:{
                 //添加标记商品
@@ -308,7 +341,7 @@
                 },
                 //寻找标记商品
                 _seekSignCommodity(wms_code,commodity_id,is_finished_product){
-                    this.commodityIds.includes(wms_code+"_"+commodity_id+"_"+is_finished_product);
+                    return this.commodityIds.includes(wms_code+"_"+commodity_id+"_"+is_finished_product);
                 },
                 //新增库单据
                 addProcessContent(type){
@@ -417,12 +450,12 @@
                     _this.processContents.some(function (processContent,i) {
                         if (processContent.wms_code===wms_code && processContent.commodity_id===commodity_id && processContent.type===type) {
                             deleteData.unshift(i);
-                            _this.commodityIds.splice(_this.commodityIds.indexOf(wms_code+"_"+processContent.commodity_id+"_"+type),1);
+                            _this._removeSignCommodity(wms_code,processContent.commodity_id,type);
                             if (type) return true;
                         }
                         if (!type && processContent.wms_code===wms_code && processContent.commodity_id===commodity_id && processContent.type===!type){
                             deleteData.unshift(i);
-                            _this.commodityIds.splice(_this.commodityIds.indexOf(wms_code+"_"+processContent.commodity_id+"_"+!type),1);
+                            _this._removeSignCommodity(wms_code,processContent.commodity_id,!type);
                         }
                     });
                     if (!type) _this.sum -= amount;
@@ -453,7 +486,7 @@
                 selectedCommodity(commodity,wms_code,type){
                     let _this=this;
                     _this.processContents.every(function (processContent) {
-                        if (_this.commodityIds.includes(wms_code+"_"+commodity.id+"_"+type)){
+                        if (_this._seekSignCommodity(wms_code,commodity.id,type)){
                             tempTip.setDuration(3000);
                             tempTip.show('该单据已被添加至下边!');
                             return;
@@ -513,11 +546,13 @@
                     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.post('{{url("process")}}',{
-                        owner_id:owner_id,process_method_id:process_method_id,unit_price:unit_price,
-                        remark:remark,amount:amount,processContents:_this.processContents,tutorials:_this.selectedTutorials
-                    }).then(function (response) {
+                    let then = function (response) {
                         if (response.data.error && response.data.data=="process"){
                             _this.error=response.data.error;
                             return;
@@ -537,10 +572,24 @@
                                 location.href="{{url('process')}}";
                             },100)
                         }
-                    }).catch(function (err) {
+                    };
+                    let error = function (err) {
                         tempTip.setDuration(5000);
                         tempTip.show('提交失败!网络错误:'+err);
-                    });
+                    };
+                    let param = {
+                        owner_id:owner_id,process_method_id:process_method_id,unit_price:unit_price,
+                        remark:remark,amount:amount,processContents:_this.processContents,/*tutorials:_this.selectedTutorials*/
+                        is_hide:_this.is_hide
+                    };
+                    if (this.process.id) {
+                        let url = '{{url("process")}}/'+_this.process.id;
+                        axios.put(url,param).then(then).catch(error);
+                    }
+                    else{
+                        let url='{{url("process")}}';
+                        axios.post(url,param).then(then).catch(error);
+                    }
                 },
                 {{--//去往新增教程
                 addTutorial(){
@@ -582,23 +631,23 @@
                     content['addBtnShow'] = false ;
                     content['type'] = type ;
                     this.processContents.unshift(content);
-                    this.commodityIds.push(processContent.wms_code+"_"+commodity.id+"_"+content['type']);
+                    this._addSignCommodity(processContent.wms_code,commodity.id,content['type']);
                     if (!type) this.sum += Number(commodity.amount);
                     return content;
                 },
                 //添加所有
                 addAll(processContent){
-                    console.log("processContent.wms_code:"+processContent.wms_code)
                     let _this=this;
                     processContent.commodities.forEach(function (commodity) {
-                        if (!_this.commodityIds.includes(processContent.wms_code+"_"+commodity.id+"_"+false)){
+                        if (!_this._seekSignCommodity(processContent.wms_code,commodity.id,false)){
                             let content = _this._add(processContent,commodity,false);
-                            if (processContent.bill_type==='入库单' && !_this.commodityIds.includes(commodity.id+"_"+true)){
+                            if (processContent.bill_type==='入库单' &&
+                                !_this._seekSignCommodity(processContent.wms_code,commodity.id,true)){
                                 let contentTemp={};
                                 Object.assign(contentTemp,content);
                                 contentTemp['type'] = true;
                                 _this.processContents.unshift(contentTemp);
-                                _this.commodityIds.push(processContent.wms_code+"_"+commodity.id+"_"+contentTemp['type']);
+                                _this._addSignCommodity(processContent.wms_code,commodity.id,contentTemp['type']);
                             }
                         }
                     });
@@ -609,9 +658,9 @@
                 finishedProductAddAll(processContent){
                     let _this=this;
                     processContent.commodities.forEach(function (commodity) {
-                        if (!_this.commodityIds.includes(processContent.bill_type+"_"+commodity.id + "_" + true)) {
+                        if (!_this._seekSignCommodity(processContent.wms_code,commodity.id,true)) {
                             _this._add(processContent, commodity, true);
-                            _this.commodityIds.push(processContent.bill_type+"_"+commodity.id+"_"+'true');
+                            _this._addSignCommodity(processContent.wms_code,commodity.id,true);
                         }
                     });
                     if (_this.processContents[(_this.processContents.length)-1].addBtnShow)
@@ -632,9 +681,9 @@
                             if (res.data.success){
                                 let sum=0;
                                 res.data.data.forEach(function (processContent) {
-                                    if (!_this.commodityIds.includes(processContent.bill_type+"_"+processContent.commodity_id+"_"+processContent.type)){
+                                    if (!_this._seekSignCommodity(processContent.wms_code,processContent.commodity_id,processContent.type)){
                                         _this.processContents.push(processContent);
-                                        _this.commodityIds.push(processContent.bill_type+"_"+processContent.commodity_id+"_"+processContent.type);
+                                        _this._seekSignCommodity(processContent.wms_code,processContent.commodity_id,processContent.type);
                                         if (!processContent.type) sum += Number(processContent.amount);
                                         if (processContent.owner_id && !_this.process.owner_id)
                                             _this.process.owner_id = processContent.owner_id;

+ 0 - 454
resources/views/process/edit.blade.php

@@ -1,454 +0,0 @@
-@extends('layouts.app')
-@section('title')编辑二次加工单@endsection
-@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" id="list">
-        <div class="card col-md-8 offset-md-2">
-            <div class="card-body">
-                <div class="row">
-                    <div class="col-6  rounded mb-2 border" style="background: #efe3d9;">
-                        <div class="form-group row mt-2" v-if="!is_hide">
-                            <label class="col-2 text-right mt-2">原料单据</label>
-                            <input class="form-control col-7" v-model="process.wms_code">&nbsp;&nbsp;&nbsp;
-                            <button class="btn btn-info btn-sm col-2"  type="button" @click="addProcessContent(false)"> 新增库单据</button>
-                        </div>
-                        <div class="form-group row" v-if="!is_hide">
-                            <div class="col-10 offset-1 pl-0 pt-2 border rounded bg-light">
-                                <div class="row pt-2 small"><label class="col-3 text-right" >单据号</label>
-                                    <b class="col-8" v-if="processContents.length>0 && processContents[0].addBtnShow && !processContents[0].type">@{{ processContents[0].wms_code }}</b></div> <!---->
-                                <div class="row pt-2" v-if="processContents.length>0 && processContents[0].addBtnShow && !processContents[0].type">
-                                    <span class="col-12 text-center text-muted small">双击选择商品:</span>
-                                    <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,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>
-                                                </div>
-                                            </li>
-                                        </ul>
-                                    </span>
-                                </div>
-                                <div class="row pt-2 small"><label class="col-3  text-right">商品名</label>
-                                    <input v-if="processContents.length>0 && processContents[0].addBtnShow && !processContents[0].type" class="form-control form-control-sm col-8" @change="update_commodity_name(processContents[0])" v-model="processContents[0].commodity_name">
-                                </div>
-                                <div class="row pt-2 small"><label class="col-3  text-right">条码</label>
-                                    <input v-if="processContents.length>0 && processContents[0].addBtnShow && !processContents[0].type" class="form-control form-control-sm col-8" @change="update_commodity_barcode(processContents[0],$event)" :value="processContents[0].commodity_barcode ? processContents[0].commodity_barcode :
-                                    (processContents[0].commodity_barcodes[0] ? processContents[0].commodity_barcodes[0].code :'')">
-                                </div>
-                                <div class="row pt-2 small"><label class="col-3  text-right">SKU</label>
-                                    <input v-if="processContents.length>0 && processContents[0].addBtnShow && !processContents[0].type" class="form-control form-control-sm col-8" @change="update_commodity_sku(processContents[0])" v-model="processContents[0].commodity_sku">
-                                </div>
-                                <div class="row pt-2 small"><label class="col-3  text-right">单据类型</label>
-                                    <select v-if="processContents.length>0 && processContents[0].addBtnShow && !processContents[0].type"
-                                            v-model="processContents[0].bill_type"  class="col-8 form-control form-control-sm">
-                                        <option value="移库单">移库单</option>
-                                        <option value="入库单">入库单</option>
-                                        <option value="出库单">出库单</option>
-                                    </select></div>
-                                <div class="row pt-2 small"><label class="col-3  text-right">数量</label>
-                                    <input v-if="processContents.length>0 && processContents[0].addBtnShow && !processContents[0].type" v-model="processContents[0].amount" type="text" class="form-control form-control-sm col-8">
-                                </div>
-                                <div class="col-8 offset-2 pt-2 pb-2">
-                                    <input type="button" v-if="processContents.length>0 && processContents[0].addBtnShow && !processContents[0].type"
-                                           @click="confirmStore(processContents[0].wms_code,processContents[0].commodity_id,processContents[0].amount,processContents[0].bill_type,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].type" 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" :class="is_hide ? 'mt-3' : ''">
-                            <div class="col-10 offset-1 p-1 border rounded bg-light" v-for="processContent in processContents" v-if="!processContent.addBtnShow && !processContent.type">
-                                <div class="col-12 border">
-                                    <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>
-                                        <span class=" text-muted">@{{ processContent.bill_type }}</span>
-                                        <span class="ml-2 font-weight-bold">商品名:</span>
-                                        <span class="font-weight-bold">@{{ processContent.commodity_name }}</span>
-                                        <span class="ml-2 text-muted">SKU:</span>
-                                        <span class=" text-muted">@{{ processContent.commodity_sku }}</span>
-                                        <span class="ml-2 font-weight-bold">数量:</span>
-                                        <span class="font-weight-bold">@{{ processContent.amount }}</span>
-                                        <span class="ml-2 text-muted">条码:</span>
-                                        <span class="text-muted">
-                                            <small v-if="processContent.commodity_barcode"> @{{ processContent.commodity_barcode }}</small>
-                                            <small v-if="processContent.commodity_barcodes && processContent.commodity_barcodes.length>0 && !processContent.commodity_barcode"
-                                                   v-for="barcode in processContent.commodity_barcodes">@{{ barcode.code }}</small></span>
-                                        <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>
-                        </div>
-                    </div>
-                    <div class="col-6 rounded mb-2 border" style="background: #ccd7dc;" >
-                        <div class="form-group row mt-2">
-                            <label class="col-2 text-right mt-2">成品单据</label>
-                            <input class="form-control col-7" v-model="process.wms_code_full">&nbsp;&nbsp;&nbsp;
-                            <button class="btn btn-info btn-sm col-2"  type="button" @click="addProcessContent(true)"> 新增库单据</button>
-                        </div>
-                        <div class="form-group row">
-                            <div class="col-10 offset-1 pl-0 pt-2 border rounded bg-light">
-                                <div class="row pt-2 small"><label class="col-3 text-right" >单据号</label>
-                                    <b class="col-8" v-if="processContents.length>0 && processContents[0].addBtnShow && processContents[0].type">@{{ processContents[0].wms_code }}</b></div> <!---->
-                                <div class="row pt-2" v-if="processContents.length>0 && processContents[0].addBtnShow && processContents[0].type">
-                                    <span class="col-12 text-center text-muted small">双击选择商品:</span>
-                                    <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,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>
-                                                </div>
-                                            </li>
-                                        </ul>
-                                    </span>
-                                </div>
-                                <div class="row pt-2 small"><label class="col-3  text-right">商品名</label>
-                                    <input v-if="processContents.length>0 && processContents[0].addBtnShow && processContents[0].type" class="form-control form-control-sm col-8" @change="update_commodity_name(processContents[0])" v-model="processContents[0].commodity_name">
-                                </div>
-                                <div class="row pt-2 small"><label class="col-3  text-right">条码</label>
-                                    <input v-if="processContents.length>0 && processContents[0].addBtnShow && processContents[0].type" class="form-control form-control-sm col-8" @change="update_commodity_barcode(processContents[0],$event)" :value="processContents[0].commodity_barcode ? processContents[0].commodity_barcode :
-                                        (processContents[0].commodity_barcodes[0] ? processContents[0].commodity_barcodes[0].code :'')">
-                                </div>
-                                <div class="row pt-2 small"><label class="col-3  text-right">SKU</label>
-                                    <input v-if="processContents.length>0 && processContents[0].addBtnShow && processContents[0].type" class="form-control form-control-sm col-8" @change="update_commodity_sku(processContents[0])" v-model="processContents[0].commodity_sku">
-                                </div>
-                                <div class="row pt-2 small"><label class="col-3  text-right">单据类型</label>
-                                    <select v-if="processContents.length>0 && processContents[0].addBtnShow && processContents[0].type"
-                                            v-model="processContents[0].bill_type"  class="col-8 form-control form-control-sm">
-                                        <option value="移库单">移库单</option>
-                                        <option value="入库单">入库单</option>
-                                        <option value="出库单">出库单</option>
-                                    </select></div>
-                                <div class="row pt-2 small"><label class="col-3  text-right">数量</label>
-                                    <input v-if="processContents.length>0 && processContents[0].addBtnShow && processContents[0].type" v-model="processContents[0].amount" type="text" class="form-control form-control-sm col-8">
-                                </div>
-                                <div class="col-8 offset-2 pt-2 pb-2">
-                                    <input type="button" v-if="processContents.length>0 && processContents[0].addBtnShow && processContents[0].type"
-                                           @click="confirmStore(processContents[0].wms_code,processContents[0].commodity_id,processContents[0].amount,processContents[0].bill_type,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].type" 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.type">
-                                <div class="col-12 border">
-                                    <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>
-                                        <span class=" text-muted">@{{ processContent.bill_type }}</span>
-                                        <span class="ml-2 font-weight-bold">商品名:</span>
-                                        <span class="font-weight-bold">@{{ processContent.commodity_name }}</span>
-                                        <span class="ml-2 text-muted">SKU:</span>
-                                        <span class=" text-muted">@{{ processContent.commodity_sku }}</span>
-                                        <span class="ml-2 font-weight-bold">数量:</span>
-                                        <span class="font-weight-bold">@{{ processContent.amount }}</span>
-                                        <span class="ml-2 text-muted">条码:</span>
-                                        <span class="text-muted">
-                                            <small v-if="processContent.commodity_barcode"> @{{ processContent.commodity_barcode }}</small>
-                                            <small v-if="processContent.commodity_barcodes && processContent.commodity_barcodes.length>0 && !processContent.commodity_barcode"
-                                                   v-for="barcode in processContent.commodity_barcodes">@{{ barcode.code }}</small></span>
-                                        <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>
-                        </div>
-                    </div>
-                </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-8">
-                </div>
-                <div class="form-group row">
-                    <label class="col-3 col-form-label text-right" >货主</label>
-                    <input readonly v-if="processContents.length>0" :value="process.owner_name" class="form-control col-8" :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-8 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 :disabled="is_hide" v-model="process.process_method_id" class="form-control col-8" :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 :readonly="is_hide" v-model="process.amount" type="text" class="form-control col-8" :class="error.amount && error.amount.length>0 ? 'is-invalid' :''">
-                    <span v-if="error.amount && error.amount.length>0" class="invalid-feedback col-8 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 :readonly="is_hide" v-model="process.unit_price" type="text" class="form-control col-8" :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-8 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 :readonly="is_hide" v-model="process.remark" type="text" class="form-control col-8"></textarea>
-                </div>
-                <div class="form-group row">
-                    <div class="col-8 offset-3">
-                        <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}}',
-                    process_method_id:'{{$process->process_method_id}}',unit_price:'{{$process->unit_price}}',remark:'{{$process->remark}}',wms_code_full:'',status:'{{$process->status}}'},
-                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,type:'{{$processesContent->type}}'},
-                    @endforeach
-                ],
-                processMethods:[
-                    @foreach($processMethods as $processMethod)
-                    {!! $processMethod !!},
-                    @endforeach
-                ],
-                tutorials:[],
-                selectedTutorials:[],
-                commodityIds:[],
-                is_delBtn:[],
-                is_hide:false,
-            },
-            mounted:function(){
-                if (this.process.status==='加工中' || this.process.status==='待加工')this.is_hide=true;
-                let _this=this;
-                _this.processContents.some(function (processContent) {
-                    processContent.type=processContent.type==='成品单'?true:false;
-                    if (!processContent.addBtnShow) {
-                        _this.commodityIds.push(processContent.commodity_id+'_'+processContent.type);
-                    }
-                });
-            },
-            watch:{
-                processContents:{
-                    handler(){
-                        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;
-                        }
-                    }
-                },
-            },
-            methods:{
-                //新增库单据
-                addProcessContent(type){
-                    let _this=this;
-                    let wms_code=_this.process.wms_code;
-                    if (type) wms_code=_this.process.wms_code_full;
-                    if (!wms_code){
-                        tempTip.setDuration(3000);
-                        tempTip.show('未输入单据号!');
-                        return;
-                    }
-                    if (_this.processContents.length>0 && _this.processContents[_this.processContents.length-1].addBtnShow) {
-                        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){
-                                tempTip.setDuration(3000);
-                                tempTip.show(response.data.error);
-                                return;
-                            }
-                            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']='';
-                            processContent['lineNo']='';
-                            processContent['addBtnShow']=true;
-                            processContent['type']=type;
-                            _this.processContents.unshift(processContent);
-                        }).catch(function (err) {
-                            tempTip.setDuration(3000);
-                            tempTip.show('查询单据号失败!网络错误:'+err);
-                        });
-                },
-                //确定新增
-                confirmStore(wms_code,commodity_id,amount,bill_type,type){
-                    if (!commodity_id) {
-                        tempTip.setDuration(2000);
-                        tempTip.show("尚未选择商品!");
-                        return;
-                    }
-                    if (!amount) {
-                        tempTip.setDuration(2000);
-                        tempTip.show("尚未填写数量!");
-                        return;
-                    }
-                    let _this=this;
-                    let sign=true;
-                    let is_return=false;
-                    let processContentTemp={};
-                    _this.processContents.some(function (processContent) {
-                        if (processContent.wms_code==wms_code && processContent.commodity_id==commodity_id && processContent.type==type) {
-                            processContent.commodities.every(function (commodity) {
-                                if (commodity.id===commodity_id && commodity.amount<amount){
-                                    tempTip.setDuration(2000);
-                                    tempTip.show("数量不得超出原有数量!");
-                                    is_return=true;
-                                    return false;
-                                }
-                                return true;
-                            });
-                            if (is_return)return true;
-                            _this.commodityIds.push(processContent.commodity_id+"_"+type);
-                            processContent.addBtnShow=false;
-                            processContentTemp=Object.assign({},processContent);
-                        }
-                        if (processContent.wms_code==wms_code && processContent.commodity_id==commodity_id && processContent.type==!type)sign=false;
-                    });
-                    if (is_return)return;
-                    if (bill_type==='入库单' && !type && sign){
-                        _this.commodityIds.push(processContentTemp.commodity_id+"_"+!type);
-                        processContentTemp['type']=true;
-                        _this.processContents.unshift(processContentTemp);
-                    }
-                },
-                //删除新增
-                deleteProcessContent(wms_code,commodity_id,type){
-                    let _this=this;
-                    let deleteData=[];
-                    _this.processContents.some(function (processContent,i) {
-                        if (processContent.wms_code===wms_code && processContent.commodity_id===commodity_id && processContent.type===type) {
-                            deleteData.unshift(i);
-                            _this.commodityIds.splice(_this.commodityIds.indexOf(processContent.commodity_id+"_"+type),1);
-                            if (type) return true;
-                        }
-                        if (!type && processContent.wms_code===wms_code && processContent.commodity_id===commodity_id && processContent.type===!type){
-                            deleteData.unshift(i);
-                            _this.commodityIds.splice(_this.commodityIds.indexOf(processContent.commodity_id+"_"+!type),1);
-                        }
-                    });
-                    deleteData.forEach(function (data) {
-                        _this.processContents.splice(data,1);
-                    });
-                },
-                //选择商品
-                selectedCommodity(commodity,wms_code,type){
-                    let _this=this;
-                    _this.processContents.every(function (processContent) {
-                        if (_this.commodityIds.includes(commodity.id+"_"+type)){
-                            tempTip.setDuration(3000);
-                            tempTip.show('该单据已被添加至下边!');
-                            return;
-                        }else 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;
-                           processContent.amount=commodity.amount;
-                           processContent.lineNo=commodity.lineNo;
-                           return false;
-                       }
-                       return  true;
-                    });
-                },
-                //异补提交
-                submit(){
-                    let _this=this;
-                    if (_this.processContents.length>0 && _this.processContents[_this.processContents.length-1].addBtnShow) {
-                        tempTip.setDuration(3000);
-                        tempTip.show('新增单据操作中不能继续新增!');
-                        return;
-                    }
-                    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,is_hide:_this.is_hide
-                    }).then(function (response) {
-                        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;
-                        }
-                        if(response.data.success==false){
-                            tempTip.setDuration(5000);
-                            tempTip.show('提交失败:'+response.data.data);
-                        }else {
-                            tempTip.setDuration(5000);
-                            tempTip.showSuccess('提交成功');
-                            setTimeout(function () {
-                                location.href="{{url('process')}}";
-                            },100)
-                        }
-                    }).catch(function (err) {
-                        tempTip.setDuration(3000);
-                        tempTip.show('提交失败!网络错误:'+err);
-                    });
-                },
-                //删除按钮的显示
-                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);
-                },
-                update_commodity_name(processContent){
-                    this.$set(processContent,'is_update_commodity_name',true);
-                },
-                update_commodity_barcode(processContent,e){
-                    this.$set(processContent,'commodity_barcode',e.target.value);
-                },
-                update_commodity_sku(processContent){
-                    this.$set(processContent,'is_update_commodity_sku',true);
-                },
-            },
-
-        });
-    </script>
-@endsection

+ 1 - 1
resources/views/process/index.blade.php

@@ -160,7 +160,7 @@
         </div>
         <table class="table table-sm text-nowrap d-none" id="headerRoll"></table>
         <table class="table table-sm text-nowrap" id="headerParent">
-            <tr class="row-even" id="header" style="background: rgb(255, 255, 255);">
+            <tr class="row-even p-0" id="header" style="background: rgb(255, 255, 255);">
                 <th>
                     <label for="all">
                         <input id="all" type="checkbox" @click="checkAll($event)">全选