QuKatie %!s(int64=3) %!d(string=hai) anos
pai
achega
02763ecc45

+ 1 - 1
src/views/basicData/facultyManagement/detailsPage.vue

@@ -643,7 +643,7 @@ export default {
             span: 6
           },
           {
-            label: "是否享受公办待遇",
+            label: "是否享受公办保险待遇",
             prop: "enjoyOfficeTreatment",
             type: "radio",
             dataType: "string",

+ 7 - 2
src/views/basicData/facultyManagement/index.vue

@@ -273,14 +273,19 @@ export default {
         res.data.data;
       this.$refs.crud.init();
     });
+    this.getWorkDicts("TF_status").then(res => {
+      this.findObject(this.option.column, "enjoyOfficeTreatment").dicData =
+        res.data.data;
+      this.$refs.crud.init();
+    });
     this.option.height = window.innerHeight - 210;
   },
   methods: {
     searchCriteriaSwitch(type) {
       if (type) {
-        this.option.height = this.option.height - 277;
+        this.option.height = this.option.height - 327;
       } else {
-        this.option.height = this.option.height + 277;
+        this.option.height = this.option.height + 327;
       }
       this.$refs.crud.getTableHeight();
     },

+ 12 - 4
src/views/basicData/facultyManagement/js/optionList.js

@@ -1,6 +1,6 @@
 export const option = {
   searchShow: true,
-  searchMenuSpan: 8,
+  searchMenuSpan: 24,
   align: "center",
   searchSpan: 8,
   border: true,
@@ -13,7 +13,7 @@ export const option = {
   tip: false,
   selection: true,
   dialogClickModal: false,
-  searchLabelWidth: 100,
+  searchLabelWidth: 140,
   searchIcon: true,
   searchIndex: 2,
   addBtnText: "新单",
@@ -575,9 +575,17 @@ export const option = {
       index:63,
     },
     {
-      label: "是否享受公办待遇",
+      label: "是否享受公办保险待遇",
       prop: "enjoyOfficeTreatment",
-      width: "120",
+      type: "select",
+      search:true,
+      dicData:[],
+      dataType: "string",
+      props: {
+        label: "dictValue",
+        value: "dictValue"
+      },
+      width: "150",
       overHidden: true,
       index:64,
     }