Merge tag 'Hotfix-90' into develop

Finish Hotfix-90

src/views/supply/pickup/sum_list.vue

@@ -36,7 +36,7 @@
           </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-input type="number" v-model.number="screenForm.takerPhone" placeholder="请输入手机号"></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
@@ -50,15 +50,13 @@
           </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="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 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-form-item>
           </el-col>
@@ -84,8 +82,7 @@
         </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 ? '已打单' : '未打单' }}
@@ -195,9 +192,7 @@
     </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 @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>
     </div>
@@ -216,20 +211,21 @@ export default {
       listTotal: 0, // 列表总数
       dataList: null, // 列表数据
       listLoading: false, // 列表加载loading
-      screenForm: { // 筛选表单数据
-        orderNum: '',
-        jxsName: '',
-        jxsNum: '',
-        warehouse: '',
-        date: '',
-        status: '',
-        takerPhone: '',
-        takerId: '',
-        printTime:'',
-        salesOrderId:''
+      screenForm: {
+        // 筛选表单数据
+        orderNum: "",
+        jxsName: "",
+        jxsNum: "",
+        warehouse: "",
+        date: "",
+        status: "",
+        takerPhone: "",
+        takerId: "",
+        printTime: "",
+        salesOrderId: "",
       },
-      pickupManList:''
-    }
+      pickupManList: "",
+    };
   },
 
   computed: {
@@ -239,21 +235,21 @@ 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,
-        printStartTime:this.screenForm.printTime[0],
-        printEndTime:this.screenForm.printTime[1],
-        salesOrderId:this.screenForm.salesOrderId
-      }
+        printStartTime: this.screenForm.printTime[0],
+        printEndTime: this.screenForm.printTime[1],
+        salesOrderId: this.screenForm.salesOrderId,
+      };
     },
   },
 
   created() {
     this.getList();
-    this.getPickupManList()
+    this.getPickupManList();
   },
 
   methods: {
@@ -263,7 +259,7 @@ export default {
       // if(!btnRole) {return true}
       // let index = btnRole.indexOf(value);
       // return index >= 0;
-      return true
+      return true;
     },
 
     // 查询列表
@@ -276,29 +272,26 @@ 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,
-        printStartTime:this.screenForm.printTime[0],
-        printEndTime:this.screenForm.printTime[1],
-        salesOrderId:this.screenForm.salesOrderId
+        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;
-      })
-
+      });
     },
 
     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;
+      });
     },
 
     // 提交筛选表单
@@ -326,8 +319,8 @@ export default {
       this.currentPage = val;
       this.getList();
     },
-  }
-}
+  },
+};
 </script>
 
 <style lang="scss" scoped>