测试问题修改

ruoyi-ui/src/views/in/job/index.vue

@@ -80,21 +80,21 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="仓库" prop="warehouseId"><!--仓库-->
-        <el-select
-          v-model="queryParams.warehouseId"
-          placeholder="请选择仓库"
-          clearable
-          @change="handleQuery"
-        >
-          <el-option
-            v-for="item in warehouseOptions"
-            :key="item.warehouseId"
-            :label="item.warehouseName"
-            :value="item.warehouseId"
-          />
-        </el-select>
-      </el-form-item>
+<!--      <el-form-item label="仓库" prop="warehouseId">&lt;!&ndash;仓库&ndash;&gt;-->
+<!--        <el-select-->
+<!--          v-model="queryParams.warehouseId"-->
+<!--          placeholder="请选择仓库"-->
+<!--          clearable-->
+<!--          @change="handleQuery"-->
+<!--        >-->
+<!--          <el-option-->
+<!--            v-for="item in warehouseOptions"-->
+<!--            :key="item.warehouseId"-->
+<!--            :label="item.warehouseName"-->
+<!--            :value="item.warehouseId"-->
+<!--          />-->
+<!--        </el-select>-->
+<!--      </el-form-item>-->
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -145,7 +145,6 @@
         </template>
       </el-table-column>
       <el-table-column label="任务号" align="left" prop="taskNo" />
-      <el-table-column label="批号" align="left" prop="lotNo" fixed />
       <el-table-column label="托盘码" align="left" prop="trayCode" width="140" />
       <el-table-column label="货位" align="left" prop="cargoSpaceName" width="140" />
       <el-table-column label="优先级" align="left" prop="priority" />
@@ -179,6 +178,8 @@
       <el-table-column label="子单据ID" align="left" prop="inOrOutDId" />
       <el-table-column label="物料编码" align="left" prop="productId" width="140" />
       <el-table-column label="物料名称" align="left" prop="productName" />
+      <el-table-column label="批号" align="left" prop="lotNo" />
+      <el-table-column label="入库数量" align="right" prop="inQuantity" />
       <el-table-column label="机型" align="left" prop="unit"/><!--机型-->
       <el-table-column label="分销" align="left" prop="spare9"/><!--分销-->
       <el-table-column label="规格" align="left" prop="spec"/><!--规格-->
@@ -190,7 +191,6 @@
       <el-table-column label="功率" align="left" prop="spare6"/><!--功率-->
       <el-table-column label="相位" align="left" prop="spare7"/><!--相位-->
       <el-table-column label="毛重" align="left" prop="spare8"/><!--毛重-->
-      <el-table-column label="入库数量" align="right" prop="inQuantity" />
     </el-table>
 
     <pagination
@@ -288,7 +288,7 @@ export default {
   created() {
     // 获取字典数据后，设置默认值
     this.getList()
-    this.getWarehouseList()
+    //this.getWarehouseList()
   },
   methods: {
     /** 获取仓库列表 */

ruoyi-ui/src/views/in/stockIn/add/index_new.vue

@@ -52,10 +52,10 @@
             <el-button type="primary" plain icon="el-icon-download" size="mini" @click="handleAddProduct" v-hasPermi="['receive:stockin:add']">
               添加物料</el-button>
           </el-col>
-          <el-col :span="1.5">
+<!--          <el-col :span="1.5">
             <el-button type="success" plain icon="el-icon-download" size="mini" @click="handleImport" v-hasPermi="['receive:stockin:import']">
               导入物料</el-button>
-          </el-col>
+          </el-col>-->
         </el-row>
       </div>