Browse Source

销售询价单-筛选条件修改

jingbb 4 months ago
parent
commit
78f5eb0def

+ 6 - 2
src/views/saleCode/saleInquiryForm/SaleInquiryForm.api.ts

@@ -16,7 +16,8 @@ enum Api {
   saleInquiryFormProductList = '/saleCode/saleInquiryForm/querySaleInquiryFormProductByMainId',
   submitBatch='/saleCode/saleInquiryForm/submitBatch',
   cancelSubmitBatch='/saleCode/saleInquiryForm/returnSubmitBatch',
-  customerList='/cuspCode/cuspCustomerProfile/list?pageSize=-1'
+  customerList='/cuspCode/cuspCustomerProfile/list?pageSize=-1',
+  projectList='/baseCode/baseProjectArchive/list'
 }
 /**
  * 导出api
@@ -120,4 +121,7 @@ export const cancelBatchSubmit = (params, handleSuccess) => {
 }
 
 //获取客户下拉框列表
-export const CustomerOption = (params) => defHttp.get({ url: Api.customerList, params });
+export const CustomerOption = (params) => defHttp.get({ url: Api.customerList, params });
+
+//获取项目下拉框列表
+export const ProjectOption = (params) => defHttp.get({ url: Api.projectList, params });

+ 25 - 8
src/views/saleCode/saleInquiryForm/SaleInquiryFormList.vue

@@ -20,21 +20,38 @@
             <a-col :lg="8">
               <a-form-item name="inquiryProject">
                 <template #label><span title="询价项目(inquiry project)" AutoComplete="off">询价项目(inquiry project)</span></template>
-                <a-input v-model:value="queryParam.inquiryProject"/>
+                <ApiSelect
+                  :api="ProjectOption"
+                  showSearch
+                  v-model:value="queryParam.inquiryProject"
+                  :filterOption="false"
+                  resultField="records"
+                  labelField="name"
+                  valueField="id"
+                  :params='{pageSize:-1}'
+                />
               </a-form-item>
             </a-col>
             <a-col :lg="8">
               <a-form-item name="inquiryCustomer">
                 <template #label><span title="询价客户(inquiry customer)">询价客户(inquiry customer)</span></template>
-                <a-input placeholder="请输入询价客户(inquiry customer)" v-model:value="queryParam.inquiryCustomer" allow-clear AutoComplete="off"></a-input>
+                <ApiSelect
+                  :api="CustomerOption"
+                  showSearch
+                  v-model:value="queryParam.inquiryCustomer"
+                  :filterOption="false"
+                  resultField="records"
+                  labelField="abbreviation"
+                  valueField="id"
+                />
               </a-form-item>
             </a-col>
-            <a-col :lg="8">
+            <!-- <a-col :lg="8">
               <a-form-item name="shipID">
                 <template #label><span title="船(ship)">船(ship)</span></template>
                 <a-input placeholder="请输入船(ship)" v-model:value="queryParam.shipID" allow-clear ></a-input>
               </a-form-item>
-            </a-col>
+            </a-col> -->
             <a-col :lg="8">
               <a-form-item name="priority">
                 <template #label><span title="优先级(priority)">优先级(priority)</span></template>
@@ -62,7 +79,7 @@
             <a-col :lg="8">
               <a-form-item name="inquiryPlatform">
                 <template #label><span title="询价平台(inquiry platform)">询价平台(inquiry platform)</span></template>
-                <a-input placeholder="请输入询价平台(inquiry platform)" v-model:value="queryParam.inquiryPlatform" allow-clear AutoComplete="off"></a-input>
+                <JDictSelectTag v-model:value="queryParam.inquiryPlatform" placeholder="请选择" dictCode="inquiry_platform"/>
               </a-form-item>
             </a-col>
 
@@ -110,7 +127,7 @@
               </a-form-item>
             </a-col>
           </template>
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+          <a-col :xl="6" :lg="7" :md="8" :sm="24" >
             <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
               <a-col :lg="6">
                 <a-button type="primary" preIcon="ant-design:search-outlined" @click="reload">查询</a-button>
@@ -169,12 +186,12 @@
   import {useModal} from '/@/components/Modal';
   import SaleInquiryFormModal from './components/SaleInquiryFormModal.vue'
   import {columns, superQuerySchema} from './SaleInquiryForm.data';
-  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl,batchSubmit,cancelBatchSubmit} from './SaleInquiryForm.api';
+  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl,batchSubmit,cancelBatchSubmit,ProjectOption,CustomerOption} from './SaleInquiryForm.api';
   import {downloadFile} from '/@/utils/common/renderUtils';
   import { cloneDeep } from "lodash-es";
   import { useUserStore } from '/@/store/modules/user';
   import { defHttp } from '/@/utils/http/axios';
-  import { JDictSelectTag} from '/@/components/Form';
+  import { JDictSelectTag,ApiSelect} from '/@/components/Form';
   import JSelectInput from '/@/components/Form/src/jeecg/components/JSelectInput.vue';
   import JSelectUser from '/@/components/Form/src/jeecg/components/JSelectUser.vue';
   import JSelectDept from '/@/components/Form/src/jeecg/components/JSelectDept.vue';