From 90b122b177acf0393ef74219f98eca198bc1b6fe Mon Sep 17 00:00:00 2001
From: chenxt <10125295+chen-xintao97@user.noreply.gitee.com>
Date: Thu, 18 Dec 2025 15:15:15 +0800
Subject: [PATCH] 下拉离开事件

---
 src/components/Common/CommonComponent/index.js     |  59 +++++++++++++++++++++++++++++++++++++----------------------
 src/components/Common/CommonHooks/useCommonBase.js | 364 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------
 src/components/Common/CommonListTreeEvent.js       |   2 ++
 src/components/Common/CommonSubBillEvent.js        |   1 +
 src/components/Common/CommonViewTable/index.js     |   3 ++-
 src/mes/common/commonModelComponent/index.js       |   1 -
 6 files changed, 400 insertions(+), 30 deletions(-)

diff --git a/src/components/Common/CommonComponent/index.js b/src/components/Common/CommonComponent/index.js
index a7a3fa5..ab19884 100644
--- a/src/components/Common/CommonComponent/index.js
+++ b/src/components/Common/CommonComponent/index.js
@@ -300,7 +300,9 @@ export default class CommonComponent extends Component {
     }
     /* 若下拉配置了movesql 则离开时 调用下拉sql数据 */
     if (this.props.showConfig && (this.props.showConfig.sDropDownType === 'movesql' || commonUtils.isNotEmptyObject(this.props.showConfig.sButtonParam))) {
-      this.props.onDropDownBlur(this.props.name, this.props.showConfig.sName, this.props.record, this.props.showConfig);
+       this.props.onDropDownBlur(this.props.name, this.props.showConfig.sName, this.props.record, this.props.showConfig);
+      console.log(this.props, 'onDropDownBlur');
+      
     }
 
     this.onCheckFields(500);
@@ -334,7 +336,7 @@ export default class CommonComponent extends Component {
           const { sActiveKey = '' } = item;
           return sActiveKey.split(',').includes(`${name}.${sName}`);
         })
-      || {};
+        || {};
       if (!sActiveKey) return;
       this.lastValue = currentValue;
       onToolBarBtnClick({ key: sControlName });
@@ -733,11 +735,24 @@ export default class CommonComponent extends Component {
     /*   返回值   */
     return obj;
   };
-
+  getLocalizedString = (jsonStr, language) => {
+    try {
+      const data = JSON.parse(jsonStr);
+      return data[language] || "";
+    } catch (e) {
+      console.error("Error parsing JSON:", e);
+      return "";
+    }
+  };
   getSelectTableOption = () => {
     const { selectTableData } = this.state;
-    const { showConfig } = this.props;
-    const { sTableTitleSql } = showConfig;
+    const { showConfig , app} = this.props;
+    const { userinfo } = app;
+    let { sTableTitleSql } = showConfig;
+    /* 根据用户配置语言 设置表格标题 */
+    if (commonUtils.isJSON(sTableTitleSql) && sTableTitleSql.includes("Chinese")) {
+      sTableTitleSql = this.getLocalizedString(sTableTitleSql, userinfo.sLanguage);
+    }
     const tempColumnArr = sTableTitleSql.split(',');
     let scrollX = 0;
     const columns = tempColumnArr.map((item, index) => {
@@ -1029,8 +1044,8 @@ export default class CommonComponent extends Component {
         if (this.isReportInfo && this.props.enabled) {
           innerInputProps.addonAfter = <PlusOutlined
             onClick={() => {
-                this.props.handleReportInfo?.(this.props.showConfig);
-              }}
+              this.props.handleReportInfo?.(this.props.showConfig);
+            }}
           />;
         }
         return <InputA {...innerInputProps} />;
@@ -1066,7 +1081,7 @@ export default class CommonComponent extends Component {
       loading: this.state.buttonLoading,
       style: {
         position: 'absolute',
-        right:3,
+        right: 3,
         top: 3,
         minWidth: "auto"
       },
@@ -1093,9 +1108,9 @@ export default class CommonComponent extends Component {
 
       const sIndexNoClick = (num) => {
         const oPrint = document.querySelector(`#salveWydm2Print${num}`);
-          if (oPrint) {
-            oPrint.click();
-          }
+        if (oPrint) {
+          oPrint.click();
+        }
       };
 
       return (
@@ -1402,7 +1417,7 @@ export default class CommonComponent extends Component {
       obj.title = obj.value;
     }
     obj.placeholder = this.props.showConfig.placeholder;
-    
+
     if (this.props.name === "tableS0" && this.props.showConfig.sName === "sStatus") {
       if (this.state.dataValue === "已提交") {
         obj.className = "sStatusSubmit";
@@ -1442,7 +1457,7 @@ export default class CommonComponent extends Component {
       disabled: !this.state.enabled, /*   是否可编辑   */
       onChange: (newValue, dateString) => {
         let dateStringNew = dateString;
-        if (dateStringNew &&sDateFormat === 'MM-DD') {
+        if (dateStringNew && sDateFormat === 'MM-DD') {
           dateStringNew = `${moment().format('YYYY')}-${dateString} 00:00:00`;
         } else if (dateStringNew && sDateFormat === 'HH:mm') {
           dateStringNew = `${moment().format('YYYY-MM-DD')} ${dateString}:00`;
@@ -2655,7 +2670,7 @@ export default class CommonComponent extends Component {
   handleViewChoose = () => {
     this.props.onViewChoose(this.props.name, this.props.showConfig.sName, this.props.record);
   }
-  handleMemoShow= () => {
+  handleMemoShow = () => {
     this.props.onMemoShow(this.props.name, this.props.showConfig.sName, this.props.record, 0, this.props.showConfig);
   }
 
@@ -2955,11 +2970,11 @@ export default class CommonComponent extends Component {
     }
     /*   获取outformitem控件参数  */
     const outFormItemProps = this.getOutFormItemProps();
-    
+
     /*   获取fieldDecorator参数   */
     const fieldDecoratorProps = this.getFieldDecoratorProps();
     /*   通用组件(主表存在getFieldDecorator表单验证,而从表则不需要)   */
-    const commonAssembly = this.props.bNewForm ? innerInput:  (
+    const commonAssembly = this.props.bNewForm ? innerInput : (
       <FormItem {...outFormItemProps}>
         {viewInfo}
         {speacilNote}
@@ -2967,11 +2982,11 @@ export default class CommonComponent extends Component {
         {!this.props.bTable && this.getFieldDecorator ? this.getFieldDecorator(this.props.showConfig.sName, fieldDecoratorProps)(innerInput) : innerInput}
       </FormItem>
     );
-    const { iColValue, showConfig, enabled, bViewTable} = this.props;
+    const { iColValue, showConfig, enabled, bViewTable } = this.props;
     const readonlyStyle = showConfig.bReadonly || showConfig.iTag === 1 ? 'readonlyStyle' : '';
     const costomStyle = showConfig.costomStyle || '';
 
-    const { bNotEmpty }  = showConfig;
+    const { bNotEmpty } = showConfig;
     let oPreDot = '';
     if (enabled && bViewTable && !location.pathname.includes('login')) {
       oPreDot = bNotEmpty ?
@@ -2987,12 +3002,12 @@ export default class CommonComponent extends Component {
         this.props.showConfig.sName === 'dReportQty'
         && this.props.showConfig.sControlName === 'dReportQtyBllb'
       ) || (
-        this.props.showConfig.sName === 'dLittleReportQty'
-        && this.props.showConfig.sControlName === 'dLittleReportQtyBllb'
-      ))
+          this.props.showConfig.sName === 'dLittleReportQty'
+          && this.props.showConfig.sControlName === 'dLittleReportQtyBllb'
+        ))
     ) {
       oBllb = <div className='productionExecBllb'>
-        <span>{ '质量标识' } </span>
+        <span>{'质量标识'} </span>
         <Button
           type="link"
           size="large"
diff --git a/src/components/Common/CommonHooks/useCommonBase.js b/src/components/Common/CommonHooks/useCommonBase.js
index 38c11c4..5953af3 100644
--- a/src/components/Common/CommonHooks/useCommonBase.js
+++ b/src/components/Common/CommonHooks/useCommonBase.js
@@ -41,6 +41,8 @@ const useCommonBase = props => {
   const [state, dispatch] = useReducer(reducer, getInitialState(props));
   const tempRef = useRef({});
   let mounted = true
+  console.log(props, 'useCommonBase');
+  
   const setTempRef = (params, bRewrite) => {
     if (bRewrite) {
       tempRef.current = params;
@@ -1832,7 +1834,7 @@ const useCommonBase = props => {
   };
 
   /** 表格数据更改 */
-  const handleTableChange = (
+  const handleTableChange = async (
     name,
     sFieldName,
     changeValue,
@@ -1856,7 +1858,6 @@ const useCommonBase = props => {
       [`${name}Config`]: tableConfig,
       sModelsId
     } = state;
-
     const iIndex = tableData.findIndex(item => item.sId === sId);
     let { handleType } = tableData[iIndex];
     handleType = commonUtils.isEmpty(handleType) ? "update" : handleType;
@@ -1907,11 +1908,18 @@ const useCommonBase = props => {
         changeValue = { ...tableDataAfter };
       }
     }
+    const models = name === 'materials' ? 'Materials' : ''
+    let tableDataRow = { ...tableData[iIndex], ...changeValue, handleType }
+    const { masterData } = state
+    const { app } = props
+    const { token } = app || {}
+    tableDataRow = await handleMaterialsChange(tableDataRow, sModelsId, masterData, changeValue, sFieldName, app, token, models);
+    console.log(tableDataRow, 'tableDataRow');
     if (isWait) {
-      return { ...tableData[iIndex], ...changeValue, handleType };
+      return tableDataRow;
     } else {
       const rowDataOld = JSON.parse(JSON.stringify(tableData[iIndex]));
-      tableData[iIndex] = { ...tableData[iIndex], ...changeValue, handleType };
+      tableData[iIndex] = tableDataRow;
       handleSaveState(
         { [`${name}Data`]: tableData, sUseInfo: "" },
         nextProps => {
@@ -1930,7 +1938,112 @@ const useCommonBase = props => {
       );
     }
   };
-
+  const handleMaterialsChange = async (tableDataRow, sModelsId, masterData, changeValue, sFieldName, app, token, models) => {
+    const { sComputeId, sConversionComputeId, sReConversionComputeId } = tableDataRow;
+    const sFormulaIdType = tableDataRow.bInverse ? 'sReComputeId' : 'sComputeId'; /* 正算、反算类型 */
+    if (sFieldName === 'sMaterialsNo' || sFieldName === 'sMaterialsName' || sFieldName === 'dAuxiliaryQty' || sFieldName === 'dReelAuxiliaryQty' || sFieldName === 'dConversionQty' || sFieldName === 'sMaterialsStyle' || sFieldName === 'dProductQty') {
+      if (sFieldName === 'dReelAuxiliaryQty') {
+        if (tableDataRow.sMaterialsUnit === '吨' && tableDataRow.bReel && tableDataRow.dGramWeight > 0) {
+          tableDataRow = commonBusiness.getMaterialsQty(app, { ...tableDataRow, sMaterialsStyle: tableDataRow.sReelMaterialsStyle }, 'dReelAuxiliaryQty', 'dMaterialsQty');
+          tableDataRow.dAuxiliaryQty = tableDataRow.dMaterialsQty;
+          tableDataRow.sMaterialsStyle = tableDataRow.sMaterialsStyle !== undefined && tableDataRow.sMaterialsStyle.split('*').length > 1 ? tableDataRow.sMaterialsStyle.split('*')[0] : tableDataRow.sMaterialsStyle;
+          tableDataRow.sAuxiliaryUnit = tableDataRow.sMaterialsUnit;
+        } else if (tableDataRow.sMaterialsUnit.toUpper() === 'M2' && tableDataRow.bReel) {
+          tableDataRow = commonBusiness.getMaterialsQty(app, tableDataRow, 'dReelAuxiliaryQty', 'dMaterialsQty');
+          tableDataRow.dAuxiliaryQty = tableDataRow.dReelAuxiliaryQty;
+        } else {
+          tableDataRow.dAuxiliaryQty = tableDataRow.dReelAuxiliaryQty;
+        }
+      }
+      if (commonUtils.isEmpty(sComputeId) && sFieldName !== 'dConversionQty') {
+        if (sFieldName === 'dProductQty') {
+          tableDataRow = commonBusiness.getMaterialsQty(app, tableDataRow, 'dProductQty', 'dMaterialsQty');
+        } else if (app.currentPane.sModelsType && app.currentPane.sModelsType.includes('outside/')) {
+          tableDataRow = commonBusiness.getMaterialsQty(app, tableDataRow, 'dAuxiliaryQty', 'dMaterialsQty');
+        } else {
+          tableDataRow.dMaterialsQty = await commonBusiness.getFormulaValue({
+            token, sModelsId, masterData, tableDataRow, sComputeId, sFormulaIdType,
+          });
+        }
+      } else if (!commonUtils.isEmpty(sComputeId)) {
+        tableDataRow.dMaterialsQty = await commonBusiness.getFormulaValue({
+          token, sModelsId, masterData, tableDataRow, sComputeId,
+        });
+      }
+      if (sFieldName !== 'dConversionQty' && !commonUtils.isEmpty(sConversionComputeId)) {
+        tableDataRow.dConversionQty = await commonBusiness.getFormulaValue({
+          token, sModelsId, masterData, tableDataRow, sComputeId: sConversionComputeId,
+        });
+      }
+    } else if (sFieldName === 'dMaterialsQty') {
+      const { sReComputeId } = tableDataRow;
+      if (commonUtils.isEmpty(sReComputeId) && tableDataRow.bInverse) {
+        if (app.currentPane.sModelsType && app.currentPane.sModelsType.includes('outside/')) {
+          tableDataRow = commonBusiness.getAuxiliaryQty(app, tableDataRow, sFieldName, 'dAuxiliaryQty');
+        } else {
+          tableDataRow.dAuxiliaryQty = await commonBusiness.getFormulaValue({
+            token, sModelsId, masterData, tableDataRow, sReComputeId, sFormulaIdType,
+          });
+        }
+      } else if (tableDataRow.bInverse) {
+        tableDataRow.dAuxiliaryQty = await commonBusiness.getFormulaValue({
+          token, sModelsId, masterData, tableDataRow, sComputeId: sReComputeId,
+        });
+        if (commonUtils.isNotEmptyArr(tableDataRow.dAuxiliaryQty) && tableDataRow.dAuxiliaryQty !== 0) {
+          tableDataRow.dProductQty = tableDataRow.dAuxiliaryQty;
+        }
+      }
+      if (!commonUtils.isEmpty(sReConversionComputeId)) {
+        tableDataRow.dConversionQty = await commonBusiness.getFormulaValue({
+          token, sModelsId, masterData, tableDataRow, sComputeId: sReConversionComputeId,
+        });
+      }
+    } else if (sFieldName === 'dAuxiliaryLossQty') {
+      const tableDataRowNew = { ...tableDataRow, dAuxiliaryQty: tableDataRow.dAuxiliaryLossQty };
+      if (commonUtils.isEmpty(sComputeId)) {
+        // tableDataRow = commonBusiness.getMaterialsQty(app, tableDataRow, sFieldName, 'dLossQty');
+        tableDataRow.dLossQty = await commonBusiness.getFormulaValue({
+          token, sModelsId, masterData, tableDataRow: tableDataRowNew, sComputeId, sFormulaIdType,
+        });
+      } else {
+        tableDataRow.dLossQty = await commonBusiness.getFormulaValue({
+          token, sModelsId, masterData, tableDataRow: tableDataRowNew, sComputeId,
+        });
+      }
+      if (!commonUtils.isEmpty(tableDataRow.dSrcSurplusAuxiliaryQty)) {
+        tableDataRow.dAuxiliaryQty = tableDataRow.dSrcSurplusAuxiliaryQty - tableDataRow.dAuxiliaryLossQty;
+        tableDataRow.dMaterialsQty = commonUtils.convertFixNum(tableDataRow.dSrcSurplusQty - tableDataRow.dLossQty, 6);
+      }
+    } else if (sFieldName === 'dLossQty') {
+      const { sReComputeId } = tableDataRow;
+      const tableDataRowNew = { ...tableDataRow, dMaterialsQty: tableDataRow.dLossQty };
+      if (commonUtils.isEmpty(sReComputeId) && tableDataRow.bInverse) {
+        // tableDataRow = commonBusiness.getAuxiliaryQty(app, tableDataRow, sFieldName, 'dAuxiliaryLossQty');
+        tableDataRow.dAuxiliaryLossQty = await commonBusiness.getFormulaValue({
+          token, sModelsId, masterData, tableDataRow: tableDataRowNew, sReComputeId, sFormulaIdType,
+        });
+      } else {
+        tableDataRow.dAuxiliaryLossQty = await commonBusiness.getFormulaValue({
+          token, sModelsId, masterData, tableDataRow: tableDataRowNew, sComputeId: sReComputeId,
+        });
+      }
+      if (!commonUtils.isEmpty(tableDataRow.dSrcSurplusAuxiliaryQty)) {
+        tableDataRow.dAuxiliaryQty = tableDataRow.dSrcSurplusAuxiliaryQty - tableDataRow.dAuxiliaryLossQty;
+        tableDataRow.dMaterialsQty = tableDataRow.dSrcSurplusQty - tableDataRow.dLossQty;
+      }
+    } else if (sFieldName === 'sProcessId' || sFieldName === 'sProcessNo' || sFieldName === 'sProcessName') {
+      const sProcessId = changeValue.sProcessId;
+      const url = `${commonConfig.server_host}process/outsideprocess?sModelsId=${sModelsId}&sProcessId=${sProcessId}`;
+      const dataReturn = (await commonServices.getService(token, url)).data;
+      if (dataReturn.code === 1) {
+        if (commonUtils.isNotEmptyArr(dataReturn.dataset.rows)) {
+          tableDataRow.dMaterialsPrice = dataReturn.dataset.rows[0].dMaterialsPrice;
+        }
+        tableDataRow = commonBusiness.getCalculateAllMoney(app, models, 'dMaterialsPrice', masterData, tableDataRow);
+      }
+    }
+    return tableDataRow;
+  }
   const handleFilterDropDownData = (dropDownData, showConfig, name, record) => {
     if (!commonUtils.isEmptyArr(dropDownData)) {
       const conditon = showConfig.sSqlCondition.split(",");
@@ -2358,7 +2471,245 @@ const useCommonBase = props => {
       });
     }
   };
+  /* 下拉多选离开事件 */
+  const handleTableBlur = async (name, sFileName, record, tableConfig, other) => {
+    const { sModelsId, app } = props;
+    const { controlData, slaveConfig, [`${name}Data`]: tableData, [`${name}Config`]: tempConfig } = state;
+    let { slaveData: slaveDataOld, masterData, slaveDelData, } = state;
+    const addState = {};
+    if (commonUtils.isEmptyArr(slaveDelData)) {
+      slaveDelData = [];
+    }
+    if (sFileName === 'sPartsNameNew') {
+      if (commonUtils.isNotEmptyArr(controlData)) {
+        /* 离开时 把sPartsNameNewId数据挂载到sControlParentId */
+        let iIndex = controlData.findIndex(item => item.sId === record.sId);
+        if (iIndex === -1) {
+          if (record.sId && record.sId.split('-').length > 1) {
+            iIndex = controlData.findIndex(item => item.sId === record.sId.split('-')[0]);
+          }
+        }
+        if (iIndex > -1) {
+          addState.sControlParentId = controlData[iIndex].sPartsNameNewId;
+          if (commonUtils.isNotEmptyObject(controlData[iIndex].sPartsNameNewId)) {
+            controlData[iIndex] = { ...controlData[iIndex], ...addState };
+            props.onSaveState({ controlData: controlData });
+          }
+        }
+      }
+    } else if (tableConfig.sDropDownType === 'movesql') { /* 通用字段离开调下拉事件 */
+      let slaveRow = record;
+      const sqlDropDownData = await getSqlDropDownData(sModelsId, name, tableConfig, slaveRow);
+      const dDropDownData = sqlDropDownData.dropDownData;
+      const iIndex = tableData.findIndex(item => item.sId === record.sId);
+      if (commonUtils.isNotEmptyArr(dDropDownData) && iIndex > -1) {
+        slaveRow = { ...slaveRow, ...commonFunc.getAssignFieldValue(tableConfig.sAssignField, dDropDownData[0]) }; // 取赋值字段
+        slaveRow.handleType = commonUtils.isEmpty(slaveRow.handleType) ? 'update' : slaveRow.handleType;
+        const sButtonParam = tableConfig.sButtonParam; /* 设置多级联动 */
+        if (commonUtils.isNotEmptyObject(sButtonParam)) {
+          let sLinkFieldName = 'dMaterialsPrice';
+          if (commonUtils.isJSON(sButtonParam)) { /* 按钮条件 */
+            const linkObj = JSON.parse(sButtonParam); /* 联动配置 */
+            let models = 'Materials';
+            if (linkObj.linkMaterials) {
+              sLinkFieldName = linkObj.linkMaterials;
+              models = 'Materials';
+            } else if (linkObj.linkProduct) {
+              sLinkFieldName = linkObj.linkProduct;
+              models = 'Product';
+            }
+            slaveRow = commonBusiness.getCalculateAllMoney(app, models, sLinkFieldName, masterData, slaveRow);
+          }
+        }
 
+        tableData[iIndex] = { ...tableData[iIndex], ...slaveRow };
+        handleSaveState({ ...addState });
+      }
+    } else if (commonUtils.isNotEmptyObject(tableConfig) && commonUtils.isNotEmptyObject(tableConfig.sButtonParam)) {
+      let slaveNewData = [];
+      const allConfig = { slaveConfig };
+      // console.log('sTmpInfoConfigArr', sTmpInfoConfigArr);
+      const sTmpInfoConfig = tableConfig;
+      const sButtonParam = tableConfig.sButtonParam;
+      const btn = commonUtils.isNotEmptyObject(sButtonParam) && commonUtils.isJSON(sButtonParam) ? JSON.parse(sButtonParam) : {};;
+      const sProName = commonUtils.isNotEmptyObject(btn) ? btn.sproName : '';
+      const sTmpInfoBySqlBtnName = commonUtils.isNotEmptyObject(btn) ? btn.sControlName : '';
+      const sActiveKey = sTmpInfoConfig.sActiveKey;
+      if (commonUtils.isNotEmptyObject(sTmpInfoConfig)) {
+        if (commonUtils.isEmptyObject(sTmpInfoBySqlBtnName)) {
+          const newCopyTo = {};
+          newCopyTo.master = masterData;
+          // newCopyTo.slave = commonUtils.isEmpty(slaveData) ? [] : slaveData[0];
+          // const sRowData = copyTo.slaveData;
+          const sRowData = masterData;
+          const value = { sProName, sProInParam: JSON.stringify({ params: sRowData }) };
+          if (other?.iFlag === 1) {
+            value.iFlag = 1;
+          }
+          const url = `${commonConfig.server_host}procedureCall/doGenericProcedureCall?sModelsId=${sModelsId}`;
+          const dataReturn = (await commonServices.postValueService(app.token, value, url)).data;
+          if (dataReturn.code === 1) {
+            if (commonUtils.isNotEmptyArr(slaveDataOld)) {
+              slaveDataOld.forEach((item) => {
+                item.handleType = 'del';
+                slaveDelData.push(item);
+              });
+              addState.slaveDelData = slaveDelData;
+            }
+            const returnData = dataReturn.dataset.rows[0];
+            const slaveReturn = returnData.dataSet.proData;
+            if (commonUtils.isNotEmptyArr(slaveReturn)) {
+              slaveReturn.forEach((slaveItem) => {
+                newCopyTo.slave = slaveItem;
+                let slaveRow = commonFunc.getDefaultData(allConfig.slaveConfig, newCopyTo); // 取默认值
+                // if (salveDetailAssignField) {
+                //   slaveRow = {...slaveRow, ...commonFunc.getAssignFieldValue(salveDetailAssignField, copyTo.masterData, newCopyTo)};
+                // } else if (salveAssignField) {
+                //   slaveRow = {...slaveRow, ...commonFunc.getAssignFieldValue(salveAssignField, slaveItem, newCopyTo)}; // 取赋值字段
+                // }
+                slaveRow = { ...slaveRow, ...slaveItem };
+                slaveRow.handleType = 'add';
+                slaveRow.sId = commonUtils.createSid();
+                slaveRow.sParentId = masterData.sId;
+                slaveNewData.push(slaveRow);
+              });
+            }
+            addState.slaveData = slaveNewData;
+            handleSaveState({ ...addState });
+          } else {
+            getServiceError({ ...dataReturn, fn: () => handleTableBlur(name, sFileName, record, tableConfig, { iFlag: 1 }) });
+          }
+        } else if (sTmpInfoBySqlBtnName.includes('sTmpInfoBySql')) { /* 走TmpInfo逻辑 */
+          const newCopyTo = {};
+          newCopyTo.master = masterData;
+          /* 找到自定义TempInfo配置 */
+
+          const btnConfig = tempConfig.gdsconfigformslave.filter(item => item.sControlName.includes(sTmpInfoBySqlBtnName));
+          const dataUrl = `${commonConfig.server_host}salesorder/getTmpInfoBySql/?sModelsId=${sModelsId}`;
+          const sConfigformId = commonUtils.isEmpty(btnConfig) ? '' : btnConfig[0].sParentId;
+          const sControlName = commonUtils.isNotEmptyObject(sTmpInfoBySqlBtnName) ? sTmpInfoBySqlBtnName : 'TmpInfoBySql';
+          const sAssignField = btnConfig[0].sAssignField;
+          const sActiveKeyNew = btnConfig[0].sActiveKey;
+          let sRowData = [record];
+          if (name === 'master' && sTmpInfoBySqlBtnName.includes('_update')) {
+            const { slaveData } = state;
+            if (commonUtils.isNotEmptyArr(slaveData)) {
+              sRowData = [...sRowData, ...slaveData];
+            }
+          }
+          const values = { sConfigformId, sControlName, sRowData };
+          if (true) {
+            const dataReturn = (await commonServices.postValueService(app.token, values, dataUrl)).data;
+            const allReturnMap = {};
+            if (dataReturn.code === 1) {
+              const returnData = dataReturn.dataset.rows[0];
+              if (commonUtils.isNotEmptyObject(returnData)) {
+                for (const key of Object.keys(returnData)) {
+                  const sName = `${key}Data`;
+                  const sDelName = `${key}DelData`;
+                  // allReturnMap[sName] = returnData[key];
+                  let { [`${key}Data`]: oldData, [`${key}Data`]: oldDelData } = state;
+                  if (commonUtils.isEmptyArr(oldDelData)) {
+                    oldDelData = [];
+                  }
+                  if (commonUtils.isEmptyArr(oldData)) {
+                    oldData = [];
+                  }
+                  if (sTmpInfoBySqlBtnName.includes('_edit')) { /* 替换 根据对应字段对比 相同的不管 不同的插入  */
+                    /* 对应字段 */
+                    const sActiveKey = sTmpInfoConfig.sActiveKey;
+                    const keyData = returnData[key];
+                    let newData = [];
+                    if (commonUtils.isNotEmptyArr(keyData)) {
+                      keyData.forEach((child) => {
+                        const filterData = oldData.filter(item => item[sActiveKeyNew] !== child[sActiveKeyNew]);
+                        if (commonUtils.isNotEmptyArr(filterData) && filterData.length === oldData.length) {
+                          const tableRow = { ...child, ...commonFunc.getAssignFieldValue(sAssignField, child) }; // 取赋值字段111
+                          tableRow.sId = commonUtils.createSid();
+                          tableRow.sParentId = masterData.sId;
+                          tableRow.handleType = 'add';
+                          newData.push(tableRow);
+                        } else {  /* 相同的根据赋值字段覆盖 */
+                          const iIndex = oldData.findIndex(item => item[sActiveKeyNew] === child[sActiveKeyNew]);
+                          if (iIndex > -1) {
+                            if (sAssignField) {
+                              oldData[iIndex] = { ...oldData[iIndex], ...commonFunc.getAssignFieldValue(sAssignField, child) };
+                            } else {
+                              oldData[iIndex] = { ...oldData[iIndex], ...child };
+                            }
+                            oldData[iIndex].handleType = commonUtils.isEmpty(oldData[iIndex].handleType) ? 'update' : oldData[iIndex].handleType;
+                          }
+                        }
+                      });
+                      newData = oldData.concat(newData)
+                    }
+
+                  } else if (sTmpInfoBySqlBtnName.includes('_del')) { /* 替换 根据对应字段对比 相同的不管 不同的插入  */
+                    /* 对应字段 */
+                    oldData.forEach((child) => {
+                      child.handleType = 'del';
+                      oldDelData.push(child);
+                    });
+                    allReturnMap[sDelName] = oldDelData;
+                    oldData = [];
+                    const keyData = returnData[key];
+                    if (commonUtils.isNotEmptyArr(keyData)) {
+                      keyData.forEach((child) => {
+                        const tableRow = { ...child, ...commonFunc.getAssignFieldValue(sAssignField, child) }; // 取赋值字段111
+                        tableRow.sId = commonUtils.createSid();
+                        if (sName === 'slaveData' && !tableRow.sSqlConditionId) {
+                          tableRow.sSqlConditionId = tableRow.sId;
+                        }
+                        tableRow.sParentId = masterData.sId;
+                        tableRow.handleType = 'add';
+                        oldData.push(tableRow);
+                      });
+                    }
+                    allReturnMap[sName] = oldData;
+                  } else if (sTmpInfoBySqlBtnName.includes('_update')) { /* 更新字段  */
+                    const keyData = returnData[key];
+                    if (commonUtils.isNotEmptyArr(keyData) && sActiveKeyNew) {
+                      const [linkField, onchangeField] = sActiveKeyNew.split(',');
+                      const tableName = key.split('_update')[0];
+                      const { [`${tableName}Data`]: tableData = [] } = state;
+
+                      for (let i = 0; i < keyData.length; i++) {
+                        const child = keyData[i];
+                        const tableDataFilter = tableData.filter(item => item[linkField] === child[linkField]);
+                        for (let j = 0; j < tableDataFilter.length; j++) {
+                          const item = tableDataFilter[j];
+                          const iIndex = tableData.findIndex(row => row.sId === item.sId);
+                          tableData[iIndex] = { ...item, ...child };
+                          if (onchangeField && state.onEventDataChange) {
+                            const { sId, [onchangeField]: fieldsValue } = tableData[iIndex];
+                            window.tmpSlaveData = tableData;
+                            tableData[iIndex] = await state.onEventDataChange('slave', onchangeField, { [onchangeField]: fieldsValue }, sId, [], true);
+                            window.tmpSlaveData = null;
+                          }
+                        }
+                      }
+                      allReturnMap[`${tableName}Data`] = tableData;
+                    }
+                  } else {
+                    allReturnMap[sName] = returnData[key];
+                  }
+
+                }
+                if (commonUtils.isNotEmptyArr(allReturnMap.masterData) && Array.isArray(allReturnMap.masterData)) {
+                  allReturnMap.masterData = allReturnMap.masterData[0];
+                }
+                handleSaveState({ ...allReturnMap });
+              }
+            } else {
+              getServiceError(dataReturn);
+            }
+          }
+        }
+      } else {
+        message.error('请正确配置自定义按钮！');
+      }
+    }
+  };
   // 通用表格行按钮操作
   const handleTableBtnClick = async params => {
     const { app } = props;
@@ -2961,7 +3312,8 @@ const useCommonBase = props => {
     onCopyTo: handleCopyTo, // 复制到
     onMergeTableConfig: handleMergeTableConfig, // 合并config配置和所有sButtonEnabled配置
     awaitPromiseReturn: awaitPromiseReturn,
-    onSelectCommonPopup: handleSelectCommonPopup
+    onSelectCommonPopup: handleSelectCommonPopup,
+    onDropDownBlur: handleTableBlur
   };
 
   // 切换页面时，加载角标数据
diff --git a/src/components/Common/CommonListTreeEvent.js b/src/components/Common/CommonListTreeEvent.js
index 620b8d6..654cf69 100644
--- a/src/components/Common/CommonListTreeEvent.js
+++ b/src/components/Common/CommonListTreeEvent.js
@@ -2355,6 +2355,8 @@ export default (ChildComponent) => {
           // onBtnEent={this.handleBtnEent}
           onOeeBtnEent={this.handleOeeBtnEent} // onBtnEent={this.handleBtnEent}
           onGetSlaveTreeData={this.handleGetSlaveTreeData}
+            onDropDownBlur={console.log(11111)
+            }
         />
       );
     }
diff --git a/src/components/Common/CommonSubBillEvent.js b/src/components/Common/CommonSubBillEvent.js
index 792bf95..ae9669b 100644
--- a/src/components/Common/CommonSubBillEvent.js
+++ b/src/components/Common/CommonSubBillEvent.js
@@ -5565,6 +5565,7 @@ export default (ChildComponent) => {
           onContextMenuOk={this.handleContextMenuOk}
           orderNum={this.orderNum}
           onSelectCommonPopup={this.handleSelectCommonPopup} /* 送货单个性化放大镜弹窗 */
+          }
         />
       );
     }
diff --git a/src/components/Common/CommonViewTable/index.js b/src/components/Common/CommonViewTable/index.js
index 8ab0bbd..fd2a113 100644
--- a/src/components/Common/CommonViewTable/index.js
+++ b/src/components/Common/CommonViewTable/index.js
@@ -525,7 +525,8 @@ class CommonViewTableRc extends Component {
                 onCostomChange: this.props.onCostomChange, // 控件后自定义按钮事件,
                 onExecInstructSet: this.props.onExecInstructSet, // 调用指令集
                 handleReportInfo: this.props.handleReportInfo,
-                showTooltip: this.props.showTooltip
+                showTooltip: this.props.showTooltip,
+                onDropDownBlur: this.props.onDropDownBlur
               };
               return (
                 <Col
diff --git a/src/mes/common/commonModelComponent/index.js b/src/mes/common/commonModelComponent/index.js
index 7a17207..3864033 100644
--- a/src/mes/common/commonModelComponent/index.js
+++ b/src/mes/common/commonModelComponent/index.js
@@ -1580,7 +1580,6 @@ const CommonViewTableComponent = props => {
           viewRow,
           tableName: sName
         };
-        console.log(viewProps, 'viewProps');
         
         if (commonUtils.isEmptyObject(viewRow)) {
           viewProps.enabledNew = false;
--
libgit2 0.22.2