{
!_.isEmpty(screenParams) &&
-
+ 1280 ? 3 : 2}/>
}
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerBaseSetting.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerBaseSetting.js
index 2da6a2ac..cc89cd8a 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerBaseSetting.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerBaseSetting.js
@@ -184,7 +184,7 @@ class LedgerBaseSetting extends Component {
type === "CHECKBOX" ?
+ content="【起薪日期≤薪资周期止】且【最后发薪日期≥薪资周期起】"/>
:
type === "SELECT" ?
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemPreviewModal.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemPreviewModal.js
index 09c1df43..1ce016da 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemPreviewModal.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemPreviewModal.js
@@ -23,7 +23,7 @@ export default class LedgerSalaryItemPreviewModal extends React.Component {
};
})
};
- columns.push(columnItem);
+ columnItem.children.length > 0 && columns.push(columnItem);
});
return { columns };
};
diff --git a/pc4mobx/hrmSalary/pages/payroll/watermarkPreview.js b/pc4mobx/hrmSalary/pages/payroll/watermarkPreview.js
index 4ea21411..a6bd6564 100644
--- a/pc4mobx/hrmSalary/pages/payroll/watermarkPreview.js
+++ b/pc4mobx/hrmSalary/pages/payroll/watermarkPreview.js
@@ -19,7 +19,7 @@ class WatermarkPreview extends Component {
salaryBillBaseSetPreviewWaterMark = (payload) => {
salaryBillBaseSetPreviewWaterMark(payload).then(({ status, data }) => {
if (status) {
- const { wmHeight: height, wmWidth: width, wmNoTransparent, wmRotate } = payload;
+ const { wmSetting: { wmHeight: height, wmWidth: width, wmNoTransparent, wmRotate } } = payload;
watermark({
text: data,
src: "",
diff --git a/pc4mobx/hrmSalary/pages/payrollFiles/index.js b/pc4mobx/hrmSalary/pages/payrollFiles/index.js
index 0ad6737c..89fd3996 100644
--- a/pc4mobx/hrmSalary/pages/payrollFiles/index.js
+++ b/pc4mobx/hrmSalary/pages/payrollFiles/index.js
@@ -70,7 +70,7 @@ class Index extends Component {
workcode: "",
departmentIds: "",
positionIds: "",
- userstatus: "",
+ statuses: "",
// archiveStatus: "EFFICIENT",
taxAgentId: "",
subcompanyIds: ""
@@ -128,7 +128,7 @@ class Index extends Component {
};
Select = (value, key) => {
const { taxAgentStore } = this.props;
- const { userstatus, archiveStatus, taxAgentId } = this.state.searchItemsValue;
+ const { statuses, archiveStatus, taxAgentId } = this.state.searchItemsValue;
const { archiveStatusList, userStatusList } = this.state;
const { taxAgentAdminOption } = taxAgentStore;
return (
@@ -138,8 +138,9 @@ class Index extends Component {
wrapperCol={{ span: 18 }}
>
({
+ userStatusList: [..._.map(userStatusList, it => ({
key: String(it.value),
showname: it.defaultLabel
}))],
@@ -690,7 +688,7 @@ class Index extends Component {
{ com: this.Browser("分部", "subcompanyIds") },
{ com: this.Browser("部门", "departmentIds") },
{ com: this.Browser("岗位", "positionIds") },
- { com: this.Select("人员状态", "userstatus") },
+ { com: this.Select("人员状态", "statuses") },
// { com: this.Select("档案状态", "archiveStatus") },
{ com: this.Select("个税扣缴义务人", "taxAgentId") },
{ com: this.Input("工号", "workcode") }
@@ -715,7 +713,7 @@ class Index extends Component {
workcode: "",
departmentIds: "",
positionIds: "",
- userstatus: "",
+ statuses: "",
archiveStatus: ""
}
})}> 重置 ,
diff --git a/pc4mobx/hrmSalary/pages/reportView/components/condition-柱状图数据为0不占位.js b/pc4mobx/hrmSalary/pages/reportView/components/condition-柱状图数据为0不占位.js
new file mode 100644
index 00000000..fba734b3
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/reportView/components/condition-柱状图数据为0不占位.js
@@ -0,0 +1,451 @@
+import { WeaLocaleProvider } from "ecCom";
+import { format_with_regex } from "../../../util";
+
+const { getLabel } = WeaLocaleProvider;
+export const condition = [
+ {
+ items: [
+ {
+ colSpan: 2,
+ checkbox: false,
+ checkboxValue: false,
+ conditionType: "SELECT",
+ domkey: ["taxAgent"],
+ fieldcol: 18,
+ label: getLabel(111, "个税扣缴义务人"),
+ labelcol: 6,
+ options: [],
+ multiple: true,
+ viewAttr: 2
+ },
+ {
+ browserConditionParam: {
+ completeParams: {},
+ conditionDataParams: {},
+ dataParams: {},
+ destDataParams: {},
+ hasAddBtn: false,
+ hasAdvanceSerach: true,
+ idSeparator: ",",
+ isAutoComplete: 1,
+ isDetail: 0,
+ isMultCheckbox: false,
+ isSingle: false,
+ linkUrl: "",
+ pageSize: 10,
+ quickSearchName: "",
+ replaceDatas: [],
+ title: getLabel(111, "分部"),
+ type: "164",
+ viewAttr: 2
+ },
+ colSpan: 2,
+ conditionType: "BROWSER",
+ domkey: ["subCompany"],
+ fieldcol: 18,
+ isQuickSearch: false,
+ label: getLabel(111, "分部"),
+ labelcol: 6,
+ viewAttr: 2
+ },
+ {
+ browserConditionParam: {
+ completeParams: {},
+ conditionDataParams: {},
+ dataParams: {},
+ destDataParams: {},
+ hasAddBtn: false,
+ hasAdvanceSerach: true,
+ idSeparator: ",",
+ isAutoComplete: 1,
+ isDetail: 0,
+ isMultCheckbox: false,
+ isSingle: false,
+ linkUrl: "",
+ pageSize: 10,
+ quickSearchName: "",
+ replaceDatas: [],
+ title: getLabel(111, "部门"),
+ type: "57",
+ viewAttr: 2
+ },
+ colSpan: 2,
+ conditionType: "BROWSER",
+ domkey: ["department"],
+ fieldcol: 18,
+ isQuickSearch: false,
+ label: getLabel(111, "部门"),
+ labelcol: 6,
+ viewAttr: 2
+ },
+ // {
+ // browserConditionParam: {
+ // completeParams: {},
+ // conditionDataParams: {},
+ // dataParams: {},
+ // destDataParams: {},
+ // hasAddBtn: false,
+ // hasAdvanceSerach: true,
+ // idSeparator: ",",
+ // isAutoComplete: 1,
+ // isDetail: 0,
+ // isMultCheckbox: false,
+ // isSingle: false,
+ // linkUrl: "",
+ // pageSize: 10,
+ // quickSearchName: "",
+ // replaceDatas: [],
+ // title: getLabel(111, "岗位"),
+ // type: "278",
+ // viewAttr: 2
+ // },
+ // colSpan: 2,
+ // conditionType: "BROWSER",
+ // domkey: ["position"],
+ // fieldcol: 18,
+ // isQuickSearch: false,
+ // label: getLabel(111, "岗位"),
+ // labelcol: 6,
+ // viewAttr: 2
+ // },
+ {
+ browserConditionParam: {
+ completeParams: {},
+ conditionDataParams: {},
+ dataParams: {},
+ destDataParams: {},
+ hasAddBtn: false,
+ hasAdvanceSerach: true,
+ idSeparator: ",",
+ isAutoComplete: 1,
+ isDetail: 0,
+ isMultCheckbox: false,
+ isSingle: false,
+ linkUrl: "",
+ pageSize: 10,
+ quickSearchName: "",
+ replaceDatas: [],
+ title: getLabel(111, "人员"),
+ type: "17",
+ viewAttr: 2
+ },
+ colSpan: 2,
+ conditionType: "BROWSER",
+ domkey: ["employee"],
+ fieldcol: 18,
+ isQuickSearch: false,
+ label: getLabel(111, "人员"),
+ labelcol: 6,
+ viewAttr: 2
+ },
+ {
+ colSpan: 2,
+ conditionType: "RANGEPICKER",
+ domkey: ["hiredate1", "hiredate2"],
+ fieldcol: 18,
+ label: getLabel(111, "入职日期"),
+ labelcol: 6,
+ viewAttr: 2
+ }
+ ],
+ title: "",
+ defaultshow: true
+ }
+];
+
+const colorList = [
+ "#709DF7", "#73DEB3", "#7585A2", "#F7C739", "#5FC3E3", "#AEE279", "#FF7F81", "#709DF7", "#73DEB3", "#7585A2", "#F7C739", "#5FC3E3", "#AEE279", "#FF7F81",
+ "#709DF7", "#73DEB3", "#7585A2", "#F7C739", "#5FC3E3", "#AEE279", "#FF7F81", "#709DF7", "#73DEB3", "#7585A2", "#F7C739", "#5FC3E3", "#AEE279", "#FF7F81",
+ "#709DF7", "#73DEB3", "#7585A2", "#F7C739", "#5FC3E3", "#AEE279", "#FF7F81", "#709DF7", "#73DEB3", "#7585A2", "#F7C739", "#5FC3E3", "#AEE279", "#FF7F81"
+];
+export const mapBarOptions = (params) => ({
+ tooltip: {
+ trigger: "axis",
+ axisPointer: {
+ type: "shadow"
+ },
+ backgroundColor: "#FFF",
+ borderColor: "#FFF",
+ borderWidth: "1",
+ borderRadius: "5",
+ textStyle: {
+ color: "#333"
+ },
+ formatter: function (params) {
+ let str = params[0].axisValue + "
";
+ for (let item of params) {
+ str += `${item.marker}${item.seriesName}${format_with_regex(item.value)}
`;
+ }
+ return str;
+ }
+ },
+ legend: {
+ type: "scroll",
+ icon: "rect",
+ top: "0%",
+ right: "center",
+ itemGap: 10,
+ textStyle: {
+ fontSize: 12,//字体大小
+ color: "#B8B8B8"//字体颜色
+ }
+ },
+ grid: {
+ top: "10%",
+ right: "0%",
+ left: "5%",
+ bottom: "0%",
+ containLabel: true
+ },
+ xAxis: params.xAxis.map((item, index) => {
+ const data = Array(params.xAxis.length).fill("");
+ data[index] = item;
+ return {
+ type: "category",
+ position: "bottom",
+ data: data,
+ axisTick: {
+ alignWithLabel: true,
+ show: false
+ },
+ axisLabel: {
+ interval: 0,
+ margin: 10,
+ textStyle: {
+ fontSize: 11
+ }
+ }
+ };
+ }),
+ yAxis: {
+ name: params.name,
+ type: "value",
+ axisLabel: {
+ padding: [3, 0, 0, 0],
+ formatter: "{value}",
+ color: "#666",
+ textStyle: {
+ fontSize: 11
+ }
+ },
+ nameTextStyle: {
+ color: "#787E95",
+ fontSize: 12
+ },
+ axisLine: {
+ show: true,
+ lineStyle: {
+ color: "transparent"
+ }
+ },
+ axisTick: {
+ show: false // 不显示坐标轴刻度线
+ },
+ splitLine: {
+ show: false,
+ lineStyle: {
+ color: "rgba(66, 192, 255, 0.1)"
+ }
+ }
+ },
+ series: params.data.map(item => {
+ return [...dealBar(_.map(item.data, (it) => parseFloat(it.replace(/,/g, ""))), item.name)];
+ }).reduce((acc, cur) => acc.concat(cur), [])
+});
+export const mapLineOptions = (params) => ({
+ tooltip: {
+ // 坐标轴指示器，坐标轴触发有效
+ trigger: "axis",
+ axisPointer: {
+ // 默认为直线，可选为：'line' | 'shadow'
+ type: "line"
+ }
+ },
+ legend: {
+ type: "scroll",
+ icon: "circle",
+ top: "0%",
+ right: "center",
+ itemGap: 20,
+ textStyle: {
+ fontSize: 12,//字体大小
+ color: "#787E95"//字体颜色
+ }
+ },
+ grid: {
+ top: "10%",
+ left: "3%",
+ right: "2%",
+ bottom: "3%",
+ containLabel: true
+ },
+ xAxis: [
+ {
+ type: "category",
+ boundaryGap: false,
+ data: params.xAxis,
+ axisTick: {
+ alignWithLabel: true,
+ show: false
+ },
+ // 修改坐标值样式
+ axisLabel: {
+ color: "#B8B8B8",
+ fontSize: 12,
+ show: true
+ },
+ axisLine: {
+ show: false
+ }
+ }
+ ],
+ yAxis: [
+ {
+ type: "value",
+ // 修改坐标值样式
+ axisLabel: {
+ color: "#787E95",
+ fontSize: 14
+ },
+ nameTextStyle: {
+ color: "#787E95",
+ fontSize: 16
+ },
+ // 修改坐标轴线样式
+ axisLine: {
+ show: true,
+ lineStyle: {
+ color: "transparent"
+ }
+ },
+ axisTick: {
+ show: false // 不显示坐标轴刻度线
+ },
+ splitLine: {
+ lineStyle: {
+ color: "rgba(93,126,158,1)"
+ }
+ }
+ }
+ ],
+ series: _.map(params.data, (item, index) => {
+ return {
+ name: item.name,
+ data: _.map(item.data, (it) => it.replace(/,/g, "")),
+ type: "line",
+ itemStyle: {
+ normal: {
+ color: function (params) {
+ return colorList[params.seriesIndex] || colorList[Math.floor((Math.random() * colorList.length))];
+ },
+ lineStyle: {
+ color: colorList[index] || colorList[Math.floor((Math.random() * colorList.length))]
+ }
+ }
+ }
+ };
+ })
+});
+export const mapPieOptions = (params) => ({
+ tooltip: {
+ show: true,
+ formatter: function (params) {
+ let str = params.seriesName + "
";
+ str += params.marker + params.name + ":" + format_with_regex(params.value) + "(" + params.percent + "%" + ")" + "
";
+ return str;
+ }
+ },
+ legend: {
+ type: "scroll",
+ icon: "rect",
+ top: "0%",
+ left: "2%",
+ orient: "vertical",
+ itemGap: 10,
+ textStyle: {
+ fontSize: 12,//字体大小
+ color: "#787E95"//字体颜色
+ }
+ },
+ series: _.map(params.data, item => {
+ return {
+ name: item.name,
+ data: _.map(item.data, (it) => ({ ...it, value: it.value.replace(/,/g, "") })),
+ type: "pie",
+ radius: "60%",
+ avoidLabelOverlap: true,
+ animation: false,
+ labelLine: {
+ show: true,
+ normal: {
+ length: 5,
+ align: "center"
+ }
+ },
+ itemStyle: {
+ normal: {
+ color: function (colors) {
+ return colorList[colors.dataIndex] || colorList[Math.floor((Math.random() * colorList.length))];
+ }
+ }
+ }
+ };
+ })
+});
+
+const dealBar = (arr, name) => {
+ const bar = [];
+ arr.forEach((item, index) => {
+ const data = [];
+ for (let i = 0; i < index; i++) {
+ data.push("");
+ }
+ if (item) {
+ data.push(item);
+ bar.push({
+ name,
+ type: "bar",
+ xAxisIndex: index,
+ barWidth: 32,
+ data,
+ itemStyle: {
+ normal: {
+ color: function (params) {
+ return colorList[params.seriesIndex] || colorList[Math.floor((Math.random() * colorList.length))];
+ }
+ }
+ },
+ label: {
+ show: true,
+ position: "insideBottom",
+ distance: 15,
+ align: "left",
+ verticalAlign: "middle",
+ rotate: "90",
+ formatter: function (params) {
+ if (parseInt(params.value) === 0) {
+ return ``;
+ } else {
+ return [
+ `{a|${format_with_regex(params.value)}} {b|${params.seriesName}}`
+ ];
+ }
+ },
+ rich: {
+ a: {
+ fontWeight: "bold",
+ fontSize: 14,
+ color: "#333",
+ marginRight: 10
+ },
+ b: {
+ fontSize: 12,
+ color: "#333"
+ }
+ }
+ }
+ });
+ }
+ });
+ return bar;
+};
diff --git a/pc4mobx/hrmSalary/pages/reportView/components/condition.js b/pc4mobx/hrmSalary/pages/reportView/components/condition.js
index c8422666..103793c3 100644
--- a/pc4mobx/hrmSalary/pages/reportView/components/condition.js
+++ b/pc4mobx/hrmSalary/pages/reportView/components/condition.js
@@ -176,6 +176,7 @@ export const mapBarOptions = (params) => ({
}
},
legend: {
+ type: "scroll",
icon: "rect",
top: "0%",
right: "center",
@@ -188,8 +189,8 @@ export const mapBarOptions = (params) => ({
grid: {
top: "10%",
right: "0%",
- left: "2%",
- bottom: "0%",
+ left: "5%",
+ bottom: "10%",
containLabel: true
},
xAxis: {
@@ -209,6 +210,7 @@ export const mapBarOptions = (params) => ({
},
yAxis: {
name: params.name,
+ type: "value",
axisLabel: {
padding: [3, 0, 0, 0],
formatter: "{value}",
@@ -241,6 +243,7 @@ export const mapBarOptions = (params) => ({
return {
name: item.name,
barWidth: "32",
+ barGap: "0%",
data: _.map(item.data, (it) => it.replace(/,/g, "")),
type: "bar",
itemStyle: {
@@ -280,7 +283,18 @@ export const mapBarOptions = (params) => ({
}
}
};
- })
+ }),
+ dataZoom: [
+ {
+ type: "inside"
+
+ },
+ {
+ type: "slider",
+ show: true,
+ bottom: 20,
+ }
+ ]
});
export const mapLineOptions = (params) => ({
tooltip: {
@@ -360,7 +374,7 @@ export const mapLineOptions = (params) => ({
series: _.map(params.data, (item, index) => {
return {
name: item.name,
- data: _.map(item.data, (it) => it.replace(/,/g, "")),
+ data: _.map(item.data, (it) => parseFloat(it.replace(/,/g, ""))),
type: "line",
itemStyle: {
normal: {
@@ -385,6 +399,7 @@ export const mapPieOptions = (params) => ({
}
},
legend: {
+ type: "scroll",
icon: "rect",
top: "0%",
left: "2%",
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js
index 34ec32ff..c0111c45 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js
@@ -14,6 +14,7 @@ import * as API from "../../../apis/welfareArchive";
import ImportModal from "../../../components/importModal";
import TipLabel from "../../../components/TipLabel";
import UnifiedTable from "../../../components/UnifiedTable";
+import { convertToUrlString } from "../../../util/url";
import { salaryArchiveDelete } from "../../../apis/payrollFiles";
import "./index.less";
@@ -611,16 +612,16 @@ export default class Archives extends React.Component {
let url = `${window.location.origin}/api/bs/hrmsalary/scheme/export?ids=`;
switch (selectedKey) {
case "pending":
- url = `${url}&runStatuses=1`;
+ url = `${url}&runStatuses=1&${convertToUrlString(form.getFormParams())}`;
break;
case "fixed":
- url = `${url}&runStatuses=2,3`;
+ url = `${url}&runStatuses=2,3&${convertToUrlString(form.getFormParams())}`;
break;
case "suspend":
- url = `${url}&runStatuses=3`;
+ url = `${url}&runStatuses=3&${convertToUrlString(form.getFormParams())}`;
break;
default:
- url = `${url}&runStatuses=4,5`;
+ url = `${url}&runStatuses=4,5&${convertToUrlString(form.getFormParams())}`;
break;
}
window.open(url, "_self");
diff --git a/pc4mobx/hrmSalary/stores/payrollFiles.js b/pc4mobx/hrmSalary/stores/payrollFiles.js
index 7efc0dd2..70088da8 100644
--- a/pc4mobx/hrmSalary/stores/payrollFiles.js
+++ b/pc4mobx/hrmSalary/stores/payrollFiles.js
@@ -1,7 +1,7 @@
import { action, observable } from "mobx";
import { WeaTableNew } from "comsMobx";
import * as API from "../apis/payrollFiles";
-import { statisticsEmployeeDetailList, getDataPerspective } from "../apis/statistics";
+import { getDataPerspective, statisticsEmployeeDetailList } from "../apis/statistics";
const { TableStore } = WeaTableNew;
@@ -14,11 +14,12 @@ export class PayrollFilesStore {
@action("薪资档案-列表查询")
queryList = (payload = {}, searchItemsValue = {}, url = "") => {
return new Promise((resolve, reject) => {
- const { departmentIds, positionIds, subcompanyIds, ...extra } = searchItemsValue;
+ const { departmentIds, positionIds, subcompanyIds, statuses, ...extra } = searchItemsValue;
API.queryList({
departmentIds: departmentIds ? departmentIds.split(",") : [],
positionIds: positionIds ? positionIds.split(",") : [],
subcompanyIds: subcompanyIds ? subcompanyIds.split(",") : [],
+ statuses: statuses ? statuses.split(",") : [],
...payload, ...extra, url
}).then(res => {
const { data, status } = res;