Merge remote-tracking branch 'origin/dev2.5_scan' into dev2.5_scan

src/views/inoutDrug/DialogCreateDrugOrder.vue

@@ -361,7 +361,7 @@
           </el-col>
         </el-row>
         <el-row v-if="viewType != 1">
-          <el-col :span="18">
+          <el-col :span="16">
             <el-form-item prop="code" label="扫码录入校验:">
               <el-input
                 @focus="getInputFocus($event)"
@@ -373,7 +373,7 @@
               ></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="4">
+          <el-col :span="6">
             <el-button-group
               style="display: flex; height: 35px">
               <el-button