Merge remote-tracking branch 'origin/dev_New' into dev_New

chenhj

昨天 cac302f302084ab310d0e35339f30966a4829a4e

 src/views/qualityManagement/nearExpiryReturn/index.vue

@@ -1,6 +1,6 @@
<template>
  <div class="app-container">
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
      <el-form-item label="产品名称" prop="productName">
        <el-input
          v-model="queryParams.productName"