Merge remote-tracking branch 'origin/mdc-test' into mdc-test

Lius

2023-11-13 3a8223b71d18205d40b894fd0b4c0fa1ca773e86

 src/views/eam/modules/dailyMaintenanceStandard/JSelectMaintenanceStandardModal.vue

@@ -22,7 +22,7 @@
              :sm='6'
            >
              <a-form-item label='保养项目名称'>
                <a-input
                <j-input
                  placeholder='请输入保养项目名称'
                  v-model='queryParam.name'
                />
@@ -102,20 +102,25 @@
          align: 'center',
          dataIndex: 'standard'
        },
        // {
        //   title: '方法',
        //   align: 'center',
        //   dataIndex: 'maintenanceMethod_dictText'
        // },
        // {
        //   title: '工具',
        //   align: 'center',
        //   dataIndex: 'maintenanceTool'
        // },
        // {
        //   title: '维保专业',
        //   align: 'center',
        //   dataIndex: 'maintenanceSpecialtyId_dictText'
        // },
        {
          title: '方法',
          title: '保养部位',
          align: 'center',
          dataIndex: 'maintenanceMethod_dictText'
        },
        {
          title: '工具',
          align: 'center',
          dataIndex: 'maintenanceTool'
        },
        {
          title: '维保专业',
          align: 'center',
          dataIndex: 'maintenanceSpecialtyId_dictText'
          dataIndex: 'location'
        },
        {
          title: '安全要求',