Merge branch 'master' of ssh://47.103.131.176:10022/var/git/bswas

 Conflicts:

	app/Http/Controllers/TestController.php

app/Filters/WorkOrderFilters.php

@@ -43,7 +43,8 @@ class WorkOrderFilters
         'is_end',
         'status',
         'process_progress',
-        'order_issue_log'
+        'order_issue_log',
+        'log_content'
     ];
     protected $array_filter;
     protected $params = [];
@@ -53,6 +54,7 @@ class WorkOrderFilters
     protected $orderPackageQuery;
     protected $issueTypeQuery;
     protected $orderIssueLogQuery;
+    protected $orderIssueQuery;
 
 
 
@@ -147,9 +149,9 @@ class WorkOrderFilters
     public function afterFileIssueType()
     {
         if (Gate::allows('订单管理-工单处理-客服编辑') || Gate::allows('订单管理-工单处理-货主编辑')) {
-            $this->getOrderIssueQuery()->whereIn('name', ['拦截','取消拦截', '信息更改', '其他', '快递异常', '错漏发', '破损', '快递丢件']);
+            $this->getOrderIssueTypeQuery()->whereIn('name', ['拦截','取消拦截', '信息更改', '其他', '快递异常', '错漏发', '破损', '快递丢件']);
         } else if (Gate::allows('订单管理-工单处理-承运商编辑')) {
-            $this->getOrderIssueQuery()->whereIn('name', ['拦截','取消拦截', '信息更改', '破损', '快递丢件', '快递异常']);
+            $this->getOrderIssueTypeQuery()->whereIn('name', ['拦截','取消拦截', '信息更改', '破损', '快递丢件', '快递异常']);
         }
     }
 
@@ -166,6 +168,10 @@ class WorkOrderFilters
         if ($this->issueTypeQuery) {
             $this->queryBuilder->whereIn('order_issue_type_id', $this->issueTypeQuery);
         }
+
+        if ($this->orderIssueQuery){
+            $this->queryBuilder->whereIn('work_orders.order_id', $this->orderIssueQuery);
+        }
         $this->orderByTag();
     }
 
@@ -198,7 +204,7 @@ class WorkOrderFilters
         return $this->orderPackageQuery;
     }
 
-    public function getOrderIssueQuery(): Builder
+    public function getOrderIssueTypeQuery(): Builder
     {
         if (!$this->issueTypeQuery) {
             $this->issueTypeQuery = OrderIssueType::query()->select('id');
@@ -206,6 +212,15 @@ class WorkOrderFilters
         return $this->issueTypeQuery;
     }
 
+
+    public function getOrderIssueQuery(): Builder
+    {
+        if (!$this->orderIssueQuery) {
+            $this->orderIssueQuery = OrderIssue::query()->select('order_issues.order_id');
+        }
+        return $this->orderIssueQuery;
+    }
+
     public function getOrderIssueLogQuery(): Builder
     {
         if (!$this->orderIssueLogQuery) {
@@ -320,6 +335,17 @@ class WorkOrderFilters
         $this->queryBuilder->whereIn('order_id',$order_issue_query);
     }
 
+    public function log_content($log_content)
+    {
+        $order_issue_process_log_query = OrderIssueProcessLog::query()->selectRaw('order_issue_id')->where('content', 'like', $log_content);
+        if (!array_key_exists('addtime',$this->params) ) {
+            $order_issue_process_log_query->where('created_at', '>=', Carbon::now()->subDays(31));
+        } else {
+            $order_issue_process_log_query->where('created_at', '>=', Carbon::now()->subDays($this->params['addtime']));
+        }
+        $this->getOrderIssueQuery()->whereIn('id',$order_issue_process_log_query);
+    }
+
     public function status($status){
         $status_list = [];
         if ($status == '承运商处理'){

app/Http/Controllers/HandInStorageController.php

@@ -213,9 +213,18 @@ class HandInStorageController extends Controller
             }else{
                 Cache::put($key,true, $ttl);
             }
-
             $result = $handInStorageService->fluxHandPa($info, $checkData);
-            if ($result===true)$this->success("上架成功");
+            if ($result===true){
+                if ($checkData['customerid']=="JIANSHANG"){
+                    $asn=OracleDOCASNHeader::query()
+                        ->where('asnno',$checkData['docno'])
+                        ->where('asnstatus','99')
+                        ->whereIn('asntype',['F10','F21','F31','F32'])
+                        ->first();
+                    if ($asn){$handInStorageService->verifyAsnStatusAndInsert($asn);}
+                }
+                $this->success("上架成功");
+            }
             if ($result===false) $this->error("上架失败");
             if ($result===1)$this->error("拣货区找到效期更新的同样货品，不能上架至存储区");
         } catch (\Exception $e) {

app/Http/Controllers/OracleDOCAsnHeaderController.php

@@ -28,8 +28,12 @@ class OracleDOCAsnHeaderController extends Controller
         if (!$customer_id){
             return ['success'=> false,'message' => '参数错误'];
         }
-        $data = $this->service->getToBeProcessAsnDetailsByCustomId($customer_id);
-        return ['success' => true,'data' => $data];
+        $page = $request->input('page',0);
+        $prePage = $request->input('prePage',20);
+        $data = $this->service->getToBeProcessAsnDetailsByCustomId($customer_id,$page,$prePage);
+        $total= $this->service->getToBeProcessAsnCountByCustomId($customer_id);
+        $page_count = ceil($total / $prePage);
+        return ['success' => true,'data' => $data,'total' => $total,'current_page'=>$page ,'page_count' => $page_count];
     }
 
 }

app/Http/Controllers/ReceivingTaskController.php

@@ -57,12 +57,21 @@ 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 (!$delivery_appointment_car){
+            return ['success' => false,'errors' =>['appointment_number' => ['对应预约号未找到']]];
+        }
+        if (!$delivery_appointment_car->deliveryAppointment){
+            return ['success' => false,'errors' =>['appointment_number' => ['对应预约号未找到']]];
+        }
 
-        if (ReceivingTask::query()->where('delivery_appointment_car_id',$delivery_appointment_car->id)->exists())
+        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' => '生成入库单任务失败，请重新尝试'];

app/Http/Controllers/RejectedController.php

@@ -23,6 +23,7 @@ use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use Illuminate\Routing\Redirector;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Gate;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Validation\ValidationException;
@@ -500,17 +501,31 @@ class RejectedController extends Controller
     public function exportAnalyze(Request $request){
         $searchParams = $this->getAnalyzeSearchParams($request);
         $sql = RejectedAnalyzeOwner::getQuerySQL($searchParams);
-
-        $e = new Export();
-        $e->setMysqlConnection(config('database.connections.mysql.host'),
-            config('database.connections.mysql.port'),config('database.connections.mysql.database')
-            ,config('database.connections.mysql.username'),config('database.connections.mysql.password'));
-        $e->setFileName("退货统计记录单");
-        return $e->sql($sql,[
-            "owner_name"=>"货主名","bounce_amount"=>"退件单数",
-            "check_amount"=>"审核单数","uncheck_amount"=>"未审核单数",
-            "in_storage_count"=>"入库单数","not_in_storage_count"=>"未入库单数",
-        ])->direct();
+        $result_array = DB::select($sql);
+        $row = ['货主名','退件单数','审核单数','未审核单数','入库单数','未入库单数'];
+        $json = [];
+        foreach ($result_array as $result){
+            $json[] = [
+                $result->owner_name,
+                $result->bounce_amount,
+                $result->check_amount,
+                $result->bounce_amount-$result->check_amount,
+                $result->in_storage_count,
+                $result->not_in_storage_count,
+            ];
+        }
+        return Export::make($row,$json,"退货统计记录单");
+//        dd($json);
+//        $e = new Export();
+//        $e->setMysqlConnection(config('database.connections.mysql.host'),
+//            config('database.connections.mysql.port'),config('database.connections.mysql.database')
+//            ,config('database.connections.mysql.username'),config('database.connections.mysql.password'));
+//        $e->setFileName("退货统计记录单");
+//        return $e->sql($sql,[
+//            "owner_name"=>"货主名","bounce_amount"=>"退件单数",
+//            "check_amount"=>"审核单数","uncheck_amount"=>"未审核单数",
+//            "in_storage_count"=>"入库单数","not_in_storage_count"=>"未入库单数",
+//        ])->direct();
     }
 
     public function apiGetRejectedByLogisticNumberReturn(Request $request){

app/Jobs/PackageCollectingAllocation.php

@@ -37,23 +37,8 @@ class PackageCollectingAllocation implements ShouldQueue
     {
         /** @var OrderPackageService $orderPackageService */
         $orderPackageService = app('OrderPackageService');
-        DB::beginTransaction();
-        try {
-            $result = OrderPackage::query()->where("id",$this->orderPackage->id)
-                ->where("collecting_status",0)->update(["collecting_status"=>1]);
-            if ($result==1){
-                $result = $orderPackageService->collectUpload([$this->orderPackage->logistic_number]);
-                if (!$result["success"]){
-                    DB::rollBack();
-                    Log::warning("自动揽收失败",["message"=>$result["message"],"param"=>$this->orderPackage->logistic_number]);
-                    return;
-                }
-            }else Log::warning("自动揽收异常",["message"=>"未能成功修改揽收标记","param"=>["id"=>$this->orderPackage->id,
-                "number"=>$this->orderPackage->logistic_number],"line"=>$result]);
-            DB::commit();
-        }catch (\Exception $e){
-            DB::rollBack();
-            Log::warning("自动揽收错误",["param"=>$this->orderPackage->toJson()]);
+        if (OrderPackage::query()->selectRaw('1')->where('logistic_number',$this->orderPackage->logistic_number)->where('collecting_status',0)->first()){
+            $orderPackageService->collectUpload([$this->orderPackage->logistic_number]);
         }
     }
 }

app/OracleDOCASNDetail.php

@@ -33,7 +33,7 @@ class OracleDOCASNDetail extends Model
     public function basSku()
     {
         return $this->hasOne(OracleBasSKU::class,['customerid','sku'],['customerid','sku'])
-            ->select('customerid','sku','lotid','alternate_sku1','alternate_sku2','alternate_sku3','descr_c','alternate_sku1','alternate_sku2','alternate_sku3');
+            ->select('customerid','sku','lotid','alternate_sku1','alternate_sku2','alternate_sku3','descr_c');
 
     }
 }

app/ReceivingTask.php

@@ -18,6 +18,7 @@ class ReceivingTask extends Model
         'warehouse_id',
         'owner_id',
         'delivery_appointment_car_id',
+        'user_id',
         'driver_name',
         'driver_phone',
         "for_single_member",
@@ -44,6 +45,11 @@ class ReceivingTask extends Model
         return $this->belongsTo(Owner::class);
     }
 
+    public function user(): BelongsTo
+    {
+        return $this->belongsTo(User::class);
+    }
+
     public function deliveryAppointmentCar(): BelongsTo
     {
         return $this->belongsTo(DeliveryAppointmentCar::class);

app/Services/HandInStorageService.php

@@ -469,6 +469,45 @@ sql;
             return true; //上架成功
         });
     }
+
+    /**
+     * ASN关闭后  针对JIANSHANG货主，订单关闭后将数据写入临时表CUS_ADJ_H
+     */
+    public function verifyAsnStatusAndInsert($asn)
+    {
+        $who = 'WAS' . (Auth::user() ? '-' . Auth::user()["name"] : '');
+        $host = config('database.connections.oracle.host');
+        $serviceName = config('database.connections.oracle.service_name');
+        $user = config('database.connections.oracle.username');
+        $password = config('database.connections.oracle.password');
+        $conn = oci_connect($user, $password, $host . '/' . $serviceName, 'utf8');
+        $IN_WarehouseID = '';
+        $IN_Parameter1 = 'ASNCLOSE_AFTER';
+        $IN_Parameter2 = $asn->asnno;
+        $IN_Parameter3 = $asn->asnstatus;
+        $IN_Parameter4 = '';
+        $IN_Language = '';
+        $IN_UserID = $who;
+        $OUT_Return_Code = '';
+        $sql_sp = "begin SPUDF_ProcessA(:IN_WarehouseID,:IN_Parameter1,:IN_Parameter2,:IN_Parameter3,:IN_Parameter4,:IN_Language,:IN_UserID,:OUT_Return_Code); end;";
+        $stmt = oci_parse($conn, $sql_sp);
+        oci_bind_by_name($stmt, ':IN_WarehouseID', $IN_WarehouseID);
+        oci_bind_by_name($stmt, ':IN_Parameter1', $IN_Parameter1);
+        oci_bind_by_name($stmt, ':IN_Parameter2', $IN_Parameter2);
+        oci_bind_by_name($stmt, ':IN_Parameter3', $IN_Parameter3);
+        oci_bind_by_name($stmt, ':IN_Parameter4', $IN_Parameter4);
+        oci_bind_by_name($stmt, ':IN_Language', $IN_Language);
+        oci_bind_by_name($stmt, ':IN_UserID', $IN_UserID);
+        oci_bind_by_name($stmt, ':OUT_Return_Code', $OUT_Return_Code, 300);
+        oci_execute($stmt);
+
+        if (substr($OUT_Return_Code, 0, 3) != '000') {
+            app('LogService')->log(__METHOD__, '上架调用sp生成异动数据失败' . __FUNCTION__, "asn:" . $asn . "ERROR：" . $OUT_Return_Code);
+            return false;
+        }
+        oci_close($conn);
+        return true;
+    }
     /**
      * @param $task
      * @param $location

app/Services/OracleDocAsnHerderService.php

@@ -36,14 +36,24 @@ class OracleDocAsnHerderService
             ->get();
     }
 
-    public function getToBeProcessAsnDetailsByCustomId($customId)
+    public function getToBeProcessAsnDetailsByCustomId($customId,$page = 1, $perGage= 20)
     {
         return OracleDOCASNHeader::query()
             ->with(['asnType', 'asnStatus', 'basCustomer','asnDetails' => function ($query) {
                 $query->with(['lineStatus', 'qualityStatus', 'basSku']);
             }])
             ->whereIn("AsnStatus", ['00', '30'])
-            ->where('CustomerId', $customId)->get();
+            ->where('CustomerId', $customId)->orderByDesc('addtime')->forPage($page,$perGage)->get();
+    }
+
+    public function getToBeProcessAsnCountByCustomId($customId): int
+    {
+        return OracleDOCASNHeader::query()
+            ->with(['asnType', 'asnStatus', 'basCustomer','asnDetails' => function ($query) {
+                $query->with(['lineStatus', 'qualityStatus', 'basSku']);
+            }])
+            ->whereIn("AsnStatus", ['00', '30'])
+            ->where('CustomerId', $customId)->count();
     }
 
 }

app/Services/ReceivingTaskService.php

@@ -2,12 +2,12 @@
 
 namespace App\Services;
 
-use App\DeliveryAppointment;
 use App\DeliveryAppointmentCar;
 use App\Traits\ServiceAppAop;
 use App\ReceivingTask;
 use App\Utils\IdCreate;
 use Illuminate\Support\Carbon;
+use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
 use Ramsey\Uuid\Uuid;
 
@@ -54,6 +54,7 @@ class ReceivingTaskService
         $task_number = $this->buildTaskNumber();
         $params['number'] = $task_number;
         $params['delivery_appointment_car_id'] = $deliveryAppointmentCar->id;         // 预约号
+        $params['user_id'] = Auth::user()->id;
         $receivingTask = new ReceivingTask($params);
         DB::transaction(function () use ($deliveryAppointmentCar, $params, &$receivingTask) {
             $receivingTask->save();

database/migrations/2021_12_31_092206_receiving_task_add_user_id.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class ReceivingTaskAddUserId extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('receiving_tasks', function (Blueprint $table) {
+            $table->integer('user_id')->comment('创建人');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('receiving_tasks', function (Blueprint $table) {
+            $table->dropColumn('user_id');
+        });
+    }
+}

resources/views/inventory/stockInventory/inventoryMission.blade.php

@@ -1624,8 +1624,8 @@
                                 return true;
                             });
                             _this.重排序并显示();
-                            if (response.data.inventoryMission.difference_amount!==0)_this.初盘有盘点差异_确认是否重盘();
-                            if (response.data.inventoryMission.difference_amount===0){
+                            if (response.data.inventoryMission.difference_amount!=0){_this.初盘有盘点差异_确认是否重盘();}
+                            if (response.data.inventoryMission.difference_amount==0){
                                 _this.清空inputs();
                                 tempTip.setDuration(3000);
                                 tempTip.showSuccess('盘点成功！');

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

@@ -189,10 +189,6 @@
                         <th class="three-layer bg-whit  align-middle" rowspan="2" style="min-width: 180px">情况说明</th>
                         <th class="three-layer align-middle" rowspan="2" style="min-width: 115px">问题类别</th>
                         <th class="three-layer align-middle" colspan="4" style="min-width: 155px">处理结果</th>
-
-                        <th class="three-layer align-middle " rowspan="2"
-                            style="max-width: 500px;min-width: 400px;">快递路由
-                        </th>
                         @cannot('订单管理-问题件-客户不可见')
                             <th class="three-layer  align-middle" rowspan="2"
                                 style="width:50px">@{{ isShowSecondOrderInfo ? '隐藏':'展开' }}
@@ -716,33 +712,7 @@
                         {{--情况说明 结束--}}
 
                         {{--客户编辑 开启--}}
-                        <td>
-                            <div class="alert alert-light " v-for="(item,i) in orderIssue.order.packages">
-                                <div class="text-left">
-                                    <span v-text="item.logistic_number"></span>
-                                    <span class="float-right" v-if="item['transfer_status'].length === 0">暂无路由信息</span>
-                                    <button type="button" class="btn btn-sm btn-outline-primary float-right" v-if="item['transfer_status'].length > 0 && selectOrderPackage!==item.id" @click="selectOrderPackage = item.id">展开</button>
-                                    <button type="button" class="btn btn-sm btn-outline-primary float-right" v-if="selectOrderPackage === item.id" @click="selectOrderPackage = null">收起</button>
-                                </div>
-                                <div class="text-left" v-if="selectOrderPackage === item.id">
-                                    <div v-for="transfer in item['transfer_status']">
-                                        <div >
-                                            <hr>
-                                            <span class="mr-1 text-monospace">时间:</span>
-                                            <span v-text="transfer['accept_time']"></span>
-                                        </div>
-                                        <div>
-                                            <span class="mr-1 text-monospace">到达地:</span>
-                                            <span v-text="transfer['accept_address']"></span>
-                                        </div>
-                                        <div>
-                                            <span class="mr-1 text-monospace">详情:</span>
-                                            <span v-text="transfer['remark']"></span>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </td>
+
                     @cannot('订单管理-问题件-客户不可见')
                             <td class="p-0 m-0 child-layer-3" style="min-width:50px;"
                                 v-if="index===0"
@@ -1247,7 +1217,6 @@
                     orderIssue: {id: null, showId: ''},
                 },
                 toggleBtnHeight: null,
-                selectOrderPackage: null,
             },
             created() {
                 let _this = this;
@@ -1529,29 +1498,12 @@
                     this.isShowRejectedBill = false;
                     this.isShowSecondOrderInfo = false;
                 },
-                sortTransferStatus(item){
-                    item.isShowTransferStatus = false;
-                    item.isShowRemark = false;
-                    if (item['transfer_status'] == null) {
-                        item['transfer_status'] = [];
-                        return;
-                    }
-                    if (item['transfer_status'].length === 0) return;
-                    item['transfer_status'].sort((item1,item2)=>{
-                        let date1 = new Date(item1['accept_time']);
-                        let date2 = new Date(item2['accept_time']);
-                        if (date1 - date2 > 0) return -1;
-                        if (date1 - date2 < 0) return 1;
-                        return 0;
-                    });
-                },
                 regroupOrder(order) {
                     if (!order) return;
                     let amounts = 0; // 商品总数
                     let type_numbers = 0; // 商品类型数量
                     let _this = this;
                     $.each(order.packages, function (i, item) {
-                        _this.sortTransferStatus(item);
                         $.each(item.commodities, function (i, commodity) {
                             type_numbers++;
                             amounts += Number(commodity.amount);

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

@@ -447,6 +447,10 @@
                     $(".up").slideUp();
                     $(".tooltipTarget").tooltip({'trigger': 'hover'});
                     $("#list").removeClass('d-none');
+                    let log_content_range = [{name: '15', value: '15天内'}, {name: '31', value: '近一月'}, {
+                        name: '92',
+                        value: '近三月'
+                    }, {name: '183', value: '近半年'}, {name: '366', value: '近一年'}, {name: '0', value: '不限'},];
                     let data = [[
                         {name: 'created_at_start', type: 'time', tip: ['工单创建开始日期', '时间']},
                         {name: 'created_at_end', type: 'time', tip: ['工单创建结束日期', '时间']},
@@ -526,6 +530,21 @@
                         {name: 'is_end', type: 'checkbox', tip: '是否已拦截', data: [{name: 'ture', value: '已完成'}]},
                     ], [
                         {name: 'order_issue_log', type: 'input', placeholder: '问题件处理日志'},
+                        {
+                            name: ['log_content', 'addtime'],
+                            type: 'input_select',
+                            tip: ['处理结果:前或后加 百分号为单个模糊搜索，否则为多条件精确搜索', '查询范围越短，搜索速度越快'],
+                            placeholder: ['处理结果', ''],
+                            data: log_content_range,
+                            rules: [{
+                                son: {
+                                    addtime: {
+                                        default: '31',
+                                        required_without_all_if: ['created_at_start', 'created_at_end']
+                                    }
+                                }
+                            }]
+                        },
                     ]];
                     this.form = new query({
                         el: '#form_div',

resources/views/store/receivingTasks/create.blade.php

@@ -44,7 +44,6 @@
                                            id="for_single_member" name="for_single_member"
                                            :class="{'is-invalid':errors.for_single_member}"
                                            @change="clearError('for_single_member')"
-
                                            v-model="receiving_task.for_single_member">
                                     <div id="validation-for-single-member" class="invalid-feedback"
                                          v-show="errors.for_single_member">
@@ -301,6 +300,18 @@
                             label="接收时间">
                         </el-table-column>
                     </el-table>
+
+                    <div class="block">
+                        <el-pagination
+                            @size-change="handleSizeChange"
+                            @current-change="handleCurrentChange"
+                            :current-page="current_page"
+                            :page-sizes="['50',100, 200, 300, 400]"
+                            :page-size="50"
+                            layout="total, sizes, prev, pager, next, jumper"
+                            :total="total">
+                        </el-pagination>
+                    </div>
                 </div>
                 <div class="card-body mt-0 pt-0 pm-0">
                     <el-table
@@ -352,7 +363,10 @@
                 </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")
@@ -380,7 +394,7 @@
                     appointment_number: null,
                     driver_name: null,
                     driver_phone: null,
-                    for_single_member: null,
+                    for_single_member: '{{ Auth::user()->name }}',
                     plate_number: null,
                     driving_license_no: null,
                     logistics_single_number: null,
@@ -404,6 +418,10 @@
                     @endforeach
                 ],
                 driving_license_image: null,
+                page_size: 20,
+                pager_count: 0,
+                current_page: 0,
+                total: 0,
                 asn_headers: [],
                 asn_details: [],
                 asn_detail: [],
@@ -439,7 +457,7 @@
                     owner: null,                // 货主
                     appointment_number: null, // 预约号
                 },
-                clodop:null,
+                clodop: null,
                 clodopPrintDialogVisible: false,
                 printerList: [],
                 print_setting: {
@@ -505,20 +523,50 @@
                         this.submit_loading = false;
                     })
                 },
-                getASNDetails() {
+                nextPage() {
+                    this.getASNDetails(false,this.current_page + 1,this.pager_count);
+                },
+                prevPage(){
+                    this.getASNDetails(false,this.current_page - 1,this.pager_count);
+                },
+                handleSizeChange(val){
+                    this.getASNDetails(false,0,val);
+                },
+                handleCurrentChange(val){
+                    this.getASNDetails(false,val,this.pager_count);
+                },
+                changeCurrent(val){
+                    this.getASNDetails(false,val,this.pager_count);
+                },
+                getASNDetails(isChange,page, prePage) {
                     let {owner_id} = this.receiving_task;
                     let owner = this.owners.filter(e => e.id === owner_id).find(e => e);
                     if (!owner) return;
                     let url = '{{route('oracle.asn.getToBeProcessApi')}}';
-                    let data = {customer_id: owner.value};
+                    page = page ? page : this.current_page;
+                    prePage = prePage ? prePage : this.prevPage;
+                    if (isChange){
+                        this.current_page = 0;
+                        this.pager_count = 20;
+                        this.sum = 0;
+                    }
+                    let data = {
+                        customer_id: owner.value,
+                        page: page,
+                        prePage: prePage
+                    };
                     window.axios.post(url, data).then(res => {
                         if (res.data.success) {
+                            this.total = res.data.total;
+                            this.pager_count = res.data.pager_count;
+                            this.current_page = res.data.current_page;
                             this.asn_headers = this.formatAsnHeaderDetails(res.data.data);
+                            this.selected_asn_nos = [];
                         }
                     }).catch(err => {
                         this.errorTempTip(err);
                     });
-                 },
+                },
                 formatAsnHeaderDetails(asnHeaderDetails) {
                     return asnHeaderDetails.map(e => this.formatAsnHeaderDetail(e));
                 },
@@ -655,7 +703,7 @@
                     }
                 },
                 downloadClodopConfirm() {
-                    this.$confirm('打印组件确实，是否下在?', '提示', {
+                    this.$confirm('打印组件不存在，是否下载?', '提示', {
                         confirmButtonText: '确定',
                         cancelButtonText: '取消',
                         type: 'warning'
@@ -684,7 +732,7 @@
                         });
                     }
                 },
-                clodopPrint(){
+                clodopPrint() {
                     let {
                         number,               // 收货任务号
                         warehouse,             // 仓库
@@ -698,63 +746,63 @@
                         owner,                // 货主
                         appointment_number, // 预约号
                     } = this.receiving_task_print;
-                    this.clodop.PRINT_INITA(2,0,0,0,"");
-                    this.clodop.SET_PRINT_PAGESIZE(2,'76mm','130mm');
-                    this.clodop.ADD_PRINT_BARCODE(20,70,350,50,"Code39",number);
-                    this.clodop.SET_PRINT_STYLEA(0,"FontSize",10);
-                    this.clodop.ADD_PRINT_TEXT(100,15,100,20,"收货任务号");
-                    this.clodop.SET_PRINT_STYLEA(0,"FontSize",10);
-                    this.clodop.SET_PRINT_STYLEA(0,"Alignment",2);
-                    this.clodop.SET_PRINT_STYLEA(0,"Bold",1);
-                    this.clodop.ADD_PRINT_TEXT(130,15,100,20,"仓库");
-                    this.clodop.SET_PRINT_STYLEA(0,"FontSize",10);
-                    this.clodop.SET_PRINT_STYLEA(0,"Alignment",2);
-                    this.clodop.SET_PRINT_STYLEA(0,"Bold",1);
-                    this.clodop.ADD_PRINT_TEXT(160,15,100,20,"司机姓名");
-                    this.clodop.SET_PRINT_STYLEA(0,"FontSize",10);
-                    this.clodop.SET_PRINT_STYLEA(0,"Alignment",2);
-                    this.clodop.SET_PRINT_STYLEA(0,"Bold",1);
-                    this.clodop.ADD_PRINT_TEXT(190,15,100,20,"车牌号");
-                    this.clodop.SET_PRINT_STYLEA(0,"FontSize",10);
-                    this.clodop.SET_PRINT_STYLEA(0,"Alignment",2);
-                    this.clodop.SET_PRINT_STYLEA(0,"Bold",1);
-                    this.clodop.ADD_PRINT_TEXT(220,15,100,20,"是否提供清单");
-                    this.clodop.SET_PRINT_STYLEA(0,"FontSize",10);
-                    this.clodop.SET_PRINT_STYLEA(0,"Alignment",2);
-                    this.clodop.SET_PRINT_STYLEA(0,"Bold",1);
-                    this.clodop.ADD_PRINT_TEXT(250,15,100,20,"货主");
-                    this.clodop.SET_PRINT_STYLEA(0,"FontSize",10);
-                    this.clodop.SET_PRINT_STYLEA(0,"Alignment",2);
-                    this.clodop.SET_PRINT_STYLEA(0,"Bold",1);
-                    this.clodop.ADD_PRINT_TEXT(130,245,100,20,"投单员");
-                    this.clodop.SET_PRINT_STYLEA(0,"Alignment",2);
-                    this.clodop.SET_PRINT_STYLEA(0,"Bold",1);
-                    this.clodop.ADD_PRINT_TEXT(160,245,100,20,"司机电话");
-                    this.clodop.SET_PRINT_STYLEA(0,"Alignment",2);
-                    this.clodop.SET_PRINT_STYLEA(0,"Bold",1);
-                    this.clodop.ADD_PRINT_TEXT(190,245,100,20,"驾驶证号");
-                    this.clodop.SET_PRINT_STYLEA(0,"Alignment",2);
-                    this.clodop.SET_PRINT_STYLEA(0,"Bold",1);
-                    this.clodop.ADD_PRINT_TEXT(220,245,100,20,"收货类型");
-                    this.clodop.SET_PRINT_STYLEA(0,"Alignment",2);
-                    this.clodop.SET_PRINT_STYLEA(0,"Bold",1);
-                    this.clodop.ADD_PRINT_TEXT(250,245,100,20,"预约号");
-                    this.clodop.SET_PRINT_STYLEA(0,"Alignment",2);
-                    this.clodop.SET_PRINT_STYLEA(0,"Bold",1);
-                    this.clodop.ADD_PRINT_TEXT(100,115,250,20,number); // number
-                    this.clodop.SET_PRINT_STYLEA(0,"FontSize",10);
-                    this.clodop.SET_PRINT_STYLEA(0,"Alignment",2);
-                    this.clodop.SET_PRINT_STYLEA(0,"Bold",1);
-                    this.clodop.ADD_PRINT_TEXT(130,115,130,20,warehouse);  // warehouse
-                    this.clodop.ADD_PRINT_TEXT(160,115,100,20,driver_name); //driver_name
-                    this.clodop.ADD_PRINT_TEXT(190,115,130,20,plate_number);  //plate_number
-                    this.clodop.ADD_PRINT_TEXT(220,115,100,20,provide_list); //provide_list
-                    this.clodop.ADD_PRINT_TEXT(250,115,130,20,owner);  // owner
-                    this.clodop.ADD_PRINT_TEXT(130,345,100,20,for_single_member);  // for_single_member
-                    this.clodop.ADD_PRINT_TEXT(160,345,140,20,driver_phone); // driver_phone
-                    this.clodop.ADD_PRINT_TEXT(190,345,140,20,driving_license_no); // driving_license_no
-                    this.clodop.ADD_PRINT_TEXT(220,345,100,20,receiving_type);  // receiving_type
-                    this.clodop.ADD_PRINT_TEXT(250,345,140,20,appointment_number); //appointment_number
+                    this.clodop.PRINT_INITA(2, 0, 0, 0, "");
+                    this.clodop.SET_PRINT_PAGESIZE(2, '76mm', '130mm');
+                    this.clodop.ADD_PRINT_BARCODE(20, 70, 350, 50, "Code39", number);
+                    this.clodop.SET_PRINT_STYLEA(0, "FontSize", 10);
+                    this.clodop.ADD_PRINT_TEXT(100, 15, 100, 20, "收货任务号");
+                    this.clodop.SET_PRINT_STYLEA(0, "FontSize", 10);
+                    this.clodop.SET_PRINT_STYLEA(0, "Alignment", 2);
+                    this.clodop.SET_PRINT_STYLEA(0, "Bold", 1);
+                    this.clodop.ADD_PRINT_TEXT(130, 15, 100, 20, "仓库");
+                    this.clodop.SET_PRINT_STYLEA(0, "FontSize", 10);
+                    this.clodop.SET_PRINT_STYLEA(0, "Alignment", 2);
+                    this.clodop.SET_PRINT_STYLEA(0, "Bold", 1);
+                    this.clodop.ADD_PRINT_TEXT(160, 15, 100, 20, "司机姓名");
+                    this.clodop.SET_PRINT_STYLEA(0, "FontSize", 10);
+                    this.clodop.SET_PRINT_STYLEA(0, "Alignment", 2);
+                    this.clodop.SET_PRINT_STYLEA(0, "Bold", 1);
+                    this.clodop.ADD_PRINT_TEXT(190, 15, 100, 20, "车牌号");
+                    this.clodop.SET_PRINT_STYLEA(0, "FontSize", 10);
+                    this.clodop.SET_PRINT_STYLEA(0, "Alignment", 2);
+                    this.clodop.SET_PRINT_STYLEA(0, "Bold", 1);
+                    this.clodop.ADD_PRINT_TEXT(220, 15, 100, 20, "是否提供清单");
+                    this.clodop.SET_PRINT_STYLEA(0, "FontSize", 10);
+                    this.clodop.SET_PRINT_STYLEA(0, "Alignment", 2);
+                    this.clodop.SET_PRINT_STYLEA(0, "Bold", 1);
+                    this.clodop.ADD_PRINT_TEXT(250, 15, 100, 20, "货主");
+                    this.clodop.SET_PRINT_STYLEA(0, "FontSize", 10);
+                    this.clodop.SET_PRINT_STYLEA(0, "Alignment", 2);
+                    this.clodop.SET_PRINT_STYLEA(0, "Bold", 1);
+                    this.clodop.ADD_PRINT_TEXT(130, 245, 100, 20, "投单员");
+                    this.clodop.SET_PRINT_STYLEA(0, "Alignment", 2);
+                    this.clodop.SET_PRINT_STYLEA(0, "Bold", 1);
+                    this.clodop.ADD_PRINT_TEXT(160, 245, 100, 20, "司机电话");
+                    this.clodop.SET_PRINT_STYLEA(0, "Alignment", 2);
+                    this.clodop.SET_PRINT_STYLEA(0, "Bold", 1);
+                    this.clodop.ADD_PRINT_TEXT(190, 245, 100, 20, "驾驶证号");
+                    this.clodop.SET_PRINT_STYLEA(0, "Alignment", 2);
+                    this.clodop.SET_PRINT_STYLEA(0, "Bold", 1);
+                    this.clodop.ADD_PRINT_TEXT(220, 245, 100, 20, "收货类型");
+                    this.clodop.SET_PRINT_STYLEA(0, "Alignment", 2);
+                    this.clodop.SET_PRINT_STYLEA(0, "Bold", 1);
+                    this.clodop.ADD_PRINT_TEXT(250, 245, 100, 20, "预约号");
+                    this.clodop.SET_PRINT_STYLEA(0, "Alignment", 2);
+                    this.clodop.SET_PRINT_STYLEA(0, "Bold", 1);
+                    this.clodop.ADD_PRINT_TEXT(100, 115, 250, 20, number); // number
+                    this.clodop.SET_PRINT_STYLEA(0, "FontSize", 10);
+                    this.clodop.SET_PRINT_STYLEA(0, "Alignment", 2);
+                    this.clodop.SET_PRINT_STYLEA(0, "Bold", 1);
+                    this.clodop.ADD_PRINT_TEXT(130, 115, 130, 20, warehouse);  // warehouse
+                    this.clodop.ADD_PRINT_TEXT(160, 115, 100, 20, driver_name); //driver_name
+                    this.clodop.ADD_PRINT_TEXT(190, 115, 130, 20, plate_number);  //plate_number
+                    this.clodop.ADD_PRINT_TEXT(220, 115, 100, 20, provide_list); //provide_list
+                    this.clodop.ADD_PRINT_TEXT(250, 115, 130, 20, owner);  // owner
+                    this.clodop.ADD_PRINT_TEXT(130, 345, 100, 20, for_single_member);  // for_single_member
+                    this.clodop.ADD_PRINT_TEXT(160, 345, 140, 20, driver_phone); // driver_phone
+                    this.clodop.ADD_PRINT_TEXT(190, 345, 140, 20, driving_license_no); // driving_license_no
+                    this.clodop.ADD_PRINT_TEXT(220, 345, 100, 20, receiving_type);  // receiving_type
+                    this.clodop.ADD_PRINT_TEXT(250, 345, 140, 20, appointment_number); //appointment_number
                     this.clodop.PREVIEW();
                 }
             }

resources/views/store/receivingTasks/index.blade.php

@@ -8,30 +8,32 @@
 
 @section('content')
     <div id="list" class="container-fluid d-none">
-        <div >
+        <div>
             <div id="form_div" style="min-width: 1220px;"></div>
             <div class="ml-3 form-inline" id="btn">
                 @can('入库管理-开单入库-打印任务单')
-                <button type="button"
-                        class="ml-2 btn btn-sm btn-outline-success "
-                        @click="printReceivingTask" >打印任务清单
-                </button>
+                    <button type="button"
+                            class="ml-2 btn btn-sm btn-outline-success "
+                            @click="printReceivingTask">打印任务清单
+                    </button>
                 @endcan
             </div>
             <div>
-                <table class="table table-sm table-striped table-hover table-bordered  " id="table">
-                    <tr v-for="(item,i) in receiving_tasks" @click="selectTr===i+1?selectTr=0:selectTr=i+1" :class="selectTr===i+1?'focusing' : ''">
+                <table class="table table-sm table-striped table-hover table-bordered" id="table">
+                    <tbody>
+                    <tr v-for="(item,i) in receiving_tasks"
+                        @click="selectTr===i+1?selectTr=0:selectTr=i+1" :class="selectTr===i+1?'focusing' : ''">
                         <td>
-                            <label><input type="checkbox" :value="item.id"></label>
+                            <input type="checkbox" class="checkItem" :value="item.id">
                         </td>
                         <td v-text="i+1"></td>
                         <td v-text="item.number"></td>
                         <td v-text="item.status"></td>
-                        <td >
+                        <td>
                             <template v-for="(asn_no,i) in item.asn_nos">
-                               <div >
-                                   <span v-text="asn_no"></span>
-                               </div>
+                                <div>
+                                    <span v-text="asn_no"></span>
+                                </div>
                             </template>
                         </td>
                         <td v-text="item.created_at"></td>
@@ -40,6 +42,7 @@
                         <td v-text="item.driving_license_no"></td>
                         <td v-text="item.receiving_type"></td>
                     </tr>
+                    </tbody>
                 </table>
                 <div class="text-info h5 btn btn">{{$receivingTasks->count()}}/@{{ total }}</div>
                 {{ $receivingTasks->withQueryString()->links() }}
@@ -50,10 +53,11 @@
 @endsection
 @section('lastScript')
     <script type="text/javascript" src="{{mix('js/queryForm/queryForm.js')}}"></script>
-    <script type="text/javascript" src="{{mix('js/queryForm/header.js')}}"></script>
-    <script type="text/javascript" src="{{ mix('js/element-ui.js') }}"></script>
+    <script type="text/javascript" src="{{mix('js/queryForm/header.js')}}"></script>{{--新版2--}}
+    <script type="text/javascript" src="{{mix('js/element-ui.js') }}"></script>
     <script type="text/javascript" src="{{mix('js/lodop/LodopFuncs.js')}}"></script>
-    <script src='http://localhost:18000/CLodopfuncs.js?name=CLODOPA'></script>
+
+    <script type="text/javascript" src='http://localhost:18000/CLodopfuncs.js?name=CLODOPA'></script>
 
     <script>
         let vue = new Vue({
@@ -61,7 +65,7 @@
             data: {
                 receiving_tasks: [],
                 total: 0,
-                selectTr:0,
+                selectTr: 0,
                 owners: [
                         @foreach($owners as $owner)
                     {
@@ -76,38 +80,39 @@
                     },
                     @endforeach
                 ],
-                receiving_task_print:{
-                    number:null,
-                    warehouse:null,
-                    for_single_member:null,
-                    driver_name:null,
-                    driver_phone:null,
-                    plate_number:null,
-                    driving_license_no:null,
-                    provide_list:null,
-                    receiving_type:null,
-                    owner:null,
-                    appointment_number:null,
+                receiving_task_print: {
+                    number: null,
+                    warehouse: null,
+                    for_single_member: null,
+                    driver_name: null,
+                    driver_phone: null,
+                    plate_number: null,
+                    driving_license_no: null,
+                    provide_list: null,
+                    receiving_type: null,
+                    owner: null,
+                    appointment_number: null,
                 },
-                clodop:null,
+                clodop: null,
                 clodopPrintDialogVisible: false,
                 printerList: [],
                 print_setting: {
                     printer_index: 0,
                 }
             },
+            created() {
+            },
             mounted() {
                 let receiving_tasks = {!! $receivingTasks->toJson() !!}['data'];
+                this.receiving_tasks = this.sortReceivingTasks(receiving_tasks);
                 this.total = {!! $receivingTasks->toJson() !!}['total'];
                 $("#list").removeClass('d-none');
-                this.receiving_tasks = this.sortReceivingTasks(receiving_tasks);
-
                 let data = [[
                     {name: 'created_at_start', type: 'dateTime', tip: '选择显示指定日期的起始时间', placeholder: ''},
                     {name: 'created_at_end', type: 'dateTime', tip: '选择显示指定日期的结束时间', placeholder: ''},
                     {name: 'number', type: 'input', tip: '任务号：如模糊搜索需要在条件前后输入%号，回车提交', placeholder: '任务号'},
                     {name: 'appointment_number', type: 'input', tip: '预约号：如模糊搜索需要在条件前后输入%号，回车提交', placeholder: '预约号'},
-                ],[
+                ], [
                     {
                         name: 'owner_id',
                         type: 'select_multiple_select',
@@ -130,23 +135,27 @@
                 this.form.init();
 
                 let column = [
-                    {name:'id',value: '序号', neglect: true},
-                    {name:'number',value: '收货任务号'},
-                    {name:'status',value: '状态', neglect: true},
-                    {name:'asn_nos',value: 'ASN单号', neglect: true},
-                    {name:'created_at',value: '投单时间'},
-                    {name:'warehouse',value: '仓库'},
-                    {name:'appointment_number',value: '预约号'},
-                    {name:'driving_license_no',value: '驾驶证号'},
-                    {name:'receiving_type',value: '收货类型'},
+                    {name: 'id', value: '序号', neglect: true},
+                    {name: 'number', value: '收货任务号'},
+                    {name: 'status', value: '状态', neglect: true},
+                    {name: 'asn_nos', value: 'ASN单号', neglect: true},
+                    {name: 'created_at', value: '投单时间'},
+                    {name: 'warehouse', value: '仓库'},
+                    {name: 'appointment_number', value: '预约号'},
+                    {name: 'driving_license_no', value: '驾驶证号'},
+                    {name: 'receiving_type', value: '收货类型'},
                 ];
-                new Header({
+                let init = new Header({
                     el: "table",
                     name: "receiving_tasks",
                     column: column,
                     data: this.receiving_tasks,
+                    restorationColumn: 'id',
                     fixedTop: ($('#form_div').height()) + ($('#btn').height()) + 1,
-                }).init();
+                });
+                setTimeout(()=>{
+                    init.init();
+                },300);
             },
             methods: {
                 waitingTempTip(message) {
@@ -173,6 +182,7 @@
                     let warehouse = this.getWarehouseName(task);
                     let owner = this.getOwnerName(task);
                     return {
+                        id: task.id,
                         number: task.number,
                         status: task.status,
                         asn_nos: asn_nos,
@@ -210,19 +220,19 @@
                     let {owner} = task;
                     return owner ? owner.name : '';
                 },
-                printReceivingTask(){
-                    let message =null;
-                    if (checkData.length > 1){
+                printReceivingTask() {
+                    let message = null;
+                    if (checkData.length > 1) {
                         message = '进行单个任务打印';
-                    }else if (checkData.length === 1){
+                    } else if (checkData.length < 1) {
                         message = '请勾选收货任务';
                     }
-                    if (message){
+                    if (message) {
                         this.errorTempTip(message);
-                        return ;
+                        return;
                     }
                     let id = checkData[0];
-                    this.receiving_task_print = this.receiving_tasks.find(e=>e.id===id);
+                    this.receiving_task_print = this.receiving_tasks.find(e => e.id.toString() === id);
                     this.printLodop();
                 },
                 printLodop() {
@@ -239,7 +249,7 @@
                     }
                 },
                 downloadClodopConfirm() {
-                    this.$confirm('打印组件确实，是否下在?', '提示', {
+                    this.$confirm('打印组件不存在，是否下载?', '提示', {
                         confirmButtonText: '确定',
                         cancelButtonText: '取消',
                         type: 'warning'
@@ -268,7 +278,7 @@
                         });
                     }
                 },
-                clodopPrint(){
+                clodopPrint() {
                     let {
                         number,               // 收货任务号
                         warehouse,             // 仓库
@@ -282,63 +292,64 @@
                         owner,                // 货主
                         appointment_number, // 预约号
                     } = this.receiving_task_print;
-                    this.clodop.PRINT_INITA(2,0,0,0,"");
-                    this.clodop.SET_PRINT_PAGESIZE(2,'76mm','130mm');
-                    this.clodop.ADD_PRINT_BARCODE(20,70,350,50,"Code39",number);
-                    this.clodop.SET_PRINT_STYLEA(0,"FontSize",10);
-                    this.clodop.ADD_PRINT_TEXT(100,15,100,20,"收货任务号");
-                    this.clodop.SET_PRINT_STYLEA(0,"FontSize",10);
-                    this.clodop.SET_PRINT_STYLEA(0,"Alignment",2);
-                    this.clodop.SET_PRINT_STYLEA(0,"Bold",1);
-                    this.clodop.ADD_PRINT_TEXT(130,15,100,20,"仓库");
-                    this.clodop.SET_PRINT_STYLEA(0,"FontSize",10);
-                    this.clodop.SET_PRINT_STYLEA(0,"Alignment",2);
-                    this.clodop.SET_PRINT_STYLEA(0,"Bold",1);
-                    this.clodop.ADD_PRINT_TEXT(160,15,100,20,"司机姓名");
-                    this.clodop.SET_PRINT_STYLEA(0,"FontSize",10);
-                    this.clodop.SET_PRINT_STYLEA(0,"Alignment",2);
-                    this.clodop.SET_PRINT_STYLEA(0,"Bold",1);
-                    this.clodop.ADD_PRINT_TEXT(190,15,100,20,"车牌号");
-                    this.clodop.SET_PRINT_STYLEA(0,"FontSize",10);
-                    this.clodop.SET_PRINT_STYLEA(0,"Alignment",2);
-                    this.clodop.SET_PRINT_STYLEA(0,"Bold",1);
-                    this.clodop.ADD_PRINT_TEXT(220,15,100,20,"是否提供清单");
-                    this.clodop.SET_PRINT_STYLEA(0,"FontSize",10);
-                    this.clodop.SET_PRINT_STYLEA(0,"Alignment",2);
-                    this.clodop.SET_PRINT_STYLEA(0,"Bold",1);
-                    this.clodop.ADD_PRINT_TEXT(250,15,100,20,"货主");
-                    this.clodop.SET_PRINT_STYLEA(0,"FontSize",10);
-                    this.clodop.SET_PRINT_STYLEA(0,"Alignment",2);
-                    this.clodop.SET_PRINT_STYLEA(0,"Bold",1);
-                    this.clodop.ADD_PRINT_TEXT(130,245,100,20,"投单员");
-                    this.clodop.SET_PRINT_STYLEA(0,"Alignment",2);
-                    this.clodop.SET_PRINT_STYLEA(0,"Bold",1);
-                    this.clodop.ADD_PRINT_TEXT(160,245,100,20,"司机电话");
-                    this.clodop.SET_PRINT_STYLEA(0,"Alignment",2);
-                    this.clodop.SET_PRINT_STYLEA(0,"Bold",1);
-                    this.clodop.ADD_PRINT_TEXT(190,245,100,20,"驾驶证号");
-                    this.clodop.SET_PRINT_STYLEA(0,"Alignment",2);
-                    this.clodop.SET_PRINT_STYLEA(0,"Bold",1);
-                    this.clodop.ADD_PRINT_TEXT(220,245,100,20,"收货类型");
-                    this.clodop.SET_PRINT_STYLEA(0,"Alignment",2);
-                    this.clodop.SET_PRINT_STYLEA(0,"Bold",1);
-                    this.clodop.ADD_PRINT_TEXT(250,245,100,20,"预约号");
-                    this.clodop.SET_PRINT_STYLEA(0,"Alignment",2);
-                    this.clodop.SET_PRINT_STYLEA(0,"Bold",1);
-                    this.clodop.ADD_PRINT_TEXT(100,115,250,20,number); // number
-                    this.clodop.SET_PRINT_STYLEA(0,"FontSize",10);
-                    this.clodop.SET_PRINT_STYLEA(0,"Alignment",2);
-                    this.clodop.SET_PRINT_STYLEA(0,"Bold",1);
-                    this.clodop.ADD_PRINT_TEXT(130,115,130,20,warehouse);  // warehouse
-                    this.clodop.ADD_PRINT_TEXT(160,115,100,20,driver_name); //driver_name
-                    this.clodop.ADD_PRINT_TEXT(190,115,130,20,plate_number);  //plate_number
-                    this.clodop.ADD_PRINT_TEXT(220,115,100,20,provide_list); //provide_list
-                    this.clodop.ADD_PRINT_TEXT(250,115,130,20,owner);  // owner
-                    this.clodop.ADD_PRINT_TEXT(130,345,100,20,for_single_member);  // for_single_member
-                    this.clodop.ADD_PRINT_TEXT(160,345,140,20,driver_phone); // driver_phone
-                    this.clodop.ADD_PRINT_TEXT(190,345,140,20,driving_license_no); // driving_license_no
-                    this.clodop.ADD_PRINT_TEXT(220,345,100,20,receiving_type);  // receiving_type
-                    this.clodop.ADD_PRINT_TEXT(250,345,140,20,appointment_number); //appointment_number
+
+                    this.clodop.PRINT_INITA(2, 0, 0, 0, "");
+                    this.clodop.SET_PRINT_PAGESIZE(2, '76mm', '130mm');
+                    this.clodop.ADD_PRINT_BARCODE(20, 70, 350, 50, "Code39", number);
+                    this.clodop.SET_PRINT_STYLEA(0, "FontSize", 10);
+                    this.clodop.ADD_PRINT_TEXT(100, 15, 100, 20, "收货任务号");
+                    this.clodop.SET_PRINT_STYLEA(0, "FontSize", 10);
+                    this.clodop.SET_PRINT_STYLEA(0, "Alignment", 2);
+                    this.clodop.SET_PRINT_STYLEA(0, "Bold", 1);
+                    this.clodop.ADD_PRINT_TEXT(130, 15, 100, 20, "仓库");
+                    this.clodop.SET_PRINT_STYLEA(0, "FontSize", 10);
+                    this.clodop.SET_PRINT_STYLEA(0, "Alignment", 2);
+                    this.clodop.SET_PRINT_STYLEA(0, "Bold", 1);
+                    this.clodop.ADD_PRINT_TEXT(160, 15, 100, 20, "司机姓名");
+                    this.clodop.SET_PRINT_STYLEA(0, "FontSize", 10);
+                    this.clodop.SET_PRINT_STYLEA(0, "Alignment", 2);
+                    this.clodop.SET_PRINT_STYLEA(0, "Bold", 1);
+                    this.clodop.ADD_PRINT_TEXT(190, 15, 100, 20, "车牌号");
+                    this.clodop.SET_PRINT_STYLEA(0, "FontSize", 10);
+                    this.clodop.SET_PRINT_STYLEA(0, "Alignment", 2);
+                    this.clodop.SET_PRINT_STYLEA(0, "Bold", 1);
+                    this.clodop.ADD_PRINT_TEXT(220, 15, 100, 20, "是否提供清单");
+                    this.clodop.SET_PRINT_STYLEA(0, "FontSize", 10);
+                    this.clodop.SET_PRINT_STYLEA(0, "Alignment", 2);
+                    this.clodop.SET_PRINT_STYLEA(0, "Bold", 1);
+                    this.clodop.ADD_PRINT_TEXT(250, 15, 100, 20, "货主");
+                    this.clodop.SET_PRINT_STYLEA(0, "FontSize", 10);
+                    this.clodop.SET_PRINT_STYLEA(0, "Alignment", 2);
+                    this.clodop.SET_PRINT_STYLEA(0, "Bold", 1);
+                    this.clodop.ADD_PRINT_TEXT(130, 245, 100, 20, "投单员");
+                    this.clodop.SET_PRINT_STYLEA(0, "Alignment", 2);
+                    this.clodop.SET_PRINT_STYLEA(0, "Bold", 1);
+                    this.clodop.ADD_PRINT_TEXT(160, 245, 100, 20, "司机电话");
+                    this.clodop.SET_PRINT_STYLEA(0, "Alignment", 2);
+                    this.clodop.SET_PRINT_STYLEA(0, "Bold", 1);
+                    this.clodop.ADD_PRINT_TEXT(190, 245, 100, 20, "驾驶证号");
+                    this.clodop.SET_PRINT_STYLEA(0, "Alignment", 2);
+                    this.clodop.SET_PRINT_STYLEA(0, "Bold", 1);
+                    this.clodop.ADD_PRINT_TEXT(220, 245, 100, 20, "收货类型");
+                    this.clodop.SET_PRINT_STYLEA(0, "Alignment", 2);
+                    this.clodop.SET_PRINT_STYLEA(0, "Bold", 1);
+                    this.clodop.ADD_PRINT_TEXT(250, 245, 100, 20, "预约号");
+                    this.clodop.SET_PRINT_STYLEA(0, "Alignment", 2);
+                    this.clodop.SET_PRINT_STYLEA(0, "Bold", 1);
+                    this.clodop.ADD_PRINT_TEXT(100, 115, 250, 20, number); // number
+                    this.clodop.SET_PRINT_STYLEA(0, "FontSize", 10);
+                    this.clodop.SET_PRINT_STYLEA(0, "Alignment", 2);
+                    this.clodop.SET_PRINT_STYLEA(0, "Bold", 1);
+                    this.clodop.ADD_PRINT_TEXT(130, 115, 130, 20, warehouse);  // warehouse
+                    this.clodop.ADD_PRINT_TEXT(160, 115, 100, 20, driver_name); //driver_name
+                    this.clodop.ADD_PRINT_TEXT(190, 115, 130, 20, plate_number);  //plate_number
+                    this.clodop.ADD_PRINT_TEXT(220, 115, 100, 20, provide_list); //provide_list
+                    this.clodop.ADD_PRINT_TEXT(250, 115, 130, 20, owner);  // owner
+                    this.clodop.ADD_PRINT_TEXT(130, 345, 100, 20, for_single_member);  // for_single_member
+                    this.clodop.ADD_PRINT_TEXT(160, 345, 140, 20, driver_phone); // driver_phone
+                    this.clodop.ADD_PRINT_TEXT(190, 345, 140, 20, driving_license_no); // driving_license_no
+                    this.clodop.ADD_PRINT_TEXT(220, 345, 100, 20, receiving_type);  // receiving_type
+                    this.clodop.ADD_PRINT_TEXT(250, 345, 140, 20, appointment_number); //appointment_number
                     this.clodop.PREVIEW();
                     this.clodopPrintDialogVisible = false;
                 }