|  | @@ -60,7 +60,7 @@
 | 
	
		
			
				|  |  |  							</a-form-item>
 | 
	
		
			
				|  |  |  						</a-col>
 | 
	
		
			
				|  |  |  						<a-col :span="12">
 | 
	
		
			
				|  |  | -							<a-form-item label="交货地点(place of delivery)" v-bind="validateInfos.placeDelivery" id="PuechaseQuotationFormForm-placeDelivery" name="placeDelivery">
 | 
	
		
			
				|  |  | +							<a-form-item label="发货地址(place of delivery)" v-bind="validateInfos.placeDelivery" id="PuechaseQuotationFormForm-placeDelivery" name="placeDelivery">
 | 
	
		
			
				|  |  |  								<a-input v-model:value="formData.placeDelivery" placeholder=""  allow-clear ></a-input>
 | 
	
		
			
				|  |  |  							</a-form-item>
 | 
	
		
			
				|  |  |  						</a-col>
 | 
	
	
		
			
				|  | @@ -76,8 +76,8 @@
 | 
	
		
			
				|  |  |  							</a-form-item>
 | 
	
		
			
				|  |  |  						</a-col>
 | 
	
		
			
				|  |  |              <a-col :span="12">
 | 
	
		
			
				|  |  | -							<a-form-item label="交期(delivery time)" v-bind="validateInfos.deliveryTime" id="PuechaseQuotationFormForm-deliveryTime" name="deliveryTime">
 | 
	
		
			
				|  |  | -								<a-date-picker placeholder="请选择交期(delivery time)"  v-model:value="formData.deliveryTime"  value-format="YYYY-MM-DD" format="YYYY-MM-DD" style="width: 100%"  allow-clear @change="changeFormDeliveryTime"/>
 | 
	
		
			
				|  |  | +							<a-form-item label="交期(delivery tidayme)" v-bind="validateInfos.deliveryDayHead" id="PuechaseQuotationFormForm-deliveryDayHead" name="deliveryDayHead">
 | 
	
		
			
				|  |  | +								<a-input-number v-model:value="formData.deliveryDayHead" placeholder="请输入" style="width: 100%" @change="changeFormDeliveryTime"/>
 | 
	
		
			
				|  |  |  							</a-form-item>
 | 
	
		
			
				|  |  |  						</a-col>
 | 
	
		
			
				|  |  |              <a-col :span="12">
 | 
	
	
		
			
				|  | @@ -249,7 +249,7 @@
 | 
	
		
			
				|  |  |          paymentTerms:'',
 | 
	
		
			
				|  |  |          placeDelivery:'',
 | 
	
		
			
				|  |  |          delivery:'',
 | 
	
		
			
				|  |  | -        deliveryTime: '',  
 | 
	
		
			
				|  |  | +        deliveryDayHead: '',  
 | 
	
		
			
				|  |  |          quotationValidity:'',
 | 
	
		
			
				|  |  |          quotationValidityDate:'',
 | 
	
		
			
				|  |  |          currency:'',
 | 
	
	
		
			
				|  | @@ -427,7 +427,7 @@
 | 
	
		
			
				|  |  |          const xTable = PuechaseQuotationFormProductTableRef.value!.getXTable();
 | 
	
		
			
				|  |  |          var arrProduct = [...xTable.data]
 | 
	
		
			
				|  |  |          arrProduct.map(item=>{
 | 
	
		
			
				|  |  | -          item.deliveryTime = formData.deliveryTime
 | 
	
		
			
				|  |  | +          item.deliveryDayChild = formData.deliveryDayHead
 | 
	
		
			
				|  |  |          })
 | 
	
		
			
				|  |  |          PuechaseQuotationFormProductTable.dataSource = arrProduct
 | 
	
		
			
				|  |  |        }
 | 
	
	
		
			
				|  | @@ -438,12 +438,14 @@
 | 
	
		
			
				|  |  |            item.unit = item.unit
 | 
	
		
			
				|  |  |            item.sourceId = item.childId
 | 
	
		
			
				|  |  |            item.model = item.childModel
 | 
	
		
			
				|  |  | -          item.deliveryTime = formData.deliveryTime
 | 
	
		
			
				|  |  | +          item.deliveryDayChild = formData.deliveryDayHead
 | 
	
		
			
				|  |  |          })
 | 
	
		
			
				|  |  |          var arrProduct = data.concat(PuechaseQuotationFormProductTable.dataSource)
 | 
	
		
			
				|  |  |          notAllowEdit.value=true
 | 
	
		
			
				|  |  |          PuechaseQuotationFormProductTable.dataSource=arrProduct     
 | 
	
		
			
				|  |  |          formData.quotationProject = data[0].inquiryProject
 | 
	
		
			
				|  |  | +        formData.delivery = data[0].delivery
 | 
	
		
			
				|  |  | +        formData.paymentTerms = data[0].paymentTerms
 | 
	
		
			
				|  |  |          formData.projectName = data[0].projectName
 | 
	
		
			
				|  |  |          formData.quotationSuppiler = data[0].inquirySuppiler
 | 
	
		
			
				|  |  |          formData.suppilerName = data[0].suppilerName
 | 
	
	
		
			
				|  | @@ -483,7 +485,8 @@
 | 
	
		
			
				|  |  |                    res.result.records.forEach(element => {
 | 
	
		
			
				|  |  |                        var obj = {
 | 
	
		
			
				|  |  |                          label: element.name?element.name:'无名称请维护',
 | 
	
		
			
				|  |  | -                        value: element.id?element.id:''
 | 
	
		
			
				|  |  | +                        value: element.id?element.id:'',
 | 
	
		
			
				|  |  | +                        paymentTerms:element.paymentTerms?element.paymentTerms:''
 | 
	
		
			
				|  |  |                        };
 | 
	
		
			
				|  |  |                        supplierOption.value.push( obj)
 | 
	
		
			
				|  |  |                    });    
 | 
	
	
		
			
				|  | @@ -500,7 +503,8 @@
 | 
	
		
			
				|  |  |          if(prop){
 | 
	
		
			
				|  |  |            supplierOption.value.map(item=>{
 | 
	
		
			
				|  |  |              if(item.value==prop){
 | 
	
		
			
				|  |  | -              formData.suppilerName = item.label
 | 
	
		
			
				|  |  | +              formData.suppilerName = item.label,
 | 
	
		
			
				|  |  | +              formData.paymentTerms = item.paymentTerms
 | 
	
		
			
				|  |  |              }
 | 
	
		
			
				|  |  |            })
 | 
	
		
			
				|  |  |          }else{
 |