Merge remote-tracking branch 'origin/master'

src/views/purchase/cert/supCertAudit.vue

@@ -7,12 +7,12 @@
         <el-row>
           <el-col :span="6">
             <el-form-item label="配送企业名称:">
-              <el-input v-model="filterQuery.companyName" style="width: 90%" placeholder="请输入配送企业名称"></el-input>
+              <el-input v-model="filterQuery.companyName" style="width: 90%" placeholder="请输入配送企业名称" clearable></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="统一社会信用号:">
-              <el-input v-model="filterQuery.creditNum" style="width: 90%" placeholder="请输入统一社会信用号"></el-input>
+              <el-input v-model="filterQuery.creditNum" style="width: 90%" placeholder="请输入统一社会信用号" clearable></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -134,13 +134,13 @@
           <el-col :span="6">
             <el-form-item label="生产企业名称">
               <el-input v-model="filterManufacturerQuery.companyName" style="width: 90%"
-                        placeholder="请输入生产企业名称"></el-input>
+                        placeholder="请输入生产企业名称" clearable></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="统一社会信用号">
               <el-input v-model="filterManufacturerQuery.creditCode" style="width: 90%"
-                        placeholder="请输入统一社会信用号"></el-input>
+                        placeholder="请输入统一社会信用号" clearable></el-input>
             </el-form-item>
           </el-col>
         </el-row>

src/views/userManage/registerManage.vue

@@ -8,6 +8,7 @@
               v-model="filterQuery.companyName"
               style="width: 90%"
               placeholder="请输入企业名称"
+              clearable
             ></el-input>
           </el-form-item>
           <el-form-item label="审核状态">