up

src/views/rain/inspection/inspection.vue

@@ -6,6 +6,7 @@
           <div slot="content"></div>
           <slot>
             <div>
+              <Input style="width: 200px; margin-right: 10px" v-model="searchFields.KeyWord" placeholder="关键字搜索" />
               <el-select class="vm10" filterable v-model="searchFields.area_id" placeholder="请选择所属片区">
                   <el-option
                     v-for="item in selects.areasList"
@@ -14,7 +15,28 @@
                     :value="item.id">
                   </el-option>
                 </el-select>
-              <!-- <Input style="width: 200px; margin-right: 10px" v-model="searchFields.KeyWord" placeholder="关键字搜索" /> -->
+                <el-select class="vm10" filterable v-model="searchFields.status_id" placeholder="请选择状态">
+                    <el-option
+                      v-for="item in selects.statusList"
+                      :key="item.id"
+                      :label="item.name"
+                      :value="item.id">
+                    </el-option>
+                  </el-select>
+                  <el-select class="vm10" filterable v-model="searchFields.type_id" placeholder="请选择类型">
+                      <el-option
+                        v-for="item in selects.typeList"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id">
+                      </el-option>
+                    </el-select>
+                        <el-date-picker
+                          class="vm10"
+                          v-model="datesearch"
+                          type="datetime"
+                          placeholder="选择日期时间">
+                        </el-date-picker>
               <Button type="primary" @click="load" style="margin-left: 10px">查询</Button>
               <Button type="primary" @click="edit()" style="margin-left: 10px">新增</Button>
             </div>
@@ -52,6 +74,8 @@
               </div>
               <div v-else-if="column.type=='format'">
                 {{scope.row[column.field]?scope.row[column.field].name:""}}
+                <!-- <div v-if="column.field=='ask_content_detail'">{{scope.row[column.field]?scope.row[column.field].value:""}}</div>
+                <div v-else></div> -->
               </div>
               <!-- <div v-else-if="column.type=='end_type'">
                     <el-tag v-if="scope.row[column.field]==0">无</el-tag>
@@ -685,6 +709,7 @@
     },
     data() {
       return {
+        datesearch:"",
         tableHeight: 0,
         rainTypeVisible: false,
         rainType: "1",
@@ -707,7 +732,30 @@
           areasList:[{
             id:"",
             name:"所有"
-          }]
+          }],
+          typeList:[{
+            id:"",
+            name:"所有"
+          },{
+            id:"1",
+            name:"日常雨水设施"
+          },{
+            id:"2",
+            name:"在建工地"
+          }],
+          statusList:[{
+            id:"",
+            name:"所有"
+          },{
+            id:"1",
+            name:"未审核"
+          },{
+            id:"2",
+            name:"已审核"
+          },{
+            id:"3",
+            name:"已办结"
+          }],
         },
         paginations: {
           page: 1,
@@ -778,6 +826,20 @@
             align: "left",
             width: 360
           },
+          {
+            field: "area_info",
+            title: "所属片区",
+            type: "format",
+            align: "center",
+            width:180
+          },
+          {
+            field: "askName",
+            title: "巡查内容",
+            type: "string",
+            align: "center",
+            width:180
+          },
           {
             field: "type",
             title: "类型",
@@ -792,13 +854,6 @@
             align: "center",
             width: 180
           },
-          // {
-          //   field: "end_type",
-          //   title: "结办类型",
-          //   type: "end_type",
-          //   align: "center",
-          //   width:160
-          // },
           {
             field: "admin",
             title: "提交人",
@@ -904,6 +959,11 @@
           page_size: this.paginations.page_size,
           area_id: this.searchFields.area_id
         }).then(response => {
+          for(var m of response.data){
+            if(m.rain_equipment_info){
+              m.askName = m.rain_equipment_info.ask_content_detail?m.rain_equipment_info.ask_content_detail.value:""
+            }
+          }
           this.tableData = response.data;
           this.paginations.total = response.total;
         }).catch(error => {
@@ -1237,10 +1297,16 @@
   .files_check .el-upload.el-upload--picture-card {
     display: none;
   }
+  .vm10{
+    margin-right:10px
+  }
   .vm10 input{
     height:32px;vertical-align: middle;
   }
   .vm10 .el-select__caret.el-input__icon.el-icon-arrow-up{
     line-height: 30px;
   }
+    .vm10 .el-input__icon.el-icon-time{
+          line-height: 30px;
+    }
 </style>

src/views/rain/maintain/maintain.vue

@@ -826,6 +826,13 @@
             align: "left",
             width:360
           },
+          {
+            field: "area_info",
+            title: "所属片区",
+            type: "format",
+            align: "center",
+            width:180
+          },
           {
               field: "type",
               title: "类型",