build

src/components/PageContent/src/hooks/use-request.ts

@@ -10,6 +10,7 @@ import { useNav } from "/@/layout/hooks/nav";
 import { useParams } from "./use-params";
 import { useUserInfo } from "/@/hooks/core/useUser";
 import { httpSupplierList } from "/@/api/supplierManage/supplierAccoutManage";
+import { httpCompanyList } from "/@/api/InvoiceSales/invoiceApply";
 
 export function useRequeset(props: PageContentProps) {
   const { contentConfig } = props;
@@ -32,7 +33,7 @@ export function useRequeset(props: PageContentProps) {
 
   async function onSearch() {
     const { contentConfig } = props;
-    const { apis, isTree, mockData, listNoRelation, transformCompany, transformField } = contentConfig;
+    const { apis, isTree, mockData, listNoRelation, transformCompany, transformField, transformFieldCompany, notDeleteCompanyrProp } = contentConfig;
     const hasCompanyFilter = !notNeedCompanyFilter;
     const vm = getCurrentInstance();
 
@@ -60,18 +61,22 @@ export function useRequeset(props: PageContentProps) {
         : {}
     });
 
+
+    if (transformFieldCompany && params['companyNo']) {
+      const { data } = await httpCompanyList({ size: 1000 })
+      const name = (data.list.find(({ companyNo }) => companyNo === params['companyNo']) || {}).company_name
+      const { data: rdata } = await httpSupplierList({ name })
+      const item = name ? rdata.list.find(item => item.name === name) || {} : {};
+      params['supplierNo'] = item.code;
+      delete params['companyNo']
+    }
+
     if (transformField) {
       params[transformField] = transCompany;
-      delete params[companyProp]
+      !notDeleteCompanyrProp && delete params[companyProp];
     }
 
-
-
-    const { code, data, message } = await apis.httpList({
-      ...params,
-      ...(listNoRelation ? { noRela: true } : {})
-    });
-
+    const { code, data, message } = await apis.httpList({ ...params, ...(listNoRelation ? { noRela: true } : {}) });
 
 
     responseHandle({

src/views/InvoiceSaleSettings/consultingChildCost/config/content.config.ts

@@ -129,9 +129,18 @@ const contentConfig: ContentConfig = {
   title: "销售成本类目设置",
   superUserNoPerview: true,
   columns,
-  transformField: 'supplierNo',
+  transformField: 'origin_supplierNo',
   apis: {
-    httpList: (params = {}) => httpList({ ...params, isChild: 1, noRela: true })
+    httpList: (params = {}) => {
+      const { supplierNo, origin_supplierNo, ...rest } = params
+      return httpList({
+        ...rest,
+        isChild: 1,
+        supplierNo: origin_supplierNo,
+        cgd_supplierNo: supplierNo,
+        noRela: true
+      })
+    }
   }
 };
 

src/views/supplyInvoiceSaleSettings/supplyConsultingChildCost/config/content.config.ts

@@ -118,11 +118,22 @@ const columns = [
 const contentConfig: ContentConfig = {
   title: "销售成本类目设置",
   superUserNoPerview: true,
-  transformField: 'cgd_supplierNo',
+  // transformField: 'origin_cgd_supplierNo',
+  // transformFieldCompany: 'supplierNo',
   companyProp: "supplierNo",
+  notDeleteCompanyrProp: true,
   columns,
   apis: {
-    httpList: (params = {}) => httpList({ ...params, isChild: 1, noRela: true })
+    httpList: (params = {}) => {
+      const { companyNo, supplierNo, ...rest } = params;
+      return httpList({
+        ...rest,
+        isChild: 1,
+        supplierNo: companyNo,
+        cgd_supplierNo: supplierNo,
+        noRela: true
+      })
+    }
   }
 };
 

src/views/supplyInvoiceSaleSettings/supplyConsultingChildCost/config/search.config.ts

@@ -18,7 +18,7 @@ const searchFormConfig: FormConfig = {
     },
     {
       field: "companyNo",
-      type: "business-query"
+      type: "supplier-query"
     },
     {
       field: "status",