|  | @@ -24,68 +24,68 @@
 | 
	
		
			
				|  |  |              >
 | 
	
		
			
				|  |  |                <!-- <el-row>
 | 
	
		
			
				|  |  |                  <el-col :span="5"> -->
 | 
	
		
			
				|  |  | -                  <el-form-item label="任务名称" prop="planId">
 | 
	
		
			
				|  |  | -                    <el-select
 | 
	
		
			
				|  |  | -                      v-model="queryParams.planId"
 | 
	
		
			
				|  |  | -                      filterable
 | 
	
		
			
				|  |  | -                      placeholder="请选择任务名称"
 | 
	
		
			
				|  |  | -                      clearable
 | 
	
		
			
				|  |  | -                    >
 | 
	
		
			
				|  |  | -                      <el-option
 | 
	
		
			
				|  |  | -                        v-for="item in planList"
 | 
	
		
			
				|  |  | -                        :key="item.id"
 | 
	
		
			
				|  |  | -                        :label="item.name"
 | 
	
		
			
				|  |  | -                        :value="item.id"
 | 
	
		
			
				|  |  | -                      >
 | 
	
		
			
				|  |  | -                      </el-option>
 | 
	
		
			
				|  |  | -                    </el-select>
 | 
	
		
			
				|  |  | -                  </el-form-item>
 | 
	
		
			
				|  |  | -                <!-- </el-col>
 | 
	
		
			
				|  |  | +              <el-form-item label="任务名称" prop="planId">
 | 
	
		
			
				|  |  | +                <el-select
 | 
	
		
			
				|  |  | +                  v-model="queryParams.planId"
 | 
	
		
			
				|  |  | +                  filterable
 | 
	
		
			
				|  |  | +                  placeholder="请选择任务名称"
 | 
	
		
			
				|  |  | +                  clearable
 | 
	
		
			
				|  |  | +                >
 | 
	
		
			
				|  |  | +                  <el-option
 | 
	
		
			
				|  |  | +                    v-for="item in planList"
 | 
	
		
			
				|  |  | +                    :key="item.id"
 | 
	
		
			
				|  |  | +                    :label="item.name"
 | 
	
		
			
				|  |  | +                    :value="item.id"
 | 
	
		
			
				|  |  | +                  >
 | 
	
		
			
				|  |  | +                  </el-option>
 | 
	
		
			
				|  |  | +                </el-select>
 | 
	
		
			
				|  |  | +              </el-form-item>
 | 
	
		
			
				|  |  | +              <!-- </el-col>
 | 
	
		
			
				|  |  |                  <el-col :span="5"> -->
 | 
	
		
			
				|  |  | -                  <el-form-item label="履职人员" prop="executeRole">
 | 
	
		
			
				|  |  | -                    <el-select
 | 
	
		
			
				|  |  | -                      v-model="queryParams.executeRole"
 | 
	
		
			
				|  |  | -                      placeholder="请选择履职人员"
 | 
	
		
			
				|  |  | -                      clearable
 | 
	
		
			
				|  |  | -                    >
 | 
	
		
			
				|  |  | -                      <el-option
 | 
	
		
			
				|  |  | -                        v-for="item in roleList"
 | 
	
		
			
				|  |  | -                        :key="item.id"
 | 
	
		
			
				|  |  | -                        :label="item.name"
 | 
	
		
			
				|  |  | -                        :value="item.id"
 | 
	
		
			
				|  |  | -                      ></el-option>
 | 
	
		
			
				|  |  | -                    </el-select>
 | 
	
		
			
				|  |  | -                  </el-form-item>
 | 
	
		
			
				|  |  | -                <!-- </el-col>
 | 
	
		
			
				|  |  | +              <el-form-item label="履职人员" prop="executeRole">
 | 
	
		
			
				|  |  | +                <el-select
 | 
	
		
			
				|  |  | +                  v-model="queryParams.executeRole"
 | 
	
		
			
				|  |  | +                  placeholder="请选择履职人员"
 | 
	
		
			
				|  |  | +                  clearable
 | 
	
		
			
				|  |  | +                >
 | 
	
		
			
				|  |  | +                  <el-option
 | 
	
		
			
				|  |  | +                    v-for="item in roleList"
 | 
	
		
			
				|  |  | +                    :key="item.id"
 | 
	
		
			
				|  |  | +                    :label="item.name"
 | 
	
		
			
				|  |  | +                    :value="item.id"
 | 
	
		
			
				|  |  | +                  ></el-option>
 | 
	
		
			
				|  |  | +                </el-select>
 | 
	
		
			
				|  |  | +              </el-form-item>
 | 
	
		
			
				|  |  | +              <!-- </el-col>
 | 
	
		
			
				|  |  |                  <el-col :span="5"> -->
 | 
	
		
			
				|  |  | -                  <el-form-item label="任务进度" prop="status">
 | 
	
		
			
				|  |  | -                    <el-select
 | 
	
		
			
				|  |  | -                      v-model="queryParams.status"
 | 
	
		
			
				|  |  | -                      placeholder="请选择任务进度"
 | 
	
		
			
				|  |  | -                      clearable
 | 
	
		
			
				|  |  | -                    >
 | 
	
		
			
				|  |  | -                      <el-option
 | 
	
		
			
				|  |  | -                        v-for="item in dict.type.resumption_status"
 | 
	
		
			
				|  |  | -                        :key="item.value"
 | 
	
		
			
				|  |  | -                        :label="item.label"
 | 
	
		
			
				|  |  | -                        :value="item.value"
 | 
	
		
			
				|  |  | -                      ></el-option>
 | 
	
		
			
				|  |  | -                    </el-select>
 | 
	
		
			
				|  |  | -                  </el-form-item>
 | 
	
		
			
				|  |  | -                <!-- </el-col>
 | 
	
		
			
				|  |  | +              <el-form-item label="任务进度" prop="status">
 | 
	
		
			
				|  |  | +                <el-select
 | 
	
		
			
				|  |  | +                  v-model="queryParams.status"
 | 
	
		
			
				|  |  | +                  placeholder="请选择任务进度"
 | 
	
		
			
				|  |  | +                  clearable
 | 
	
		
			
				|  |  | +                >
 | 
	
		
			
				|  |  | +                  <el-option
 | 
	
		
			
				|  |  | +                    v-for="item in dict.type.resumption_status"
 | 
	
		
			
				|  |  | +                    :key="item.value"
 | 
	
		
			
				|  |  | +                    :label="item.label"
 | 
	
		
			
				|  |  | +                    :value="item.value"
 | 
	
		
			
				|  |  | +                  ></el-option>
 | 
	
		
			
				|  |  | +                </el-select>
 | 
	
		
			
				|  |  | +              </el-form-item>
 | 
	
		
			
				|  |  | +              <!-- </el-col>
 | 
	
		
			
				|  |  |                  <el-col :span="9"> -->
 | 
	
		
			
				|  |  | -                  <el-form-item class="searchTitle" label="任务时间">
 | 
	
		
			
				|  |  | -                    <DataRangePicker
 | 
	
		
			
				|  |  | -                      v-model="queryParams.range"
 | 
	
		
			
				|  |  | -                      key="daterange"
 | 
	
		
			
				|  |  | -                      type="daterange"
 | 
	
		
			
				|  |  | -                      :clearable="timeClearable"
 | 
	
		
			
				|  |  | -                      range-separator="至"
 | 
	
		
			
				|  |  | -                      start-placeholder="开始日期"
 | 
	
		
			
				|  |  | -                      end-placeholder="结束日期"
 | 
	
		
			
				|  |  | -                    />
 | 
	
		
			
				|  |  | -                  </el-form-item>
 | 
	
		
			
				|  |  | -                <!-- </el-col>
 | 
	
		
			
				|  |  | +              <el-form-item class="searchTitle" label="任务时间">
 | 
	
		
			
				|  |  | +                <DataRangePicker
 | 
	
		
			
				|  |  | +                  v-model="queryParams.range"
 | 
	
		
			
				|  |  | +                  key="daterange"
 | 
	
		
			
				|  |  | +                  type="daterange"
 | 
	
		
			
				|  |  | +                  :clearable="timeClearable"
 | 
	
		
			
				|  |  | +                  range-separator="至"
 | 
	
		
			
				|  |  | +                  start-placeholder="开始日期"
 | 
	
		
			
				|  |  | +                  end-placeholder="结束日期"
 | 
	
		
			
				|  |  | +                />
 | 
	
		
			
				|  |  | +              </el-form-item>
 | 
	
		
			
				|  |  | +              <!-- </el-col>
 | 
	
		
			
				|  |  |                </el-row> -->
 | 
	
		
			
				|  |  |              </el-form>
 | 
	
		
			
				|  |  |              <!--    按纽    -->
 | 
	
	
		
			
				|  | @@ -138,6 +138,13 @@
 | 
	
		
			
				|  |  |                label="序号"
 | 
	
		
			
				|  |  |                v-if="columns[0].visible"
 | 
	
		
			
				|  |  |              >
 | 
	
		
			
				|  |  | +              <template slot-scope="scope">
 | 
	
		
			
				|  |  | +                {{
 | 
	
		
			
				|  |  | +                  (queryParams.pageNum - 1) * queryParams.pageSize +
 | 
	
		
			
				|  |  | +                  scope.$index +
 | 
	
		
			
				|  |  | +                  1
 | 
	
		
			
				|  |  | +                }}
 | 
	
		
			
				|  |  | +              </template>
 | 
	
		
			
				|  |  |              </el-table-column>
 | 
	
		
			
				|  |  |              <el-table-column
 | 
	
		
			
				|  |  |                header-align="center"
 | 
	
	
		
			
				|  | @@ -494,7 +501,7 @@ export default {
 | 
	
		
			
				|  |  |  </script>
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  <style lang="scss" scoped>
 | 
	
		
			
				|  |  | -  .el-form--inline .el-form-item{
 | 
	
		
			
				|  |  | -    display: inline-flex;
 | 
	
		
			
				|  |  | -  }
 | 
	
		
			
				|  |  | +.el-form--inline .el-form-item {
 | 
	
		
			
				|  |  | +  display: inline-flex;
 | 
	
		
			
				|  |  | +}
 | 
	
		
			
				|  |  |  </style>
 |