转岗管理接口联调

src/views/basicData/jobTransferManagement.vue

@@ -265,6 +265,7 @@ export default {
             width: 200,
             hide: true,
             addDisabled: true,
+            
           },
           {
             label: '工号',
@@ -272,8 +273,10 @@ export default {
             addDisabled: true,
             hide: true,
             span: 8,
-            search: true,
+            search: false,
             width: 200,
+            searchLabelWidth:50,
+            
           },
           {
             label: '姓名',
@@ -284,6 +287,7 @@ export default {
             type: 'select',
             dicUrl: '/blade-system/user/page?size=999999&current=1',
             filterable: true,
+            searchLabelWidth:50,
             props: {
               label: 'realName',
               value: 'id',
@@ -331,7 +335,7 @@ export default {
             prop: 'inJobDate',
             span: 8,
             labelWidth: 150,
-            search: true,
+            search: false,
             hide: true,
             width: 200,
             type: 'date',
@@ -481,16 +485,6 @@ export default {
             search: false,
             width: 200,
           },
-
-          {
-            label: '所属岗位',
-            prop: 'station',
-            span: 8,
-            labelWidth: 150,
-            search: true,
-            width: 200,
-            addDisplay: false,
-          },
           {
             label: '出生年月',
             prop: 'dataBirth',
@@ -608,7 +602,7 @@ export default {
             prop: 'contractDuration',
             span: 8,
             labelWidth: 150,
-            search: true,
+            search: false,
             width: 200,
             type: 'date',
             format: 'YYYY-MM-DD HH:mm:ss',
@@ -630,7 +624,7 @@ export default {
             prop: 'inJobDate',
             span: 8,
             labelWidth: 150,
-            search: true,
+            search: false,
             width: 200,
             addDisplay: false,
             editDisplay: false,
@@ -649,6 +643,7 @@ export default {
             editDisplay: false,
             search: true,
             width: 130,
+            searchLabelWidth:50,
             dicUrl: '/blade-system/dict/dictionary?code=personnel_position_status',
             props: {
               label: 'dictValue',

src/views/changeJobManagement/trainingRecordManagement.vue

@@ -183,11 +183,25 @@ export default {
           },
           {
             label: '用工类型',
-            prop: 'staffTypeName',
+            prop: 'staffType',
-            span: 24,
+            type: 'select',
-            labelWidth: 140,
+            span: 8,
-            overflow: true,
+            labelWidth: 150,
-            search: true,
+            search: false,
+            width: 200,
+            editDisplay: false,
+            rules: [
+              {
+                required: true,
+                message: '请输入用工类型',
+                trigger: 'click',
+              },
+            ],
+            dicUrl: '/blade-system/dict/dictionary?code=staffType',
+            props: {
+              label: 'dictValue',
+              value: 'dictKey',
+            },
           },
           {
             label: '培训类型',
@@ -203,7 +217,7 @@ export default {
             span: 24,
             labelWidth: 140,
             overflow: true,
-            search: true,
+            search: false,
           },
           {
             label: '预警周期(天)',
@@ -211,7 +225,7 @@ export default {
             span: 24,
             labelWidth: 140,
             overflow: true,
-            search: true,
+            search: false,
           },
           {
             label: '培训计划',
@@ -219,7 +233,7 @@ export default {
             span: 24,
             labelWidth: 140,
             overflow: true,
-            search: true,
+            search: false,
           },
           {
             label: '培训师',
@@ -227,7 +241,7 @@ export default {
             span: 24,
             labelWidth: 140,
             overflow: true,
-            search: true,
+            search: false,
           },
           {
             label: '培训时间',
@@ -241,21 +255,21 @@ export default {
             span: 24,
             labelWidth: 140,
             overflow: true,
-            search: true,
+            search: false,
           },
           {
             label: '状态',
             prop: 'caStatusName',
-            // type: 'select',
+            type: 'select',
             span: 24,
             labelWidth: 140,
             overflow: true,
             search: true,
-            // dicUrl: '/blade-system/dict/dictionary?code=training_ecord_tatus',
+            dicUrl: '/blade-system/dict/dictionary?code=training_ecord_tatus',
-            // props: {
+            props: {
-            //   label: 'dictValue',
+              label: 'dictValue',
-            //   value: 'dictKey',
+              value: 'dictKey',
-            // },
+            },
           },
         ],
       },

src/views/workLicense/certificateType.vue

@@ -49,7 +49,7 @@ export default {
         calcHeight: 32,
         simplePage: false,
         searchShow: true,
-        searchMenuSpan: 6,
+        searchMenuSpan: 18,
         searchIcon: true,
         searchIndex: 3,
         tree: false,
@@ -88,7 +88,7 @@ export default {
           {
             label: '证书名称',
             prop: 'name',
-            search: false,
+            search: true,
             sortable: true,
             span: 12,
           },

src/views/workLicense/personnelEquipment.vue

@@ -164,6 +164,7 @@ export default {
             overflow: true,
             search: true,
             fixed: 'left',
+            searchLabelWidth:50,
           },
           {
             label: '所属班组',
@@ -183,11 +184,17 @@ export default {
           },
           {
             label: '技能等级',
-            prop: 'skillName',
+            prop: 'skill',
-            span: 24,
+            type: 'select',
-            width: 150,
+            span: 8,
-            overflow: true,
+            labelWidth: 150,
             search: true,
+            width: 200,
+            dicUrl: '/blade-system/dict/dictionary?code=skill_level',
+            props: {
+              label: 'dictValue',
+              value: 'dictKey',
+            },
           },
           {
             label: '性别',

src/views/workLicense/workLicense.vue

@@ -124,6 +124,7 @@ export default {
             overflow: true,
             search: true,
             fixed:'left',
+            searchLabelWidth:50,
             rules: [
               {
                 required: true,