Ver código fonte

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

jingbb 4 meses atrás
pai
commit
a059900aee

+ 1 - 1
src/views/saleCode/quotation/components/SelectSupplierQuotation.vue

@@ -67,7 +67,7 @@
                         </a-col>
                         <a-col :md="6"  :sm="8">
                             <a-form-item label="厂家(maker)">
-                                <a-input placeholder="请输入厂家(maker)" v-model:value="queryParams.maker" allow-clear ></a-input>
+                                <JDictSelectTag v-model:value="queryParams.maker" placeholder="请选择" dictCode="factory"/>
                             </a-form-item>
                         </a-col>
                         <a-col :md="6"  :sm="8">

+ 1 - 1
src/views/saleCode/quotation/components/quotationFormForm.vue

@@ -46,7 +46,7 @@
 						</a-col>
 						<a-col :span="12">
 							<a-form-item label="厂家(maker)" v-bind="validateInfos.maker" id="quotationFormForm-maker" name="maker" :labelCol="formItemLayout.labelCol1" :wrapperCol="formItemLayout.wrapperCol1">
-								<a-input v-model:value="formData.maker" placeholder="请输入厂家(maker)"  allow-clear ></a-input>
+                <JDictSelectTag v-model:value="formData.maker" placeholder="请选择" dictCode="factory"/>
 							</a-form-item>
 						</a-col>
             <a-col :span="12">

+ 23 - 5
src/views/saleCode/quotation/quotation.vue

@@ -20,13 +20,31 @@
             <a-col :lg="8">
               <a-form-item name="inquiryProject">
                 <template #label><span title="报价项目(quotation project)">报价项目(quotation project)</span></template>
-                <a-input placeholder="请输入报价项目(quotation project)" v-model:value="queryParam.quotationProject" allow-clear AutoComplete="off"></a-input>
+                  <ApiSelect
+                    :api="ProjectOption"
+                    showSearch
+                    v-model:value="queryParam.quotationProject"
+                    :filterOption="false"
+                    resultField="records"
+                    labelField="name"
+                    valueField="id"
+                    :params='{pageSize:-1}'
+                  />
               </a-form-item>
             </a-col>
             <a-col :lg="8">
               <a-form-item name="quotationCustomer">
                 <template #label><span title="报价客户(quotation customer)">报价客户(quotation customer)</span></template>
-                <a-input placeholder="请输入报价客户(quotation customer)" v-model:value="queryParam.quotationCustomer" allow-clear ></a-input>
+                <ApiSelect
+                  :api="CustomerOption"
+                  showSearch
+                  v-model:value="queryParam.quotationCustomer"
+                  :filterOption="false"
+                  resultField="records"
+                  labelField="abbreviation"
+                  valueField="id"
+                  :params='{pageSize:-1}'
+                />
               </a-form-item>
             </a-col>
             <a-col :lg="8">
@@ -50,7 +68,7 @@
             <a-col :lg="8">
               <a-form-item name="maker">
                 <template #label><span title="厂家(maker)">厂家(maker)</span></template>
-                <a-input placeholder="请输入厂家(maker)" v-model:value="queryParam.maker" allow-clear AutoComplete="off"></a-input>
+                <JDictSelectTag v-model:value="queryParam.maker" placeholder="请选择" dictCode="factory"/>
               </a-form-item>
             </a-col>
             <a-col :lg="8">
@@ -135,11 +153,11 @@
   import { useListPage } from '/@/hooks/system/useListPage'
   import {useModal} from '/@/components/Modal';
   import {columns, superQuerySchema} from './quotationForm.data';
-  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl,batchSubmit,cancelBatchSubmit} from './quotationForm.api';
+  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl,batchSubmit,cancelBatchSubmit,ProjectOption,CustomerOption} from './quotationForm.api';
   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 quotationFormModal from './components/quotationFormModal.vue';
   import ViewHistoryVersionModal from './components/ViewHistoryVersionModal.vue';

+ 10 - 2
src/views/saleCode/quotation/quotationForm.api.ts

@@ -21,7 +21,9 @@ enum Api {
   salVersonFormProductList = '/saleCode/saleQuotationHis/querySaleQuotationProductHisByMainId',
   submitBatch='/saleCode/saleQuotation/submitBatch',
   cancelSubmitBatch='/saleCode/saleQuotation/returnSubmitBatch',
-  supplierList='/cuspCode/cuspSupplierProfile/list?pageSize=-1'
+  supplierList='/cuspCode/cuspSupplierProfile/list?pageSize=-1',
+  customerList='/cuspCode/cuspCustomerProfile/list',
+  projectList='/baseCode/baseProjectArchive/list'
 }
 /**
  * 导出api
@@ -139,4 +141,10 @@ export const cancelBatchSubmit = (params, handleSuccess) => {
 }
 
 //获取供应商列表
-export const supplierOption = (params) => defHttp.get({url: Api.supplierList, params});
+export const supplierOption = (params) => defHttp.get({url: Api.supplierList, params});
+
+//获取客户下拉框列表
+export const CustomerOption = (params) => defHttp.get({ url: Api.customerList, params });
+
+//获取项目下拉框列表
+export const ProjectOption = (params) => defHttp.get({ url: Api.projectList, params });