From 2b4b5623bc0be3d4c2ada199bd576fd91494535a 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, 6 Dec 2023 18:28:02 +0800
Subject: [PATCH 1/2] =?UTF-8?q?hotfix/2.9.9.2312.01=20=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E8=96=AA=E8=B3=87=E6=A0=B8=E7=AE=97=E9=A1=B5=E9=9D=A2=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=9D=83=E9=99=90=EF=BC=8C=E7=A7=BB=E5=8A=A8=E7=AB=AF?=
 =?UTF-8?q?=E8=96=AA=E8=B5=84=E6=9F=A5=E7=9C=8B=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pc4mobx/hrmSalary/index.js                    |   2 +-
 .../hrmSalary/pages/calculate/calculate.js    |   2 +-
 pc4mobx/hrmSalary/pages/calculate/index.less  |   5 +
 .../calculateDetail/placeOnFileDetail.js      | 117 +++++++++---------
 .../hrmSalary/pages/mobilePayroll/index.js    |   1 +
 5 files changed, 68 insertions(+), 59 deletions(-)

diff --git a/pc4mobx/hrmSalary/index.js b/pc4mobx/hrmSalary/index.js
index 2179f9ee..c9c0e3cf 100644
--- a/pc4mobx/hrmSalary/index.js
+++ b/pc4mobx/hrmSalary/index.js
@@ -145,7 +145,7 @@ const Routes = (
     <Route key="calculateDetail" path="calculateDetail" component={CalculateDetail}/>
     <Route key="doCalc" path="calculate/:salaryAcctRecordId" component={DoCalcDetail}/>
     <Route key="calcOc" path="calcOc/:salaryAcctRecordId" component={OfflineCompare}/>
-    <Route key="placeOnFileDetail" path="placeOnFileDetail" component={PlaceOnFileDetail}/>
+    <Route key="placeOnFileDetail" path="placeOnFileDetail/:salaryAcctRecordId" component={PlaceOnFileDetail}/>
     <Route key="compareDetail" path="compareDetail" component={CompareDetail}/>
     <Route key="payroll" path="payroll" component={Payroll}/>
     <Route key="watermarkPreview" path="payroll/watermark/preview" component={WatermarkPreview}/>
diff --git a/pc4mobx/hrmSalary/pages/calculate/calculate.js b/pc4mobx/hrmSalary/pages/calculate/calculate.js
index ae98e007..8f886557 100644
--- a/pc4mobx/hrmSalary/pages/calculate/calculate.js
+++ b/pc4mobx/hrmSalary/pages/calculate/calculate.js
@@ -123,7 +123,7 @@ class Calculate extends Component {
         break;
       case "3":
         //查看详情
-        window.open(`/spa/hrmSalary/static/index.html#/main/hrmSalary/placeOnFileDetail?id=${id}`);
+        window.open(`/spa/hrmSalary/static/index.html#/main/hrmSalary/placeOnFileDetail/${id}?id=${id}`);
         break;
       case "4":
         //重新核算
diff --git a/pc4mobx/hrmSalary/pages/calculate/index.less b/pc4mobx/hrmSalary/pages/calculate/index.less
index b0418614..98cfc21f 100644
--- a/pc4mobx/hrmSalary/pages/calculate/index.less
+++ b/pc4mobx/hrmSalary/pages/calculate/index.less
@@ -82,12 +82,17 @@
     }
 
     .ant-table-tbody {
+      .ant-table-row-indent {
+        display: none;
+      }
+
       td {
         span {
           width: 100%;
           overflow: hidden;
           text-overflow: ellipsis;
           white-space: nowrap;
+          display: inline-block;
         }
       }
     }
diff --git a/pc4mobx/hrmSalary/pages/calculateDetail/placeOnFileDetail.js b/pc4mobx/hrmSalary/pages/calculateDetail/placeOnFileDetail.js
index 3f5096fe..4cdd5a9c 100644
--- a/pc4mobx/hrmSalary/pages/calculateDetail/placeOnFileDetail.js
+++ b/pc4mobx/hrmSalary/pages/calculateDetail/placeOnFileDetail.js
@@ -8,8 +8,9 @@ import FileMergeDetail from "./fileMergeDetail";
 import { getQueryString } from "../../util/url";
 import { inject, observer } from "mobx-react";
 import { getExportField } from "../../apis/calculate";
-import "./index.less";
 import CustomExportDialog from "./customExportDialog";
+import Layout from "../calculate/doCalc/layout";
+import "./index.less";
 
 const getLabel = WeaLocaleProvider.getLabel;
 @inject("calculateStore")
@@ -162,17 +163,18 @@ export default class PlaceOnFileDetail extends React.Component {
     };
 
     return (
-      <div className="placeOnFileDetail">
-        <CustomTab
-          searchOperationItem={
-            renderRightOperation()
-          }
-        />
-        <div className="tabWrapper" style={{ borderBottom: "none" }}>
-          <span style={{ marginRight: 10 }}>薪资所属月：{baseSalarySobCycle.salaryMonth}</span>
-          <WeaHelpfulTip
-            width={100}
-            title={`薪资周期\n
+      <Layout {...this.props}>
+        <div className="placeOnFileDetail">
+          <CustomTab
+            searchOperationItem={
+              renderRightOperation()
+            }
+          />
+          <div className="tabWrapper" style={{ borderBottom: "none" }}>
+            <span style={{ marginRight: 10 }}>薪资所属月：{baseSalarySobCycle.salaryMonth}</span>
+            <WeaHelpfulTip
+              width={100}
+              title={`薪资周期\n
                         ${baseSalarySobCycle.salaryCycle && baseSalarySobCycle.salaryCycle.fromDate}至${baseSalarySobCycle.salaryCycle && baseSalarySobCycle.salaryCycle.endDate}\n
                         税款所属期\n
                         ${baseSalarySobCycle.taxCycle}\n
@@ -180,53 +182,54 @@ export default class PlaceOnFileDetail extends React.Component {
                         ${baseSalarySobCycle.attendCycle && baseSalarySobCycle.attendCycle.fromDate}至${baseSalarySobCycle.attendCycle && baseSalarySobCycle.attendCycle.endDate}\n
                         福利台账月份\n
                         引用${baseSalarySobCycle.socialSecurityCycle}的福利台账数据`}
-            placement="topLeft"
+              placement="topLeft"
+            />
+          </div>
+          <div className="tabWrapper">
+            <span>公式=</span>
+            <span>{toJS(columnDescList)[columnIndex] && toJS(columnDescList)[columnIndex].formulaContent}</span>
+          </div>
+          <div className="tableWrapper">
+            <iframe
+              style={{ border: 0, width: "100%", height: "100%" }}
+              // src="http://localhost:7607/#/atdTable"
+              src="/spa/hrmSalary/hrmSalaryCalculateDetail/index.html#/atdTable"
+              id="atdTable"
+            />
+          </div>
+          <CustomExportDialog
+            {...customExportParams}
+            searchItemsValue={{ employeeName: this.state.searchValue }}
+            onCancel={() => {
+              this.setState({
+                customExportParams: {
+                  visible: false, checkItems: [], itemsByGroup: []
+                }
+              });
+            }}
           />
-        </div>
-        <div className="tabWrapper">
-          <span>公式=</span>
-          <span>{toJS(columnDescList)[columnIndex] && toJS(columnDescList)[columnIndex].formulaContent}</span>
-        </div>
-        <div className="tableWrapper">
-          <iframe
-            style={{ border: 0, width: "100%", height: "100%" }}
-            // src="http://localhost:7607/#/atdTable"
-            src="/spa/hrmSalary/hrmSalaryCalculateDetail/index.html#/atdTable"
-            id="atdTable"
-          />
-        </div>
-        <CustomExportDialog
-          {...customExportParams}
-          searchItemsValue={{ employeeName: this.state.searchValue }}
-          onCancel={() => {
-            this.setState({
-              customExportParams: {
-                visible: false, checkItems: [], itemsByGroup: []
+          {
+            slideVisiable &&
+            <WeaSlideModal
+              visible={slideVisiable}
+              top={0}
+              width={40}
+              height={100}
+              direction={"right"}
+              measure={"%"}
+              title={
+                <SlideModalTitle
+                  subtitle={"合并计税详情"}
+                  editable={true}
+                />
               }
-            });
-          }}
-        />
-        {
-          slideVisiable &&
-          <WeaSlideModal
-            visible={slideVisiable}
-            top={0}
-            width={40}
-            height={100}
-            direction={"right"}
-            measure={"%"}
-            title={
-              <SlideModalTitle
-                subtitle={"合并计税详情"}
-                editable={true}
-              />
-            }
-            content={(<FileMergeDetail/>)}
-            onClose={() => this.setState({ slideVisiable: false })}
-            showMask={true}
-            closeMaskOnClick={() => this.setState({ slideVisiable: false })}/>
-        }
-      </div>
+              content={(<FileMergeDetail/>)}
+              onClose={() => this.setState({ slideVisiable: false })}
+              showMask={true}
+              closeMaskOnClick={() => this.setState({ slideVisiable: false })}/>
+          }
+        </div>
+      </Layout>
     );
   }
 }
diff --git a/pc4mobx/hrmSalary/pages/mobilePayroll/index.js b/pc4mobx/hrmSalary/pages/mobilePayroll/index.js
index d742b459..2b2308d1 100644
--- a/pc4mobx/hrmSalary/pages/mobilePayroll/index.js
+++ b/pc4mobx/hrmSalary/pages/mobilePayroll/index.js
@@ -211,6 +211,7 @@ export default class MobilePayroll extends React.Component {
               <div className="templatePreview">
                 <div className="contentWrapper">
                   <PhoneTemplate
+                    isPreview
                     salaryTemplateShowSet={JSON.stringify(mySalaryBillData.salaryTemplate)}
                     salaryItemSet={!_.isEmpty(salaryGroups) ? JSON.stringify([employeeInformation, ...salaryGroups]) : []}
                   >

From e4573bb95e65afc5f41ebd29a1a878227e71428a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Thu, 7 Dec 2023 13:55:52 +0800
Subject: [PATCH 2/2] hotfix/2.9.9.2312.01

---
 .../ledgerPage/components/ledgerSearchComp.js |   5 +-
 pc4mobx/hrmSalary/pages/ledgerPage/config.js  |   1 -
 pc4mobx/hrmSalary/pages/salaryItem/options.js | 154 ++++++++++--------
 3 files changed, 86 insertions(+), 74 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSearchComp.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSearchComp.js
index fa6242ce..a95d9048 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSearchComp.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSearchComp.js
@@ -41,7 +41,10 @@ class LedgerSearchComp extends Component {
                 if (getKey(j) === "taxAgentId") {
                   return {
                     ...j,
-                    options: _.map(data, g => ({ key: g.id, showname: g.content }))
+                    options: [{ key: "", showname: getLabel(332, "全部") }, ..._.map(data, g => ({
+                      key: g.id,
+                      showname: g.content
+                    }))]
                   };
                 }
                 return { ...j };
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/config.js b/pc4mobx/hrmSalary/pages/ledgerPage/config.js
index 0c56f799..9af48b4d 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/config.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/config.js
@@ -48,7 +48,6 @@ export const searchConditions = [
         conditionType: "SELECT",
         domkey: ["taxAgentId"],
         fieldcol: 24,
-        placeholder: "请选择个税扣缴义务人",
         lanId: 543234,
         label: "",
         labelcol: 0,
diff --git a/pc4mobx/hrmSalary/pages/salaryItem/options.js b/pc4mobx/hrmSalary/pages/salaryItem/options.js
index e80e8b89..7dbd51b4 100644
--- a/pc4mobx/hrmSalary/pages/salaryItem/options.js
+++ b/pc4mobx/hrmSalary/pages/salaryItem/options.js
@@ -1,78 +1,88 @@
 export const roundingModeOptions = [
-    {
-        key: "1",
-        selected: false,
-        showname: "原始数据"
-    },
-    {
-        key: "2",
-        selected: false,
-        showname: "四舍五入"
-    },
-    {
-        key: "3",
-        selected: false,
-        showname: "向上舍入"
-    },
-    {
-        key: "4",
-        selected: false,
-        showname: "向下舍入"
-    },
-    {
-        key: "5",
-        selected: false,
-        showname: "见分进角"
-    }
+  {
+    key: "1",
+    selected: false,
+    showname: "原始数据"
+  },
+  {
+    key: "2",
+    selected: false,
+    showname: "四舍五入"
+  },
+  {
+    key: "3",
+    selected: false,
+    showname: "向上舍入"
+  },
+  {
+    key: "4",
+    selected: false,
+    showname: "向下舍入"
+  },
+  {
+    key: "5",
+    selected: false,
+    showname: "见分进角"
+  }
 ];
 
 export const patternOptions = [
-    {
-        key: "0",
-        showname: "0",
-        selected: false
-    },
-    {
-        key: "1",
-        showname: "1",
-        selected: false
-    },
-    {
-        key: "2",
-        showname: "2",
-        selected: false
-    },
-    {
-        key: "3",
-        showname: "3",
-        selected: false
-    },
-    {
-        key: "4",
-        showname: "4",
-        selected: false
-    },
-    {
-        key: "5",
-        showname: "5",
-        selected: false
-    },
-    {
-        key: "6",
-        showname: "6",
-        selected: false
-    },
-]
+  {
+    key: "0",
+    showname: "0",
+    selected: false
+  },
+  {
+    key: "1",
+    showname: "1",
+    selected: false
+  },
+  {
+    key: "2",
+    showname: "2",
+    selected: false
+  },
+  {
+    key: "3",
+    showname: "3",
+    selected: false
+  },
+  {
+    key: "4",
+    showname: "4",
+    selected: false
+  },
+  {
+    key: "5",
+    showname: "5",
+    selected: false
+  },
+  {
+    key: "6",
+    showname: "6",
+    selected: false
+  },
+  {
+    key: "7",
+    showname: "7",
+    selected: false
+  },
+  {
+    key: "8",
+    showname: "8",
+    selected: false
+  }
+];
 
 export const dataTypeOptions = [
-    {
-        key: "number",
-        showname: "数值",
-        selected: false
-    },
-    {
-        key: "string",
-        showname: "字符",
-        selected: false
-    },
-]
+  {
+    key: "number",
+    showname: "数值",
+    selected: false
+  },
+  {
+    key: "string",
+    showname: "字符",
+    selected: false
+  }
+];