Merge branch 'develop' into feature/V2-dev合并多语言

2023-06-07 11:30:04 +08:00 · 2023-06-07 11:30:04 +08:00 · 94341c62e0
parent 9f21749ac5 4891fff298
commit 94341c62e0
1 changed files with 20 additions and 0 deletions
--- a/pc4mobx/hrmSalary/pages/taxAgent/editConditions.js
+++ b/pc4mobx/hrmSalary/pages/taxAgent/editConditions.js
@ -52,6 +52,16 @@ export const editConditions = [
        labelcol: 6,
        viewAttr: 3
      },
+      {
+        colSpan: 1,
+        conditionType: "INPUTNUMBER",
+        domkey: ["sortedIndex"],
+        fieldcol: 14,
+        label: "排序",
+        labelcol: 6,
+        value: "",
+        viewAttr: 2,
+      },
      {
        colSpan: 1,
        conditionType: "TEXTAREA",
@ -80,6 +90,16 @@ export const decentralizationConditions = [
        value: "",
        viewAttr: 3
      },
+      {
+        colSpan: 1,
+        conditionType: "INPUTNUMBER",
+        domkey: ["sortedIndex"],
+        fieldcol: 14,
+        label: "排序",
+        labelcol: 6,
+        value: "",
+        viewAttr: 2,
+      },
      {
        colSpan: 1,
        conditionType: "TEXTAREA",