Bladeren bron

JLHWEB: 1、修复表格默认样式名称;2、床垫报价,tab拉链允许编辑厚度;3、下拉默认修改成等于

JohnnyChan 1 maand geleden
bovenliggende
commit
5333c5eac9

+ 4 - 1
JLHWEB/src/components/LjVxeTable/index.vue

@@ -20,7 +20,10 @@
   />
 
   <!-- 表格内容 card -->
-  <div class="table-main flx-col" :class="`${propsDefine.height == 'auto' ? 'flx-1' : ''} ${tableCls}`">
+  <div
+    class="table-main flx-col"
+    :class="`${propsDefine.height == 'auto' ? 'flx-1' : ''} ${tableCls} ${tableCls == '' ? 'h-full' : ''}`"
+  >
     <!-- 表格头部 操作按钮 -->
     <div class="table-header flx-shrink">
       <div class="header-button-lf">

+ 1 - 1
JLHWEB/src/components/LjVxeTable/interface/index.ts

@@ -668,7 +668,7 @@ const defineColumnStyle: any = {
     // width: 80
   },
   number: {
-    fMode: fModeEnum.GE
+    fMode: fModeEnum.EQUAL
   },
   date$: {
     fMode: fModeEnum.EQUAL

+ 4 - 4
JLHWEB/src/views/quote/mattressQuote/detail.vue

@@ -978,7 +978,7 @@ const tableProps_mx = ref({
   height: "auto",
   align: "left",
   // height: "",
-  minHeight: "300px",
+  minHeight: "100px",
   editConfig: { trigger: "click", mode: "row", enabled: false, autoClear: false },
   // exportConfig: {
   //   filename: t("menu.saleTaskCrmDetail") + formatToDate(new Date(), "YYYY-MM-DDHH:mm:ss")
@@ -1064,7 +1064,7 @@ const tableProps_subSpecs = ref({
   height: "auto",
   align: "left",
   // height: "",
-  minHeight: "300px",
+  minHeight: "100px",
   editConfig: { trigger: "click", mode: "row", enabled: false, autoClear: false },
   // exportConfig: {
   //   filename: t("menu.saleTaskCrmDetail") + formatToDate(new Date(), "YYYY-MM-DDHH:mm:ss")
@@ -1632,7 +1632,7 @@ const save = async () => {
               // 检查明细输入是否正确
               let _disabled = !(
                 (itm.if_inputqty == 0 && [50, 51, 52, 53, 54, 104, 114, 11, 12, 13, 14, 32, 33].includes(itm.formulakind)) ||
-                // itm.formulakind == 202 ||
+                itm.formulakind == 202 ||
                 itm.formulakind == 7
               );
               console.log("_disabled :>> ", _disabled);
@@ -1645,7 +1645,7 @@ const save = async () => {
               } else if (t.ref == "innerClothLayerMxRef") {
                 _disabled = !(
                   (itm.if_inputqty == 0 && [50, 51, 52, 53, 54, 104, 114, 11, 14, 32, 33].includes(itm.formulakind)) ||
-                  // itm.formulakind == 202 ||
+                  itm.formulakind == 202 ||
                   itm.formulakind == 203
                 );
               }

+ 2 - 2
JLHWEB/src/views/quote/mattressQuote/hooks/index.tsx

@@ -3537,7 +3537,7 @@ export const useHooks = (t?: any) => {
         const { $table, column, row, status } = scope;
         const _disabled = !(
           (row.if_inputqty == 0 && [50, 51, 52, 53, 54, 104, 114, 11, 12, 13, 14, 32, 33].includes(row.formulakind)) ||
-          // row.formulakind == 202 ||
+          row.formulakind == 202 ||
           row.formulakind == 7
         );
 
@@ -4563,7 +4563,7 @@ export const useHooks = (t?: any) => {
         const { $table, column, row, status } = scope;
         const _disabled = !(
           (row.if_inputqty == 0 && [50, 51, 52, 53, 54, 104, 114, 11, 14, 32, 33].includes(row.formulakind)) ||
-          // row.formulakind == 202 ||
+          row.formulakind == 202 ||
           row.formulakind == 203
         );