采购-修改浏览器警告，调整采购单状态显示

database/migrations/2021_03_23_140544_add_configurations_data.php

@@ -16,9 +16,9 @@ class AddConfigurationsData extends Migration
     {
         $time=\Illuminate\Support\Carbon::now()->toDateTimeString();
         $configurations = [];
-        $conf_one=['name'=>'价格系数','description'=>'采购管理价格系数','operator'=>Auth::user()['id'],'created_at'=>$time,'updated_at'=>$time];
-        $conf_two=['name'=>'询价延时时间','description'=>'报价需在询价发起延时时间之内有效','operator'=>Auth::user()['id'],'created_at'=>$time,'updated_at'=>$time];
-        $conf_three=['name'=>'接单延时时间','description'=>'接单需在询价发起延时时间之内有效','operator'=>Auth::user()['id'],'created_at'=>$time,'updated_at'=>$time];
+        $conf_one=['name'=>'价格系数','value'=>1.3,'description'=>'采购管理价格系数','operator'=>Auth::user()['id'],'created_at'=>$time,'updated_at'=>$time];
+        $conf_two=['name'=>'询价延时时间','value'=>4,'description'=>'报价需在询价发起延时时间之内有效','operator'=>Auth::user()['id'],'created_at'=>$time,'updated_at'=>$time];
+        $conf_three=['name'=>'接单延时时间','value'=>24,'description'=>'接单需在询价发起延时时间之内有效','operator'=>Auth::user()['id'],'created_at'=>$time,'updated_at'=>$time];
         $configurations[]=$conf_one;
         $configurations[]=$conf_two;
         $configurations[]=$conf_three;

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

@@ -24,17 +24,17 @@
                     </div>
                     @can('订单管理-批量备注')<button @click="modal()" type="button" class="btn btn-sm ml-2 btn-outline-primary">批量备注追加</button>@endcan
                     @can('订单管理-编辑')
-                        <span class="btn btn-sm tooltipTarget ml-1 btn-outline-dark"  @click="freezeAll" style="cursor: pointer" title="订单的冻结条件要只局限在“创建订单”,“分配完成”,“拣货完成”,“播种完成”"
-                              :class="[checkData.length>0?'btn-dark text-light':'']" >冻结</span>
+                        <span class="btn btn-sm tooltipTarget ml-1"  @click="freezeAll" style="cursor: pointer" title="订单的冻结条件要只局限在“创建订单”,“分配完成”,“拣货完成”,“播种完成”"
+                              :class="[checkData.length>0?'btn-dark':'btn-outline-dark']" >冻结</span>
                         <button type="button" @click="thaw(checkData,true)" class="btn btn-sm tooltipTarget ml-1" title="解除已冻结订单"
                                 :class="[checkData.length>0?'btn-danger':'btn-outline-danger']" style="opacity: 0.7">解冻</button>
                         <span class="btn btn-sm tooltipTarget ml-1" @click="deAllocationAll" style="cursor: pointer"  title="订单的取消分配条件要只局限在“分配完成”或“部分分配”"
                               :class="[checkData.length>0?'btn-dark':'btn-outline-dark'] ">取消分配</span>
-                        <button type="button" @click="resetLogisticsGetMark()" class="btn btn-sm ml-1 btn-outline-secondary" style="background: #d7e8df;"
-                                :class="[checkData.length>0?'btn-dark text-black':''] ">重置快递获取标记</button>
+                        <button type="button" @click="resetLogisticsGetMark()" class="btn btn-sm ml-1 btn-outline-success"
+                                :class="[checkData.length>0?'btn-success text-light':''] ">重置快递获取标记</button>
                     @endcan
                     @can('订单管理-订单-生成问题件')<button  @click="orderIssueTag()" type="button" class="btn btn-sm ml-1 btn-outline-primary "
-                                                 :class="[checkData.length>0?'btn-dark':'btn-outline-primary']">标记问题件</button>@endcan
+                                                 :class="[checkData.length>0?'btn-primary text-light':'']">标记问题件</button>@endcan
                     @can('订单管理-订单-生成退货单')
                         <button class="btn btn-sm ml-1" :class="[checkData.length>0?'btn-danger':'btn-outline-danger']" @click="isRejectedBillExist()"
                             style="opacity: 0.7">生成退货单</button>

resources/views/procurement/procurement/_addProcurement.blade.php

@@ -15,7 +15,7 @@
                             <select id="owner_id" name="owner_id" class="form-control col-4" :class="errors.owner_id ? 'is-invalid' : ''" v-model="owner_id" @change="selectOwner" required>
                                 <option v-for="owner in owners" :value="owner.name">@{{owner.value}}</option>
                             </select>
-                            <input type="text" class="form-control-sm ml-2" placeholder="输入关键字定位项目" @input="owner_seek">
+                            <input id="owner_name" type="text" class="form-control-sm ml-2" placeholder="输入关键字定位项目" @input="owner_seek($event)" autocomplete="off">
                             <span class="invalid-feedback" role="alert" v-if="errors.owner_id">
                                 <strong>@{{ errors.owner_id[0] }}</strong>
                             </span>
@@ -24,7 +24,7 @@
                     <div class="form-group row">
                         <label for="customer_name" class="col-2 col-form-label text-right">客户名称</label>
                         <div class="col-8">
-                            <input type="text" class="form-control " name="customer_name" autocomplete="off" value="{{ old('customer_name') }}" v-model="customer_name" readonly>
+                           <input  id="customer_name" type="text" class="form-control " name="customer_name" autocomplete="off" value="{{ old('customer_name') }}" v-model="customer_name" readonly>
                         </div>
                     </div>
                     <div class="form-group row">
@@ -41,65 +41,67 @@
                     <div class="form-group row">
                         <label for="name" class="col-2 col-form-label text-right">耗材名称</label>
                         <div class="col-8">
-                            <input type="text" class="form-control " name="material_name" autocomplete="off" value="{{ old('material_name') }}" v-model="material_name" readonly>
+                           <input id="name" type="text" class="form-control " name="material_name" autocomplete="off" value="{{ old('material_name') }}" v-model="material_name" readonly>
                         </div>
                     </div>
                     <div class="form-group row">
-                        <label for="name" class="col-2 col-form-label text-right">尺寸大小</label>
+                        <label for="size" class="col-2 col-form-label text-right">尺寸大小</label>
                         <div class="col-8">
-                            <input type="text" class="form-control " name="size" autocomplete="off" value="{{ old('size') }}" v-model="size" readonly>
+                            <input id="size" type="text" class="form-control " name="size" autocomplete="off" value="{{ old('size') }}" v-model="size" readonly>
                         </div>
                     </div>
                     <div class="form-group row">
-                        <label for="name" class="col-2 col-form-label text-right">特殊要求</label>
+                        <label for="special" class="col-2 col-form-label text-right">特殊要求</label>
                         <div class="col-8">
-                            <input type="text" class="form-control " name="special" autocomplete="off" value="{{ old('special') }}" v-model="special" readonly>
+                            <input id="special" type="text" class="form-control " name="special" autocomplete="off" value="{{ old('special') }}" v-model="special" readonly>
                         </div>
                     </div>
                     <div class="form-group row">
-                        <label for="name" class="col-2 col-form-label text-right">材质规格</label>
+                        <label for="specification" class="col-2 col-form-label text-right">材质规格</label>
                         <div class="col-8">
-                            <textarea type="text" class="form-control" name="specification" autocomplete="off" value="{{ old('specification') }}" readonly>@{{ specification }}</textarea>
+                            <textarea id="specification" type="text" class="form-control" name="specification" autocomplete="off" value="{{ old('specification') }}" readonly>@{{ specification }}</textarea>
                         </div>
                     </div>
-                    <div class="form-group row">
+                    <div class="form-group row" v-if="is_procurement==='procurement'">
                         <label for="quantity" class="col-2 col-form-label text-right">采购数量</label>
                         <div class="col-8">
-                            <input type="text" class="form-control" v-model="quantity" :class="errors.quantity ? 'is-invalid' : ''"  name="quantity" autocomplete="off" value="{{ old('quantity') }}" required>
+                            <input id="quantity" type="text" class="form-control" v-model="quantity" :class="errors.quantity ? 'is-invalid' : ''"  name="quantity" autocomplete="off" value="{{ old('quantity') }}" required>
                             <span class="invalid-feedback" role="alert" v-if="errors.quantity">
                                 <strong>@{{ errors.quantity[0] }}</strong>
                             </span>
                         </div>
                     </div>
-                    <div class="form-group row">
+                    <div class="form-group row" v-if="is_procurement==='procurement'">
                         <label for="amount" class="col-2 col-form-label text-right">销售数量</label>
                         <div class="col-8">
-                            <input type="text" class="form-control" name="amount" :class="errors.amount ? 'is-invalid' : ''" autocomplete="off" value="{{ old('amount') }}" @input="countTotalPrice" v-model="amount" required>
+                            <input id="amount" type="text" class="form-control" name="amount" :class="errors.amount ? 'is-invalid' : ''" autocomplete="off" value="{{ old('amount') }}" @input="countTotalPrice" v-model="amount" required>
                             <span class="invalid-feedback" role="alert" v-if="errors.amount">
                                 <strong>@{{ errors.amount[0] }}</strong>
                             </span>
                         </div>
                     </div>
-                    <div class="form-group row">
+                    <div class="form-group row" v-if="is_procurement==='procurement'">
                         <label for="unit_price" class="col-2 col-form-label text-right">销售单价</label>
                         <div class="col-8">
-                            <input type="text" class="form-control" name="unit_price" :class="errors.unit_price ? 'is-invalid' : ''" autocomplete="off" value="{{ old('unit_price') }}" @input="countTotalPrice" v-model="unit_price" required>
+                            <input id="unit_price" type="text" class="form-control" name="unit_price" :class="errors.unit_price ? 'is-invalid' : ''" autocomplete="off" value="{{ old('unit_price') }}" @input="countTotalPrice" v-model="unit_price" required>
                             <span class="invalid-feedback" role="alert" v-if="errors.unit_price">
                                 <strong>@{{ errors.unit_price[0] }}</strong>
                             </span>
                         </div>
                     </div>
-                    <div class="form-group row">
+                    <div class="form-group row" v-if="is_procurement==='procurement'">
                         <label for="total_price" class="col-2 col-form-label text-right">销售总价</label>
                         <div class="col-8">
-                            <input type="text" class="form-control" name="total_price" autocomplete="off" value="{{ old('total_price') }}" v-model="total_price" readonly>
+                            <input id="total_price" type="text" class="form-control" name="total_price" autocomplete="off" value="{{ old('total_price') }}" v-model="total_price" readonly>
                         </div>
                     </div>
                 </form>
             </div>
             <div class="modal-footer">
                 <button type="button" class="btn btn-secondary"  data-dismiss="modal" >关闭</button>
-                <button type="button" class="btn btn-primary" @click="createProcurement">提交</button>
+                <button v-if="is_procurement==='procurement'" type="button" class="btn btn-primary" @click="createProcurement">提交</button>
+                <button v-if="is_procurement==='enquiry'" type="button" class="btn btn-primary" @click="createEnquiry">提交</button>
+                <button v-if="is_procurement==='proof'" type="button" class="btn btn-primary" @click="createProof">提交</button>
             </div>
         </div>
     </div>

resources/views/procurement/procurement/index.blade.php

@@ -52,16 +52,10 @@
         </div>
         </span>
             <span class="btn btn-sm btn-outline-info ml-2" @click="addProcurement">新增采购</span>
-            @can('采购管理-采购-新建')
-                @include('procurement.procurement._addProcurement')
-            @endcan
             <span class="btn btn-sm btn-outline-success ml-2" @click="addEnquiry">新增询价</span>
-            @can('采购管理-采购-新建')
-                @include('procurement.procurement._addEnquiry')
-            @endcan
             <span class="btn btn-sm btn-outline-danger ml-2" @click="addProof">新增打样</span>
             @can('采购管理-采购-新建')
-                @include('procurement.procurement._addProof')
+                @include('procurement.procurement._addProcurement')
             @endcan
             @can('采购管理-采购-编辑')
                 @include('procurement.procurement._addQuantity')
@@ -102,16 +96,20 @@
                 <td><span>@{{ procurement.unit_price }}</span></td>
                 <td><span v-if="procurement.deliver_amount">@{{ procurement.deliver_amount }}</span></td>
                 <td><span>@{{ procurement.quantity*procurement.unit_price }}</span></td>
-                <td><span>@{{ procurement_status[procurement.status] }}</span></td>
+                <td>
+                    <span :class="[procurement.status==10?'text-danger font-weight-bold':procurement.status==9?'text-success font-weight-bold':'']"  >@{{ procurement_status[procurement.status] }}</span>
+                </td>
                 <td><span v-if="procurement.owner_material.owner.customer">@{{ procurement.owner_material.owner.customer.phone }}</span></td>
                 <td>
+                    <div class="align-center text-center" >
                     <span v-if="procurement_status[procurement.status]!='订单取消'">
                         <span class="btn btn-sm btn-outline-danger" v-if="!procurement.supplier_id"
                               @click="cancel(procurement.id,procurement.type,procurement.code)">取消</span>
-                        <span class="btn btn-sm btn-outline-success" v-if="procurement_type[procurement.type]=='询价单'
-                        /*|| (procurement_type[procurement.type]=='采购单'*/ && !procurement.cost_price"
+                        <span class="btn btn-sm btn-outline-success" v-if="procurement_type[procurement.type]=='询价单' && !procurement.cost_price"
                               @click="initiateProcurement(procurement)">发起采购</span>
                     </span>
+                        <span v-else>-</span>
+                    </div>
                 </td>
             </tr>
         </table>
@@ -157,11 +155,12 @@
                     },
                     @endforeach
                 ],
+                is_procurement:'',
                 procurement_type:{!! json_encode(\App\Procurement::type,JSON_UNESCAPED_UNICODE) !!},
                 procurement_status:{!! json_encode(\App\Procurement::status,JSON_UNESCAPED_UNICODE) !!},
                 checkData: [],
                 sum:{!! $procurements->total() !!},
-                owner_id: '',
+                owner_id:'{{old('owner_id')}}',
                 owner_material_id: '{{old('owner_material_id')}}',
                 material_name: '{{old('material_name')}}',
                 customer_name: '{{old('customer_name')}}',
@@ -257,15 +256,21 @@
                 },
                 addProcurement() {
                     this.errors = {};
+                    this.is_procurement='procurement';
                     $('#add-procurement').modal('show');
+                    $('#owner_name').val('');
                 },
                 addEnquiry() {
                     this.errors = {};
-                    $('#add-enquiry').modal('show');
+                    this.is_procurement='enquiry';
+                    $('#add-procurement').modal('show');
+                    $('#owner_name').val('');
                 },
                 addProof() {
                     this.errors = {};
-                    $('#add-proof').modal('show');
+                    this.is_procurement='proof';
+                    $('#add-procurement').modal('show');
+                    $('#owner_name').val('');
                 },
                 initiateProcurement(procurement) {
                     let _this=this;
@@ -363,7 +368,7 @@
                             _this.errors = res.data.errors;
                         } else {
                             _this.procurements.push(res.data.data);
-                            $("#add-enquiry").modal('hide');
+                            $("#add-procurement").modal('hide');
                             _this.clearData();
                             tempTip.setDuration(3000);
                             tempTip.showSuccess('新增询价单成功！');
@@ -383,7 +388,7 @@
                             _this.errors = res.data.errors;
                         } else {
                             _this.procurements.push(res.data.data);
-                            $("#add-proof").modal('hide');
+                            $("#add-procurement").modal('hide');
                             _this.clearData();
                             tempTip.setDuration(3000);
                             tempTip.showSuccess('新增打样单成功！');

resources/views/procurement/procurement/menu.blade.php

@@ -10,7 +10,7 @@
                     </li> @endcan
                 @can('采购管理-采购-新建')
                     <li class="nav-item">
-                        <a  class="nav-link" href="{{url('procurement/procurement/create')}}" :class="{active:isActive('create',3)}">新建</a>
+                        <a  class="nav-link" href="{{url('procurement/procurement/create')}}" :class="{active:isActive('create',3)}">新建采购单</a>
                     </li> @endcan
             </ul>
         </div>