1、优化table，新增分页

2、增加不需要价格表条件的物料选择

JLHWEB/src/api/interface/index.ts

@@ -1070,60 +1070,40 @@ export namespace Basicinfo {
   export interface ResDelUserList {
     useridList: number[];
   }
-  export interface ReqSaveBedNetType {
-    bednet: any;
+  export interface ReqDeleteBasicinfo {
+    list: any[];
   }
-  export interface ResSaveBedNetType {}
-  export interface ReqDeleteBedNetType {
+  export interface ResDeleteBasicinfo {
+
+  }
+  export interface ReqBanBasicinfo {
     list: any[];
+    type: Number;
+  }
+  export interface ResBanBasicinfo {
+  }
+  export interface ReqSaveBedNetType {
+    bednet: any;
   }
-  export interface ResDeleteBedNetType {}
   export interface ReqSaveMattressType {
     mattress: any;
   }
-  export interface ResSaveMattressType {}
-  export interface ReqDeleteMattressType {
-    list: any[];
-  }
-  export interface ResDeleteMattressType {}
   export interface ReqSaveMattressFormula {
     mattress: any;
   }
-  export interface ResSaveMattressFormula {}
-  export interface ReqDeleteMattressFormula {
-    list: any[];
-  }
-  export interface ResDeleteMattressFormula {}
   export interface ReqSaveShrinkage {
     shrinkage: any;
   }
-  export interface ResSaveShrinkage {}
-  export interface ReqDeleteShrinkage {
-    list: any[];
-  }
-  export interface ResDeleteShrinkage {}
-
   export interface ReqSaveSpring {
     spring: any;
   }
-  export interface ResSaveSpring {}
-  export interface ReqDeleteSpring {
-    list: any[];
-  }
-  export interface ResDeleteSpring {}
   export interface ReqAuditSpring {
     list: any[];
     type: number;
   }
-  export interface ResAuditSpring {}
   export interface ReqSaveBedNetVar {
     bednetvar: any;
   }
-  export interface ResSaveBedNetVar {}
-  export interface ReqDeleteBedNetVar {
-    list: any[];
-  }
-  export interface ResDeleteBedNetVar {}
   export interface ResGetMtrlTypeList {
     list: any[];
     reList: any[];
@@ -1131,69 +1111,18 @@ export namespace Basicinfo {
   export interface ReqSaveMtrlType {
     mtrltype: any;
   }
-  export interface ResSaveMtrlType {}
-  export interface ReqDeleteMtrlType {
-    list: any[];
-  }
-  export interface ResDeleteMtrlType {}
   export interface ReqSaveMtrlDef {
     mtrldef: any;
   }
-  export interface ResSaveMtrlDef {}
-  export interface ReqDeleteMtrlDef {
-    list: any[];
-  }
-  export interface ResDeleteMtrlDef {}
-  export interface ReqBanMtrlDef {
-    list: any[];
-    type: Number;
-  }
-  export interface ResBanMtrlDef {}
   export interface ReqSaveMultiPrice {
     price: any;
   }
-  export interface ResSaveMultiPrice {}
-  export interface ReqDeleteMultiPrice {
-    list: any[];
-  }
-  export interface ResDeleteMultiPrice {}
-  export interface ReqBanMultiPrice {
-    list: any[];
-    type: Number;
-  }
-  export interface ResBanMultiPrice {}
   export interface ReqSaveBedNetArea {
     area: any;
   }
-  export interface ResSaveBedNetArea {}
-  export interface ReqDeleteBedNetArea {
-    list: any[];
-  }
-  export interface ResDeleteBedNetArea {}
-  export interface ReqSaveConfigureType {
-    area: any;
-  }
-  export interface ResSaveConfigureType {}
-  export interface ReqDeleteConfigureType {
-    list: any[];
-  }
-  export interface ResDeleteConfigureType {}
-  export interface ReqSaveConfigureCode {
-    area: any;
-  }
-  export interface ResSaveConfigureCode {}
-  export interface ReqDeleteConfigureCode {
-    list: any[];
-  }
-  export interface ResDeleteConfigureCode {}
-  export interface ReqSaveConfigureCodeMx {
-    area: any;
-  }
-  export interface ResSaveConfigureCodeMx {}
-  export interface ReqDeleteConfigureCodeMx {
-    list: any[];
+  export interface ReqSaveConfigure {
+    configure: any;
   }
-  export interface ResDeleteConfigureCodeMx {}
 }
 
 export namespace SalePrice {

JLHWEB/src/api/modules/basicinfo.ts

@@ -30,8 +30,8 @@ export const getBedNetTypeList = (params: any) => {
   let newParams: any = {};
   newParams.dsname = "web_bednet_typelist";
   newParams.queryparams = params;
-  newParams.pageNum && (newParams.pageindex = params.pageNum);
-  newParams.pageSize && (newParams.pagesize = params.pageSize);
+  params.pageNum && (newParams.pageindex = params.pageNum);
+  params.pageSize && (newParams.pagesize = params.pageSize);
   delete params.pageNum;
   delete params.pageSize;
   return CommonDynamicSelect(newParams, "web_bednet_typelist");
@@ -41,14 +41,14 @@ export const getBedNetTypeList = (params: any) => {
  * @name 保存 床网类别定义
  */
 export const SaveBedNetType = (params: Basicinfo.ReqSaveBedNetType) => {
-  return http.post<Basicinfo.ResSaveBedNetType>(PORT1 + `/SaveBedNetType`, params);
+  return http.post(PORT1 + `/SaveBedNetType`, params);
 };
 
 /**
  * @name 删除 床网类别定义
  */
-export const DeleteBedNetType = (params: Basicinfo.ReqDeleteBedNetType) => {
-  return http.post<Basicinfo.ResDeleteBedNetType>(PORT1 + `/DeleteBedNetType`, params);
+export const DeleteBedNetType = (params: Basicinfo.ReqDeleteBasicinfo) => {
+  return http.post<Basicinfo.ResDeleteBasicinfo>(PORT1 + `/DeleteBedNetType`, params);
 };
 
 /**
@@ -58,8 +58,8 @@ export const getMattressTypeList = (params: any) => {
   let newParams: any = {};
   newParams.dsname = "web_mattress_typelist";
   newParams.queryparams = params;
-  newParams.pageNum && (newParams.pageindex = params.pageNum);
-  newParams.pageSize && (newParams.pagesize = params.pageSize);
+  params.pageNum && (newParams.pageindex = params.pageNum);
+  params.pageSize && (newParams.pagesize = params.pageSize);
   delete params.pageNum;
   delete params.pageSize;
   return CommonDynamicSelect(newParams, "web_mattress_typelist");
@@ -69,14 +69,14 @@ export const getMattressTypeList = (params: any) => {
  * @name 保存 床垫类别定义
  */
 export const SaveMattressType = (params: Basicinfo.ReqSaveMattressType) => {
-  return http.post<Basicinfo.ResSaveMattressType>(PORT1 + `/SaveMattressType`, params);
+  return http.post(PORT1 + `/SaveMattressType`, params);
 };
 
 /**
  * @name 删除 床垫类别定义
  */
-export const DeleteMattressType = (params: Basicinfo.ReqDeleteMattressType) => {
-  return http.post<Basicinfo.ResDeleteMattressType>(PORT1 + `/SaveMattressType`, params);
+export const DeleteMattressType = (params: Basicinfo.ReqDeleteBasicinfo) => {
+  return http.post<Basicinfo.ResDeleteBasicinfo>(PORT1 + `/SaveMattressType`, params);
 };
 
 /**
@@ -86,8 +86,8 @@ export const getMattressFormulaList = (params: any) => {
   let newParams: any = {};
   newParams.dsname = "web_mattress_formulalist";
   newParams.queryparams = params;
-  newParams.pageNum && (newParams.pageindex = params.pageNum);
-  newParams.pageSize && (newParams.pagesize = params.pageSize);
+  params.pageNum && (newParams.pageindex = params.pageNum);
+  params.pageSize && (newParams.pagesize = params.pageSize);
   delete params.pageNum;
   delete params.pageSize;
   return CommonDynamicSelect(newParams, "web_mattress_formulalist");
@@ -97,14 +97,14 @@ export const getMattressFormulaList = (params: any) => {
  * @name 保存 床垫公式定义
  */
 export const SaveMattressFormula = (params: Basicinfo.ReqSaveMattressFormula) => {
-  return http.post<Basicinfo.ResSaveMattressFormula>(PORT1 + `/SaveMattressFormula`, params);
+  return http.post(PORT1 + `/SaveMattressFormula`, params);
 };
 
 /**
  * @name 删除 床垫公式定义
  */
-export const DeleteMattressFormula = (params: Basicinfo.ReqDeleteMattressFormula) => {
-  return http.post<Basicinfo.ResDeleteMattressFormula>(PORT1 + `/DeleteMattressFormula`, params);
+export const DeleteMattressFormula = (params: Basicinfo.ReqDeleteBasicinfo) => {
+  return http.post<Basicinfo.ResDeleteBasicinfo>(PORT1 + `/DeleteMattressFormula`, params);
 };
 
 /**
@@ -114,8 +114,8 @@ export const getShrinkageList = (params: any) => {
   let newParams: any = {};
   newParams.dsname = "web_shrinkagelist";
   newParams.queryparams = params;
-  newParams.pageNum && (newParams.pageindex = params.pageNum);
-  newParams.pageSize && (newParams.pagesize = params.pageSize);
+  params.pageNum && (newParams.pageindex = params.pageNum);
+  params.pageSize && (newParams.pagesize = params.pageSize);
   delete params.pageNum;
   delete params.pageSize;
   return CommonDynamicSelect(newParams, "web_shrinkagelist");
@@ -125,14 +125,14 @@ export const getShrinkageList = (params: any) => {
  * @name 保存 裥棉收缩率
  */
 export const SaveShrinkage = (params: Basicinfo.ReqSaveShrinkage) => {
-  return http.post<Basicinfo.ResSaveShrinkage>(PORT1 + `/SaveShrinkage`, params);
+  return http.post(PORT1 + `/SaveShrinkage`, params);
 };
 
 /**
  * @name 删除 裥棉收缩率
  */
-export const DeleteShrinkage = (params: Basicinfo.ReqDeleteShrinkage) => {
-  return http.post<Basicinfo.ResDeleteShrinkage>(PORT1 + `/DeleteShrinkage`, params);
+export const DeleteShrinkage = (params: Basicinfo.ReqDeleteBasicinfo) => {
+  return http.post<Basicinfo.ResDeleteBasicinfo>(PORT1 + `/DeleteShrinkage`, params);
 };
 
 /**
@@ -142,8 +142,8 @@ export const getSpringList = (params: any) => {
   let newParams: any = {};
   newParams.dsname = "web_springlist";
   newParams.queryparams = params;
-  newParams.pageNum && (newParams.pageindex = params.pageNum);
-  newParams.pageSize && (newParams.pagesize = params.pageSize);
+  params.pageNum && (newParams.pageindex = params.pageNum);
+  params.pageSize && (newParams.pagesize = params.pageSize);
   delete params.pageNum;
   delete params.pageSize;
   return CommonDynamicSelect(newParams, "web_springlist");
@@ -153,21 +153,21 @@ export const getSpringList = (params: any) => {
  * @name 保存 弹簧资料
  */
 export const SaveSpring = (params: Basicinfo.ReqSaveSpring) => {
-  return http.post<Basicinfo.ResSaveSpring>(PORT1 + `/SaveSpring`, params);
+  return http.post(PORT1 + `/SaveSpring`, params);
 };
 
 /**
  * @name 删除 弹簧资料
  */
-export const DeleteSpring = (params: Basicinfo.ReqDeleteSpring) => {
-  return http.post<Basicinfo.ResDeleteSpring>(PORT1 + `/DeleteSpring`, params);
+export const DeleteSpring = (params: Basicinfo.ReqDeleteBasicinfo) => {
+  return http.post<Basicinfo.ResDeleteBasicinfo>(PORT1 + `/DeleteSpring`, params);
 };
 
 /**
  * @name 审核 弹簧资料
  */
 export const AuditSpring = (params: Basicinfo.ReqAuditSpring) => {
-  return http.post<Basicinfo.ResAuditSpring>(PORT1 + `/AuditSpring`, params);
+  return http.post(PORT1 + `/AuditSpring`, params);
 };
 
 /**
@@ -177,8 +177,8 @@ export const getBedNetVarList = (params: any) => {
   let newParams: any = {};
   newParams.dsname = "web_bednetvarlist";
   newParams.queryparams = params;
-  newParams.pageNum && (newParams.pageindex = params.pageNum);
-  newParams.pageSize && (newParams.pagesize = params.pageSize);
+  params.pageNum && (newParams.pageindex = params.pageNum);
+  params.pageSize && (newParams.pagesize = params.pageSize);
   delete params.pageNum;
   delete params.pageSize;
   return CommonDynamicSelect(newParams, "web_bednetvarlist");
@@ -191,8 +191,8 @@ export const getBedNetVarMxList = (params: any) => {
   let newParams: any = {};
   newParams.dsname = "web_bednetvarmxlist";
   newParams.queryparams = params;
-  newParams.pageNum && (newParams.pageindex = params.pageNum);
-  newParams.pageSize && (newParams.pagesize = params.pageSize);
+  params.pageNum && (newParams.pageindex = params.pageNum);
+  params.pageSize && (newParams.pagesize = params.pageSize);
   delete params.pageNum;
   delete params.pageSize;
   return CommonDynamicSelect(newParams, "web_bednetvarmxlist");
@@ -212,14 +212,14 @@ export const getBedNetVarMxNewList = (params: any) => {
  * @name 保存 床网/床垫变量定义
  */
 export const SaveBedNetVar = (params: Basicinfo.ReqSaveBedNetVar) => {
-  return http.post<Basicinfo.ResSaveBedNetVar>(PORT1 + `/SaveBedNetVar`, params);
+  return http.post(PORT1 + `/SaveBedNetVar`, params);
 };
 
 /**
  * @name 删除 床网/床垫变量定义
  */
-export const DeleteBedNetVar = (params: Basicinfo.ReqDeleteBedNetVar) => {
-  return http.post<Basicinfo.ResDeleteBedNetVar>(PORT1 + `/DeleteBedNetVar`, params);
+export const DeleteBedNetVar = (params: Basicinfo.ReqDeleteBasicinfo) => {
+  return http.post<Basicinfo.ResDeleteBasicinfo>(PORT1 + `/DeleteBedNetVar`, params);
 };
 
 /**
@@ -233,14 +233,14 @@ export const getMtrlType = () => {
  * @name 保存 物料类别定义
  */
 export const SaveMtrlType = (params: Basicinfo.ReqSaveMtrlType) => {
-  return http.post<Basicinfo.ResSaveMtrlType>(PORT1 + `/SaveMtrlType`, params);
+  return http.post(PORT1 + `/SaveMtrlType`, params);
 };
 
 /**
  * @name 删除 物料类别定义
  */
-export const DeleteMtrlType = (params: Basicinfo.ReqDeleteMtrlType) => {
-  return http.post<Basicinfo.ResDeleteMtrlType>(PORT1 + `/DeleteMtrlType`, params);
+export const DeleteMtrlType = (params: Basicinfo.ReqDeleteBasicinfo) => {
+  return http.post<Basicinfo.ResDeleteBasicinfo>(PORT1 + `/DeleteMtrlType`, params);
 };
 
 /**
@@ -250,8 +250,8 @@ export const getMtrlDefList = (params: any) => {
   let newParams: any = {};
   newParams.dsname = "web_mtrldeflist";
   newParams.queryparams = params;
-  newParams.pageNum && (newParams.pageindex = params.pageNum);
-  newParams.pageSize && (newParams.pagesize = params.pageSize);
+  params.pageNum && (newParams.pageindex = params.pageNum);
+  params.pageSize && (newParams.pagesize = params.pageSize);
   delete params.pageNum;
   delete params.pageSize;
   return CommonDynamicSelect(newParams, "web_mtrldeflist");
@@ -261,21 +261,21 @@ export const getMtrlDefList = (params: any) => {
  * @name 保存 物料资料定义
  */
 export const SaveMtrlDef = (params: Basicinfo.ReqSaveMtrlDef) => {
-  return http.post<Basicinfo.ResSaveMtrlDef>(PORT1 + `/SaveMtrlDef`, params);
+  return http.post(PORT1 + `/SaveMtrlDef`, params);
 };
 
 /**
- * @name 删除 物料资料定义x
+ * @name 删除 物料资料定义
  */
-export const DeleteMtrlDef = (params: Basicinfo.ReqDeleteMtrlDef) => {
-  return http.post<Basicinfo.ResDeleteMtrlDef>(PORT1 + `/DeleteMtrlDef`, params);
+export const DeleteMtrlDef = (params: Basicinfo.ReqDeleteBasicinfo) => {
+  return http.post<Basicinfo.ResDeleteBasicinfo>(PORT1 + `/DeleteMtrlDef`, params);
 };
 
 /**
  * @name 禁用 物料资料定义
  */
-export const BanMtrlDef = (params: Basicinfo.ReqBanMtrlDef) => {
-  return http.post<Basicinfo.ResBanMtrlDef>(PORT1 + `/BanMtrlDef`, params);
+export const BanMtrlDef = (params: Basicinfo.ReqBanBasicinfo) => {
+  return http.post<Basicinfo.ResBanBasicinfo>(PORT1 + `/BanMtrlDef`, params);
 };
 
 /**
@@ -285,8 +285,8 @@ export const getMtrlPriceList = (params: any) => {
   let newParams: any = {};
   newParams.dsname = "web_mtrl_price_pricelist";
   newParams.queryparams = params;
-  newParams.pageNum && (newParams.pageindex = params.pageNum);
-  newParams.pageSize && (newParams.pagesize = params.pageSize);
+  params.pageNum && (newParams.pageindex = params.pageNum);
+  params.pageSize && (newParams.pagesize = params.pageSize);
   delete params.pageNum;
   delete params.pageSize;
   return CommonDynamicSelect(newParams, "web_mtrl_price_pricelist");
@@ -299,8 +299,8 @@ export const getMtrlPriceNewList = (params: any) => {
   let newParams: any = {};
   newParams.dsname = "web_mtrl_price_price_newlist";
   newParams.queryparams = params;
-  newParams.pageNum && (newParams.pageindex = params.pageNum);
-  newParams.pageSize && (newParams.pagesize = params.pageSize);
+  params.pageNum && (newParams.pageindex = params.pageNum);
+  params.pageSize && (newParams.pagesize = params.pageSize);
   delete params.pageNum;
   delete params.pageSize;
   return CommonDynamicSelect(newParams, "web_mtrl_price_price_newlist");
@@ -313,8 +313,8 @@ export const getMultiPriceList = (params: any) => {
   let newParams: any = {};
   newParams.dsname = "web_multipricelist";
   newParams.queryparams = params;
-  newParams.pageNum && (newParams.pageindex = params.pageNum);
-  newParams.pageSize && (newParams.pagesize = params.pageSize);
+  params.pageNum && (newParams.pageindex = params.pageNum);
+  params.pageSize && (newParams.pagesize = params.pageSize);
   delete params.pageNum;
   delete params.pageSize;
   return CommonDynamicSelect(newParams, "web_multipricelist");
@@ -324,21 +324,21 @@ export const getMultiPriceList = (params: any) => {
  * @name 保存 多维度定价
  */
 export const SaveMultiPrice = (params: Basicinfo.ReqSaveMultiPrice) => {
-  return http.post<Basicinfo.ResSaveMultiPrice>(PORT1 + `/SaveMultiPrice`, params);
+  return http.post(PORT1 + `/SaveMultiPrice`, params);
 };
 
 /**
  * @name 删除 多维度定价
  */
-export const DeleteMultiPrice = (params: Basicinfo.ReqDeleteMultiPrice) => {
-  return http.post<Basicinfo.ResDeleteMultiPrice>(PORT1 + `/DeleteMultiPrice`, params);
+export const DeleteMultiPrice = (params: Basicinfo.ReqDeleteBasicinfo) => {
+  return http.post<Basicinfo.ResDeleteBasicinfo>(PORT1 + `/DeleteMultiPrice`, params);
 };
 
 /**
  * @name 禁用 多维度定价
  */
-export const BanMultiPrice = (params: Basicinfo.ReqBanMultiPrice) => {
-  return http.post<Basicinfo.ResBanMultiPrice>(PORT1 + `/BanMultiPrice`, params);
+export const BanMultiPrice = (params: Basicinfo.ReqBanBasicinfo) => {
+  return http.post<Basicinfo.ResBanBasicinfo>(PORT1 + `/BanMultiPrice`, params);
 };
 
 /**
@@ -348,8 +348,8 @@ export const getBedNetAreaList = (params: any) => {
   let newParams: any = {};
   newParams.dsname = "web_bednet_arealist";
   newParams.queryparams = params;
-  newParams.pageNum && (newParams.pageindex = params.pageNum);
-  newParams.pageSize && (newParams.pagesize = params.pageSize);
+  params.pageNum && (newParams.pageindex = params.pageNum);
+  params.pageSize && (newParams.pagesize = params.pageSize);
   delete params.pageNum;
   delete params.pageSize;
   return CommonDynamicSelect(newParams, "web_bednet_arealist");
@@ -359,14 +359,14 @@ export const getBedNetAreaList = (params: any) => {
  * @name 保存 床网分区定义
  */
 export const SaveBedNetArea = (params: Basicinfo.ReqSaveBedNetArea) => {
-  return http.post<Basicinfo.ResSaveBedNetArea>(PORT1 + `/SaveBedNetArea`, params);
+  return http.post(PORT1 + `/SaveBedNetArea`, params);
 };
 
 /**
  * @name 删除 床网分区定义
  */
-export const DeleteBedNetArea = (params: Basicinfo.ReqDeleteBedNetArea) => {
-  return http.post<Basicinfo.ResDeleteBedNetArea>(PORT1 + `/DeleteBedNetArea`, params);
+export const DeleteBedNetArea = (params: Basicinfo.ReqDeleteBasicinfo) => {
+  return http.post<Basicinfo.ResDeleteBasicinfo>(PORT1 + `/DeleteBedNetArea`, params);
 };
 
 /**
@@ -376,8 +376,8 @@ export const getConfigureTypeList = (params: any) => {
   let newParams: any = {};
   newParams.dsname = "web_configure_typelist";
   newParams.queryparams = params;
-  newParams.pageNum && (newParams.pageindex = params.pageNum);
-  newParams.pageSize && (newParams.pagesize = params.pageSize);
+  params.pageNum && (newParams.pageindex = params.pageNum);
+  params.pageSize && (newParams.pagesize = params.pageSize);
   delete params.pageNum;
   delete params.pageSize;
   return CommonDynamicSelect(newParams, "web_configure_typelist");
@@ -386,15 +386,15 @@ export const getConfigureTypeList = (params: any) => {
 /**
  * @name 保存 部件选配类型
  */
-export const SaveConfigureType = (params: Basicinfo.ReqSaveConfigureType) => {
-  return http.post<Basicinfo.ResSaveConfigureType>(PORT1 + `/SaveConfigureType`, params);
+export const SaveConfigureType = (params: Basicinfo.ReqSaveConfigure) => {
+  return http.post(PORT1 + `/SaveConfigureType`, params);
 };
 
 /**
  * @name 删除 部件选配类型
  */
-export const DeleteConfigureType = (params: Basicinfo.ReqDeleteConfigureType) => {
-  return http.post<Basicinfo.ResDeleteConfigureType>(PORT1 + `/DeleteConfigureType`, params);
+export const DeleteConfigureType = (params: Basicinfo.ReqDeleteBasicinfo) => {
+  return http.post<Basicinfo.ResDeleteBasicinfo>(PORT1 + `/DeleteConfigureType`, params);
 };
 
 /**
@@ -404,8 +404,8 @@ export const getConfigureCodeList = (params: any) => {
   let newParams: any = {};
   newParams.dsname = "web_configure_codelist";
   newParams.queryparams = params;
-  newParams.pageNum && (newParams.pageindex = params.pageNum);
-  newParams.pageSize && (newParams.pagesize = params.pageSize);
+  params.pageNum && (newParams.pageindex = params.pageNum);
+  params.pageSize && (newParams.pagesize = params.pageSize);
   delete params.pageNum;
   delete params.pageSize;
   return CommonDynamicSelect(newParams, "web_configure_codelist");
@@ -414,15 +414,15 @@ export const getConfigureCodeList = (params: any) => {
 /**
  * @name 保存 部件选配项
  */
-export const SaveConfigureCode = (params: Basicinfo.ReqSaveConfigureCode) => {
-  return http.post<Basicinfo.ResSaveConfigureCode>(PORT1 + `/SaveConfigureCode`, params);
+export const SaveConfigureCode = (params: Basicinfo.ReqSaveConfigure) => {
+  return http.post(PORT1 + `/SaveConfigureCode`, params);
 };
 
 /**
  * @name 删除 部件选配项
  */
-export const DeleteConfigureCode = (params: Basicinfo.ReqDeleteConfigureCode) => {
-  return http.post<Basicinfo.ResDeleteConfigureCode>(PORT1 + `/DeleteConfigureCode`, params);
+export const DeleteConfigureCode = (params: Basicinfo.ReqDeleteBasicinfo) => {
+  return http.post<Basicinfo.ResDeleteBasicinfo>(PORT1 + `/DeleteConfigureCode`, params);
 };
 
 /**
@@ -432,8 +432,8 @@ export const getConfigureCodeMxList = (params: any) => {
   let newParams: any = {};
   newParams.dsname = "web_configure_codemxlist";
   newParams.queryparams = params;
-  newParams.pageNum && (newParams.pageindex = params.pageNum);
-  newParams.pageSize && (newParams.pagesize = params.pageSize);
+  params.pageNum && (newParams.pageindex = params.pageNum);
+  params.pageSize && (newParams.pagesize = params.pageSize);
   delete params.pageNum;
   delete params.pageSize;
   return CommonDynamicSelect(newParams, "web_configure_codemxlist");
@@ -442,13 +442,13 @@ export const getConfigureCodeMxList = (params: any) => {
 /**
  * @name 保存 部件选配项值
  */
-export const SaveConfigureCodeMx = (params: Basicinfo.ReqSaveConfigureCodeMx) => {
-  return http.post<Basicinfo.ResSaveConfigureCodeMx>(PORT1 + `/SaveConfigureCodeMx`, params);
+export const SaveConfigureCodeMx = (params: Basicinfo.ReqSaveConfigure) => {
+  return http.post(PORT1 + `/SaveConfigureCodeMx`, params);
 };
 
 /**
  * @name 删除 部件选配项值
  */
-export const DeleteConfigureCodeMx = (params: Basicinfo.ReqDeleteConfigureCodeMx) => {
-  return http.post<Basicinfo.ResDeleteConfigureCodeMx>(PORT1 + `/DeleteConfigureCodeMx`, params);
+export const DeleteConfigureCodeMx = (params: Basicinfo.ReqDeleteBasicinfo) => {
+  return http.post<Basicinfo.ResDeleteBasicinfo>(PORT1 + `/DeleteConfigureCodeMx`, params);
 };

JLHWEB/src/views/baseinfo/bednetarea/index.vue

@@ -10,6 +10,7 @@
       :table-props="tableProps"
       :table-events="tableEvents"
       :auto-load-layout="false"
+      pagination
     >
       <!-- 表格 header 按钮 -->
       <template #tableHeader>

JLHWEB/src/views/baseinfo/bednettype/index.vue

@@ -10,6 +10,7 @@
       :table-props="tableProps"
       :table-events="tableEvents"
       :auto-load-layout="false"
+      pagination
     >
       <!-- 表格 header 按钮 -->
       <template #tableHeader>

JLHWEB/src/views/baseinfo/bednetvar/index.vue

@@ -12,6 +12,7 @@
         :table-events="tableEvents"
         :init-param="initParams"
         :auto-load-layout="false"
+        pagination
       >
         <!-- 表格 header 按钮 -->
         <template #tableHeader>
@@ -27,7 +28,7 @@
       </LjVxeTable>
     </div>
     <template #right>
-      <el-scrollbar ref="DetailScrollBarRef">
+      <div class="main-box flx-col">
         <LjVxeTable
           row-key="varmxid"
           :columns="columns_mx"
@@ -38,9 +39,11 @@
           :table-props="tableMxProps"
           :auto-load-layout="false"
           :collapse-buttons="true"
+          pagination
+          :table-button="[]"
         >
         </LjVxeTable>
-      </el-scrollbar>
+      </div>
     </template>
   </LjFoldLayout>
 
@@ -90,8 +93,9 @@ const tableProps = {
   // }
 };
 const tableMxProps = {
-  height: "",
-  minHeight: "300px"
+  // height: "",
+  // minHeight: "300px"
+  height: "auto"
   // editConfig: { trigger: "click", mode: "cell" }
   // rowClassName: rowClsNameFunc
   // exportConfig: {

JLHWEB/src/views/baseinfo/configure/index.vue

@@ -13,6 +13,7 @@
             :table-props="tableProps"
             :table-events="tableEvents_left"
             :auto-load-layout="false"
+            pagination
           >
             <!-- 表格 header 按钮 -->
             <template #tableHeader>
@@ -37,6 +38,7 @@
           :table-events="tableEvents_mid"
           :init-param="initParams_mid"
           :auto-load-layout="false"
+          pagination
         >
           <!-- 表格 header 按钮 -->
           <template #tableHeader>
@@ -61,6 +63,7 @@
             :table-events="tableEvents_right"
             :init-param="initParams_right"
             :auto-load-layout="false"
+            pagination
           >
             <!-- 表格 header 按钮 -->
             <template #tableHeader>

JLHWEB/src/views/baseinfo/mattressformula/detail.vue

@@ -8,6 +8,7 @@
     :init-param="mainData[0]"
     :if-fold-layout="false"
     :if-layout-editable="false"
+    :if-baisc-editable="false"
     :search-col="{ xs: 6, sm: 6, md: 6, lg: 6, xl: 6 }"
     :basic-group-col="{ xs: 6, sm: 6, md: 6, lg: 6, xl: 6 }"
     :enum="props.enum"
@@ -26,7 +27,7 @@ import { DetailProp } from "@/components/LjDetail/interface";
 import { useI18n } from "vue-i18n";
 import { useHooks } from "./hooks/index";
 import { useAuthButtons } from "@/hooks/useAuthButtons";
-import MtrldefDialog from "@/views/system/selector/mtrldef/index.vue";
+import MtrldefDialog from "@/views/system/selector/mtrldefNoPrice/index.vue";
 
 interface detailProp {
   /**

JLHWEB/src/views/baseinfo/mattressformula/hooks/index.tsx

@@ -2,7 +2,7 @@ import { ref, reactive, computed, toRefs, nextTick } from "vue";
 import { Table } from "@/hooks/interface";
 import { ColumnProps } from "@/components/LjVxeTable/interface";
 import { ALLOW_EDIT_STATE } from "@/config/index";
-import MtrldefSelect from "@/views/system/selector/mtrldef/select.vue";
+import MtrldefSelect from "@/views/system/selector/mtrldefNoPrice/select.vue";
 import { SaveMattressFormula, DeleteMattressFormula } from "@/api/modules/basicinfo";
 import { ElMessage, ElMessageBox } from "element-plus";
 import { useHooks as useHooks_mtrltype } from "@/views/baseinfo/mtrltype/hooks/index";

JLHWEB/src/views/baseinfo/mattressformula/index.vue

@@ -10,6 +10,7 @@
       :table-props="tableProps"
       :table-events="tableEvents"
       :auto-load-layout="false"
+      pagination
     >
       <!-- 表格 header 按钮 -->
       <template #tableHeader>

JLHWEB/src/views/baseinfo/mattresstype/detail.vue

@@ -8,6 +8,7 @@
     :init-param="mainData[0]"
     :if-fold-layout="false"
     :if-layout-editable="false"
+    :if-baisc-editable="false"
     :search-col="{ xs: 6, sm: 6, md: 6, lg: 6, xl: 6 }"
     :basic-group-col="{ xs: 6, sm: 6, md: 6, lg: 6, xl: 6 }"
     :enum="props.enum"

JLHWEB/src/views/baseinfo/mattresstype/index.vue

@@ -10,6 +10,7 @@
       :table-props="tableProps"
       :table-events="tableEvents"
       :auto-load-layout="false"
+      pagination
     >
       <!-- 表格 header 按钮 -->
       <template #tableHeader>

JLHWEB/src/views/baseinfo/mtrldef/detail.vue

@@ -8,6 +8,7 @@
     :init-param="mainData[0]"
     :if-fold-layout="false"
     :if-layout-editable="false"
+    :if-baisc-editable="false"
     :search-col="{ xs: 4, sm: 4, md: 4, lg: 4, xl: 4 }"
     :basic-group-col="{ xs: 4, sm: 4, md: 4, lg: 4, xl: 4 }"
     :enum="props.enum"

JLHWEB/src/views/baseinfo/mtrldef/hooks/index.tsx

@@ -156,7 +156,7 @@ export const useHooks = (t?: any) => {
         { label: "公式单价", value: "1" }
       ],
       editRender: {
-        name: "$select",
+        name: "VxeSelect",
         options: [
           { label: "直接单价", value: "0" },
           { label: "公式单价", value: "1" }

JLHWEB/src/views/baseinfo/mtrldef/index.vue

@@ -24,6 +24,7 @@
           :table-events="tableEvents"
           :init-param="initParams"
           :auto-load-layout="false"
+          pagination
         >
           <!-- 表格 header 按钮 -->
           <template #tableHeader>

JLHWEB/src/views/baseinfo/mutilprice/index.vue

@@ -10,6 +10,7 @@
       :table-props="tableProps"
       :table-events="tableEvents"
       :auto-load-layout="false"
+      pagination
     >
       <!-- 表格 header 按钮 -->
       <template #tableHeader>

JLHWEB/src/views/baseinfo/shrinkage/index.vue

@@ -10,6 +10,7 @@
       :table-props="tableProps"
       :table-events="tableEvents"
       :auto-load-layout="false"
+      pagination
     >
       <!-- 表格 header 按钮 -->
       <template #tableHeader>
@@ -36,7 +37,7 @@
     </template>
     <div class="flx-1 h-full">
       <LjHeaderMenu :data="mainData" :action="orderStatus ? orderEditAction : orderDefaultAction" />
-      <Detail class="flx-1" :data="mainData" :status="orderStatus" :enum="enumMap" />
+      <!-- <Detail class="flx-1" :data="mainData" :status="orderStatus" :enum="enumMap" /> -->
     </div>
   </LjDialog>
 </template>

JLHWEB/src/views/baseinfo/spring/index.vue

@@ -10,6 +10,7 @@
       :table-props="tableProps"
       :table-events="tableEvents"
       :auto-load-layout="false"
+      pagination
     >
       <!-- 表格 header 按钮 -->
       <template #tableHeader>

JLHWEB/src/views/saleprice/dept/index.vue

@@ -10,6 +10,7 @@
       :table-props="tableProps"
       :table-events="tableEvents"
       :auto-load-layout="false"
+      pagination
     >
       <!-- 表格 header 按钮 -->
       <template #tableHeader>

JLHWEB/src/views/saleprice/profitrate/index.vue

@@ -11,6 +11,7 @@
       :table-props="tableProps"
       :table-events="tableEvents"
       :auto-load-layout="false"
+      pagination
     >
       <template #tableHeader>
         <el-tabs v-model="initParams.kind" class="tableheader-tabs">

JLHWEB/src/views/saleprice/workmanship/index.vue

@@ -10,6 +10,7 @@
       :table-props="tableProps"
       :table-events="tableEvents"
       :auto-load-layout="false"
+      pagination
     >
       <!-- 表格 header 按钮 -->
       <template #tableHeader>

JLHWEB/src/views/system/selector/mtrldefNoPrice/hooks/index.ts

@@ -0,0 +1,54 @@
+import { ColumnProps, SearchProps } from "@/components/LjVxeTable/interface";
+import type { uSale } from "@/typings/modules/sale";
+import { Table } from "@/hooks/interface/index";
+import { useUserStore } from "@/stores/modules/user";
+
+export const useOutrep = (t: any) => {
+  // 表格配置项
+  const columns: ColumnProps<any>[] = [];
+
+  // {
+  //   field: "mtrlname"
+  //   title:"名称",
+  //   },
+  //   {
+  //   field: "thickness"
+  //   title:"厚度",
+  //   },
+  //   {
+  //   field: "priceunit"
+  //   title:"单位",
+  //   },
+  //   {
+  //   field: "pricelistprice"
+  //   title:"单价",
+  //   },
+  //   {
+  //   field: "dscrp"
+  //   title:"备注"
+  //   },
+  //   {
+  //   field: "erp_mtrlcode"
+  //   title:"L1编码",
+  //   },
+  //   {
+  //   field: "erp_mtrlname"
+  //   title:"L1名称",
+  //   },
+  //   {
+  //   field: "erp_mtrlmode"
+  //   title:"L1规格",
+  //   },
+  //   {
+  //   field: "erp_unit"
+  //   title:"L1单位",
+  //   },
+  //   {
+  //   field: "erp_mtrlengname",
+  //   title: "L1英文名称"
+  //   },
+
+  return {
+    columns
+  };
+};

JLHWEB/src/views/system/selector/mtrldefNoPrice/index.vue

@@ -0,0 +1,222 @@
+<template>
+  <LjSelector
+    ref="LjSelectorRef"
+    :title="`${$t('business.selector.mtrlprice.title')} ${subtitle ? '(' + subtitle + ')' : ''}`"
+    v-model:value="selectList"
+    v-bind="$attrs"
+    :item-key="TABLE_KEY"
+    :layout="layout"
+    @change-value="autoUpdateTableCheckbox"
+  >
+    <template #default>
+      <LjVxeTable
+        ref="LjTableRef"
+        table-cls=""
+        :columns="selColumns"
+        :request-api="getData"
+        :data-callback="dataCallback"
+        :init-param="initParams"
+        :dwname="DwnameEnum.mtrlPrice"
+        pagination
+        :search-col="tableSearchCol"
+        :table-events="tableEvents"
+        :table-props="tableProps"
+        :tool-button="['refresh', 'setting', 'search']"
+        :auto-load-layout="false"
+        collapse-buttons
+        :page-change-call-back="autoUpdateTableCheckbox"
+      >
+        <template #tableHeader>
+          <el-input
+            v-model="searchInput"
+            size="default"
+            class="mb-8"
+            :prefix-icon="Search"
+            clearable
+            @input="disshow"
+            @clear="() => disshow('')"
+            placeholder="物料名称/备注"
+          ></el-input>
+        </template>
+      </LjVxeTable>
+    </template>
+  </LjSelector>
+</template>
+
+<script lang="tsx" setup name="SelectorMtrldefDialog">
+import { reactive, toRefs, ref, onMounted, nextTick, inject, watch, computed } from "vue";
+// import LjDialog from "@/components/LjDialog/index.vue";
+// import LjFoldLayoutDouble from "@/components/LjFoldLayoutDouble/index.vue";
+import LjVxeTable from "@/components/LjVxeTable/index.vue";
+// 注意: 需要按需引入使用到的第三方UI组件
+// import { ElDialog, ElButton } from "element-plus";
+
+import { useOutrep } from "./hooks/index";
+import { useI18n } from "vue-i18n";
+import { DwnameEnum } from "@/enums/dwnameEnum";
+import { cloneDeep, pick, defaultsDeep } from "lodash-es";
+import { CommonDynamicSelect } from "@/api/modules/common";
+// import LjHeaderMenu from "@/components/LjHeaderMenu/index.vue";
+import { useAuthButtons } from "@/hooks/useAuthButtons";
+
+import LjSelector from "@/components/LjSelector/index.vue";
+import { throttle } from "lodash-es";
+import { Search } from "@element-plus/icons-vue";
+// import variables from "@/styles/js.module.scss";
+
+// const props = withDefaults(defineProps<{}>(), {});
+
+const { t } = useI18n();
+const { columns } = useOutrep(t);
+const selColumns: any = computed(() => {
+  // let selCol: any = { type: "checkbox", width: 50, fixed: "left" };
+  let selCol: any = { type: "radio", width: 50, fixed: "left" };
+  let _columns = cloneDeep(columns);
+  // console.log(" _columns.unshift(selCol); :>> ", _columns.unshift(selCol));
+  _columns.unshift(selCol);
+  console.log("_columns :>> ", _columns);
+  return _columns;
+});
+
+/**
+ * @description 已选列表
+ */
+const selectList = ref<any>([]);
+const TABLE_KEY = "mtrlid";
+const layout = { first: { left: { hidden: true } } };
+
+const LjSelectorRef = ref();
+const LjTableRef = ref();
+// const _variables: any = variables;
+const { CheckPower, CheckOption, buttonNew, buttonDefault } = useAuthButtons(t);
+
+const initParams = ref<any>({});
+const searchInput = ref("");
+const tableSearchCol = { xs: 4, sm: 5, md: 6, lg: 6, xl: 8 };
+const tableProps = {
+  height: "auto",
+  editConfig: { trigger: "click", mode: "cell" },
+  rowConfig: { isCurrent: true, isHover: true, useKey: true, keyField: TABLE_KEY }
+};
+
+const subtitle = ref("");
+
+/**
+ * @description 鼠标单击表格
+ */
+const handleClickTable = async ({ row, column, rowIndex }: any) => {
+  const $table = LjTableRef.value.element;
+  if ($table) {
+    selectList.value = [row];
+    $table.setRadioRow(row);
+  }
+};
+
+/**
+ * @description 鼠标双击表格
+ */
+const handleDBlClickTable = async ({ row, column, rowIndex }: any) => {
+  const $table = LjTableRef.value.element;
+  if ($table) {
+    selectList.value = [row];
+    $table.setRadioRow(row);
+
+    LjSelectorRef.value.funcSubmit();
+  }
+};
+
+// 返回绑定的事件
+const tableEvents = {
+  "cell-dblclick": handleDBlClickTable,
+  "cell-click": handleClickTable
+};
+
+// const selectedLayout = ref<any>({
+//   icon: "iconmove",
+//   header: [
+//     {
+//       value: "name",
+//       // icon: "iconuser-01",
+//       textClassName: "text-ellipsis-one2"
+//     },
+//     {
+//       value: "cuscode",
+//       // label: "描述",
+//       icon: "iconcode",
+//       textClassName: "text-ellipsis-one2"
+//     }
+//   ]
+//   // aside: {
+//   //   value: "cuscode"
+//   // }
+// });
+
+const dataCallback = (data: any) => {
+  console.log("data :>> ", data);
+  return {
+    list: data.datatable,
+    tableinfo: data.tableinfo,
+    total: data.totalcnt,
+    pageNum: data.pageindex,
+    pageSize: data.pagesize
+  };
+};
+
+const getData = (params: any) => {
+  // console.log("getData params :>> ", params);
+  let newParams: any = {};
+  params.pageNum && (newParams.pageindex = params.pageNum);
+  params.pageSize && (newParams.pagesize = params.pageSize);
+
+  delete params.pageNum;
+  delete params.pageSize;
+  newParams.queryParams = initParams.value;
+  console.log("params :>> ", newParams);
+  newParams.dsname = "web_mtrl_noprice_choose";
+  return CommonDynamicSelect(newParams, DwnameEnum.mtrlPrice);
+};
+
+const autoUpdateTableCheckbox = () => {
+  const $table = LjTableRef.value.element;
+  if ($table && selectList.value.length) {
+    console.log("autoUpdateTableCheckbox selectLst.value :>> ", selectList.value);
+    $table.clearCheckboxRow();
+    let _rows: any = [];
+    selectList.value.map((item: any) => {
+      if ($table.getRowById(item[TABLE_KEY])) {
+        _rows.push($table.getRowById(item[TABLE_KEY]));
+      }
+    });
+    _rows.length && $table.setCheckboxRow(_rows, true);
+  }
+};
+
+/**
+ * @description 打开组件
+ * @param params 入参
+ */
+const show = (params: any, label?: string) => {
+  selectList.value = [];
+  searchInput.value = "";
+
+  subtitle.value = label;
+
+  console.log("show bfff initParams.value :>> ", initParams.value, params);
+  initParams.value = defaultsDeep(params, initParams.value);
+  console.log("show afff initParams.value :>> ", initParams.value);
+  LjSelectorRef.value.show(initParams.value);
+};
+
+// 节流
+const disshow = throttle((val: any) => {
+  console.log("val :>> ", val);
+  // initParams.value = defaultsDeep({ keyword: val }, initParams.value);
+  initParams.value.keyword = val;
+
+  console.log("disshow initParams.value :>> ", initParams.value);
+}, 500);
+
+defineExpose({
+  show
+});
+</script>

JLHWEB/src/views/system/selector/mtrldefNoPrice/select.vue

@@ -0,0 +1,114 @@
+<template>
+  <LjSelectorSelect
+    ref="selectStationRef"
+    v-model:value="props.value"
+    value-key="mtrlid"
+    :loading="loading"
+    v-bind="$attrs"
+    :remote-method="remoteMethod"
+    @select="handleSelect"
+    @open-modal="openModal"
+  >
+    <template #header>
+      <div class="table-header lj-select__table">
+        <div class="table-tr">
+          <div class="table-td pr-4" style="width: 60px">{{ $t("table.u_mtrl_price.name") }}</div>
+          <div class="table-td pr-4" style="width: 60px">{{ $t("table.u_mtrl_price.thickness") }}</div>
+          <div class="table-td pr-4" style="width: 60px">{{ $t("table.u_mtrl_price.priceunit") }}</div>
+          <div class="table-td pr-4" style="width: 40px">{{ $t("table.u_mtrl_price.dscrp") }}</div>
+        </div>
+      </div>
+    </template>
+    <el-option
+      v-for="item in options"
+      :key="item.mtrlid"
+      :label="item.name"
+      :value="item"
+      class="lj-select__table pl-10 pr-10"
+      :class="{
+        'w-full': item.label
+      }"
+    >
+      <template v-if="item.label">
+        <div class="table-tr w-full text-center">{{ item.label }}</div>
+      </template>
+      <template v-else>
+        <div class="table-tr">
+          <div style="width: 60px" class="table-td pr-4 text-ellipsis-one" :title="item.mtrlname">{{ item.mtrlname }}</div>
+          <div style="width: 60px" class="table-td pr-4 text-ellipsis-one">{{ Number(item.thickness) }}</div>
+          <div style="width: 60px" class="table-td pr-4 text-ellipsis-one">{{ item.priceunit }}</div>
+          <div style="width: 40px" class="table-td pr-4 text-ellipsis-one">{{ item.dscrp }}</div>
+        </div>
+      </template>
+    </el-option>
+  </LjSelectorSelect>
+</template>
+
+<script lang="ts" setup name="SelectorMtrldefSelect">
+import { ref, computed } from "vue";
+import { CommonDynamicSelect } from "@/api/modules/common";
+import { DwnameEnum } from "@/enums/dwnameEnum";
+import LjSelectorSelect from "@/components/LjSelector/select.vue";
+import { useUserStore } from "@/stores/modules/user";
+
+interface ProTableProps {
+  value: any;
+  mtrltype: any;
+  [key: string]: any;
+}
+
+// 默认值
+const props = withDefaults(defineProps<ProTableProps>(), {});
+const { userInfo } = useUserStore();
+const emit = defineEmits(["select", "update:value", "openModal"]);
+const loading = ref(false);
+
+const options = ref<any[]>([]);
+// const isuse = ref("有效");
+
+const pricePower = computed(() => {
+  return userInfo.rsltFunids.includes(96);
+});
+
+const remoteMethod = async (queryString: string) => {
+  console.log("remoteMethod props :>> ", props, queryString);
+  loading.value = true;
+
+  let newParams: any = {};
+  newParams.pageindex = 1;
+  newParams.pagesize = 5;
+  newParams.queryParams = {
+    keyword: queryString,
+    arg_mtrltype: props.mtrltype,
+    arg_pricelistid: props.pricelistid
+  };
+  newParams.dsname = "web_mtrl_noprice_choose";
+  let result = await CommonDynamicSelect(newParams, DwnameEnum.mtrlPrice);
+
+  console.log("result.datatable :>> ", result.datatable);
+  if (result.datatable.length) {
+    // options.value = result.datatable.map(item => {
+    //   item.label = item.cuscode;
+    //   return item;
+    // });
+    options.value = result.datatable;
+  } else {
+    options.value = [
+      {
+        label: "暂无数据",
+        disabled: true
+      }
+    ];
+  }
+
+  loading.value = false;
+};
+
+const handleSelect = (item: any) => {
+  emit("select", item);
+};
+
+const openModal = (e: any) => {
+  emit("openModal", e);
+};
+</script>