Finish Hotfix-zh-299

src/views/supply/pickup/sum_list.vue

@@ -6,66 +6,103 @@
         <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>
             </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>
+              <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,18 +115,25 @@
     <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">
-        <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 ? '已打单' : '未打单' }}
             </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 +142,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 +214,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,23 +225,29 @@
               {{ 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>
-
   </div>
 </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 +259,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,84 +283,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,
-      };
-      getPickupList(params).then((res) => {
-        this.dataList = res.data.records;
-        this.listTotal = res.data.total;
-        this.listLoading = false;
-      });
+        salesOrderId: this.screenForm.salesOrderId
+      }
+      getPickupList(params).then(res => {
+        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;
-      });
+      getPickupManList({ pageNum: 1, pageSize: -1 }).then(res => {
+        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>
-</style>
+<style lang="scss" scoped></style>