采购订单/到货单-字段修改

src/views/purchase/arrivedGoods/components/ArriveGoodsFormForm.vue

@@ -13,8 +13,6 @@
               <a-form-item
                 label="到货日期(arrival date)"
                 v-bind="validateInfos.arrivalDate"
-                :label-col="formItemLayout.labelCol1"
-                :wrapper-col="formItemLayout.wrapperCol1"
                 id="ArriveGoodsForm-arrivalDate"
                 name="arrivalDate"
               >
@@ -45,8 +43,6 @@
               <a-form-item
                 label="供应商(supplier)"
                 v-bind="validateInfos.supplier"
-                :label-col="formItemLayout.labelCol1"
-                :wrapper-col="formItemLayout.wrapperCol1"
                 id="ArriveGoodsForm-supplier"
                 name="supplierName"
               >
@@ -62,8 +58,6 @@
               <a-form-item
                 label="产品分类(production class)"
                 v-bind="validateInfos.productionClass"
-                :label-col="formItemLayout.labelCol1"
-                :wrapper-col="formItemLayout.wrapperCol1"
                 id="ArriveGoodsForm-productionClass"
                 name="productionClass"
               >
@@ -89,8 +83,7 @@
               <a-form-item
                 label="厂家(maker)"
                 v-bind="validateInfos.maker"
-                :label-col="formItemLayout.labelCol1"
-                :wrapper-col="formItemLayout.wrapperCol1"
+
                 id="ArriveGoodsForm-maker"
                 name="maker"
               >
@@ -106,8 +99,6 @@
               <a-form-item
                 label="包装要求(package requirement)"
                 v-bind="validateInfos.packagebRequirement"
-                :label-col="formItemLayout.labelCol1"
-                :wrapper-col="formItemLayout.wrapperCol1"
                 id="ArriveGoodsForm-packagebRequirement"
                 name="packagebRequirement"
               >
@@ -123,39 +114,36 @@
               >
                 <a-input v-model:value="formData.waybillNumber" placeholder="请输入运单号(waybill number)" allow-clear AutoComplete="off" />
               </a-form-item>
-            </a-col>
+            </a-col>            
             <a-col :span="12">
               <a-form-item
-                label="收件人(recipient)"
-                v-bind="validateInfos.recipient"
-                :label-col="formItemLayout.labelCol1"
-                :wrapper-col="formItemLayout.wrapperCol1"
-                id="ArriveGoodsForm-recipient"
-                name="recipient"
+                label="发票/发货日期(delivery/invoice date)"
+                v-bind="validateInfos.invoiceDate"
+                id="ArriveGoodsForm-invoiceDate"
+                name="invoiceDate"
               >
-                <a-input v-model:value="formData.recipient" placeholder="请输入收件人(recipient)" allow-clear disabled />
+                <a-date-picker
+                  placeholder="请选择发票/发货日期(delivery/invoice date)"
+                  v-model:value="formData.invoiceDate"
+                  value-format="YYYY-MM-DD"
+                  style="width: 100%"
+                  allow-clear
+                />
               </a-form-item>
             </a-col>
             <a-col :span="12">
-              <a-form-item
-                label="收件人电话(recipient tel)"
-                v-bind="validateInfos.recipientTel"
-                id="ArriveGoodsForm-recipientTel"
-                name="recipientTel"
-              >
-                <a-input v-model:value="formData.recipientTel" placeholder="请输入收件人电话(recipient tel)" allow-clear disabled />
+              <a-form-item label="采购员(purchasesman)" v-bind="validateInfos.purchaseman" id="ArriveGoodsForm-purchaseman" name="purchaseman">
+                <a-input v-model:value="formData.purchasemanName" placeholder="请输入采购员(salesman)" allow-clear disabled />
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item
-                label="收件人地址(recipient address)"
-                v-bind="validateInfos.recipientAddress"
-                :label-col="formItemLayout.labelCol1"
-                :wrapper-col="formItemLayout.wrapperCol1"
-                id="ArriveGoodsForm-recipientAddress"
-                name="recipientAddress"
+                label="采购部门(purchase department)"
+                v-bind="validateInfos.purchaseDepartment"
+                id="ArriveGoodsForm-purchaseDepartment"
+                name="purchaseDepartment"
               >
-                <a-input v-model:value="formData.recipientAddress" placeholder="请输入收件人地址(recipient address)" allow-clear disabled />
+                <a-input v-model:value="formData.purchaseDepartmentName" placeholder="请输入" allow-clear disabled />
               </a-form-item>
             </a-col>
             <a-col :span="12">
@@ -168,52 +156,26 @@
                 <a-input v-model:value="formData.warrantyTerms" placeholder="请输入质保条款(warranty terms)" allow-clear disabled />
               </a-form-item>
             </a-col>
+           
             <a-col :span="12">
-              <a-form-item
-                label="采购部门(purchase department)"
-                v-bind="validateInfos.purchaseDepartment"
-                :label-col="formItemLayout.labelCol1"
-                :wrapper-col="formItemLayout.wrapperCol1"
-                id="ArriveGoodsForm-purchaseDepartment"
-                name="purchaseDepartment"
-              >
-                <a-input v-model:value="formData.purchaseDepartmentName" placeholder="请输入" allow-clear disabled />
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">
-              <a-form-item label="采购员(purchasesman)" v-bind="validateInfos.purchaseman" id="ArriveGoodsForm-purchaseman" name="purchaseman">
-                <a-input v-model:value="formData.purchasemanName" placeholder="请输入采购员(salesman)" allow-clear disabled />
+              <a-form-item label="备注(notes)" v-bind="validateInfos.notes" id="ArriveGoodsForm-notes" name="notes">
+                <a-input v-model:value="formData.notes" AutoComplete="off" />
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item
-                label="发票/发货日期(delivery/invoice date)"
-                v-bind="validateInfos.invoiceDate"
-                :label-col="formItemLayout.labelCol1"
-                :wrapper-col="formItemLayout.wrapperCol1"
-                id="ArriveGoodsForm-invoiceDate"
-                name="invoiceDate"
+                label="收件人地址(recipient address)"
+                v-bind="validateInfos.recipientAddress"
+                id="SaleOrderForm-recipientAddress"
+                name="recipientAddress"
               >
-                <a-date-picker
-                  placeholder="请选择发票/发货日期(delivery/invoice date)"
-                  v-model:value="formData.invoiceDate"
-                  value-format="YYYY-MM-DD"
-                  style="width: 100%"
-                  allow-clear
-                />
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">
-              <a-form-item label="备注(notes)" v-bind="validateInfos.notes" id="ArriveGoodsForm-notes" name="notes">
-                <a-input v-model:value="formData.notes" AutoComplete="off" />
+                <a-textarea v-model:value="formData.recipientAddress" AutoComplete="off" :rows="2" />
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item
                 label="到货详情(arrival details)"
                 v-bind="validateInfos.arrivalDetails"
-                :label-col="formItemLayout.labelCol1"
-                :wrapper-col="formItemLayout.wrapperCol1"
                 id="ArriveGoodsForm-arrivalDetails"
                 name="arrivalDetails"
               >
@@ -388,8 +350,8 @@
       const {resetFields, validate, validateInfos} = useForm(formData, validatorRules, {immediate: false});
       const dbData = {};
       const formItemLayout = {
-        labelCol: { xs: { span: 24 }, sm: { span: 5 } },
-        wrapperCol: { xs: { span: 24 }, sm: { span: 16 } },
+        labelCol: { xs: { span: 24 }, sm: { span: 7 } },
+        wrapperCol: { xs: { span: 24 }, sm: { span: 15 } },
         labelCol1: { xs: { span: 24 }, sm: { span: 7 } },
         wrapperCol1: { xs: { span: 24 }, sm: { span: 15 } },
       };

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

@@ -119,17 +119,17 @@
                 />
               </a-form-item>
             </a-col>
-            <a-col :span="12">
+            <!-- <a-col :span="12">
               <a-form-item label="收件人(recipient)" v-bind="validateInfos.recipient" id="PurchaseOrderFormModal-recipient" name="recipient">
                 <a-input v-model:value="formData.recipient" placeholder="请输入" AutoComplete="off" />
               </a-form-item>
-            </a-col>
+            </a-col> -->
             <a-col :span="12">
               <a-form-item label="运输方式(transport)" v-bind="validateInfos.transport" id="PurchaseOrderFormModal-transport" name="transport">
                 <JDictSelectTag v-model:value="formData.transport" placeholder="请选择" dictCode="delivery_methods" />
               </a-form-item>
             </a-col>
-            <a-col :span="12">
+            <!-- <a-col :span="12">
               <a-form-item
                 label="收件人地址(recipient address)"
                 v-bind="validateInfos.recipientAddress"
@@ -138,17 +138,17 @@
               >
                 <a-input v-model:value="formData.recipientAddress" placeholder="请输入" AutoComplete="off" />
               </a-form-item>
-            </a-col>
+            </a-col> -->
             <a-col :span="12">
               <a-form-item label="付款条件(payment terms)" v-bind="validateInfos.paymentTerms" id="PurchaseOrderFormModal-paymentTerms" name="paymentTerms">
                 <JDictSelectTag v-model:value="formData.paymentTerms" placeholder="请选择" dictCode="payment_terms" />
               </a-form-item>
             </a-col>
-            <a-col :span="12">
+            <!-- <a-col :span="12">
               <a-form-item label="收件人电话(recipient tel)" v-bind="validateInfos.recipientTel" id="PurchaseOrderFormModal-recipientTel" name="recipientTel">
                 <a-input v-model:value="formData.recipientTel" placeholder="请输入" AutoComplete="off" />
               </a-form-item>
-            </a-col>
+            </a-col> -->
 
             <a-col :span="12">
               <a-form-item label="发货方式(delivery)" v-bind="validateInfos.delivery" id="PurchaseOrderFormModal-delivery" name="delivery">
@@ -247,6 +247,16 @@
                 />
               </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-textarea v-model:value="formData.recipientAddress" AutoComplete="off" :rows="2" />
+              </a-form-item>
+            </a-col>
             <a-col :span="12">
               <a-form-item label="附件(attachs)" v-bind="validateInfos.attachs" id="PurchaseOrderFormModal-attachs" name="attachs">
                 <JUpload v-model:value="formData.attachs" />