diff --git a/pc4mobx/hrmSalary/pages/payroll/components/backgroundUpload.js b/pc4mobx/hrmSalary/pages/payroll/components/backgroundUpload.js
index 0b8bcb35..da0bcf43 100644
--- a/pc4mobx/hrmSalary/pages/payroll/components/backgroundUpload.js
+++ b/pc4mobx/hrmSalary/pages/payroll/components/backgroundUpload.js
@@ -1,95 +1,95 @@
-import React from 'react'
-import { Upload, Icon, Modal } from 'antd';
-import "./index.less"
+import React from "react";
+import { Icon, message, Modal, Upload } from "antd";
+import "./index.less";
function getBase64(img, callback) {
- const reader = new FileReader();
- reader.addEventListener('load', () => callback(reader.result));
- reader.readAsDataURL(img);
+ const reader = new FileReader();
+ reader.addEventListener("load", () => callback(reader.result));
+ reader.readAsDataURL(img);
}
function beforeUpload(file) {
- const isJPG = file.type === 'image/jpeg' || file.type==="image/png";
- if (!isJPG) {
- message.error('只允许上传jpg、png类型的图片!');
- }
- const isLt2M = file.size / 1024 / 1024 < 2;
- if (!isLt2M) {
- message.error('图片大小限制2MB!');
- }
- return isJPG && isLt2M;
+ const isJPG = file.type === "image/jpeg" || file.type === "image/png";
+ if (!isJPG) {
+ message.error("只允许上传jpg、png类型的图片!");
+ }
+ const isLt2M = file.size / 1024 / 1024 < 2;
+ if (!isLt2M) {
+ message.error("图片大小限制2MB!");
+ }
+ return isJPG && isLt2M;
}
- export default class BackgroundUpload extends React.Component {
- constructor(props) {
- super(props)
- this.state = {
- showOperate: false,
- visible: false
- }
- }
+export default class BackgroundUpload extends React.Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ showOperate: false,
+ visible: false
+ };
+ }
- // 上传完成监听
- handleChange = (info) => {
- if (info.file.status === 'done') {
- this.props.onChange && this.props.onChange(info.file.response.data.acclink)
- getBase64(info.file.originFileObj, imageUrl => this.setState({ imageUrl }));
- }
+ // 上传完成监听
+ handleChange = (info) => {
+ if (info.file.status === "done") {
+ this.props.onChange && this.props.onChange(info.file.response.data.acclink);
+ getBase64(info.file.originFileObj, imageUrl => this.setState({ imageUrl }));
}
+ };
- // 删除
- handleDelete = () => {
- this.props.onChange && this.props.onChange(null);
- }
+ // 删除
+ handleDelete = () => {
+ this.props.onChange && this.props.onChange(null);
+ };
- // 预览
- handlePreview = () => {
- this.setState({visible: true})
- }
+ // 预览
+ handlePreview = () => {
+ this.setState({ visible: true });
+ };
- render() {
- const props = {
- action: '/api/doc/upload/uploadFile',
- multiple: false,
- listType: "picture-card",
- showUploadList: false,
- onChange: this.handleChange.bind(this)
- };
- const { imageUrl } = this.props;
- return (
-
- {
- (imageUrl || imageUrl == "") ?
-
{
-this.setState({showOperate: true})
-}} onMouseLeave={() => {
-this.setState({showOperate: false})
-}}>
-

- {
- this.state.showOperate &&
- {
-this.handlePreview()
-}}/>
- {
-this.handleDelete()
-}}/>
-
- }
-
- :
-
-
-
- }
-
{
-this.setState({visible: false})
-}} >
-
-

-
-
+ render() {
+ const props = {
+ action: "/api/doc/upload/uploadFile",
+ multiple: false,
+ listType: "picture-card",
+ showUploadList: false,
+ onChange: this.handleChange.bind(this)
+ };
+ const { imageUrl } = this.props;
+ return (
+
+ {
+ (imageUrl || imageUrl == "") ?
+
{
+ this.setState({ showOperate: true });
+ }} onMouseLeave={() => {
+ this.setState({ showOperate: false });
+ }}>
+

+ {
+ this.state.showOperate &&
+ {
+ this.handlePreview();
+ }}/>
+ {
+ this.handleDelete();
+ }}/>
+
+ }
- );
- }
- }
\ No newline at end of file
+ :
+
+
+
+ }
+
{
+ this.setState({ visible: false });
+ }}>
+
+

+
+
+
+ );
+ }
+}
diff --git a/pc4mobx/hrmSalary/pages/payroll/components/index.less b/pc4mobx/hrmSalary/pages/payroll/components/index.less
index aec5737a..38191bdb 100644
--- a/pc4mobx/hrmSalary/pages/payroll/components/index.less
+++ b/pc4mobx/hrmSalary/pages/payroll/components/index.less
@@ -1,31 +1,48 @@
.uploadPictureWrapper {
- .previewWrapper {
- position: relative;
- width: 96px;
- height: 96px;
- border: 1px dashed #d9d9d9;
- .previewImg {
- width: 100%;
- height: 100%;
- }
- .operateWrapper {
- position: absolute;
- width: 96px;
- height: 90px;
- top: 0;
- left: 0;
- line-height: 96px;
- z-index: 100;
- color: #fff;
- background-color: rgba(0, 0, 0, 0.3);
- text-align: center;
- .operateIcon {
- margin-right: 20px;
- cursor: pointer;
- }
- .operateIcon:last-child {
- margin-right: 0px;
- }
- }
+ .previewWrapper {
+ position: relative;
+ width: 96px;
+ height: 96px;
+ border: 1px dashed #d9d9d9;
+
+ .previewImg {
+ width: 100%;
+ height: 100%;
}
-}
\ No newline at end of file
+
+ .operateWrapper {
+ position: absolute;
+ width: 96px;
+ height: 90px;
+ top: 0;
+ left: 0;
+ line-height: 96px;
+ z-index: 100;
+ color: #fff;
+ background-color: rgba(0, 0, 0, 0.3);
+ text-align: center;
+
+ .operateIcon {
+ margin-right: 20px;
+ cursor: pointer;
+ }
+
+ .operateIcon:last-child {
+ margin-right: 0px;
+ }
+ }
+ }
+
+ .ant-upload {
+ padding: 0;
+ line-height: 96px;
+
+ & > span {
+ height: 100%;
+
+ .avatar-uploader-trigger {
+ font-size: 28px;
+ }
+ }
+ }
+}
diff --git a/pc4mobx/hrmSalary/pages/payroll/stepForm/showSettingForm.js b/pc4mobx/hrmSalary/pages/payroll/stepForm/showSettingForm.js
index cec7f7d2..0477bca2 100644
--- a/pc4mobx/hrmSalary/pages/payroll/stepForm/showSettingForm.js
+++ b/pc4mobx/hrmSalary/pages/payroll/stepForm/showSettingForm.js
@@ -140,7 +140,7 @@ export default class ShowSettingForm extends React.Component {
dataSource={salaryItemSet}
onChangeSalaryItem={this.handleChangeSalaryItem}
salarySobId={toJS(templateBaseData).salarySob}
- isReplenish={true}
+ isReplenish={false}
/>