Merge branch 'main' of http://git.xlyprint.cn/zhangz/xlyUmi into main

陈鑫涛
2 parents ba89a64f dc5d9c19
Showing 1 changed file with 12 additions and 1 deletions
src/components/QuickQuote/index.jsx
@@ -514,6 +514,17 @@ const QuickQuoteEvent = props =&gt; {
  
   // 核价按钮
   addState.handleCalcPrice = async () => {
+    if (props.app.webSocket === null || props.app.webSocket?.readyState !== WebSocket.OPEN) {
+      console.log("================webSocket连接======================");
+      props.dispatch({
+        type: "app/createWebSocket",
+        payload: { reStart: true, dispatch: props.dispatch },
+      });
+
+      // 暂停2秒
+      await new Promise(resolve => setTimeout(resolve, 2000));
+    }
+
     const { masterConfig, masterData = {}, slaveConfig, slaveData = [], selectedNode = {}, extraParts = {} } = state;
     const selectProduct = commonFunc.showLocalMessage(props, "selectProduct", "请先选择产品");
     if (commonUtils.isEmptyObject(selectedNode)) {
@@ -2953,10 +2964,10 @@ const BackendParamsExtraComponent = props =&gt; {
             sId: commonUtils.createSid(),
             value: changeValue[sFieldName],
             sParam: showConfig.sParam,
-            [sFieldName]: changeValue[sFieldName],
             sParamKey: showConfig.sName0,
             sParamKeyNew: sFieldName,
           };
+      dropDownDataSelected[sFieldName] = dropDownDataSelected.value;
       const { sParam } = dropDownDataSelected;
       const { sBackendParams = [] } = slaveData[iIndex].sBackProcessData[iIndex1];
       const iIndex2 = sBackendParams.findIndex(item => item.sParam === sParam);