临时提交

app/Http/Controllers/CommodityController.php

@@ -398,7 +398,7 @@ class CommodityController extends Controller
 
     public function getCommodityApi(Request $request,CommodityService $service): array
     {
-        $owner = Owner::query()->where('name',$request['owner_name'])->first();
+        $owner = Owner::query()->where('code',$request['owner_code'])->first();
         if (!$owner){
             return ['success' => false ,'message' => '货主未找到'];
         }

app/OracleBasSKU.php

@@ -12,7 +12,7 @@ use App\Traits\ModelTimeFormat;
 use App\Traits\ModelLogChanging;
 class OracleBasSKU extends Model
 {
-    use \Awobaz\Compoships\Compoships;
+//    use \Awobaz\Compoships\Compoships;
     use ModelLogChanging;
 
     use ModelTimeFormat;

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

@@ -1,6 +1,6 @@
 <div class="modal fade " id="intercept-modal" tabindex="-1" role="dialog" aria-labelledby="checkModalLabel"
      aria-hidden="true">
-    <div class="modal-dialog modal-xl modal-dialog-centered">
+    <div class="modal-dialog modal-xl modal-dialog-centered ">
         <div class="modal-content">
             <div class="modal-header">
                 <h5 class="modal-title" id="checkModalLabel">创建工单</h5>
@@ -8,7 +8,7 @@
                     <span aria-hidden="true">&times;</span>
                 </button>
             </div>
-            <div class="modal-body">
+            <div class="modal-body pd-0">
                 {{--工单类型--}}
                 <div class="form-group row">
                     <label for="order_issue_type" class="col-sm-2 col-form-label text-right">工单类型</label>
@@ -139,7 +139,7 @@
                                 <td class="text-center" v-if="['破损',].includes(workOrder.orderIssueType)">异常类型</td>
                                 <td class="text-center">商品名称</td>
                                 <td class="text-center">订单数量</td>
-                                <td class="text-center">异常数量</td>
+                                <td class="text-center"><span v-text="workOrder.orderIssueType === '错漏发' ? '客户实收数量' : '异常数量'" ></span></td>
                                 <td></td>
                             </tr>
                             </thead>
@@ -150,8 +150,6 @@
                                 <td v-if="['破损',].includes(workOrder.orderIssueType)">
                                     <span v-if="workOrder.orderIssueType === '破损'"
                                           :data="commodity.abnormal_type = '破损'" >破损</span>
-{{--                                    <span v-if="workOrder.orderIssueType === '错漏发'"--}}
-{{--                                          :data="commodity.abnormal_type = '错漏发'"  >错漏发</span>--}}
                                 </td>
                                 <td><span v-text="commodity.name"></span></td>
                                 <td><span v-text="commodity.amount"></span></td>
@@ -166,6 +164,32 @@
                             </tr>
                             </tbody>
                         </table>
+                        <div v-if="workOrder.orderIssueType === '错漏发'" >
+                            <table class="table table-sm table-grid-row table-hover mb-0">
+                                <tr>
+                                    <td>
+                                        <input type="text" class="form-control" id="add-commodity-logistic-number" ref="add-commodity-logistic-number" placeholder="快递单号">
+                                    </td>
+                                    <td>
+                                        <input type="text" class="form-control" id="add-commodity-sku" ref="add-commodity-sku" placeholder="商品条码">
+                                    </td>
+                                    <td>
+
+                                    </td>
+                                    <td>
+
+                                    </td>
+                                    <td>
+                                        <input type="number" class="form-control" id="add-commodity-number" ref="add-commodity-number" placeholder="客户实收数量">
+                                    </td>
+                                    <td>
+                                        <button type="button" class="btn btn-sm btn-outline-success" @click="addWorkOrderCommodity">
+                                            添加
+                                        </button>
+                                    </td>
+                                </tr>
+                            </table>
+                        </div>
                     </div>
                 </div>
             </div>

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

@@ -1733,6 +1733,59 @@
                 showNextWorkOrder(){
                     if (parseInt(this.workOrderIndex) === (this.workOrderInfos.length -1)) return false;
                     return this.workOrderIndex  < this.workOrderInfos.length -1;
+                },
+                addWorkOrderCommodity(){
+                    window.tempTip.setIndex(1999);
+                    window.tempTip.setDuration(1500);
+
+                    let sku = this.$refs['add-commodity-sku'].value;
+                    let logistic_number = this.$refs['add-commodity-logistic-number'].value;
+
+                    let order = this.orders.find(item=>{
+                        return item.orderno === checkData[0];
+                    });
+                     let owner_code = order.owner_code;
+                     if (logistic_number.trim().length ===0){
+                        window.tempTip.show('填写快递单号');
+                        return ;
+                    }
+                    this.getCommodity(owner_code,sku).then(res => {
+                        if (res===null){
+                            window.tempTip.show('请检查商品条码');
+                        } else {
+                            this.workOrder.commodities.push({
+                                logistic_number:logistic_number,
+                                commodity_id:res.id,
+                                name:res.name,
+                                abnormal_type:"多发",
+                                amount:0,
+                                sku:this.$refs['add-commodity-sku'].value,
+                                abnormal_amount:this.$refs['add-commodity-number'].value,
+                            });
+                            this.$refs['add-commodity-logistic-number'].value = "";
+                            this.$refs['add-commodity-sku'].value = "";
+                            this.$refs['add-commodity-number'].value = "";
+                            window.tempTip.showSuccess("添加成功");
+                        }
+                    }).catch(err=>{
+                        window.tempTip.showSuccess("获取商品信息异常");
+                    });
+                },
+                getCommodity(owner,code){
+                    return new Promise((resolve, reject) => {
+                        let url = "{{route('commodity.getCommodityApi')}}";
+                        let data = {owner_code:owner,sku:code};
+                        console.log(data);
+                        window.axios.post(url,data).then(res=>{
+                            if (res.data.success){
+                               resolve(res.data.data);
+                            } else {
+                                resolve(null);
+                            }
+                        }).catch(err=>{
+                            reject(null);
+                        });
+                    });
                 }
             },
         });