Переглянути джерело

JLHWEB:1、修复弹窗选择组件布局问题;

JohnnyChan 1 тиждень тому
батько
коміт
5f04e9d879

+ 1 - 1
JLHWEB/src/components/LjVxeTable/components/SearchForm.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="card table-search vxetable-search" v-if="columns.length" id="searchForm" ref="searchFormRef">
+  <div class="card table-search vxetable-search flx-shrink" v-if="columns.length" id="searchForm" ref="searchFormRef">
     <el-form
       ref="formRef"
       :model="searchParam"

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

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

+ 6 - 0
JLHWEB/src/views/quote/bednetQuote/detail.vue

@@ -126,6 +126,10 @@ interface DetailProps {
    * @description 床垫长度
    */
   mattressLength?: number;
+  /**
+   * @description 床网大单类型
+   */
+  dannum_type?: number;
   /**
    * @description 是否只读
    */
@@ -168,6 +172,7 @@ const {
   AllFormulaRef,
   cmpFormulas,
   cmpFormulaReplace,
+  dannum_type,
   reload_dw2,
   getData,
   getDataMxAdd,
@@ -647,6 +652,7 @@ onMounted(async () => {
     initParamsMx.value.arg_deptid = props?.deptid;
     initParamsMx.value.arg_bednetid = props.bednetid;
     defaultColumnsValue.value.deptid = props?.deptid;
+    dannum_type.value = props?.dannum_type;
 
     defaultColumnsValue.value.mattress_width = props?.mattressWidth;
     defaultColumnsValue.value.mattress_length = props?.mattressLength;

+ 4 - 1
JLHWEB/src/views/quote/bednetQuote/hooks/index.tsx

@@ -43,6 +43,7 @@ interface defaultState {
   AllFormulaRef: any;
   cmpFormulas: any;
   cmpFormulaReplace: any;
+  dannum_type: number;
 }
 
 /**
@@ -149,7 +150,8 @@ export const useHooks = (t?: any, props?: any) => {
     bednetVarList: [],
     AllFormulaRef: null,
     cmpFormulas: null,
-    cmpFormulaReplace: null
+    cmpFormulaReplace: null,
+    dannum_type: 0
   });
   state.orderStatus = inject("orderStatus", "");
 
@@ -2416,6 +2418,7 @@ export const useHooks = (t?: any, props?: any) => {
     bednet.flag = Number(bednet.flag);
 
     let _params: any = {
+      dannum_type: state.dannum_type,
       bednet: bednet,
       bednetMx: state.vxeTableMxRef?.element.getTableData().fullData ?? [],
       spring: state.vxeTableMxSpringRef?.element.getTableData().fullData ?? []

+ 3 - 1
JLHWEB/src/views/quote/mattressQuote/detail.vue

@@ -940,7 +940,8 @@ const bednetDrawerProps = reactive({
   bednetid: 0,
   state: "",
   deptid: 0,
-  onlyView: false
+  onlyView: false,
+  dannum_type: 0
 });
 
 const footerMethod = ({ columns, data }: any) => {
@@ -2923,6 +2924,7 @@ const handleCellDblClick_bednet = ({ row, rowIndex, $rowIndex, column, columnInd
   if (!orderStatus.value && row.mtrlid > 0) {
     drawerTitle.value = "床网报价详情";
     // bednetDrawerProps.deptid = LjDetailRef.value._mainData.deptid;
+    bednetDrawerProps.dannum_type = LjDetailRef.value._mainData.dannum_type;
     bednetDrawerProps.bednetid = row.mtrlid;
     bednetDrawerProps.state = "";
     bednetDrawerProps.onlyView = true;