Merge branch 'hotfix/2.9.10.2312.02' into release/2.9.10.2312.02

pc4mobx/hrmSalary/pages/calculate/calculate.js

@@ -28,7 +28,7 @@ class Calculate extends Component {
         name: "",
         dateRange: [
           moment(new Date()).startOf("year").format("YYYY-MM"),
-          moment(new Date()).startOf("month").format("YYYY-MM")
+          moment(new Date()).endOf("year").format("YYYY-MM")
         ]
       }, isRefresh: false,
       progressModule: { visible: false, progress: 0, title: getLabel(111, "正在归档中请稍后") },

pc4mobx/hrmSalary/pages/fieldManagement/components/fieldSlide.js

@@ -43,6 +43,7 @@ class FieldSlide extends Component {
       roundingMode: "1",
       pattern: "2",
       sortedIndex: "",
+      width: "",
       description: ""
     };
   }
@@ -72,6 +73,7 @@ class FieldSlide extends Component {
           dataType,
           description,
           sortedIndex,
+          width,
           sharedType,
           roundingMode,
           taxAgentIds,
@@ -86,6 +88,7 @@ class FieldSlide extends Component {
           dataType,
           description,
           sortedIndex,
+          width,
           sharedType: sharedType ? sharedType.toString() : "0",
           roundingMode: roundingMode ? roundingMode.toString() : "0",
           taxAgentIds,
@@ -140,6 +143,7 @@ class FieldSlide extends Component {
       dataType,
       description,
       sortedIndex,
+      width,
       sharedType,
       roundingMode,
       taxAgentIds,
@@ -153,6 +157,7 @@ class FieldSlide extends Component {
       dataType,
       description,
       sortedIndex,
+      width,
       sharedType,
       roundingMode: Number(roundingMode),
       taxAgentIds,
@@ -192,6 +197,7 @@ class FieldSlide extends Component {
       roundingMode: "1",
       pattern: "2",
       sortedIndex: "",
+      width: "",
       description: ""
     });
   };
@@ -217,6 +223,7 @@ class FieldSlide extends Component {
       roundingMode,
       pattern,
       sortedIndex,
+      width,
       description
     } = this.state;
     return (
@@ -329,6 +336,11 @@ class FieldSlide extends Component {
               <WeaInputNumber value={sortedIndex} precision={0}
                               onChange={value => this.handleChangeFields("sortedIndex", value)}/>
             </WeaFormItem>
+            <WeaFormItem label="显示宽度" labelCol={{ span: 6 }} wrapperCol={{ span: 12 }}>
+              <WeaInputNumber value={width} precision={0} min={0}
+                              onChange={value => this.handleChangeFields("width", value)}/>
+              <span style={{ paddingLeft: 10, position: "absolute", marginTop: 4 }}>px</span>
+            </WeaFormItem>
             <WeaFormItem label="备注" labelCol={{ span: 6 }} wrapperCol={{ span: 12 }}>
               <WeaTextarea
                 value={description}

pc4mobx/hrmSalary/pages/mySalaryBenefits/index.js

@@ -18,7 +18,7 @@ class Index extends Component {
   constructor(props) {
     super(props);
     this.state = {
-      selectedKey: "1", salaryYearMonth: [moment().startOf("year").format("YYYY-MM"), moment().format("YYYY-MM")]
+      selectedKey: "1", salaryYearMonth: [moment().startOf("year").format("YYYY-MM"), moment().endOf("year").format("YYYY-MM")]
     };
   }
 

pc4mobx/hrmSalary/pages/payrollRelease/index.js

@@ -29,7 +29,7 @@ class Index extends Component {
         salarySobId: "", name: "",
         dateRange: [
           moment(new Date()).startOf("year").format("YYYY-MM"),
-          moment(new Date()).startOf("month").format("YYYY-MM")
+          moment(new Date()).endOf("year").format("YYYY-MM")
         ]
       }
     };

pc4mobx/hrmSalary/pages/salaryItem/columns.js

@@ -142,6 +142,14 @@ export const salaryItemFields = [
     viewAttr: 2,
     tip: ""
   },
+  {
+    key: "width",
+    label: "显示宽度",
+    lanId: 111,
+    type: "INPUTNUMBER",
+    viewAttr: 2,
+    tip: ""
+  },
   {
     key: "description",
     label: "备注",

pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js

@@ -46,8 +46,9 @@ class SalaryItemForm extends Component {
           case "pattern":
           case "roundingMode":
             return { ...item, display: dataType === "number" };
+          case "width":
           case "sortedIndex":
-            return { ...item };
+            return { ...item, label: getLabel(item.lanId, item.label) };
           case "useInEmployeeSalary":
             return {
               ...item,
@@ -164,8 +165,13 @@ class SalaryItemForm extends Component {
                           </WeaFormItem> :
                           (type === "INPUTNUMBER" && display) ?
                             <WeaFormItem label={label} labelCol={{ span: 6 }} wrapperCol={{ span: 12 }}>
-                              <WeaInputNumber value={value} viewAttr={viewAttr} precision={0}
-                                              onChange={v => this.handleChangeSalaryFiledItems(key, v)}/>
+                              <React.Fragment>
+                                <WeaInputNumber value={value} viewAttr={viewAttr} precision={0}
+                                                min={key === "width" ? 0 : -99999}
+                                                onChange={v => this.handleChangeSalaryFiledItems(key, v)}/>
+                                {key === "width" &&
+                                  <span style={{ paddingLeft: 10, position: "absolute", marginTop: 4 }}>px</span>}
+                              </React.Fragment>
                             </WeaFormItem> : null
               }
             </React.Fragment>;