销售管理-表格大小更改

src/views/publicComponents/SelectContractModal.vue

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

src/views/publicComponents/SelectProjectModal.vue

@@ -10,7 +10,7 @@
       @cancel="handleCancel">
         <div>
             <!--引用表格-->
-          <BasicTable @register="registerTable" :rowSelection="rowSelection" size="small">
+          <BasicTable @register="registerTable" :rowSelection="rowSelection" size="small" >
             <template #tableTitle>
               <a-button type="primary"  v-if="allowAdd=='yes'"  @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增(add)</a-button>
             </template>
@@ -50,6 +50,9 @@
             },
            showTableSetting:false,
            showActionColumn:false,
+           scroll:{
+              y:'400px'
+            },
            actionColumn: {
                width: 200,
                fixed:'right'

src/views/publicComponents/SelectQuotationModal.vue

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

src/views/publicComponents/SelectSaleOrderMianModal.vue

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

src/views/publicComponents/SelectSaleOrderModal.vue

@@ -158,7 +158,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/freightPurchaseOrder/components/SelectDeliveryNoticeModal.vue

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

src/views/saleCode/advancePayment/advancePaymentList.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,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">
@@ -161,6 +162,7 @@
       },
       scroll: {
         x: '2200px',
+        y:'calc(100vh - 400px)',
       },
       beforeFetch: async (params) => {
         let rangerQuery = await setRangeQuery();

src/views/saleCode/deliveryNotice/deliveryNoticeList.vue

@@ -11,16 +11,9 @@
             </a-form-item>
           </a-col>
           <a-col :lg="8">
-            <a-form-item name="bideliveryDatellDate">
-              <template #label><span title="发货日期(delivery date)">发货日期(delivery date)</span></template>
-              <a-range-picker value-format="YYYY-MM-DD" v-model:value="queryParam.deliveryDate" class="query-group-cust" />
-            </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="bideliveryDatellDate">
+                <template #label><span title="发货日期(delivery date)">发货日期(delivery date)</span></template>
+                <a-range-picker value-format="YYYY-MM-DD" v-model:value="queryParam.deliveryDate" class="query-group-cust" />
               </a-form-item>
             </a-col>
             <a-col :lg="8">
@@ -215,6 +215,7 @@
       },
       scroll: {
         x: '3500px',
+        y:'calc(100vh - 400px)',
       },
       beforeFetch: async (params) => {
         let rangerQuery = await setRangeQuery();

src/views/saleCode/quotation/quotation.vue

@@ -11,15 +11,8 @@
             </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>
+              <a-form-item name="quotationProject" >
+                <template #label ><span title="报价项目(quotation project)">报价项目(quotation project)</span></template>
                 <ApiSelect
                   :api="ProjectOption"
                   showSearch
@@ -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="quotationCustomer">
                 <template #label><span title="报价客户(quotation customer)">报价客户(quotation customer)</span></template>
@@ -203,6 +204,7 @@
       },
       scroll: {
         x: '2700px',
+        y:'calc(100vh - 400px)',
       },
       beforeFetch: async (params) => {
         let rangerQuery = await setRangeQuery();
@@ -374,11 +376,11 @@
   const toggleSearchStatus = ref<boolean>(false);
   const labelCol = reactive({
     xs: 24,
-    sm: 8,
+    sm: 9,
   });
   const wrapperCol = reactive({
     xs: 24,
-    sm: 16,
+    sm: 17,
   });
   const labelCol1 = reactive({
     xs: 24,

src/views/saleCode/receiptOrder/receiptOrdertList.vue

@@ -11,13 +11,6 @@
             </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
@@ -32,6 +25,13 @@
                   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">
               <a-form-item name="customer">
@@ -154,6 +154,7 @@
       },
       scroll: {
         x: '2200px',
+        y:'calc(100vh - 400px)',
       },
       beforeFetch: async (params) => {
         let rangerQuery = await setRangeQuery();

src/views/saleCode/rfp/SaleRfp.data.ts

@@ -100,6 +100,7 @@ export const searchFormSchema: FormSchema[] = [
     label: '客户(customer)',
     field: 'customerId',
     component: 'ApiSelect',
+    labelWidth: 150,
     componentProps: {
       // mode: 'multiple',//multiple: 多选；不填写为单选
       //请求api,返回结果{ result: { records: [{'id':'1',name:'scott'},{'id':'2',name:'小张'}] }}
@@ -120,26 +121,6 @@ export const searchFormSchema: FormSchema[] = [
     },
     //colProps: {span: 6},
   },
-  {
-    label: '投标结果(tender result)',
-    field: 'tenderResult',
-    component: 'JDictSelectTag',
-    componentProps: {
-      dictCode: 'tender_result',
-    },
-    labelWidth: 180,
-    //colProps: {span: 6},
-  },
-  {
-    label: '招标项目号(tender code)',
-    field: 'tenderCode',
-    component: 'JInput',
-    labelWidth: 200,
-    componentProps: {
-      AutoComplete: 'off',
-    },
-    //colProps: {span: 6},
-  },
   {
     label: '系统项目(project)',
     field: 'projectId',
@@ -162,7 +143,26 @@ export const searchFormSchema: FormSchema[] = [
       showSearch: 'true',
     },
   },
-
+  {
+    label: '招标项目号(tender code)',
+    field: 'tenderCode',
+    component: 'JInput',
+    labelWidth: 200,
+    componentProps: {
+      AutoComplete: 'off',
+    },
+    //colProps: {span: 6},
+  },
+  {
+    label: '投标结果(tender result)',
+    field: 'tenderResult',
+    component: 'JDictSelectTag',
+    componentProps: {
+      dictCode: 'tender_result',
+    },
+    labelWidth: 180,
+    //colProps: {span: 6},
+  },
   {
     label: '投标时间(bid Time)',
     field: 'bidTime',

src/views/saleCode/rfp/SaleRfpList.vue

@@ -75,7 +75,8 @@
                fixed:'right'
             },
             scroll:{
-            x:'3000px'
+            x:'3000px',
+            y:'400px'
            },
             beforeFetch: (params) => {
               return Object.assign(params, queryParam);

src/views/saleCode/saleContract/SaleContract.data.ts

@@ -105,18 +105,18 @@ export const searchFormSchema: FormSchema[] = [
     //colProps: {span: 6},
   },
   {
-    label: '客户(Customer)',
-    field: 'quotationCustomer',
+    label: '项目(Project)',
+    field: 'quotationProject',
     labelWidth: 150,
     component: 'ApiSelect',
     componentProps: {
       // mode: 'multiple',//multiple: 多选；不填写为单选
       //请求api,返回结果{ result: { records: [{'id':'1',name:'scott'},{'id':'2',name:'小张'}] }}
-      api: CustomerOption,
+      api: ProjectOption,
       //数值转成String
       numberToString: false,
       //标题字段
-      labelField: 'abbreviation',
+      labelField: 'code',
       //值字段
       valueField: 'id',
       //请求参数
@@ -130,18 +130,18 @@ export const searchFormSchema: FormSchema[] = [
     //colProps: {span: 6},
   },
   {
-    label: '项目(Project)',
-    field: 'quotationProject',
+    label: '客户(Customer)',
+    field: 'quotationCustomer',
     labelWidth: 150,
     component: 'ApiSelect',
     componentProps: {
       // mode: 'multiple',//multiple: 多选；不填写为单选
       //请求api,返回结果{ result: { records: [{'id':'1',name:'scott'},{'id':'2',name:'小张'}] }}
-      api: ProjectOption,
+      api: CustomerOption,
       //数值转成String
       numberToString: false,
       //标题字段
-      labelField: 'code',
+      labelField: 'abbreviation',
       //值字段
       valueField: 'id',
       //请求参数

src/views/saleCode/saleContract/SaleContractList.vue

@@ -74,7 +74,8 @@
                fixed:'right'
            },
            scroll:{
-              x:'3000px'
+              x:'3000px',
+              y:'calc(100vh - 400px)',
            },
            beforeFetch: (params) => {
              return Object.assign(params, queryParam);

src/views/saleCode/saleInquiryForm/SaleInquiryFormList.vue

@@ -11,14 +11,7 @@
             </a-form-item>
           </a-col>
           <a-col :lg="8">
-            <a-form-item name="billCode" :label-col="{ style: 'width: 200px' }">
-              <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="inquiryProject" :label-col="{ style: 'width: 280px' }">
+              <a-form-item name="inquiryProject" :label-col="{ style: 'width: 200px' }">
                 <template #label><span title="询价项目(inquiry project)" AutoComplete="off">询价项目(inquiry project)</span></template>
                 <ApiSelect
                   :api="ProjectOption"
@@ -33,6 +26,13 @@
                 />
               </a-form-item>
             </a-col>
+          <template v-if="toggleSearchStatus">
+            <a-col :lg="8">
+              <a-form-item name="billCode" :label-col="{ style: 'width: 280px' }">
+                <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">
               <a-form-item name="inquiryCustomer" :label-col="{ style: 'width: 200px' }">
                 <template #label><span title="询价客户(inquiry customer)">询价客户(inquiry customer)</span></template>
@@ -249,6 +249,7 @@
       },
       scroll: {
         x: '4000px',
+        y:'calc(100vh - 400px)',
       },
       beforeFetch: async (params) => {
         let rangerQuery = await setRangeQuery();

src/views/saleCode/salesInvoice/components/SelectCommissionOrderModal.vue

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

src/views/saleCode/salesInvoice/components/SelectDeliveryNoticeModal.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>

src/views/saleCode/salesInvoice/salesInvoiceList.vue

@@ -11,26 +11,27 @@
             </a-form-item>
           </a-col>
           <a-col :lg="8">
-            <a-form-item name="invoiceCode" :label-col="labelCol1" :wrapper-col="wrapperCol1">
-              <template #label><span title="发票编号(invoice code)">发票编号(invoice code)</span></template>
-              <JInput placeholder="请输入发票编号(invoice code)" v-model:value="queryParam.invoiceCode" allow-clear AutoComplete="off" />
+            <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"
+                :filterOption="true"
+                resultField="records"
+                labelField="code"
+                valueField="id"
+                :params="{ pageSize: -1 }"
+                optionFilterProp="label"
+              />
             </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
-                  :api="ProjectOption"
-                  showSearch
-                  v-model:value="queryParam.project"
-                  :filterOption="true"
-                  resultField="records"
-                  labelField="code"
-                  valueField="id"
-                  :params="{ pageSize: -1 }"
-                  optionFilterProp="label"
-                />
+              <a-form-item name="invoiceCode" >
+                <template #label><span title="发票编号(invoice code)">发票编号(invoice code)</span></template>
+                <JInput placeholder="请输入发票编号(invoice code)" v-model:value="queryParam.invoiceCode" allow-clear AutoComplete="off" />
               </a-form-item>
             </a-col>
             <a-col :lg="8">
@@ -190,6 +191,8 @@
       },
       scroll: {
         x: '3000px',
+        y:'calc(100vh - 400px)',
+
       },
       beforeFetch: async (params) => {
         let rangerQuery = await setRangeQuery();

src/views/saleCode/salesOrder/SaleOrderFormList.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">
@@ -232,6 +232,7 @@
       },
       scroll: {
         x: '4000px',
+        y:'calc(100vh - 400px)',
       },
       beforeFetch: async (params) => {
         let rangerQuery = await setRangeQuery();

src/views/saleCode/salesOrder/components/SelectSaleOrderModal.vue

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