修改

src/views/basicData/facultyManagement/detailsPage.vue

@@ -197,7 +197,7 @@ export default {
             span: 6
           },
           {
-            label: "职务",
+            label: "职位",
             prop: "compileCategory",
             type: "select",
             dicUrl:
@@ -483,6 +483,17 @@ export default {
             span: 6
           },
           {
+            label: "职称",
+            prop: "rankType",
+            type: "select",
+            dicUrl: "/api/blade-system/dict-biz/dictionary?code=job_title",
+            props: {
+              label: "dictValue",
+              value: "dictValue"
+            },
+            span: 6
+          },
+          {
             label: "职级等级",
             prop: "rankSalaryName",
             type: "select",
@@ -630,9 +641,9 @@ export default {
             span: 6
           },
           {
-            label: "正班、副班",
+            label: "班主任",
             prop: "doubleTeachers",
-            type: "radio",
+            type: "select",
             dataType: "string",
             dicUrl:
               "/api/blade-system/dict-biz/dictionary?code=double_teachers",

src/views/basicData/salaryConfiguration/detailsPage.vue

@@ -177,11 +177,10 @@ export default {
             span: 6
           },
           {
-            label: "教师类别",
-            prop: "salaryWithdrawalStandardName",
+            label: "标准类别",
+            prop: "normType",
             type: "select",
-            dicUrl:
-              "/api/blade-system/dict-biz/dictionary?code=Salary_allocation_standard",
+            dicUrl: "/api/blade-system/dict-biz/dictionary?code=norm_type",
             props: {
               label: "dictValue",
               value: "dictValue"
@@ -196,32 +195,20 @@ export default {
             span: 6
           },
           {
-            label: "标准类别",
-            prop: "normType",
+            label: "教师类别",
+            prop: "salaryWithdrawalStandardName",
             type: "select",
-            dicUrl: "/api/blade-system/dict-biz/dictionary?code=norm_type",
+            dicUrl:
+              "/api/blade-system/dict-biz/dictionary?code=Salary_allocation_standard",
             props: {
               label: "dictValue",
               value: "dictValue"
             },
-            rules: [
-              {
-                required: true,
-                message: "",
-                trigger: "blur"
-              }
-            ],
             span: 6
           },
           {
             label: "计算类别",
             prop: "resultType",
-            // type: "select",
-            // dicUrl: "/api/blade-system/dict-biz/dictionary?code=result_type",
-            // props: {
-            //   label: "dictValue",
-            //   value: "dictValue"
-            // },
             // rules: [
             //   {
             //     required: true,
@@ -232,10 +219,11 @@ export default {
             span: 6
           },
           {
-            label: "职务",
+            label: "职位",
             prop: "compileCategory",
             type: "select",
-            dicUrl: "/api/blade-system/dict-biz/dictionary?code=compile_category",
+            dicUrl:
+              "/api/blade-system/dict-biz/dictionary?code=compile_category",
             props: {
               label: "dictValue",
               value: "dictValue"

src/views/salaryManagement/primarySchool/detailsPage.vue

@@ -983,8 +983,8 @@ export default {
     if (this.detailData.status == 1) {
       this.option.disabled = true;
     }
-    this.optionList.height = window.innerHeight - 500;
-    this.annexOption.height = window.innerHeight - 500;
+    this.optionList.height = 450;
+    this.annexOption.height = 450;
   },
   methods: {
     cellStyle() {

src/views/salaryManagement/primarySchool/js/optionList.js

@@ -341,7 +341,7 @@ export const optionList = {
     {
       label: "自定义工作量工资",
       prop: "customWorkloadSalary",
-      width: 100,
+      width: 120,
       overHidden: true,
       rules: [{
         validator: validateDecimal,