zhouzhendong 3 лет назад
Родитель
Сommit
315c364d22

+ 1 - 1
app/Http/Controllers/ProcessController.php

@@ -1050,7 +1050,7 @@ class ProcessController extends Controller
             ,config('database.connections.mysql.username'),config('database.connections.mysql.password'));
         $e->setFileName("二次加工记录-".date('ymdHis'));
         return $e->sql($sql,[
-            "code"=>"任务号","owner_name"=>"货主",
+            "code"=>"任务号","designate"=>"接单人","owner_name"=>"货主",
             "process_method_name"=>"加工类型","amount"=>"预期数量",
             "completed_amount"=>"实际数量","status"=>"状态",
             "remark"=>"加工备注","unit_price"=>"单价",

+ 1 - 0
app/Http/Controllers/TestController.php

@@ -58,6 +58,7 @@ class TestController extends Controller
         $list = DB::connection("aliyunMysql")->select("select * from equipment where category_id = 0 and type = 0 and parent_id is null");
         foreach ($list as $item) {
             $obj = json_decode($item->info);
+            var_dump(DB::connection("aliyunMysql")->update("update equipment set category_id = {$obj->id} where id = {$item->id} or parent_id = {$item->id}"));
         }
     }
 }

+ 3 - 1
app/Services/ProcessService.php

@@ -18,7 +18,7 @@ class ProcessService
      * @return Builder
      */
     private function conditionQuery(array $params){
-        $processes=Process::filterAuthorities()->with(['owner','processMethod','tutorials.owner','signs','operatorLogs.user',
+        $processes=Process::filterAuthorities()->with(['owner','processMethod','designate:id,name','tutorials.owner','signs','operatorLogs.user',
             'signUnitPrice','processesContents'=>function($query){
             return $query->with(['signCommodityName','signCommoditySku','signCommodityBarcode','commodity'=>function($query){
                 return $query->with('barcodes');
@@ -85,6 +85,8 @@ class ProcessService
                 ->selectRaw('processes.code,processes.amount,processes.completed_amount,processes.status,processes.remark,processes.unit_price,processes.created_at')
             ->leftJoin('owners','processes.owner_id','owners.id')
                 ->selectRaw('owners.name owner_name')
+            ->leftJoin('users','processes.designate_id','users.id')
+                ->selectRaw('users.name designate')
             ->leftJoin('process_methods','processes.process_method_id','process_methods.id')
                 ->selectRaw('process_methods.name process_method_name')
             ->leftJoin('processes_contents','processes.id','processes_contents.process_id')

+ 1 - 0
resources/views/process/create.blade.php

@@ -622,6 +622,7 @@
                     };
                     let param = {
                         owner_id:owner_id,process_method_id:process_method_id,unit_price:unit_price,
+                        designate_id:_this.process.designate_id,
                         remark:remark,balance_remark:balance_remark,amount:amount,processContents:_this.processContents,/*tutorials:_this.selectedTutorials*/
                         is_hide:_this.is_hide
                     };

+ 4 - 1
resources/views/process/index.blade.php

@@ -208,6 +208,8 @@
                         </table>
                     </div>
                 </td>
+                <td v-if="processOne.id" class="text-muted" :rowspan="processOne.is_multi_row?2:''">
+                    @{{ processOne.designate }}</td>
                 <td v-if="processOne.id" class="text-muted" :rowspan="processOne.is_multi_row?2:''">@{{ processOne.owner_name }}</td>
                 <td v-if="processOne.id" :rowspan="processOne.is_multi_row?2:''" class="font-weight-bold text-danger">@{{ processOne.process_method_name }}</td>
                 <td v-if="processOne.id" :rowspan="processOne.is_multi_row?2:''">@{{ processOne.amount }}</td>
@@ -463,7 +465,7 @@
                         ,tutorials:{!! $processOne->tutorials !!},processesContents:{!! $processOne->processesContents !!},unit_price:'{{$processOne->unit_price}}',created_at:'{{$processOne->created_at}}',
                         completed_amount:'{{$processOne->completed_amount}}',status:'{{$processOne->status}}',remark:'{{preg_replace("/\s/",' ',$processOne->remark)}}',
                         balance_remark:'{{preg_replace("/\s/",' ',$processOne->balance_remark)}}',
-                        designate_id:"{{$processOne->designate_id}}",
+                        designate_id:"{{$processOne->designate_id}}",designate: "{{$processOne->designate ? $processOne->designate->name :''}}",
                         detailFolding:false,openProcessHour:false,is_multi_row:false,is_verifier_show:false,is_update_unit_price:false,
                         array: []
                     },
@@ -534,6 +536,7 @@
                     {name: 'status', value: '状态'},
                     {name: 'code', value: '任务号'},
                     {name:'person',value: '经手人', neglect: true},
+                    {name:'designate',value: '接单人'},
                     {name: 'owner_name', value: '货主'},
                     {name: 'process_method_name', value: '加工类型'},
                     {name: 'amount', value: '预期数量'},