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

陈鑫涛
2 parents e32e83c7 dc29d25a
Showing 2 changed files with 54 additions and 7 deletions
src/components/UserRegistration/index.jsx
src/models/app.js
 import { useState, useEffect } from "react";
-import { ConfigProvider, Modal, Form, Input, Select, message } from "antd";
+import { ConfigProvider, Modal, Form, Input, Select, message, Button } from "antd";
 import commonConfig from "@/utils/config";
 import * as commonServices from "@/services/services";
@@ -33,7 +33,7 @@ const UserRegistration = ({ _this }) =&gt; {
   if (!userRegisterMode) return "";
   const props = UserRegistrationEvent();
-  const { customerData = [] } = props;
+  const { customerData = [], successModalVisible } = props;
   const [form] = Form.useForm();
@@ -47,13 +47,40 @@ const UserRegistration = ({ _this }) =&gt; {
     form.submit();
   };
-  const onFinish = values => {
-    console.log("=====Success:", values);
+  const onFinish = ({ username, phonenumber, sCustomerId }) => {
+    const url = `${commonConfig.feedback_host}sftlogininfo/insertPasswordUserName/add`;
+    const params = {
+      sUserName: username,
+      sLanguage: "sChinese",
+      sBrandsId: "1111111111",
+      sSubsidiaryId: "1111111111",
+      sPhone: phonenumber,
+      sCustomerId,
+    };
+    commonServices.postValueService("", params, url).then(({ data: result = {} }) => {
+      const { code = -1, msg = "接口出错" } = result;
+      if (code > -1) {
+        props.setState({
+          successModalVisible: true,
+          phonenumber,
+        });
+      } else {
+        message.error(msg);
+      }
+    });
   };
   return (
     <ConfigProvider prefixCls="antdV5">
-      <Modal title="用户注册" open={userRegisterMode} okText="确认" cancelText="取消" onOk={handleOk} onCancel={handleCancel} width={400}>
+      <Modal
+        title="用户注册"
+        open={userRegisterMode && !successModalVisible}
+        okText="确认"
+        cancelText="取消"
+        onOk={handleOk}
+        onCancel={handleCancel}
+        width={400}
+      >
         <Form
           name="basic"
           form={form}
@@ -71,7 +98,7 @@ const UserRegistration = ({ _this }) =&gt; {
           <Form.Item
             label="手机号"
-            name="telenumber"
+            name="phonenumber"
             rules={[
               { required: true, message: "未填写手机号!" },
               {
@@ -93,6 +120,25 @@ const UserRegistration = ({ _this }) =&gt; {
           </Form.Item>
         </Form>
       </Modal>
+      <Modal
+        open={successModalVisible}
+        title="注册成功"
+        onCancel={handleCancel}
+        footer={
+          <Button type="primary" onClick={handleCancel}>
+            确认
+          </Button>
+        }
+        width={400}
+      >
+        <p style={{ fontWeight: "bold", fontSize: 16 }}>请等待【管理员审核】成功后用以下账号登陆！</p>
+        <p>
+          用户名: <span style={{ fontSize: 16 }}>{props.phonenumber}</span>
+        </p>
+        <p>
+          密&nbsp;&nbsp;&nbsp;&nbsp;码: <span style={{ fontSize: 16 }}>{props.phonenumber}</span>
+        </p>
+      </Modal>
     </ConfigProvider>
   );
 };
@@ -539,7 +539,6 @@ export default {
         const webSocket = yield select(state => state.app.webSocket);
         let dataCode = 0;
         const { data } = yield call(services.postValueService, token, value, url);
-        console.log("=====data", data);
         if (utils.isEmpty(webSocket)) {
           const reStart = true;
           yield put({ type: "createWebSocket", payload: { reStart, dispatch } });
@@ -659,6 +658,8 @@ export default {
           // 工单系统消息
           const msgData = JSON.parse(msg.data);
           dispatch({ type: "app/saveWorkMsg", payload: { workMsg: msgData.msg } });
+        } else if (window.tempWsAction) {
+          window.tempWsAction(msg);
         }
       };
       ws.onmessage = msg => {