loustwo 4 роки тому
батько
коміт
bbd0e9530d

+ 12 - 4
app/Http/Controllers/ReceivingTaskController.php

@@ -57,12 +57,20 @@ class ReceivingTaskController extends Controller
         }
         $appointment_number = $request->input('appointment_number',null);
 
-        $delivery_appointment_car = DeliveryAppointmentCar::query()->where('appointment_number',$appointment_number)->first();
+        $delivery_appointment_car = DeliveryAppointmentCar::query()->with('deliveryAppointment')->where('appointment_number',$appointment_number)->first();
 
-        if (!$delivery_appointment_car) return ['success' => false,'errors' =>['appointment_number' => ['对应预约号未找到']]];
-
-        if (ReceivingTask::query()->where('delivery_appointment_car_id',$delivery_appointment_car->id)->exists())
+        if (!$delivery_appointment_car){
+            return ['success' => false,'errors' =>['appointment_number' => ['对应预约号未找到']]];
+        }
+        if (!$delivery_appointment_car->deliveryAppointment){
+            return [['success' => false,'errors' =>['appointment_number' => ['对应预约号未找到']]]];
+        }
+        if (!$delivery_appointment_car->deliveryAppointment->owner_id != $request->input('owner_id')){
+            return [['success' => false,'errors' =>['appointment_number' => ['预约号与货主未对应']]]];
+        }
+        if (ReceivingTask::query()->where('delivery_appointment_car_id',$delivery_appointment_car->id)->exists()){
             return ['success' => false, 'errors' =>['appointment_number' => ['预约号已有对应的任务']]];
+        }
         try {
             $receiving_task = $this->service->createReceivingTask($delivery_appointment_car, $request->all());
             if (!$receiving_task->id) return ['success' => false, 'message' => '生成入库单任务失败,请重新尝试'];

+ 4 - 2
resources/views/store/receivingTasks/create.blade.php

@@ -352,7 +352,9 @@
                 </div>
                 <div class="form-group">
                     @can('入库管理-开单入库-打印任务单')
-                    <el-button type="primary" class="col-12" @click="printLodop">打  印</el-button>
+                    <el-button type="primary" class="col-12" @click="printLodop" v-show="receiving_task_print.number">
+                        <span v-text="receiving_task_print.number + '打  印'" ></span>
+                    </el-button>
                     @endcan
                 </div>
                 @include("store.receivingTasks._receiving_task_print")
@@ -655,7 +657,7 @@
                     }
                 },
                 downloadClodopConfirm() {
-                    this.$confirm('打印组件确实,是否下在?', '提示', {
+                    this.$confirm('打印组件不存在,是否下载?', '提示', {
                         confirmButtonText: '确定',
                         cancelButtonText: '取消',
                         type: 'warning'