commonbill查询条件

chenxt
1 parent 45d17a73
Showing 7 changed files with 50 additions and 27 deletions
src/components/Common/CommonHooks/useCommonBase.js
src/components/Common/CommonTable/index.js
src/index.less
src/mes/common/commonModelComponent/index.js
src/mes/common/commonOperationBarComponent/MesToolbar.js
src/mes/common/commonOperationBarComponent/index.js
src/mes/indexMes/index.less
@@ -245,7 +245,7 @@ const useCommonBase = props =&gt; {
       flag,
       isWait,
       configData,
-      clearSelectData
+      clearSelectData,
     } = params;
     const {
       token,
@@ -326,23 +326,29 @@ const useCommonBase = props =&gt; {
         ...sParentConditions
       };
     }
-    
+
     const configDataId = configData?.sId;
     const sId = JSON.parse(JSON.stringify(condition?.sId || ''))
-    console.log(configData, 'configData');
-    
-    if (name === 'master') {
+    let pageRoute = props.sModelType;
+    // 如果是弹窗且没有pageLayout，则认为是commonBill
+    if (commonUtils.isNotEmptyObject(props.parentProps)) {
+      pageRoute = '/indexPage/commonBill';
+    }
+    if (name === 'master' && pageRoute.includes('indexPage/commonBill')) {
       // condition.sId = configDataId
       condition.pageNum = ''
       condition.pageSize = ''
       delete condition.sSqlCondition
     }
-    if (name.includes('slave')) {
-        delete condition.sSqlCondition
-        delete condition.sId
-        condition.sSqlCondition = {
-          sParentId: sId
-        }
+    if (name.includes('slave') && pageRoute.includes('indexPage/commonBill')) {
+      delete condition.sSqlCondition
+      delete condition.sId
+      condition.sSqlCondition = {
+        sParentId: sId
+      }
+    }
+    if (name === 'master' && sId === '') {
+      return
     }
     const dataUrl = `${commonConfig.server_host
       }business/getBusinessDataByFormcustomId/${configDataId}?sModelsId=${sModelsId}&sName=${formSrcRoute}`;
@@ -548,7 +554,7 @@ const useCommonBase = props =&gt; {
     const conditonValues = {};
     if (commonUtils.isNotEmptyStr(showConfig.sSqlCondition)) {
       const conditon = showConfig.sSqlCondition.split(",");
-      
+
       conditon.forEach(item => {
         // 特殊处理
         if (item === "sBoardNo.sBoardNo") {
@@ -2337,6 +2343,7 @@ const useCommonBase = props =&gt; {
         sActiveId,
         title: sActiveName,
         sParentConditions,
+        sModelType: '/indexPage/commonBill',
         parentProps: {
           ...returnProps,
           record
@@ -8234,6 +8234,8 @@ class CommonTableRc extends React.Component {
           controlConfig[0].sDropDownType === "popup"
         ) {
           btnPupopConfig = controlConfig[0];
+          console.log(btnPupopConfig, 'btnPupopConfig');
+          
           this.setState({
             commonPopupVisible: true,
             commonPopupTbName: name,
@@ -4094,7 +4094,10 @@ ton:focus {
     }
   }
 }
-
+:global .ant-select.ant-select-in-form-item{
+  border: 1px solid #d9d9d9;
+  border-radius: 4px;
+}
 :global {
   #root {
  
@@ -399,8 +399,8 @@ const useCommonModelEvent = props =&gt; {
       if (!props.bFinish) return;
       if (commonUtils.isEmptyObject(copyTo)) return;
  
-      const { masterConfig, sModelsId } = props;
-
+      const { masterConfig, sModelsId, masterData } = props;
+      if (masterData && masterData.sBillNo) return
       let masterDataCopyTo = {};
       for (const key in copyTo) {
         const tableData = copyTo[key];
@@ -408,14 +408,15 @@ const useCommonModelEvent = props =&gt; {
           masterDataCopyTo = tableData;
         }
       }
-      // const masterDataNew = {
-      //   ...commonFunc.getDefaultData(masterConfig),
-      //   handleType: "add",
-      //   sId: commonUtils.createSid(),
-      //   sFormId: sModelsId,
-      //   ...masterDataCopyTo
-      // };
-      // props.onSaveState({ masterData: masterDataNew, enabled: true });
+      
+      const masterDataNew = {
+        ...commonFunc.getDefaultData(masterConfig),
+        handleType: "add",
+        sId: commonUtils.createSid(),
+        sFormId: sModelsId,
+        ...masterDataCopyTo
+      };
+      props.onSaveState({ masterData: masterDataNew, enabled: true });
     },
     [props.bFinish]
   );
@@ -595,6 +596,7 @@ const useCommonModelEvent = props =&gt; {
             sSqlCondition: { ...conditonValues, ...sFilterConditions, },
             bFilter
           },
+          sModelTypes: props.parentProps,
           isWait: true
         })) || {};
       props.setTempRef(result);
@@ -12,6 +12,7 @@ const ToolbarFun = (props) =&gt; {
  
   const { sControlName } = btnConfig;
   const btnName = sControlName.replace('BtnLeft.', '').replace('BtnRight.', '').toLowerCase();
+
   if (btnName === 'btnadd') {
     handleAdd(props);
   } else if (btnName === 'btnsave') {
@@ -20,6 +21,8 @@ const ToolbarFun = (props) =&gt; {
     props.onSaveState({ enabled: true });
   } else if (btnName === 'btnscanface') {
     handleScanFace(props);
+  } else if (btnName === 'btncancel') {
+    
   }
  
  
@@ -43,7 +46,8 @@ const handleAdd = (props) =&gt; {
   const { app } = props;
   const { managementData } = app;
   const menuList = managementData.reduce((result, item) => {
-    result = [...result, ...item.children];
+    // ✅ 安全展开：确保children是数组，否则使用空数组
+    result = [...result, ...(Array.isArray(item?.children) ? item.children : [])];
     return result;
   }, []);
  
@@ -424,6 +424,7 @@ const useCommonOperationBarComponentEvent = props =&gt; {
       sActiveId,
       title: sActiveName,
       copyTo,
+       sModelType:'/indexPage/commonBill',
       sParentConditions,
       parentProps: props,
       onOk: data => {
@@ -781,7 +782,8 @@ const CommonOperationBarComponent = basProps =&gt; {
   const btnLeftConfig = gdsconfigformslave.filter(
     item => item.bVisible && item.sControlName.includes("BtnLeft.")
   );
-
+  console.log(btnLeftConfig,gdsconfigformslave, 'btnLeftConfig');
+  
   // 将扫码上料放到最后
   const scanCodeToLoadMaterialsIndex = btnLeftConfig.findIndex(
     item => item.showName === "扫码上料"
@@ -3,12 +3,15 @@
 @header-height: 60px;
 @sider-width: 110px;
 @base-color: #FFF;
-
+ :global .ant-select-in-form-item {
+    border-radius: 4px;
+    border: 1px solid #d9d9d9;
+  }
 .indexMes {
   .size();
   background: #DCE2E8;
   overflow: hidden;
-
+ 
   :global {
     .header {
       .flex();