Merge remote-tracking branch 'origin/master'

jiangping

2024-12-06 e1552a4eb2699eb84c4e1419cb76b7beb4951c4a

 admin/src/views/workorder/workorderList.vue

@@ -19,14 +19,14 @@
        </el-select>
      </el-form-item>
      <el-form-item prop="cateId" label="工单分类">
        <el-cascader v-model="searchForm.areaIds" @change="changeSel" placeholder="请选择巡检区域" clearable
        <el-cascader v-model="searchForm.areaIds" @change="changeSel" placeholder="请选择工单分类" clearable
          :options="cateList" :props="{
            label: 'name',
            value: 'id',
            children: 'childCategoryList'
          }"></el-cascader>
      </el-form-item>
      <el-form-item label="提交日期">
      <el-form-item label="上报时间">
        <el-date-picker v-model="searchForm.selDate" @change="changeSelDate" format="yyyy-MM-dd"
          value-format="yyyy-MM-dd" type="daterange"></el-date-picker>
      </el-form-item>
@@ -168,6 +168,7 @@
        buildingId: '',
        cateId: '',
      }
      this.buildList = []
      this.search()
    },
    changeSelDate(e) {