Browse Source

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

jingbb 3 tháng trước cách đây
mục cha
commit
2901b674d4

+ 0 - 1
src/views/publicComponents/SelectPurchaseOrderModal.vue

@@ -134,7 +134,6 @@
     import {  ApiSelect, } from '/@/components/Form/index';
     import { filterObj, getFileAccessHttpUrl } from '/@/utils/common/compUtils';
     import { JDictSelectTag} from '/@/components/Form';
-    import JSelectInput from '/@/components/Form/src/jeecg/components/JSelectInput.vue';
     import {ProjectOption,supplierOption,ClassList} from '../purchase/arrivedGoods/ArriveGoodsForm.api';
     const emit = defineEmits([ 'selectPurchaseOrder']); //定义emit
     var visible = ref(false)

+ 4 - 4
src/views/purchase/purPaymentRequest/components/purPaymentRequestForm.vue

@@ -17,7 +17,7 @@
             <a-col :span="12">
               <a-form-item label="供应商(supplier)" v-bind="validateInfos.supplier" id="purPaymnetRequest-supplier" name="supplier">
                 <ApiSelect
-                  :api="listSupplier"
+                  :api="supplierOption"
                   showSearch
                   v-model:value="formData.supplier"
                   :filterOption="false"
@@ -114,7 +114,7 @@
   import { defineComponent, ref, reactive, computed, toRaw, onMounted } from 'vue';
   import { defHttp } from '/@/utils/http/axios';
   import { useValidateAntFormAndTable } from '/@/hooks/system/useJvxeMethods';
-  import { listSupplier,queryPaymentDetailListByMainId,queryDataById, saveOrUpdate } from '../purPaymentRequestForm.api';
+  import { supplierOption,queryPaymentDetailListByMainId,queryDataById, saveOrUpdate } from '../purPaymentRequestForm.api';
   import { JVxeTable } from '/@/components/jeecg/JVxeTable';
   import { paymentDetailColumns} from '../purPaymentRequest.data';
   import SelectPurchaseOrderModal from '../../../publicComponents/SelectPurchaseOrderModal.vue';
@@ -322,11 +322,11 @@
       }
       async function changeSupplier(value){
         var param={id:value}
-        var result=await listSupplier(param)     
+        var result=await supplierOption(param)     
         formData.supplierName =result.records[0].name
       }
       return {
-        listSupplier,
+        supplierOption,
         paymentDetailsTableRef,
         paymentDetailsTable,
         validatorRules,

+ 12 - 3
src/views/purchase/purPaymentRequest/purPaymentRequestForm.api.ts

@@ -15,7 +15,9 @@ enum Api {
   paymentDetailList = '/purCode/purPaymentRequest/queryPurPaymentRequestDetailsByMainId',
   submitBatch='/purCode/purPaymentRequest/submitBatch',
   cancelSubmitBatch='/purCode/purPaymentRequest/returnSubmitBatch',
-  supplierList='/cuspCode/cuspSupplierProfile/list'
+  supplierList='/cuspCode/cuspSupplierProfile/list',
+  projectList='/baseCode/baseProjectArchive/list',
+  classList='baseCode/baseProductClass/list',
 }
 /**
  * 导出api
@@ -43,7 +45,7 @@ export const list = (params) =>
   defHttp.get({url: Api.list, params});
 
 // 供应商列表接口
-export const listSupplier = (params) =>
+export const supplierOption = (params) =>
   defHttp.get({url: Api.supplierList, params});
 
 /**
@@ -116,4 +118,11 @@ export const cancelBatchSubmit = (params, handleSuccess) => {
       });
     }
   });
-}
+}
+//获取项目下拉框列表
+export const ProjectOption = (params) => defHttp.get({ url: Api.projectList, params });
+/**
+ * 分类列表接口
+ * @param params
+ */
+export const ClassList = (params) => defHttp.get({url: Api.classList, params});

+ 13 - 5
src/views/purchase/purPaymentRequest/purPaymentRequesttList.vue

@@ -18,9 +18,18 @@
             </a-col>          
             <template v-if="toggleSearchStatus">
               <a-col :lg="8">
-                <a-form-item name="supplierName">
+                <a-form-item name="supplier">
                   <template #label><span title="供应商(supplier)">供应商(supplier)</span></template>
-                  <a-input v-model:value="queryParam.supplierName" placeholder="请输入" AutoComplete="off"/>
+                  <ApiSelect
+                  :api="supplierOption"
+                  showSearch
+                  v-model:value="queryParam.supplier"
+                  :filterOption="false"
+                  resultField="records"
+                  labelField="name"
+                  valueField="id"
+                  :params='{pageSize:-1}'
+                />
                 </a-form-item>
               </a-col>
               <a-col :lg="8">
@@ -98,10 +107,9 @@
     import { useListPage } from '/@/hooks/system/useListPage'
     import {useModal} from '/@/components/Modal';
     import {columns,} from './purPaymentRequest.data';
-    import {list, deleteOne, batchDelete, getImportUrl,getExportUrl,batchSubmit,cancelBatchSubmit} from './purPaymentRequestForm.api';
+    import {list, deleteOne, batchDelete, getImportUrl,getExportUrl,batchSubmit,cancelBatchSubmit,supplierOption} from './purPaymentRequestForm.api';
     import { cloneDeep } from "lodash-es";
-    import { defHttp } from '/@/utils/http/axios';
-    import { JDictSelectTag} from '/@/components/Form';
+    import { JDictSelectTag,ApiSelect} from '/@/components/Form';
     import purPaymentRequestFormModal from './components/purPaymentRequestFormModal.vue';
     import { message } from 'ant-design-vue';
     const formRef = ref();