From fb3b4c7d59d1c9e59c33204eb2d83d5c3ad6047f 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, 16 Mar 2023 11:03:52 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9D=9E=E7=B3=BB=E7=BB=9F=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/externalPersonModal/index.js   |  4 +--
 .../pages/calculateDetail/userSure.js         | 25 -------------------
 .../pages/externalPersonManage/index.js       | 10 ++++----
 .../pages/salaryFile/saralyFileViewSlide.js   |  2 +-
 4 files changed, 8 insertions(+), 33 deletions(-)

diff --git a/pc4mobx/hrmSalary/components/externalPersonModal/index.js b/pc4mobx/hrmSalary/components/externalPersonModal/index.js
index 1d9e17ec..64f21fbf 100644
--- a/pc4mobx/hrmSalary/components/externalPersonModal/index.js
+++ b/pc4mobx/hrmSalary/components/externalPersonModal/index.js
@@ -46,9 +46,9 @@ class Index extends Component {
         onCancel={onCancel}
       >
         <WeaSearchGroup col={1} needTigger title="" showGroup center>
-          <WeaFormItem label="外部人员" labelCol={{ span: 6 }} wrapperCol={{ span: 18 }}>
+          <WeaFormItem label="非系统人员" labelCol={{ span: 6 }} wrapperCol={{ span: 18 }}>
             <WeaBrowser
-              title="外部人员"
+              title="非系统人员"
               type={162}
               viewAttr={3}
               isSingle={false}
diff --git a/pc4mobx/hrmSalary/pages/calculateDetail/userSure.js b/pc4mobx/hrmSalary/pages/calculateDetail/userSure.js
index d0701591..e74a8d8a 100644
--- a/pc4mobx/hrmSalary/pages/calculateDetail/userSure.js
+++ b/pc4mobx/hrmSalary/pages/calculateDetail/userSure.js
@@ -497,31 +497,6 @@ export default class UserSure extends React.Component {
               title="提示：环比上期当前选择的账套归档的各个税扣缴义务人下增加的人员"
               placement="topLeft"
             />
-            <span style={{ margin: "0 8px" }}>|</span>
-            <span
-              className={
-                this.state.selectedKey == "3"
-                  ? "crumbItem crumbItemSelected"
-                  : "crumbItem"
-              }
-              onClick={() => {
-                this.setState({ selectedKey: "3" }, () => {
-                  const childFrameObj = document.getElementById("atdTable");
-                  const salaryAcctRecordId = getQueryString("id");
-                  const payload = {
-                    type: "PC",
-                    listType: "MA",
-                    url: "/api/bs/hrmsalary/salaryacct/addedemployee/list",
-                    queryParams: {
-                      salaryAcctRecordId,
-                      employeeName: this.state.userListSearchValue
-                    }
-                  };
-                  childFrameObj.contentWindow.postMessage(JSON.stringify(payload), "*");
-                });
-              }}>
-              非系统人员
-            </span>
           </div>
           <div className="crumbsOperateWrapper">
             <WeaTab
diff --git a/pc4mobx/hrmSalary/pages/externalPersonManage/index.js b/pc4mobx/hrmSalary/pages/externalPersonManage/index.js
index 1ab229c2..265f5e0b 100644
--- a/pc4mobx/hrmSalary/pages/externalPersonManage/index.js
+++ b/pc4mobx/hrmSalary/pages/externalPersonManage/index.js
@@ -6,12 +6,11 @@
  */
 import React, { Component } from "react";
 import { inject, observer } from "mobx-react";
-import { WeaTab, WeaTop } from "ecCom";
+import { WeaTab, WeaTable, WeaTop } from "ecCom";
 import ExternalPersonManageEditSlide from "./components/externalPersonManageEditSlide";
 import { Button, message, Modal } from "antd";
 import { getSearchs } from "../../util";
 import { condition, searchCondition } from "./conditions";
-import UnifiedTable from "../../components/UnifiedTable";
 import { deleteExtEmp, listPage } from "../../apis/externalPersonManage";
 import "./index.less";
 
@@ -141,7 +140,7 @@ class Index extends Component {
               onAdSearch={() => this.setState({ showSearchAd: false }, () => this.listPage())}
               onAdReset={() => form.resetForm()} onAdCancel={() => this.setState({ showSearchAd: false })}
             />
-            <UnifiedTable
+            <WeaTable
               rowKey="id"
               loading={loading}
               columns={showOperateBtn ? [
@@ -149,11 +148,12 @@ class Index extends Component {
                 {
                   dataIndex: "operate",
                   title: "操作",
+                  width: 120,
                   render: (_, { id }) => (
                     <React.Fragment>
                       <a href="javascript: void(0);" onClick={() => this.handleAdd(id)}
                          style={{ paddingRight: 8 }}>编辑</a>
-                      <a href="javascript: void(0);" onClick={() => this.handleDelete(id)}>删除</a>
+                      {/*<a href="javascript: void(0);" onClick={() => this.handleDelete(id)}>删除</a>*/}
                     </React.Fragment>
                   )
                 }
@@ -161,7 +161,7 @@ class Index extends Component {
               dataSource={dataSource}
               pagination={pagination}
               rowSelection={rowSelection}
-              xWidth={this.getColumns().length * 120}
+              xWidth={800}
             />
             <ExternalPersonManageEditSlide
               showOperateBtn={showOperateBtn} form={addForm} condition={condition}
diff --git a/pc4mobx/hrmSalary/pages/salaryFile/saralyFileViewSlide.js b/pc4mobx/hrmSalary/pages/salaryFile/saralyFileViewSlide.js
index 3abb7f69..c6719241 100644
--- a/pc4mobx/hrmSalary/pages/salaryFile/saralyFileViewSlide.js
+++ b/pc4mobx/hrmSalary/pages/salaryFile/saralyFileViewSlide.js
@@ -87,7 +87,7 @@ export default class SalaryFileViewSlide extends React.Component {
       {
         com: PickDate({
           label: "起始发薪日期",
-          viewAttr: selectedKey === "pending" ? 3 : 1,
+          viewAttr: (selectedKey === "pending" || selectedKey === "ext") ? 3 : 1,
           value: paysetParams.payStartDate,
           onChange: handleSetpay
         })