From 7560e00afb5f9000269f7070cdeb279adb886f29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Wed, 16 Nov 2022 15:44:59 +0800
Subject: [PATCH] =?UTF-8?q?=E8=96=AA=E8=B5=84=E9=A1=B9=E7=9B=AE=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E9=A1=B5=E9=9D=A2=E7=9A=84=E6=96=B0=E5=BB=BA=E8=87=AA?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89=E8=96=AA=E8=B5=84=E9=A1=B9=E7=9B=AE=E7=9A=84?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E9=80=89=E6=8B=A9sql=E7=9A=84=E5=BC=B9?=
 =?UTF-8?q?=E6=A1=86=E6=96=B0=E5=A2=9E=E9=A1=B5=E9=9D=A2=E5=88=87=E6=8D=A2?=
 =?UTF-8?q?=E5=A4=96=E9=83=A8=E6=95=B0=E6=8D=AE=E6=BA=90=E6=97=B6=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E7=A1=AE=E8=AE=A4=E8=AF=A2=E9=97=AE=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/calculateDetail/salaryDetail.js     |  4 +--
 .../pages/salaryItem/formalFormModal.js       | 35 +++++++++++++++----
 2 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/calculateDetail/salaryDetail.js b/pc4mobx/hrmSalary/pages/calculateDetail/salaryDetail.js
index 07be33f2..60826a09 100644
--- a/pc4mobx/hrmSalary/pages/calculateDetail/salaryDetail.js
+++ b/pc4mobx/hrmSalary/pages/calculateDetail/salaryDetail.js
@@ -146,8 +146,8 @@ export default class SalaryDetail extends React.Component {
         <div className="tableWrapper">
           <iframe
             style={{ border: 0, width: "100%", height: "100%" }}
-            // src="http://localhost:7607/#/atdTable"
-            src="/spa/hrmSalary/hrmSalaryCalculateDetail/index.html#/atdTable"
+            src="http://localhost:7607/#/atdTable"
+            // src="/spa/hrmSalary/hrmSalaryCalculateDetail/index.html#/atdTable"
             id="atdTable"
           />
         </div>
diff --git a/pc4mobx/hrmSalary/pages/salaryItem/formalFormModal.js b/pc4mobx/hrmSalary/pages/salaryItem/formalFormModal.js
index 187629e0..f2d1e100 100644
--- a/pc4mobx/hrmSalary/pages/salaryItem/formalFormModal.js
+++ b/pc4mobx/hrmSalary/pages/salaryItem/formalFormModal.js
@@ -1,5 +1,5 @@
 import React from "react";
-import { Button, Col, Icon, Row } from "antd";
+import { Button, Col, Icon, Modal, Row } from "antd";
 import { WeaCheckbox, WeaDialog, WeaFormItem, WeaHelpfulTip, WeaInput, WeaSelect, WeaTextarea } from "ecCom";
 import { inject, observer } from "mobx-react";
 import "./index.less";
@@ -284,12 +284,25 @@ export default class FormalFormModal extends React.Component {
                   options={formulaDatasourceList}
                   value={extendParam.datasource.datasourceId}
                   onChange={(datasourceId) => {
-                    this.setState({ extendParam: { ...extendParam, datasource: { datasourceId } } });
+                    if (datasourceId) {
+                      Modal.confirm({
+                        title: "信息确认",
+                        content: "外部数据源指第三方数据库，连接第三方数据库会影响核算效率。",
+                        onOk: () => {
+                          this.setState({ extendParam: { ...extendParam, datasource: { datasourceId } } });
+                        },
+                        onCancel: () => {
+                          this.setState({ extendParam: { ...extendParam, datasource: { datasourceId: "" } } });
+                        }
+                      });
+                    } else {
+                      this.setState({ extendParam: { ...extendParam, datasource: { datasourceId: "" } } });
+                    }
                   }}
                 />
                 <WeaHelpfulTip
                   width={196}
-                  title="不设置，默认使用系统数据源"
+                  title="不设置，默认使用系统数据源。"
                   isCenter={true}
                 />
               </WeaFormItem>
@@ -300,9 +313,19 @@ export default class FormalFormModal extends React.Component {
                 labelCol={{ span: 6 }}
                 wrapperCol={{ span: 18 }}
               >
-                <WeaCheckbox display="switch" value={extendParam.openDecrypt} onChange={(openDecrypt) => {
-                  this.setState({ extendParam: { ...extendParam, openDecrypt } });
-                }}/>
+                <WeaCheckbox
+                  style={{ marginRight: 8 }}
+                  display="switch"
+                  value={extendParam.openDecrypt}
+                  onChange={(openDecrypt) => {
+                    this.setState({ extendParam: { ...extendParam, openDecrypt } });
+                  }}
+                />
+                <WeaHelpfulTip
+                  width={196}
+                  title="若需要获取薪酬加密数据，需开启解密。"
+                  isCenter={true}
+                />
               </WeaFormItem>
             </Col>
           </Row>