采购管理-列表高度修改/筛选条件修改

src/views/publicComponents/SelectPurchaseOrderModal.vue

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

src/views/purchase/arrivedGoods/ArriveGoodsList.vue

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

src/views/purchase/commissionPayRequest/commissionPayRequestList.vue

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

src/views/purchase/freightPurchaseOrder/FreightPurchaseOrderList.vue

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

src/views/purchase/payment/paymentList.vue

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

src/views/purchase/purPaymentRequest/purPaymentRequesttList.vue

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

src/views/purchase/purchaseInquiryForm/components/SelectCustomerInquiryModal.vue

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

src/views/purchase/purchaseInquiryForm/purchaseInquiryFormList.vue

@@ -11,13 +11,6 @@
             </a-form-item>
           </a-col>
           <a-col :lg="8">
-            <a-form-item name="billDate">
-              <template #label><span title="单据日期(bill date)">单据日期(bill date)</span></template>
-              <a-range-picker value-format="YYYY-MM-DD" v-model:value="queryParam.billDate" class="query-group-cust" />
-            </a-form-item>
-          </a-col>
-          <template v-if="toggleSearchStatus">
-            <a-col :lg="8">
               <a-form-item name="inquiryProject">
                 <template #label><span title="询价项目(inquiry project)">询价项目(inquiry project)</span></template>
                 <ApiSelect
@@ -33,6 +26,20 @@
                 />
               </a-form-item>
             </a-col>
+          
+          <template v-if="toggleSearchStatus">
+            <a-col :lg="8">
+              <a-form-item name="billDate">
+                <template #label><span title="单据日期(bill date)">单据日期(bill date)</span></template>
+                <a-range-picker value-format="YYYY-MM-DD" v-model:value="queryParam.billDate" class="query-group-cust" />
+              </a-form-item>
+            </a-col>
+            <a-col :lg="8">
+              <a-form-item name="priority">
+                <template #label><span title="优先级(priority)">优先级(priority)</span></template>
+                <JDictSelectTag v-model:value="queryParam.priority" placeholder="请选择" dictCode="priority" />
+              </a-form-item>
+            </a-col>
             <a-col :lg="8">
               <a-form-item name="inquirySuppiler">
                 <template #label><span title="询价供应商(inquiry supplier)">询价供应商(inquiry supplier)</span></template>
@@ -49,12 +56,6 @@
                 />
               </a-form-item>
             </a-col>
-            <a-col :lg="8">
-              <a-form-item name="priority">
-                <template #label><span title="优先级(priority)">优先级(priority)</span></template>
-                <JDictSelectTag v-model:value="queryParam.priority" placeholder="请选择" dictCode="priority" />
-              </a-form-item>
-            </a-col>
             <a-col :lg="8">
               <a-form-item name="productionClass">
                 <template #label><span title="产品分类(production class)">产品分类(production class)</span></template>
@@ -208,6 +209,7 @@
       },
       scroll: {
         x: '3000px',
+        y:'calc(100vh - 400px)',
       },
       beforeFetch: async (params) => {
         let rangerQuery = await setRangeQuery();
@@ -345,11 +347,11 @@
   const toggleSearchStatus = ref<boolean>(false);
   const labelCol = reactive({
     xs: 24,
-    sm: 8,
+    sm: 9,
   });
   const wrapperCol = reactive({
     xs: 24,
-    sm: 16,
+    sm: 15,
   });
   const labelCol1 = reactive({
     xs: 24,

src/views/purchase/purchaseOrder/PurchaseOrderFormList.vue

@@ -11,16 +11,9 @@
             </a-form-item>
           </a-col>
           <a-col :lg="8">
-            <a-form-item name="billCode" :label-col="labelCol1" :wrapper-col="wrapperCol1">
-              <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" :label-col="labelCol1" :wrapper-col="wrapperCol1">
+              <template #label><span title="系统项目(project)">系统项目(project)</span></template>
+              <ApiSelect
                   :api="ProjectOption"
                   showSearch
                   v-model:value="queryParam.project"
@@ -30,7 +23,15 @@
                   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">
@@ -235,6 +236,7 @@
       },
       scroll: {
         x: '4000px',
+        y:'calc(100vh - 400px)',
       },
       beforeFetch: async (params) => {
         let rangerQuery = await setRangeQuery();

src/views/purchase/purchaseQuotationFrm/components/SelectSupplierInquiryModal.vue

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

src/views/purchase/purchaseQuotationFrm/purchaseQuotationFormList.vue

@@ -11,13 +11,6 @@
             </a-form-item>
           </a-col>
           <a-col :lg="8">
-            <a-form-item name="billDate">
-              <template #label><span title="单据日期(bill date)">单据日期(bill date)</span></template>
-              <a-range-picker value-format="YYYY-MM-DD" v-model:value="queryParam.billDate" class="query-group-cust" />
-            </a-form-item>
-          </a-col>
-          <template v-if="toggleSearchStatus">
-            <a-col :lg="8">
               <a-form-item name="quotationProject">
                 <template #label><span title="报价项目(quotation project)">报价项目(quotation project)</span></template>
                 <ApiSelect
@@ -33,6 +26,14 @@
                 />
               </a-form-item>
             </a-col>
+          
+          <template v-if="toggleSearchStatus">
+            <a-col :lg="8">
+              <a-form-item name="billDate">
+                <template #label><span title="单据日期(bill date)">单据日期(bill date)</span></template>
+                <a-range-picker value-format="YYYY-MM-DD" v-model:value="queryParam.billDate" class="query-group-cust" />
+              </a-form-item>
+            </a-col>
             <a-col :lg="8">
               <a-form-item name="quotationSuppiler">
                 <template #label><span title="报价供应商(quotation supplier)">报价供应商(quotation supplier)</span></template>
@@ -204,6 +205,7 @@
       },
       scroll: {
         x: '3000px',
+        y:'calc(100vh - 400px)',
       },
       beforeFetch: async (params) => {
         let rangerQuery = await setRangeQuery();
@@ -325,11 +327,11 @@
   const toggleSearchStatus = ref<boolean>(false);
   const labelCol = reactive({
     xs: 24,
-    sm: 8,
+    sm: 9,
   });
   const wrapperCol = reactive({
     xs: 24,
-    sm: 16,
+    sm: 15,
   });
   const labelCol1 = reactive({
     xs: 24,

src/views/purchase/selectionQuotationForm/selectionQuotationFormList.vue

@@ -11,16 +11,9 @@
             </a-form-item>
           </a-col>
           <a-col :lg="8">
-            <a-form-item name="billDate">
-              <template #label><span title="单据日期(bill date)">单据日期(bill date)</span></template>
-              <a-range-picker value-format="YYYY-MM-DD" v-model:value="queryParam.billDate" class="query-group-cust" />
-            </a-form-item>
-          </a-col>
-          <template v-if="toggleSearchStatus">
-            <a-col :lg="8">
-              <a-form-item name="inquiryProject">
-                <template #label><span title="询价项目(inquiry project)">询价项目(inquiry project)</span></template>
-                <ApiSelect
+            <a-form-item name="inquiryProject">
+              <template #label><span title="询价项目(inquiry project)">询价项目(inquiry project)</span></template>
+              <ApiSelect
                   :api="ProjectOption"
                   showSearch
                   v-model:value="queryParam.inquiryProject"
@@ -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="billDate">
+                <template #label><span title="单据日期(bill date)">单据日期(bill date)</span></template>
+                <a-range-picker value-format="YYYY-MM-DD" v-model:value="queryParam.billDate" class="query-group-cust" />
               </a-form-item>
             </a-col>
             <a-col :lg="8">
@@ -181,6 +181,7 @@
       },
       scroll: {
         x: '2000px',
+        y:'calc(100vh - 400px)',
       },
       beforeFetch: async (params) => {
         let rangerQuery = await setRangeQuery();