Merge branch 'zzd'

app/Http/Controllers/ProcessController.php

@@ -1123,8 +1123,8 @@ class ProcessController extends Controller
             'user_id'=>'参与人',
             'started_at'=>'开始时间',
             'ended_at'=>'结束时间',
-            'hour_price'=>'计时工资',
-            'unit_price'=>'计件工资',
+            'hour_price'=>'计时单价',
+            'unit_price'=>'计件单价',
             'dinner_duration'=>'晚饭时间',
             'hour_count'=>'计时工时',
             'unit_count'=>'计件数量',

app/Http/Controllers/TestController.php

@@ -277,7 +277,6 @@ class TestController extends Controller
     /*1*/
     function test(Request $request)
     {/**/
-        dd(City::select('id','name')->first());
     }
 
 }

app/Http/Controllers/UserLaborController.php

@@ -140,7 +140,7 @@ class UserLaborController extends Controller
             'mobile_phone'=>'电话',
             'gender'=>'性别',
             'identity_number'=>'身份证号',
-            'default_hour_price'=>'默认计时工资',
+            'default_hour_price'=>'默认计时单价',
             'name'=>'劳务所',
         ])->validate();
         $userDetail=UserDetail::find($id);

database/migrations/2020_03_25_164303_create_process_daily_participants_table.php

@@ -21,9 +21,9 @@ class CreateProcessDailyParticipantsTable extends Migration
             $table->bigInteger('user_id')->index()->comment('外键用户');
             $table->time('started_at')->nullable()->comment('开始时间');
             $table->time('ended_at')->nullable()->comment('开始时间');
-            $table->decimal('hour_price')->nullable()->comment('计时工资');
+            $table->decimal('hour_price')->nullable()->comment('计时单价');
             $table->tinyInteger('hour_count')->nullable()->comment('计时工时');
-            $table->decimal('unit_price')->nullable()->comment('计件工资');
+            $table->decimal('unit_price')->nullable()->comment('计件单价');
             $table->integer('unit_count')->nullable()->comment('计件数');
             $table->integer('dinner_duration')->default(0)->comment('晚饭时间');
             $table->string('remark')->nullable()->comment('备注');

database/migrations/2020_03_25_164350_create_user_labors_table.php

@@ -17,7 +17,7 @@ class CreateUserLaborsTable extends Migration
     {
         Schema::create('user_labors', function (Blueprint $table) {
             $table->bigInteger('user_id')->unique()->comment('外键用户');
-            $table->decimal('default_hour_price')->nullable()->comment('默认计时工资');
+            $table->decimal('default_hour_price')->nullable()->comment('默认计时单价');
             $table->string('company')->nullable()->index()->comment('劳务所');
         });
     }

database/migrations/2020_05_22_173230_change_user_labors_table.php

@@ -17,7 +17,7 @@ class ChangeUserLaborsTable extends Migration
         Schema::dropIfExists('user_labors');
         Schema::create('user_labors', function (Blueprint $table) {
             $table->bigInteger('user_id')->index()->comment('外键用户');
-            $table->decimal('default_hour_price')->nullable()->comment('默认计时工资');
+            $table->decimal('default_hour_price')->nullable()->comment('默认计时单价');
             $table->bigInteger('labor_company_id')->nullable()->index()->comment('外键劳务所');
         });
     }

resources/views/maintenance/userLabor/edit.blade.php

@@ -57,7 +57,7 @@
                     @enderror
                 </div>
                 <div class="form-group row">
-                    <label for="default_hour_price" class="form-check-label col-3 pull-left">默认计时工资/小时：</label>
+                    <label for="default_hour_price" class="form-check-label col-3 pull-left">默认计时单价/小时：</label>
                     <input name="default_hour_price" :value="userLabor.default_hour_price" id="default_hour_price" class="@error('default_hour_price') is-invalid @enderror col-7 form-control" type="text">
                     @error('default_hour_price')
                     <span class="invalid-feedback col-7 offset-3 mt-0" role="alert">

resources/views/maintenance/userLabor/index.blade.php

@@ -24,9 +24,9 @@
                                     <td>开始时间</td>
                                     <td>结束时间</td>
                                     <td>计件数</td>
-                                    <td>计件工资</td>
+                                    <td>计件单价</td>
                                     <td>计时数</td>
-                                    <td>计时工资</td>
+                                    <td>计时单价</td>
                                 </tr>
                                 </thead>
                                 <tbody>

resources/views/order/wave/search.blade.php

@@ -3,7 +3,7 @@
 
 @section("content")
     @component("order.wave.menu")@endcomponent
-    <div class="container-fluid" id="wave_div">
+    <div class="container-fluid d-none" id="wave_div">
         <div style="min-width: 2000px;">
 
 
@@ -83,7 +83,7 @@
 @endsection
 
 @section("lastScript")
-    <script type="text/javascript" src="{{asset('queryForm.js.queryForm.js.tempscript>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm.js')}}"></script>
     <script>
         let vueList = new Vue({
             el: "#wave_div",
@@ -117,6 +117,7 @@
 
             },
             mounted: function () {
+                $('#wave_div').removeClass('d-none')
                 let data = [[
                     {name: 'start_time', type: 'dataTime', tip: '选择显示指定日期的起始时间', placeholder: ''},
                     {name: 'end_time', type: 'dataTime', tip: '选择显示指定日期的结束时间', placeholder: ''},

resources/views/process/index.blade.php

@@ -81,14 +81,14 @@
                         </div>
                         <div v-if="errors.hour_price" class="row"><label class="col-3"></label><small  class="text-danger col-7">@{{ errors.hour_price[0] }}</small></div>
                         <div class="form-group row">
-                            <label for="initial_weight" class="col-3 col-form-label text-right">计时工资</label>
+                            <label for="initial_weight" class="col-3 col-form-label text-right">计时单价</label>
                             <div class="col-7">
                                 <input :class="{ 'is-invalid' : errors.hour_price }"  type="text" class="form-control" autocomplete="off" v-model="processDailyParticipantOne.hour_price" >
                             </div>
                         </div>
                         <div v-if="errors.unit_price" class="row"><label class="col-3"></label><small  class="text-danger col-7">@{{ errors.unit_price[0] }}</small></div>
                         <div class="form-group row">
-                            <label for="initial_weight" class="col-3 col-form-label text-right">计件工资</label>
+                            <label for="initial_weight" class="col-3 col-form-label text-right">计件单价</label>
                             <div class="col-7">
                                 <input :class="{ 'is-invalid' : errors.unit_price }" type="text" class="form-control" autocomplete="off" v-model="processDailyParticipantOne.unit_price" >
                             </div>
@@ -318,9 +318,9 @@
                             </tr>
                         </table>
                         <div v-else :style="[{background: (!processOne.id || processOne.is_multi_row)  ? (!processOne.id) ? '#e8eef6' :'rgb(246, 238, 232)' : (processOne.processesContents.length>0 ? ((processOne.processesContents[0].type=='成品单') ? '#e8eef6' : 'rgb(246, 238, 232)') :'')}
-                        ,{'-webkit-transform':'scale('+(1/Math.ceil(arrayFilter(processOne.processesContents,processOne).length/3))+')'},{height: (35*Math.ceil(arrayFilter(processOne.processesContents,processOne).length/3))+'px'}
-                        ,{width: (100*Math.ceil(arrayFilter(processOne.processesContents,processOne).length/3))+'%'},{'margin-left': (-100*((Math.ceil(arrayFilter(processOne.processesContents,processOne).length/3))-1)/2)+'%'}
-                        ,{'margin-top': (-35*((Math.ceil(arrayFilter(processOne.processesContents,processOne).length/3))-1)/2)+'px'},{'margin-bottom': (-35*((Math.ceil(arrayFilter(processOne.processesContents,processOne).length/3))-1)/2)+'px'}]">
+                        ,{'-webkit-transform':'scale('+(1/Math.ceil(arrayFilter(processOne.processesContents,processOne).length/2))+')'},{height: (35*Math.ceil(arrayFilter(processOne.processesContents,processOne).length/2))+'px'}
+                        ,{width: (100*Math.ceil(arrayFilter(processOne.processesContents,processOne).length/2))+'%'},{'margin-left': (-100*((Math.ceil(arrayFilter(processOne.processesContents,processOne).length/2))-1)/2)+'%'}
+                        ,{'margin-top': (-35*((Math.ceil(arrayFilter(processOne.processesContents,processOne).length/2))-1)/2)+'px'},{'margin-bottom': (-35*((Math.ceil(arrayFilter(processOne.processesContents,processOne).length/2))-1)/2)+'px'}]">
                             <div v-for="(processesContent,i) in arrayFilter(processOne.processesContents,processOne)"  class=" row  p-1" style="float: left;margin-right: 10px;-webkit-transform-origin: 0" :style="[{opacity:1/0.7},
                             {'margin-left': arrayFilter(processOne.processesContents,processOne).length >3 ? (1*parseInt(arrayFilter(processOne.processesContents,processOne).length/3))+'px' : '0px'}]">
                                 <span>@{{ processesContent.bill_type }}</span>&nbsp;&nbsp;
@@ -369,8 +369,8 @@
                                 <td>参与者</td>
                                 <td>开始时间</td>
                                 <td>结束时间</td>
-                                <td>计时工资</td>
-                                <td>计件工资</td>
+                                <td>计时单价</td>
+                                <td>计件单价</td>
                                 <td>晚饭时间</td>
                                 <td>计时工时</td>
                                 <td>计件数量</td>