Merge branch 'zzd' of ssh://was.baoshi56.com:10022/var/git/bswas

app/Http/Controllers/DeliveryAppointmentController.php

@@ -305,7 +305,7 @@ class DeliveryAppointmentController extends Controller
                 break;
             }
         }
-        if ($index===null)$this->success([]);
+        if ($index===null)$this->success();
         DeliveryAppointmentCar::query()->whereHas("deliveryAppointment",function (Builder $query)use($index){
             $query->where("appointment_date",date("Y-m-d"))->whereIn("status",[0,2]);
         })->where(function ($query)use($index){

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

@@ -344,7 +344,7 @@
                     {name:'warehouseid',value: '仓库'},
                     {name:'edisendflag2',value: '快递获取标记'},
                     {name:'edisendtime2',value: '快递获取时间'},
-                    {type:"multi",title:"商品信息",rows:[
+                    {name:"commodity",type:"multi",title:"商品信息",rows:[
                             {value:"产品代码",col:"2"},
                             {value:"产品条码",col:"2"},
                             {value:"产品名称",col:"2"},

resources/views/process/index.blade.php

@@ -271,8 +271,31 @@
                 </td>
                 <td v-if="processOne.id" :rowspan="processOne.is_multi_row?2:''">@{{ processOne.completed_amount }}</td>
                 <td v-if="processOne.id" :rowspan="processOne.is_multi_row?2:''">@{{ processOne.created_at }}</td>
-                <td colspan="5" style="margin:0;padding:0;position: relative">
-                    <table class="table table-sm table-striped" style="margin:0;padding:0;" v-if="processUnfold[processOne.code+processOne.id] || processOne.processesContents.length==1 ||
+                <td colspan="5" style="margin:0;padding:0;position: relative;min-width: 900px">
+                    <div class="w-100" v-if="processUnfold[processOne.code+processOne.id] || processOne.processesContents.length==1 ||
+                    (processOne.is_multi_row &&  (processOne.processesContents.length)-(processFullSum[processOne.code])==1) || (!processOne.id &&  processFullSum[processOne.code]==1)">
+                        <div class="row" v-for="processesContent in processOne.processesContents"
+                             v-if="processOne.is_multi_row || !processOne.id ? !processOne.id  ? processesContent.type=='成品单' :processesContent.type=='原料单' : true">
+                            <div class="col-2">@{{ processesContent.bill_type }} <span style="opacity: 0.75">(@{{ processesContent.type }})</span></div>
+                            <div class="col-2">@{{ processesContent.wms_code }}</div>
+                            <div class="col-2">@{{ processesContent.amount }}</div>
+                            <div class="col-3">
+                                <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>
+                            </div>
+                            <div :title="processesContent.sign_commodity_name_mark?processesContent.sign_commodity_name_mark:processesContent.commodity_name" class="text-muted tooltipTarget col-3">
+                                <div style="white-space: normal">@{{ processesContent.sign_commodity_name_mark?processesContent.sign_commodity_name_mark:processesContent.commodity_name }}</div>
+                            </div>
+                        </div>
+                        <div class="row">
+                            <div class="text-center col-12 cursor-pointer">
+                                <b v-if="processUnfold[processOne.code+processOne.id]=='原料单'" @click="close(processOne.code,processOne.id)">点击关闭原料单</b>
+                                <b v-if="processUnfold[processOne.code+processOne.id]=='成品单'" @click="close(processOne.code,processOne.id)">点击关闭成品单</b></div>
+                        </div>
+                    </div>
+                    {{--<table class="table table-sm table-striped" style="margin:0;padding:0;" v-if="processUnfold[processOne.code+processOne.id] || processOne.processesContents.length==1 ||
                     (processOne.is_multi_row &&  (processOne.processesContents.length)-(processFullSum[processOne.code])==1) || (!processOne.id &&  processFullSum[processOne.code]==1)">
                         <tr v-for="processesContent in processOne.processesContents"
                             v-if="processOne.is_multi_row || !processOne.id ? !processOne.id  ? processesContent.type=='成品单' :processesContent.type=='原料单' : true">
@@ -295,7 +318,7 @@
                                    <b v-if="processUnfold[processOne.code+processOne.id]=='成品单'" style="cursor:pointer;" @click="close(processOne.code,processOne.id)">点击关闭成品单</b></div>
                            </td>
                         </tr>
-                    </table>
+                    </table>--}}
                     <div v-else :style="[{background: (!processOne.id || processOne.is_multi_row)  ? (!processOne.id) ? '#e8eef6' :'rgb(246, 238, 232)' : (processOne.processesContents.length>0 ? ((processOne.processesContents[0].type=='成品单') ? '#e8eef6' : 'rgb(246, 238, 232)') :'')}
                     ,{'-webkit-transform':'scale('+(1/Math.ceil(arrayFilter(processOne.processesContents,processOne).length/2))+')'},{height: (35*Math.ceil(arrayFilter(processOne.processesContents,processOne).length/2))+'px'}
                     ,{width: (100*Math.ceil(arrayFilter(processOne.processesContents,processOne).length/2))+'%'},{'margin-left': (-100*((Math.ceil(arrayFilter(processOne.processesContents,processOne).length/2))-1)/2)+'%'}
@@ -533,7 +556,6 @@
                     condition: data,
                 });
                 this.form.init();
-                let _this = this;
                 let column = [
                     {name:'index',value: '序号', neglect: true},
                     {name:'operation',value: '操作', neglect: true},
@@ -547,11 +569,13 @@
                     {name: 'unit_price', value: '单价'},
                     {name: 'completed_amount', value: '完成数量'},
                     {name: 'created_at', value: '提交日期'},
-                    {name:'bill_type',value: '单据类型', neglect: true, style: 'min-width:200px;'},
-                    {name:'wms_code',value: '单据号', neglect: true, style: 'min-width:200px;'},
-                    {name:'count',value: '本单数量', neglect: true, style: 'min-width:200px;'},
-                    {name:'commodity_barcode',value: '商品条码', neglect: true, style: 'min-width:200px;'},
-                    {name:'commodity_name',value: '商品名称', neglect: true, style: 'min-width:200px;'},
+                    {name:"items",type:"multi",title:"单据信息",rows:[
+                            {value:"单据类型",col:"2"},
+                            {value:"单据号",col:"2"},
+                            {value:"本单数量",col:"2"},
+                            {value:"商品条码",col:"3"},
+                            {value:"商品名称",col:"3"},
+                        ]},
                     {name:'remark', value: '加工备注'},
                     {name:'balance_remark', value: '结算备注'},
                     {name:'remove',value: '', neglect: true},

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

@@ -79,28 +79,24 @@
                         @can('退货管理-查询-客户定义-爱奇艺')<td class="text-muted">@{{rejectedBill.common_01}}</td>@endcan
                         <td class="text-muted">@{{rejectedBill.common_02}}</td>
                         <td class="text-muted">@{{rejectedBill.goods_amount}}</td>
-                        <td colspan="8">
-                            <div class="text-center" v-if="rejectedBill.detailFolding && rejectedBill.items.length>1">
-                                <a href="javascript:;" @click="rejectedBill.detailFolding=false">@{{rejectedBill.goods_amount}}件商品，点击展开明细</a></div>
-                            <table class="table table-sm" v-else>
-                                <tr v-for="item in rejectedBill.items">
-                                    <td style="width: 140px">@{{item.barcode_goods}}</td>
-                                    <td style="width: 140px">@{{item.name_goods}}</td>
-                                    <td style="width: 30px">@{{item.amount}}</td>
-                                    <td class="text-muted">@{{item.quality_label}}</td>
-                                    <td class="text-muted">@{{item.batch_number}}</td>
-                                    <td class="text-muted">@{{item.made_at}}</td>
-                                    <td class="text-muted">@{{item.validity_at}}</td>
-                                    <td class="text-muted">@{{item.remark}}</td>
-                                </tr>
-                                <tr v-if="!rejectedBill.detailFolding && rejectedBill.items.length>1">
-                                    <td colspan="8" class="text-center">
-                                        <a href="javascript:;" @click="rejectedBill.detailFolding=true">点击收起明细</a>
-                                    </td>
-                                </tr>
-                            </table>
+                        <td colspan="8" style="min-width: 800px">
+                            <div class="w-100" :class="rejectedBill.items.length>1 ? 'up' : ''" :id="'rejected-'+rejectedBill.id">
+                                <div class="row" v-for="item in rejectedBill.items">
+                                    <div class="col-2">@{{item.barcode_goods}}</div>
+                                    <div class="col-2">@{{item.name_goods}}</div>
+                                    <div class="col-1">@{{item.amount}}</div>
+                                    <div class="col-1">@{{item.quality_label}}</div>
+                                    <div class="col-2">@{{item.batch_number}}</div>
+                                    <div class="col-1">@{{item.made_at}}</div>
+                                    <div class="col-1">@{{item.validity_at}}</div>
+                                    <div class="col-2">@{{item.remark}}</div>
+                                </div>
+                            </div>
+                            <div class="text-center cursor-pointer" v-if="rejectedBill.items.length>1" @click="unfold(rejectedBill.id)">
+                                <div v-if="upList[rejectedBill.id]">点击收起明细</div>
+                                <div v-else>@{{rejectedBill.goods_amount}}件商品，点击展开明细</div>
+                            </div>
                         </td>
-                        {{--                        <td class="text-muted" style="max-width: 190px">@{{rejectedBill.remark}}</td>--}}
                         <td style="min-width:150px;">
                             @can('退货管理-编辑备注')
                                 <textarea class="form-control form-control-sm"   :rows="rejectedBill.remark?Math.ceil(rejectedBill.remark.length/8):2"  cols=8
@@ -137,9 +133,6 @@
 @section('lastScript')
     <script>
         let rejectedBills={!! $rejectedBills->toJson()!!}.data;
-        rejectedBills.forEach(function(rejectedBill){
-            rejectedBill.detailFolding=true;
-        })
         let owners=[
                 @foreach($owners as $owner)
             {id:'{{$owner->id}}',name:'{{$owner->name}}'},
@@ -190,9 +183,11 @@
                     {name:'{{$qualityLabel->id}}',value:'{{$qualityLabel->name}}'},
                     @endforeach
                 ],
-                selectTr:''
+                selectTr:'',
+                upList:{},
             },
             mounted:function(){
+                $(".up").slideUp();
                 $(".tooltipTarget").tooltip({'trigger':'hover'});
                 $('#list').removeClass('d-none');
                 let data=[
@@ -239,17 +234,19 @@
                         @can('退货管理-查询-客户定义-爱奇艺'){name:'common_01',value: '寄件方省'},@endcan
                     {name:'common_02',value: '重量'},
                     {name:'goods_amount',value: '商品总数'},
-                    {name:'item_barcode_goods',value: '商品条码', neglect: true},
-                    {name: 'item_name_goods', value: '商品名称', neglect: true},
-                    {name: 'item_amount', value: '数量', neglect: true},
-                    {name:'item_quality_label',value: '是否正品', neglect: true},
-                    {name:'item_batch_number',value: '批次号', neglect: true},
-                    {name:'item_made_at',value: '生产日期', neglect: true},
-                    {name:'item_validity_at',value: '效期', neglect: true},
-                    {name:'item_remark',value: '备注', neglect: true},
+                    {name:"goods",type:"multi",title:"商品信息",rows:[
+                            {value:"商品条码",col:"2"},
+                            {value:"商品名称",col:"2"},
+                            {value:"数量",col:"1"},
+                            {value:"质量",col:"1"},
+                            {value:"批次号",col:"2"},
+                            {value:"产期",col:"1"},
+                            {value:"效期",col:"1"},
+                            {value:"备注",col:"2"},
+                        ]},
                     {name:'remark',value: '退单备注'},
                     {name:'operator_name',value: '录入人'},
-                        @can('退货管理-编辑','退货管理-删除'){name:'remove',value: '操作', neglect: true},@endcan
+                    @can('退货管理-编辑','退货管理-删除'){name:'remove',value: '操作', neglect: true},@endcan
                 ];
                 new Header({
                     el: "table",
@@ -260,6 +257,10 @@
                 }).init();
             },
             methods:{
+                unfold(id){
+                    this.$set(this.upList,id,this.upList[id] ? !this.upList[id] : true);
+                    $("#rejected-"+id).slideToggle();
+                },
                 selectTableRow(id,e){
                     $('#headerParent tr[class=focusing]').removeClass('focusing');
                     if (id === this.selectTr) {

resources/views/store/deliveryAppointment/exhibition.blade.php

@@ -167,7 +167,6 @@
                 notReached : 0,
                 work : 0,
             },
-            success : 0,
         },
         mounted(){
             $("#container").removeClass("d-none");
@@ -233,12 +232,13 @@
                         }
                     });
                 },1800000);*/
-                this.success++;
+                this.count.success++;
             },
             //初始化数据
             _initData(){
                 let url = "{{url('store/deliveryAppointment/getExhibitionList')}}";
                 window.tempTip.postBasicRequest(url,{},res=>{
+                    if (!res)return;
                     if (res.list){
                         /*let data = res.list;
                         data.forEach((item,i)=>{
@@ -269,7 +269,7 @@
             },
             /*//获取密匙
             _getKey(){
-                let url = "{{url('store/deliveryAppointment/getKey')}}";
+                let url = "{{--{{url('store/deliveryAppointment/getKey')}}--}}";
                 window.tempTip.postBasicRequest(url,{},res=>{
                     this.key = res;
                     this._createQrCode(this.baseUrl+this.base64());