采购订单/销售订单/采购询价单/销售报价单-增加协议条款字段

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

@@ -81,8 +81,13 @@
 								<a-input v-model:value="formData.inquiryNotes" placeholder="请输入询价备注(inquiry notes)"  allow-clear AutoComplete="off"></a-input>
 							</a-form-item>
 						</a-col>
+            <a-col :span="12">
+							<a-form-item label="协议条款(agreement terms)" v-bind="validateInfos.agreementTerms" id="SaleOrderForm-agreementTerms" name="agreementTerms"  >
+								<a-textarea v-model:value="formData.agreementTerms" AutoComplete="off" :rows="2" ></a-textarea>
+							</a-form-item>
+						</a-col>   
 						<a-col :span="12">
-							<a-form-item label="附件(attachs)" v-bind="validateInfos.attachs" id="PuechaseInquiryFormForm-attachs" name="attachs" >
+							<a-form-item label="附件(attachs)" v-bind="validateInfos.attachs" id="PuechaseInquiryFormForm-attachs" name="attachs" :label-col="formItemLayout.labelCol1" :wrapper-col="formItemLayout.wrapperCol1">
 								<JUpload v-model:value="formData.attachs"></JUpload>
 							</a-form-item>
 						</a-col>
@@ -238,7 +243,8 @@
         suppilerName:'',
         saleAttachs:'',
         paymentTermsInfo:'',
-        sourceId:""
+        sourceId:"",
+        agreementTerms:''
       });
 
       //表单验证

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

@@ -13,7 +13,7 @@
 							</a-form-item>
 						</a-col>
             <a-col :span="12">
-							<a-form-item label="订单编号(bill code)" v-bind="validateInfos.billCode" id="SaleOrderForm-billCode" name="billCode" :labelCol="formItemLayout.labelCol1" :wrapperCol="formItemLayout.wrapperCol1">
+							<a-form-item label="订单编号(bill code)" v-bind="validateInfos.billCode" id="SaleOrderForm-billCode" name="billCode" >
 								<a-input v-model:value="formData.billCode" placeholder="自动生成" disabled></a-input>
 							</a-form-item>
 						</a-col>
@@ -24,7 +24,7 @@
 						</a-col>
 						
 						<a-col :span="12">
-							<a-form-item label="项目(project)" v-bind="validateInfos.projectName" id="SaleOrderForm-projectName" name="projectName" :labelCol="formItemLayout.labelCol1" :wrapperCol="formItemLayout.wrapperCol1">
+							<a-form-item label="项目(project)" v-bind="validateInfos.projectName" id="SaleOrderForm-projectName" name="projectName" >
 								<a-input-search v-model:value="formData.projectName" placeholder="请输入项目(project)" :disabled="notAllowEdit"  allow-clear enter-button="Search" AutoComplete="off" @search="onSearchProject"></a-input-search>
 							</a-form-item>
 						</a-col>
@@ -43,7 +43,7 @@
 							</a-form-item>
 						</a-col>
 						<a-col :span="12">
-							<a-form-item label="优先级(priority)" v-bind="validateInfos.priority" id="SaleOrderForm-priority" name="priority" :labelCol="formItemLayout.labelCol1" :wrapperCol="formItemLayout.wrapperCol1">
+							<a-form-item label="优先级(priority)" v-bind="validateInfos.priority" id="SaleOrderForm-priority" name="priority" >
                 <JDictSelectTag v-model:value="formData.priority" placeholder="请选择" dictCode="priority" disabled/>
 							</a-form-item>
 						</a-col>
@@ -62,7 +62,7 @@
 							</a-form-item>
 						</a-col>
 						<a-col :span="12">
-							<a-form-item label="机型(model)" v-bind="validateInfos.model" id="SaleOrderForm-model" name="model" :labelCol="formItemLayout.labelCol1" :wrapperCol="formItemLayout.wrapperCol1">
+							<a-form-item label="机型(model)" v-bind="validateInfos.model" id="SaleOrderForm-model" name="model" >
                 <JDictSelectTag v-model:value="formData.model" placeholder="请选择" dictCode="model_typer" disabled />
 							</a-form-item>
 						</a-col>
@@ -72,27 +72,28 @@
 							</a-form-item>
 						</a-col>
             <a-col :span="12">
-							<a-form-item label="贸易条款(trade term)" v-bind="validateInfos.tradeTerms" id="SaleOrderForm-tradeTerms" name="tradeTerms" :labelCol="formItemLayout.labelCol1" :wrapperCol="formItemLayout.wrapperCol1">
+							<a-form-item label="贸易条款(trade term)" v-bind="validateInfos.tradeTerms" id="SaleOrderForm-tradeTerms" name="tradeTerms" >
                 <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"  id="SaleOrderForm-packagebRequirement" name="packagebRequirement">
-								<a-input v-model:value="formData.packagebRequirement" placeholder="请输入包装要求(package requirement)"  allow-clear AutoComplete="off"></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" :labelCol="formItemLayout.labelCol1" :wrapperCol="formItemLayout.wrapperCol1">
+							<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 AutoComplete="off"></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-input v-model:value="formData.recipient" placeholder="请输入"  AutoComplete="off"/>
 							</a-form-item>
 						</a-col>
             <a-col :span="12">
-							<a-form-item label="运输方式(transport)" v-bind="validateInfos.transport"  id="SaleOrderForm-transport" name="transport" :labelCol="formItemLayout.labelCol1" :wrapperCol="formItemLayout.wrapperCol1">
+							<a-form-item label="运输方式(transport)" v-bind="validateInfos.transport"  id="SaleOrderForm-transport" name="transport" >
                 <JDictSelectTag v-model:value="formData.transport" placeholder="请选择" dictCode="delivery_methods" />
 							</a-form-item>
 						</a-col>
@@ -102,7 +103,7 @@
 							</a-form-item>
 						</a-col>
             <a-col :span="12">
-							<a-form-item label="付款条件(payment terms)" v-bind="validateInfos.paymentTerms" id="SaleOrderForm-paymentTerms" name="paymentTerms" :labelCol="formItemLayout.labelCol1" :wrapperCol="formItemLayout.wrapperCol1">
+							<a-form-item label="付款条件(payment terms)" v-bind="validateInfos.paymentTerms" id="SaleOrderForm-paymentTerms" name="paymentTerms" >
                 <JDictSelectTag v-model:value="formData.paymentTerms" placeholder="请选择" dictCode="payment_terms" />
 							</a-form-item>
 						</a-col>
@@ -113,7 +114,7 @@
 						</a-col>
            
             <a-col :span="12">
-							<a-form-item label="发货方式(delivery)" v-bind="validateInfos.delivery"  id="SaleOrderForm-delivery" name="delivery" :labelCol="formItemLayout.labelCol1" :wrapperCol="formItemLayout.wrapperCol1">
+							<a-form-item label="发货方式(delivery)" v-bind="validateInfos.delivery"  id="SaleOrderForm-delivery" name="delivery" >
                 <JDictSelectTag v-model:value="formData.delivery" placeholder="请选择" dictCode="delivery_sale_order" />
 							</a-form-item>
 						</a-col>
@@ -123,7 +124,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" :labelCol="formItemLayout.labelCol1" :wrapperCol="formItemLayout.wrapperCol1">
+							<a-form-item label="质保条款(warranty terms)" v-bind="validateInfos.warrantyTerms" id="SaleOrderForm-warrantyTerms" name="warrantyTerms" >
 								<a-input v-model:value="formData.warrantyTerms" placeholder="请输入质保条款(warranty terms)"  allow-clear AutoComplete="off" ></a-input>
 							</a-form-item>
 						</a-col> 
@@ -133,7 +134,7 @@
 							</a-form-item>
 						</a-col>
             <a-col :span="12">
-							<a-form-item label="币种(currency)" v-bind="validateInfos.currency" id="SaleOrderForm-currency" name="currency" :labelCol="formItemLayout.labelCol1" :wrapperCol="formItemLayout.wrapperCol1">
+							<a-form-item label="币种(currency)" v-bind="validateInfos.currency" id="SaleOrderForm-currency" name="currency" >
                 <JDictSelectTag v-model:value="formData.currency" placeholder="请选择" dictCode="currency" disabled/>
 							</a-form-item>
 						</a-col> 
@@ -143,7 +144,7 @@
 							</a-form-item>
 						</a-col>   
             <a-col :span="12">
-							<a-form-item label="采购员(purchasesman)" v-bind="validateInfos.purchaseman" id="SaleOrderForm-purchaseman" name="purchaseman" :labelCol="formItemLayout.labelCol1" :wrapperCol="formItemLayout.wrapperCol1" >
+							<a-form-item label="采购员(purchasesman)" v-bind="validateInfos.purchaseman" id="SaleOrderForm-purchaseman" name="purchaseman"  >
 								<a-input v-model:value="formData.purchasemanName" placeholder="请输入采购员(salesman)"  allow-clear disabled ></a-input>
 							</a-form-item>
 						</a-col> 
@@ -151,7 +152,12 @@
 							<a-form-item label="备注(notes)" v-bind="validateInfos.notes" id="SaleOrderForm-notes" name="notes"  >
 								<a-input v-model:value="formData.notes" AutoComplete="off"></a-input>
 							</a-form-item>
-						</a-col>           
+						</a-col>         
+            <a-col :span="12">
+							<a-form-item label="协议条款(agreement terms)" v-bind="validateInfos.agreementTerms" id="SaleOrderForm-agreementTerms" name="agreementTerms"  >
+								<a-textarea v-model:value="formData.agreementTerms" AutoComplete="off" :rows="2" ></a-textarea>
+							</a-form-item>
+						</a-col>            
           </a-row>
         </a-form>
       </template>
@@ -314,7 +320,8 @@
         purchaseman:'',
         purchasemanName:'',
         currency:'',
-        notes:''
+        notes:'',
+        agreementTerms:''
       });
 
       //表单验证
@@ -323,8 +330,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/saleCode/quotation/components/quotationFormForm.vue

@@ -104,17 +104,22 @@
 								<a-input v-model:value="formData.quotationNotes" placeholder="请输入报价备注(quotation notes)"  allow-clear AutoComplete="off"></a-input>
 							</a-form-item>
 						</a-col>
-						<a-col :span="12">
-							<a-form-item label="附件(attachs)" v-bind="validateInfos.attachs" id="quotationFormForm-attachs" name="attachs">
-								<JUpload v-model:value="formData.attachs"></JUpload>
+            <a-col :span="12">
+							<a-form-item label="协议条款(agreement terms)" v-bind="validateInfos.agreementTerms" id="SaleOrderForm-agreementTerms" name="agreementTerms"  :labelCol="formItemLayout.labelCol1" :wrapperCol="formItemLayout.wrapperCol1">
+								<a-textarea v-model:value="formData.agreementTerms" AutoComplete="off" :rows="2" ></a-textarea>
 							</a-form-item>
-						</a-col>
+						</a-col> 
             <a-col :span="12">
 							<a-form-item label="供应商技术资料(supplier quotation attachs)" v-bind="validateInfos.supplierAttachs" id="quotationFormForm-supplierAttachs" name="supplierAttachs" :labelCol="formItemLayout.labelCol1" :wrapperCol="formItemLayout.wrapperCol1">
 								<a :href="baseUrl+formData.supplierAttachs" v-if="formData.supplierAttachs">{{formData.supplierAttachs}}</a>
                 <a-input v-model:value="formData.supplierAttachs"   disabled v-if="!formData.supplierAttachs"></a-input>
 							</a-form-item>
 						</a-col>
+            <a-col :span="12">
+							<a-form-item label="附件(attachs)" v-bind="validateInfos.attachs" id="quotationFormForm-attachs" name="attachs">
+								<JUpload v-model:value="formData.attachs"></JUpload>
+							</a-form-item>
+						</a-col>
           </a-row>
         </a-form>
       </template>
@@ -292,7 +297,8 @@
         attachs: '',   
         supplierAttachs: '',   
         sourceCode:'',
-        exchangeRate:''
+        exchangeRate:'',
+        agreementTerms:''
       });
 
       //表单验证

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

@@ -164,7 +164,12 @@
 							</a-form-item>
 						</a-col>
             <a-col :span="12">
-							<a-form-item label="附件(attachs)" v-bind="validateInfos.attachs" id="SaleOrderForm-attachs" name="attachs"  :labelCol="formItemLayout.labelCol1" :wrapperCol="formItemLayout.wrapperCol1">
+							<a-form-item label="协议条款(agreement terms)" v-bind="validateInfos.agreementTerms" id="SaleOrderForm-agreementTerms" name="agreementTerms"  :labelCol="formItemLayout.labelCol1" :wrapperCol="formItemLayout.wrapperCol1">
+								<a-textarea v-model:value="formData.agreementTerms" AutoComplete="off" :rows="2" ></a-textarea>
+							</a-form-item>
+						</a-col>  
+            <a-col :span="12">
+							<a-form-item label="附件(attachs)" v-bind="validateInfos.attachs" id="SaleOrderForm-attachs" name="attachs"  >
 								<JUpload v-model:value="formData.attachs"></JUpload>
 							</a-form-item>
 						</a-col>
@@ -340,6 +345,7 @@
         currency:'',
         exchangeRate:'',
         submit:undefined,
+        agreementTerms:''
       });
 
       //表单验证