Merge branch 'release/2.9.9.2312.01' into release/2.9.9.2312.01-个税

pc4mobx/hrmSalary/index.js

@@ -158,7 +158,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}/>

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":
         //重新核算

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,6 +163,7 @@ export default class PlaceOnFileDetail extends React.Component {
     };
 
     return (
+      <Layout {...this.props}>
         <div className="placeOnFileDetail">
           <CustomTab
             searchOperationItem={
@@ -227,6 +229,7 @@ export default class PlaceOnFileDetail extends React.Component {
               closeMaskOnClick={() => this.setState({ slideVisiable: false })}/>
           }
         </div>
+      </Layout>
     );
   }
 }

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 };

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,

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]) : []}
                   >

pc4mobx/hrmSalary/pages/salaryItem/options.js

@@ -62,7 +62,17 @@ export const patternOptions = [
     showname: "6",
     selected: false
   },
-]
+  {
+    key: "7",
+    showname: "7",
+    selected: false
+  },
+  {
+    key: "8",
+    showname: "8",
+    selected: false
+  }
+];
 
 export const dataTypeOptions = [
   {
@@ -74,5 +84,5 @@ export const dataTypeOptions = [
     key: "string",
     showname: "字符",
     selected: false
-    },
-]
+  }
+];