Merge branch 'bug_mk' into dev

src/views/modules/base/smartImport/index.vue

@@ -4,7 +4,7 @@
       <div class="m-search">
         <el-form  :inline="true" :model="formData"  :label-width="'100px'">
         <el-form-item label="任务类型">
-            <el-select v-model.trim="formData.importCategoryName" placeholder="请输入" size="small" class="u-item-width-normal" clearable>
+            <el-select v-model.trim="formData.importCategory" placeholder="请输入" size="small" class="u-item-width-normal" clearable>
               <el-option v-for="item in dicts.resident_category_import" :key="item.value" :label="item.label" :value="item.value">
               </el-option>
             </el-select>
@@ -43,18 +43,8 @@
 
           <el-table-column prop="taskName" align="center"  label="任务名称" :show-overflow-tooltip="true">
           </el-table-column>
-          <el-table-column prop="importCategory" align="center" width="100" label="任务类型" :show-overflow-tooltip="true">
+          <el-table-column prop="importCategoryName" align="center" width="150" label="任务类型" :show-overflow-tooltip="true">
-            <template slot-scope="scope">
+           
-              <span>{{
-                scope.row.importCategory
-                ? scope.row.importCategory == "1"
-                  ? "导入房屋信息"
-                  : scope.row.importCategory == "2"
-                    ? "导入居民信息"
-                    : "--"
-                : "--"
-              }}</span>
-            </template>
           </el-table-column>
 
           <el-table-column prop="processStatus" align="center" width="200" label="状态" :show-overflow-tooltip="true">