检查

src/views/task/list/components/addPatrol.vue

@@ -15,6 +15,16 @@
           </div>
         </div>
       </template> -->
+      <template v-slot:title>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label" style="font-weight: bold;">
+            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>检查名称：
+          </div>
+          <div class="xy-table-item-content">
+            <el-input v-model="form.title" type="text" placeholder="请输入检查名称" style="width: 400px;"></el-input>
+          </div>
+        </div>
+      </template>
       <template v-slot:date>
         <div class="xy-table-item">
           <div class="xy-table-item-label" style="font-weight: bold;">
@@ -211,7 +221,7 @@
         sitePlaceholder:'请选择站点',
         mapClickIndex:0,
         form: {
-
+          title: '',
           date: '',
 
           siteName: '',
@@ -239,6 +249,10 @@ mission_id: '',
           //   required: true,
           //   message: '请选择任务名称'
           // }],
+          title: [{
+            required: true,
+            message: '请输入检查名称'
+          }],
           date: [{
             required: true,
             message: '请选择发现时间'
@@ -441,6 +455,7 @@ mission_id: '',
         const res = await get(this.id)
         this.form = {
 
+          title: res?.title,
           date: res?.date,
           site_id: res?.site_id,
           siteName: res.site_id?[undefined,res.site_id]:res.address,

src/views/task/list/components/showPatrol.vue

@@ -25,6 +25,12 @@
                 </template>
                 {{showform.mission_id===0?"日常巡查":(showform.mission?showform.mission.name:'')}}
               </el-descriptions-item>
+              <el-descriptions-item>
+                <template slot="label">
+                  检查名称
+                </template>
+                {{showform.title?showform.title:''}}
+              </el-descriptions-item>
               <el-descriptions-item>
                 <template slot="label">
                   状态

src/views/task/list/patrol.vue

@@ -6,6 +6,12 @@
           <div style="display: flex;justify-content: flex-start;flex-wrap: wrap;">
             <DatePicker style='width:200px;margin-right: 10px;' placeholder="年份" placement="bottom" format='yyyy'
               type="year" @on-change="changeYear"></DatePicker>
+            <el-date-picker @change="changeDate" v-model="select.dateRange" type="daterange"
+              value-format="yyyy-MM-dd" range-separator="至"
+              start-placeholder="开始日期" end-placeholder="结束日期" 
+              style="width: 280px;margin-right: 10px;height:32px">
+            </el-date-picker>
+            <Input v-model="select.title" clearable style="width: 150px;margin-right: 10px;" placeholder="检查名称" />
             <Select filterable clearable style='width:150px;margin-right: 10px;' v-model="select.status" placeholder="检查状态">
               <Option v-for="item in statusList" :value="item.id">{{item.value}}</Option>
             </Select>
@@ -70,6 +76,7 @@
           <template v-slot:btns>
             <el-table-column align='center' label="操作" fixed="right" width="80" header-align="center">
               <template slot-scope="scope">
+                <template v-if="!scope.row.children || (scope.row.children && scope.row.children.length === 0)">
                   <div v-if="(is_guiji||is_chuzhang||scope.row.is_myself)&&!(scope.row.status==5||scope.row.status==6)">
                     <Button  type="primary" style='margin-right:5px;margin-bottom:5px;' size="small" @click="showPatrol(scope.row.id,'show')">办理</Button>
                   </div>
@@ -88,7 +95,7 @@
                       <Button type="primary" style='margin-right:5px;margin-bottom:5px;' size='small' ghost>删除</Button>
                     </Poptip>
                   </div>
-
+                </template>
               </template>
             </el-table-column>
           </template>
@@ -157,7 +164,11 @@
           ask_id:'',
           sort_name:'date',
           sort_type:"DESC",
-          year:''
+          year:'',
+          dateRange:[],
+          start_date:'',
+          end_date:'',
+          title:''
           // pid:0
           // myself_update:0
         },
@@ -232,6 +243,10 @@
           label:"问题类型",
           prop:'ask_value',
           width:120,
+        },{
+          label:"检查名称",
+          prop:'title',
+          align:'left'
         },{
           label:"问题描述",
           prop:'ask_introduce',
@@ -304,8 +319,8 @@
         // is_my_inspection:false
         // 导出
         importtable:[{
-          label:"任务名称",
+          label:"检查名称",
-          prop:'mission_name',
+          prop:'title',
         },{
           label:"发现时间",
           prop:'date',
@@ -377,6 +392,16 @@
           // this.getList()
         }
       },
+      changeDate(e){
+        if(e){
+          this.select.start_date = e[0];
+          this.select.end_date = e[1];
+        }else{
+          this.select.start_date = "";
+          this.select.end_date = "";
+          this.select.dateRange = [];
+        }
+      },
       selectionChange(e){
         console.log(e)
         let arr = []
@@ -719,7 +744,7 @@
             }
           })
           for(var k of res.data){
-            k.mission_name = k.mission?k.mission.name:''
+            {/* k.mission_name = k.mission?k.mission.name:'' */}
             k.site_name = k.site?k.site.name:k.address
             k.ask_value = k.ask?k.ask.value:''
             k.up_admin_name  = k.up_admin?k.up_admin.name:''