采购订单-布局修改

src/views/publicComponents/SelectSaleOrderModal.vue

@@ -65,16 +65,17 @@
                                 <a-input placeholder="请输入" v-model:value="queryParams.childModel"></a-input>
                             </a-form-item>
                         </a-col> 
-                        <a-col :md="6" :sm="8">
-                            <a-form-item label="销售部门(sale department)">
-                                <a-input placeholder="请输入" v-model:value="queryParams.saleDepartment"></a-input>
-                            </a-form-item>
-                        </a-col> 
+                        
                         <a-col :md="6" :sm="8">
                             <a-form-item label="业务员(salesman)">
                                 <a-input placeholder="请输入" v-model:value="queryParams.salesman"></a-input>
                             </a-form-item>
-                        </a-col>                        
+                        </a-col>   
+                        <a-col :md="6" :sm="8">
+                            <a-form-item label="销售部门(sale department)" :label-col="labelCol1" :wrapper-col="wrapperCol1"> 
+                                <a-input placeholder="请输入" v-model:value="queryParams.saleDepartment"></a-input>
+                            </a-form-item>
+                        </a-col>                      
                     </template>
                     <a-col :md="6" :sm="8">
                         <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
@@ -112,7 +113,7 @@
                 size="small"
                 @change="handleTableChange"
                 :pagination="pagination"
-                :scroll="{ x: 3500, y: 300 }"
+                :scroll="{ x: 4000, y: 300 }"
                 :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
             >
             </a-table>

src/views/purchase/purchaseOrder/PurchaseOrderFormList.vue

@@ -11,7 +11,7 @@
               </a-form-item>
           </a-col> 
           <a-col :lg="8">
-              <a-form-item name="billCode">
+              <a-form-item name="billCode" :label-col="labelCol1" :wrapper-col="wrapperCol1">
                 <template #label><span title="订单编号(bill code)">订单编号(bill code)</span></template>
                 <a-input placeholder="请输入订单编号(bill code)" v-model:value="queryParam.billCode" allow-clear ></a-input>
               </a-form-item>
@@ -30,7 +30,7 @@
               </a-form-item>
             </a-col>
             <a-col :lg="8">
-              <a-form-item name="priority">
+              <a-form-item name="priority" :label-col="labelCol1" :wrapper-col="wrapperCol1">
                 <template #label><span title="优先级(priority)">优先级(priority)</span></template>
                 <JDictSelectTag v-model:value="queryParam.priority" placeholder="请选择" dictCode="priority" style="width: 100%;"/>
               </a-form-item>
@@ -48,7 +48,7 @@
               </a-form-item>
             </a-col>
             <a-col :lg="8">
-              <a-form-item name="maker">
+              <a-form-item name="maker" :label-col="labelCol1" :wrapper-col="wrapperCol1">
                 <template #label><span title="厂家(maker)">厂家(maker)</span></template>
                 <a-input placeholder="请输入厂家(maker)" v-model:value="queryParam.maker" allow-clear ></a-input>
               </a-form-item>
@@ -59,12 +59,6 @@
 								<JSelectDept v-model:value="queryParam.productCode" :multiple="false" />
               </a-form-item>
             </a-col>
-            <a-col :lg="8">
-              <a-form-item name="saleDepartment" >
-                <template #label><span title="采购部门(purchase saleDepartment)">采购部门(purchase department)</span></template>
-								<JSelectDept v-model:value="queryParam.purchaseDepartment" :multiple="false" />
-              </a-form-item>
-            </a-col>
             <a-col :lg="8">
               <a-form-item name="salesman">
                 <template #label><span title="采购员(purchaseman)">采购员(purchaseman)</span></template>
@@ -72,15 +66,15 @@
               </a-form-item>
             </a-col>
             <a-col :lg="8">
-              <a-form-item name="submit">
-                <template #label><span title="提交(submit)">提交(submit)</span></template>
-                <JDictSelectTag v-model:value="queryParam.submit" placeholder="请选择" dictCode="yes_or_no" style="width: 100%;"/>
+              <a-form-item name="saleDepartment" :label-col="labelCol1" :wrapper-col="wrapperCol1">
+                <template #label><span title="采购部门(purchase saleDepartment)">采购部门(purchase department)</span></template>
+								<JSelectDept v-model:value="queryParam.purchaseDepartment" :multiple="false" />
               </a-form-item>
             </a-col>
             <a-col :lg="8">
-              <a-form-item name="customerConfirm">
-                <template #label><span title="供应商确认(supplier confirm)">供应商确认(supplier confirm)</span></template>
-                <JDictSelectTag v-model:value="queryParam.status" placeholder="请选择" dictCode="yes_or_no"/>
+              <a-form-item name="submit">
+                <template #label><span title="提交(submit)">提交(submit)</span></template>
+                <JDictSelectTag v-model:value="queryParam.submit" placeholder="请选择" dictCode="yes_or_no" style="width: 100%;"/>
               </a-form-item>
             </a-col>
             <a-col :lg="8">
@@ -89,6 +83,12 @@
                 <JDictSelectTag v-model:value="queryParam.close" placeholder="请选择" dictCode="yes_or_no" style="width: 100%;"/>
               </a-form-item>
             </a-col> 
+            <a-col :lg="8">
+              <a-form-item name="customerConfirm" :label-col="labelCol1" :wrapper-col="wrapperCol1">
+                <template #label><span title="供应商确认(supplier confirm)">供应商确认(supplier confirm)</span></template>
+                <JDictSelectTag v-model:value="queryParam.status" placeholder="请选择" dictCode="yes_or_no"/>
+              </a-form-item>
+            </a-col>
           </template>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
@@ -464,11 +464,11 @@
   });
   const labelCol1 = reactive({
     xs:24,
-    sm:12,
+    sm:10,
   });
   const wrapperCol1 = reactive({
     xs: 24,
-    sm: 12,
+    sm: 14,
   });
   /**
    * 重置

src/views/purchase/purchaseOrder/components/PurchaseOrderFormForm.vue

@@ -10,7 +10,7 @@
 							</a-form-item>
 						</a-col>
 						<a-col :span="12">
-							<a-form-item label="单据日期(bill date)" v-bind="validateInfos.billDate" id="SaleOrderForm-billDate" name="billDate">
+							<a-form-item label="单据日期(bill date)" v-bind="validateInfos.billDate" :label-col="formItemLayout.labelCol1" :wrapper-col="formItemLayout.wrapperCol1" id="SaleOrderForm-billDate" name="billDate">
 								<a-date-picker placeholder="请选择单据日期(bill date)"  v-model:value="formData.billDate"  value-format="YYYY-MM-DD"  style="width: 100%"  allow-clear />
 							</a-form-item>
 						</a-col>
@@ -21,7 +21,7 @@
 							</a-form-item>
 						</a-col>
 						<a-col :span="12">
-							<a-form-item label="供应商(supplier)" v-bind="validateInfos.supplier" id="SaleOrderForm-supplier" name="supplier">
+							<a-form-item label="供应商(supplier)" v-bind="validateInfos.supplier" :label-col="formItemLayout.labelCol1" :wrapper-col="formItemLayout.wrapperCol1" id="SaleOrderForm-supplier" name="supplier">
                   <a-input   v-model:value="formData.supplierName"  placeholder="请选择" allow-clear  ></a-input>
 							</a-form-item>
 						</a-col>
@@ -31,7 +31,7 @@
 							</a-form-item>
 						</a-col>
 						<a-col :span="12">
-							<a-form-item label="产品分类(production class)" v-bind="validateInfos.productionClass" id="SaleOrderForm-productionClass" name="productionClass">
+							<a-form-item label="产品分类(production class)" v-bind="validateInfos.productionClass" :label-col="formItemLayout.labelCol1" :wrapper-col="formItemLayout.wrapperCol1" id="SaleOrderForm-productionClass" name="productionClass">
 								<a-input v-model:value="formData.productionClass" placeholder="请输入"  allow-clear disabled ></a-input>
 							</a-form-item>
 						</a-col>
@@ -41,7 +41,7 @@
 							</a-form-item>
 						</a-col>
 						<a-col :span="12">
-							<a-form-item label="厂家(maker)" v-bind="validateInfos.maker" id="SaleOrderForm-maker" name="maker">
+							<a-form-item label="厂家(maker)" v-bind="validateInfos.maker" :label-col="formItemLayout.labelCol1" :wrapper-col="formItemLayout.wrapperCol1" id="SaleOrderForm-maker" name="maker">
 								<a-input v-model:value="formData.maker" placeholder="请输入厂家(maker)"  allow-clear disabled></a-input>
 							</a-form-item>
 						</a-col>
@@ -50,18 +50,18 @@
                 <JDictSelectTag v-model:value="formData.tradeTerms" placeholder="请选择" dictCode="delivery_terms"/>
 							</a-form-item>
 						</a-col>
+            <a-col :span="12">
+							<a-form-item label="包装要求(package requirement)" v-bind="validateInfos.packagebRequirement" :label-col="formItemLayout.labelCol1" :wrapper-col="formItemLayout.wrapperCol1" id="SaleOrderForm-packagebRequirement" name="packagebRequirement">
+								<a-input v-model:value="formData.packagebRequirement" placeholder="请输入包装要求(package requirement)"  allow-clear ></a-input>
+							</a-form-item>
+						</a-col> 
             <a-col :span="12">
 							<a-form-item label="是否出口(export)" v-bind="validateInfos.isExport" id="SaleOrderForm-isExport" name="isExport">
                 <JDictSelectTag v-model:value="formData.isExport" placeholder="请选择" dictCode="yes_or_no" />
 							</a-form-item>
 						</a-col>  
             <a-col :span="12">
-							<a-form-item label="包装要求(package requirement)" v-bind="validateInfos.packagebRequirement" id="SaleOrderForm-packagebRequirement" name="packagebRequirement">
-								<a-input v-model:value="formData.packagebRequirement" placeholder="请输入包装要求(package requirement)"  allow-clear ></a-input>
-							</a-form-item>
-						</a-col> 
-            <a-col :span="12">
-							<a-form-item label="收件人(recipient)" v-bind="validateInfos.recipient" id="SaleOrderForm-recipient" name="recipient">
+							<a-form-item label="收件人(recipient)" v-bind="validateInfos.recipient" :label-col="formItemLayout.labelCol1" :wrapper-col="formItemLayout.wrapperCol1" id="SaleOrderForm-recipient" name="recipient">
                 <a-input v-model:value="formData.recipient" placeholder="请选择"  />
 							</a-form-item>
 						</a-col>
@@ -71,7 +71,7 @@
 							</a-form-item>
 						</a-col>
             <a-col :span="12">
-							<a-form-item label="收件人地址(recipient address)" v-bind="validateInfos.recipientAddress" id="SaleOrderForm-recipientAddress" name="recipientAddress">
+							<a-form-item label="收件人地址(recipient address)" v-bind="validateInfos.recipientAddress" :label-col="formItemLayout.labelCol1" :wrapper-col="formItemLayout.wrapperCol1" id="SaleOrderForm-recipientAddress" name="recipientAddress">
                 <a-input v-model:value="formData.recipientAddress" placeholder="请选择"  />
 							</a-form-item>
 						</a-col>
@@ -81,7 +81,7 @@
 							</a-form-item>
 						</a-col>
             <a-col :span="12">
-							<a-form-item label="发货方式(delivery)" v-bind="validateInfos.delivery" id="SaleOrderForm-delivery" name="delivery">
+							<a-form-item label="发货方式(delivery)" v-bind="validateInfos.delivery" :label-col="formItemLayout.labelCol1" :wrapper-col="formItemLayout.wrapperCol1" id="SaleOrderForm-delivery" name="delivery">
                 <JDictSelectTag v-model:value="formData.delivery" placeholder="请选择" dictCode="delivery_methods" />
 							</a-form-item>
 						</a-col>
@@ -91,7 +91,7 @@
 							</a-form-item>
 						</a-col>
             <a-col :span="12">
-							<a-form-item label="质保条款(warranty terms)" v-bind="validateInfos.warrantyTerms" id="SaleOrderForm-warrantyTerms" name="warrantyTerms">
+							<a-form-item label="质保条款(warranty terms)" v-bind="validateInfos.warrantyTerms" :label-col="formItemLayout.labelCol1" :wrapper-col="formItemLayout.wrapperCol1" id="SaleOrderForm-warrantyTerms" name="warrantyTerms">
 								<a-input v-model:value="formData.warrantyTerms" placeholder="请输入质保条款(warranty terms)"  allow-clear ></a-input>
 							</a-form-item>
 						</a-col> 
@@ -101,7 +101,7 @@
 							</a-form-item>
 						</a-col>
             <a-col :span="12">
-							<a-form-item label="采购部门(purchase department)" v-bind="validateInfos.purchaseDepartment" id="SaleOrderForm-purchaseDepartment" name="purchaseDepartment">
+							<a-form-item label="采购部门(purchase department)" v-bind="validateInfos.purchaseDepartment" :label-col="formItemLayout.labelCol1" :wrapper-col="formItemLayout.wrapperCol1" id="SaleOrderForm-purchaseDepartment" name="purchaseDepartment">
 								<a-input v-model:value="formData.purchaseDepartment" placeholder="请输入"  allow-clear disabled></a-input>
 							</a-form-item>
 						</a-col>   
@@ -111,7 +111,7 @@
 							</a-form-item>
 						</a-col> 
             <a-col :span="12">
-							<a-form-item label="币种(currency)" v-bind="validateInfos.currency" id="SaleOrderForm-currency" name="currency">
+							<a-form-item label="币种(currency)" v-bind="validateInfos.currency" :label-col="formItemLayout.labelCol1" :wrapper-col="formItemLayout.wrapperCol1" id="SaleOrderForm-currency" name="currency">
                 <JDictSelectTag v-model:value="formData.currency" placeholder="请选择" dictCode="currency" />
 							</a-form-item>
 						</a-col> 
@@ -286,6 +286,8 @@
       const formItemLayout = {
         labelCol: {xs: {span: 24}, sm: {span: 5}},
         wrapperCol: {xs: {span: 24}, sm: {span: 16}},
+        labelCol1: {xs: {span: 24}, sm: {span: 7}},
+        wrapperCol1: {xs: {span: 24}, sm: {span: 15}},
       };
 
       // 表单禁用