【修改】经销商提货增加物流公司搜索

src/views/deposit_home/components/deposit-apply-surrender.vue

@@ -54,7 +54,7 @@
           <el-col :xs="24" :sm="24" :lg="16" class="item">
             <div class="label">跨区厂编号</div>
             <div class="value">
-<!--              {{ details.refFactoryNo }}-->
+              <!--              {{ details.refFactoryNo }}-->
               <el-form-item prop="refFactoryNo">
                 <el-input
                   v-model="details.refFactoryNo"
@@ -77,12 +77,12 @@
             <div class="label">工程差价总额</div>
             <div class="value">{{ details.depositDiffAmount }}</div>
           </el-col>
-              <el-col :xs="24" :sm="24" :lg="24" class="item" v-if="!isCustomer">
-              <div class="label">格力备注</div>
-              <div class="value">
-                 <el-input  v-model=" details.geLiInerNote" placeholder="格力备注" ></el-input>
-              </div>
-            </el-col>
+          <el-col v-if="!isCustomer" :xs="24" :sm="24" :lg="24" class="item">
+            <div class="label">格力备注</div>
+            <div class="value">
+              <el-input v-model=" details.geLiInerNote" placeholder="格力备注" />
+            </div>
+          </el-col>
           <el-col :xs="24" :sm="24" :lg="24" class="item">
             <div class="label">使用单位</div>
             <div class="value">{{ details.refUseUnit }}</div>
@@ -165,26 +165,26 @@
             show-overflow-tooltip
           />
           <el-table-column align="left" label="实装规格型号" prop="realSpecification" min-width="300" show-overflow-tooltip>
-              <template slot-scope="scope">
-                <div :style="scope.row.realSpecification != scope.row.specification?{color:'blue'}:''">
-                    {{scope.row.realSpecification}}
-                </div>
-              </template>
-            </el-table-column>
-            <el-table-column align="left" label="实装物料编号" prop="realMaterialNumber" min-width="150" show-overflow-tooltip>
-          <template slot-scope="scope">
-                <div :style="scope.row.realMaterialNumber != scope.row.materialNumber?{color:'blue'}:''">
-                    {{scope.row.realMaterialNumber}}
-                </div>
-              </template>
-        </el-table-column>
-            <el-table-column align="left" label="实装厂产品编码" prop="realMaterialOldNumber" min-width="200" show-overflow-tooltip>
-              <template slot-scope="scope">
-                <div :style="scope.row.realMaterialOldNumber != scope.row.materialOldNumber?{color:'blue'}:''">
-                    {{scope.row.realMaterialOldNumber}}
-                </div>
-              </template>
-            </el-table-column>
+            <template slot-scope="scope">
+              <div :style="scope.row.realSpecification != scope.row.specification?{color:'blue'}:''">
+                {{ scope.row.realSpecification }}
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column align="left" label="实装物料编号" prop="realMaterialNumber" min-width="150" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <div :style="scope.row.realMaterialNumber != scope.row.materialNumber?{color:'blue'}:''">
+                {{ scope.row.realMaterialNumber }}
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column align="left" label="实装厂产品编码" prop="realMaterialOldNumber" min-width="200" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <div :style="scope.row.realMaterialOldNumber != scope.row.materialOldNumber?{color:'blue'}:''">
+                {{ scope.row.realMaterialOldNumber }}
+              </div>
+            </template>
+          </el-table-column>
           <el-table-column
             align="center"
             label="单价"
@@ -200,16 +200,16 @@
             show-overflow-tooltip
           />
           <el-table-column
-              align="right"
-              label="金额"
-              prop="totalAmount"
-              min-width="160"
-              show-overflow-tooltip
-            >
-              <template slot-scope="scope">
-                {{ scope.row.totalAmount | numToFixed }}
-              </template>
-            </el-table-column>
+            align="right"
+            label="金额"
+            prop="totalAmount"
+            min-width="160"
+            show-overflow-tooltip
+          >
+            <template slot-scope="scope">
+              {{ scope.row.totalAmount | numToFixed }}
+            </template>
+          </el-table-column>
           <el-table-column
             align="center"
             label="押金数量"
@@ -225,66 +225,66 @@
             show-overflow-tooltip
           />
           <el-table-column
-              align="right"
-              label="合同数量"
-              prop="contractQty"
-              min-width="160"
-              show-overflow-tooltip
-            >
-              <template slot-scope="scope">
+            align="right"
+            label="合同数量"
+            prop="contractQty"
+            min-width="160"
+            show-overflow-tooltip
+          >
+            <template slot-scope="scope">
 
-                <el-input
+              <el-input
 
-                  class="inpt"
-                  v-model.number="scope.row.contractQty"
-                  size="mini"
-                  clearable
-                ></el-input>
-              </template>
-            </el-table-column>
-            <el-table-column
-              align="right"
-              label="合同单价"
-              prop="contractPrice"
-              min-width="160"
-              show-overflow-tooltip
-            >
-              <template slot-scope="scope">
+                v-model.number="scope.row.contractQty"
+                class="inpt"
+                size="mini"
+                clearable
+              />
+            </template>
+          </el-table-column>
+          <el-table-column
+            align="right"
+            label="合同单价"
+            prop="contractPrice"
+            min-width="160"
+            show-overflow-tooltip
+          >
+            <template slot-scope="scope">
 
-                <el-input
+              <el-input
 
-                  class="inpt"
-                  v-model.number="scope.row.contractPrice"
-                  size="mini"
-                  clearable
-                ></el-input>
-              </template>
-            </el-table-column>
-            <el-table-column
-              align="right"
-              label="合同金额"
-              prop="contractAmount"
-              min-width="160"
-              show-overflow-tooltip
-            >
-              <template slot-scope="scope">
+                v-model.number="scope.row.contractPrice"
+                class="inpt"
+                size="mini"
+                clearable
+              />
+            </template>
+          </el-table-column>
+          <el-table-column
+            align="right"
+            label="合同金额"
+            prop="contractAmount"
+            min-width="160"
+            show-overflow-tooltip
+          >
+            <template slot-scope="scope">
 
-                <div >
-                  {{comTotal(scope.row.contractQty,scope.row.contractPrice)}}
-                </div>
-              </template>
-            </el-table-column>
-            <el-table-column
-              align="right"
-              label="押金金额"
-              prop="depositAmount"
-              min-width="160"
-              show-overflow-tooltip
-            >
-              <template slot-scope="scope">
-                {{ scope.row.depositAmount | numToFixed }}
-              </template>
-            </el-table-column>
+              <div>
+                {{ comTotal(scope.row.contractQty,scope.row.contractPrice) }}
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column
+            align="right"
+            label="押金金额"
+            prop="depositAmount"
+            min-width="160"
+            show-overflow-tooltip
+          >
+            <template slot-scope="scope">
+              {{ scope.row.depositAmount | numToFixed }}
+            </template>
+          </el-table-column>
           <el-table-column
             align="center"
             label="上交资料"
@@ -293,37 +293,37 @@
             show-overflow-tooltip
           >
             <template slot-scope="scope">
-                <el-input
+              <el-input
+                v-model.number="scope.row.dataQty"
+                class="inpt"
+                size="mini"
+                clearable
                 @blur="setDataQty($event,scope.row)"
-                  class="inpt"
-                  v-model.number="scope.row.dataQty"
-                  size="mini"
-                  clearable
-                ></el-input>
-              </template>
-        </el-table-column>
-        <el-table-column
-              align="right"
-              label="收差金额"
-              prop="diffAmount"
-              min-width="160"
-              show-overflow-tooltip
-            >
-              <template slot-scope="scope">
-                {{ scope.row.diffAmount | numToFixed }}
-              </template>
-            </el-table-column>
+              />
+            </template>
+          </el-table-column>
           <el-table-column
-              align="right"
-              label="收差政策价格"
-              prop="diffPolicyPrice"
-              min-width="200"
-              show-overflow-tooltip
-            >
-              <template slot-scope="scope">
-                {{ scope.row.diffPolicyPrice | numToFixed }}
-              </template>
-            </el-table-column>
+            align="right"
+            label="收差金额"
+            prop="diffAmount"
+            min-width="160"
+            show-overflow-tooltip
+          >
+            <template slot-scope="scope">
+              {{ scope.row.diffAmount | numToFixed }}
+            </template>
+          </el-table-column>
+          <el-table-column
+            align="right"
+            label="收差政策价格"
+            prop="diffPolicyPrice"
+            min-width="200"
+            show-overflow-tooltip
+          >
+            <template slot-scope="scope">
+              {{ scope.row.diffPolicyPrice | numToFixed }}
+            </template>
+          </el-table-column>
         </el-table>
       </div>
     </div>
@@ -344,7 +344,7 @@
               <imageUpload :file-list="fileList" :multiple="true" :start-restricting="true" :restrict-filename="restrictFilename" />
             </el-form-item>
           </el-col>
-          <el-col :xs="24" :sm="12" :lg="24" v-if="details.dataList && details.dataList.length">
+          <el-col v-if="details.dataList && details.dataList.length" :xs="24" :sm="12" :lg="24">
             <!-- 列表 -->
             <div class="mymain-container">
               <div class="table">
@@ -446,7 +446,7 @@
                         title="这是一段内容确定删除吗？"
                         @onConfirm="delFile(scope.$index)"
                       >
-                        <el-button type="text" slot="reference">删除</el-button>
+                        <el-button slot="reference" type="text">删除</el-button>
                       </el-popconfirm>
 
                     </template>
@@ -488,12 +488,15 @@
               />
             </el-form-item>
           </el-col>
-            <el-col :xs="24" :sm="12" :lg="18"  v-if="details.checkBy && details.checkDate">
-            <el-form-item label="验收说明
-" prop="checkNote">
+          <el-col v-if="details.checkBy && details.checkDate" :xs="24" :sm="12" :lg="18">
+            <el-form-item
+              label="验收说明
+"
+              prop="checkNote"
+            >
               <el-input
                 v-model="details.checkNote"
-                 disabled
+                disabled
                 type="textarea"
                 placeholder="请输入验收说明
 "
@@ -522,7 +525,7 @@
 </template>
 
 <script>
-import { applyDeposit, geDetail,computeDiff } from '@/api/engin_deposit.js'
+import { applyDeposit, geDetail, computeDiff } from '@/api/engin_deposit.js'
 
 import imageUpload from '@/components/Common/image-upload.vue'
 import { downloadFiles, downloadPdf } from '@/utils/util'
@@ -541,36 +544,34 @@ export default {
       fileList: [],
       details: {},
       restrictFilename: [
-        '结算单', '合同', '明细表', '审核表', '收据', '发票', '照片','相片'
-      ],
+        '结算单', '合同', '明细表', '审核表', '收据', '发票', '照片', '相片'
+      ]
 
     }
   },
-    computed:{
-    isCustomer(){
+  computed: {
+    isCustomer() {
       return this.$store.getters.customerId && this.$store.getters.customerNumber
     },
-    comTotal(){
-      return (qty,price)=>{
-
+    comTotal() {
+      return (qty, price) => {
         return Number(qty) * Number(price)
       }
     }
   },
-  watch:{
-    "details.items": {
+  watch: {
+    'details.items': {
       handler(newValue, oldValue) {
-          if (newValue && newValue.length) {
-            newValue.forEach((item, index) => {
+        if (newValue && newValue.length) {
+          newValue.forEach((item, index) => {
             item.contractAmount = Number(item.contractQty) * Number(item.contractPrice)
-          });
-
-          }
-        this.details.items = newValue;
+          })
+        }
+        this.details.items = newValue
       },
       immediate: true,
-      deep: true,
-    },
+      deep: true
+    }
   },
   created() {
     this.imageURL = this.$imageUrl
@@ -578,40 +579,38 @@ export default {
   },
   methods: {
 
-    geDetail(){
+    geDetail() {
       geDetail({ id: this.$parent.depositManageId }).then((res) => {
-      let arr = []
-      res.data.items.forEach((item) => {
-        if (Number(item.qty)>0) {
-              arr.push(item)
-            }
-        // item.number = (item.qty*100 - item.directTransferQty*100 - item.retiredQty*100) / 100;
-        item.sums1 = ['orderHasSendQty', 'dataQty', 'qty',"hasSendQty","contractQty"]
-        item.sums2 = ['totalAmount', 'diffAmount', 'price','depositAmount',   "contractPrice","comTotal",
-          "contractAmount",]
+        const arr = []
+        res.data.items.forEach((item) => {
+          if (Number(item.qty) > 0) {
+            arr.push(item)
+          }
+          // item.number = (item.qty*100 - item.directTransferQty*100 - item.retiredQty*100) / 100;
+          item.sums1 = ['orderHasSendQty', 'dataQty', 'qty', 'hasSendQty', 'contractQty']
+          item.sums2 = ['totalAmount', 'diffAmount', 'price', 'depositAmount', 'contractPrice', 'comTotal',
+            'contractAmount']
+        })
+        res.data.items = arr
+        this.details = res.data
       })
-      res.data.items = arr
-      this.details = res.data
-
-    })
     },
 
     // 计算收差金额
-    setDataQty(e,row){
-        if(!row.dataQty) return
+    setDataQty(e, row) {
+      if (!row.dataQty) return
       row.saleTypeId = this.details.saleTypeId
-      computeDiff(row).then(res=>{
+      computeDiff(row).then(res => {
         row.diffAmount = res.data.diffAmount
         row.diffPolicyPrice = res.data.diffPolicyPrice
       // this.$successMsg('已计算收差金额')
       })
-    }
-    ,
+    },
     goBack() {
       this.$parent.showPage = 1
     },
     handleSvse() {
-          const arr = []
+      const arr = []
       if (!this.details.installDate) {
         this.$errorMsg('请选择安装时间')
         return
@@ -619,23 +618,19 @@ export default {
 
       if (this.isCustomer) {
         for (let i = 0; i < this.details.items.length; i++) {
-            this.details.items[i].contractAmount = this.details.items[i].contractQty * this.details.items[i].contractPrice
-              if (!this.details.items[i].contractAmount) {
-                return this.$errorMsg('合同单价、合同数量不能为空')
-              }
-
+          this.details.items[i].contractAmount = this.details.items[i].contractQty * this.details.items[i].contractPrice
+          if (!this.details.items[i].contractAmount) {
+            return this.$errorMsg('合同单价、合同数量不能为空')
           }
+        }
       }
 
-
-
       this.fileList.forEach((el) => {
-
-        if (this.details.dataList.length){
-          this.details.dataList.forEach((i,e)=>{
-            console.log(i.fileName==el.name)
-            if (el.name === i.fileName){
-              this.details.dataList.splice(e,1)
+        if (this.details.dataList.length) {
+          this.details.dataList.forEach((i, e) => {
+            console.log(i.fileName == el.name)
+            if (el.name === i.fileName) {
+              this.details.dataList.splice(e, 1)
             }
           })
         }
@@ -649,7 +644,7 @@ export default {
       })
       applyDeposit({
         ...this.details,
-        dataList:[...arr,...this.details.dataList]
+        dataList: [...arr, ...this.details.dataList]
       }).then((res) => {
         this.$successMsg('申请成功')
         this.$parent.showPage = 1
@@ -657,8 +652,8 @@ export default {
         this.$parent.getList()
       })
     },
-    delFile(index){
-      this.details.dataList.splice(index,1)
+    delFile(index) {
+      this.details.dataList.splice(index, 1)
       this.$successMsg('删除成功')
     },
     handleReset() {
@@ -674,7 +669,7 @@ export default {
         downloadPdf(this.$imageUrl + v, fileName)
         return
       }
-        downloadFiles("common/file/getStream", { key: v, fileName:fileName});
+      downloadFiles('common/file/getStream', { key: v, fileName: fileName })
       // getFileUrl({ key: v }).then((res) => {
       //   window.open(res.data)
       // })
@@ -704,7 +699,7 @@ export default {
       } else {
         return ''
       }
-    },
+    }
   }
 }
 </script>

src/views/supply/pickup/sum_list.vue

@@ -6,43 +6,50 @@
         <el-row :gutter="20">
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="申请发货单号" prop="orderNum">
-              <el-input v-model="screenForm.orderNum" placeholder="请输入申请发货单号"></el-input>
+              <el-input v-model="screenForm.orderNum" placeholder="请输入申请发货单号" />
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="经销商名称" prop="jxsName">
-              <el-input v-model="screenForm.jxsName" placeholder="请输入经销商名称"></el-input>
+              <el-input v-model="screenForm.jxsName" placeholder="请输入经销商名称" />
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="经销商编码" prop="jxsNum">
-              <el-input v-model="screenForm.jxsNum" placeholder="请输入经销商编码"></el-input>
+              <el-input v-model="screenForm.jxsNum" placeholder="请输入经销商编码" />
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="仓库" prop="warehouse">
-              <el-input v-model="screenForm.warehouse" placeholder="请输入仓库"></el-input>
+              <el-input v-model="screenForm.warehouse" placeholder="请输入仓库" />
             </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-option label="未打单" :value="0" />
+                <el-option label="已打单" :value="1" />
               </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" @mousewheel.native.prevent v-model.number="screenForm.takerPhone" placeholder="请输入手机号"></el-input>
+              <el-input v-model.number="screenForm.takerPhone" type="number" placeholder="请输入手机号" @mousewheel.native.prevent />
             </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-select
+                v-model="screenForm.takerId"
+                placeholder="请选择"
+                clearable
+                filterable
+              >
                 <el-option v-for="item in pickupManList" :key="item.id" :label="item.takerName" :value="item.id">
+                  <template>
+                    <span>{{ item.takerName }}</span>
+                    <span style="color: #cccccc"> {{ item.customerName }}</span>
+                  </template>
                 </el-option>
 
               </el-select>
@@ -50,22 +57,33 @@
           </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>
+              <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-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="打印时间" prop="printTime">
-              <el-date-picker v-model="screenForm.printTime" type="datetimerange" range-separator="至" style="width: 100%;" value-format="yyyy-MM-dd HH:mm:ss" start-placeholder="开始日期" end-placeholder="结束日期">
-              </el-date-picker>
+              <el-date-picker v-model="screenForm.printTime" type="datetimerange" range-separator="至" style="width: 100%;" value-format="yyyy-MM-dd HH:mm:ss" start-placeholder="开始日期" end-placeholder="结束日期" />
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="出库单号" prop="salesOrderId">
-              <el-input type="number" @mousewheel.native.prevent v-model.number="screenForm.salesOrderId" placeholder="请输入出库单号"></el-input>
+              <el-input v-model.number="screenForm.salesOrderId" type="number" placeholder="请输入出库单号" @mousewheel.native.prevent />
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="物流公司" prop="logisticsId">
+              <el-select
+                v-model="screenForm.logisticsId"
+                placeholder="请选择物流公司"
+                clearable
+                filterable
+              >
+                <el-option v-for="item in logisticsList" :key="item.id" :label="item.logisticsCompany" :value="item.id" />
+
+              </el-select>
             </el-form-item>
           </el-col>
-          <el-col :xs="24" :sm="12" :lg="12" class="tr">
+          <el-col :xs="24" :sm="24" :lg="24" class="tr">
             <el-form-item label="">
               <el-button @click="resetScreenForm">清空</el-button>
               <el-button type="primary" @click="submitScreenForm">搜索</el-button>
@@ -78,7 +96,7 @@
     <div class="mymain-container">
       <div class="btn-group clearfix">
         <div class="fr">
-          <ExportButton :exUrl="'pick/export'" :exParams="exParams" />
+          <ExportButton :ex-url="'pick/export'" :ex-params="exParams" />
         </div>
       </div>
       <div class="table">
@@ -88,8 +106,7 @@
               {{ scope.row.printNum ? '已打单' : '未打单' }}
             </template>
           </el-table-column>
-          <el-table-column align="left" label="打单日期" prop="printTime" min-width="160" show-overflow-tooltip>
-          </el-table-column>
+          <el-table-column align="left" label="打单日期" prop="printTime" min-width="160" show-overflow-tooltip />
           <!-- <el-table-column align="left" label="信息密钥" prop="informationKey" min-width="100" show-overflow-tooltip>
             <template slot-scope="scope">
               <CopyButton :copyText="scope.row.informationKey" />
@@ -98,67 +115,64 @@
           </el-table-column> -->
           <el-table-column align="left" label="出库单号" prop="salesOrderId" min-width="130" show-overflow-tooltip>
             <template slot-scope="scope">
-              <CopyButton :copyText="scope.row.salesOrderId" />
+              <CopyButton :copy-text="scope.row.salesOrderId" />
               <span>{{ scope.row.salesOrderId }}</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" />
+              <CopyButton :copy-text="scope.row.invoiceId" />
               <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" />
+              <CopyButton :copy-text="scope.row.mainOrderId" />
               <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" />
+              <CopyButton :copy-text="scope.row.materialCode" />
               <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" />
+              <CopyButton :copy-text="scope.row.materialOldNumber" />
               <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" />
+              <CopyButton :copy-text="scope.row.materialName" />
               <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" />
+              <CopyButton :copy-text="scope.row.specification" />
               <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="takerName" min-width="100" show-overflow-tooltip>
-          </el-table-column>
-          <el-table-column align="left" label="提货人手机号" prop="takerPhone" 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 align="left" label="提货人" prop="takerName" min-width="100" show-overflow-tooltip />
+          <el-table-column align="left" label="提货人手机号" prop="takerPhone" min-width="100" show-overflow-tooltip />
           <el-table-column align="left" label="经销商编码" prop="customerNumber" min-width="100" show-overflow-tooltip>
             <template slot-scope="scope">
-              <CopyButton :copyText="scope.row.customerNumber" />
+              <CopyButton :copy-text="scope.row.customerNumber" />
               <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" />
+              <CopyButton :copy-text="scope.row.customerName" />
               <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" />
+              <CopyButton :copy-text="scope.row.enginOrderNo" />
               <span>{{ scope.row.enginOrderNo }}</span>
             </template>
           </el-table-column>
@@ -173,8 +187,7 @@
             </template>
           </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="correspondName" min-width="100" show-overflow-tooltip />
           <el-table-column align="left" label="提货方式" prop="pickType" min-width="100" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ scope.row.pickType == '1' ? '自提' : '物流快递' }}
@@ -185,15 +198,13 @@
               {{ 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>
       </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" :total="listTotal">
-        </el-pagination>
+        <el-pagination :current-page="currentPage" :page-sizes="[10, 20, 30, 50]" :page-size="10" layout="total, sizes, prev, pager, next, jumper" :total="listTotal" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
       </div>
     </div>
 
@@ -201,7 +212,8 @@
 </template>
 
 <script>
-import { getPickupList, getPickupManList } from "@/api/supply/pickup";
+import { getPickupList, getPickupManList } from '@/api/supply/pickup'
+import { getLogisticsList } from '@/api/basic_data/logistics'
 
 export default {
   data() {
@@ -213,19 +225,21 @@ export default {
       listLoading: false, // 列表加载loading
       screenForm: {
         // 筛选表单数据
-        orderNum: "",
-        jxsName: "",
-        jxsNum: "",
-        warehouse: "",
-        date: "",
-        status: "",
-        takerPhone: "",
-        takerId: "",
-        printTime: "",
-        salesOrderId: "",
+        orderNum: '',
+        jxsName: '',
+        jxsNum: '',
+        warehouse: '',
+        date: '',
+        status: '',
+        takerPhone: '',
+        takerId: '',
+        printTime: '',
+        salesOrderId: '',
+        logisticsId: ''
       },
-      pickupManList: "",
-    };
+      pickupManList: '',
+      logisticsList: []
+    }
   },
 
   computed: {
@@ -235,83 +249,96 @@ export default {
         customerName: this.screenForm.jxsName,
         customerNumber: this.screenForm.jxsNum,
         stockName: this.screenForm.warehouse,
-        startTime: this.screenForm.date ? this.screenForm.date[0] : "",
-        endTime: this.screenForm.date ? this.screenForm.date[1] : "",
+        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,
+        logisticsId: this.screenForm.logisticsId,
         printStartTime: this.screenForm.printTime[0],
         printEndTime: this.screenForm.printTime[1],
-        salesOrderId: this.screenForm.salesOrderId,
-      };
-    },
+        salesOrderId: this.screenForm.salesOrderId
+      }
+    }
   },
 
   created() {
-    this.getList();
-    this.getPickupManList();
+    this.getList()
+    this.getLogisticsList()
+    this.getPickupManList()
   },
 
   methods: {
     // 查询列表
     getList() {
-      this.listLoading = true;
-      let params = {
+      this.listLoading = true
+      const params = {
         pageNum: this.currentPage,
         pageSize: this.pageSize,
         invoiceId: this.screenForm.orderNum,
         customerName: this.screenForm.jxsName,
         customerNumber: this.screenForm.jxsNum,
+        logisticsId: this.screenForm.logisticsId,
+
         stockName: this.screenForm.warehouse,
-        startTime: this.screenForm.date ? this.screenForm.date[0] : "",
-        endTime: this.screenForm.date ? this.screenForm.date[1] : "",
+        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,
         printStartTime: this.screenForm.printTime[0],
         printEndTime: this.screenForm.printTime[1],
-        salesOrderId: this.screenForm.salesOrderId,
-      };
+        salesOrderId: this.screenForm.salesOrderId
+      }
       getPickupList(params).then((res) => {
-        this.dataList = res.data.records;
-        this.listTotal = res.data.total;
-        this.listLoading = false;
-      });
+        this.dataList = res.data.records
+        this.listTotal = res.data.total
+        this.listLoading = false
+      })
     },
 
     getPickupManList() {
       getPickupManList({ pageNum: 1, pageSize: -1 }).then((res) => {
-        this.pickupManList = res.data.records;
-      });
+        this.pickupManList = res.data.records
+      })
+    },
+    getLogisticsList() {
+      const params = {
+        pageNum: 1,
+        pageSize: -1
+      }
+      getLogisticsList(params).then((res) => {
+        this.logisticsList = res.data.records
+        console.log(this.logisticsList, 'kkk')
+      })
     },
-
     // 提交筛选表单
     submitScreenForm() {
-      this.currentPage = 1;
-      this.getList();
+      this.currentPage = 1
+      this.getList()
     },
 
     // 重置筛选表单
     resetScreenForm() {
-      this.$refs.screenForm.resetFields();
-      this.currentPage = 1;
-      this.getList();
+      this.$refs.screenForm.resetFields()
+      this.currentPage = 1
+      this.getList()
     },
 
     // 更改每页数量
     handleSizeChange(val) {
-      this.pageSize = val;
-      this.currentPage = 1;
-      this.getList();
+      this.pageSize = val
+      this.currentPage = 1
+      this.getList()
     },
 
     // 更改当前页
     handleCurrentChange(val) {
-      this.currentPage = val;
-      this.getList();
-    },
-  },
-};
+      this.currentPage = val
+      this.getList()
+    }
+  }
+}
 </script>
 
 <style lang="scss" scoped>