From 0bb52e145a5320680f50444e253d8b3c1de46396 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Tue, 20 Dec 2022 17:22:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=88=90=E6=9C=AC=E4=B8=AD?=
 =?UTF-8?q?=E5=BF=83=E8=B7=B3=E8=BD=AC=E8=BF=9E=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/calculateDetail/salaryDetail.js     |  2 ++
 .../pages/calculateDetail/userSure.js         | 14 +++++----
 .../pages/payroll/payrollGrant/index.js       |  7 +++--
 .../standingBookDetail/components/normal.js   | 12 ++++++--
 .../components/regEditDetial.js               | 30 +++++++++++++------
 .../standingBookDetail/components/regList.js  | 12 +++++++-
 .../components/regression.js                  |  4 +--
 7 files changed, 58 insertions(+), 23 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/calculateDetail/salaryDetail.js b/pc4mobx/hrmSalary/pages/calculateDetail/salaryDetail.js
index 91cf2263..749c7be0 100644
--- a/pc4mobx/hrmSalary/pages/calculateDetail/salaryDetail.js
+++ b/pc4mobx/hrmSalary/pages/calculateDetail/salaryDetail.js
@@ -52,6 +52,8 @@ export default class SalaryDetail extends React.Component {
     if (type === "PR") {
       if (id === "EDIT") {
         this.handleEdit(record);
+      } else if (id === "COSTCENTER") {
+        window.open(record ? record.url : "", "_blank");
       } else if (id === "COLUMNINDEX") {
         if (!extraId) {
           this.setState({ columnIndex: record });
diff --git a/pc4mobx/hrmSalary/pages/calculateDetail/userSure.js b/pc4mobx/hrmSalary/pages/calculateDetail/userSure.js
index c6b0938a..e74a8d8a 100644
--- a/pc4mobx/hrmSalary/pages/calculateDetail/userSure.js
+++ b/pc4mobx/hrmSalary/pages/calculateDetail/userSure.js
@@ -4,7 +4,6 @@ import { WeaBrowser, WeaFormItem, WeaHelpfulTip, WeaInput, WeaSearchGroup, WeaSe
 import { inject, observer } from "mobx-react";
 import "./index.less";
 import { getQueryString } from "../../util/url";
-import { calcPageNo } from "../../util";
 
 @inject("calculateStore", "salaryFileStore")
 @observer
@@ -87,8 +86,8 @@ export default class UserSure extends React.Component {
         <WeaSelect
           value={String(status)}
           options={[
-            { key: "", showname: "" }, {key: "ALL", showname: "全部"},
-            { key: "NORMAL", showname: "在职" }, {key: "UNAVAILABLE", showname: "离职"}
+            { key: "", showname: "" }, { key: "ALL", showname: "全部" },
+            { key: "NORMAL", showname: "在职" }, { key: "UNAVAILABLE", showname: "离职" }
           ]}
           onChange={(val) => this.setState({ searchItemsValue: { ...this.state.searchItemsValue, [key]: val } })}/>
       </WeaFormItem>
@@ -122,6 +121,8 @@ export default class UserSure extends React.Component {
         childFrameObj.contentWindow.postMessage(JSON.stringify(payload), "*"); //window.postMessage
       } else if (id === "DELETE") {
         this.handleDeleteItem(record);
+      } else if (id === "COSTCENTER") {
+        window.open(record.url, "_blank");
       } else if (id === "BATCHDELETE") {
         this.onSelectChange(record);
       } else if (id === "PAGEINFO") {
@@ -144,7 +145,7 @@ export default class UserSure extends React.Component {
           const payload = {
             type: "PC",
             listType: "MA",
-            url: this.state.selectedKey === '1'?"/api/bs/hrmsalary/salaryacct/reducedemployee/list":"/api/bs/hrmsalary/salaryacct/addedemployee/list",
+            url: this.state.selectedKey === "1" ? "/api/bs/hrmsalary/salaryacct/reducedemployee/list" : "/api/bs/hrmsalary/salaryacct/addedemployee/list",
             queryParams: {
               salaryAcctRecordId,
               employeeName: this.state.userListSearchValue,
@@ -223,7 +224,7 @@ export default class UserSure extends React.Component {
               salaryAcctRecordId,
               employeeName: this.state.userListSearchValue,
               ...this.pageInfo,
-              current: 1,
+              current: 1
             }
           };
           childFrameObj.contentWindow.postMessage(JSON.stringify(payload), "*");
@@ -253,7 +254,7 @@ export default class UserSure extends React.Component {
             queryParams: {
               salaryAcctRecordId,
               employeeName: this.state.userListSearchValue,
-              ...this.pageInfo,
+              ...this.pageInfo
             }
           };
           childFrameObj.contentWindow.postMessage(JSON.stringify(payload), "*");
@@ -570,6 +571,7 @@ export default class UserSure extends React.Component {
           <div style={{ width: "100%", height: "calc(100vh - 261px)" }}>
             <iframe
               style={{ border: 0, width: "100%", height: "100%" }}
+              // src="http://localhost:7607/#/atdTable"
               src="/spa/hrmSalary/hrmSalaryCalculateDetail/index.html#/atdTable"
               id="atdTable"
             />
diff --git a/pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js b/pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js
index 8c5e4511..af00f377 100644
--- a/pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js
+++ b/pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js
@@ -216,7 +216,8 @@ export default class PayrollGrant extends React.Component {
 
   getColumns = () => {
     const { payrollStore } = this.props;
-    const { salaryGrantTableStore: columns } = payrollStore;
+    const { salaryGrantTableStore: columns,salarySendDetailBaseInfo } = payrollStore;
+    const notShowGrantOrWithdraw = salarySendDetailBaseInfo.haveBackCalc === 1 && salarySendDetailBaseInfo.salaryAcctType === "0";
     return [
       ...toJS(columns),
       {
@@ -225,7 +226,7 @@ export default class PayrollGrant extends React.Component {
         dataIndex: "",
         display: true,
         render: (text, record) => {
-          if (record.sendStatus === "已发放") {
+          if (record.sendStatus === "已发放" && !notShowGrantOrWithdraw) {
             return (
               <a
                 href="javascript:void(0);"
@@ -233,7 +234,7 @@ export default class PayrollGrant extends React.Component {
                 撤回
               </a>
             );
-          } else {
+          } else if(!notShowGrantOrWithdraw) {
             return (
               <a
                 href="javascript:void(0);"
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js
index afa64704..c85b5dab 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js
@@ -435,12 +435,12 @@ export default class NormalIndex extends Component {
       returnEditPersonSlide: { ...returnEditPersonSlide, visible: true, title: userName, editId }
     });
   };
-  handleCloseNormalStandingBookModal = () => {
+  handleCloseNormalStandingBookModal = (refreshList = false) => {
     const { returnEditPersonSlide } = this.state;
     this.setState({
       returnEditPersonSlide: { ...returnEditPersonSlide, visible: false, title: "", editId: "" }
     }, () => {
-      this.getNormalList();
+      refreshList && this.getNormalList();
     });
   };
 
@@ -489,6 +489,14 @@ export default class NormalIndex extends Component {
     columns = _.map(toJS(columns), item => {
       if (item.dataIndex === "employeeId") {
         return { ...item };
+      } else if (item.dataIndex === "costCenter") {
+        return {
+          ...item,
+          render: (text, record) => {
+            const { costCenter } = record;
+            return <a href={costCenter.url} className="tdEllipsis">{costCenter.name || ""}</a>;
+          }
+        };
       }
       return {
         ...item,
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regEditDetial.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regEditDetial.js
index 5af8b0fd..87f373f4 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regEditDetial.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regEditDetial.js
@@ -110,16 +110,28 @@ class RegEditDetial extends Component {
       otherComJson: {}
     };
     _.forEach(socialData.dataSource, item => {
-      payload["socialPerJson"][item["insuranceId"]] = item.personalPaymentAmount || "0";
-      payload["socialComJson"][item["insuranceId"]] = item.companyPaymentAmount || "0";
+      if (item.personalPaymentAmount) {
+        payload["socialPerJson"][item["insuranceId"]] = item.personalPaymentAmount;
+      }
+      if (item.companyPaymentAmount) {
+        payload["socialComJson"][item["insuranceId"]] = item.companyPaymentAmount;
+      }
     });
     _.forEach(foundData.dataSource, item => {
-      payload["fundPerJson"][item["insuranceId"]] = item.personalPaymentAmount || "0";
-      payload["fundComJson"][item["insuranceId"]] = item.companyPaymentAmount || "0";
+      if (item.personalPaymentAmount) {
+        payload["fundPerJson"][item["insuranceId"]] = item.personalPaymentAmount;
+      }
+      if (item.companyPaymentAmount) {
+        payload["fundComJson"][item["insuranceId"]] = item.companyPaymentAmount;
+      }
     });
     _.forEach(otherData.dataSource, item => {
-      payload["otherPerJson"][item["insuranceId"]] = item.personalPaymentAmount || "0";
-      payload["otherComJson"][item["insuranceId"]] = item.companyPaymentAmount || "0";
+      if (item.personalPaymentAmount) {
+        payload["otherPerJson"][item["insuranceId"]] = item.personalPaymentAmount;
+      }
+      if (item.companyPaymentAmount) {
+        payload["otherComJson"][item["insuranceId"]] = item.companyPaymentAmount;
+      }
     });
     _.forEach(Object.keys(payload), item => {
       payload[item] = JSON.stringify(payload[item]);
@@ -142,7 +154,7 @@ class RegEditDetial extends Component {
       case "social":
         const sociallist = _.map(socialData.dataSource, item => {
           if (item.insuranceId === record.insuranceId) {
-            return { ...item, [dataIndex]: !_.isNil(value) ? String(value): "0" };
+            return { ...item, [dataIndex]: !_.isNil(value) ? String(value) : "0" };
           }
           return { ...item };
         });
@@ -153,7 +165,7 @@ class RegEditDetial extends Component {
       case "fund":
         const fundlist = _.map(foundData.dataSource, item => {
           if (item.insuranceId === record.insuranceId) {
-            return { ...item, [dataIndex]: !_.isNil(value) ? String(value): "0" };
+            return { ...item, [dataIndex]: !_.isNil(value) ? String(value) : "0" };
           }
           return { ...item };
         });
@@ -164,7 +176,7 @@ class RegEditDetial extends Component {
       case "other":
         const otherlist = _.map(otherData.dataSource, item => {
           if (item.insuranceId === record.insuranceId) {
-            return { ...item, [dataIndex]: !_.isNil(value) ? String(value): "0" };
+            return { ...item, [dataIndex]: !_.isNil(value) ? String(value) : "0" };
           }
           return { ...item };
         });
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regList.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regList.js
index 6979d48a..b2dec6f0 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regList.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regList.js
@@ -74,7 +74,6 @@ class RegList extends Component {
                 ...items,
                 width: 110,
                 title: "姓名",
-                fixed: "left",
                 render: (text, r) => {
                   const { userName } = r;
                   return (
@@ -82,6 +81,17 @@ class RegList extends Component {
                   );
                 }
               };
+            } else if (items.dataIndex === "costCenter") {
+              return {
+                ...items,
+                width: 110,
+                render: (text, r) => {
+                  const { costCenter } = r;
+                  return (
+                    <a href={costCenter.url} className="tdEllipsis">{costCenter.name || ""}</a>
+                  );
+                }
+              };
             }
             return {
               ...items,
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regression.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regression.js
index c3e7a95b..34f11cd5 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regression.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regression.js
@@ -102,14 +102,14 @@ class Regression extends Component {
         break;
     }
   };
-  handleCloseModal = () => {
+  handleCloseModal = (refreshList = false) => {
     const { returnPersonModal, returnEditPersonSlide } = this.state;
     this.setState({
       returnPersonModal: { ...returnPersonModal, visible: false, title: "添加退差人员" },
       returnEditPersonSlide: { ...returnEditPersonSlide, visible: false, title: "", editId: "" }
     }, () => {
       this.regEmmployeeRef.handleReset();
-      this.regListRef.recessionList();
+      refreshList && this.regListRef.recessionList();
     });
   };
   handleEdit = (record) => {