1.处理单据修改点击不动问题

Min
1 parent b1ef056e
Showing 2 changed files with 31 additions and 2 deletions
src/components/Common/CommonBillEvent.js
src/components/Common/PersonCenter/PersonCenterAddFace.js
@@ -2069,7 +2069,36 @@ export default (ChildComponent) =&gt; {
           }
         }
       };
-      this.props.handleSendSocketMessage('update', 'showMsg', currentId, userinfo.sId, null, null);
+      // 检查WebSocket连接状态
+      const isWebSocketConnected = app.webSocket && app.webSocket.readyState === 1; // 1表示连接正常
+      console.log('检查WebSocket连接状态', isWebSocketConnected);
+      if (isWebSocketConnected) {
+        // 发送WebSocket消息
+        this.props.handleSendSocketMessage('update', 'showMsg', currentId, userinfo.sId, null, null);
+
+        // 添加超时机制，防止WebSocket断链导致按钮一直加载
+        setTimeout(() => {
+          // 检查是否仍然处于加载状态
+          if (this.props.loading) {
+            this.props.onSaveState({ loading: false });
+            console.log('网络连接超时，请检查网络后重试');
+          }
+        }, 10000); // 10秒超时
+      } else {
+        // WebSocket未连接，直接执行编辑操作
+        // console.log('WebSocket未连接，直接执行编辑操作');
+        try {
+          await this.handleGetData(masterConfig, slaveConfig, checkConfig,'update');
+          if (cb && typeof cb === 'function') {
+            this.props.onSaveState({ enabled: false, calculated: false }, () => { cb(); });
+          } else {
+            this.props.onSaveState({ enabled: true, calculated: false, loading: false });
+          }
+        } catch (error) {
+          this.props.onSaveState({ loading: false });
+          message.error('修改操作失败，请重试');
+        }
+      }
     };
     /**   表单回带   */
     handleForm = (form) => {
@@ -10,7 +10,7 @@ const PersonCenterAddFace = Form.create({
   mapPropsToFields(props) {},
 })(props => {
   const { onCancel, handleModalClose, addFaceVisible } = props;
-  console.log('sssaddFaceVisibles', addFaceVisible);
+
   const GetFace = commonFunc.showMessage(props.app.commonConst, "GetFace"); /* 在线用户 */
   return (
     <div>