选择弹窗-带出供应商/页面布局

src/views/publicComponents/SelectContractModal.vue

@@ -163,13 +163,14 @@
             title: '项目(project)',
             dataIndex: 'quotationProjectName',
             key: 'quotationProjectName',
-            align:"center"
+            align:"center",
+            ellipsis: true,
         },
         {
             title: '客户(custormer)',
             dataIndex: 'quotationCustomerName',
             key: 'quotationCustomerName',
-            align:"center"
+            align:"center",ellipsis: true,
         },
         {
             title: '优先级(priority)',

src/views/publicComponents/SelectQuotationModal.vue

@@ -153,12 +153,14 @@
             key: 'quotationProjectName',
             align:"center",
             width:250,
+            ellipsis: true,
         },
         {
             title: '客户(custormer)',
             dataIndex: 'quotationCustomerName',
             key: 'quotationCustomerName',
-            align:"center"
+            align:"center",
+            ellipsis: true,
         },
         {
             title: '报价有效期(quotation period)',

src/views/publicComponents/SelectSupplierQuotationModal.vue

@@ -142,12 +142,14 @@
             key: 'projectName',
             align:"center",
             width:250,
+            ellipsis: true,
         },
         {
             title: '供应商(supplier)',
             dataIndex: 'suppilerName',
             key: 'suppilerName',
-            align:"center"
+            align:"center",
+            ellipsis: true,
         },
         {
             title: '报价截止日期(quotation period)',

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

@@ -242,7 +242,8 @@
         placeDelivery:'',
         suppilerName:'',
         saleAttachs:'',
-        paymentTermsInfo:''
+        paymentTermsInfo:'',
+        sourceId:""
       });
 
       //表单验证

src/views/purchase/selectionQuotationForm/components/SelectQuotationFormForm.vue

@@ -370,6 +370,10 @@ import { log } from 'console';
               res.result.records.map(item=>{
                  supplierList.value.push({label:item.suppilerName,value:item.quotationSuppiler})
               })
+              supplierList.value = supplierList.value.filter((item, index, self) => {
+                return index === self.findIndex(obj => obj.value === item.value && obj.label === item.label);
+              });
+
             }
           })
       }

src/views/saleCode/quotation/components/SelectSupplierQuotation.vue

@@ -1,6 +1,6 @@
 <template>
     <a-modal
-      title="选择供应商报价单(select supplier quotation)"
+      title="选择供应商报价选定(select supplier quotation selection)"
       width="95%"
       :visible="visible"
       :maskClosable="false"
@@ -13,7 +13,7 @@
                 <a-form :model="queryParams" :label-col="labelCol" :wrapper-col="wrapperCol" @keyup.enter.native="searchQuery">
                     <a-row :gutter="24">
                     <a-col :md="6" :sm="8">
-                        <a-form-item label="报价编码(quotation code)">
+                        <a-form-item label="选定单号(bill code)">
                             <a-input placeholder="请输入" v-model:value="queryParams.billCode"></a-input>
                         </a-form-item>
                     </a-col>
@@ -24,11 +24,11 @@
                     </a-col> 
                     <template v-if="toggleSearchStatus">
                         <a-col :md="6"  :sm="8">
-                            <a-form-item label="报价项目(quotation project)">
+                            <a-form-item label="项目(quotation project)">
                                 <ApiSelect
                                     :api="projectListList"
                                     showSearch
-                                    v-model:value="queryParams.quotationProject"
+                                    v-model:value="queryParams.inquiryProject"
                                     optionFilterProp="label"
                                     resultField="records"
                                     labelField="name"
@@ -38,11 +38,11 @@
                             </a-form-item>
                         </a-col>
                            <a-col :md="6"  :sm="8">
-                            <a-form-item  label="报价供应商(quotation supplier)">
+                            <a-form-item  label="供应商(quotation supplier)">
                                 <ApiSelect
                                     :api="supplierOption"
                                     showSearch
-                                    v-model:value="queryParams.quotationSuppiler"
+                                    v-model:value="queryParams.selectionSupplier"
                                     optionFilterProp="label"
                                     resultField="records"
                                     labelField="name"
@@ -112,7 +112,7 @@
                 size="small"
                 @change="handleTableChange"
                 :pagination="pagination"
-                :scroll="{ x: 2500, y: 300 }"
+                :scroll="{ x: 3500, y: 300 }"
                 :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
             >
             </a-table>
@@ -155,15 +155,20 @@
             align:"center",
             dataIndex: 'projectName'
         },
+        {
+            title: '供应商(supplier)',
+            align:"center",
+            dataIndex: 'selectionSupplier_dictText'
+        },
         // {
         //     title: '询价供应商(quotation supplier)',
         //     align:"center",
         //     dataIndex: 'suppilerName'
         // },
         {
-            title: '报价有效期(quotation period)',
+            title: '交期(delivery time)',
             align:"center",
-            dataIndex: 'quotationValidityDate',
+            dataIndex: 'deliveryTime',
             width:250,
         },
         {
@@ -201,11 +206,6 @@
             align:"center",
             dataIndex: 'qualityGrade'
         },
-        {
-            title: '数量(quantity)',
-            align:"center",
-            dataIndex: 'quantity'
-        },
         {
             title: '含税单价(tax price)',
             align:"center",
@@ -232,13 +232,13 @@
     const queryParams = ref({
         billCode:'',
         billDate:'',
-        quotationSuppiler:'',
+        selectionSupplier:'',
         priority:'',
         productionClass:'',
         model:'',
         maker:'',
         productionCode:'',
-        quotationProject:'',
+        inquiryProject:'',
         projectName:''
     });
     let pagination = ref({
@@ -255,7 +255,7 @@
     function loadData(){
         let params = getQueryParams();
         defHttp
-        .get({ url: '/purCode/purPurchaseQuotation/supplierQuotationDetails2',params}, { isTransformResponse: false })
+        .get({ url: '/purCode/purQuotationSelection/purQuotationSelectionProductAlert',params}, { isTransformResponse: false })
         .then((res) => {
             if (res.success) {
                 dataSource.value = res.result.records;
@@ -275,9 +275,9 @@
         params.pageNo = pagination.value.current;
         params.pageSize = pagination.value.pageSize;
         if(fatherProject.value&&fatherProject.value!==''){
-            queryParams.value.quotationProject = fatherProject.value
+            queryParams.value.inquiryProject = fatherProject.value
         }else{
-            queryParams.value.quotationProject = params.quotationProject
+            queryParams.value.inquiryProject = params.inquiryProject
         }
         return filterObj(params);
     }
@@ -313,13 +313,13 @@
         queryParams.value = {
             billCode:'',
             billDate:'',
-            quotationSuppiler:'',
+            selectionSupplier:'',
             priority:'',
             productionClass:'',
             model:'',
             maker:'',
             productionCode:'',
-            quotationProject:'',
+            inquiryProject:'',
             projectName:''
         }
         pagination.value.current =1;
@@ -355,13 +355,13 @@
       queryParams.value = {
             billCode:'',
             billDate:'',
-            quotationSuppiler:'',
+            selectionSupplier:'',
             priority:'',
             productionClass:'',
             model:'',
             maker:'',
             productionCode:'',
-            quotationProject:'',
+            inquiryProject:'',
             projectName:''
         }
     }

src/views/saleCode/quotation/components/quotationFormForm.vue

@@ -579,11 +579,13 @@
           item.model = item.childModel
           item.deliveryTime = formData.deliveryTime
           item.supplierCurrency = item.currency
+          item.supplierId = item.selectionSupplier
+          item.supplierName = item.selectionSupplier_dictText
         })
         var arrProduct = data.concat(saleQuotationFormProductTable.dataSource)
         saleQuotationFormProductTable.dataSource=arrProduct     
         notAllowEdit.value=true
-        formData.quotationProject = data[0].quotationProject
+        formData.quotationProject = data[0].inquiryProject
         formData.quotationProjectName = data[0].projectName
         formData.sourceCode = data[0].billCode
         formData.priority = data[0].priority