Merge branch 'zzd'

resources/views/process/index.blade.php

@@ -232,7 +232,8 @@
                         </label>
                     </th>
                     <th>序号</th>
-                    <th >操作</th>
+                    <th>操作</th>
+                    <th>状态</th>
                     <th>任务号</th>
                     <th>经手人</th>
                     <th>货主</th>
@@ -242,7 +243,6 @@
                     <th>单价</th>
                     <th>完成数量</th>
                     <th>提交日期</th>
-                    <th>状态</th>
                     <th style="min-width: 200px">单据类型</th>
                     <th style="min-width: 200px">单据号</th>
                     <th style="min-width: 200px">本单数量</th>
@@ -258,8 +258,6 @@
                     </td>
                     <td v-if="processOne.id" class="text-muted" :rowspan="processOne.is_multi_row?2:''">@{{ processOne.serial_number }}</td>
                     <td v-if="processOne.id" style="min-width:200px;" :rowspan="processOne.is_multi_row?2:''">
-                        <span v-if="!processOne.openProcessHour && processOne.status=='已驳回'" class="text-muted">已驳回</span>
-                        <span v-if="!processOne.openProcessHour && processOne.status=='交接完成'" class="text-success font-weight-bold">交接完成</span>
                         @can("二次加工管理-审核")
                         <button v-if="!processOne.openProcessHour && (processOne.status=='待审核' || processOne.status=='已驳回')"  @mouseenter="processOne.buttonTexts.审核='审核'" @mouseleave="processOne.buttonTexts.审核='审'" class="btn btn-sm btn-outline-success" @click="audit(processOne)"><span>@{{ processOne.buttonTexts.审核 }}</span></button>@endcan
                         @can("二次加工管理-回滚")
@@ -279,6 +277,8 @@
                                     @mouseleave="processOne.buttonTexts.编辑='编'" style="opacity: 0.6">@{{processOne.buttonTexts.编辑}}</button>
                         @endcan
                     </td>
+                    <td v-if="processOne.id" :rowspan="processOne.is_multi_row?2:''"
+                        :class="processOne.status==='已驳回' ? 'text-danger' : (processOne.status==='交接完成' ? 'text-success font-weight-bold' : 'text-muted')">@{{ processOne.status }}</td>
                     <td v-if="processOne.id" class="text-muted" :rowspan="processOne.is_multi_row?2:''">
                         <button style="transform: scale(0.85);opacity: 0.8;" class="btn btn-sm btn-info" @click="show(processOne.id)" @mouseenter="processOne.buttonTexts.查看单据='查看单据'" @mouseleave="processOne.buttonTexts.查看单据='查'">@{{ processOne.buttonTexts.查看单据 }}</button>
                         @{{ processOne.code }}
@@ -332,34 +332,33 @@
                             </div>
                         </div>
                     </td>
-                <td v-if="processOne.id" class="text-muted" :rowspan="processOne.is_multi_row?2:''">
-                    @can('二次加工管理-修改价格')
-                        <div v-if="processOne.status=='交接完成'">
-                            <div v-if="processOne.signs.length<=0">
-                                <div v-if="processOne.is_update_unit_price" >
-                                    <input type="text" :value="processOne.unit_price" :id="'unit_price_'+processOne.id" class="form-control form-control-sm" style="min-width: 50px;">
-                                    <button type="button" class="btn btn-sm btn-outline-success" @click="updateUnitPrice(processOne)">确定</button>
-                                    <button type="button" class="btn btn-sm btn-outline-danger" @click="processOne.is_update_unit_price=false;">取消</button>
+                    <td v-if="processOne.id" class="text-muted" :rowspan="processOne.is_multi_row?2:''">
+                        @can('二次加工管理-修改价格')
+                            <div v-if="processOne.status=='交接完成'">
+                                <div v-if="processOne.signs.length<=0">
+                                    <div v-if="processOne.is_update_unit_price" >
+                                        <input type="text" :value="processOne.unit_price" :id="'unit_price_'+processOne.id" class="form-control form-control-sm" style="min-width: 50px;">
+                                        <button type="button" class="btn btn-sm btn-outline-success" @click="updateUnitPrice(processOne)">确定</button>
+                                        <button type="button" class="btn btn-sm btn-outline-danger" @click="processOne.is_update_unit_price=false;">取消</button>
+                                    </div>
+                                    <input readonly @click="processOne.is_update_unit_price=true;" v-else style="cursor: pointer;min-width: 50px" :value="processOne.unit_price" class="form-control form-control-sm">
                                 </div>
-                                <input readonly @click="processOne.is_update_unit_price=true;" v-else style="cursor: pointer;min-width: 50px" :value="processOne.unit_price" class="form-control form-control-sm">
-                            </div>
-                            <div v-else @mouseleave="processOne.is_update_unit_price=false;" @mouseenter="processOne.is_update_unit_price=true;">
-                                <span class="flicker" style="cursor: move">@{{ processOne.unit_price }}</span>
-                                <div v-if="processOne.is_update_unit_price" style="position: absolute;width: 150px;background-color: white;white-space: normal;margin-left: -50px"
-                                     @mouseleave="processOne.is_update_unit_price=false;" @mouseenter="processOne.is_update_unit_price=true;">
-                                    <p class="text-center text-dark font-weight-bold">待确认</p>
-                                    @can('二次加工管理-组长确认')<button v-if="!signs[processOne.code]['二次加工组确认']" class="btn btn-sm btn-outline-success" @click="verify(processOne,'workGroup')">组长确认</button>@endcan
-                                    @can('二次加工管理-财务确认')<button v-if="!signs[processOne.code]['财务确认']" class="btn btn-sm btn-outline-success" @click="verify(processOne,'accountant')">财务确认</button>@endcan
+                                <div v-else @mouseleave="processOne.is_update_unit_price=false;" @mouseenter="processOne.is_update_unit_price=true;">
+                                    <span class="flicker" style="cursor: move">@{{ processOne.unit_price }}</span>
+                                    <div v-if="processOne.is_update_unit_price" style="position: absolute;width: 150px;background-color: white;white-space: normal;margin-left: -50px"
+                                         @mouseleave="processOne.is_update_unit_price=false;" @mouseenter="processOne.is_update_unit_price=true;">
+                                        <p class="text-center text-dark font-weight-bold">待确认</p>
+                                        @can('二次加工管理-组长确认')<button v-if="!signs[processOne.code]['二次加工组确认']" class="btn btn-sm btn-outline-success" @click="verify(processOne,'workGroup')">组长确认</button>@endcan
+                                        @can('二次加工管理-财务确认')<button v-if="!signs[processOne.code]['财务确认']" class="btn btn-sm btn-outline-success" @click="verify(processOne,'accountant')">财务确认</button>@endcan
+                                    </div>
                                 </div>
                             </div>
-                        </div>
-                        <div v-else>@{{ processOne.unit_price }} </div>
-                    @endcan
-                    @cannot('二次加工管理-修改价格') @{{ processOne.unit_price }}@endcannot
-                </td>
+                            <div v-else>@{{ processOne.unit_price }} </div>
+                        @endcan
+                        @cannot('二次加工管理-修改价格') @{{ processOne.unit_price }}@endcannot
+                    </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 v-if="processOne.id" class="text-muted" :rowspan="processOne.is_multi_row?2:''">@{{ processOne.status }}</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 ||
                         (processOne.is_multi_row &&  (processOne.processesContents.length)-(processFullSum[processOne.code])==1) || (!processOne.id &&  processFullSum[processOne.code]==1)">
@@ -399,7 +398,7 @@
                                 <span :title="processesContent.sign_mark?processesContent.sign_mark:processesContent.commodity_name" class="text-muted tooltipTarget" style="max-width:100px;overflow:hidden;">@{{ processesContent.sign_mark?processesContent.sign_mark:processesContent.commodity_name }}</span>
                             </div>
                         </div>
-                        <div style="overflow: auto;zoom:1;position:absolute;margin-top: -35px;margin-left: 50%;background-color: white" v-if="!processUnfold[processOne.code+processOne.id] && processOne.processesContents.length>1 &&
+                        <div style="overflow: auto;zoom:1;position:absolute;margin-top: -35px;left:calc(50% - 50px);background-color: white" v-if="!processUnfold[processOne.code+processOne.id] && processOne.processesContents.length>1 &&
                         ((processFullSum[processOne.code]!=processOne.processesContents.length && (processOne.processesContents.length)-(processFullSum[processOne.code])!=1 && ((processOne.is_multi_row || !processOne.id) ? (!processOne.id  ? false :true) : true)) ||
                         processFullSum[processOne.code] && processFullSum[processOne.code]>1 && ((processOne.is_multi_row || !processOne.id) ? (!processOne.id  ? true :false) : true))" class="text-center">
                         <button type="button" class="btn btn-sm btn-outline-primary" 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)" @click="unfold(processOne.code,processOne.id,'原料单')">点击展开原料单</button>