Merge branch 'release/3.0.1.2504.01-合并业务线' into release/2.19.1.2503.01-业务线个税

pc4mobx/hrmSalary/pages/adjustSalaryManage/index.js

@@ -62,7 +62,7 @@ class Index extends Component {
             if (o.dataIndex === "username") {
               return { ...o, width: 150, fixed: "left" };
             }
-            return { ...o, width: 150 };
+            return { ...o, width: 150, render: (v) => (<span title={v}>{v}</span>) };
           }), {
             dataIndex: "options", title: getLabel(30585, "操作"),
             width: 120, render: (_, record) => (

pc4mobx/hrmSalary/pages/adjustSalaryManage/index.less

@@ -43,5 +43,15 @@
 
     }
   }
+
+  .wea-new-table {
+    .ant-table-tbody > tr > td,
+    .ant-table-thead > tr > th {
+      width: 100%;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+    }
+  }
 }
 

pc4mobx/hrmSalary/pages/mySalary/mySalaryView.js

@@ -13,6 +13,7 @@ import Content from "../../components/pcTemplate/content";
 import { confirmSalaryBill, feedBackSalaryBill, payrollCheckType } from "../../apis/payroll";
 import CaptchaModal from "../../components/captchaModal";
 import "./index.less";
+import { getQueryString } from "../../util/url";
 
 const isIPhone = new RegExp("\\biPhone\\b|\\biPod\\b", "i").test(window.navigator.userAgent);
 const isEm = window.navigator.userAgent.indexOf("E-Mobile7") >= 0;
@@ -84,7 +85,18 @@ class MySalaryView extends Component {
     const { captchaVisible, mySalaryStore } = this.state;
     const { params: { salaryInfoId } } = this.props;
     if (_.isEmpty(mySalaryStore)) {
-      return <div></div>;
+      return <div>
+        <CaptchaModal
+          visible={captchaVisible} id={salaryInfoId}
+          onCancel={() => this.setState({ captchaVisible: false })}
+          onConfirm={() => {
+            this.props.mySalaryStore.setInitEmVerify();
+            this.props.mySalaryStore.getMySalaryBill(Number(salaryInfoId)).then(data => {
+              this.setState({ mySalaryStore: data });
+            });
+          }}
+        />
+      </div>;
     }
     const { salaryTemplate, salaryGroups, employeeInformation, sendTime } = mySalaryStore;
     const salaryProps = {
@@ -106,11 +118,6 @@ class MySalaryView extends Component {
             </Content>
           </div>
         </Authority>
-        <CaptchaModal
-          visible={captchaVisible} id={salaryInfoId}
-          onCancel={() => this.setState({ captchaVisible: false })}
-          onConfirm={() => mySalaryStore.setInitEmVerify()}
-        />
       </React.Fragment>
     );
   }

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

@@ -70,10 +70,10 @@ class StatisticalMicroSettingsSlide extends Component {
 
   getTaxAgentSelectList = async (props) => {
     const [salarySobList, empStatusList] = await Promise.all([
-      postFetch("/api/bs/hrmsalary/salarysob/listAuth", { filterType: "QUERY_DATA" }),
+      postFetch("/api/bs/hrmsalary/salarysob/listAuth", { filterType: "QUERY_DATA", isShare: props.isShare }),
       commonEnumList({ enumClass: "com.engine.salary.enums.salarysob.SalaryEmployeeStatusEnum" })
     ]);
-    postFetch("/api/bs/hrmsalary/taxAgent/listAuth", { filterType: "QUERY_DATA" })
+    postFetch("/api/bs/hrmsalary/taxAgent/listAuth", { filterType: "QUERY_DATA", isShare: props.isShare })
       .then(({ status, data }) => {
         if (status) {
           const conditions = _.map(condition, item => {

pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/columns.js

@@ -22,6 +22,9 @@ export const socialAccountConditions = [
         lanId: 537996,
         labelcol: 6,
         options: [],
+        otherParams: {
+          showSearch: true, optionFilterProp: "children"
+        },
         rules: "required|string",
         viewAttr: 3
       },