release/2.19.1.2501.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/analysisOfSalaryStatistics/components/salaryDetails.js

@@ -166,7 +166,7 @@ class SalaryDetails extends Component {
       this.postMessageToChild({
         dataSource, pageInfo, selectedRowKeys, showTotalCell, calcDetail: true, tableScrollHeight: 154, sumRow,
         columns: _.map(columns, (it, idx) => ({
-          dataIndex: it.column || it.dataIndex, title: it.text || it.title, calcDetail: true,
+          dataIndex: it.column || it.dataIndex, title: it.text || it.title, calcDetail: true, showSee: false,
           width: (it.dataIndex === "taxAgent" || it.dataIndex === "salarySob") ? 176 : (it.width || it.oldWidth),
           fixed: (idx === 1 || idx === 0 || idx === 2) ? "left" : "",
           ellipsis: true

pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js

@@ -125,17 +125,18 @@ class EditCalcTable extends Component {
           }, 500);
         });
         const { routeParams: { salaryAcctRecordId } } = this.props;
-        updateLockStatus({ ...payload, salaryAcctRecordId }).then(({ status, errormsg }) => {
-          if (status) {
-            clearInterval(this.timerLock);
-            this.setState({
-              progressVisible: false,
-              progress: 0
-            }, () => this.queryCalcResultList());
-          } else {
-            message.error(errormsg);
-          }
-        });
+        updateLockStatus({ ...payload, salaryAcctRecordId, acctEmpIds: this.state.selectedRowKeys })
+          .then(({ status, errormsg }) => {
+            if (status) {
+              clearInterval(this.timerLock);
+              this.setState({
+                progressVisible: false,
+                progress: 0
+              }, () => this.queryCalcResultList());
+            } else {
+              message.error(errormsg);
+            }
+          });
       }
     });
   };

pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editSalaryCalcSlide.js

@@ -43,7 +43,7 @@ class EditSalaryCalcSlide extends Component {
     });
   };
   renderTitle = () => {
-    const { loading } = this.state, { viewAttr } = this.props;
+    const { loading, itemsByGroup } = this.state, { viewAttr } = this.props;
     return <div className="titleDialog">
       <div className="titleCol titleLeftBox">
         <div className="titleIcon"><i className="icon-coms-fa"/></div>
@@ -52,7 +52,7 @@ class EditSalaryCalcSlide extends Component {
       <div className="titleCol titleRightBox">
         {
           viewAttr === 2 &&
-          <Button type="primary" onClick={this.save} loading={loading}>{getLabel(537558, "保存")}</Button>
+          <Button type="primary" disabled={_.isEmpty(itemsByGroup)} onClick={this.save} loading={loading}>{getLabel(537558, "保存")}</Button>
         }
       </div>
     </div>;

pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.less

@@ -239,6 +239,8 @@
           position: relative;
           margin-top: 10px;
           transition: margin-top .3s;
+          max-height: 80vh;
+          overflow: auto;
 
           .anchor-list-ink {
             position: absolute;

pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceDataViewSlide.js

@@ -5,9 +5,9 @@
  * Date: 2023/3/7
  */
 import React, { Component } from "react";
-import { WeaInputSearch, WeaLocaleProvider, WeaSlideModal, WeaTable, WeaTop } from "ecCom";
-import { Button } from "antd";
+import { WeaInputSearch, WeaLocaleProvider, WeaSlideModal, WeaTop } from "ecCom";
 import { viewAttendQuote } from "../../../../apis/attendance";
+import { Button, Spin } from "antd";
 import "./index.less";
 
 const { getLabel } = WeaLocaleProvider;
@@ -16,11 +16,31 @@ class AttendanceDataViewSlide extends Component {
   constructor(props) {
     super(props);
     this.state = {
-      loading: { query: false }, keyword: "", dataSource: [], columns: [],
-      pageInfo: { current: 1, pageSize: 10, total: 0 }
+      loading: { query: false }, keyword: "", dataSource: [], pageInfo: { current: 1, pageSize: 10, total: 0 }
     };
   }
 
+  componentDidMount() {
+    window.addEventListener("message", this.handleReceive, false);
+  }
+
+  componentWillUnmount() {
+    window.removeEventListener("message", this.handleReceive, false);
+  }
+
+  handleReceive = async ({ data }) => {
+    const { type, payload: { id, params } = {} } = data;
+    if (type === "turn") {
+      switch (id) {
+        case "PAGEINFO":
+          this.setState({ pageInfo: { ...this.state.pageInfo, ...params } }, () => this.viewAttendQuote());
+          break;
+        default:
+          break;
+      }
+    }
+  };
+
   componentWillReceiveProps(nextProps, nextContext) {
     if (nextProps.visible !== this.props.visible && nextProps.visible) {
       document.querySelector(".attendanceRefWrapper").classList.add("zIndex0-attendance");
@@ -33,19 +53,29 @@ class AttendanceDataViewSlide extends Component {
 
   viewAttendQuote = (extraPayload = {}, props) => {
     const { loading, pageInfo, keyword } = this.state;
-    const { attendQuoteId } = props;
+    const { attendQuoteId } = props || this.props;
     this.setState({ loading: { ...loading, query: true } });
     viewAttendQuote({ ...pageInfo, attendQuoteId, keyword, ...extraPayload }).then(({ status, data }) => {
       this.setState({ loading: { ...loading, query: false } });
       if (status) {
         const { columns, list: dataSource, pageNum: current, pageSize, total } = data.pageInfo;
         this.setState({
-          pageInfo: { ...pageInfo, current, pageSize, total }, dataSource,
-          columns: _.map(columns, (o, i) => ({ ...o, width: 150, fixed: i === 0 ? "left" : null }))
-        });
+          pageInfo: { ...pageInfo, current, pageSize, total }, dataSource
+        }, () => this.postMessageToChild({
+          pageInfo: this.state.pageInfo, dataSource, showRowSelection: false, unitTableType: "attendanceView",
+          columns: _.map(columns, (o, i) => ({ ...o, width: 150, fixed: i === 0 ? "left" : false }))
+        }));
       }
     }).catch(() => this.setState({ loading: { ...loading, query: false } }));
   };
+  postMessageToChild = (payload = {}) => {
+    const i18n = {
+      "操作": getLabel(30585, "操作"), "编辑": getLabel(111, "编辑"), "共": getLabel(18609, "共"),
+      "条": getLabel(18256, "条")
+    };
+    const childFrameObj = document.getElementById("attendanceViewTable");
+    childFrameObj && childFrameObj.contentWindow.postMessage(JSON.stringify({ ...payload, i18n }), "*");
+  };
   handleExportAttendQuote = () => {
     if (!this.handleDebounce) {
       this.handleDebounce = _.debounce(() => {
@@ -60,24 +90,7 @@ class AttendanceDataViewSlide extends Component {
 
   render() {
     const { showOperateBtn, salaryYearMonth, ...extra } = this.props;
-    const { columns, dataSource, loading, pageInfo, keyword } = this.state;
-    const pagination = {
-      ...pageInfo,
-      showTotal: (total) => `共 ${total} 条`,
-      pageSizeOptions: ["10", "20", "50", "100"],
-      showSizeChanger: true,
-      showQuickJumper: true,
-      onShowSizeChange: (current, pageSize) => {
-        this.setState({
-          pageInfo: { ...pageInfo, current, pageSize }
-        }, () => this.viewAttendQuote({}, this.props));
-      },
-      onChange: (current) => {
-        this.setState({
-          pageInfo: { ...pageInfo, current }
-        }, () => this.viewAttendQuote({}, this.props));
-      }
-    };
+    const { loading, keyword } = this.state;
     const btns = [
       <Button type="primary" onClick={this.handleExportAttendQuote}>{getLabel(81272, "导出全部")}</Button>,
       <WeaInputSearch
@@ -100,9 +113,16 @@ class AttendanceDataViewSlide extends Component {
                            <div>{getLabel(543376, "考勤周期")}：{salaryYearMonth}</div>
                            <div></div>
                          </div>
-                         <WeaTable
-                           columns={columns} dataSource={dataSource} bordered pagination={pagination}
-                           loading={loading.query} scroll={{ x: 1200, y: `calc(100vh - 240px)` }}/>
+                         <div style={{ height: `calc(100% - 40px)` }}>
+                           <Spin spinning={loading.query}>
+                             <iframe
+                               style={{ border: 0, width: "100%", height: "100%" }}
+                               // src="http://localhost:7607/#/unitTable"
+                               src="/spa/hrmSalary/hrmSalaryCalculateDetail/index.html#/unitTable"
+                               id="attendanceViewTable"
+                             />
+                           </Spin>
+                         </div>
                        </div>
                      }
       />

pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/index.less

@@ -54,8 +54,8 @@
       margin-bottom: 8px;
     }
 
-    .wea-new-table {
-      background: #FFF;
+    .ant-spin-nested-loading, .ant-spin-container {
+      height: 100%;
     }
   }
 

pc4mobx/hrmSalary/pages/declare/components/declareQuery/index.js

@@ -17,7 +17,7 @@ class Index extends Component {
     return (
       <div className="salary-btn-flex">
         <div className="mounth-range">
-          <span className="label">{getLabel(543549, "薪资所属月：")}</span>
+          <span className="label">{getLabel(111, "税款所属期：")}</span>
           <MonthRangePicker dateRange={dateRange} viewAttr={2}
                             onChange={v => this.props.onChange({ dateRange: v })}/>
         </div>

pc4mobx/hrmSalary/pages/declare/components/declareTablelist/index.js

@@ -8,7 +8,7 @@ import React, { Component } from "react";
 import { WeaLocaleProvider, WeaTable } from "ecCom";
 import { Dropdown, Menu, message, Modal } from "antd";
 import { getDeclareList, withDrawTaxDeclaration } from "../../../../apis/declare";
-import { sysConfCodeRule } from "../../../../apis/ruleconfig";
+import { sysConfCodeRule, sysinfo } from "../../../../apis/ruleconfig";
 
 const getLabel = WeaLocaleProvider.getLabel;
 
@@ -35,18 +35,19 @@ class Index extends Component {
       if (status && data === "1") this.setState({ showWithDrawBtn: data === "1" });
     });
   };
-  getDeclareList = (props) => {
-    const { pageInfo } = this.state;
-    const { queryParams } = props;
+  getDeclareList = async (props) => {
+    const { data: sysData } = await sysinfo();
+    const { pageInfo } = this.state, { queryParams } = props;
     const { dateRange, ...extra } = queryParams;
-    const [fromSalaryMonthStr, endSalaryMonthStr] = dateRange || [];
-    const params = { fromSalaryMonthStr, endSalaryMonthStr, ...extra };
+    const [fromSalaryMonth, endSalaryMonth] = dateRange || [];
+    const params = { fromSalaryMonth: fromSalaryMonth + "-01", endSalaryMonth: endSalaryMonth + "-01", ...extra };
     const payload = { ...pageInfo, ...params };
     this.setState({ loading: true });
     getDeclareList(payload).then(({ status, data }) => {
       this.setState({ loading: false });
       if (status) {
-        const { columns, list: dataSource, pageNum, pageSize, total } = data;
+        let { columns, list: dataSource, pageNum, pageSize, total } = data;
+        sysData["TAX_DECLARATION_DATE_TYPE"] === "1" && (columns = _.filter(columns, o => o.dataIndex !== "salaryMonth"));
         this.setState({
           dataSource, pageInfo: { ...pageInfo, pageNum, pageSize, total },
           columns: _.map(columns, o => {

pc4mobx/hrmSalary/pages/declare/generateDeclarationDetail.js

@@ -2,6 +2,7 @@ import React from "react";
 import { inject, observer } from "mobx-react";
 import { WeaLocaleProvider, WeaTable, WeaTop } from "ecCom";
 import { getQueryString } from "../../util/url";
+import { sysinfo } from "../../apis/ruleconfig";
 import * as API from "../../apis/declare";
 import { Button } from "antd";
 import "./index.less";
@@ -14,15 +15,21 @@ export default class GenerateDeclarationDetail extends React.Component {
     super(props);
     this.state = {
       loading: false, dataSource: [], columns: [], declareInfo: {},
-      pageInfo: { current: 1, pageSize: 10, total: 0 }
+      pageInfo: { current: 1, pageSize: 10, total: 0 }, sysinfo: {}
     };
   }
 
   componentDidMount() {
     this.getDetailList();
     this.getDeclareInfo();
+    this.getSysinfo();
   }
 
+  getSysinfo = () => {
+    sysinfo().then(({ status, data: sysinfo }) => {
+      if (status) this.setState({ sysinfo });
+    });
+  };
   getDetailList = () => {
     const { pageInfo } = this.state;
     const payload = {
@@ -64,9 +71,10 @@ export default class GenerateDeclarationDetail extends React.Component {
     window.open(url, "_self");
   };
   renderTitle = () => {
-    const { declareInfo } = this.state;
+    const { declareInfo, sysinfo } = this.state;
+    const title = sysinfo["TAX_DECLARATION_DATE_TYPE"] === "1" ? getLabel(111, "税款所属期") : getLabel(111, "薪资所属月");
     return (<React.Fragment>
-      <span>{getLabel(111, "薪资所属月")}：{declareInfo.salaryMonth}</span>
+      <span>{title}：{declareInfo.salaryMonth}</span>
       <span style={{ marginLeft: "10px" }}>{getLabel(111, "个税扣缴义务人")}：{declareInfo.taxAgentName}</span>
     </React.Fragment>);
   };

pc4mobx/hrmSalary/pages/mobilePayroll/index.js

@@ -119,7 +119,7 @@ export default class MobilePayroll extends React.Component {
   handleGoFeedback = () => {
     Modal.confirm({
       title: getLabel(131329, "信息确认"),
-      content: getLabel(111, "请确认薪资信息是有误，进行反馈并发起反馈流程。"),
+      content: getLabel(111, "确认是否发起反馈流程？"),
       onOk: () => {
         const { salaryBillToken } = this.state;
         feedBackSalaryBill({ salaryInfoId: getQueryString("id"), header: salaryBillToken })

pc4mobx/hrmSalary/pages/mySalary/mySalaryView.js

@@ -13,7 +13,10 @@ 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 isPhone = /(iPhone|iPad|iPod|iOS|Android)/i.test(window.navigator.userAgent);
+const isEm = window.navigator.userAgent.indexOf("E-Mobile7") >= 0;
 const { getLabel } = WeaLocaleProvider;
 
 @inject("mySalaryStore")
@@ -57,7 +60,7 @@ class MySalaryView extends Component {
   handleGoFeedback = () => {
     Modal.confirm({
       title: getLabel(131329, "信息确认"),
-      content: getLabel(544271, "请确认薪资信息是有误，进行反馈并发起反馈流程。"),
+      content: getLabel(544271, "确认是否发起反馈流程？"),
       onOk: () => {
         const { params: { salaryInfoId }, mySalaryStore: { getMySalaryBill } } = this.props;
         feedBackSalaryBill({ salaryInfoId }).then(({ status, errorMsg }) => {
@@ -82,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 = {
@@ -104,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>
     );
   }
@@ -123,7 +132,7 @@ export const ConfirmBtns = (props) => {
       <Button type="primary" onClick={props.confirmSalaryBill}>{getLabel(111, "确认")}</Button>
     }
     {
-      props.showFeedback === "1" &&
+      ((props.showFeedback === "1" && !isPhone) || (props.showFeedback === "1" && isEm)) &&
       <Button type="ghost" onClick={props.goFeedback}>{getLabel(111, "反馈")}</Button>
     }
   </div>;

pc4mobx/hrmSalary/pages/mySalaryBenefits/index.js

@@ -31,6 +31,7 @@ class Index extends Component {
   }
 
   async componentDidMount() {
+    this.setState({ store: { ...this.state.store, loading: true } });
     const { data: sysinfo } = await API.sysinfo();
     const { adjustShowStatus, salaryShowStatus } = sysinfo;
     let tabs = [
@@ -39,7 +40,7 @@ class Index extends Component {
     ];
     salaryShowStatus === "0" && (tabs = _.filter(tabs, o => o.key !== "1"));
     adjustShowStatus === "0" && (tabs = _.filter(tabs, o => o.key !== "2"));
-    this.setState({ sysinfo, tabs }, () => {
+    this.setState({ sysinfo, tabs, store: { ...this.state.store, loading: false } }, () => {
       const { tabs, store } = this.state;
       this.setState({
         selectedKey: !_.isEmpty(tabs) ? _.head(tabs).key : "0",

pc4mobx/hrmSalary/pages/payrollRelease/components/updatePayrollTemplateSlide/index.js

@@ -53,7 +53,7 @@ class Index extends Component {
         } = payrollTempForm.getFormParams(),
         { ackFeedbackStatus, feedbackStatus, autoAckDays, ...extraFb } = payrollTempFeedbackForm.getFormParams(),
         { formData, smsSettingDialog } = this.tmpBaseSetRef.state;
-      if (autoSendStatus !== "1" && emailStatus !== "1" && msgStatus !== "1" && smsStatus !== 1) {
+      if (autoSendStatus !== "1" && emailStatus !== "1" && msgStatus !== "1" && smsStatus !== "1") {
         message.warning(getLabel(111, "工资单模板至少开启一个发送通道"));
         return;
       }

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

@@ -445,7 +445,9 @@ export const MonthRangePicker = (props) => {
     <WeaDatePicker
       value={startDate} disabled={disabled}
       disabledDate={(current) => {
-        return current && endDate && current.getTime() > new Date(endDate).getTime();
+        // 20251212前版本(问题时不能选到当月)
+        // return current && endDate && current.getTime() > new Date(endDate).getTime();
+        return current && endDate && moment(`${new Date(current.getTime()).getFullYear()}-${String(new Date(current.getTime()).getMonth() + 1).padStart(2, '0')}`).isAfter(moment(endDate));
       }}
       format="YYYY-MM"
       onChange={(val) => onChange([val, endDate])}

pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js

@@ -30,7 +30,7 @@ class SalaryItemForm extends Component {
   componentDidMount() {
     const { salaryItemFieldsList } = this.state;
     const { request, editable, record, isAdd = false, taxAgentAdminOption, isLedger = false } = this.props;
-    const { systemType = "", sharedType, valueType, useInEmployeeSalary, dataType } = request;
+    const { systemType = "", sharedType, valueType, useInEmployeeSalary, dataType, pattern } = request;
     this.setState({
       salaryItemFieldsList: _.map(salaryItemFieldsList, item => {
         const { key } = item;
@@ -87,6 +87,7 @@ class SalaryItemForm extends Component {
           case "defaultValue":
             return {
               ...item,
+              precision: pattern ? pattern : item.precision,
               type: dataType === "number" ? "INPUTNUMBER" : "INPUT",
               display: valueType && valueType.toString() === "1" && useInEmployeeSalary == 0,
               viewAttr: (isLedger && record.canEdit) || (editable && record.canEdit) || isAdd ? 2 : 1

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

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

@@ -151,7 +151,7 @@ class StandingBook extends Component {
                      })} onOk={this.handleAccount}
       />
       {/*操作日志*/}
-      <LogDialog visible={logDialogVisible} logFunction="siAccount" filterConditions={filterConditions}
+      <LogDialog visible={logDialogVisible} logFunction="siaccount" filterConditions={filterConditions}
                  onCancel={() => this.setState({ logDialogVisible: false })}/>
       {/*核算进度条*/}
       {

pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/welfareAdvanceSearchPannel/index.js

@@ -54,6 +54,12 @@ class WelfareAdvanceSearchPannel extends Component {
                     viewAttr: 2
                   }
                 };
+              } else if (getKey(o) === "siSchemeId" || getKey(o) === "fundSchemeId" || getKey(o) === "otherSchemeId" || getKey(o) === "taxAgentId") {
+                return {
+                  ...o, otherParams: {
+                    showSearch: true, optionFilterProp: "children"
+                  }
+                };
               }
               return { ...o };
             })

pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/welfareEditArchiveSlide/index.js

@@ -111,7 +111,10 @@ class Index extends Component {
                     return {
                       ...g, label: getLabel(g.lanId, g.label),
                       viewAttr: (runStatuses === "4,5" || !showOperateBtn) ? 1 : g.viewAttr,
-                      options: _.find(props[`${o.title}Items`], j => j.domkey[0] === key).options
+                      options: _.find(props[`${o.title}Items`], j => j.domkey[0] === key).options,
+                      otherParams: {
+                        showSearch: true, optionFilterProp: "children"
+                      }
                     };
                   } else if (getKey(g).indexOf("StartTime") !== -1) {
                     return {

pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/index.js

@@ -188,7 +188,7 @@ class Index extends Component {
             {/*基数调整记录*/}
             <RecordDialog visible={recordDialogVisible} onCancel={() => this.setState({ recordDialogVisible: false })}/>
             {/*操作日志*/}
-            <LogDialog visible={logDialogVisible} logFunction="siArchives" filterConditions={filterConditions}
+            <LogDialog visible={logDialogVisible} logFunction="siarchives" filterConditions={filterConditions}
                        onCancel={() => this.setState({ logDialogVisible: false })}/>
             {/*  导入*/}
             <WelfareArchivesImportDialog {...welfareImpDialog}