采购报价单-接口修正，字段修改

src/views/purchase/purchaseQuotationFrm/components/PurchaseQuotationFormForm.vue

@@ -21,8 +21,8 @@
 							</a-form-item>
 						</a-col>
 						<a-col :span="12">
-							<a-form-item label="报价供应商(quotation supplier)" v-bind="validateInfos.inquirySuppiler" id="PuechaseQuotationFormForm-inquirySuppiler" name="inquirySuppiler">
-                  <JSelectInput   v-model:value="formData.inquirySuppiler"  placeholder="请选择" allow-clear  :options="supplierOption" @change="changeSupplier"></JSelectInput>
+							<a-form-item label="报价供应商(quotation supplier)" v-bind="validateInfos.quotationSuppiler" id="PuechaseQuotationFormForm-quotationSuppiler" name="quotationSuppiler">
+                  <JSelectInput   v-model:value="formData.quotationSuppiler"  placeholder="请选择" allow-clear  :options="supplierOption" @change="changeSupplier"></JSelectInput>
 							</a-form-item>
 						</a-col>
 						<a-col :span="12">
@@ -57,7 +57,8 @@
 						</a-col>
             <a-col :span="12">
 							<a-form-item label="付款条件(payment terms)" v-bind="validateInfos.paymentTerms" id="PuechaseQuotationFormForm-paymentTerms" name="paymentTerms" :labelCol="formItemLayout.labelCol1" :wrapperCol="formItemLayout.wrapperCol1">
-                <JDictSelectTag v-model:value="formData.paymentTerms" placeholder="请选择" dictCode="payment_terms"/>
+                <JDictSelectTag v-model:value="formData.paymentTerms" placeholder="请选择" dictCode="payment_terms" style="width: 49%;margin-right: 1%;"/>
+                <a-input v-model:value="formData.paymentTermsInfo" placeholder=""  allow-clear style="width: 49%"></a-input>
 							</a-form-item>
 						</a-col>
             <a-col :span="12">
@@ -73,7 +74,7 @@
             <a-col :span="12">
 							<a-form-item label="报价有效期(quotation validity period)" v-bind="validateInfos.quotationValidity" id="PuechaseQuotationFormForm-quotationValidity" name="quotationValidity">
                 <a-input v-model:value="formData.quotationValidity" placeholder="请输入" style="width: 43%;margin-right: 1%;"/>天(days)到
-                <a-date-picker v-model:value="formData.quotationValidityPeriod" show-time  valueFormat="YYYY-MM-DD" format='YYYY-MM-DD' style="width: 43%;margin-left: 1%;"></a-date-picker>
+                <a-date-picker v-model:value="formData.quotationValidityDate" show-time  valueFormat="YYYY-MM-DD" format='YYYY-MM-DD' style="width: 43%;margin-left: 1%;"></a-date-picker>
 							</a-form-item>
 						</a-col>
 						<a-col :span="12">
@@ -82,8 +83,8 @@
 							</a-form-item>
 						</a-col>     
             <a-col :span="12">
-							<a-form-item label="报价备注(quotation notes)" v-bind="validateInfos.inquiryNotes" id="PuechaseQuotationFormForm-inquiryNotes" name="inquiryNotes">
-								<a-input v-model:value="formData.inquiryNotes" placeholder="请输入报价备注(quotation notes)"  allow-clear ></a-input>
+							<a-form-item label="报价备注(quotation notes)" v-bind="validateInfos.quotationNotes" id="PuechaseQuotationFormForm-quotationNotes" name="quotationNotes">
+								<a-input v-model:value="formData.quotationNotes" placeholder="请输入报价备注(quotation notes)"  allow-clear ></a-input>
 							</a-form-item>
 						</a-col>      
 						<a-col :span="12">
@@ -93,7 +94,7 @@
 						</a-col>
             <a-col :span="12">
 							<a-form-item label="报价资料(quotation information)" v-bind="validateInfos.quotationInformation" id="PuechaseQuotationFormForm-quotationInformation" name="quotationInformation">
-								<JUpload v-model:value="formData.quotationInformation"></JUpload>
+								<JUpload v-model:value="formData.quotationInfomation"></JUpload>
 							</a-form-item>
 						</a-col>
            
@@ -154,7 +155,7 @@
 </template>
 
 <script lang="ts">
-  import { defineComponent, ref, reactive, computed, toRaw, onMounted } from 'vue';
+  import { defineComponent, ref, reactive, computed, toRaw} from 'vue';
   import { defHttp } from '/@/utils/http/axios';
   import { useValidateAntFormAndTable } from '/@/hooks/system/useJvxeMethods';
   import { PuechaseQuotationFormShippTable, queryPurcodeQuotationFormProductListByMainId, queryDataById, saveOrUpdate } from '../PurchaseQuotationForm.api';
@@ -232,15 +233,20 @@
         paymentTerms:'',
         delivery:'',
         deliveryTime: '',  
-        inquiryTeam: '',   
-        quotationValidity:'',
-        attachs: '',   
-        inquiryNotes: '',   
+        // inquiryTeam: '',   
+        quotationValidity:'', 
+        quotationNotes: '',   
+        quotationDeadline:'',
         sourceCode:'',
         projectName:'',
         placeDelivery:'',
         suppilerName:'',
-        saleAttachs:''
+        saleAttachs:'',
+        paymentTermsInfo:'',
+        quotationValidityDate:'',
+        technicalInformation:'',
+        quotationInfomation:'',
+        currency:''
       });
 
       //表单验证
@@ -301,7 +307,7 @@
 
       const {getSubFormAndTableData, transformData} = useValidateAntFormAndTable(activeKey, {
         'purPurchaseQuotationShip': PuechaseQuotationFormShipTableRef,
-        'purPurchaseInquiryProduct': PuechaseQuotationFormProductTableRef,
+        'purPurchaseQuotationProduct': PuechaseQuotationFormProductTableRef,
       });
 
       async function getFormData() {
@@ -376,11 +382,11 @@
       }
       function addProject(data) {
         if(data.length!==0){
-          formData.inquiryProject = data[0].id
+          formData.quotationProject = data[0].id
            formData.projectName = data[0].name
         }else{
           formData.inquiryProject = ''
-          formData.projectName = ''
+          formData.quotationProject = ''
         }
         
       }
@@ -408,14 +414,14 @@
         formData.priority = data[0].priority
         formData.model = data[0].headModel
         formData.maker = data[0].maker
-        formData.inquiryTeam =  data[0].inquiryTeam
+        // formData.inquiryTeam =  data[0].inquiryTeam
         formData.productionClass =  data[0].productionClass_dictText
-        formData.saleAttachs =data[0].attachs
+        // formData.saleAttachs =data[0].attachs
         getShipList(data[0].headId)
       }
       function getShipList(id){
         let params = {id:id}
-          defHttp.get({url:'/saleCode/saleInquiryForm/querySaleInquiryFormShipByMainId',params}, { isTransformResponse: false }).then(res=>{
+          defHttp.get({url:'/purCode/purInquiryForm/queryPurInquiryFormShipByMainId',params}, { isTransformResponse: false }).then(res=>{
             if(res){
               PuechaseQuotationFormShipTable.dataSource = res.result
             }
@@ -460,7 +466,7 @@
             }
           })
         }else{
-          formData.inquirySuppiler = ''
+          formData.quotationSuppiler = ''
           formData.suppilerName = ''
         }
         

src/views/purchase/purchaseQuotationFrm/components/SelectSupplierInquiryModal.vue

@@ -24,7 +24,7 @@
                     </a-col>
                     <a-col :md="6" :sm="8">
                         <a-form-item label="询价项目(inquiry project)">
-                            <a-input placeholder="请输入" v-model:value="queryParams.inquiryProject" :disabled="fatherProjectName!==''"></a-input>
+                            <a-input placeholder="请输入" v-model:value="queryParams.projectName" :disabled="fatherProjectName!==''"></a-input>
                         </a-form-item>
                     </a-col>
                     <template v-if="toggleSearchStatus">
@@ -272,7 +272,7 @@
     function loadData(){
         let params = getQueryParams();
         defHttp
-        .get({ url: '/saleCode/saleInquiryForm/alertSaleInquiryList',params}, { isTransformResponse: false })
+        .get({ url: '/purCode/purInquiryForm/alertPurInquiryList',params}, { isTransformResponse: false })
         .then((res) => {
             if (res.success) {
                 dataSource.value = res.result.records;
@@ -331,7 +331,6 @@
             billCode:'',
             billDate:'',
             inquiryProject:'',
-            busynessType:'',
             priority:'',
             productionClass:'',
             model:'',

src/views/purchase/purchaseQuotationFrm/purchaseQuotationFormList.vue

@@ -18,15 +18,15 @@
           </a-col>           
           <template v-if="toggleSearchStatus">
             <a-col :lg="8">
-              <a-form-item name="inquiryProject">
+              <a-form-item name="quotatioProject">
                 <template #label><span title="报价项目(quotation project)">报价项目(quotation project)</span></template>
-                <a-input placeholder="请输入询价项目(inquiry project)" v-model:value="queryParam.inquiryProject" allow-clear ></a-input>
+                <a-input placeholder="请输入询价项目(inquiry project)" v-model:value="queryParam.quotatioProject" allow-clear ></a-input>
               </a-form-item>
             </a-col>
             <a-col :lg="8">
-              <a-form-item name="inquiryCustomer">
+              <a-form-item name="quotationSuppiler ">
                 <template #label><span title="报价供应商(quotation supplier)">报价供应商(quotation supplier)</span></template>
-                <JSelectInput   v-model:value="queryParam.inquirySuppiler"  placeholder="请选择" :options="supplierOption" ></JSelectInput>
+                <JSelectInput   v-model:value="queryParam.quotationSuppiler"  placeholder="请选择" :options="supplierOption" ></JSelectInput>
               </a-form-item>
             </a-col>
             <a-col :lg="8">