From 01f3e49f3763a25ef67a4c3e5786491703a1aece Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期四, 13 七月 2023 14:39:58 +0800
Subject: [PATCH] 特殊作业对接修改

---
 src/views/newSpecialWorkSystem/workTicket/sqjl/index.vue |  111 +++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 75 insertions(+), 36 deletions(-)

diff --git a/src/views/newSpecialWorkSystem/workTicket/sqjl/index.vue b/src/views/newSpecialWorkSystem/workTicket/sqjl/index.vue
index dcd2db8..6882547 100644
--- a/src/views/newSpecialWorkSystem/workTicket/sqjl/index.vue
+++ b/src/views/newSpecialWorkSystem/workTicket/sqjl/index.vue
@@ -4,28 +4,46 @@
 <!--            <el-tab-pane label="申请中" name="1">-->
                 <div style="height: 100%">
                     <el-row class="homeCard">
+                     <div class="basic-line" style="display:flex;white-space:nowrap;line-height: 40px">
+                        <span>时间筛选:</span>
+                        <el-date-picker v-model="timeRange" value-format="YYYY-MM-DD HH:mm:ss" type="datetimerange" @change="giveTime()" range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间" />
+                      </div>
+                      <div class="basic-line" style="display:flex;white-space:nowrap;line-height: 40px">
+                        <span>负责人:</span>
+                        <el-input v-model="searPara.headUserName" placeholder="负责人"/>
+                      </div>
+                      <div class="basic-line">
+                        <span>事业部:</span>
+                        <el-select v-model="searPara.secondDepId">
+                          <el-option
+                              v-for="item in dep4List"
+                              :key="item.id"
+                              :label="item.name"
+                              :value="item.id"
+                          />
+                        </el-select>
+                      </div>
+                      <div class="basic-line">
                         <span>作业类型:</span>
-                        <el-col :span="10">
-                            <div class="grid-content topInfo">
-                                <el-select v-model="searchWord">
-                                    <el-option
-                                            v-for="item in workType"
-                                            :key="item.id"
-                                            :label="item.name"
-                                            :value="item.id"
-                                    />
-                                </el-select>
-
-                                <el-button type="primary" @click="searchRecord">查询</el-button>
-                                <el-button plain @click="clearSearch">重置</el-button>
-                            </div>
-                        </el-col>
+                        <el-select v-model="searPara.workType">
+                          <el-option
+                              v-for="item in workType"
+                              :key="item.id"
+                              :label="item.name"
+                              :value="item.id"
+                          />
+                        </el-select>
+                      </div>
+                      <div style="margin-left: 20px">
+                        <el-button type="primary" @click="searchRecord">查询</el-button>
+                        <el-button plain @click="clearSearch">重置</el-button>
+                      </div>
                     </el-row>
                     <div class="homeCard">
                         <div class="main-card">
                             <el-row class="cardTop">
                                 <el-col :span="12" class="mainCardBtn">
-                                    <el-button type="primary" :icon="Plus" size="default" @click="toApply()">申请</el-button>
+                                    <el-button type="primary" :icon="Plus" size="default" @click="toApply()">新增申报</el-button>
                                     <!--									<el-button type="danger" :icon="Delete" size="default">删除</el-button>-->
                                     <!--									<el-button type="success" size="default">设置分类</el-button>-->
                                 </el-col>
@@ -76,10 +94,10 @@
                                 </el-table-column>
                                 <el-table-column fixed="right" label="操作" align="center" width="300">
                                     <template #default="scope">
-                                        <el-button link type="danger" size="small" :icon="Delete" @click="deleteRecordBtn(scope.row)">作废</el-button>
+<!--                                        <el-button link type="danger" size="small" :icon="Delete" @click="deleteRecordBtn(scope.row)">作废</el-button>-->
                                         <el-button link type="primary" size="small" :icon="View" @click="viewRecord(scope.row)">查看</el-button>
-                                        <el-button link type="success" size="small" :icon="Finished">修改</el-button>
-                                        <el-button link type="success" size="small" :icon="Download">正式办票</el-button>
+<!--                                        <el-button link type="success" size="small" :icon="Finished">修改</el-button>-->
+<!--                                        <el-button link type="success" size="small" :icon="Download">正式办票</el-button>-->
 <!--                                        <el-button :disabled="scope.row.status == 7 ? false : true" link type="primary" size="small" :icon="Download" @click="downLoadBtn(scope.row)">导出作业票</el-button>-->
                                     </template>
                                 </el-table-column>
@@ -265,7 +283,6 @@
     deleteId: null | number;
     downLoadId: null | number;
     downLoadName: string;
-    searchWord: string;
     totalSize1: number;
     activeName: string;
     addRecord: {};
@@ -276,6 +293,9 @@
     departmentList: Array<any>;
     departmentRecursionList: Array<DepartmentState>;
     statusList: Array<any>;
+    dep4List: Array<type>;
+    searPara: {}
+    timeRange: Array<string>;
 }
 interface type {
     id: number;
@@ -303,7 +323,13 @@
             departmentList: [],
             departmentRecursionList: [],
             chosenIndex: null,
-            searchWord: '',
+            searPara:{
+              startTime: '',
+              endTime: '',
+              workType: null,
+              headUserName: '',
+              secondDepId: null
+            },
             applyData: [],
             workTimeList: [],
             multipleSelection: [],
@@ -322,6 +348,12 @@
             downLoadId: null,
             downLoadName: '',
             deleteArr: [],
+            dep4List: [
+              {id:49,name:'电石事业部'},
+              {id:50,name:'电力事业部'},
+              {id:48,name:'有机化工事业部'},
+              {id:32,name:'甲醇事业部'}
+            ],
             workType: [
                 { id: 1, name: '动火作业' },
                 { id: 2, name: '受限空间作业' },
@@ -377,13 +409,19 @@
               value: 9,
               label: '安全措施确认,培训交底中'
             }
-          ]
+          ],
+          timeRange: []
         });
-        interface User {
-            name: string;
-            list: [];
-            info: string;
+
+      const giveTime = () => {
+        if (state.timeRange && state.timeRange !== null) {
+          state.searPara.startTime = state.timeRange[0];
+          state.searPara.endTime = state.timeRange[1];
+        } else {
+          state.searPara.startTime = '';
+          state.searPara.endTime = '';
         }
+      };
 
         // 刷新
         const reLoadData = async () => {
@@ -427,7 +465,7 @@
 
         // 分页获取
         const getListByPage = async () => {
-            const data = { pageSize: state.pageSize1, pageIndex: state.pageIndex1, searchParams: { workType: state.searchWord } };
+            const data = { pageSize: state.pageSize1, pageIndex: state.pageIndex1, searchParams: state.searPara };
             let res = await workApplyApi().getAllNewApplyListPage(data);
             if (res.data.code === '200') {
                 state.applyData = JSON.parse(JSON.stringify(res.data.data));
@@ -467,18 +505,18 @@
 
         // 关键词查询记录
         const searchRecord = async () => {
-            if (state.searchWord == '') {
-                ElMessage({
-                    type: 'warning',
-                    message: '请输入查询关键词'
-                });
-            } else {
-                getListByPage();
-            }
+            getListByPage();
         };
         // 重置搜索
         const clearSearch = async () => {
-            state.searchWord = '';
+            state.timeRange = []
+            state.searPara = {
+              startTime: '',
+              endTime: '',
+              workType: null,
+              headUserName: '',
+              secondDepId: null
+            };
             getListByPage();
         };
 
@@ -601,6 +639,7 @@
             Plus,
             Finished,
             Download,
+            giveTime,
             reLoadData,
             toApply,
             handleClick,

--
Gitblit v1.9.2