hotfix/2.9.9.2312.01

pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSearchComp.js

@@ -41,7 +41,10 @@ class LedgerSearchComp extends Component {
                 if (getKey(j) === "taxAgentId") {
                   return {
                     ...j,
-                    options: _.map(data, g => ({ key: g.id, showname: g.content }))
+                    options: [{ key: "", showname: getLabel(332, "全部") }, ..._.map(data, g => ({
+                      key: g.id,
+                      showname: g.content
+                    }))]
                   };
                 }
                 return { ...j };

pc4mobx/hrmSalary/pages/ledgerPage/config.js

@@ -48,7 +48,6 @@ export const searchConditions = [
         conditionType: "SELECT",
         domkey: ["taxAgentId"],
         fieldcol: 24,
-        placeholder: "请选择个税扣缴义务人",
         lanId: 543234,
         label: "",
         labelcol: 0,

pc4mobx/hrmSalary/pages/salaryItem/options.js

@@ -1,78 +1,88 @@
 export const roundingModeOptions = [
-    {
-        key: "1",
-        selected: false,
-        showname: "原始数据"
-    },
-    {
-        key: "2",
-        selected: false,
-        showname: "四舍五入"
-    },
-    {
-        key: "3",
-        selected: false,
-        showname: "向上舍入"
-    },
-    {
-        key: "4",
-        selected: false,
-        showname: "向下舍入"
-    },
-    {
-        key: "5",
-        selected: false,
-        showname: "见分进角"
-    }
+  {
+    key: "1",
+    selected: false,
+    showname: "原始数据"
+  },
+  {
+    key: "2",
+    selected: false,
+    showname: "四舍五入"
+  },
+  {
+    key: "3",
+    selected: false,
+    showname: "向上舍入"
+  },
+  {
+    key: "4",
+    selected: false,
+    showname: "向下舍入"
+  },
+  {
+    key: "5",
+    selected: false,
+    showname: "见分进角"
+  }
 ];
 
 export const patternOptions = [
-    {
-        key: "0",
-        showname: "0",
-        selected: false
-    },
-    {
-        key: "1",
-        showname: "1",
-        selected: false
-    },
-    {
-        key: "2",
-        showname: "2",
-        selected: false
-    },
-    {
-        key: "3",
-        showname: "3",
-        selected: false
-    },
-    {
-        key: "4",
-        showname: "4",
-        selected: false
-    },
-    {
-        key: "5",
-        showname: "5",
-        selected: false
-    },
-    {
-        key: "6",
-        showname: "6",
-        selected: false
-    },
-]
+  {
+    key: "0",
+    showname: "0",
+    selected: false
+  },
+  {
+    key: "1",
+    showname: "1",
+    selected: false
+  },
+  {
+    key: "2",
+    showname: "2",
+    selected: false
+  },
+  {
+    key: "3",
+    showname: "3",
+    selected: false
+  },
+  {
+    key: "4",
+    showname: "4",
+    selected: false
+  },
+  {
+    key: "5",
+    showname: "5",
+    selected: false
+  },
+  {
+    key: "6",
+    showname: "6",
+    selected: false
+  },
+  {
+    key: "7",
+    showname: "7",
+    selected: false
+  },
+  {
+    key: "8",
+    showname: "8",
+    selected: false
+  }
+];
 
 export const dataTypeOptions = [
-    {
-        key: "number",
-        showname: "数值",
-        selected: false
-    },
-    {
-        key: "string",
-        showname: "字符",
-        selected: false
-    },
-]
+  {
+    key: "number",
+    showname: "数值",
+    selected: false
+  },
+  {
+    key: "string",
+    showname: "字符",
+    selected: false
+  }
+];