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

src/views/pharmaceuticals/distribution/DialogCreateOrder.vue

@@ -5,9 +5,9 @@
                style="margin-bottom: -15px">
         <el-button-group
           style="display: flex; margin: 0px 0 15px 75%; height: 35px">
-          <el-button size="mini" type="success" @click="triggerFileUpload2"
+          <el-button size="mini" type="success" @click="triggerFileUpload2" icon="el-icon-upload"
           >
-            1:上传阳采单据
+            上传阳采单据
           </el-button>
           <!-- 隐藏的文件输入元素 -->
           <input type="file" ref="fileInput2" accept=".xlsx,.xls" style="display: none;" @change="handleFileUpload2"/>
@@ -186,7 +186,7 @@
           </el-col>
         </el-row>
         <el-row v-if="viewType!=1">
-          <el-col :span="20">
+          <el-col :span="18">
             <el-form-item prop="code" label="扫码录入校验:">
               <el-input
                 id="inputer"
@@ -199,7 +199,7 @@
               ></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="2">
+          <el-col :span="4">
             <el-button-group
               style="display: flex; height: 35px">
               <el-button
@@ -211,14 +211,23 @@
               </el-button
               >
               <el-button
+                icon="el-icon-document-add"
                 type="success"
                 size="mini"
                 @click.native="selectOrder()"
                 v-if="curAction.checkWebNew != 2  || viewType !=1"
-              >2:下载码上放心追溯码
+              >下载码上放心追溯码
                 <!--   v-if="(curAction.checkWebNew !== 2 || viewType !== 1) && orderFormData.billNo"-->
               </el-button
               >
+
+              <el-button size="mini" type="success" @click="triggerFileUpload" icon="el-icon-upload2"
+                         v-if="curAction.checkWebNew != 2  || viewType !=1"
+              >
+                导入阳采追溯码
+              </el-button>
+              <!-- 隐藏的文件输入元素 -->
+              <input type="file" ref="fileInput" accept=".xlsx,.xls" style="display: none;" @change="handleFileUpload"/>
             </el-button-group>
 
           </el-col>