wans

src/views/check/checkjob/CheckJob.vue

@@ -12,7 +12,7 @@
     </a-space>
     <a-card style="margin-bottom: 8px;padding-bottom: 0px;" v-show="visible">
       <a-drawer
-        title="设备筛选"
+        title="筛选"
         placement="top"
         :closable="false"
         :visible="showFilter"

src/views/repair/application-form/RepairForm.vue

@@ -1,125 +1,190 @@
 <template>
   <div>
+    <a-space v-show="visible" :size="50">
+      <div class="filter-icon" :class="current===0?'active':''" @click="handleFilter(0)">
+        <a-icon type="file-protect" />
+        <div>全部工单</div>
+      </div>
+      <div class="filter-icon" :class="current===1?'active':''" @click="handleFilter(1)">
+        <a-icon type="exception" />
+        <div>接单大厅</div>
+      </div>
+      <div class="filter-icon" :class="current===2?'active':''" @click="handleFilter(2)">
+        <a-icon type="exception" />
+        <div>我的工单</div>
+      </div>
+      <div class="filter-icon" :class="current===3?'active':''" @click="handleFilter(3)">
+        <a-icon type="exception" />
+        <div>待接工单</div>
+      </div>
+      <div class="filter-icon" :class="current===4?'active':''" @click="handleFilter(4)">
+        <a-icon type="exception" />
+        <div>待派工单</div>
+      </div>
+      <div class="filter-icon" :class="current===5?'active':''" @click="handleFilter(5)">
+        <a-icon type="exception" />
+        <div>撤回工单</div>
+      </div>
+      <div class="filter-icon" :class="current===6?'active':''" @click="handleFilter(6)">
+        <a-icon type="exception" />
+        <div>上报工单</div>
+      </div>
+      <div class="filter-icon" :class="current===7?'active':''" @click="handleFilter(7)">
+        <a-icon type="exception" />
+        <div>关闭工单</div>
+      </div>
+      <div class="filter-icon" :class="current===8?'active':''" @click="handleFilter(8)">
+        <a-icon type="exception" />
+        <div>我的审核</div>
+      </div>
+    </a-space>
     <a-card v-show="visible">
       <div class="table-page-search-wrapper">
+        <a-drawer
+          title="筛选"
+          placement="top"
+          :closable="false"
+          :visible="showFilter"
+          :height="330"
+          @close="showFilter=false"
+        >
+          <div class="table-page-search-wrapper">
+            <a-form layout="inline">
+              <a-row :gutter="48">
+                <a-col :md="6" :sm="24">
+                  <a-form-item label="关键字">
+                    <a-input v-model.trim="queryParam.keyword" placeholder="请输入设备名称/故障描述"/>
+                  </a-form-item>
+                </a-col>
+                <!--            <a-col :md="6" :sm="24">-->
+                <!--              <a-form-item label="设备自编号">-->
+                <!--                <a-input v-model="queryParam.zbh" placeholder="请输入设备自编号"/>-->
+                <!--              </a-form-item>-->
+                <!--            </a-col>-->
+                <a-col :md="6" :sm="24">
+                  <a-form-item label="报修人">
+                    <a-input v-model="queryParam.actualUser" placeholder="请输入报修人"/>
+                  </a-form-item>
+                </a-col>
+                <a-col :md="6" :sm="24">
+                  <a-form-item label="维修人">
+                    <a-input v-model="queryParam.repairUserName" placeholder="请输入维修人"/>
+                  </a-form-item>
+                </a-col>
+                <!--            <a-col :md="6" :sm="24">-->
+                <!--              <a-form-item label="问题描述">-->
+                <!--                <a-input v-model="queryParam.content" placeholder="问题描述模糊查询"/>-->
+                <!--              </a-form-item>-->
+                <!--            </a-col>-->
+                <a-col :md="6" :sm="24">
+                  <a-form-item label="状态">
+                    <a-select v-model="queryParam.status" placeholder="请选择">
+                      <a-select-option
+                        v-for="(label,value) in statusMap"
+                        :key="value"
+                        :label="label"
+                        :value="parseInt(value)">{{ label }}
+                      </a-select-option>
+                    </a-select>
+                  </a-form-item>
+                </a-col>
+                <a-col :md="6" :sm="24">
+                  <a-form-item label="报修起始日期">
+                    <a-date-picker
+                      v-model="queryParam.searchStartTime"
+                      style="width: 100%"
+                      :format="BaseTool.Date.PICKER_NORM_DATETIME_PATTERN"
+                    />
+                  </a-form-item>
+                </a-col>
+                <a-col :md="6" :sm="24">
+                  <a-form-item label="报修结束日期">
+                    <a-date-picker
+                      v-model="queryParam.searchEndTime"
+                      style="width: 100%"
+                      :format="BaseTool.Date.PICKER_NORM_DATETIME_PATTERN"
+                    />
+                  </a-form-item>
+                </a-col>
+                <a-col :md="6" :sm="24">
+                  <a-form-item label="工单类型">
+                    <a-select v-model="queryParam.category" placeholder="请选择">
+                      <a-select-option
+                        v-for="(label,value) in categoryMap"
+                        :key="value"
+                        :label="label"
+                        :value="parseInt(value)">{{ label }}
+                      </a-select-option>
+                    </a-select>
+                  </a-form-item>
+                </a-col>
+                <a-col :md="6" :sm="24">
+                  <a-form-item
+                    label="维修部门"
+                    :labelCol="BaseTool.Constant.labelCol"
+                    :wrapperCol="BaseTool.Constant.wrapperCol"
+                  >
+                    <a-select v-model="queryParam.repairDeptId" placeholder="请选择" >
+                      <a-select-option
+                        v-for="(label,value) in repairDeptMap"
+                        :key="value"
+                        :label="label"
+                        :value="value">{{ label }}
+                      </a-select-option>
+                    </a-select>
+                  </a-form-item>
+                </a-col>
+                <a-col :md="6" :sm="24">
+                  <a-form-item
+                    label="报修类型"
+                    :labelCol="BaseTool.Constant.labelCol"
+                    :wrapperCol="BaseTool.Constant.wrapperCol"
+                  >
+                    <a-select v-model="queryParam.repairFormType" placeholder="请选择">
+                      <a-select-option
+                        v-for="(label,value) in repairFormTypeMap"
+                        :key="value"
+                        :label="label"
+                        :value="parseInt(value)">{{ label }}
+                      </a-select-option>
+                    </a-select>
+                  </a-form-item>
+                </a-col>
+                <a-col :md="6" :sm="24">
+                  <a-form-item label="车间位置">
+                    <a-select v-model="queryParam.sbPositionId" placeholder="请选择">
+                      <a-select-option
+                        v-for="({id,name}) in sbPositionData"
+                        :key="id"
+                        :label="name"
+                        :value="id">{{ name }}
+                      </a-select-option>
+                    </a-select>
+                  </a-form-item>
+                </a-col>
+                <a-col :md="8 || 24" :sm="24">
+                  <span class="table-page-search-submitButtons">
+                    <a-button type="primary" @click="handleOk()">查询</a-button>
+                    <a-button style="margin-left: 8px" @click="resetSearchForm">重置</a-button>
+                  </span>
+                </a-col>
+              </a-row>
+            </a-form>
+          </div>
+        </a-drawer>
         <a-form layout="inline">
           <a-row :gutter="48">
-            <a-col :md="6" :sm="24">
+            <a-col :md="8" :sm="24">
               <a-form-item label="关键字">
-                <a-input v-model.trim="queryParam.keyword" placeholder="请输入设备名称/故障描述"/>
+                <a-input v-model.trim="queryParam.keyword" placeholder="请输入设备名称/故障描述" />
               </a-form-item>
             </a-col>
-            <!--            <a-col :md="6" :sm="24">-->
-            <!--              <a-form-item label="设备自编号">-->
-            <!--                <a-input v-model="queryParam.zbh" placeholder="请输入设备自编号"/>-->
-            <!--              </a-form-item>-->
-            <!--            </a-col>-->
-            <a-col :md="6" :sm="24">
-              <a-form-item label="报修人">
-                <a-input v-model="queryParam.actualUser" placeholder="请输入报修人"/>
-              </a-form-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-item label="维修人">
-                <a-input v-model="queryParam.repairUserName" placeholder="请输入维修人"/>
-              </a-form-item>
-            </a-col>
-            <!--            <a-col :md="6" :sm="24">-->
-            <!--              <a-form-item label="问题描述">-->
-            <!--                <a-input v-model="queryParam.content" placeholder="问题描述模糊查询"/>-->
-            <!--              </a-form-item>-->
-            <!--            </a-col>-->
-            <a-col :md="6" :sm="24">
-              <a-form-item label="状态">
-                <a-select v-model="queryParam.status" placeholder="请选择">
-                  <a-select-option
-                    v-for="(label,value) in statusMap"
-                    :key="value"
-                    :label="label"
-                    :value="parseInt(value)">{{ label }}
-                  </a-select-option>
-                </a-select>
-              </a-form-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-item label="报修起始日期">
-                <a-date-picker
-                  v-model="queryParam.searchStartTime"
-                  style="width: 100%"
-                  :format="BaseTool.Date.PICKER_NORM_DATETIME_PATTERN"
-                />
-              </a-form-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-item label="报修结束日期">
-                <a-date-picker
-                  v-model="queryParam.searchEndTime"
-                  style="width: 100%"
-                  :format="BaseTool.Date.PICKER_NORM_DATETIME_PATTERN"
-                />
-              </a-form-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-item label="工单类型">
-                <a-select v-model="queryParam.category" placeholder="请选择">
-                  <a-select-option
-                    v-for="(label,value) in categoryMap"
-                    :key="value"
-                    :label="label"
-                    :value="parseInt(value)">{{ label }}
-                  </a-select-option>
-                </a-select>
-              </a-form-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-item
-                label="维修部门"
-                :labelCol="BaseTool.Constant.labelCol"
-                :wrapperCol="BaseTool.Constant.wrapperCol"
-              >
-                <a-select v-model="queryParam.repairDeptId" placeholder="请选择" >
-                  <a-select-option
-                    v-for="(label,value) in repairDeptMap"
-                    :key="value"
-                    :label="label"
-                    :value="value">{{ label }}
-                  </a-select-option>
-                </a-select>
-              </a-form-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-item
-                label="报修类型"
-                :labelCol="BaseTool.Constant.labelCol"
-                :wrapperCol="BaseTool.Constant.wrapperCol"
-              >
-                <a-select v-model="queryParam.repairFormType" placeholder="请选择">
-                  <a-select-option
-                    v-for="(label,value) in repairFormTypeMap"
-                    :key="value"
-                    :label="label"
-                    :value="parseInt(value)">{{ label }}
-                  </a-select-option>
-                </a-select>
-              </a-form-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-item label="车间位置">
-                <a-select v-model="queryParam.sbPositionId" placeholder="请选择">
-                  <a-select-option
-                    v-for="({id,name}) in sbPositionData"
-                    :key="id"
-                    :label="name"
-                    :value="id">{{ name }}
-                  </a-select-option>
-                </a-select>
-              </a-form-item>
-            </a-col>
-            <a-col :md="8 || 24" :sm="24">
-              <span class="table-page-search-submitButtons">
-                <a-button type="primary" @click="handleOk()">查询</a-button>
-                <a-button style="margin-left: 8px" @click="resetSearchForm">重置</a-button>
-              </span>
+            <a-col :md="6 || 24" :sm="24">
+              <a-space>
+                <a-button type="primary" @click="handleOk">查询</a-button>
+                <a-button type="primary" @click="showFilter=true">筛选</a-button>
+                <a-button @click="resetSearchForm">重置</a-button>
+              </a-space>
             </a-col>
           </a-row>
         </a-form>
@@ -281,9 +346,11 @@ export default {
 
       },
       visible: true,
+      current: 0,
       dispatchFlag: false,
       allocatedFlag: false,
       editFlag: false,
+      showFilter: false,
       // 表头
       columns: [
         {
@@ -627,7 +694,70 @@ export default {
     handleDispatching (record) {
       const modal = this.$refs.dispatchBaseForm
       modal.base(record)
+    },
+    handleFilter (key) {
+      this.current = key
+      this.queryParam.status = null
+
+      switch (key) {
+        case 0:
+          this.queryParam.filter = -1
+          this.queryParam.searchType = -1
+          break
+        case 1:
+          this.queryParam.filter = -1
+          this.queryParam.searchType = 3
+          break
+        case 2:
+          this.queryParam.filter = 0
+          this.queryParam.searchType = 1
+          break
+        case 3:
+          this.queryParam.filter = -1
+          this.queryParam.searchType = 4
+          break
+        case 4:
+          this.queryParam.filter = -1
+          this.queryParam.searchType = 7
+          break
+        case 5:
+          this.queryParam.filter = -1
+          this.queryParam.searchType = -1
+          this.queryParam.status = 23
+          break
+        case 6:
+          this.queryParam.filter = -1
+          this.queryParam.searchType = 8
+          break
+        case 7:
+          this.queryParam.filter = -1
+          this.queryParam.searchType = 9
+          break
+        case 8:
+          this.queryParam.filter = -1
+          this.queryParam.searchType = 5
+          break
+      }
+      this.$refs.table.refresh()
     }
   }
 }
 </script>
+<style lang="less" scoped>
+.filter-icon{
+  font-size: 18px;
+  text-align: center;
+  color: #666;
+  cursor: pointer;
+  margin-bottom: 10px;
+  &>:first-child{
+  font-size: 30px;
+}
+&:hover{
+  color: #1890ff;
+}
+}
+.active{
+  color:#1890ff;
+}
+</style>

src/views/repair/application-form/RepairFormPool.vue

@@ -1,81 +1,108 @@
 <template>
   <div>
     <a-card v-show="visible">
+      <a-drawer
+        title="筛选"
+        placement="top"
+        :closable="false"
+        :visible="showFilter"
+        :height="330"
+        @close="showFilter=false"
+      >
+        <div class="table-page-search-wrapper">
+          <a-form layout="inline">
+            <a-row :gutter="48">
+              <a-col :md="6" :sm="24">
+                <a-form-item label="关键字">
+                  <a-input v-model.trim="queryParam.keyword" placeholder="请输入设备名称/设备编号"/>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="设备自编号">
+                  <a-input v-model="queryParam.zbh" placeholder="请输入设备自编号"/>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="报修人">
+                  <a-input v-model="queryParam.actualUser" placeholder="请输入报修人"/>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="维修人">
+                  <a-input v-model="queryParam.repairUserName" placeholder="请输入维修人"/>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="问题描述">
+                  <a-input v-model="queryParam.content" placeholder="问题描述模糊查询"/>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="状态">
+                  <a-select v-model="queryParam.status" placeholder="请选择">
+                    <a-select-option
+                      v-for="(label,value) in statusMap"
+                      :key="value"
+                      :label="label"
+                      :value="parseInt(value)">{{ label }}
+                    </a-select-option>
+                  </a-select>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="是否加入日历图">
+                  <a-select v-model="queryParam.addCalendar" placeholder="请选择">
+                    <a-select-option
+                      :value="true">已加入
+                    </a-select-option>
+                    <a-select-option
+                      :value="false">未加入
+                    </a-select-option>
+                  </a-select>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="报修起始日期">
+                  <a-date-picker
+                    v-model="queryParam.searchStartTime"
+                    style="width: 100%"
+                    :format="BaseTool.Date.PICKER_NORM_DATETIME_PATTERN"
+                  />
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="报修结束日期">
+                  <a-date-picker
+                    v-model="queryParam.searchEndTime"
+                    style="width: 100%"
+                    :format="BaseTool.Date.PICKER_NORM_DATETIME_PATTERN"
+                  />
+                </a-form-item>
+              </a-col>
+              <a-col :md="8 || 24" :sm="24">
+                <span class="table-page-search-submitButtons">
+                  <a-button type="primary" @click="handleOk()">查询</a-button>
+                  <a-button style="margin-left: 8px" @click="resetSearchForm">重置</a-button>
+                </span>
+              </a-col>
+            </a-row>
+          </a-form>
+        </div>
+      </a-drawer>
       <div class="table-page-search-wrapper">
         <a-form layout="inline">
           <a-row :gutter="48">
-            <a-col :md="6" :sm="24">
+            <a-col :md="8" :sm="24">
               <a-form-item label="关键字">
-                <a-input v-model.trim="queryParam.keyword" placeholder="请输入设备名称/设备编号"/>
-              </a-form-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-item label="设备自编号">
-                <a-input v-model="queryParam.zbh" placeholder="请输入设备自编号"/>
-              </a-form-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-item label="报修人">
-                <a-input v-model="queryParam.actualUser" placeholder="请输入报修人"/>
-              </a-form-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-item label="维修人">
-                <a-input v-model="queryParam.repairUserName" placeholder="请输入维修人"/>
-              </a-form-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-item label="问题描述">
-                <a-input v-model="queryParam.content" placeholder="问题描述模糊查询"/>
-              </a-form-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-item label="状态">
-                <a-select v-model="queryParam.status" placeholder="请选择">
-                  <a-select-option
-                    v-for="(label,value) in statusMap"
-                    :key="value"
-                    :label="label"
-                    :value="parseInt(value)">{{ label }}
-                  </a-select-option>
-                </a-select>
-              </a-form-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-item label="是否加入日历图">
-                <a-select v-model="queryParam.addCalendar" placeholder="请选择">
-                  <a-select-option
-                    :value="true">已加入
-                  </a-select-option>
-                  <a-select-option
-                    :value="false">未加入
-                  </a-select-option>
-                </a-select>
-              </a-form-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-item label="报修起始日期">
-                <a-date-picker
-                  v-model="queryParam.searchStartTime"
-                  style="width: 100%"
-                  :format="BaseTool.Date.PICKER_NORM_DATETIME_PATTERN"
-                />
-              </a-form-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-item label="报修结束日期">
-                <a-date-picker
-                  v-model="queryParam.searchEndTime"
-                  style="width: 100%"
-                  :format="BaseTool.Date.PICKER_NORM_DATETIME_PATTERN"
-                />
+                <a-input v-model.trim="queryParam.keyword" placeholder="请输入设备名称/设备编号" />
               </a-form-item>
             </a-col>
-            <a-col :md="8 || 24" :sm="24">
-              <span class="table-page-search-submitButtons">
-                <a-button type="primary" @click="handleOk()">查询</a-button>
-                <a-button style="margin-left: 8px" @click="resetSearchForm">重置</a-button>
-              </span>
+            <a-col :md="6 || 24" :sm="24">
+              <a-space>
+                <a-button type="primary" @click="handleOk">查询</a-button>
+                <a-button type="primary" @click="showFilter=true">筛选</a-button>
+                <a-button @click="resetSearchForm">重置</a-button>
+              </a-space>
             </a-col>
           </a-row>
         </a-form>
@@ -223,6 +250,7 @@ export default {
       dispatchFlag: false,
       allocatedFlag: false,
       editFlag: false,
+      showFilter: false,
       // 表头
       columns: [
         {