Browse Source

库存管理-列表高度调整/筛选字段顺序调整

jingbb 4 months ago
parent
commit
090301bd04

+ 12 - 11
src/views/inventiry/defectiveProducts/defectiveProductsList.vue

@@ -11,16 +11,9 @@
             </a-form-item>
           </a-col>
           <a-col :lg="8">
-            <a-form-item name="billCode">
-              <template #label><span title="入库单号(bill code)">入库单号(bill code)</span></template>
-              <JInput placeholder="请输入入库单号(bill code)" v-model:value="queryParam.billCode" allow-clear AutoComplete="off" />
-            </a-form-item>
-          </a-col>
-          <template v-if="toggleSearchStatus">
-            <a-col :lg="8">
-              <a-form-item name="project">
-                <template #label><span title="项目(project)">项目(project)</span></template>
-                <ApiSelect
+            <a-form-item name="project">
+              <template #label><span title="项目(project)">项目(project)</span></template>
+              <ApiSelect
                   :api="ProjectOption"
                   showSearch
                   v-model:value="queryParam.project"
@@ -30,7 +23,14 @@
                   valueField="id"
                   :params="{ pageSize: -1 }"
                   optionFilterProp="label"
-                />
+              />
+            </a-form-item>
+          </a-col>
+          <template v-if="toggleSearchStatus">
+            <a-col :lg="8">
+              <a-form-item name="billCode">
+                <template #label><span title="入库单号(bill code)">入库单号(bill code)</span></template>
+                <JInput placeholder="请输入入库单号(bill code)" v-model:value="queryParam.billCode" allow-clear AutoComplete="off" />
               </a-form-item>
             </a-col>
             <a-col :lg="8">
@@ -104,6 +104,7 @@
       //  },
       scroll: {
         x: '3500px',
+        y:'calc(100vh - 400px)',
       },
       beforeFetch: async (params) => {
         let rangerQuery = await setRangeQuery();

+ 12 - 11
src/views/inventiry/existingQuantity/existingQuantityList.vue

@@ -11,16 +11,9 @@
             </a-form-item>
           </a-col>
           <a-col :lg="8">
-            <a-form-item name="goodsAllocation">
-              <template #label><span title="货位(goods allocation)">货位(goods allocation)</span></template>
-              <JDictSelectTag v-model:value="queryParam.goodsAllocation" placeholder="请选择" dictCode="goods_allocation" />
-            </a-form-item>
-          </a-col>
-          <template v-if="toggleSearchStatus">
-            <a-col :lg="8">
-              <a-form-item name="project">
-                <template #label><span title="项目(project)">项目(project)</span></template>
-                <ApiSelect
+            <a-form-item name="project">
+              <template #label><span title="项目(project)">项目(project)</span></template>
+              <ApiSelect
                   :api="ProjectOption"
                   showSearch
                   v-model:value="queryParam.project"
@@ -30,7 +23,14 @@
                   valueField="id"
                   :params="{ pageSize: -1 }"
                   optionFilterProp="label"
-                />
+              />
+            </a-form-item>
+          </a-col>
+          <template v-if="toggleSearchStatus">
+            <a-col :lg="8">
+              <a-form-item name="goodsAllocation">
+                <template #label><span title="货位(goods allocation)">货位(goods allocation)</span></template>
+                <JDictSelectTag v-model:value="queryParam.goodsAllocation" placeholder="请选择" dictCode="goods_allocation" />
               </a-form-item>
             </a-col>
             <a-col :lg="8">
@@ -155,6 +155,7 @@
       //  },
       scroll: {
         x: '3500px',
+        y:'calc(100vh - 400px)',
       },
       beforeFetch: async (params) => {
         let rangerQuery = await setRangeQuery();

+ 1 - 0
src/views/inventiry/inventoryCheck/inventoryCheckList.vue

@@ -124,6 +124,7 @@
       },
       scroll: {
         x: '1600px',
+        y:'calc(100vh - 400px)',
       },
       beforeFetch: async (params) => {
         let rangerQuery = await setRangeQuery();

+ 12 - 11
src/views/inventiry/otherIn/othernList.vue

@@ -11,16 +11,9 @@
             </a-form-item>
           </a-col>
           <a-col :lg="8">
-            <a-form-item name="billCode">
-              <template #label><span title="入库单号(bill code)">入库单号(bill code)</span></template>
-              <JInput placeholder="请输入入库单号(bill code)" v-model:value="queryParam.billCode" allow-clear AutoComplete="off" />
-            </a-form-item>
-          </a-col>
-          <template v-if="toggleSearchStatus">
-            <a-col :lg="8">
-              <a-form-item name="project">
-                <template #label><span title="项目(project)">项目(project)</span></template>
-                <ApiSelect
+            <a-form-item name="project">
+              <template #label><span title="项目(project)">项目(project)</span></template>
+              <ApiSelect
                   :api="ProjectOption"
                   showSearch
                   v-model:value="queryParam.project"
@@ -30,7 +23,14 @@
                   valueField="id"
                   :params="{ pageSize: -1 }"
                   optionFilterProp="label"
-                />
+              />
+            </a-form-item>
+          </a-col>
+          <template v-if="toggleSearchStatus">
+            <a-col :lg="8">
+              <a-form-item name="billCode">
+                <template #label><span title="入库单号(bill code)">入库单号(bill code)</span></template>
+                <JInput placeholder="请输入入库单号(bill code)" v-model:value="queryParam.billCode" allow-clear AutoComplete="off" />
               </a-form-item>
             </a-col>
             <a-col :lg="8">
@@ -196,6 +196,7 @@
       },
       scroll: {
         x: '2500px',
+        y:'calc(100vh - 400px)',
       },
       beforeFetch: async (params) => {
         let rangerQuery = await setRangeQuery();

+ 12 - 11
src/views/inventiry/otherOut/otherOutList.vue

@@ -11,16 +11,9 @@
             </a-form-item>
           </a-col>
           <a-col :lg="8">
-            <a-form-item name="billCode">
-              <template #label><span title="出库单号(bill code)">入库单号(bill code)</span></template>
-              <JInput placeholder="请输入入库单号(bill code)" v-model:value="queryParam.billCode" allow-clear AutoComplete="off" />
-            </a-form-item>
-          </a-col>
-          <template v-if="toggleSearchStatus">
-            <a-col :lg="8">
-              <a-form-item name="project">
-                <template #label><span title="项目(project)">项目(project)</span></template>
-                <ApiSelect
+            <a-form-item name="project">
+              <template #label><span title="项目(project)">项目(project)</span></template>
+              <ApiSelect
                   :api="ProjectOption"
                   showSearch
                   v-model:value="queryParam.project"
@@ -30,7 +23,14 @@
                   valueField="id"
                   :params="{ pageSize: -1 }"
                   optionFilterProp="label"
-                />
+              />
+            </a-form-item>
+          </a-col>
+          <template v-if="toggleSearchStatus">
+            <a-col :lg="8">
+              <a-form-item name="billCode">
+                <template #label><span title="出库单号(bill code)">入库单号(bill code)</span></template>
+                <JInput placeholder="请输入入库单号(bill code)" v-model:value="queryParam.billCode" allow-clear AutoComplete="off" />
               </a-form-item>
             </a-col>
             <a-col :lg="8">
@@ -168,6 +168,7 @@
       },
       scroll: {
         x: '2000px',
+        y:'calc(100vh - 400px)',
       },
       beforeFetch: async (params) => {
         let rangerQuery = await setRangeQuery();

+ 12 - 11
src/views/inventiry/purInAbnormal/purInAbnormalList.vue

@@ -11,16 +11,9 @@
             </a-form-item>
           </a-col>
           <a-col :lg="8">
-            <a-form-item name="billCode">
-              <template #label><span title="入库单号(bill code)">入库单号(bill code)</span></template>
-              <JInput placeholder="请输入入库单号(bill code)" v-model:value="queryParam.billCode" allow-clear AutoComplete="off" />
-            </a-form-item>
-          </a-col>
-          <template v-if="toggleSearchStatus">
-            <a-col :lg="8">
-              <a-form-item name="project">
-                <template #label><span title="项目(project)">项目(project)</span></template>
-                <ApiSelect
+            <a-form-item name="project">
+              <template #label><span title="项目(project)">项目(project)</span></template>
+              <ApiSelect
                   :api="ProjectOption"
                   showSearch
                   v-model:value="queryParam.project"
@@ -29,7 +22,14 @@
                   labelField="code"
                   valueField="id"
                   :params="{ pageSize: -1 }"
-                />
+              />
+            </a-form-item>
+          </a-col>
+          <template v-if="toggleSearchStatus">
+            <a-col :lg="8">
+              <a-form-item name="billCode">
+                <template #label><span title="入库单号(bill code)">入库单号(bill code)</span></template>
+                <JInput placeholder="请输入入库单号(bill code)" v-model:value="queryParam.billCode" allow-clear AutoComplete="off" />
               </a-form-item>
             </a-col>
             <a-col :lg="8">
@@ -158,6 +158,7 @@
       },
       scroll: {
         x: '2500px',
+        y:'calc(100vh - 400px)',
       },
       beforeFetch: async (params) => {
         let rangerQuery = await setRangeQuery();

+ 12 - 11
src/views/inventiry/purchaseIn/purchaseInList.vue

@@ -11,16 +11,9 @@
             </a-form-item>
           </a-col>
           <a-col :lg="8">
-            <a-form-item name="billCode">
-              <template #label><span title="入库单号(bill code)">入库单号(bill code)</span></template>
-              <JInput placeholder="请输入入库单号(bill code)" v-model:value="queryParam.billCode" allow-clear AutoComplete="off" />
-            </a-form-item>
-          </a-col>
-          <template v-if="toggleSearchStatus">
-            <a-col :lg="8">
-              <a-form-item name="project">
-                <template #label><span title="项目(project)">项目(project)</span></template>
-                <ApiSelect
+            <a-form-item name="project">
+              <template #label><span title="项目(project)">项目(project)</span></template>
+              <ApiSelect
                   :api="ProjectOption"
                   showSearch
                   v-model:value="queryParam.project"
@@ -30,7 +23,14 @@
                   valueField="id"
                   :params="{ pageSize: -1 }"
                   optionFilterProp="label"
-                />
+               />
+            </a-form-item>
+          </a-col>
+          <template v-if="toggleSearchStatus">
+            <a-col :lg="8">
+              <a-form-item name="billCode">
+                <template #label><span title="入库单号(bill code)">入库单号(bill code)</span></template>
+                <JInput placeholder="请输入入库单号(bill code)" v-model:value="queryParam.billCode" allow-clear AutoComplete="off" />
               </a-form-item>
             </a-col>
             <a-col :lg="8">
@@ -189,6 +189,7 @@
       },
       scroll: {
         x: '2500px',
+        y:'calc(100vh - 400px)',
       },
       beforeFetch: async (params) => {
         let rangerQuery = await setRangeQuery();

+ 1 - 1
src/views/inventiry/salesOutbound/components/SelectDeliveryModal.vue

@@ -131,7 +131,7 @@
                 size="small"
                 @change="handleTableChange"
                 :pagination="pagination"
-                :scroll="{ x: 3500, y: 300 }"
+                :scroll="{ x: 3500, y: 400 }"
                 :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
             >
             </a-table>

+ 1 - 1
src/views/inventiry/salesOutbound/components/SelectStaningStockModal.vue

@@ -127,7 +127,7 @@
                 size="small"
                 @change="handleTableChange"
                 :pagination="pagination"
-                :scroll="{ x: 3500, y: 300 }"
+                :scroll="{ x: 3500, y: 400 }"
                 :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
             >
             </a-table>

+ 12 - 11
src/views/inventiry/salesOutbound/salesOutboundList.vue

@@ -11,16 +11,9 @@
             </a-form-item>
           </a-col>
           <a-col :lg="8">
-            <a-form-item name="billCode">
-              <template #label><span title="出库单号(bill code)">出库单号(bill code)</span></template>
-              <JInput placeholder="请输入出库单号(bill code)" v-model:value="queryParam.billCode" allow-clear AutoComplete="off" />
-            </a-form-item>
-          </a-col>
-          <template v-if="toggleSearchStatus">
-            <a-col :lg="8">
-              <a-form-item name="project">
-                <template #label><span title="项目(project)">项目(project)</span></template>
-                <ApiSelect
+            <a-form-item name="project">
+              <template #label><span title="项目(project)">项目(project)</span></template>
+              <ApiSelect
                   :api="ProjectOption"
                   showSearch
                   v-model:value="queryParam.project"
@@ -30,7 +23,14 @@
                   valueField="id"
                   :params="{ pageSize: -1 }"
                   optionFilterProp="label"
-                />
+              />
+            </a-form-item>
+          </a-col>
+          <template v-if="toggleSearchStatus">
+            <a-col :lg="8">
+              <a-form-item name="billCode">
+                <template #label><span title="出库单号(bill code)">出库单号(bill code)</span></template>
+                <JInput placeholder="请输入出库单号(bill code)" v-model:value="queryParam.billCode" allow-clear AutoComplete="off" />
               </a-form-item>
             </a-col>
             <a-col :lg="8">
@@ -221,6 +221,7 @@
       },
       scroll: {
         x: '2500px',
+        y:'calc(100vh - 400px)',
       },
       beforeFetch: async (params) => {
         let rangerQuery = await setRangeQuery();

+ 3 - 0
src/views/publicComponents/SelectShipSModal.vue

@@ -48,6 +48,9 @@
                width: 200,
                fixed:'right'
             },
+            scroll: {
+              y:'400px',
+            },
             beforeFetch: (params) => {
               return Object.assign(params, queryParam);
             },

+ 1 - 1
src/views/publicComponents/SelectStaningStockModal.vue

@@ -139,7 +139,7 @@
                 size="small"
                 @change="handleTableChange"
                 :pagination="pagination"
-                :scroll="{ x: 3500, y: 300 }"
+                :scroll="{ x: 3500, y: 400 }"
                 :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
             >
             </a-table>

+ 1 - 1
src/views/publicComponents/selectArrivalList.vue

@@ -119,7 +119,7 @@
                 size="small"
                 @change="handleTableChange"
                 :pagination="pagination"
-                :scroll="{ x: 3200, y: 300 }"
+                :scroll="{ x: 3200, y: 400 }"
                 :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
             >
             </a-table>