Merge branch 'flex' into clearingForm

src/components/combining/index.jsx

@@ -181,6 +181,9 @@ const Combining = forwardRef((props, ref) => {
       obj.origin = obj.only
       obj.send_num = item.send_num
       obj.checked = true
+      if (state.keyPcType == 2) {
+        delete item.id
+      }
       return obj
     })
 
@@ -452,6 +455,7 @@ const Combining = forwardRef((props, ref) => {
                     setInfo({ receive_mode: target.value })
                     if (state.keyPcType === 2) {
                       setState({ rankOptions: [], rank: [], tableData: [] })
+                      sessionStorage.setItem("knockGoldData", JSON.stringify([]))
                     }
                   }}
                   value={info.receive_mode}

src/pages/exchangecode/combiningAdd/index.jsx

@@ -1066,6 +1066,7 @@ export default class combiningAdd extends React.Component {
                         this.handleChange(target.value, "receive_mode")
                         if (this.state.isState === 1) {
                           this.setState({ tempdata: [], rankoptions: [], rank: [] })
+                          sessionStorage.setItem("knockGoldData", JSON.stringify([]))
                         }
                       }}
                       value={this.state.codeInfo.receive_mode}