Browse Source

销售管理/采购管理/库存管理-客户筛选框加宽

jingbb 2 months ago
parent
commit
75cabd5174

+ 2 - 2
src/views/inventiry/otherOut/otherOutList.vue

@@ -2,7 +2,7 @@
   <div class="p-2">
     <!--查询区域-->
     <div class="jeecg-basic-table-form-container">
-      <a-form ref="formRef" @keyup.enter.native="reload" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
+      <a-form ref="formRef" @keyup.enter.native="reload" :model="queryParam" :label-col="{ style: 'width: 200px' }">
         <a-row :gutter="24">
           <a-col :lg="8">
             <a-form-item name="billDate">
@@ -33,7 +33,7 @@
                 <JInput placeholder="请输入入库单号(bill code)" v-model:value="queryParam.billCode" allow-clear AutoComplete="off" />
               </a-form-item>
             </a-col>
-            <a-col :lg="8">
+            <a-col :lg="16">
               <a-form-item name="customer">
                 <template #label><span title="客户(customer)">客户(customer)</span></template>
                 <JSelect   v-model:value="queryParam.customer" :get-option-url="CustomerOption" :showField="showField"></JSelect>

+ 12 - 11
src/views/inventiry/salesOutbound/components/SelectDeliveryModal.vue

@@ -10,7 +10,7 @@
         <div>
           <a-card  :body-style="{ padding: '10px' }" :bordered="false" style="margin: 10px;">
             <div class="table-page-search-wrapper">
-                <a-form :model="queryParams" :label-col="labelCol" :wrapper-col="wrapperCol" @keyup.enter.native="searchQuery">
+                <a-form :model="queryParams"  :label-col="{ style: 'width: 200px' }" @keyup.enter.native="searchQuery">
                 <a-row :gutter="24">
                     <a-col :md="6" :sm="8">
                         <a-form-item label="发货单号(bill code)">
@@ -18,7 +18,7 @@
                         </a-form-item>
                     </a-col>
                     <a-col :md="6" :sm="8">
-                        <a-form-item label="发货日期(delivery date)" :label-col="labelCol1" :wrapper-col="wrapperCol1">
+                        <a-form-item label="发货日期(delivery date)" >
                             <a-range-picker value-format="YYYY-MM-DD"  v-model:value="deliveryDate"  @change="chengDeliveryDate" class="query-group-cust"/>
                         </a-form-item>
                     </a-col> 
@@ -38,19 +38,20 @@
                                 />
                             </a-form-item>
                         </a-col>
-                        <a-col :md="6" :sm="8">
-                            <a-form-item label="客户(customer)" :label-col="labelCol1" :wrapper-col="wrapperCol1">
-                                <JSelect   v-model:value="queryParams.customer" :get-option-url="CustomerOption" :showField="showField"></JSelect>
-                            </a-form-item>
-                        </a-col>
-                        
                         <a-col :md="6" :sm="8">
                             <a-form-item label="优先级(priority)" >
                                 <JDictSelectTag v-model:value="queryParams.priority" placeholder="请选择" dictCode="priority"/>
                             </a-form-item>
                         </a-col>
+                        <a-col :md="12" :sm="16">
+                            <a-form-item label="客户(customer)" >
+                                <JSelect   v-model:value="queryParams.customer" :get-option-url="CustomerOption" :showField="showField"></JSelect>
+                            </a-form-item>
+                        </a-col>
+                        
+                        
                         <a-col :md="6" :sm="8">
-                            <a-form-item label="产品分类(production class)" :label-col="labelCol1" :wrapper-col="wrapperCol1">
+                            <a-form-item label="产品分类(production class)" >
                                 <ApiSelect
                                     :api="ClassList"
                                     showSearch
@@ -70,7 +71,7 @@
                         </a-col>
                         
                         <a-col :md="6" :sm="8">
-                            <a-form-item label="产品英文名(English name)" :label-col="labelCol1" :wrapper-col="wrapperCol1">
+                            <a-form-item label="产品英文名(English name)" >
                                 <j-input placeholder="请输入" v-model:value="queryParams.englishName"></j-input>
                             </a-form-item>
                         </a-col>
@@ -81,7 +82,7 @@
                             </a-form-item>
                         </a-col> 
                         <a-col :md="6" :sm="8">
-                            <a-form-item label="产品编码(product code)" :label-col="labelCol1" :wrapper-col="wrapperCol1">
+                            <a-form-item label="产品编码(product code)" >
                                 <j-input placeholder="请输入" v-model:value="queryParams.productCode"></j-input>
                             </a-form-item>
                         </a-col>                       

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

@@ -10,7 +10,7 @@
         <div>
           <a-card  :body-style="{ padding: '10px' }" :bordered="false" style="margin: 10px;">
             <div class="table-page-search-wrapper">
-                <a-form :model="queryParams" :label-col="labelCol" :wrapper-col="wrapperCol" @keyup.enter.native="searchQuery">
+                <a-form :model="queryParams" :label-col="{ style: 'width: 200px' }" @keyup.enter.native="searchQuery">
                 <a-row :gutter="24">
                     <a-col :md="6" :sm="8">
                         <a-form-item label="仓库(warehouse)">
@@ -42,13 +42,13 @@
                                 />
                             </a-form-item>
                         </a-col>
-                        <a-col :md="6" :sm="8">
+                        <a-col :md="12" :sm="16">
                             <a-form-item label="客户(customer)">
                                 <JSelect   v-model:value="queryParams.customer" :get-option-url="CustomerOption" :showField="showField"></JSelect>
                             </a-form-item>
                         </a-col>
                         <a-col :md="6" :sm="8">
-                            <a-form-item label="产品分类(production class)" :label-col="labelCol1" :wrapper-col="wrapperCol1">
+                            <a-form-item label="产品分类(production class)" >
                                 <ApiSelect
                                     :api="ClassList"
                                     showSearch
@@ -67,7 +67,7 @@
                             </a-form-item>
                         </a-col>
                         <a-col :md="6" :sm="8">
-                            <a-form-item label="产品编码(product code)" :label-col="labelCol1" :wrapper-col="wrapperCol1">
+                            <a-form-item label="产品编码(product code)" >
                                 <j-input placeholder="请输入" v-model:value="queryParams.productCode"  :disabled="father.productCode!==''"></j-input>
                             </a-form-item>
                         </a-col>  

+ 2 - 2
src/views/inventiry/salesOutbound/salesOutboundList.vue

@@ -2,7 +2,7 @@
   <div class="p-2">
     <!--查询区域-->
     <div class="jeecg-basic-table-form-container">
-      <a-form ref="formRef" @keyup.enter.native="reload" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
+      <a-form ref="formRef" @keyup.enter.native="reload" :model="queryParam"  :label-col="{ style: 'width: 200px' }">
         <a-row :gutter="24">
           <a-col :lg="8">
             <a-form-item name="billDate">
@@ -33,7 +33,7 @@
                 <JInput placeholder="请输入出库单号(bill code)" v-model:value="queryParam.billCode" allow-clear AutoComplete="off" />
               </a-form-item>
             </a-col>
-            <a-col :lg="8">
+            <a-col :lg="16">
               <a-form-item name="customer">
                 <template #label><span title="客户(customer)">客户(customer)</span></template>
                 <JSelect   v-model:value="queryParam.customer" :get-option-url="CustomerOption" :showField="showField"></JSelect>

+ 6 - 6
src/views/publicComponents/SelectContractModal.vue

@@ -8,9 +8,9 @@
       @ok = "handleOk"
       @cancel="handleCancel">
         <div>
-          <a-card  :body-style="{ padding: '10px' }" :bordered="false" style="margin: 10px;">
+          <a-card  :body-style="{ padding: '10px' }" :bordered="false" style="margin: 10px;" >
             <div class="table-page-search-wrapper">
-                <a-form :model="queryParams" :label-col="labelCol" :wrapper-col="wrapperCol" @keyup.enter.native="searchQuery">
+                <a-form :model="queryParams" @keyup.enter.native="searchQuery" :label-col="{ style: 'width: 200px' }">
                 <a-row :gutter="24">
                     <a-col :md="6" :sm="8">
                         <a-form-item label="合同编码(contract code)">
@@ -40,7 +40,7 @@
                             </a-form-item>
                         </a-col>
                         <a-col :md="6" :sm="8">
-                            <a-form-item label="产品分类(production class)" :label-col="labelCol1" :wrapper-col="wrapperCol1">
+                            <a-form-item label="产品分类(production class)">
                                 <ApiSelect
                                     :api="ClassList"
                                     showSearch
@@ -58,7 +58,7 @@
                                 <JDictSelectTag v-model:value="queryParams.priority" placeholder="请选择" dictCode="priority"/>
                             </a-form-item>
                         </a-col>
-                        <a-col :md="6" :sm="8">
+                        <a-col :md="12" :sm="16">
                             <a-form-item label="客户(customer)">
                                 <JSelect   v-model:value="queryParams.quotationCustomer" :get-option-url="CustomerOption" :showField="showField"></JSelect>
                             </a-form-item>
@@ -70,7 +70,7 @@
                         </a-col>
                         
                         <a-col :md="6" :sm="8">
-                            <a-form-item label="产品英文名(English name)" :label-col="labelCol1" :wrapper-col="wrapperCol1">
+                            <a-form-item label="产品英文名(English name)">
                                 <j-input placeholder="请输入" v-model:value="queryParams.englishName"></j-input>
                             </a-form-item>
                         </a-col>
@@ -91,7 +91,7 @@
                             </a-form-item>
                         </a-col>
                         <a-col :md="6" :sm="8">
-                            <a-form-item label="销售部门(sale department)" :label-col="labelCol1" :wrapper-col="wrapperCol1">
+                            <a-form-item label="销售部门(sale department)">
                                 <j-input placeholder="请输入" v-model:value="queryParams.saleDepartment"></j-input>
                             </a-form-item>
                         </a-col>

+ 4 - 4
src/views/publicComponents/SelectQuotationModal.vue

@@ -10,7 +10,7 @@
         <div>
           <a-card  :body-style="{ padding: '10px' }" :bordered="false" style="margin: 10px;">
             <div class="table-page-search-wrapper">
-                <a-form :model="queryParams" :label-col="labelCol" :wrapper-col="wrapperCol" @keyup.enter.native="searchQuery">
+                <a-form :model="queryParams"  @keyup.enter.native="searchQuery" :label-col="{ style: 'width: 200px' }">
                 <a-row :gutter="24">
                     <a-col :md="6" :sm="8">
                         <a-form-item label="报价单号(bill code)">
@@ -39,7 +39,7 @@
                             </a-form-item>
                         </a-col>
                         <a-col :md="6" :sm="8">
-                            <a-form-item label="产品分类(production class)" :label-col="labelCol1" :wrapper-col="wrapperCol1">
+                            <a-form-item label="产品分类(production class)">
                                 <ApiSelect
                                 :api="ClassList"
                                 showSearch
@@ -57,7 +57,7 @@
                                 <JDictSelectTag v-model:value="queryParams.priority" placeholder="请选择" dictCode="priority"/>
                             </a-form-item>
                         </a-col>
-                        <a-col :md="6" :sm="8">
+                        <a-col :md="12" :sm="16">
                             <a-form-item label="客户(customer)">
                                 <JSelect   v-model:value="queryParams.quotationCustomer" :get-option-url="CustomerOption" :showField="showField"></JSelect>
                             </a-form-item>
@@ -69,7 +69,7 @@
                         </a-col>
                         
                         <a-col :md="6" :sm="8">
-                            <a-form-item label="产品英文名(English name)" :label-col="labelCol1" :wrapper-col="wrapperCol1">
+                            <a-form-item label="产品英文名(English name)">
                                 <j-input placeholder="请输入" v-model:value="queryParams.englishName"></j-input>
                             </a-form-item>
                         </a-col>

+ 5 - 5
src/views/publicComponents/SelectSaleOrderModal.vue

@@ -10,7 +10,7 @@
         <div>
           <a-card  :body-style="{ padding: '10px' }" :bordered="false" style="margin: 10px;">
             <div class="table-page-search-wrapper">
-                <a-form :model="queryParams" :label-col="labelCol" :wrapper-col="wrapperCol" @keyup.enter.native="searchQuery">
+                <a-form :model="queryParams"  @keyup.enter.native="searchQuery" :label-col="{ style: 'width: 200px' }">
                 <a-row :gutter="24">
                     <a-col :md="6" :sm="8">
                         <a-form-item label="订单编号(bill code)">
@@ -39,7 +39,7 @@
                             </a-form-item>
                         </a-col>
                         <a-col :md="6" :sm="8">
-                            <a-form-item label="产品分类(production class)" :label-col="labelCol1" :wrapper-col="wrapperCol1">
+                            <a-form-item label="产品分类(production class)" >
                                 <!-- <j-input placeholder="请输入" v-model:value="queryParams.classId"></j-input> -->
                                 <ApiSelect
                                     :api="ClassList"
@@ -73,7 +73,7 @@
                                     />
                             </a-form-item>
                         </a-col>
-                        <a-col :md="6" :sm="8" v-if="showCustomer=='yes'">
+                        <a-col :md="12" :sm="16" v-if="showCustomer=='yes'">
                             <a-form-item label="客户(customer)">
                                 <JSelect   v-model:value="queryParams.customer" :get-option-url="CustomerOption" :showField="showField"  @change="changeCustmer"></JSelect>
                             </a-form-item>
@@ -85,7 +85,7 @@
                         </a-col>
                         
                         <a-col :md="6" :sm="8">
-                            <a-form-item label="产品英文名(English name)" :label-col="labelCol1" :wrapper-col="wrapperCol1">
+                            <a-form-item label="产品英文名(English name)" >
                                 <j-input placeholder="请输入" v-model:value="queryParams.englishName"></j-input>
                             </a-form-item>
                         </a-col>
@@ -106,7 +106,7 @@
                             </a-form-item>
                         </a-col>   
                         <a-col :md="6" :sm="8">
-                            <a-form-item label="销售部门(sale department)" :label-col="labelCol1" :wrapper-col="wrapperCol1"> 
+                            <a-form-item label="销售部门(sale department)" > 
                                 <j-input placeholder="请输入" v-model:value="queryParams.saleDepartment"></j-input>
                             </a-form-item>
                         </a-col>                      

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

@@ -10,7 +10,7 @@
         <div>
           <a-card  :body-style="{ padding: '10px' }" :bordered="false" style="margin: 10px;">
             <div class="table-page-search-wrapper">
-                <a-form :model="queryParams" :label-col="labelCol" :wrapper-col="wrapperCol" @keyup.enter.native="searchQuery">
+                <a-form :model="queryParams" :label-col="{ style: 'width: 200px' }" @keyup.enter.native="searchQuery">
                 <a-row :gutter="24">
                     <a-col :md="6" :sm="8">
                         <a-form-item label="仓库(warehouse)">
@@ -52,7 +52,7 @@
                                 />
                             </a-form-item>
                         </a-col>
-                        <a-col :md="6" :sm="8">
+                        <a-col :md="12" :sm="16">
                             <a-form-item label="客户(customer)">
                                 <JSelect   v-model:value="queryParams.customer" :get-option-url="CustomerOption" :showField="showField"></JSelect>
                             </a-form-item>

+ 5 - 5
src/views/purchase/freightPurchaseOrder/components/SelectDeliveryNoticeModal.vue

@@ -10,7 +10,7 @@
         <div>
           <a-card  :body-style="{ padding: '10px' }" :bordered="false" style="margin: 10px;">
             <div class="table-page-search-wrapper">
-                <a-form :model="queryParams" :label-col="labelCol" :wrapper-col="wrapperCol" @keyup.enter.native="searchQuery">
+                <a-form :model="queryParams" :label-col="{ style: 'width: 280px' }">
                 <a-row :gutter="24">
                     <a-col :md="6" :sm="8">
                         <a-form-item label="通知单号(bill code)">
@@ -18,7 +18,7 @@
                         </a-form-item>
                     </a-col>
                     <a-col :md="6" :sm="8">
-                        <a-form-item label="发货日期(delivery date)" :label-col="labelCol1" :wrapper-col="wrapperCol1">
+                        <a-form-item label="发货日期(delivery date)" >
                             <a-range-picker value-format="YYYY-MM-DD"  v-model:value="deliveryDate"  @change="changeBillDate" class="query-group-cust"/>
                         </a-form-item>
                     </a-col> 
@@ -37,7 +37,7 @@
                                     />
                             </a-form-item>
                         </a-col>
-                        <a-col :md="6" :sm="8">
+                        <a-col :md="12" :sm="16">
                             <a-form-item name="customer">
                             <template #label><span title="客户(customer)">客户(customer)</span></template>
                             <JSelect   v-model:value="queryParams.customer" :get-option-url="CustomerOption" :showField="showField"></JSelect>
@@ -49,7 +49,7 @@
                             </a-form-item>
                         </a-col>
                         <a-col :md="6" :sm="8">
-                            <a-form-item label="产品分类(production class)" :label-col="labelCol1" :wrapper-col="wrapperCol1">
+                            <a-form-item label="产品分类(production class)" >
                                 <ApiSelect
                                 :api="ClassList"
                                 showSearch
@@ -80,7 +80,7 @@
                             </a-form-item>
                         </a-col>   
                         <a-col :md="6" :sm="8">
-                            <a-form-item label="销售部门(sale department)" :label-col="labelCol1" :wrapper-col="wrapperCol1"> 
+                            <a-form-item label="销售部门(sale department)" > 
                                 <j-input placeholder="请输入" v-model:value="queryParams.saleDepartmentName"></j-input>
                             </a-form-item>
                         </a-col>                      

+ 2 - 2
src/views/saleCode/advancePayment/advancePaymentList.vue

@@ -2,7 +2,7 @@
   <div class="p-2">
     <!--查询区域-->
     <div class="jeecg-basic-table-form-container">
-      <a-form ref="formRef" @keyup.enter.native="reload" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
+      <a-form ref="formRef" @keyup.enter.native="reload" :model="queryParam" :label-col="{ style: 'width: 200px' }">
         <a-row :gutter="24">
           <a-col :lg="8">
             <a-form-item name="billDate">
@@ -34,7 +34,7 @@
                 <JInput placeholder="请输入预收款编码(bill code)" v-model:value="queryParam.billCode" allow-clear AutoComplete="off" />
               </a-form-item>
             </a-col>
-            <a-col :lg="8">
+            <a-col :lg="16">
               <a-form-item name="customer">
                 <template #label><span title="客户(customer)">客户(customer)</span></template>
                 <JSelect   v-model:value="queryParam.customer" :get-option-url="CustomerOption" :showField="showField"></JSelect>

+ 2 - 2
src/views/saleCode/deliveryNotice/deliveryNoticeList.vue

@@ -2,7 +2,7 @@
   <div class="p-2">
     <!--查询区域-->
     <div class="jeecg-basic-table-form-container">
-      <a-form ref="formRef" @keyup.enter.native="reload" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
+      <a-form ref="formRef" @keyup.enter.native="reload" :model="queryParam" :label-col="{ style: 'width: 200px' }">
         <a-row :gutter="24">
           <a-col :lg="8">
             <a-form-item name="billCode">
@@ -33,7 +33,7 @@
                 <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">
+            <a-col :lg="16">
               <a-form-item name="customer">
                 <template #label><span title="客户(customer)">客户(customer)</span></template>
                 <JSelect   v-model:value="queryParam.customer" :get-option-url="CustomerOption" :showField="showField"></JSelect>

+ 13 - 13
src/views/saleCode/quotation/quotation.vue

@@ -2,16 +2,16 @@
   <div class="p-2">
     <!--查询区域-->
     <div class="jeecg-basic-table-form-container">
-      <a-form ref="formRef" @keyup.enter.native="reload" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
+      <a-form ref="formRef" @keyup.enter.native="reload" :model="queryParam">
         <a-row :gutter="24">
           <a-col :lg="8">
-            <a-form-item name="billCode">
+            <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>
           <a-col :lg="8">
-              <a-form-item name="quotationProject" >
+              <a-form-item name="quotationProject" :label-col="{ style: 'width: 200px' }">
                 <template #label ><span title="报价项目(quotation project)">报价项目(quotation project)</span></template>
                 <ApiSelect
                   :api="ProjectOption"
@@ -29,25 +29,25 @@
           
           <template v-if="toggleSearchStatus">
             <a-col :lg="8">
-              <a-form-item name="billDate">
+              <a-form-item name="billDate" :label-col="{ style: 'width: 200px' }">
                 <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">
+            <a-col :lg="16">
+              <a-form-item name="quotationCustomer" :label-col="{ style: 'width: 200px' }">
                 <template #label><span title="报价客户(quotation customer)">报价客户(quotation customer)</span></template>
                 <JSelect   v-model:value="queryParam.quotationCustomer" :get-option-url="CustomerOption" :showField="showField"></JSelect>
               </a-form-item>
             </a-col>
             <a-col :lg="8">
-              <a-form-item name="priority">
+              <a-form-item name="priority" :label-col="{ style: 'width: 200px' }">
                 <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">
+              <a-form-item name="productionClass" :label-col="{ style: 'width: 200px' }">
                 <template #label><span title="产品分类(production class)">产品分类(production class)</span></template>
                 <JDictSelectTag
                   v-model:value="queryParam.productionClass"
@@ -59,25 +59,25 @@
               </a-form-item>
             </a-col>
             <a-col :lg="8">
-              <a-form-item name="model">
+              <a-form-item name="model" :label-col="{ style: 'width: 200px' }">
                 <template #label><span title="机型(model)">机型(model)</span></template>
                 <JDictSelectTag v-model:value="queryParam.model" placeholder="请选择" dictCode="model_typer" />
               </a-form-item>
             </a-col>
             <a-col :lg="8">
-              <a-form-item name="maker">
+              <a-form-item name="maker" :label-col="{ style: 'width: 200px' }">
                 <template #label><span title="厂家(maker)">厂家(maker)</span></template>
                 <JDictSelectTag v-model:value="queryParam.maker" placeholder="请选择" dictCode="factory" />
               </a-form-item>
             </a-col>
             <a-col :lg="8">
-              <a-form-item name="englishName">
+              <a-form-item name="englishName" :label-col="{ style: 'width: 200px' }">
                 <template #label><span title="产品英文名(english name)">产品英文名(english name)</span></template>
                 <JInput placeholder="请输入产品英文名(english name)" v-model:value="queryParam.englishName" allow-clear AutoComplete="off" />
               </a-form-item>
             </a-col>
             <a-col :lg="8">
-              <a-form-item name="productCode">
+              <a-form-item name="productCode" :label-col="{ style: 'width: 200px' }">
                 <template #label><span title="产品编码(product code)">产品编码(product code)</span></template>
                 <JInput placeholder="请输入产品编码(product code)" v-model:value="queryParam.productCode" allow-clear AutoComplete="off" />
               </a-form-item>
@@ -89,7 +89,7 @@
               </a-form-item>
             </a-col>
             <a-col :lg="8">
-              <a-form-item name="status">
+              <a-form-item name="status" :label-col="{ style: 'width: 200px' }">
                 <template #label><span title="状态(status)">状态(status)</span></template>
                 <JDictSelectTag v-model:value="queryParam.status" placeholder="请选择" dictCode="quotation_status" />
               </a-form-item>

+ 2 - 2
src/views/saleCode/receiptOrder/receiptOrdertList.vue

@@ -2,7 +2,7 @@
   <div class="p-2">
     <!--查询区域-->
     <div class="jeecg-basic-table-form-container">
-      <a-form ref="formRef" @keyup.enter.native="reload" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
+      <a-form ref="formRef" @keyup.enter.native="reload" :model="queryParam" :label-col="{ style: 'width: 200px' }">
         <a-row :gutter="24">
           <a-col :lg="8">
             <a-form-item name="billDate">
@@ -33,7 +33,7 @@
                 <JInput placeholder="请输入收款编码(bill code)" v-model:value="queryParam.billCode" allow-clear AutoComplete="off" />
               </a-form-item>
             </a-col>
-            <a-col :lg="8">
+            <a-col :lg="16">
               <a-form-item name="customer">
                 <template #label><span title="购方(buyer)">购方(buyer)</span></template>
                 <JSelect   v-model:value="queryParam.customer" :get-option-url="CustomerOption" :showField="showField"></JSelect>

+ 11 - 12
src/views/saleCode/saleContract/SaleContract.data.ts

@@ -129,6 +129,16 @@ export const searchFormSchema: FormSchema[] = [
     },
     //colProps: {span: 6},
   },
+  {
+    label: '优先级(priority)',
+    field: 'priority',
+    labelWidth: 150,
+    component: 'JDictSelectTag',
+    componentProps: {
+      dictCode: 'priority',
+    },
+    //colProps: {span: 6},
+  },
   {
     label: '客户(Customer)',
     field: 'quotationCustomer',
@@ -143,18 +153,7 @@ export const searchFormSchema: FormSchema[] = [
       //标题字段
       labelField: 'abbreviation',
     },
-    //colProps: {span: 6},
-  },
-
-  {
-    label: '优先级(priority)',
-    field: 'priority',
-    labelWidth: 150,
-    component: 'JDictSelectTag',
-    componentProps: {
-      dictCode: 'priority',
-    },
-    //colProps: {span: 6},
+    colProps: {span: 12},
   },
   {
     label: '产品分类(production class)',

+ 7 - 7
src/views/saleCode/saleInquiryForm/SaleInquiryFormList.vue

@@ -5,7 +5,7 @@
       <a-form ref="formRef" @keyup.enter.native="reload" :model="queryParam">
         <a-row :gutter="24">
           <a-col :lg="8">
-            <a-form-item name="billDate" :label-col="{ style: 'width: 200px' }">
+            <a-form-item name="billDate" :label-col="{ style: 'width: 280px' }">
               <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>
@@ -33,8 +33,8 @@
                 <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' }">
+            <a-col :lg="16">
+              <a-form-item name="inquiryCustomer" :label-col="{ style: 'width: 280px' }">
                 <template #label><span title="询价客户(inquiry customer)">询价客户(inquiry customer)</span></template>
                 <JSelect   v-model:value="queryParam.inquiryCustomer" :get-option-url="CustomerOption" :showField="showField"></JSelect>
               </a-form-item>
@@ -46,7 +46,7 @@
               </a-form-item>
             </a-col> -->
             <a-col :lg="8">
-              <a-form-item name="priority" :label-col="{ style: 'width: 200px' }">
+              <a-form-item name="priority" :label-col="{ style: 'width: 280px' }">
                 <template #label><span title="优先级(priority)">优先级(priority)</span></template>
                 <JDictSelectTag v-model:value="queryParam.priority" placeholder="请选择" dictCode="priority" />
               </a-form-item>
@@ -74,7 +74,7 @@
               </a-form-item>
             </a-col>
             <a-col :lg="8">
-              <a-form-item name="maker" :label-col="{ style: 'width: 200px' }">
+              <a-form-item name="maker" :label-col="{ style: 'width: 280px' }">
                 <template #label><span title="厂家(maker)">厂家(maker)</span></template>
                 <JInput placeholder="请输入厂家(maker)" v-model:value="queryParam.maker" allow-clear AutoComplete="off" />
               </a-form-item>
@@ -93,7 +93,7 @@
               </a-form-item>
             </a-col>
             <a-col :lg="8">
-              <a-form-item name="inquiryPlatform" :label-col="{ style: 'width: 200px' }">
+              <a-form-item name="inquiryPlatform" :label-col="{ style: 'width: 280px' }">
                 <template #label><span title="询价平台(inquiry platform)">询价平台(inquiry platform)</span></template>
                 <JDictSelectTag v-model:value="queryParam.inquiryPlatform" placeholder="请选择" dictCode="inquiry_platform" />
               </a-form-item>
@@ -123,7 +123,7 @@
               </a-form-item>
             </a-col>
             <a-col :lg="8">
-              <a-form-item name="submit" :label-col="{ style: 'width: 200px' }">
+              <a-form-item name="submit" :label-col="{ style: 'width: 280px' }">
                 <template #label><span title="提交(submit)">提交(submit)</span></template>
                 <JDictSelectTag v-model:value="queryParam.submit" placeholder="请选择" dictCode="yes_or_no" />
               </a-form-item>

+ 9 - 9
src/views/saleCode/salesInvoice/components/SelectCommissionOrderModal.vue

@@ -10,7 +10,7 @@
         <div>
           <a-card  :body-style="{ padding: '10px' }" :bordered="false" style="margin: 10px;">
             <div class="table-page-search-wrapper">
-                <a-form :model="queryParams" :label-col="labelCol" :wrapper-col="wrapperCol" @keyup.enter.native="searchQuery">
+                <a-form :model="queryParams" :label-col="{ style: 'width: 200px' }" @keyup.enter.native="searchQuery">
                 <a-row :gutter="24">
                     <a-col :md="6" :sm="8">
                         <a-form-item label="订单编号(bill code)">
@@ -18,11 +18,16 @@
                         </a-form-item>
                     </a-col>
                     <a-col :md="6" :sm="8">
-                        <a-form-item label="单据日期(bill date)" :label-col="labelCol1" :wrapper-col="wrapperCol1">
+                        <a-form-item label="单据日期(bill date)" >
                             <a-range-picker value-format="YYYY-MM-DD"  v-model:value="billDate"  @change="changeBillDate" class="query-group-cust"/>
                         </a-form-item>
                     </a-col> 
                     <template v-if="toggleSearchStatus">
+                        <a-col :md="12" :sm="16">
+                            <a-form-item label="客户(customer)">
+                                <JSelect   v-model:value="queryParams.customer" :get-option-url="CustomerOption" :showField="showField"></JSelect>
+                            </a-form-item>
+                        </a-col>        
                         <a-col :md="6" :sm="8">
                             <a-form-item label="供应商(supplier)">
                                 <ApiSelect
@@ -35,19 +40,14 @@
                                     valueField="id"
                                     />
                             </a-form-item>
-                        </a-col>
-                        <a-col :md="6" :sm="8">
-                            <a-form-item label="客户(customer)">
-                                <JSelect   v-model:value="queryParams.customer" :get-option-url="CustomerOption" :showField="showField"></JSelect>
-                            </a-form-item>
-                        </a-col>                     
+                        </a-col>             
                         <a-col :md="6" :sm="8">
                             <a-form-item label="业务员(salesman)">
                                 <j-input placeholder="请输入" v-model:value="queryParams.salesman"></j-input>
                             </a-form-item>
                         </a-col>   
                         <a-col :md="6" :sm="8">
-                            <a-form-item label="销售部门(sale department)" :label-col="labelCol1" :wrapper-col="wrapperCol1"> 
+                            <a-form-item label="销售部门(sale department)" > 
                                 <j-input placeholder="请输入" v-model:value="queryParams.saleDepartment"></j-input>
                             </a-form-item>
                         </a-col>                      

+ 10 - 9
src/views/saleCode/salesInvoice/components/SelectDeliveryNoticeModal.vue

@@ -10,7 +10,7 @@
         <div>
           <a-card  :body-style="{ padding: '10px' }" :bordered="false" style="margin: 10px;">
             <div class="table-page-search-wrapper">
-                <a-form :model="queryParams" :label-col="labelCol" :wrapper-col="wrapperCol" @keyup.enter.native="searchQuery">
+                <a-form :model="queryParams" :label-col="{ style: 'width: 200px' }" @keyup.enter.native="searchQuery">
                 <a-row :gutter="24">
                     <a-col :md="6" :sm="8">
                         <a-form-item label="通知单号(bill code)">
@@ -18,7 +18,7 @@
                         </a-form-item>
                     </a-col>
                     <a-col :md="6" :sm="8">
-                        <a-form-item label="发货日期(delivery date)" :label-col="labelCol1" :wrapper-col="wrapperCol1">
+                        <a-form-item label="发货日期(delivery date)" >
                             <a-range-picker value-format="YYYY-MM-DD"  v-model:value="deliveryDate"  @change="changeBillDate" class="query-group-cust"/>
                         </a-form-item>
                     </a-col> 
@@ -38,18 +38,19 @@
                             </a-form-item>
                         </a-col>
                         <a-col :md="6" :sm="8">
+                            <a-form-item label="优先级(priority)" >
+                                <JDictSelectTag v-model:value="queryParams.priority" placeholder="请选择" dictCode="priority"/>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :md="12" :sm="16">
                             <a-form-item label="客户(customer)">
                                 <JSelect   v-model:value="queryParams.customer" :get-option-url="CustomerOption" :showField="showField"></JSelect>
                             </a-form-item>
                         </a-col>
                         
+                       
                         <a-col :md="6" :sm="8">
-                            <a-form-item label="优先级(priority)" >
-                                <JDictSelectTag v-model:value="queryParams.priority" placeholder="请选择" dictCode="priority"/>
-                            </a-form-item>
-                        </a-col>
-                        <a-col :md="6" :sm="8">
-                            <a-form-item label="产品分类(production class)" :label-col="labelCol1" :wrapper-col="wrapperCol1">
+                            <a-form-item label="产品分类(production class)" >
                                 <ApiSelect
                                     :api="ClassList"
                                     showSearch
@@ -78,7 +79,7 @@
                             </a-form-item>
                         </a-col>   
                         <a-col :md="6" :sm="8">
-                            <a-form-item label="销售部门(sale department)" :label-col="labelCol1" :wrapper-col="wrapperCol1"> 
+                            <a-form-item label="销售部门(sale department)" > 
                                 <j-input placeholder="请输入" v-model:value="queryParams.saleDepartmentName"></j-input>
                             </a-form-item>
                         </a-col>                      

+ 4 - 4
src/views/saleCode/salesInvoice/salesInvoiceList.vue

@@ -2,7 +2,7 @@
   <div class="p-2">
     <!--查询区域-->
     <div class="jeecg-basic-table-form-container">
-      <a-form ref="formRef" @keyup.enter.native="reload" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
+      <a-form ref="formRef" @keyup.enter.native="reload" :model="queryParam" :label-col="{ style: 'width: 240px' }">
         <a-row :gutter="24">
           <a-col :lg="8">
             <a-form-item name="billDate">
@@ -11,7 +11,7 @@
             </a-form-item>
           </a-col>
           <a-col :lg="8">
-            <a-form-item name="project" :label-col="labelCol1" :wrapper-col="wrapperCol1">
+            <a-form-item name="project" >
               <template #label><span title="项目(project)">项目(project)</span></template>
               <ApiSelect
                 :api="ProjectOption"
@@ -34,14 +34,14 @@
                 <JInput placeholder="请输入发票编号(invoice code)" v-model:value="queryParam.invoiceCode" allow-clear AutoComplete="off" />
               </a-form-item>
             </a-col>
-            <a-col :lg="8">
+            <a-col :lg="16">
               <a-form-item name="customer">
                 <template #label><span title="购方(buyer)">购方(buyer)</span></template> 
                 <JSelect   v-model:value="queryParam.customer" :get-option-url="CustomerOption" :showField="showField"></JSelect>
               </a-form-item>
             </a-col>
             <a-col :lg="8">
-              <a-form-item name="orderNumber" :label-col="labelCol1" :wrapper-col="wrapperCol1">
+              <a-form-item name="orderNumber" >
                 <template #label><span title="客户订单号(customer order number)">客户订单号(customer order number)</span></template>
                 <JInput placeholder="请输入" v-model:value="queryParam.orderNumber" allow-clear AutoComplete="off" />
               </a-form-item>

+ 2 - 2
src/views/saleCode/salesOrder/SaleOrderFormList.vue

@@ -2,7 +2,7 @@
   <div class="p-2">
     <!--查询区域-->
     <div class="jeecg-basic-table-form-container">
-      <a-form ref="formRef" @keyup.enter.native="reload" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
+      <a-form ref="formRef" @keyup.enter.native="reload" :model="queryParam" :label-col="{ style: 'width: 200px' }">
         <a-row :gutter="24">
           <a-col :lg="8">
             <a-form-item name="billDate">
@@ -33,7 +33,7 @@
                 <JInput placeholder="请输入订单编号(bill code)" v-model:value="queryParam.billCode" allow-clear AutoComplete="off" />
               </a-form-item>
             </a-col>
-            <a-col :lg="8">
+            <a-col :lg="16">
               <a-form-item name="customer">
                 <template #label><span title="客户(customer)">客户(customer)</span></template>
                 <JSelect   v-model:value="queryParam.customer" :get-option-url="CustomerOption" :showField="showField"></JSelect>