JLHWEB： 1、弹簧下拉选择默认使用新弹簧

JLHWEB/src/languages/modules/zh-cn/common.json

@@ -194,7 +194,7 @@
   "viewHistoricalQuotes": "查看历史报价",
   "showFormula": "显示计算公式",
   "showQuoteDetail": "查看详细报价",
-  "enabled": "开启",
+  "enabled": "启用",
   "addSameLevel": "增同级",
   "addSubLevel": "增下级",
   "insert": "插入",

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

@@ -205,6 +205,7 @@ export const useHooks = (t?: any, props?: any) => {
 
       let _params = {
         // arg_springtypeid: "11", // 默认选择国内分类
+        arg_newspring: 1,
         ...params
       };
       state.SpringDialogProps = {
@@ -1719,9 +1720,14 @@ export const useHooks = (t?: any, props?: any) => {
       bednet.flag = Number(bednet.flag);
       bednet.pricelistid = _pricelistid;
 
+      let _bednetMx = state.vxeTableMxRef?.element.getTableData().fullData ?? [];
+      _bednetMx.forEach(itm => {
+        itm.if_part = Number(itm.if_part);
+      });
+
       let _params: any = {
         bednet: bednet,
-        bednetMx: state.vxeTableMxRef?.element.getTableData().fullData ?? [],
+        bednetMx: _bednetMx,
         spring: state.vxeTableMxSpringRef?.element.getTableData().fullData ?? []
       };
       let res = await GetComputeSpring(_params);

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

@@ -23,7 +23,6 @@
         :table-props="tableProps"
         :tool-button="['refresh', 'setting', 'search']"
         :auto-load-layout="false"
-        collapse-buttons
         :page-change-call-back="autoUpdateTableCheckbox"
         :if-load-query-habit="false"
       >
@@ -187,19 +186,23 @@ const columns: any = [
         }
       }
     }
-    // },
-    // {
-    //   field: "createby",
-    //   search: {
-    //     el: "checkbox",
-    //     key: "arg_newspring",
-    //     defaultValue: 1,
-    //     props: {
-    //       onChange: (val: any) => {
-    //         initParams.value.arg_newspring = val;
-    //       }
-    //     }
-    //   }
+  },
+  {
+    field: "createby",
+    search: {
+      el: "switch",
+      key: "arg_newspring",
+      props: {
+        activeValue: 1,
+        inactiveValue: 0,
+        inlinePrompt: true,
+        activeText: "新弹簧",
+        inactiveText: "旧弹簧",
+        onChange: (val: any) => {
+          initParams.value.arg_newspring = val;
+        }
+      }
+    }
   }
 ];
 

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

@@ -82,7 +82,8 @@ const remoteMethod = async (queryString: string) => {
   newParams.pageindex = 1;
   newParams.pagesize = 5;
   newParams.queryParams = {
-    arg_search: queryString
+    arg_search: queryString,
+    arg_newspring: 1
   };
   props?.argHeight && (newParams.queryParams.arg_height = props?.argHeight);
   newParams.dsname = "web_spring_define_choose";