卸货任务修改为可以 支持时分

app/Services/DischargeTaskService.php

@@ -18,8 +18,14 @@ class DischargeTaskService
     public function updateDischargeTask(DischargeTask $dischargeTask, array $param): array
     {
         if ($dischargeTask->status == 3) return ['success' => false, 'message' => '已完成的卸货任务不可进行编辑'];
-        if(!empty($param['status']) && $param['status'] > 0 && $dischargeTask->facilitator_id == 0)
-            return ['success' => false, 'message' => '未指定服务商的卸货任务,不可进行当前编辑'];
+        if(!empty($param['status'])){
+            if( $param['status'] > 0 && $dischargeTask->facilitator_id == 0){
+                return ['success' => false, 'message' => '未指定服务商的卸货任务,不可进行当前编辑'];
+            }
+            if($param['status'] ==3 && $dischargeTask->status == 0){
+                return ['success' => false, 'message' => '未指定服务商的卸货任务,不可进行当前编辑'];
+            }
+        }
         // 归档入口
         $bool = $dischargeTask->update($param);
         if ($bool){

database/factories/DischargeTaskFactory.php

@@ -25,5 +25,6 @@ $factory->define(DischargeTask::class, function (Faker $faker) {
         'expenditure_remark' => $faker->title(),
         'created_at' => $faker->dateTime(),
         'updated_at' => $faker->dateTime(),
+        'warehouse_id' => $faker->numberBetween(1,2),
     ];
 });

resources/views/personnel/discharge/task/_createTask.blade.php

@@ -15,7 +15,7 @@
             <div class="modal-body">
                 <form class="form">
                     <div class="form-group row">
-                        <label for="addTask-owner-id" class="col-sm-3 col-form-label text-right">货主</label>
+                        <label for="addTask-owner-id" class="col-sm-3 col-form-label text-right text-primary">货主 *</label>
                         <div class="col-sm-5">
                             <select id="addTask-owner-id" class="form-control"
                                     v-model="addTask.owner_id" :class="taskError.owner_id? 'is-invalid' :''" @focus="taskError.owner_id = null">
@@ -33,15 +33,15 @@
                     </div>
 
                     <div class="form-group row">
-                        <label for="addTask-created-at" class="col-sm-3 col-form-label text-right">预约日期</label>
+                        <label for="addTask-created-at" class="col-sm-3 col-form-label text-right text-primary">预约日期 *</label>
                         <div class="col-sm-9 form-inline">
-                            <input type="date" id="addTask-created-at" class="form-control col-9" name="size"
+                            <input type="datetime-local" id="addTask-created-at" class="form-control col-9"
                                    v-model="addTask.income_at" @focus="taskError.income_at= null">
                         </div>
                     </div>
 
                     <div class="form-group row">
-                        <label for="addTask-type" class="col-sm-3 col-form-label text-right">作业名称</label>
+                        <label for="addTask-type" class="col-sm-3 col-form-label text-right text-primary text-primary">作业名称 *</label>
                         <div class="col-sm-9 form-inline">
                             <select id="addTask-type" class="form-control col-4" v-model="addTask.type"
                                     :class="taskError.type? 'is-invalid' :''"
@@ -57,7 +57,7 @@
                     </div>
 
                     <div class="form-group row">
-                        <label for="addTask-type" class="col-sm-3 col-form-label text-right">仓库</label>
+                        <label for="addTask-type" class="col-sm-3 col-form-label text-right text-primary">仓库 *</label>
                         <div class="col-sm-9 form-inline">
                             <select id="addTask-type" class="form-control col-4" v-model="addTask.warehouse_id"
                                     :class="taskError.warehouse_id? 'is-invalid' :''"
@@ -72,9 +72,9 @@
                     </div>
 
                     <div class="form-group row">
-                        <label for="addTask-numbers" class="col-sm-3 col-form-label text-right">入库单</label>
+                        <label for="addTask-numbers" class="col-sm-3 col-form-label text-right text-primary">入库单 *</label>
                         <div class="col-sm-9 form-inline">
-                            <input type="text" id="addTask-numbers" class="form-control col-9" name="size"
+                            <input type="text" id="addTask-numbers" class="form-control col-9"
                                    v-model="addTask.numbers" :class="taskError.numbers? 'is-invalid' :''"
                                    @focus="taskError.numbers = null">
                             <div class="invalid-feedback">
@@ -84,9 +84,9 @@
                     </div>
 
                     <div class="form-group row">
-                        <label for="addTask-amount" class="col-sm-3 col-form-label text-right">数量</label>
+                        <label for="addTask-amount" class="col-sm-3 col-form-label text-right text-primary">数量 *</label>
                         <div class="col-sm-9 form-inline">
-                            <input type="number" id="addTask-amount" class="form-control col-9" name="size"
+                            <input type="number" id="addTask-amount" class="form-control col-9"
                                    v-model="addTask.income_amount" :class="taskError.income_amount? 'is-invalid' :''"
                                    @focus="taskError.income_amount = null">
                             <div class="invalid-feedback">
@@ -96,7 +96,7 @@
                     </div>
 
                     <div class="form-group row">
-                        <label for="addTask-amount" class="col-sm-3 col-form-label text-right">单位</label>
+                        <label for="addTask-amount" class="col-sm-3 col-form-label text-right text-primary">单位 *</label>
                         <div class="col-sm-9 form-inline">
                             <select id="addTask-type" class="form-control col-4" v-model="addTask.income_unit"
                                     :class="taskError.income_unit? 'is-invalid' :''"
@@ -112,7 +112,7 @@
                     </div>
 
                     <div class="form-group row">
-                        <label for="addTask-income-unit-price" class="col-sm-3 col-form-label text-right">单价</label>
+                        <label for="addTask-income-unit-price" class="col-sm-3 col-form-label text-right text-primary">单价 *</label>
                         <div class="col-sm-9 form-inline">
                             <input type="number" id="addTask-income-unit-price" class="form-control col-9"
                                    v-model="addTask.income_unit_price" :class="taskError.income_unit_price? 'is-invalid' :''"
@@ -124,7 +124,7 @@
                     </div>
 
                     <div class="form-group row" v-show="isUpdate">
-                        <label for="addTask-income-total-cost" class="col-sm-3 col-form-label text-right">总价</label>
+                        <label for="addTask-income-total-cost" class="col-sm-3 col-form-label text-right text-primary">总价 *</label>
                         <div class="col-sm-9 form-inline">
                             <input type="number" id="addTask-income-total-cost" class="form-control col-9"
                                    v-model="addTask.income_total_cost">

resources/views/personnel/discharge/task/_executeTask.blade.php

@@ -13,7 +13,7 @@
             <div class="modal-body">
                 <form class="form">
                     <div class="form-group row">
-                        <label for="executingTack-owner-id" class="col-sm-3 col-form-label text-right">装卸队</label>
+                        <label for="executingTack-owner-id" class="col-sm-3 col-form-label text-right  text-primary">装卸队 *</label>
                         <div class="col-sm-5">
                             <select id="executingTack-owner-id" class="form-control" v-model="executingTack.facilitator_id" :class="taskError.facilitator_id? 'is-invalid' :''">
                                 <option v-for="(providers,index) in facilitatorsFilter" :value="providers.id" :key="providers+index">@{{ providers.name }}</option>
@@ -28,16 +28,16 @@
                     </div>
 
                     <div class="form-group row">
-                        <label for="executingTack-created-at" class="col-sm-3 col-form-label text-right">卸货日期</label>
+                        <label for="executingTack-created-at" class="col-sm-3 col-form-label text-right text-primary">卸货日期 *</label>
                         <div class="col-sm-9 form-inline">
-                            <input type="date" id="executingTack-created-at"  class="form-control col-9" name="size" v-model="executingTack.expenditure_at">
+                            <input type="datetime-local" id="executingTack-created-at"  class="form-control col-9"  v-model="executingTack.expenditure_at">
                         </div>
                     </div>
 
                     <div class="form-group row">
-                        <label for="executingTack-amount" class="col-sm-3 col-form-label text-right">数量</label>
+                        <label for="executingTack-amount" class="col-sm-3 col-form-label text-right text-primary">数量 *</label>
                         <div class="col-sm-9 form-inline">
-                            <input type="number" id="executingTack-amount" class="form-control col-9" name="size" v-model="executingTack.expenditure_amount" :class="taskError.facilitator_id? 'is-invalid' :''">
+                            <input type="number" id="executingTack-amount" class="form-control col-9"  v-model="executingTack.expenditure_amount" :class="taskError.facilitator_id? 'is-invalid' :''">
                             <div class="invalid-feedback" >
                                 @{{ taskError['facilitator_id'] ? taskError['facilitator_id'][0] : '' }}
                             </div>
@@ -45,7 +45,7 @@
                     </div>
 
                     <div class="form-group row">
-                        <label for="executingTack-amount" class="col-sm-3 col-form-label text-right">单位</label>
+                        <label for="executingTack-amount" class="col-sm-3 col-form-label text-right text-primary">单位 *</label>
                         <div class="col-sm-9 form-inline">
                             <select id="executingTack-type" class="form-control col-4" v-model="executingTack.expenditure_unit" :class="taskError.expenditure_unit? 'is-invalid' :''">
                                 <option v-for="(unit,index) in units" :value="unit.name" :key="unit+index">@{{ unit.value }}</option>
@@ -57,7 +57,7 @@
                     </div>
 
                     <div class="form-group row">
-                        <label for="executingTack-expenditure-unit-price" class="col-sm-3 col-form-label text-right">外派单价</label>
+                        <label for="executingTack-expenditure-unit-price" class="col-sm-3 col-form-label text-right  text-primary">外派单价 *</label>
                         <div class="col-sm-9 form-inline">
                             <input type="number" id="executingTack-expenditure-unit-price" class="form-control col-9"  v-model="executingTack.expenditure_unit_price" :class="taskError.expenditure_unit_price? 'is-invalid' :''">
                             <div class="invalid-feedback" >

resources/views/personnel/discharge/task/_table.blade.php

@@ -2,7 +2,7 @@
     <tr class="text-center">
         <th><input type="checkbox" class="form-check" name="selectAll" id="selectAll" @click="checkAll"></th>
         <th>序号</th>
-        <th>日期</th>
+        <th>预约时间</th>
         <th>客户名称</th>
         <th>仓库</th>
         <th>作业名称</th>
@@ -14,6 +14,7 @@
         <th>状态</th>
         <th>备注</th>
         <th>操作</th>
+        <th>创建时间</th>
     </tr>
     <template v-if="dischargeTasks.length > 0">
         <tr v-for="(dischargeTask,index) in dischargeTasks" :key="index" class="text-center"  @click="selectTr===index+1?selectTr=0:selectTr=index+1" :class="selectTr===index+1?'focusing' : ''">
@@ -33,7 +34,7 @@
                     <span class="badge badge-pill badge-success">完成</span>
                 </template>
             </td>
-            <td>@{{ dischargeTask.created_at }}</td>
+            <td>@{{ dischargeTask.income_at }}</td>
             <td>@{{ dischargeTask.owner ? dischargeTask.owner.name : '' }}</td>
             <td>
                 @can('人事管理-卸货-编辑')
@@ -100,6 +101,7 @@
                 <button class="btn btn-sm btn-outline-danger" @click="deleteTask(index,dischargeTask)">删除</button>
                 @endcan
             </td>
+            <td>@{{ dischargeTask.created_at }}</td>
         </tr>
     </template>
     <template v-else>

resources/views/personnel/discharge/task/index.blade.php

@@ -157,7 +157,8 @@
                 showCreateTaskModal(isDisplay) {
                     $('owner-name-filter').val('');
                     if (isDisplay){
-                        if(!this.isUpdate)this.addTask.income_at = moment().format('YYYY-MM-DD');
+                        if(!this.isUpdate)this.addTask.income_at =  moment().format('YYYY-MM-DDTHH:mm');
+                        this.$forceUpdate();
                         $("#createdModal").modal('show');
                     } else {
                         this.isUpdate = false;
@@ -170,8 +171,9 @@
                     this.executingTack = JSON.parse(JSON.stringify(task));
                     this.selectIndex = index;
                     if (isDisplay) {
-                        this.executingTack.expenditure_at = moment().format('YYYY-MM-DD');
+                        this.executingTack.expenditure_at = moment().format('YYYY-MM-DDTHH:mm');
                         this.isUpdate = true;
+                        this.$forceUpdate();
                         $("#executingTaskModal").modal('show');
                     } else {
                         this.isUpdate = false;
@@ -188,6 +190,7 @@
                 },
                 // 创建任务
                 createTask(index) {
+                    console.log(this.addTask);
                     if (this.isUpdate) {
                         this.updateCurrentTask(index);
                         return