Finish Hotfix-zh-196

src/views/supply/apply/components/apply_detail.vue

@@ -175,8 +175,8 @@
       </div>
 
     </div>
-    <print-preview ref="preView" />
-    <!-- <CommonPrint :printId="printId" :printType="printType" v-if="isShowPrint" @backDetail="backDetail" /> -->
+    <!-- <print-preview ref="preView" /> -->
+    <CommonPrint :printId="printId" :printType="printType" v-if="isShowPrint" @backDetail="backDetail" />
 
   </div>
 </template>
@@ -279,7 +279,6 @@ export default {
 
   created() {
     this.getDetail();
-   
   },
   activated(){
     this.initPrint()

src/views/supply/deliver/sum_list.vue

@@ -3,7 +3,7 @@
     <div v-show="!isShowPrint">
       <!-- 筛选条件 -->
       <div class="screen-container">
-        <el-form ref="screenForm" :model="screenForm" label-width="85px" size="mini" label-position="left">
+        <el-form ref="screenForm" :model="screenForm" label-width="120px" size="mini" label-position="left">
           <el-row :gutter="20">
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="产品名称" prop="goodsName">
@@ -88,7 +88,23 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :xs="24" :sm="24" :lg="18" class="tr">
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="审核开始时间" prop="approvalStartTime">
+                <el-date-picker v-model="screenForm.approvalStartTime" type="datetimerange" range-separator="至"
+                  style="width: 100%;" value-format="yyyy-MM-dd HH:mm:ss" start-placeholder="开始日期"
+                  end-placeholder="结束日期">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="审核结束时间" prop="approvalEndTime">
+                <el-date-picker v-model="screenForm.approvalEndTime" type="datetimerange" range-separator="至"
+                  style="width: 100%;" value-format="yyyy-MM-dd HH:mm:ss" start-placeholder="开始日期"
+                  end-placeholder="结束日期">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="24" :lg="6" class="tr">
               <el-form-item label="">
                 <el-button @click="resetScreenForm">清空</el-button>
                 <el-button type="primary" @click="submitScreenForm">搜索</el-button>
@@ -125,7 +141,7 @@
 
             <el-table-column align="left" label="订单类型" prop="orderType" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
-                {{  scope.row.orderType | orderTypeFilter  }}
+                {{ scope.row.orderType | orderTypeFilter }}
               </template>
             </el-table-column>
             <el-table-column align="left" label="审核日期" prop="approvalTime" min-width="160" show-overflow-tooltip>
@@ -137,7 +153,7 @@
             <el-table-column align="left" label="发货单号" prop="id" min-width="130" show-overflow-tooltip>
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.id" />
-                <span>{{  scope.row.id  }}</span>
+                <span>{{ scope.row.id }}</span>
               </template>
             </el-table-column>
             <el-table-column align="left" label="订单号" prop="orderId" min-width="130" show-overflow-tooltip>
@@ -145,24 +161,24 @@
 
                 <CopyButton
                   :copyText="scope.row.enginOrderType == 'HOME' || scope.row.enginOrderType == 'TRADE' ? scope.row.enginOrderNo : scope.row.mainOrderId" />
-                <span>{{  scope.row.enginOrderType == 'HOME' || scope.row.enginOrderType == 'TRADE' ?
-                scope.row.enginOrderNo
-                : scope.row.mainOrderId
-
-                  }}</span>
+                <span>{{ scope.row.enginOrderType == 'HOME' || scope.row.enginOrderType == 'TRADE' ?
+                    scope.row.enginOrderNo
+                    : scope.row.mainOrderId
+                
+                }}</span>
 
               </template>
             </el-table-column>
             <el-table-column align="left" label="经销商编码" prop="customerNumber" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.customerNumber" />
-                <span>{{  scope.row.customerNumber  }}</span>
+                <span>{{ scope.row.customerNumber }}</span>
               </template>
             </el-table-column>
             <el-table-column align="left" label="经销商名称" prop="customerName" min-width="250" show-overflow-tooltip>
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.customerName" />
-                <span>{{  scope.row.customerName  }}</span>
+                <span>{{ scope.row.customerName }}</span>
               </template>
             </el-table-column>
             <el-table-column align="left" label="销售类型" prop="saleTypeName" min-width="100" show-overflow-tooltip>
@@ -170,25 +186,25 @@
             <el-table-column align="left" label="物料编码" prop="materialCode" min-width="120" show-overflow-tooltip>
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.materialCode" />
-                <span>{{  scope.row.materialCode  }}</span>
+                <span>{{ scope.row.materialCode }}</span>
               </template>
             </el-table-column>
             <el-table-column align="left" label="产品编码" prop="materialOldNumber" min-width="140" show-overflow-tooltip>
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.materialOldNumber" />
-                <span>{{  scope.row.materialOldNumber  }}</span>
+                <span>{{ scope.row.materialOldNumber }}</span>
               </template>
             </el-table-column>
             <el-table-column align="left" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.materialName" />
-                <span>{{  scope.row.materialName  }}</span>
+                <span>{{ scope.row.materialName }}</span>
               </template>
             </el-table-column>
             <el-table-column align="left" label="规格型号" prop="specification" min-width="350" show-overflow-tooltip>
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.specification" />
-                <span>{{  scope.row.specification  }}</span>
+                <span>{{ scope.row.specification }}</span>
               </template>
             </el-table-column>
             <el-table-column align="left" label="仓库" prop="correspondName" min-width="100" show-overflow-tooltip>
@@ -196,22 +212,22 @@
 
             <el-table-column align="right" label="发货金额" prop="payAmount" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
-                {{  scope.row.payAmount | numToFixed  }}
+                {{ scope.row.payAmount | numToFixed }}
               </template>
             </el-table-column>
             <el-table-column align="right" label="发货返利金额" prop="payRebateAmount" min-width="110" show-overflow-tooltip>
               <template slot-scope="scope">
-                {{  scope.row.payRebateAmount | numToFixed  }}
+                {{ scope.row.payRebateAmount | numToFixed }}
               </template>
             </el-table-column>
             <el-table-column align="right" label="发货折扣金额" prop="discAmount" min-width="110" show-overflow-tooltip>
               <template slot-scope="scope">
-                {{  scope.row.totalDiscAmount | numToFixed  }}
+                {{ scope.row.totalDiscAmount | numToFixed }}
               </template>
             </el-table-column>
             <el-table-column align="right" label="折扣额合计" prop="totalDiscAmount" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
-                {{  (scope.row.totalDiscAmount + scope.row.payRebateAmount) | numToFixed  }}
+                {{ (scope.row.totalDiscAmount + scope.row.payRebateAmount) | numToFixed }}
               </template>
             </el-table-column>
             <el-table-column align="right" label="发货数量" prop="refundableQty" min-width="100" show-overflow-tooltip>
@@ -219,17 +235,17 @@
 
             <el-table-column align="right" label="含税单价" prop="singlePayPrice" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
-                {{  scope.row.singlePayPrice | numToFixed  }}
+                {{ scope.row.singlePayPrice | numToFixed }}
               </template>
             </el-table-column>
             <el-table-column align="right" label="含税总额" prop="singlePayPrice" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
-                {{  scope.row.payAmount | numToFixed  }}
+                {{ scope.row.payAmount | numToFixed }}
               </template>
             </el-table-column>
             <el-table-column align="right" label="未出库数量" prop="singlePayPrice" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
-                {{  comRefundableQty(scope.row.type, scope.row.salesExamineStatus, scope.row)  }}
+                {{ comRefundableQty(scope.row.type, scope.row.salesExamineStatus, scope.row) }}
               </template>
             </el-table-column>
             <el-table-column align="left" label="表头业务员" prop="k3ServiceName" min-width="100" show-overflow-tooltip>
@@ -282,9 +298,9 @@
       </div>
     </div>
 
-   
+
     <print-preview ref="preView" />
-    
+
     <el-dialog title="密码确认" :visible.sync="isShowDialog" :show-close="false" width="40%" :close-on-click-modal="false">
       <el-form ref="dialogForm" :model="dialogForm" :rules="dialogFormRules" label-position="right" label-width="70px">
         <el-row :gutter="20">
@@ -313,7 +329,7 @@
       </div>
     </el-dialog>
 
-  
+
   </div>
 </template>
 
@@ -375,7 +391,9 @@ export default {
         type: '',
         salesMan: '',
         k3ServiceId: '',
-        mainOrderId: ''
+        mainOrderId: '',
+        approvalEndTime: '',
+        approvalStartTime: ''
       },
       categoryList: [],
       salesmanList: [],
@@ -417,7 +435,7 @@ export default {
       scaleValue: 1,
       scaleMax: 5,
       scaleMin: 0.5,
-      hiprintTemplate:'',
+      hiprintTemplate: '',
       isShowDialog: false,
       dialogForm: {
         password: "",
@@ -447,7 +465,9 @@ export default {
         id: this.screenForm.orderNum,
         categoryName: this.screenForm.type,
         serviceId: this.screenForm.salesMan,
-        k3ServiceId: this.screenForm.k3ServiceId
+        k3ServiceId: this.screenForm.k3ServiceId,
+        approvalEndTime: this.screenForm.approvalEndTime,
+        approvalStartTime: this.screenForm.approvalStartTime
       }
     },
     comRefundableQty() {
@@ -483,44 +503,44 @@ export default {
     this.getCategoryList();
     this.getList();
   },
-  activated(){
+  activated() {
     this.initPrint()
   },
   methods: {
-   initPrint(){
+    initPrint() {
       hiprint.init({
-      providers: [new defaultElementTypeProvider()]
-    });
-    // 还原配置
-    hiprint.setConfig()
-    // 替换配置
-    hiprint.setConfig({
-      movingDistance: 2.5,
-      text: {
-        supportOptions: [
-          {
-            name: 'styler',
-            hidden: true
-          },
-          {
-            name: 'formatter',
-            hidden: true
-          },
-        ]
-      }
-    })
-    // eslint-disable-next-line no-undef
-    hiprint.PrintElementTypeManager.buildByHtml($('.ep-draggable-item'));
-    this.hiprintTemplate = new hiprint.PrintTemplate({
-      template: panel,
-      settingContainer: '#PrintElementOptionSetting',
-      paginationContainer: '.hiprint-printPagination'
-    });
-    this.hiprintTemplate.design('#hiprint-printTemplate');
-    // 获取当前放大比例, 当zoom时传true 才会有
-    // this.scaleValue = hiprintTemplate.editingPanel.scale || 1;
+        providers: [new defaultElementTypeProvider()]
+      });
+      // 还原配置
+      hiprint.setConfig()
+      // 替换配置
+      hiprint.setConfig({
+        movingDistance: 2.5,
+        text: {
+          supportOptions: [
+            {
+              name: 'styler',
+              hidden: true
+            },
+            {
+              name: 'formatter',
+              hidden: true
+            },
+          ]
+        }
+      })
+      // eslint-disable-next-line no-undef
+      hiprint.PrintElementTypeManager.buildByHtml($('.ep-draggable-item'));
+      this.hiprintTemplate = new hiprint.PrintTemplate({
+        template: panel,
+        settingContainer: '#PrintElementOptionSetting',
+        paginationContainer: '.hiprint-printPagination'
+      });
+      this.hiprintTemplate.design('#hiprint-printTemplate');
+      // 获取当前放大比例, 当zoom时传true 才会有
+      // this.scaleValue = hiprintTemplate.editingPanel.scale || 1;
     }
-,
+    ,
     // 获取业务员列表
     getSalesmanList() {
       getSalesmanList({
@@ -564,7 +584,9 @@ export default {
         categoryName: this.screenForm.type,
         serviceId: this.screenForm.salesMan,
         k3ServiceId: this.screenForm.k3ServiceId,
-        mainOrderId: this.screenForm.mainOrderId
+        mainOrderId: this.screenForm.mainOrderId,
+        approvalEndTime: this.screenForm.approvalEndTime,
+        approvalStartTime: this.screenForm.approvalStartTime
       };
       getSumList(params).then((res) => {
         res.data.records.forEach(item => {
@@ -605,7 +627,7 @@ export default {
     },
 
     handleSelect(selection, row) {
-     
+
       this.$refs.table.toggleRowSelection(row);
       this.dataList.forEach((item) => {
         if (item.id === row.id) {
@@ -632,7 +654,7 @@ export default {
       if (!this.tableSelection[0].printNum) {
         this.queryItem = this.tableSelection;
         // this.isShowPrint = true;
-        getDetail(this.tableSelection,JSON.parse(
+        getDetail(this.tableSelection, JSON.parse(
           localStorage.getItem("supply_user")
         ).nickName)
         this.$refs.preView.show(this.hiprintTemplate, detailArr)
@@ -662,10 +684,10 @@ export default {
           };
           checkPassword(params).then((res) => {
             this.cancelDialogForm();
-            getDetail(this.tableSelection,JSON.parse(
-          localStorage.getItem("supply_user")
-        ).nickName)
-             this.$refs.preView.show(this.hiprintTemplate, detailArr)
+            getDetail(this.tableSelection, JSON.parse(
+              localStorage.getItem("supply_user")
+            ).nickName)
+            this.$refs.preView.show(this.hiprintTemplate, detailArr)
           });
         }
       });

src/views/supply/pickup/sum_list.vue

@@ -25,20 +25,38 @@
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="状态" prop="status">
+              <el-select v-model="screenForm.status" placeholder="请选择">
+                <el-option label="未打单" :value="0">
+                </el-option>
+                <el-option label="已打单" :value="1">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>下·
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="手机号" prop="takerPhone">
+              <el-input type="number" v-model.number="screenForm.takerPhone" placeholder="请输入仓库"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="提货人" prop="takerId">
+              <el-select v-model="screenForm.takerId" placeholder="请选择">
+                <el-option v-for="item in pickupManList" :label="item.takerName" :value="item.id">
+                </el-option>
+
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="申请日期" prop="date">
-              <el-date-picker
-                v-model="screenForm.date"
-                type="datetimerange"
-                range-separator="至"
-                style="width: 100%;"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期">
+              <el-date-picker v-model="screenForm.date" type="datetimerange" range-separator="至" style="width: 100%;"
+                value-format="yyyy-MM-dd HH:mm:ss" start-placeholder="开始日期" end-placeholder="结束日期">
               </el-date-picker>
             </el-form-item>
           </el-col>
-          
-          <el-col :xs="24" :sm="12" :lg="18" class="tr">
+
+          <el-col :xs="24" :sm="12" :lg="24" class="tr">
             <el-form-item label="">
               <el-button @click="resetScreenForm">清空</el-button>
               <el-button type="primary" @click="submitScreenForm">搜索</el-button>
@@ -55,72 +73,75 @@
         </div>
       </div>
       <div class="table">
-        <el-table v-loading="listLoading" :data="dataList" element-loading-text="Loading" border fit highlight-current-row stripe>
+        <el-table v-loading="listLoading" :data="dataList" element-loading-text="Loading" border fit
+          highlight-current-row stripe>
           <el-table-column align="left" label="状态" min-width="80" show-overflow-tooltip>
             <template slot-scope="scope">
-              {{ scope.row.printNum ? '已打单':'未打单' }}
+              {{ scope.row.printNum ? '已打单' : '未打单' }}
             </template>
           </el-table-column>
-          <el-table-column align="left" label="打单日期" prop="createTime" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="left" label="打单日期" prop="createTime" min-width="160" show-overflow-tooltip>
+          </el-table-column>
           <el-table-column align="left" label="信息密钥" prop="informationKey" min-width="100" show-overflow-tooltip>
             <template slot-scope="scope">
               <CopyButton :copyText="scope.row.informationKey" />
-              <span>{{scope.row.informationKey}}</span>
+              <span>{{ scope.row.informationKey }}</span>
             </template>
           </el-table-column>
           <el-table-column align="left" label="发货申请单号" prop="invoiceId" min-width="130" show-overflow-tooltip>
             <template slot-scope="scope">
               <CopyButton :copyText="scope.row.invoiceId" />
-              <span>{{scope.row.invoiceId}}</span>
+              <span>{{ scope.row.invoiceId }}</span>
             </template>
           </el-table-column>
           <el-table-column align="left" label="销售订单号" prop="mainOrderId" min-width="140" show-overflow-tooltip>
             <template slot-scope="scope">
               <CopyButton :copyText="scope.row.mainOrderId" />
-              <span>{{scope.row.mainOrderId}}</span>
+              <span>{{ scope.row.mainOrderId }}</span>
             </template>
           </el-table-column>
           <el-table-column align="left" label="物料编码" prop="materialCode" min-width="120" show-overflow-tooltip>
             <template slot-scope="scope">
               <CopyButton :copyText="scope.row.materialCode" />
-              <span>{{scope.row.materialCode}}</span>
+              <span>{{ scope.row.materialCode }}</span>
             </template>
           </el-table-column>
           <el-table-column align="left" label="产品编码" prop="materialOldNumber" min-width="140" show-overflow-tooltip>
             <template slot-scope="scope">
               <CopyButton :copyText="scope.row.materialOldNumber" />
-              <span>{{scope.row.materialOldNumber}}</span>
+              <span>{{ scope.row.materialOldNumber }}</span>
             </template>
           </el-table-column>
           <el-table-column align="left" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip>
             <template slot-scope="scope">
               <CopyButton :copyText="scope.row.materialName" />
-              <span>{{scope.row.materialName}}</span>
+              <span>{{ scope.row.materialName }}</span>
             </template>
           </el-table-column>
           <el-table-column align="left" label="规格型号" prop="specification" min-width="350" show-overflow-tooltip>
             <template slot-scope="scope">
               <CopyButton :copyText="scope.row.specification" />
-              <span>{{scope.row.specification}}</span>
+              <span>{{ scope.row.specification }}</span>
             </template>
           </el-table-column>
-          <el-table-column align="left" label="提货总数量" prop="refundableQty" min-width="100" show-overflow-tooltip></el-table-column>
+          <el-table-column align="left" label="提货总数量" prop="refundableQty" min-width="100" show-overflow-tooltip>
+          </el-table-column>
           <el-table-column align="left" label="经销商编码" prop="customerNumber" min-width="100" show-overflow-tooltip>
             <template slot-scope="scope">
               <CopyButton :copyText="scope.row.customerNumber" />
-              <span>{{scope.row.customerNumber}}</span>
+              <span>{{ scope.row.customerNumber }}</span>
             </template>
           </el-table-column>
           <el-table-column align="left" label="经销商名称" prop="customerName" min-width="250" show-overflow-tooltip>
             <template slot-scope="scope">
               <CopyButton :copyText="scope.row.customerName" />
-              <span>{{scope.row.customerName}}</span>
+              <span>{{ scope.row.customerName }}</span>
             </template>
           </el-table-column>
           <el-table-column align="left" label="工程编号" prop="enginOrderNo" min-width="150" show-overflow-tooltip>
             <template slot-scope="scope">
               <CopyButton :copyText="scope.row.enginOrderNo" />
-              <span>{{scope.row.enginOrderNo}}</span>
+              <span>{{ scope.row.enginOrderNo }}</span>
             </template>
           </el-table-column>
           <el-table-column align="left" label="预约日期" prop="pickTime" min-width="120" show-overflow-tooltip>
@@ -130,13 +151,15 @@
           </el-table-column>
           <el-table-column align="left" label="提货时段" min-width="100" show-overflow-tooltip>
             <template slot-scope="scope">
-              {{ scope.row.pickStatus == '1' ? '上午':'下午' }}
+              {{ scope.row.pickStatus == '1' ? '上午' : '下午' }}
             </template>
           </el-table-column>
-          <el-table-column align="left" label="提货仓库" prop="correspondName" min-width="100" show-overflow-tooltip></el-table-column>
+          <!-- <el-table-column align="left" label="手机号" prop="phone" min-width="100" show-overflow-tooltip></el-table-column> -->
+          <el-table-column align="left" label="提货仓库" prop="correspondName" min-width="100" show-overflow-tooltip>
+          </el-table-column>
           <el-table-column align="left" label="提货方式" prop="pickType" min-width="100" show-overflow-tooltip>
             <template slot-scope="scope">
-              {{ scope.row.pickType == '1' ? '自提':'物流快递' }}
+              {{ scope.row.pickType == '1' ? '自提' : '物流快递' }}
             </template>
           </el-table-column>
           <el-table-column align="left" label="单据日期" prop="theTime" min-width="120" show-overflow-tooltip>
@@ -144,19 +167,15 @@
               {{ scope.row.theTime | dateToDayFilter }}
             </template>
           </el-table-column>
-          <el-table-column align="left" label="备注" prop="remark" min-width="100" show-overflow-tooltip></el-table-column>
+          <el-table-column align="left" label="备注" prop="remark" min-width="100" show-overflow-tooltip>
+          </el-table-column>
         </el-table>
       </div>
     </div>
     <div class="pagination clearfix">
       <div class="fr">
-        <el-pagination
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"
-          :current-page="currentPage"
-          :page-sizes="[10, 20, 30, 50]"
-          :page-size="10"
-          layout="total, sizes, prev, pager, next, jumper"
+        <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
+          :page-sizes="[10, 20, 30, 50]" :page-size="10" layout="total, sizes, prev, pager, next, jumper"
           :total="listTotal">
         </el-pagination>
       </div>
@@ -166,7 +185,7 @@
 </template>
 
 <script>
-import { getPickupList } from "@/api/supply/pickup";
+import { getPickupList, getPickupManList } from "@/api/supply/pickup";
 
 export default {
   data() {
@@ -182,6 +201,9 @@ export default {
         jxsNum: '',
         warehouse: '',
         date: '',
+        status: '',
+        takerPhone: '',
+        takerId: ''
       },
     }
   },
@@ -195,12 +217,16 @@ export default {
         stockName: this.screenForm.warehouse,
         startTime: this.screenForm.date ? this.screenForm.date[0] : '',
         endTime: this.screenForm.date ? this.screenForm.date[1] : '',
+        status: this.screenForm.status,
+        takerPhone: this.screenForm.takerPhone,
+        takerId: this.screenForm.takerId
       }
     },
   },
 
   created() {
     this.getList();
+    this.getPickupManList()
   },
 
   methods: {
@@ -216,7 +242,6 @@ export default {
     // 查询列表
     getList() {
       this.listLoading = true;
-
       let params = {
         pageNum: this.currentPage,
         pageSize: this.pageSize,
@@ -226,12 +251,24 @@ export default {
         stockName: this.screenForm.warehouse,
         startTime: this.screenForm.date ? this.screenForm.date[0] : '',
         endTime: this.screenForm.date ? this.screenForm.date[1] : '',
+        status: this.screenForm.status,
+        takerPhone: this.screenForm.takerPhone,
+        takerId: this.screenForm.takerId
       };
       getPickupList(params).then((res) => {
         this.dataList = res.data.records;
         this.listTotal = res.data.total;
         this.listLoading = false;
       })
+
+    },
+
+    getPickupManList() {
+      console.log('jjj');
+      getPickupManList({ pageNum: 1, pageSize: -1 }).then(res => {
+
+        this.pickupManList = res.data.records
+      })
     },
 
     // 提交筛选表单
@@ -264,5 +301,4 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-
 </style>