diff --git a/src/assets/images/index/greyExcel.png b/src/assets/images/index/greyExcel.png
new file mode 100644
index 000000000..3c4edffb0
Binary files /dev/null and b/src/assets/images/index/greyExcel.png differ
diff --git a/src/views/modules/base/smartExcel/cpts/export-search.vue b/src/views/modules/base/smartExcel/cpts/export-search.vue
index d6883b80e..a4be35557 100644
--- a/src/views/modules/base/smartExcel/cpts/export-search.vue
+++ b/src/views/modules/base/smartExcel/cpts/export-search.vue
@@ -84,6 +84,26 @@
             </div>
           </div>
         </el-form-item>
+        <el-form-item label="国籍">
+          <el-select v-model.trim="form.nationality" class="u-item-width-normal" clearable size="small">
+            <template v-for="item in nationalityList">
+              <el-option :label='item.label' :value='item.value'> </el-option>
+            </template>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="民族">
+          <el-select v-model.trim="form.nation" class="u-item-width-normal" clearable size="small">
+            <template v-for="item in nation">
+              <el-option :label='item.label' :value='item.value'> </el-option>
+            </template>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="性别">
+          <el-select v-model.trim="form.gender" class="u-item-width-normal" clearable size="small">
+            <el-option label='男' value='1'> </el-option>
+            <el-option label='女' value='2'> </el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="居民分类">
           <el-cascader
           ref="categoryAll"
@@ -103,6 +123,7 @@
             </template>
           </el-select>
         </el-form-item>
+  
         <el-form-item label="健康状态">
           <el-select v-model.trim="form.healthStatus" collapse-tags multiple class="u-item-width-normal" clearable
             size="small">
@@ -158,38 +179,6 @@
             </template>
           </el-select>
         </el-form-item>
-        <el-form-item label="名称模糊查询">
-          <el-select v-model.trim="basicType" class="u-item-width-service" clearable size="small">
-            <template >
-              <el-option @click.native="handelClickBasicType" :label='item.label' :value='item.value' v-for="(item, index) in basicInfoList" :key="index"> </el-option>
-            </template>
-          </el-select>
-        </el-form-item>
-        <el-form-item v-for="(item, index) in basicInfoList" :key="index" v-if="basicType == item.value">
-          <el-input v-model.trim="form[item.value]" class="u-item-width-service" placeholder="请输入" clearable size="small">
-          </el-input>
-        </el-form-item>
-        <el-form-item label="满意度次数">
-          <el-select v-model.trim="form.satisfactionNum" class="u-item-width-normal" clearable size="small">
-            <template v-for="(item,index) in 6">
-              <el-option :label='`${index}次`' :value='index'> </el-option>
-            </template>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="居民年龄">
-          <el-input v-model.trim="form.ageStart" @change="handleAgeChange" class="u-item-width-daterange" placeholder="请输入" clearable size="small">
-          </el-input>
-          <span class="u-data-tag">至</span>
-          <el-input v-model.trim="form.ageEnd" @change="handleAgeChange" class="u-item-width-daterange u-data-tag"
-            placeholder="请输入" clearable size="small">
-          </el-input>
-        </el-form-item>
-        <el-form-item label="性别">
-          <el-select v-model.trim="form.gender" class="u-item-width-normal" clearable size="small">
-            <el-option label='男' value='1'> </el-option>
-            <el-option label='女' value='2'> </el-option>
-          </el-select>
-        </el-form-item>
         <el-form-item label="文化程度">
           <el-select v-model.trim="form.cultureLevel" class="u-item-width-normal" clearable size="small">
             <template v-for="item in Education">
@@ -197,43 +186,6 @@
             </template>
           </el-select>
         </el-form-item>
-        <el-form-item label="国籍">
-          <el-select v-model.trim="form.nationality" class="u-item-width-normal" clearable size="small">
-            <template v-for="item in nationalityList">
-              <el-option :label='item.label' :value='item.value'> </el-option>
-            </template>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="民族">
-          <el-select v-model.trim="form.nation" class="u-item-width-normal" clearable size="small">
-            <template v-for="item in nation">
-              <el-option :label='item.label' :value='item.value'> </el-option>
-            </template>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="完整度得分">
-          <el-input v-model.trim="form.integrityScoreFrom"  typ="number" @change="informationChange(form.integrityScoreFrom,'from')" class="u-item-width-daterange" placeholder="请输入" clearable size="small">
-          </el-input>
-          <span class="u-data-tag">至</span>
-          <el-input v-model.trim="form.integrityScoreTo"  @change="informationChange(form.integrityScoreTo,'to')"  class="u-item-width-daterange u-data-tag"
-            placeholder="请输入" typ="number" clearable size="small">
-          </el-input>
-        </el-form-item>
-        <el-form-item label="更新时间">
-          <el-date-picker v-model.trim="form.updateTimeStart" type="datetime" size="small" class="u-item-width-daterange"
-            value-format="yyyy-MM-dd HH:mm:ss" placeholder="开始日期" :picker-options="pickerOptionsStart">
-          </el-date-picker>
-          <span class="u-data-tag">至</span>
-          <el-date-picker v-model.trim="form.updateTimeEnd" type="datetime" size="small" value-format="yyyy-MM-dd HH:mm:ss"
-            class="u-item-width-daterange u-data-tag" placeholder="结束日期" :picker-options="pickerOptionsEnd">
-          </el-date-picker>
-        </el-form-item>
-   
-  
-        <el-form-item label="备注">
-          <el-input v-model.trim="form.remark" placeholder="请输入" size="small" class="u-item-width-normal"
-            clearable></el-input>
-        </el-form-item>
       </el-form>
     </div>
     <el-row v-if="showSmartSearchForm" class="resi-row-more f-m0">
diff --git a/src/views/modules/base/smartExcel/cpts/filling-info.vue b/src/views/modules/base/smartExcel/cpts/filling-info.vue
index e4bed74f1..6953ae6da 100644
--- a/src/views/modules/base/smartExcel/cpts/filling-info.vue
+++ b/src/views/modules/base/smartExcel/cpts/filling-info.vue
@@ -59,7 +59,7 @@
                     </el-col>
                     <el-col :span="8" v-if="formData.taskPeriod != 'once'">
                         <el-form-item label="任务有效期">
-                            <div>{{ formData.startTime }} 至 {{ formData.endTime }}</div>
+                            <div>{{ formData.startTime.slice(0, 10)}} 至 {{ formData.endTime.slice(0, 10) }}</div>
                         </el-form-item>
                     </el-col>
                     <el-col :span="24">
@@ -76,13 +76,21 @@
                 <span>（点击以下表格开始提报任务）</span>
             </div>
             <div class="flex-wrap flex">
-                <div class="item flex flex-y flex-center-deputy" @click="handleClickShowView(formData.taskId, formData.taskStateName)" :key="index" >
+                <div v-if="formData.taskStateName==='已取消'" class="item flex flex-y flex-center-deputy"  >
+                    <img :src="require(`@/assets/images/index/greyExcel.png`)" alt="">
+                    <div class="agencyName">{{ formData.taskTitle }}</div>
+                    <div
+                        :class="formData.taskState === 'archived'?'green':formData.taskState === 'submit'?'blue':formData.taskState === 'rejected'?'black':'orange'">
+                        （{{ formData.taskStateName }}）</div>
+                </div>
+                <div  class="item flex flex-y flex-center-deputy" @click="handleClickShowView(formData.taskId, formData.taskStateName)" :key="index" v-if="formData.taskStateName!=='已取消'">
                     <img :src="require(`@/assets/images/index/Excel.png`)" alt="" style="cursor:pointer ;">
                     <div class="agencyName">{{ formData.taskTitle }}</div>
                     <div
                         :class="formData.taskState === 'archived'?'green':formData.taskState === 'submit'?'blue':formData.taskState === 'rejected'?'black':'orange'">
                         （{{ formData.taskStateName }}）</div>
                 </div>
+        
             </div>
             <div class="flex title flex-center-deputy">
                 <h3>相关任务</h3>