Merge branch 'master' into zengjun

app/Http/Controllers/ProcessController.php

@@ -561,10 +561,12 @@ class ProcessController extends Controller
                     ]);
                 }
                 if (isset($processContent['commodity_barcode'])){
-                    CommodityBarcode::query()->firstOrCreate([
-                        'commodity_id'=>$processContent['commodity_id'],
-                        'code'=>$processContent['commodity_barcode']]
-                    );
+                    Sign::query()->create([
+                        'signable_type'=>'processes_contents',
+                        'signable_id'=>$processContentOne->id,
+                        'field'=>'commodity_barcode',
+                        'mark'=>$processContent['commodity_barcode'],
+                    ]);
                 }
                 if (isset($processContent['is_update_commodity_sku'])){
                     Sign::query()->create([
@@ -679,7 +681,7 @@ class ProcessController extends Controller
     {
         if(!Gate::allows('二次加工管理-编辑')){ return redirect(url('/'));  }
         $process=Process::with(['processesContents'=>function($query){
-            return $query->with(['commodity'=>function($query){
+            return $query->with(['signCommodityName','signCommoditySku','signCommodityBarcode','commodity'=>function($query){
                 return $query->with('barcodes');
             }]);
         }])->find($id);
@@ -689,7 +691,7 @@ class ProcessController extends Controller
 
     public function show($id){
         $process=Process::with(['processesContents'=>function($query){
-            $query->with(['commodity'=>function($query){
+            $query->with(['signCommodityName','signCommoditySku','signCommodityBarcode','commodity'=>function($query){
                 $query->with('barcodes');
             }]);
         },'tutorials'])->find($id);
@@ -763,10 +765,16 @@ class ProcessController extends Controller
                     ]);
                 }
                 if (isset($processContent['commodity_barcode'])){
-                    CommodityBarcode::query()->firstOrCreate([
-                            'commodity_id'=>$processContent['commodity_id'],
-                            'code'=>$processContent['commodity_barcode']]
-                    );
+                    Sign::query()->updateOrCreate([
+                        'signable_type'=>'processes_contents',
+                        'signable_id'=>$processContentOne->id,
+                        'field'=>'commodity_barcode',
+                    ],[
+                        'signable_type'=>'processes_contents',
+                        'signable_id'=>$processContentOne->id,
+                        'field'=>'commodity_barcode',
+                        'mark'=>$processContent['commodity_barcode'],
+                    ]);
                 }
                 if (isset($processContent['is_update_commodity_sku'])){
                     Sign::query()->updateOrCreate([

app/Http/Controllers/TestController.php

@@ -17,6 +17,7 @@ use App\OracleIdxAsrsReceive;
 use App\Order;
 use App\Package;
 use App\Process;
+use App\ProcessesContent;
 use App\ProcessStatistic;
 use App\Rejected;
 use App\RejectedBill;
@@ -271,8 +272,35 @@ class TestController extends Controller
     /*1*/
     function test(Request $request)
     {/**/
-        $str = (int)'b';
-        dd($str);
+        $units=ProcessesContent::with('signCommodity')->get();
+        foreach ($units as $unit){
+            if ($unit->sign_commodity_name_mark)dd($unit->sign_commodity_name_mark);
+        }
+
+        header("Content-type:text/html;charset=utf-8");
+
+        $stuid = "201301013";
+        $pwd = "136";
+        $uri = "127.0.0.1/login.php";//这里换成你服务器的地址
+        // 参数数组
+        $data = array (
+            'stuid' => $stuid,
+            'pwd' => $pwd
+        );
+
+        $ch = curl_init();  //初始化curl
+
+        curl_setopt ( $ch, CURLOPT_URL, $uri );
+        curl_setopt ( $ch, CURLOPT_POST, 1 );  //使用post请求
+        curl_setopt ( $ch, CURLOPT_HEADER, 0 );
+        curl_setopt ( $ch, CURLOPT_RETURNTRANSFER, 1 );
+        curl_setopt ( $ch, CURLOPT_POSTFIELDS, $data);  //提交数据
+        curl_setopt ( $ch, CURLOPT_FOLLOWLOCATION, true);  //重定向地址也输出
+        $return = curl_exec ( $ch ); //得到返回值
+
+        curl_close ( $ch );  //关闭
+
+        print_r($return);  //输出返回值
     }
 
 }

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

@@ -140,6 +140,7 @@ class ProcessController extends Controller
         //处理重组数据
         $docs=['owner_code'=>[],'sku'=>[]];
         $commodities=[];
+        $commodity_ids=[];
         $i=0;
         $docSKUs=array_column($doc->toArray(),'sku');
         $docOwnerCodes=array_column($docHeader?$docHeader->toArray():$doc->toArray(),'customerid');
@@ -162,7 +163,12 @@ class ProcessController extends Controller
             }
             $commodity->amount=$docOne[$amountColumn];
             $commodity->lineNo=$docOne[$lineNoColumn];
-            array_push($commodities,$commodity->toArray());
+            if (isset($commodity_ids[$commodity->id]))
+                $commodities[$commodity_ids[$commodity->id]]['amount'] += $commodity->amount;
+            else{
+                array_push($commodities,$commodity->toArray());
+                $commodity_ids[$commodity->id] = count($commodities)-1;
+            }
             unset($doc[$i]);
             $i++;
         }
@@ -185,7 +191,12 @@ class ProcessController extends Controller
                 if (!$commodity)continue;
                 $commodity->amount=$docOne[$amountColumn];
                 $commodity->lineNo=$docOne[$lineNoColumn];
-                array_push($commodities,$commodity->toArray());
+                if (isset($commodity_ids[$commodity->id]))
+                    $commodities[$commodity_ids[$commodity->id]]['amount'] += $commodity->amount;
+                else{
+                    array_push($commodities,$commodity->toArray());
+                    $commodity_ids[$commodity->id] = count($commodities)-1;
+                }
             }
         }
         return $commodities;

app/ProcessesContent.php

@@ -15,6 +15,7 @@ class ProcessesContent extends Model
         'commodity_name',
         'sign_commodity_name_mark',
         'sign_commodity_sku_mark',
+        'sign_commodity_barcode_mark',
     ];
 
     public function process(){
@@ -31,6 +32,10 @@ class ProcessesContent extends Model
         return $this->hasOne('App\Sign','signable_id','id')
             ->where('signable_type','processes_contents')->where('field','commodity_sku');
     }
+    public function signCommodityBarcode(){
+        return $this->hasOne('App\Sign','signable_id','id')
+            ->where('signable_type','processes_contents')->where('field','commodity_barcode');
+    }
 
     public function getCommodityNameAttribute()
     {
@@ -42,6 +47,10 @@ class ProcessesContent extends Model
     }
     public function getSignCommoditySkuMarkAttribute()
     {
-        return $this['signCommodityName']? $this['signCommoditySku']['mark']:null;
+        return $this['signCommoditySku']? $this['signCommoditySku']['mark']:null;
+    }
+    public function getSignCommodityBarcodeMarkAttribute()
+    {
+        return $this['signCommodityBarcode']? $this['signCommodityBarcode']['mark']:null;
     }
 }

app/Services/ProcessService.php

@@ -12,7 +12,7 @@ Class ProcessService
     private function conditionQuery(Request $request){
         $processes=Process::filterAuthorities()->with(['tutorials','signs',
             'signUnitPrice','processesContents'=>function($query){
-            return $query->with(['signCommodityName','signCommoditySku','commodity'=>function($query){
+            return $query->with(['signCommodityName','signCommoditySku','signCommodityBarcode','commodity'=>function($query){
                 return $query->with('barcodes');
             }]);
         }])->orderBy('processes.id','DESC');

resources/js/queryForm/header.js

@@ -14,7 +14,8 @@ window.Header = function getHeader(object) {
     this._offset = object.offset || 0;  //偏移量
     this._is_restorationColumn_asc = object.is_restorationColumn_asc || false;    //恢复原数据基准字段的排序类型 true:asc false:desc
     this._vue = object.vue || null; //vue容器
-    this._checkbox = object.checkbox || 'checkData';
+    this._checkbox = object.checkbox || 'checkData';    //全选数据列名
+    this._closeFloat = object.closeFloat || false;  //是否开启浮动
 
     let _this = this;
     let _parentNode = $(_this._header);
@@ -52,13 +53,13 @@ window.Header = function getHeader(object) {
      *         }
      * */
     //点击事件触发的排序规则
-    function rule(column,column_sort,column_sort_temp) {
+    function rule(column,column_sort,column_sort_temp=null) {
         return function () {
             if (!sortType[column.name]){
                 sortType[column.name] = 'asc';
                 columnArr.push(column.name);
                 column_sort.removeClass('fa-sort').addClass('fa-sort-asc');
-                column_sort_temp.removeClass('fa-sort').addClass('fa-sort-asc');
+                if (column_sort_temp) column_sort_temp.removeClass('fa-sort').addClass('fa-sort-asc');
                 let columnArrTemp = [];
                 columnArrTemp.push.apply(columnArrTemp,columnArr);
                 window.sort.sort(_this._data,columnArrTemp,sortType);
@@ -67,7 +68,7 @@ window.Header = function getHeader(object) {
             if (sortType[column.name] === 'asc'){
                 sortType[column.name] = 'desc';
                 column_sort.removeClass('fa-sort-asc').addClass('fa-sort-desc');
-                column_sort_temp.removeClass('fa-sort-asc').addClass('fa-sort-desc');
+                if (column_sort_temp)column_sort_temp.removeClass('fa-sort-asc').addClass('fa-sort-desc');
                 let columnArrTemp = [];
                 columnArrTemp.push.apply(columnArrTemp,columnArr);
                 window.sort.sort(_this._data,columnArrTemp,sortType);
@@ -82,7 +83,7 @@ window.Header = function getHeader(object) {
                     }
                 });
                 column_sort.removeClass('fa-sort-desc').addClass('fa-sort');
-                column_sort_temp.removeClass('fa-sort-desc').addClass('fa-sort');
+                if (column_sort_temp)column_sort_temp.removeClass('fa-sort-desc').addClass('fa-sort');
                 if (columnArr.length === 0){
                     //希尔排序
                     let arr = [];
@@ -150,6 +151,11 @@ window.Header = function getHeader(object) {
                 _td += column.value+"</span>";
                 _td += "</th>";
                 _parentNode.append(_td);
+                if (!column.neglect) {
+                    let column_sort = $('#sort_' + column.name);
+                    let column_dom = $('#dom_'+column.name);
+                    column_dom.on('click',rule(column,column_sort));
+                }
             }
         });
     }
@@ -184,6 +190,7 @@ window.Header = function getHeader(object) {
             if (!column.neglect){
                 let column_sort = $('#sort_'+column.name);
                 let column_sort_temp = $('#sort_'+column.name+"_temp");
+                column_dom.off('click');
                 column_dom.on('click',rule(column,column_sort,column_sort_temp));
                 column_dom_temp.on('click',rule(column,column_sort,column_sort_temp));
             }
@@ -197,6 +204,7 @@ window.Header = function getHeader(object) {
     //初始化
     this.init = function() {
         append();
+        if (_this._closeFloat)return;
         fixed();
         cloneDom();
     };

resources/js/queryForm/queryForm.js

@@ -694,7 +694,7 @@ const query = function getQueryForm(data) {
         *   {date_relevance:{date:['',''],relevance:'',killing:'',default:[]}}
         * */
         let rules = _data[dom.name].rules;
-        if (JSON.stringify(rules) !== '{}'){
+        if (rules && JSON.stringify(rules) !== '{}'){
             if (rules['son']){
                 for (let key in rules['son']){
                     if (!dom.value){

resources/js/utilities/sort.js

@@ -12,6 +12,7 @@ const  sortData = {
         data['J']='';data['K']='';data['L']='';data['M']='';data['N']='';data['O']='';data['P']='';data['Q']='';data['R']='';
         data['S']='';data['T']='';data['U']='';data['V']='';data['W']='';data['X']='';data['Y']='';data['Z']='';
         array.forEach(function (obj) {
+            if (!obj[column]) obj[column]='';
             if (!data[obj[column].charAt(i)])  data[obj[column].charAt(i)] = [obj];
             else data[obj[column].charAt(i)].push(obj);
         });

resources/views/inventory/statement/allInventory.blade.php

@@ -65,7 +65,7 @@
 @endsection
 
 @section('lastScript')
-    <script type="text/javascript" src="{{asset('js/queryForm/export200818.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/export200818a.js')}}"></script>
     <script type="text/javascript" src="{{asset('js/queryForm/queryForm200805b.js')}}"></script>
     <script>
         $.cookie('xxx', 2223);

resources/views/inventory/statement/changeInventory.blade.php

@@ -55,9 +55,9 @@
 @endsection
 
 @section('lastScript')
-    <script type="text/javascript" src="{{asset('js/queryForm/export200818.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200813b.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/header200818.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/export200818a.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200818a.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/header200819.js')}}"></script>
     <script>
         let vue=new Vue({
             el:"#list",

resources/views/inventory/stockInventory/mission.blade.php

@@ -73,7 +73,7 @@
 @endsection
 
 @section('lastScript')
-    <script type="text/javascript" src="{{asset('js/queryForm/export200818.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/export200818a.js')}}"></script>
     <script type="text/javascript" src="{{asset('js/queryForm/queryForm200805b.js')}}"></script>
     <script>
         new Vue({

resources/views/maintenance/role/index.blade.php

@@ -49,7 +49,7 @@
 @endsection
 
 @section('lastScript')
-    <script type="text/javascript" src="{{asset('js/queryForm/header200818.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/header200819.js')}}"></script>
     <script>
         new Vue({
             el:"#list",

resources/views/maintenance/user/index.blade.php

@@ -13,7 +13,7 @@
                     <div class="alert alert-success h1">{{Session::get('successTip')}}</div>
                 @endif
                 <div id="list">
-                    <table class="table table-bordered table-sm d-none" id="headerRoll">
+                    <table class="table table-bordered table-sm d-none" id="headerRoll"></table>
                     <table class="table table-striped table-sm" id="headerParent">
                         <tr id="header"></tr>
                         <tr v-for="user in users">
@@ -49,7 +49,7 @@
 @endsection
 
 @section('lastScript')
-    <script type="text/javascript" src="{{asset('js/queryForm/header200818.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/header200819.js')}}"></script>
     <script>
         new Vue({
             el:"#list",

resources/views/order/index/delivering.blade.php

@@ -139,9 +139,9 @@
 @endsection
 
 @section('lastScript')
-    <script type="text/javascript" src="{{asset('js/queryForm/export200818.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200813b.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/header200818.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/export200818a.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200818a.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/header200819.js')}}"></script>
     <script>
         let vue=new Vue({
             el:"#list",

resources/views/order/issue/index.blade.php

@@ -407,8 +407,8 @@
         }
 
     </style>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200813b.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/export200818.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200818a.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/export200818a.js')}}"></script>
     <script>
         let listVue = new Vue({
             el: '#issue_div ',

resources/views/order/wave/search.blade.php

@@ -82,7 +82,7 @@
 @endsection
 
 @section("lastScript")
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200813b.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200818a.js')}}"></script>
     <script>
         let vueList = new Vue({
             el: "#wave_div",

resources/views/personnel/laborReport/index.blade.php

@@ -21,7 +21,7 @@
         <label for="all" class="d-none" id="cloneCheckAll">
             <input id="all" type="checkbox" @click="checkAll($event)">全选
         </label>
-        <table class="table table-sm table-bordered d-none text-nowrap " id="headerRoll">
+        <table class="table table-sm table-bordered d-none text-nowrap " id="headerRoll"></table>
         <table class="table table-sm table-hover table-striped d-none d-xl-block p-0 text-nowrap table-bordered" id="headerParent">
             <tr class="text-center" id="header"></tr>
             <tr v-for="(laborReport,i) in laborReports"  @click="selectedColor(laborReport.id)" :style="{'font-weight': laborReport.id==selectedStyle?'bold':''}">
@@ -76,7 +76,7 @@
                 <td><span v-if="laborReport.remark">@{{laborReport.remark}}</span></td>
             </tr>
         </table>
-        <table class="table table-striped table-bordered table-hover p-0 d-table  d-xl-none" style="background: rgb(255, 255, 255);">
+        <table id="listOnPad" class="table table-striped table-bordered table-hover p-0 d-table  d-xl-none" style="background: rgb(255, 255, 255);">
             <tr v-for="laborReport in laborReports">
                 <td style="filter:grayscale(30%);">
                     <div  class="pl-3 mt-1">
@@ -118,7 +118,7 @@
                             <span class="mr-3  text-nowrap"><span class="text-black">小组：</span><span class="text-black-50">@{{laborReport.userWorkGroupName  }}</span></span>
                             <span class="mr-3   text-nowrap"><span class="text-black">临时工：</span><span class="text-black-50">@{{ laborReport.name }} </span></span>
                             {{--                                    <span class="mr-3 text-nowrap"><span class="text-black">电话：</span><span style="color:#af7651" v-if="">@{{ laborReport.mobile_phone }} </span></span>--}}
-                            {{--                                    <span class="mr-3 text-nowrap"><span class="text-black">身份证号：</span><span style="color:#af7651" v-if="">@{{ laborReport.identity_number }} </span></span>--}}
+                                                                <span class="text-nowrap"><span class="text-black">身份证号：</span><span style="color:#af7651" v-if="">@{{ laborReport.identity_number }} </span></span>
                             {{--                                    <span class="mr-3 text-nowrap"><span class="text-black">劳务所：</span><span style="color:#af7651" v-if="">@{{ laborReport.labor_company }} </span></span>--}}
                             {{--                                    <span class="mr-3 text-nowrap"><span class="text-black">进组时间：</span><span style="color:#af7651" v-if="">@{{ laborReport.checkInAt }} </span></span>--}}
                             {{--                                    <span class="mr-3 text-nowrap"><span class="text-black">审核时间：</span><span style="color:#af7651" v-if="">@{{ laborReport.verifyAt }} </span></span>--}}
@@ -210,9 +210,9 @@
 @endsection
 
 @section('lastScript')
-    <script type="text/javascript" src="{{asset('js/queryForm/export200818.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200813b.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/header200818.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/export200818a.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200818a.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/header200819.js')}}"></script>
     <script>
         let today=(new Date());
         function isTomorrow(){
@@ -230,6 +230,15 @@
         setInterval(reloadOnTomorrow,1000*60*60)
     </script>
     <script>
+        window.onresize=function (){
+            let $listOnPad = $('#listOnPad');
+            let $headerRoll = $('#headerRoll');
+            if($listOnPad.css('display')!=='none'){
+                $headerRoll.attr('hidden',true)
+            }else{
+                $headerRoll.attr('hidden',false)
+            }
+        }
         @if(isset($request))
         let request={!! json_encode($request) !!};
         @endif

resources/views/process/create.blade.php

@@ -110,16 +110,26 @@
                                         <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="font-weight-bold">
+                                            <span v-if="processContent.sign_commodity_name_mark">@{{ processContent.sign_commodity_name_mark }}</span>
+                                            <span v-else>@{{ processContent.commodity_name }}</span>
+                                        </span>
                                         <span class="ml-2 text-muted">SKU：</span>
-                                        <span class=" text-muted">@{{ processContent.commodity_sku }}</span>
+                                        <span class=" text-muted">
+                                            <span v-if="processContent.sign_commodity_sku_mark">@{{ processContent.sign_commodity_sku_mark }}</span>
+                                            <span v-else>@{{ processContent.commodity_sku }}</span>
+                                        </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>
+                                            <span v-if="processContent.sign_commodity_barcode_mark">@{{ processContent.sign_commodity_barcode_mark }}</span>
+                                            <span v-else>
+                                                <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>
+                                        </span>
                                         <button v-if="is_delBtn[processContent.wms_code+'_'+processContent.commodity_id+'_'+false]" @click="deleteProcessContent(processContent.wms_code,processContent.commodity_id,false,processContent.amount)" class="btn btn-sm btn-danger" style="position: absolute;right: 0;bottom: 0">删除</button>
                                     </div>
                                 </div>
@@ -193,16 +203,26 @@
                                         <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="font-weight-bold">
+                                            <span v-if="processContent.sign_commodity_name_mark">@{{ processContent.sign_commodity_name_mark }}</span>
+                                            <span v-else>@{{ processContent.commodity_name }}</span>
+                                        </span>
                                         <span class="ml-2 text-muted">SKU：</span>
-                                        <span class=" text-muted">@{{ processContent.commodity_sku }}</span>
+                                        <span class=" text-muted">
+                                            <span v-if="processContent.sign_commodity_sku_mark">@{{ processContent.sign_commodity_sku_mark }}</span>
+                                            <span v-else>@{{ processContent.commodity_sku }}</span>
+                                        </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>
+                                            <span v-if="processContent.sign_commodity_barcode_mark">@{{ processContent.sign_commodity_barcode_mark }}</span>
+                                            <span v-else>
+                                                <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>
+                                        </span>
                                         <button v-if="is_delBtn[processContent.wms_code+'_'+processContent.commodity_id+'_'+true]" @click="deleteProcessContent(processContent.wms_code,processContent.commodity_id,true,processContent.amount)" class="btn btn-sm btn-danger" style="position: absolute;right: 0;bottom: 0">删除</button>
                                     </div>
                                 </div>
@@ -286,7 +306,10 @@
                         @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}}'},
+                            addBtnShow:false,type:'{{$processesContent->type}}',
+                            sign_commodity_name_mark:'{{$processesContent->sign_commodity_name_mark}}',
+                            sign_commodity_sku_mark:'{{$processesContent->sign_commodity_sku_mark}}',
+                            sign_commodity_barcode_mark:'{{$processesContent->sign_commodity_barcode_mark}}'},
                         @endforeach
                     @endif
                 ],
@@ -309,7 +332,7 @@
             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.getTutorial(this.processContents[(this.processContents.length)-1].owner_id);
                         }

resources/views/process/index.blade.php

@@ -284,9 +284,10 @@
                             <td style="width: 210px" class="text-muted" :class="processesContent.type=='原料单'?'td-warm':'td-cool'">@{{ processesContent.wms_code }}</td>
                             <td style="width: 100px" class="text-muted" :class="processesContent.type=='原料单'?'td-warm':'td-cool'">@{{ processesContent.amount }}</td>
                             <td style="width: 180px" class="text-muted" :class="processesContent.type=='原料单'?'td-warm':'td-cool'">
-                                <ul class="p-0 m-0 list-unstyled list-inline" v-if="processesContent.commodity">
+                                <ul class="p-0 m-0 list-unstyled list-inline" v-if="processesContent.commodity && !processesContent.sign_commodity_barcode_mark">
                                     <li v-for="barcode in processesContent.commodity.barcodes"><small>@{{ barcode.code }}</small></li>
                                 </ul>
+                                <span v-if="processesContent.sign_commodity_barcode_mark">@{{ processesContent.sign_commodity_barcode_mark }}</span>
                             </td>
                             <td :title="processesContent.sign_commodity_name_mark?processesContent.sign_commodity_name_mark:processesContent.commodity_name" class="text-muted tooltipTarget" :class="processesContent.type=='原料单'?'td-warm':'td-cool'">
                                 <div style="width: 180px;overflow:hidden" :class="processesContent.bill_type=='原料单'?'td-warm':'td-cool'">@{{ processesContent.sign_commodity_name_mark?processesContent.sign_commodity_name_mark:processesContent.commodity_name }}</div></td>
@@ -308,7 +309,11 @@
                             <span>@{{ processesContent.bill_type }}</span>&nbsp;&nbsp;
                             <span>@{{ processesContent.wms_code }}</span>&nbsp;&nbsp;
                             <span>@{{ processesContent.amount }}</span>&nbsp;&nbsp;
-                            <span v-if="processesContent.commodity && processesContent.commodity.barcodes.length>0">
+                            <span v-if="processesContent.sign_commodity_barcode_mark">
+                                @{{ processesContent.sign_commodity_barcode_mark }}
+                            </span>
+                            <span v-if="!processesContent.sign_commodity_barcode_mark &&
+                            processesContent.commodity && processesContent.commodity.barcodes.length>0">
                                 @{{ processesContent.commodity.barcodes[0].code }}
                             </span>&nbsp;&nbsp;
                             <span :title="processesContent.sign_commodity_name_mark?processesContent.sign_commodity_name_mark:processesContent.commodity_name" class="text-muted tooltipTarget" style="max-width:100px;overflow:hidden;">@{{ processesContent.sign_commodity_name_mark?processesContent.sign_commodity_name_mark:processesContent.commodity_name }}</span>
@@ -456,9 +461,9 @@
 @endsection
 
 @section('lastScript')
-    <script type="text/javascript" src="{{asset('js/queryForm/export200818.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200813b.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/header200818.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/export200818a.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200818a.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/header200819.js')}}"></script>
     <script>
         let vue = new Vue({
             el:"#process",
@@ -641,7 +646,7 @@
                 processExport(checkAllSign) {
                     let url = '{{url('process/export')}}';
                     let token='{{ csrf_token() }}';
-                    //excelExport 定义在 js/queryForm/export200818.js
+                    //excelExport 定义在 js/queryForm/export200818a.js
                     excelExport(checkAllSign,this.checkData,url,this.sum,token);
                 },
                 //获取登记工时

resources/views/process/show.blade.php

@@ -66,12 +66,13 @@
                 <td>@{{ content.wms_code }}</td>
                 <td>@{{ content.amount }}</td>
                 <td>
-                    <ul class="p-0 m-0 list-unstyled list-inline" v-if="content.commodity">
+                    <span v-if="content.sign_commodity_barcode_mark">@{{ content.sign_commodity_barcode_mark }}</span>
+                    <ul class="p-0 m-0 list-unstyled list-inline" v-if="content.commodity && !content.sign_commodity_barcode_mark">
                         <li v-for="barcode in content.commodity.barcodes"><small style="white-space: normal">@{{ barcode.code }}</small></li>
                     </ul>
                 </td>
                 <td class="text-muted tooltipTarget">
-                    <div style="white-space: normal">@{{ content.sign_mark?content.sign_mark:content.commodity_name }}</div></td>
+                    <div style="white-space: normal">@{{ content.sign_commodity_name_mark?content.sign_commodity_name_mark:content.commodity_name }}</div></td>
             </tr>
         </table>
         <table class="table table-sm table-bordered table-bordered w-100" style="background-color: #ccd7dc;">
@@ -87,12 +88,13 @@
                 <td>@{{ content.wms_code }}</td>
                 <td>@{{ content.amount }}</td>
                 <td>
-                    <ul class="p-0 m-0 list-unstyled list-inline" v-if="content.commodity">
+                    <span v-if="content.sign_commodity_barcode_mark">@{{ content.sign_commodity_barcode_mark }}</span>
+                    <ul class="p-0 m-0 list-unstyled list-inline" v-if="content.commodity && !content.sign_commodity_barcode_mark">
                         <li v-for="barcode in content.commodity.barcodes"><small style="white-space: normal">@{{ barcode.code }}</small></li>
                     </ul>
                 </td>
                 <td class="text-muted tooltipTarget">
-                    <div style="white-space: normal">@{{ content.sign_mark?content.sign_mark:content.commodity_name }}</div></td>
+                    <div style="white-space: normal">@{{ content.sign_commodity_name_mark?content.sign_commodity_name_mark:content.commodity_name }}</div></td>
             </tr>
         </table>
     </div>

resources/views/rejected/search/analyze.blade.php

@@ -60,9 +60,9 @@
 @endsection
 
 @section('lastScript')
-    <script src="{{asset('js/queryForm/export200818.js')}}"></script>
+    <script src="{{asset('js/queryForm/export200818a.js')}}"></script>
     <script src="{{asset('js/queryForm/queryForm200803a.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/header200818.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/header200819.js')}}"></script>
     <script>
         let vue = new Vue({
             el:"#list",

resources/views/rejected/search/general.blade.php

@@ -175,9 +175,9 @@
         let ajaxFinishAllUrl='{{url("rejected/ajaxFinishAll")}}';
         let csrfInput='@csrf';
     </script>
-    <script src="{{asset('js/queryForm/export200818.js')}}"></script>
-    <script src="{{asset('js/queryForm/queryForm200813b.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/header200818.js')}}"></script>
+    <script src="{{asset('js/queryForm/export200818a.js')}}"></script>
+    <script src="{{asset('js/queryForm/queryForm200818a.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/header200819.js')}}"></script>
     <script>
         let vue = new Vue({
             el:"#list",
@@ -244,7 +244,7 @@
                     {name: 'sender', value: '姓名'},
                     {name: 'mobile_sender', value: '电话'},
                     {name: 'logistic_number', value: '原单单号'},
-                        @cannot('退货管理-到付费用'){name:'fee_collected',value: '到付费用'},@endcannot
+                        @cannot('退货管理-到付费用'){name:'fee_collected',value: '到付费用',neglect: true},@endcannot
                         @can('退货管理-查询-客户定义-爱奇艺'){name:'common_01',value: '寄件方省'},@endcan
                     {name:'common_02',value: '重量'},
                     {name:'goods_amount',value: '商品总数'},

resources/views/store/index.blade.php

@@ -34,7 +34,7 @@
 @endsection
 
 @section('lastScript')
-    <script type="text/javascript" src="{{asset('js/queryForm/header200818.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/header200819.js')}}"></script>
     <script>
         let vue = new Vue({
             el:'#fast',

resources/views/store/storeItem/index.blade.php

@@ -38,7 +38,7 @@
 @endsection
 
 @section('lastScript')
-    <script type="text/javascript" src="{{asset('js/queryForm/header200818.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/header200819.js')}}"></script>
     <script>
         let vue = new Vue({
             el:'#item',

resources/views/waybill/delivering.blade.php

@@ -187,7 +187,7 @@
     .color1{background-color: #FFA07A}
     .color2{background-color: cornflowerblue}
 </style>
-<script type="text/javascript" src="{{asset('js/queryForm/header200818.js')}}"></script>
+<script type="text/javascript" src="{{asset('js/queryForm/header200819.js')}}"></script>
 <script>
     new Vue({
         el:"#list",

resources/views/waybill/index.blade.php

@@ -45,7 +45,7 @@
             <label for="all" class="d-none" id="cloneCheckAll">
                 <input id="all" type="checkbox" @click="checkAll($event)">全选
             </label>
-            <table class="table table-striped table-sm table-bordered table-hover text-nowrap d-none" id="headerRoll">
+            <table class="table table-striped table-sm table-bordered table-hover text-nowrap d-none" id="headerRoll"></table>
             <table class="table table-striped table-sm table-bordered table-hover text-nowrap waybill-table" style="background: #fff;" id="headerParent">
                 <tr>
                     <th class="table-header-layer-1" colspan="4"></th>
@@ -333,9 +333,9 @@
             -webkit-animation-play-state: running;
         }
     </style>
-    <script type="text/javascript" src="{{asset('js/queryForm/export200818.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200813b.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/header200818.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/export200818a.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200818a.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/header200819.js')}}"></script>
     <script>
         let vue = new Vue({
             el:'#list',

resources/views/waybill/waybillFinancialSnapshot/index.blade.php

@@ -133,7 +133,7 @@
 @stop
 
 @section('lastScript')
-<script type="text/javascript" src="{{asset('js/queryForm/header200818.js')}}"></script>
+<script type="text/javascript" src="{{asset('js/queryForm/header200819.js')}}"></script>
 <script>
     let vue = new Vue({
         el:'#editingPanel',

resources/views/weight/package/index.blade.php

@@ -57,9 +57,9 @@
 @endsection
 
 @section('lastScript')
-    <script type="text/javascript" src="{{asset('js/queryForm/export200818.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200813b.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/header200818.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/export200818a.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200818a.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/header200819.js')}}"></script>
     <script>
             @if(isset($request))
         let request={!! json_encode($request) !!};

resources/views/weight/weightExcepted/index.blade.php

@@ -86,7 +86,7 @@
 @endsection
 
 @section('lastScript')
-    <script type="text/javascript" src="{{asset('js/queryForm/header200818.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/header200819.js')}}"></script>
     <script>
         let vue = new Vue({
             el:"#list",

tests/webApi/test.http

@@ -34,6 +34,6 @@ Content-Type: application/json
 
 ###
 
-GET https://was.baoshi56.com/api/thirdPart/weixin/waybill?api_token=fb7efc3
+GET http://localhost:8090/?orderno=%testno%&codename_c_end=10
 
 ###

webpack.mix.js

@@ -19,7 +19,7 @@ mix.copy('resources/images','public/images');
 mix.copy('resources/icon/faviconc.ico','public/faviconc.ico');
 mix.js('resources/js/trix.js','public/js/trix.js');
 mix.copy('resources/sass/trix.css','public/css/trix.css');
-mix.copy('resources/js/queryForm/queryForm.js','public/js/queryForm/queryForm200813b.js');
-mix.copy('resources/js/queryForm/export.js','public/js/queryForm/export200818.js');
-mix.js('resources/js/queryForm/header.js','public/js/queryForm/header200818.js');
+mix.copy('resources/js/queryForm/queryForm.js','public/js/queryForm/queryForm200818a.js');
+mix.copy('resources/js/queryForm/export.js','public/js/queryForm/export200818a.js');
+mix.js('resources/js/queryForm/header.js','public/js/queryForm/header200819.js');