custom/上海港湾多语言

pc4mobx/hrmSalary/pages/payroll/templateBaseSettings.js

@@ -169,7 +169,7 @@ class TemplateBaseSettings extends Component {
               </WeaFormItem>
             </React.Fragment>
           }
-          <WeaFormItem label={getLabel(111, "启用工资单反馈")} labelCol={{ span: 2 }} wrapperCol={{ span: 4 }}>
+          <WeaFormItem label={getLabel(547986, "启用工资单反馈")} labelCol={{ span: 2 }} wrapperCol={{ span: 4 }}>
             <WeaCheckbox value={feedbackStatus} display="switch"
                          onChange={feedbackStatus => this.setState({
                            ackFeedbackSetting: {
@@ -180,7 +180,7 @@ class TemplateBaseSettings extends Component {
           {
             feedbackStatus === "1" &&
             <React.Fragment>
-              <WeaFormItem label={getLabel(111, "PC端反馈流程地址")} labelCol={{ span: 2 }} wrapperCol={{ span: 4 }}>
+              <WeaFormItem label={getLabel(547987, "PC端反馈流程地址")} labelCol={{ span: 2 }} wrapperCol={{ span: 4 }}>
                 <WeaInput
                   value={feedBackUrl} viewAttr={3}
                   onChange={feedBackUrl => this.setState({
@@ -189,7 +189,7 @@ class TemplateBaseSettings extends Component {
                     }
                   })}/>
               </WeaFormItem>
-              <WeaFormItem label={getLabel(111, "移动端反馈流程地址")} labelCol={{ span: 2 }} wrapperCol={{ span: 4 }}>
+              <WeaFormItem label={getLabel(547988, "移动端反馈流程地址")} labelCol={{ span: 2 }} wrapperCol={{ span: 4 }}>
                 <WeaInput
                   value={mobileFeedbackUrl} viewAttr={3}
                   onChange={mobileFeedbackUrl => this.setState({

pc4mobx/hrmSalary/pages/payrollRelease/components/conditions.js

@@ -208,7 +208,7 @@ export const tempBaseSetFbConditions = [
         domkey: ["feedbackStatus"],
         fieldcol: 2,
         label: "启用工资单反馈",
-        lanId: 111,
+        lanId: 547986,
         labelcol: 6,
         value: "1",
         viewAttr: 2
@@ -219,7 +219,7 @@ export const tempBaseSetFbConditions = [
         domkey: ["feedbackUrl"],
         fieldcol: 14,
         label: "PC端反馈流程地址",
-        lanId: 111,
+        lanId: 547987,
         labelcol: 6,
         value: "/",
         viewAttr: 3,
@@ -232,7 +232,7 @@ export const tempBaseSetFbConditions = [
         domkey: ["mobileFeedbackUrl"],
         fieldcol: 14,
         label: "移动端反馈流程地址",
-        lanId: 111,
+        lanId: 547988,
         labelcol: 6,
         value: "/",
         viewAttr: 3,

pc4mobx/hrmSalary/pages/reportView/components/povitpivotChartModal.js

@@ -36,8 +36,8 @@ class PovitpivotChartModal extends Component {
 
   componentWillReceiveProps(nextProps, nextContext) {
     if (nextProps.visible !== this.props.visible && nextProps.visible) {
-      const { id, dimensionId, dimensionValue, isShare } = nextProps;
-      this.getDataPerspective({ id, dimensionId, dimensionValue, isShare });
+      const { id, dimensionId, dimensionValue, isShare, salaryStartMonth, salaryEndMonth } = nextProps;
+      this.getDataPerspective({ id, dimensionId, dimensionValue, isShare, salaryStartMonth, salaryEndMonth });
     } else {
       this.setState({
         dataSource: [],
@@ -64,11 +64,11 @@ class PovitpivotChartModal extends Component {
       });
     } else if (type === "turn") {
       if (id === "PAGEINFO") {
-        const { id, dimensionId, dimensionValue, isShare } = this.props;
+        const { id, dimensionId, dimensionValue, isShare, salaryStartMonth, salaryEndMonth } = this.props;
         const { pageNum: current, size: pageSize } = params;
         this.setState({ pageInfo: { ...pageInfo, current, pageSize } }, () =>
           this.getDataPerspective({
-            id, dimensionId, dimensionValue, isShare
+            id, dimensionId, dimensionValue, isShare, salaryStartMonth, salaryEndMonth
           }));
       }
     }
@@ -79,7 +79,7 @@ class PovitpivotChartModal extends Component {
     const i18n = {
       "总计": getLabel(523, "总计"), "共": getLabel(18609, "共"),
       "条": getLabel(18256, "条"), "第": getLabel(15323, "第"),
-      "次": getLabel(18929, "次"),
+      "次": getLabel(18929, "次")
     };
     childFrameObj && childFrameObj.contentWindow.postMessage(JSON.stringify({
       dataSource, columns, showSum, pageInfo, i18n
@@ -111,8 +111,10 @@ class PovitpivotChartModal extends Component {
   };
   exportDataPerspective = () => {
     WeaLoadingGlobal.start();
-    const { id, dimensionId, dimensionValue, isShare } = this.props;
-    const promise = API.exportDataPerspective({ id, dimensionId, dimensionValue, isShare });
+    const { id, dimensionId, dimensionValue, isShare, salaryStartMonth, salaryEndMonth } = this.props;
+    const promise = API.exportDataPerspective({
+      id, dimensionId, dimensionValue, isShare, salaryStartMonth, salaryEndMonth
+    });
     WeaLoadingGlobal.destroy();
   };
 

pc4mobx/hrmSalary/pages/reportView/components/reportContent.js

@@ -68,10 +68,15 @@ class ReportContent extends Component {
       if (id === "PIVOTCHART") {
         const { record } = params;
         const { dimension: dimensionValue } = record;
-        const { id: pivotId, dimensionId, isShare } = this.props.report;
+        const {
+          id: pivotId, dimensionId, isShare, timeType, salaryEndMonth: end, salaryStartMonth: start
+        } = this.props.report;
+        const [salaryStartMonth, salaryEndMonth] = getSalaryMonthValue(timeType);
+
         this.setState({
           povitView: {
-            visible: true, id: pivotId, dimensionId, dimensionValue, isShare
+            visible: true, id: pivotId, dimensionId, dimensionValue, isShare,
+            salaryStartMonth: (salaryStartMonth || start) + "-01", salaryEndMonth: (salaryEndMonth || end) + "-01"
           }
         });
       }