From dcb848136f44817701498a25bc07d12c10984d98 Mon Sep 17 00:00:00 2001 From: odc.xiaohui <xiaohui@Q1> Date: 星期一, 20 二月 2023 11:48:08 +0800 Subject: [PATCH] 2023/2/20 肖辉 修改事项处理管理查询条件 --- src/views/operate/disposal/casepool/pool/index.vue | 169 +++++++++++++++++++++++++++++++++----------------------- 1 files changed, 99 insertions(+), 70 deletions(-) diff --git a/src/views/operate/disposal/casepool/pool/index.vue b/src/views/operate/disposal/casepool/pool/index.vue index a069592..391bf7c 100644 --- a/src/views/operate/disposal/casepool/pool/index.vue +++ b/src/views/operate/disposal/casepool/pool/index.vue @@ -1,66 +1,35 @@ <template> <div class="userList"> <header> - <div class="headerContent"> - <div class="search"> - <span>鏉ユ簮鏌ヨ:</span> - <div class="option"> - <el-select clearable v-model="resource" placeholder="璇烽�夋嫨鏉ユ簮"> - <el-option - v-for="item in eventSourceOptions" - :key="item.label" - :label="item.label" - :value="item.value" - > - </el-option> - </el-select> - </div> - <div class="findBtn"> - <el-button type="primary" @click="getUserList">鏌ヨ</el-button> - </div> - </div> - <div class="addUser"> - <el-button - class="addBtn button-addition" - type="primary" - @click="dialogCreate = true" - >娣诲姞</el-button - > - <!-- 閫夋嫨鐧昏绫诲瀷 --> - <el-dialog - :before-close="handleClose" - :visible.sync="dialogCreate" - title="璇烽�夋嫨涓婃姤浜嬩欢绫诲瀷" - width="45%" - v-if="dialogCreate" - > - <createUser @getPageProp="setDialog" /> - </el-dialog> - <!-- 浜嬩欢鐧昏 --> - <el-dialog - :before-close="handleClose" - :visible.sync="dialogNewAdd" - :title="newAddType === 0 ? '杩濊浜嬩欢鐧昏' : '杩濆缓浜嬩欢鐧昏'" - width="80%" - v-if="dialogNewAdd" - > - <!-- 杩濆缓鐧昏 --> - <MyIll - v-if="newAddType === 1" - :refresh="getUserList" - :mytype="newAddType" - @changeDialog="changeDialog" - /> - <!-- 杩濊鐧昏 --> - <myVio - v-else - :refresh="getUserList" - :mytype="newAddType" - @changeDialog="changeDialog" - /> - </el-dialog> - </div> - </div> + <MyHeader @dialogCreatepro="dialogCreatepro" @getUserList ="getUserList"></MyHeader> +<!-- <div class="headerContent">--> +<!-- <div class="search">--> +<!-- <span>鏉ユ簮鏌ヨ:</span>--> +<!-- <div class="option">--> +<!-- <el-select clearable v-model="resource" placeholder="璇烽�夋嫨鏉ユ簮">--> +<!-- <el-option--> +<!-- v-for="item in eventSourceOptions"--> +<!-- :key="item.label"--> +<!-- :label="item.label"--> +<!-- :value="item.value"--> +<!-- >--> +<!-- </el-option>--> +<!-- </el-select>--> +<!-- </div>--> +<!-- <div class="findBtn">--> +<!-- <el-button type="primary" @click="getUserList">鏌ヨ</el-button>--> +<!-- </div>--> +<!-- </div>--> +<!-- <div class="addUser">--> +<!-- <el-button--> +<!-- class="addBtn button-addition"--> +<!-- type="primary"--> +<!-- @click="dialogCreate = true"--> +<!-- >娣诲姞</el-button--> +<!-- >--> + +<!-- </div>--> +<!-- </div>--> </header> <main> <div class="mainContent"> @@ -246,6 +215,39 @@ </div> </div> </main> + <!-- 閫夋嫨鐧昏绫诲瀷 --> + <el-dialog + :before-close="handleClose" + :visible.sync="dialogCreate" + title="璇烽�夋嫨涓婃姤浜嬩欢绫诲瀷" + width="45%" + v-if="dialogCreate" + > + <createUser @getPageProp="setDialog" /> + </el-dialog> + <!-- 浜嬩欢鐧昏 --> + <el-dialog + :before-close="handleClose" + :visible.sync="dialogNewAdd" + :title="newAddType === 0 ? '杩濊浜嬩欢鐧昏' : '杩濆缓浜嬩欢鐧昏'" + width="80%" + v-if="dialogNewAdd" + > + <!-- 杩濆缓鐧昏 --> + <MyIll + v-if="newAddType === 1" + :refresh="getUserList" + :mytype="newAddType" + @changeDialog="changeDialog" + /> + <!-- 杩濊鐧昏 --> + <myVio + v-else + :refresh="getUserList" + :mytype="newAddType" + @changeDialog="changeDialog" + /> + </el-dialog> </div> </template> <script> @@ -258,7 +260,7 @@ import helper from "@/utils/mydate"; import { RESOURCE_OPTIONS } from "@/utils/helper"; import basecase from "@/api/operate/basecase"; - +import MyHeader from "@/components/seachHeader/index" export default { components: { createUser, @@ -267,6 +269,7 @@ MyDetail, MyDispatch, MyIllDetail, + MyHeader }, data() { return { @@ -361,9 +364,15 @@ this.statusArr[1] = item.value; } }); - this.getUserList(); + this.getUserList(undefined); + }, + mounted() { }, methods: { + dialogCreatepro(){ + console.log('-------------------') + this.dialogCreate = true + }, // 璋冨害 handleDispatch(data) { this.baseId = data.id; @@ -438,14 +447,34 @@ }); }, // 鑾峰彇鐢ㄦ埛鍒楄〃 - getUserList() { - const params = { - current: this.currentPage, - state: this.statusArr[0] ?? null, - size: this.pageSize, - resource: this.resource, - type: this.statusArr[1] ?? null, - }; + getUserList(seachData) { + // console.log(seachData.seachData.resource) + let params + if (seachData){ + params = { + current: this.currentPage, + state: this.statusArr[0] ?? null, + size: this.pageSize, + resource: seachData.seachData.resource ==undefined ?null:seachData.seachData.resource, + region:seachData.seachData.region ==undefined?null:seachData.seachData.region, + type: this.statusArr[1] ?? null, + code:seachData.seachData.code ==undefined?null:seachData.seachData.code, + categoryBig:seachData.seachData.categoryBig ==undefined?null:seachData.seachData.categoryBig, + categorySmall:seachData.seachData.categorySmall ==undefined?null:seachData.seachData.categorySmall, + site:seachData.seachData.site ==undefined?null:seachData.seachData.site, + street:seachData.seachData.street ==undefined?null:seachData.seachData.street, + alarmTime:seachData.seachData.alarmTime ==undefined?null:seachData.seachData.alarmTime, + }; + }else { + + params = { + current: this.currentPage, + state: this.statusArr[0] ?? null, + size: this.pageSize, + type: this.statusArr[1] ?? null, + }; + } + basecase .baseCasePoolList(params) .then(({ records, total }) => { -- Gitblit v1.8.0