1

src/xt_pages/stock/stockInOrder.vue

@@ -134,8 +134,8 @@
             >
               <el-button
                 size="small"
-                type="primary"
-                icon="el-icon-search"
+                type="warning"
+                icon="el-icon-document"
                 @click="handleSearch(scope.row.id)"
               >
               </el-button>
@@ -325,35 +325,28 @@
           <el-date-picker size="small" v-model="warehousing_time" prefix-icon="el-icon-date" :editable="false"
                           style="width: 196px;" type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
                           value-format="yyyy-MM-dd"></el-date-picker>
+          <label class="title" style="margin-left:10px;"><span class="name">经 销 商</span> : </label>
+          <el-select size="small" v-model="form.dealer" clearable placeholder="请选择经销商" @change="changeDealer">
+            <el-option
+              v-for="(option, index) in dealer"
+              :key="index"
+              :label="option.dealer_name"
+              :value="option.id">
+            </el-option>
+          </el-select>
+          <label class="title" style="margin-left:10px;"><span class="name">厂商</span> : </label>
+
+          <el-select size="small" v-model="form.manufacturer" clearable placeholder="请选择厂商" @change="changeManufacturer">
+            <el-option
+              v-for="(option, index) in manufacturer"
+              :key="index"
+              :label="option.manufacturer_name"
+              :value="option.id">
+            </el-option>
+          </el-select>
         </div>
 
-          <div style="margin-bottom:10px">
-            <label class="title"><span class="name">经 销 商</span> : </label>
-            <el-select size="small" v-model="form.dealer" clearable placeholder="请选择经销商" @change="changeDealer">
-              <el-option
-                v-for="(option, index) in dealer"
-                :key="index"
-                :label="option.dealer_name"
-                :value="option.id">
-              </el-option>
-            </el-select>
-          </div>
-
-          <div style="margin-bottom:10px">
-            <label class="title"><span class="name">厂商</span> : </label>
-
-            <el-select size="small" v-model="form.manufacturer" clearable placeholder="请选择厂商"
-                      @change="changeManufacturer">
-              <el-option
-                v-for="(option, index) in manufacturer"
-                :key="index"
-                :label="option.manufacturer_name"
-                :value="option.id">
-              </el-option>
-            </el-select>
-          </div>
-
-         <el-form :rules="tableRules" :model="recordInfo" ref="tableForm">
+        <el-form :rules="tableRules" :model="recordInfo" ref="tableForm">
         <el-table
           id="oictable"
           :data="recordInfo.recordData"
@@ -447,7 +440,7 @@
               <span>批号</span>
             </template>
             <template slot-scope="scope">
-              <el-form-item>
+              <el-form-item style="padding-top: 15px">
                 <el-input
                   placeholder="请输入批号"
                   v-model="scope.row.number"