From d60f2ca80ddbe1846fb7ad9fd1f1e2fb01c372fe Mon Sep 17 00:00:00 2001
From: 黄何裕 <1053952480@qq.com>
Date: 星期一, 22 七月 2024 09:20:27 +0800
Subject: [PATCH] 处理工单下发代码冲突
---
src/views/system/work-order/distribute/index.vue | 43 +++++++++++++++++++++++++++++++------------
1 files changed, 31 insertions(+), 12 deletions(-)
diff --git a/src/views/system/work-order/distribute/index.vue b/src/views/system/work-order/distribute/index.vue
index 4113958..de61087 100644
--- a/src/views/system/work-order/distribute/index.vue
+++ b/src/views/system/work-order/distribute/index.vue
@@ -13,9 +13,31 @@
</el-col>
</el-row>
- <el-row class="op-warp" type="flex" justify="left" >
- <el-col :span="24">
- <el-button size="mini" type="primary" @click="selectedDistribute" class="op">涓嬪彂閫変腑宸ュ崟</el-button>
+ <el-row class="op-warp">
+ <el-row v-show="showSearch">
+ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true">
+ <el-form-item label="鍏抽敭璇�" prop="keyword">
+ <el-input
+ v-model="queryParams.menuName"
+ placeholder="鍏抽敭璇嶆悳绱�"
+ clearable
+ @keyup.enter.native="page"
+ />
+ </el-form-item>
+ <el-form-item label="涓嬪彂鐘舵��" prop="status">
+ <el-select v-model="queryParams.status" placeholder="涓嬪彂鐘舵��" clearable>
+ <el-option label="鏈笅鍙�" value="WAIT_DISTRIBUTE"/>
+ <el-option label="宸蹭笅鍙�" value="DISTRIBUTED"/>
+ </el-select>
+ </el-form-item>
+ <el-form-item>
+ <el-button type="primary" icon="el-icon-search" size="small" @click="page">鎼滅储</el-button>
+ </el-form-item>
+ </el-form>
+ </el-row>
+
+ <el-row>
+ <el-button size="small" type="info" @click="selectedDistribute" class="op">涓嬪彂閫変腑宸ュ崟</el-button>
<el-popconfirm
@confirm="allDistribute"
title="纭畾瑕佷笅鍙戞墍鏈夊伐鍗曞悧锛�"
@@ -64,15 +86,9 @@
</el-form>
<el-button slot="reference" type="primary" size="mini">蹇嵎涓嬪彂</el-button>
</el-popover>
- <el-button
- type="primary"
- plain
- icon="el-icon-plus"
- size="mini"
- @click="handleAdd"
- >鎵嬪姩鏂板宸ュ崟</el-button>
- <el-button icon="el-icon-refresh" circle @click="page"></el-button>
- </el-col>
+ <el-button size="small" type="success" @click="handleAdd">鎵嬪姩鏂板宸ュ崟</el-button>
+ <right-toolbar :showSearch.sync="showSearch" @queryTable="page"></right-toolbar>
+ </el-row>
</el-row>
<el-row class="content-warp" type="flex" justify="left">
@@ -153,6 +169,7 @@
name: 'index',
data() {
return {
+ showSearch: true,
selectedIdsDistributeForm: {
ids: [],
unitId: null
@@ -207,6 +224,8 @@
},
queryParams: {
unitId: null,
+ keyword: '',
+ status: 'WAIT_DISTRIBUTE',
pageNum: 1,
pageSize: 10,
},
--
Gitblit v1.8.0