Prechádzať zdrojové kódy

销售合同-筛选条件

jingbb 3 mesiacov pred
rodič
commit
7dc6db4c69

+ 14 - 7
src/views/publicComponents/SelectQuotationModal.vue

@@ -26,13 +26,14 @@
                         <a-col :md="6" :sm="8">
                             <a-form-item label="项目(project)">
                                 <ApiSelect
-                                    :api="projectListList"
+                                    :api="ProjectOption"
                                     showSearch
                                     v-model:value="queryParams.quotationProject"
                                     optionFilterProp="label"
                                     resultField="records"
                                     labelField="name"
                                     valueField="id"
+                                    :params='{pageSize:-1}'
                                     :disabled="fatherProject!==''"
                                     />
                             </a-form-item>
@@ -50,12 +51,21 @@
                         </a-col>
                         <a-col :md="6" :sm="8">
                             <a-form-item label="客户(customer)">
-                                <a-input placeholder="请输入" v-model:value="queryParams.quotationCustomerName"></a-input>
+                                <ApiSelect
+                                    :api="CustomerOption"
+                                    showSearch
+                                    v-model:value="queryParams.quotationCustomerName"
+                                    optionFilterProp="label"
+                                    resultField="records"
+                                    labelField="abbreviation"
+                                    valueField="id"
+                                    :disabled="fatherProject!==''"
+                                    />
                             </a-form-item>
                         </a-col>
                         <a-col :md="6" :sm="8">
                             <a-form-item label="机型(model)">
-                                <a-input placeholder="请输入" v-model:value="queryParams.headModel"></a-input>
+                                <JDictSelectTag v-model:value="queryParams.headModel" placeholder="请选择" dictCode="model_typer"/>
                             </a-form-item>
                         </a-col>
                         
@@ -127,6 +137,7 @@
     import { JDictSelectTag} from '/@/components/Form';
      import {  ApiSelect, } from '/@/components/Form/index';
     import JSelectInput from '/@/components/Form/src/jeecg/components/JSelectInput.vue';
+    import {ProjectOption,CustomerOption} from '../saleCode/saleContract/SaleContract.api';
     const emit = defineEmits([ 'selectQuotation']); //定义emit
     let classOption = ref([])
     var visible = ref(false)
@@ -337,10 +348,6 @@
         pagination.value.pageSize = paginations.pageSize;
         loadData()
     };
-    function projectListList(){
-        let params = {pageSize:-1}
-        return defHttp.get({url:'/baseCode/baseProjectArchive/list',params});
-    }
     function getOptiom(){
     defHttp
         .get({ url: 'baseCode/baseProductClass/list'}, { isTransformResponse: false })

+ 8 - 0
src/views/saleCode/saleContract/SaleContract.api.ts

@@ -20,6 +20,8 @@ enum Api {
   cancelSubmitBatch='/saleCode/saleContract/returnSubmitBatch',
   closeBill='/saleCode/saleContract/closeBatch',
   queryVersonHistoryById='/saleCode/saleContractHis/queryById',
+  customerList='/cuspCode/cuspCustomerProfile/list',
+  projectList='/baseCode/baseProjectArchive/list'
 }
 /**
  * 导出api
@@ -144,3 +146,9 @@ export const closeBill = (params, handleSuccess) => {
     }
   });
 }
+
+//获取客户下拉框列表
+export const CustomerOption = (params) => defHttp.get({ url: Api.customerList, params });
+
+//获取项目下拉框列表
+export const ProjectOption = (params) => defHttp.get({ url: Api.projectList, params });

+ 35 - 10
src/views/saleCode/saleContract/SaleContract.data.ts

@@ -2,6 +2,7 @@ import {BasicColumn} from '/@/components/Table';
 import {FormSchema} from '/@/components/Table';
 import {JVxeTypes,JVxeColumn} from '/@/components/jeecg/JVxeTable/types'
 import { defHttp } from '/@/utils/http/axios';
+import {ProjectOption,CustomerOption} from './SaleContract.api';
 //列表数据
 export const columns: BasicColumn[] = [
   {
@@ -107,9 +108,21 @@ export const searchFormSchema: FormSchema[] = [
       label: "客户(Customer)",
       field: "quotationCustomerName",
       labelWidth: 150,
-      component: 'Input',
-      componentProps:{
-        AutoComplete:'off'
+      component: 'ApiSelect',
+      componentProps: {
+        // mode: 'multiple',//multiple: 多选;不填写为单选
+        //请求api,返回结果{ result: { records: [{'id':'1',name:'scott'},{'id':'2',name:'小张'}] }}
+        api: CustomerOption,
+        //数值转成String
+        numberToString: false,
+        //标题字段
+        labelField: 'abbreviation',
+        //值字段
+        valueField: 'id',
+        //请求参数
+        params:{pageSize:-1},
+        //返回结果字段
+        resultField:'records'
       },
       //colProps: {span: 6},
  	},
@@ -117,9 +130,21 @@ export const searchFormSchema: FormSchema[] = [
     label: "项目(Project)",
     field: "quotationProjectName",
     labelWidth: 150,
-    component: 'Input',
-    componentProps:{
-      AutoComplete:'off'
+    component: 'ApiSelect',
+    componentProps: {
+      // mode: 'multiple',//multiple: 多选;不填写为单选
+      //请求api,返回结果{ result: { records: [{'id':'1',name:'scott'},{'id':'2',name:'小张'}] }}
+      api: ProjectOption,
+      //数值转成String
+      numberToString: false,
+      //标题字段
+      labelField: 'name',
+      //值字段
+      valueField: 'id',
+      //请求参数
+      params:{pageSize:-1},
+      //返回结果字段
+      resultField:'records'
     },
     //colProps: {span: 6},
   },
@@ -170,9 +195,9 @@ export const searchFormSchema: FormSchema[] = [
       label: "厂家(maker)",
       field: "maker",
       labelWidth: 150,
-      component: 'Input',
+      component: 'JDictSelectTag',
       componentProps:{
-        AutoComplete:'off'
+        dictCode:"factory"
       },
       //colProps: {span: 6},
  	},
@@ -311,9 +336,9 @@ export const formSchema: FormSchema[] = [
     label: '厂家(maker)',
     labelWidth: 200,
     field: 'maker',
-    component: 'Input',
+    component: 'JDictSelectTag',
     componentProps:{
-      AutoComplete:'off'
+      dictCode:"factory"
     },
   },
   {