采购管理新增询价，打样

app/Http/Controllers/ProcurementController.php

@@ -17,6 +17,23 @@ class ProcurementController extends Controller
 {
     use AsyncResponse;
 
+    private function newProcurement($param){
+        $procurement=new Procurement([
+            'owner_material_id'=>$param['owner_material_id'],
+            'quantity'=>$param['quantity'],
+            'amount'=>$param['amount'],
+            'unit_price'=>$param['unit_price'],
+            'initiator'=>Auth::user()['id'],
+            'type'=>0,
+        ]);
+        $procurement->save();
+        $number_id=$procurement['id'];
+        $procurement_code='BSHC';
+        $procurement_code .= date ("ymd").str_pad($number_id>99999?$number_id%99999:$number_id,4,"0",STR_PAD_LEFT);
+        $procurement->update(['code'=>$procurement_code]);
+        return $procurement;
+    }
+
     public function index(Request $request,ProcurementFilters $filters)
     {
         $this->gate('采购管理-采购-查询');
@@ -64,20 +81,55 @@ class ProcurementController extends Controller
             return ['success' => false,'message' => $e->getMessage()];
         }
     }
-    public function newProcurement($param){
-        $procurement=new Procurement([
-            'owner_material_id'=>$param['owner_material_id'],
-            'quantity'=>$param['quantity'],
-            'amount'=>$param['amount'],
-            'unit_price'=>$param['unit_price'],
-            'initiator'=>Auth::user()['id'],
-        ]);
-        $procurement->save();
-        $number_id=$procurement['id'];
-        $procurement_code='BSHC';
-        $procurement_code .= date ("ymd").str_pad($number_id>99999?$number_id%99999:$number_id,4,"0",STR_PAD_LEFT);
-        $procurement->update(['code'=>$procurement_code]);
-        return $procurement;
+    public function createEnquiry(Request $request)
+    {
+        $this->gate('采购管理-采购-新建');
+        $param=$request->all(['owner_material_id']);
+        try {
+            $procurement=new Procurement([
+                'owner_material_id'=>$param['owner_material_id'],
+                'quantity'=>0,
+                'amount'=>0,
+                'unit_price'=>0,
+                'initiator'=>Auth::user()['id'],
+                'type'=>1,
+            ]);
+            $procurement->save();
+            $number_id=$procurement['id'];
+            $procurement_code='BSHC';
+            $procurement_code .= date ("ymd").str_pad($number_id>99999?$number_id%99999:$number_id,4,"0",STR_PAD_LEFT);
+            $procurement->update(['code'=>$procurement_code]);
+            $procurement = $procurement->loadMissing(['initiator','ownerMaterial.material','ownerMaterial.owner.customer']);
+            if ($procurement) return ['success' => true,'data' => $procurement];
+            else return ['success' => false, 'message' => '添加失败'];
+        } catch (\Exception $e) {
+            return ['success' => false,'message' => $e->getMessage()];
+        }
+    }
+    public function createProof(Request $request)
+    {
+        $this->gate('采购管理-采购-新建');
+        $param=$request->all(['owner_material_id']);
+        try {
+            $procurement=new Procurement([
+                'owner_material_id'=>$param['owner_material_id'],
+                'quantity'=>1,
+                'amount'=>0,
+                'unit_price'=>0,
+                'initiator'=>Auth::user()['id'],
+                'type'=>2,
+            ]);
+            $procurement->save();
+            $number_id=$procurement['id'];
+            $procurement_code='BSHC';
+            $procurement_code .= date ("ymd").str_pad($number_id>99999?$number_id%99999:$number_id,4,"0",STR_PAD_LEFT);
+            $procurement->update(['code'=>$procurement_code]);
+            $procurement = $procurement->loadMissing(['initiator','ownerMaterial.material','ownerMaterial.owner.customer']);
+            if ($procurement) return ['success' => true,'data' => $procurement];
+            else return ['success' => false, 'message' => '添加失败'];
+        } catch (\Exception $e) {
+            return ['success' => false,'message' => $e->getMessage()];
+        }
     }
 
 

app/Procurement.php

@@ -12,15 +12,27 @@ class Procurement extends Model
     use ModelLogChanging;
     use ModelTimeFormat;
 
-    protected $fillable=[
-        'code','owner_material_id', 'supplier_id', 'quantity','amount','unit_price','cost_price','status','initiator','type'
-    ];
     const type=[
         0 => "采购单",
         1 => "询价单",
         2 => "打样单",
     ];
 
+    const status=[
+        0 => "待推单",
+        1 => "已报价",
+        2 => "生产中",
+        3 => "取消订单",
+        4 => "已完成",
+        5 => "完结",
+        6 => "下单失败",
+        7 => "待出账",
+    ];
+
+    protected $fillable=[
+        'code','owner_material_id', 'supplier_id', 'quantity','amount','unit_price','cost_price','status','initiator','type'
+    ];
+
     public  function ownerMaterial(){
         return $this->hasOne('App\OwnerMaterial','id','owner_material_id');
     }

resources/views/procurement/procurement/_addEnquiry.blade.php

@@ -1,8 +1,8 @@
-<div class="modal " id="add-ownerMaterial" tabindex="-1" >
+<div class="modal " id="add-enquiry" tabindex="-1" >
     <div class="modal-dialog modal-lg modal-dialog-centered">
         <div class="modal-content">
             <div class="modal-header">
-                <h5 class="modal-title text-center">项目耗材添加</h5>
+                <h5 class="modal-title text-center">新增询价单</h5>
                 <button type="button" class="close" data-dismiss="modal">
                     <span>&times;</span>
                 </button>
@@ -10,52 +10,101 @@
             <div class="modal-body">
                 <form class="form">
                     <div class="form-group row">
-                        <label for="add-owner-id" class="col-sm-2 col-form-label text-right">货主</label>
-                        <div class="col-sm-10 form-inline">
-                            <select name="owner_id" id="add-owner-id" class="form-control col-sm-5 required" v-model="addOwnerMaterial.owner_id">
-                                <option v-for="(owner,i) in filterOwners"  :value="owner.id">@{{ owner.name }}</option>
+                        <label for="owner_id" class="col-2 col-form-label text-right text-primary">项目名称{{old('owner_id')}} *</label>
+                        <div class="col-8 form-inline">
+                            <select id="owner_id" name="owner_id" class="form-control @error('owner_id') is-invalid @enderror col-4" v-model="owner_id" @change="selectOwner" required>
+                                <option v-for="owner in owners" :value="owner.name">@{{owner.value}}</option>
                             </select>
-                            <input type="text" placeholder="输入货主进行筛选" class="form-control col-sm-4 offset-1" @change="filterOwner($event)">
+                            <input type="text" class="form-control-sm ml-2" placeholder="输入关键字定位项目" @input="owner_seek">
+                        </div>
+                        <div class="col-sm-5">
+                            <p class="form-control-static text-danger small font-weight-bold" >{{ $errors->first('owner_id') }}</p>
                         </div>
                     </div>
                     <div class="form-group row">
-                        <label for="add-material-code" class="col-sm-2 col-form-label text-right">耗材编码</label>
-                        <div class="col-sm-10 form-inline">
-                            <input type="text" name="material-code" id="add-material-code" class="form-control col-sm-10" placeholder="耗材编码" v-model="addOwnerMaterial.material_code">
+                        <label for="owner_material_id" class="col-2 col-form-label text-right text-primary">项目耗材编号{{old('owner_material_id')}} *</label>
+                        <div class="col-8">
+                            <select id="owner_material_id" name="owner_material_id" class="form-control @error('owner_material_id') is-invalid @enderror col-4" v-model="owner_material_id" @change="ownerMaterial" required>
+                                <option v-for="ownerMaterial in ownerMaterials" :value="ownerMaterial.id">@{{ownerMaterial.material_code}}</option>
+                            </select>
+                            @error('owner_material_id')
+                            <span class="invalid-feedback" role="alert">
+                                <strong>{{ $message }}</strong>
+                            </span>
+                            @enderror
                         </div>
                     </div>
                     <div class="form-group row">
-                        <label for="add_material_id" class="col-sm-2 col-form-label text-right">耗材</label>
-                        <div class="col-sm-10 form-inline">
-                            <select name="material_id" id="add_material_id" class="form-control col-sm-5" required v-model="addOwnerMaterial.material_id">
-                                <option v-for="(materials,i) in filterMaterials"  :value="materials.id">@{{ materials.code }}</option>
-                            </select>
-                            <input type="text" placeholder="输入耗材进行筛选" class="form-control col-m-4 offset-1" @change="filterMaterial($event)">
+                        <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>
                         </div>
                     </div>
                     <div class="form-group row">
-                        <label for="add-size" class="col-sm-2 col-form-label text-right">尺寸</label>
-                        <div class="col-sm-10 form-inline">
-                            <input type="text" id="add-size" class="form-control col-10" name="size" placeholder="项目耗材尺寸" v-model="addOwnerMaterial.size">
+                        <label for="name" 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>
                         </div>
                     </div>
                     <div class="form-group row">
-                        <label for="add-special" class="col-sm-2 col-form-label text-right">特殊要求</label>
-                        <div class="col-sm-10 form-inline">
-                            <textarea name="special" id="add-special" cols="30" rows="3" class="form-control form-text col-10" v-model="addOwnerMaterial.special"></textarea>
+                        <label for="name" 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>
                         </div>
                     </div>
                     <div class="form-group row">
-                        <label for="add-specification" class="col-sm-2 col-form-label text-right">材质规格</label>
-                        <div class="col-sm-10 form-inline">
-                            <textarea name="specification" id="add-specification" cols="30" rows="5" class="form-control form-text col-10" v-model="addOwnerMaterial.specification"></textarea>
+                        <label for="name" 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>
                         </div>
                     </div>
+{{--                    <div class="form-group row">--}}
+{{--                        <label for="quantity" class="col-2 col-form-label text-right">采购数量</label>--}}
+{{--                        <div class="col-8">--}}
+{{--                            <input type="text" class="form-control @error('quantity') is-invalid @enderror"--}}
+{{--                                   v-model="quantity"  name="quantity" autocomplete="off" value="{{ old('quantity') }}" required>--}}
+{{--                            @error('quantity')--}}
+{{--                            <span class="invalid-feedback" role="alert">--}}
+{{--                                <strong>{{ $message }}</strong>--}}
+{{--                            </span>--}}
+{{--                            @enderror--}}
+{{--                        </div>--}}
+{{--                    </div>--}}
+{{--                    <div class="form-group row">--}}
+{{--                        <label for="amount" class="col-2 col-form-label text-right">销售数量</label>--}}
+{{--                        <div class="col-8">--}}
+{{--                            <input type="text" class="form-control @error('amount') is-invalid @enderror"--}}
+{{--                                   name="amount" autocomplete="off" value="{{ old('amount') }}" @input="countTotalPrice" v-model="amount" required>--}}
+{{--                            @error('amount')--}}
+{{--                            <span class="invalid-feedback" role="alert">--}}
+{{--                                <strong>{{ $message }}</strong>--}}
+{{--                            </span>--}}
+{{--                            @enderror--}}
+{{--                        </div>--}}
+{{--                    </div>--}}
+{{--                    <div class="form-group row">--}}
+{{--                        <label for="unit_price" class="col-2 col-form-label text-right">销售单价</label>--}}
+{{--                        <div class="col-8">--}}
+{{--                            <input type="text" class="form-control @error('unit_price') is-invalid @enderror"--}}
+{{--                                   name="unit_price" autocomplete="off" value="{{ old('unit_price') }}" @input="countTotalPrice" v-model="unit_price" required>--}}
+{{--                            @error('unit_price')--}}
+{{--                            <span class="invalid-feedback" role="alert">--}}
+{{--                                <strong>{{ $message }}</strong>--}}
+{{--                            </span>--}}
+{{--                            @enderror--}}
+{{--                        </div>--}}
+{{--                    </div>--}}
+{{--                    <div class="form-group row">--}}
+{{--                        <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>--}}
+{{--                        </div>--}}
+{{--                    </div>--}}
                 </form>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary"  data-dismiss="modal" @click="addOwnerMaterial={}">关闭</button>
-                <button type="button" class="btn btn-primary" @click="create">提交</button>
+                <button type="button" class="btn btn-secondary"  data-dismiss="modal" >关闭</button>
+                <button type="button" class="btn btn-primary" @click="createEnquiry">提交</button>
             </div>
         </div>
     </div>

resources/views/procurement/procurement/_addProof.blade.php

@@ -1,8 +1,8 @@
-<div class="modal " id="add-ownerMaterial" tabindex="-1" >
+<div class="modal " id="add-proof" tabindex="-1" >
     <div class="modal-dialog modal-lg modal-dialog-centered">
         <div class="modal-content">
             <div class="modal-header">
-                <h5 class="modal-title text-center">项目耗材添加</h5>
+                <h5 class="modal-title text-center">新增打样单</h5>
                 <button type="button" class="close" data-dismiss="modal">
                     <span>&times;</span>
                 </button>
@@ -10,52 +10,101 @@
             <div class="modal-body">
                 <form class="form">
                     <div class="form-group row">
-                        <label for="add-owner-id" class="col-sm-2 col-form-label text-right">货主</label>
-                        <div class="col-sm-10 form-inline">
-                            <select name="owner_id" id="add-owner-id" class="form-control col-sm-5 required" v-model="addOwnerMaterial.owner_id">
-                                <option v-for="(owner,i) in filterOwners"  :value="owner.id">@{{ owner.name }}</option>
+                        <label for="owner_id" class="col-2 col-form-label text-right text-primary">项目名称{{old('owner_id')}} *</label>
+                        <div class="col-8 form-inline">
+                            <select id="owner_id" name="owner_id" class="form-control @error('owner_id') is-invalid @enderror col-4" v-model="owner_id" @change="selectOwner" required>
+                                <option v-for="owner in owners" :value="owner.name">@{{owner.value}}</option>
                             </select>
-                            <input type="text" placeholder="输入货主进行筛选" class="form-control col-sm-4 offset-1" @change="filterOwner($event)">
+                            <input type="text" class="form-control-sm ml-2" placeholder="输入关键字定位项目" @input="owner_seek">
+                        </div>
+                        <div class="col-sm-5">
+                            <p class="form-control-static text-danger small font-weight-bold" >{{ $errors->first('owner_id') }}</p>
                         </div>
                     </div>
                     <div class="form-group row">
-                        <label for="add-material-code" class="col-sm-2 col-form-label text-right">耗材编码</label>
-                        <div class="col-sm-10 form-inline">
-                            <input type="text" name="material-code" id="add-material-code" class="form-control col-sm-10" placeholder="耗材编码" v-model="addOwnerMaterial.material_code">
+                        <label for="owner_material_id" class="col-2 col-form-label text-right text-primary">项目耗材编号{{old('owner_material_id')}} *</label>
+                        <div class="col-8">
+                            <select id="owner_material_id" name="owner_material_id" class="form-control @error('owner_material_id') is-invalid @enderror col-4" v-model="owner_material_id" @change="ownerMaterial" required>
+                                <option v-for="ownerMaterial in ownerMaterials" :value="ownerMaterial.id">@{{ownerMaterial.material_code}}</option>
+                            </select>
+                            @error('owner_material_id')
+                            <span class="invalid-feedback" role="alert">
+                                <strong>{{ $message }}</strong>
+                            </span>
+                            @enderror
                         </div>
                     </div>
                     <div class="form-group row">
-                        <label for="add_material_id" class="col-sm-2 col-form-label text-right">耗材</label>
-                        <div class="col-sm-10 form-inline">
-                            <select name="material_id" id="add_material_id" class="form-control col-sm-5" required v-model="addOwnerMaterial.material_id">
-                                <option v-for="(materials,i) in filterMaterials"  :value="materials.id">@{{ materials.code }}</option>
-                            </select>
-                            <input type="text" placeholder="输入耗材进行筛选" class="form-control col-m-4 offset-1" @change="filterMaterial($event)">
+                        <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>
                         </div>
                     </div>
                     <div class="form-group row">
-                        <label for="add-size" class="col-sm-2 col-form-label text-right">尺寸</label>
-                        <div class="col-sm-10 form-inline">
-                            <input type="text" id="add-size" class="form-control col-10" name="size" placeholder="项目耗材尺寸" v-model="addOwnerMaterial.size">
+                        <label for="name" 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>
                         </div>
                     </div>
                     <div class="form-group row">
-                        <label for="add-special" class="col-sm-2 col-form-label text-right">特殊要求</label>
-                        <div class="col-sm-10 form-inline">
-                            <textarea name="special" id="add-special" cols="30" rows="3" class="form-control form-text col-10" v-model="addOwnerMaterial.special"></textarea>
+                        <label for="name" 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>
                         </div>
                     </div>
                     <div class="form-group row">
-                        <label for="add-specification" class="col-sm-2 col-form-label text-right">材质规格</label>
-                        <div class="col-sm-10 form-inline">
-                            <textarea name="specification" id="add-specification" cols="30" rows="5" class="form-control form-text col-10" v-model="addOwnerMaterial.specification"></textarea>
+                        <label for="name" 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>
                         </div>
                     </div>
+                    {{--                    <div class="form-group row">--}}
+                    {{--                        <label for="quantity" class="col-2 col-form-label text-right">采购数量</label>--}}
+                    {{--                        <div class="col-8">--}}
+                    {{--                            <input type="text" class="form-control @error('quantity') is-invalid @enderror"--}}
+                    {{--                                   v-model="quantity"  name="quantity" autocomplete="off" value="{{ old('quantity') }}" required>--}}
+                    {{--                            @error('quantity')--}}
+                    {{--                            <span class="invalid-feedback" role="alert">--}}
+                    {{--                                <strong>{{ $message }}</strong>--}}
+                    {{--                            </span>--}}
+                    {{--                            @enderror--}}
+                    {{--                        </div>--}}
+                    {{--                    </div>--}}
+                    {{--                    <div class="form-group row">--}}
+                    {{--                        <label for="amount" class="col-2 col-form-label text-right">销售数量</label>--}}
+                    {{--                        <div class="col-8">--}}
+                    {{--                            <input type="text" class="form-control @error('amount') is-invalid @enderror"--}}
+                    {{--                                   name="amount" autocomplete="off" value="{{ old('amount') }}" @input="countTotalPrice" v-model="amount" required>--}}
+                    {{--                            @error('amount')--}}
+                    {{--                            <span class="invalid-feedback" role="alert">--}}
+                    {{--                                <strong>{{ $message }}</strong>--}}
+                    {{--                            </span>--}}
+                    {{--                            @enderror--}}
+                    {{--                        </div>--}}
+                    {{--                    </div>--}}
+                    {{--                    <div class="form-group row">--}}
+                    {{--                        <label for="unit_price" class="col-2 col-form-label text-right">销售单价</label>--}}
+                    {{--                        <div class="col-8">--}}
+                    {{--                            <input type="text" class="form-control @error('unit_price') is-invalid @enderror"--}}
+                    {{--                                   name="unit_price" autocomplete="off" value="{{ old('unit_price') }}" @input="countTotalPrice" v-model="unit_price" required>--}}
+                    {{--                            @error('unit_price')--}}
+                    {{--                            <span class="invalid-feedback" role="alert">--}}
+                    {{--                                <strong>{{ $message }}</strong>--}}
+                    {{--                            </span>--}}
+                    {{--                            @enderror--}}
+                    {{--                        </div>--}}
+                    {{--                    </div>--}}
+                    {{--                    <div class="form-group row">--}}
+                    {{--                        <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>--}}
+                    {{--                        </div>--}}
+                    {{--                    </div>--}}
                 </form>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary"  data-dismiss="modal" @click="addOwnerMaterial={}">关闭</button>
-                <button type="button" class="btn btn-primary" @click="create">提交</button>
+                <button type="button" class="btn btn-secondary"  data-dismiss="modal" >关闭</button>
+                <button type="button" class="btn btn-primary" @click="createProof">提交</button>
             </div>
         </div>
     </div>

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

@@ -61,8 +61,14 @@
             @can('采购管理-采购-新建')
                 @include('procurement.procurement._addProcurement')
             @endcan
-            <span class="btn btn-sm btn-outline-success ml-2">新增询价</span>
-            <span class="btn btn-sm btn-outline-danger ml-2">新增打样</span>
+            <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')
+            @endcan
             <span class="btn btn-sm btn-outline-primary ml-2">重新发起</span>
         </div>
         <label for="all" id="cloneCheckAll" class="d-none">
@@ -76,25 +82,9 @@
                 <td>
                     <input class="checkItem" type="checkbox" :value="procurement" v-model="checkData">
                 </td>
-{{--                <td class="">@{{ procurement.code }}</td>--}}
-{{--                <td class="text-muted">@{{ procurement.owner_name }}</td>--}}
-{{--                <td class="text-muted">@{{ procurement.type }}</td>--}}
-{{--                <td class="text-muted">@{{ procurement.company_name }}</td>--}}
-{{--                <td class="tooltipTarget" style="max-width: 200px;overflow:hidden">@{{ procurement.material_code }}</td>--}}
-{{--                <td class="text-muted">@{{ procurement.material_name }}</td>--}}
-{{--                <td class="text-muted">@{{ procurement.size }}</td>--}}
-{{--                <td class="text-muted">@{{ procurement.special }}</td>--}}
-{{--                <td class="text-muted">@{{ procurement.specification }}</td>--}}
-{{--                <td></td>--}}
-{{--                <td>@{{ procurement.quantity }}</td>--}}
-{{--                <td><span>@{{ procurement.unit_price }}</span></td>--}}
-{{--                <td><span></span></td>--}}
-{{--                <td><span></span></td>--}}
-{{--                <td><span>@{{ procurement.status }}</span></td>--}}
-{{--                <td><span>@{{ procurement.phone }}</span></td>--}}
                 <td class="">@{{ procurement.code }}</td>
                 <td v-if="procurement.owner_material.owner">@{{ procurement.owner_material.owner.name }}</td>
-                <td class="text-muted">@{{ procurement.type }}</td>
+                <td >@{{ procurement_type[procurement.type] }}</td>
                 <td v-if="procurement.owner_material.owner.customer">@{{ procurement.owner_material.owner.customer.company_name }}</td>
                 <td class="tooltipTarget" style="max-width: 200px;overflow:hidden" v-if="procurement.owner_material.material">@{{ procurement.owner_material.material.code }}</td>
                 <td class="text-muted" v-if="procurement.owner_material.material">@{{ procurement.owner_material.material.name }}</td>
@@ -106,7 +96,7 @@
                 <td><span>@{{ procurement.unit_price }}</span></td>
                 <td><span></span></td>
                 <td><span></span></td>
-                <td><span>@{{ procurement.status }}</span></td>
+                <td><span>@{{ procurement_status[procurement.status] }}</span></td>
                 <td v-if="procurement.owner_material.owner.customer">@{{ procurement.owner_material.owner.customer.phone }}</td>
                 <td>
                     <span class="btn btn-sm btn-outline-danger">取消</span>
@@ -127,24 +117,6 @@
             el: '#list',
             data: {
                 procurements:{!! $procurements->toJson() !!}['data'],
-                {{--procurements: [--}}
-                {{--    @foreach($procurements as $procurement)--}}
-                {{--    {--}}
-                {{--        id:'{{$procurement->id}}',code:'{{$procurement->code}}',type:'{{$procurement->type}}',created_at:'{{$procurement->created_at}}',--}}
-                {{--        quantity:'{{$procurement->quantity}}',unit_price:'{{$procurement->unit_price}}',status:'{{$procurement->status}}',--}}
-                {{--        @if($procurement->ownerMaterial)--}}
-                {{--        owner_id:'{{$procurement->ownerMaterial->owner_id}}',size:'{{$procurement->ownerMaterial->size}}',--}}
-                {{--        special:'{{$procurement->ownerMaterial->special}}',specification:'{{$procurement->ownerMaterial->specification}}',@endif--}}
-                {{--            @if($procurement->ownerMaterial->material)--}}
-                {{--        material_id:'{{$procurement->ownerMaterial->material->id}}',material_code:'{{$procurement->ownerMaterial->material->code}}',--}}
-                {{--        material_name:'{{$procurement->ownerMaterial->material->name}}',@endif--}}
-                {{--            @if($procurement->ownerMaterial->owner)owner_name:'{{$procurement->ownerMaterial->owner->name}}',@endif--}}
-                {{--            @if($procurement->ownerMaterial->owner->customer)--}}
-                {{--        company_name:'{{$procurement->ownerMaterial->owner->customer->company_name}}',customer_id:'{{$procurement->ownerMaterial->owner->customer->id}}',--}}
-                {{--        phone:'{{$procurement->ownerMaterial->owner->customer->phone}}',@endif--}}
-                {{--    },--}}
-                {{--    @endforeach--}}
-                {{--],--}}
                 owners:[
                         @foreach($owners as $owner)
                     {
@@ -165,6 +137,8 @@
                     {name:'{{$material->id}}',value:'{{$material->name}}'},
                     @endforeach
                 ],
+                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:'{{old('owner_id')}}',
@@ -257,6 +231,12 @@
                 addProcurement(){
                     $('#add-procurement').modal('show');
                 },
+                addEnquiry(){
+                    $('#add-enquiry').modal('show');
+                },
+                addProof(){
+                    $('#add-proof').modal('show');
+                },
                 owner_seek:function (e) {
                     let _this=this;
                     let $val=e.target.value;
@@ -303,7 +283,29 @@
                         this.procurements.push(res);
                         this.$forceUpdate();
                         $("#add-procurement").modal('hide');
-                        return '新采购单成功';
+                        return '新增采购单成功';
+                    },true);
+                },
+                createEnquiry(){
+                    let _this=this;
+                    let url = '{{url('procurement/procurement/createEnquiry')}}';
+                    let params = {owner_material_id:_this.owner_material_id};
+                    window.tempTip.postBasicRequest(url,params,res=>{
+                        this.procurements.push(res);
+                        this.$forceUpdate();
+                        $("#add-enquiry").modal('hide');
+                        return '新增询价单成功';
+                    },true);
+                },
+                createProof(){
+                    let _this=this;
+                    let url = '{{url('procurement/procurement/createProof')}}';
+                    let params = {owner_material_id:_this.owner_material_id};
+                    window.tempTip.postBasicRequest(url,params,res=>{
+                        this.procurements.push(res);
+                        this.$forceUpdate();
+                        $("#add-proof").modal('hide');
+                        return '新增打样单成功';
                     },true);
                 },
 

routes/web.php

@@ -727,6 +727,8 @@ Route::group(['prefix'=>'procurement'],function () {
         Route::post('store','ProcurementController@store');
         Route::post('getOwnerMaterial','ProcurementController@getOwnerMaterial');
         Route::post('createProcurement','ProcurementController@createProcurement');
+        Route::post('createEnquiry','ProcurementController@createEnquiry');
+        Route::post('createProof','ProcurementController@createProof');
     });
     /** 财务 */
     Route::group(['prefix'=>'finance'],function(){