chenrui il y a 1 an
Parent
commit
ab08c1a01c

+ 1 - 1
src/views/bulkManagement/bulkImport/chooseImportModal.vue

@@ -20,7 +20,7 @@
           :rowKey="(record) => record.id"
           :columns="columns"
           :data="loadData"
-          :scroll="{ y:430 }"
+          :scroll="{ y:430 ,x: 1990}"
           :defaultLoadData="false"
           bordered>
         </s-table>

+ 1 - 1
src/views/inventoryManagement/inventoryImport/chooseImportModal.vue

@@ -20,7 +20,7 @@
           :rowKey="(record) => record.id"
           :columns="columns"
           :data="loadData"
-          :scroll="{ y:430 }"
+          :scroll="{ y:430}"
           :defaultLoadData="false"
           bordered>
         </s-table>

+ 5 - 5
src/views/inventoryManagement/inventoryImport/detailList.vue

@@ -22,11 +22,6 @@
               <a-input v-model.trim="queryParam.productEntity.name" allowClear placeholder="请输入产品名称"/>
             </a-form-model-item>
           </a-col>
-          <a-col :md="typeInfo != 'STOCK_IMPORT'?5:6" :sm="24">
-            <a-form-item label="仓库名称">
-              <a-input id="warehouseList-name" v-model.trim="queryParam.productEntity.warehouseName" allowClear placeholder="请输入仓库名称"/>
-            </a-form-item>
-          </a-col>
           <a-col :md="typeInfo != 'STOCK_IMPORT'?5:6" :sm="24" v-if="typeInfo != 'STOCK_IMPORT'">
             <a-form-model-item label="供应商">
               <supplier
@@ -36,6 +31,11 @@
               ></supplier>
             </a-form-model-item>
           </a-col>
+          <a-col :md="typeInfo != 'STOCK_IMPORT'?5:6" :sm="24">
+            <a-form-item label="仓库名称">
+              <a-input id="warehouseList-name" v-model.trim="queryParam.productEntity.warehouseName" allowClear placeholder="请输入仓库名称"/>
+            </a-form-item>
+          </a-col>
           <a-col :md="typeInfo != 'STOCK_IMPORT'?4:6" :sm="24" style="margin-bottom: 10px;">
             <a-button type="primary" @click="handleSearch" :disabled="disabled" id="salesDetailReportList-refresh">查询</a-button>
             <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="salesDetailReportList-reset">重置</a-button>