采购付款申请-筛选条件修改

src/views/purchase/freightPurchaseOrder/FreightPurOrder.api.ts

@@ -21,6 +21,9 @@ enum Api {
   cancelBatchClose = '/purCode/purShippingFee/returnClose',
   confirmBatch='/purCode/purShippingFee/submitConfirm',
   cancelBatchConfirm = '/purCode/purShippingFee/returnSubmitConfirm',
+  customerList='/cuspCode/cuspCustomerProfile/list',
+  projectList='/baseCode/baseProjectArchive/list',
+  classList='baseCode/baseProductClass/list',
 }
 /**
  * 导出api
@@ -189,4 +192,15 @@ export const CancelBatchConfirm = (params, handleSuccess) => {
       });
     }
   });
-}
+}
+
+//获取客户下拉框列表
+export const CustomerOption = (params) => defHttp.get({ url: Api.customerList, params });
+
+//获取项目下拉框列表
+export const ProjectOption = (params) => defHttp.get({ url: Api.projectList, params });
+/**
+ * 分类列表接口
+ * @param params
+ */
+export const ClassList = (params) => defHttp.get({url: Api.classList, params});

src/views/purchase/freightPurchaseOrder/FreightPurchaseOrderList.vue

@@ -109,7 +109,6 @@
   const queryParam = reactive<any>({});
   //注册model
   const [registerModal, {openModal}] = useModal();
-  var classOption = ref([]);
    //注册table数据
   const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
       tableProps:{
@@ -153,10 +152,6 @@
     });
     reload();
   }
-   // 自动请求并暴露内部方法
-   onMounted(() => {
-    getOptiom()
-  });
 
    /**
     * 新增事件
@@ -177,26 +172,6 @@
        showFooter: true,
      });
    }
-  //  产品分类
-  function getOptiom(){
-        defHttp
-            .get({ url: 'baseCode/baseProductClass/list'}, { isTransformResponse: false })
-            .then((res) => {
-                if (res.success) {
-                  classOption.value = []
-                  res.result.records.forEach(element => {
-                      var obj = {
-                        label: element.name?element.name:'无名称请维护',
-                        value: element.id?element.id:''
-                      };
-                      classOption.value.push( obj)
-                  });    
-                }
-            })
-            .finally(() => {
-                // loading.value = false;
-            });
-  }
    /**
     * 详情
    */

src/views/purchase/freightPurchaseOrder/components/SelectDeliveryNoticeModal.vue

@@ -26,20 +26,30 @@
                         <a-col :md="6" :sm="8">
                             <a-form-item label="项目(project)">
                                 <ApiSelect
-                                    :api="projectListList"
+                                    :api="ProjectOption"
                                     showSearch
                                     v-model:value="queryParams.project"
                                     optionFilterProp="label"
                                     resultField="records"
                                     labelField="name"
                                     valueField="id"
+                                    :params='{pageSize:-1}'
                                     />
                             </a-form-item>
                         </a-col>
                         <a-col :md="6" :sm="8">
                             <a-form-item name="customer">
                             <template #label><span title="客户(customer)">客户(customer)</span></template>
-                            <a-input placeholder="请输入客户(customer)" v-model:value="queryParams.customerName" allow-clear ></a-input>
+                            <ApiSelect
+                                :api="CustomerOption"
+                                showSearch
+                                v-model:value="queryParams.customer"
+                                :filterOption="false"
+                                resultField="records"
+                                labelField="abbreviation"
+                                valueField="id"
+                                :params='{pageSize:-1}'
+                            />
                             </a-form-item>
                         </a-col>
                         <a-col :md="6" :sm="8">
@@ -49,19 +59,28 @@
                         </a-col>
                         <a-col :md="6" :sm="8">
                             <a-form-item label="产品分类(production class)" :label-col="labelCol1" :wrapper-col="wrapperCol1">
-                                <!-- <a-input placeholder="请输入" v-model:value="queryParams.classId"></a-input> -->
-                                <JSelectInput   v-model:value="queryParams.productionClass"  placeholder="请选择" :options="classOption" ></JSelectInput>
+                                <ApiSelect
+                                :api="ClassList"
+                                showSearch
+                                v-model:value="queryParams.productionClass"
+                                :filterOption="false"
+                                resultField="records"
+                                labelField="name"
+                                valueField="id"
+                                :params='{pageSize:-1}'
+                                />
                             </a-form-item>
                         </a-col>
                         <a-col :md="6" :sm="8">
                             <a-form-item label="机型(model)">
-                                <a-input placeholder="请输入" v-model:value="queryParams.model"></a-input>
+                                <JDictSelectTag v-model:value="queryParams.model" placeholder="请选择" dictCode="model_typer"/>
+    
                             </a-form-item>
                         </a-col>
                         
                         <a-col :md="6" :sm="8">
                             <a-form-item label="厂家(maker)" >
-                                <a-input placeholder="请输入" v-model:value="queryParams.maker"></a-input>
+                                <JDictSelectTag v-model:value="queryParams.maker" placeholder="请选择" dictCode="factory"/>
                             </a-form-item>
                         </a-col>                        
                         <a-col :md="6" :sm="8">
@@ -124,11 +143,9 @@
     import { defHttp} from '/@/utils/http/axios';
     import { message } from 'ant-design-vue';
     import { filterObj, getFileAccessHttpUrl } from '/@/utils/common/compUtils';
-    import { JDictSelectTag} from '/@/components/Form';
-    import {  ApiSelect, } from '/@/components/Form/index';
-    import JSelectInput from '/@/components/Form/src/jeecg/components/JSelectInput.vue';
+    import { JDictSelectTag,ApiSelect} from '/@/components/Form';
+    import {CustomerOption,ProjectOption,ClassList} from '../FreightPurOrder.api';
     const emit = defineEmits([ 'addDelivery']); //定义emit
-    let classOption = ref([])
     var visible = ref(false)
     const columns = [
         {
@@ -280,25 +297,6 @@
         pagination.value.pageSize = paginations.pageSize;
         loadData()
     };
-    function getOptiom(){
-    defHttp
-        .get({ url: 'baseCode/baseProductClass/list'}, { isTransformResponse: false })
-        .then((res) => {
-            if (res.success) {
-              classOption.value = []
-              res.result.records.forEach(element => {
-                  var obj = {
-                    label: element.name?element.name:'无名称请维护',
-                    value: element.id?element.id:''
-                  };
-                  classOption.value.push( obj)
-              });    
-            }
-        })
-        .finally(() => {
-            // loading.value = false;
-        });
-  }
     function searchQuery(){
         loadData();
     }
@@ -366,7 +364,6 @@
     function getTable(){
         visible.value = true 
         loadData()
-        getOptiom()
     }
     function changeBillDate(prop){
        if(prop){
@@ -380,10 +377,6 @@
        }
        
     }
-    function projectListList(){
-        let params = {pageSize:-1}
-        return defHttp.get({url:'/baseCode/baseProjectArchive/list',params});
-    }
     defineExpose({
       getTable
     });