JLHWEB: 1、修复床垫报价翻页显示问题；2、修复床垫报价垫层-顶布裥棉选择物料问题

JLHWEB/src/views/quote/mattressQuote/hooks/index.tsx

@@ -3526,68 +3526,85 @@ export const useHooks = (t?: any) => {
     {
       field: "dannum_cost1",
       render: (scope: any) => {
-        if (scope.row.moneyrate > 1) {
-          return (
-            <div>
-              <span class="text-f-s" style="color: var(--lj-color-gray-7)">
-                $
-              </span>
-              {formatAmount3({ val: floatDiv(scope.row.dannum_cost1, scope.row.moneyrate) })}
-            </div>
-          );
+        if (scope.row.dannum_cost1) {
+          if (scope.row.moneyrate > 1) {
+            return (
+              <div>
+                <span class="text-f-s" style="color: var(--lj-color-gray-7)">
+                  $
+                </span>
+                {formatAmount3({ val: floatDiv(scope.row.dannum_cost1, scope.row.moneyrate) })}
+              </div>
+            );
+          } else {
+            return formatAmount3({ val: scope.row.dannum_cost1 });
+          }
         } else {
-          return formatAmount3({ val: scope.row.dannum_cost1 });
+          return scope.row.dannum_cost1;
         }
       }
     },
     {
       field: "dannum_cost2",
       render: (scope: any) => {
-        if (scope.row.moneyrate > 1) {
-          return (
-            <div>
-              <span class="text-f-s" style="color: var(--lj-color-gray-7)">
-                $
-              </span>
-              {formatAmount3({ val: floatDiv(scope.row.dannum_cost2, scope.row.moneyrate) })}
-            </div>
-          );
+        if (scope.row.dannum_cost2) {
+          if (scope.row.moneyrate > 1) {
+            return (
+              <div>
+                <span class="text-f-s" style="color: var(--lj-color-gray-7)">
+                  $
+                </span>
+                {formatAmount3({ val: floatDiv(scope.row.dannum_cost2, scope.row.moneyrate) })}
+              </div>
+            );
+          } else {
+            return formatAmount3({ val: scope.row.dannum_cost2 });
+          }
         } else {
-          return formatAmount3({ val: scope.row.dannum_cost2 });
+          return scope.row.dannum_cost2;
         }
       }
     },
     {
       field: "dannum_cost3",
       render: (scope: any) => {
-        if (scope.row.moneyrate > 1) {
-          return (
-            <div>
-              <span class="text-f-s" style="color: var(--lj-color-gray-7)">
-                $
-              </span>
-              {formatAmount3({ val: floatDiv(scope.row.dannum_cost3, scope.row.moneyrate) })}
-            </div>
-          );
+        if (scope.row.dannum_cost3) {
+          if (scope.row.moneyrate > 1) {
+            return (
+              <div>
+                <span class="text-f-s" style="color: var(--lj-color-gray-7)">
+                  $
+                </span>
+                {formatAmount3({ val: floatDiv(scope.row.dannum_cost3, scope.row.moneyrate) })}
+              </div>
+            );
+          } else {
+            return formatAmount3({ val: scope.row.dannum_cost3 });
+          }
         } else {
-          return formatAmount3({ val: scope.row.dannum_cost3 });
+          return scope.row.dannum_cost3;
         }
       }
     },
     {
       field: "dannum_cost4",
       render: (scope: any) => {
-        if (scope.row.moneyrate > 1) {
-          return (
-            <div>
-              <span class="text-f-s" style="color: var(--lj-color-gray-7)">
-                $
-              </span>
-              {formatAmount3({ val: floatDiv(scope.row.dannum_cost4, scope.row.moneyrate) })}
-            </div>
-          );
+        console.log("scope.row.moneyrate :>> ", scope);
+        if (scope.row.dannum_cost4) {
+          if (scope.row.moneyrate > 1) {
+            return (
+              <div>
+                <span class="text-f-s" style="color: var(--lj-color-gray-7)">
+                  $
+                </span>
+                {formatAmount3({ val: floatDiv(scope.row.dannum_cost4, scope.row.moneyrate) })}
+              </div>
+            );
+          } else {
+            return formatAmount3({ val: scope.row.dannum_cost4 });
+          }
         } else {
-          return formatAmount3({ val: scope.row.dannum_cost4 });
+          return scope.row.dannum_cost4;
         }
       }
     }
@@ -4499,6 +4516,7 @@ export const useHooks = (t?: any) => {
           // return <></>;
         }
 
+        console.log("垫层 row.formulakind :>> ", row.formulakind, _mtrltypeItem);
         let params = {
           mtrltype: _mtrltypeItem?.value,
           pricelistid: _pricelistid

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

@@ -127,32 +127,138 @@ const remoteMethod = async (queryString: string) => {
   //   return false;
   // }
 
-  let newParams: any = {};
-  newParams.pageindex = 1;
-  newParams.pagesize = 5;
-  newParams.queryParams = {
-    keyword: queryString,
-    arg_mtrltype: props.mtrltype,
-    arg_pricelistid: _pid ?? props.pricelistid
-  };
-  newParams.dsname = "web_mtrl_choose";
-  console.log("newParams :>> ", newParams);
-  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 {
+  if (props.mtrltype == 1201) {
+    // 顶布裥棉
     options.value = [
       {
-        label: "暂无数据",
-        disabled: true
+        label: "顶布裥棉1",
+        mtrlid: 1,
+        mtrltype: 1201,
+        mtrlname: "顶布裥棉1",
+        priceunit: "",
+        price: 0,
+        gram_weight: 0,
+        cloth_width: 0,
+        if_inputqty: 0,
+        if_areaprice: 0,
+        if_subspecs: 0,
+        thickness: 0,
+        dscrp: "",
+        createtime: null,
+        createby: "",
+        pricelistprice: 0,
+        price_formula: "",
+        erp_mtrlid: 0,
+        erp_mtrlcode: "",
+        erp_mtrlname: "",
+        erp_mtrlmode: "",
+        erp_unit: "",
+        erp_mtrlengname: ""
+      },
+      {
+        label: "顶布裥棉2",
+        mtrlid: 2,
+        mtrltype: 1201,
+        mtrlname: "顶布裥棉2",
+        priceunit: "",
+        price: 0,
+        gram_weight: 0,
+        cloth_width: 0,
+        if_inputqty: 0,
+        if_areaprice: 0,
+        if_subspecs: 0,
+        thickness: 0,
+        dscrp: "",
+        createtime: null,
+        createby: "",
+        pricelistprice: 0,
+        price_formula: "",
+        erp_mtrlid: 0,
+        erp_mtrlcode: "",
+        erp_mtrlname: "",
+        erp_mtrlmode: "",
+        erp_unit: "",
+        erp_mtrlengname: ""
+      },
+      {
+        label: "顶布裥棉3",
+        mtrlid: 3,
+        mtrltype: 1201,
+        mtrlname: "顶布裥棉3",
+        priceunit: "",
+        price: 0,
+        gram_weight: 0,
+        cloth_width: 0,
+        if_inputqty: 0,
+        if_areaprice: 0,
+        if_subspecs: 0,
+        thickness: 0,
+        dscrp: "",
+        createtime: null,
+        createby: "",
+        pricelistprice: 0,
+        price_formula: "",
+        erp_mtrlid: 0,
+        erp_mtrlcode: "",
+        erp_mtrlname: "",
+        erp_mtrlmode: "",
+        erp_unit: "",
+        erp_mtrlengname: ""
+      },
+      {
+        label: "顶布裥棉4",
+        mtrlid: 4,
+        mtrltype: 1201,
+        mtrlname: "顶布裥棉4",
+        priceunit: "公斤",
+        price: 0,
+        gram_weight: 0,
+        cloth_width: 0,
+        if_inputqty: 0,
+        if_areaprice: 0,
+        if_subspecs: 0,
+        thickness: 0,
+        dscrp: "",
+        createtime: null,
+        createby: "",
+        pricelistprice: 0,
+        price_formula: "",
+        erp_mtrlid: 0,
+        erp_mtrlcode: "",
+        erp_mtrlname: "",
+        erp_mtrlmode: "",
+        erp_unit: "",
+        erp_mtrlengname: ""
       }
     ];
+  } else {
+    let newParams: any = {};
+    newParams.pageindex = 1;
+    newParams.pagesize = 5;
+    newParams.queryParams = {
+      keyword: queryString,
+      arg_mtrltype: props.mtrltype,
+      arg_pricelistid: _pid ?? props.pricelistid
+    };
+    newParams.dsname = "web_mtrl_choose";
+    console.log("newParams :>> ", newParams);
+    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;