选择工序

chenxt
1 parent f514bccf
Showing 3 changed files with 40 additions and 10 deletions
src/components/Common/CommonHooks/useCommonBase.js
src/components/Common/CommonTable/index.js
src/routes/mes/routerComponent.js
@@ -357,7 +357,7 @@ const useCommonBase = props =&gt; {
       condition.pageSize = ''
       delete condition.sSqlCondition
     }
-    if (name.includes('slave') && pageRoute.includes('indexPage/commonBill') ) {
+    if (name.includes('slave') && pageRoute.includes('indexPage/commonBill')) {
       delete condition.sSqlCondition
       delete condition.sId
       condition.sSqlCondition = {
@@ -365,7 +365,7 @@ const useCommonBase = props =&gt; {
       }
     }
     // 只有弹窗没有不查询
-    if (name === 'master' && sId === '' && props.parentProps && pageRoute.includes('indexPage/commonBill') ) return
+    if (name === 'master' && sId === '' && props.parentProps && pageRoute.includes('indexPage/commonBill')) return
     const dataUrl = `${commonConfig.server_host
       }business/getBusinessDataByFormcustomId/${configDataId}?sModelsId=${sModelsId}&sName=${formSrcRoute}`;
     const dataReturn = (await commonServices.postValueService(
@@ -2503,12 +2503,12 @@ const useCommonBase = props =&gt; {
   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,slaveSelectedData = []} = state;
+    let { slaveData: slaveDataOld, masterData, slaveDelData, slaveSelectedData = [] } = state;
     const addState = {};
     if (commonUtils.isEmptyArr(slaveDelData)) {
       slaveDelData = [];
     }
-    
+
     if (sFileName === 'sPartsNameNew') {
       if (commonUtils.isNotEmptyArr(controlData)) {
         /* 离开时 把sPartsNameNewId数据挂载到sControlParentId */
@@ -2570,7 +2570,7 @@ const useCommonBase = props =&gt; {
           newCopyTo.master = masterData;
           // newCopyTo.slave = commonUtils.isEmpty(slaveData) ? [] : slaveData[0];
           // const sRowData = copyTo.slaveData;
-          const sRowData = masterData ? masterData :  slaveDataOld[0];
+          const sRowData = masterData ? masterData : slaveDataOld[0];
           const value = { sProName, sProInParam: JSON.stringify({ params: sRowData }) };
           if (other?.iFlag === 1) {
             value.iFlag = 1;
@@ -2981,7 +2981,7 @@ const useCommonBase = props =&gt; {
     if (location.pathname.includes("indexPad")) {
       addState.enabled = true;
     }
-    
+
     handleSaveState(
       {
         ...addState,
@@ -3444,6 +3444,21 @@ const useCommonBase = props =&gt; {
     const props = { ...obj, ...state };
     handleOkDel(props);
   };
+  const handleBtnChoose = async (name, sControlName, chooseConfig, recordIndex, tableName) => {
+    console.log("🚀 ~ handleBtnChoose ~ chooseConfig:", name, sControlName, chooseConfig, recordIndex, tableName)
+    return
+    const { token } = props;
+    const url = `${commonConfig.server_host}/gdsmodule/getGdsmoduleById/${chooseConfig.sActiveId}?sModelsId=${chooseConfig.sActiveId}`;
+    const dataReturn = (await commonServices.getService(token, url)).data;
+    if (dataReturn.code === 1) {
+      const [returnData] = dataReturn.dataset.rows;
+      props.onSaveState({
+        [`${name}ChooseVisible`]: true, [`${name}ChooseData`]: returnData, slaveSelectedIndex: recordIndex, tableName,
+      });
+    } else {
+      props.getServiceError(dataReturn);
+    }
+  };
   /* 确定要删除 */
   const handleOkDel = async (props) => {
     /*   数据参数   */
@@ -3723,6 +3738,7 @@ const useCommonBase = props =&gt; {
     onSelectCommonPopup: handleSelectCommonPopup,
     onDropDownBlur: handleTableBlur,
     onDel: handleDel, // 删除
+    onBtnChoose: handleBtnChoose, // 工序选择
     // onBtnExamine: handleAudit,
   };
  
@@ -4770,11 +4770,16 @@ class CommonTableRc extends React.Component {
           let { rowTag } = record || {}
           let operateMaterial = null;
           let operatePopupModal = null
+          let operateProcess = null;
           const modalProps = { ...this.getModalPropsTableRow(), disabled: false };
           /* 通用弹窗按钮 */
           const choosePopupProps = { ...this.getPopupPropsTableRow(), disabled: false };
           const chooseParamProps = { ...this.getParamPropsTableRow(), disabled: false };
           const materialIcon = true || props.tableProps.setMaterial; /* 材料操作 */
+          const processIcon = true; /* 工序操作 */
+          /*   获取choose的props   */
+          const chooseProcessProps = { ...this.getChooseProcessPropsTableRow(), disabled: false };
+          console.log("🚀 ~ CommonTableRc ~ processIcon:", processIcon)
           /** 放置选择材料图标 */
           if (materialIcon) {
             const setMaterial = commonFunc.showMessage(
@@ -4791,7 +4796,12 @@ class CommonTableRc extends React.Component {
               }}
             />
           }
-
+          /** 放置选择工序材料图标 */
+          if (!commonUtils.isEmpty(processIcon)) {
+            const enabled = this.getTableBtnState('BtnChooseProcess', record);
+            const setProcess = commonFunc.showMessage(props.app.commonConst, 'setProcess');/* 选择工序 */
+            operateProcess = <a title={setProcess} {...chooseProcessProps} onClick={enabled ? this.chooseProcessTbRow.bind(this, index) : null} >{enabled ? <SvgIcon iconClass="process" fill="#1296db" size="14" alt="选择工序"></SvgIcon> : <SvgIcon iconClass="process" fill="rgb(189, 189, 189)" size="14" alt="选择工序"></SvgIcon>}</a>;
+          }
           if (this.isPopupShow) {
             const enabled = this.getTableBtnState('BtnPopup', record);
             const setDownload = commonFunc.showMessage(props.app.commonConst, 'setPopup');/* 弹窗 */
@@ -4806,7 +4816,7 @@ class CommonTableRc extends React.Component {
                 tableData: props.data
               })
               : props.tableBtnsConfig || [];
-
+              
           return (
             <div
               className="operate-bar"
@@ -4905,6 +4915,7 @@ class CommonTableRc extends React.Component {
                 props.mesMaterials ? props.mesMaterials({ tableName: props.name, record, index }) : ''
               } */}
               {operatePopupModal}
+              {operateProcess}
             </div>
           );
         },
@@ -8093,8 +8104,9 @@ class CommonTableRc extends React.Component {
   handleChooseProcessRow = () => {
     if (
       commonUtils.isNotEmptyObject(this.props.tableProps.chooseProcessConfigRow)
-    ) {
+    ) { 
       const iIndex = this.props.tableProps.chooseProcessConfigRow;
+      console.log("🚀 ~ CommonTableRc ~ this.props.tableProps:", this.props)
       this.props.onBtnChoose("process", "BtnChooseProcess", iIndex);
     }
   };
@@ -18,6 +18,7 @@ export const Route = ({
   modalCallback, // 弹窗按钮回调（弹窗用）
   setExtraBtns, // 设置弹窗下方按钮（弹窗用）
   onCancel, // 弹窗关闭方法
+  onBtnChoose,
 }) => {
   const props = {
     app,
@@ -34,7 +35,8 @@ export const Route = ({
     parentProps,
     modalCallback,
     setExtraBtns,
-    onCancel
+    onCancel,
+    onBtnChoose
   };
  
   return <RouterComponent {...props} />;