Merge branch 'v1.1_smartImport' into dev

src/views/modules/base/smartImport/cpts/createdTask.vue

@@ -3,19 +3,20 @@
     <h3 class="title-small">基本信息</h3>
     <div class="content_box">
       <div class="left">
-        <el-form :model="form" :rules="rules" ref="importForm">
+        <el-form :model="form" :rules="rules" ref="importForm" label-width="100px">
           <el-form-item label="任务类型" prop="importCategory">
             <el-select
               v-model="form.importCategory"
               placeholder="请选择"
               size="small"
               class="u-item-width-normal"
+              clearable
+              @clear="handelClearCategory"
             >
               <el-option
                 v-for="item in resident_category_import_list"
                 :label="item.label"
                 :value="item.value"
-                clearable
                 :key="item.value"
                 @click.native="handelClickCategory(item.label)"
               >
@@ -26,10 +27,11 @@
             <span>
               <span v-if="categoryName">{{
                 this.$store.state.user.agencyName + categoryName || ""
-              }}</span
-              >导入模板.xlsx
+              }}</span>
+              <span  v-if="categoryName">导入模板.xlsx</span>
+              <span v-else>请先选择任务类型</span>
               <el-button type="text" @click="handelClickDownModule"
-                >点击下载</el-button
+              v-if="categoryName">点击下载</el-button
               ></span
             >
           </el-form-item>
@@ -236,6 +238,9 @@ export default {
     await this.loadPersonGroup();
   },
   methods: {
+    handelClearCategory(){
+      this.categoryName = null;
+    },
     async loadPersonGroup() {
       const url = "/oper/customize/icformitemgroup/list";
       // const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/isServiceProject/service/serviceScopeTree'
@@ -378,7 +383,7 @@ export default {
           const aLink = document.createElement("a");
           aLink.style.display = "none";
           aLink.href = url;
-          aLink.setAttribute("download", "人员导入模板.zip");
+          aLink.setAttribute("download", "全部模板");
           document.body.appendChild(aLink);
           aLink.click();
           document.body.removeChild(aLink);
@@ -439,6 +444,10 @@ export default {
     },
    async saveImportResiHouseExcel(){
       const { fileCode, dataList } = this;
+      if(!fileCode){
+        this.$message.error("请先上传文件");
+        return
+      }
       let obj = dataList.reduce((acc, item) => {
         if (item.userTableHeader) {
           acc[item.userTableHeader] = item.itemId;