Merge remote-tracking branch 'origin/master'

src/views/basic/product/udiInfoImport.vue

@@ -5,7 +5,7 @@
         <el-row>
           <el-col :span="6">
             <el-form-item label="记录ID:">
-              <el-input v-model="filterQuery.genKey" style="width: 90%" placeholder="请输入记录ID"></el-input>
+              <el-input v-model="filterQuery.genKey" style="width: 90%" placeholder="请输入记录ID" clearable></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -21,15 +21,17 @@
         </el-row>
       </el-form>
 
+      <div class="top-right-btn">
+        <el-upload :action="uploadFileUrl" multiple :limit="1" :data="uploadData" :show-file-list="false"
+                   :on-success="handleChange" :file-list="fileList">
+          <el-button icon="el-icon-upload2" type="primary">导入器械信息</el-button>
+        </el-upload>
+      </div>
       <div class="top-right-btn">
         <el-button-group>
           <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
           <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
           <el-button type="primary" icon="search" @click="getList">查询</el-button>
-          <el-upload :action="uploadFileUrl" multiple :limit="1" :data="uploadData" :show-file-list="false"
-                     :on-success="handleChange" :file-list="fileList">
-            <el-button icon="el-icon-upload2" type="primary">导入器械信息</el-button>
-          </el-upload>
         </el-button-group>
       </div>
       <el-divider style="margin: 15px"></el-divider>

src/views/inout/IoDealOrder.vue

@@ -160,7 +160,7 @@
         </el-table-column>
       </el-table>
       <el-dialog
-        title="新增单据"
+        title="编辑单据"
         :visible.sync="addOrderVisible"
         width="85%"
         append-to-body