二次加工管理-多单重叠

app/Http/Controllers/ProcessController.php

@@ -687,7 +687,7 @@ class ProcessController extends Controller
             case '驳回':
                 $process->status='待接单';break;
             case '加工中':
-                $process->status='待加工';break;
+                $process->status='待接单';break;
             case '待验收':
                 $process->status='加工中';break;
         }

resources/views/process/index.blade.php

@@ -308,9 +308,9 @@
                         (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">
-                                <td style="width: 180px" class="text-muted" :class="processesContent.type=='原料单'?'td-warm':'td-cool'">@{{ processesContent.bill_type }}</td>
-                                <td style="width: 180px" class="text-muted" :class="processesContent.type=='原料单'?'td-warm':'td-cool'">@{{ processesContent.wms_code }}</td>
-                                <td style="width: 180px" class="text-muted" :class="processesContent.type=='原料单'?'td-warm':'td-cool'">@{{ processesContent.amount }}</td>
+                                <td style="width: 190px" class="text-muted" :class="processesContent.type=='原料单'?'td-warm':'td-cool'">@{{ processesContent.bill_type }}</td>
+                                <td style="width: 190px" class="text-muted" :class="processesContent.type=='原料单'?'td-warm':'td-cool'">@{{ processesContent.wms_code }}</td>
+                                <td style="width: 200px" 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">
                                         <li v-for="barcode in processesContent.commodity.barcodes"><small>@{{ barcode.code }}</small></li>
@@ -322,12 +322,26 @@
                             <tr v-if="processUnfold[processOne.code+processOne.id]">
                                <td colspan="5">
                                    <div class="text-center">
-                                       <b v-if="processUnfold[processOne.code+processOne.id]=='原料单'" style="cursor:pointer;color: #4aa0e6;text-decoration:underline" @click="close(processOne.code,processOne.id)">点击关闭原料单</b>
-                                       <b v-if="processUnfold[processOne.code+processOne.id]=='成品单'" style="cursor:pointer;color: #4aa0e6;text-decoration:underline" @click="close(processOne.code,processOne.id)">点击关闭成品单</b></div>
+                                       <b v-if="processUnfold[processOne.code+processOne.id]=='原料单'" style="cursor:pointer;color: #aaaaaa;text-decoration:underline" @click="close(processOne.code,processOne.id)">点击关闭原料单</b>
+                                       <b v-if="processUnfold[processOne.code+processOne.id]=='成品单'" style="cursor:pointer;color: #aaaaaa;text-decoration:underline" @click="close(processOne.code,processOne.id)">点击关闭成品单</b></div>
                                </td>
                             </tr>
                         </table>
-                        <div v-if="!processUnfold[processOne.code+processOne.id] && processOne.processesContents.length>1" class="text-center">
+                        <div v-else  style="position: relative">
+                            <div v-for="(processesContent,i) in arrayFilter(processOne.processesContents,processOne)" class="w-100 row ml-1" style="position: absolute;" :style="[{ 'margin-top' :  i*2+'px'},{opacity:1/arrayFilter(processOne.processesContents,processOne).length},{background: !processOne.id ? '#e8eef6' :'rgb(246, 238, 232)'}]"
+                               {{--v-if="processOne.is_multi_row || !processOne.id ? !processOne.id  ? processesContent.type=='成品单' :processesContent.type=='原料单' : true"--}}>
+                                <span style="width: 19%">@{{ processesContent.bill_type }}</span>
+                                <span style="width: 19.5%">@{{ processesContent.wms_code }}</span>
+                                <span style="width: 20%">@{{ processesContent.amount }}</span>
+                                <span style="width: 18%">
+                                    <ul class="p-0 m-0 list-unstyled list-inline" v-if="processesContent.commodity">
+                                        <li v-for="barcode in processesContent.commodity.barcodes"><small>@{{ barcode.code }}</small></li>
+                                    </ul>
+                                </span>
+                                <span :title="processesContent.commodity_name" class="text-muted tooltipTarget" style="width:23.5%;overflow:hidden">@{{ processesContent.commodity_name }}</span>
+                            </div>
+                        </div>
+                        <div v-if="!processUnfold[processOne.code+processOne.id] && processOne.processesContents.length>1" class="text-center mt-4">
                         <b v-if="processFullSum[processOne.code]!=processOne.processesContents.length && (processOne.processesContents.length)-(processFullSum[processOne.code])!=1 && ((processOne.is_multi_row || !processOne.id) ? (!processOne.id  ? false :true) : true)" style="cursor:pointer;color: #4aa0e6;text-decoration:underline" @click="unfold(processOne.code,processOne.id,'原料单')">点击展开原料单</b>
                         <b v-if="processFullSum[processOne.code] && processFullSum[processOne.code]>1 && ((processOne.is_multi_row || !processOne.id) ? (!processOne.id  ? true :false) : true)" style="cursor:pointer;color: #4aa0e6;text-decoration:underline" @click="unfold(processOne.code,processOne.id,'成品单')">点击展开成品单</b></div>
                     </td>
@@ -507,6 +521,17 @@
                 $('#process').removeClass('d-none');
             },
             methods:{
+                arrayFilter:function(processesContents,process){
+                    if (!process.is_multi_row && process.id) return processesContents;
+                    let array=[];
+                    let type='成品单';
+                    if (process.id) type='原料单';
+                    processesContents.forEach(function (processesContent) {
+                        if (processesContent.type===type)array.push(processesContent);
+                    });
+                    return  array;
+
+                },
                 //重组数据
                 resetProcessData:function(){
                     let _this=this;