From d53d2ceccf1163e11c635037c67b88a907b4cdf7 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 12 九月 2023 11:34:17 +0800
Subject: [PATCH] 集成任务-查询
---
Source/UBCS-WEB/src/views/docking/loge.vue | 16 +++
Source/UBCS-WEB/src/components/dockingSearch/VciDockingSearch.vue | 115 ++++++++++++++++++++--------
Source/UBCS-WEB/src/views/docking/task.vue | 79 ++++++++++++++++++-
3 files changed, 168 insertions(+), 42 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/dockingSearch/VciDockingSearch.vue b/Source/UBCS-WEB/src/components/dockingSearch/VciDockingSearch.vue
index 28df3b8..81b9f58 100644
--- a/Source/UBCS-WEB/src/components/dockingSearch/VciDockingSearch.vue
+++ b/Source/UBCS-WEB/src/components/dockingSearch/VciDockingSearch.vue
@@ -1,26 +1,68 @@
<template>
<div style="display: flex" >
<el-form :inline="true" :model="formInline" class="demo-form-inline">
- <el-form-item label="绫诲瀷:" size="small">
- <el-select v-model="formInline.type" placeholder="璇疯緭鍏ョ被鍨�" @change="SelectChange">
+ <el-form-item label="闆嗘垚鏌ヨ:" size="small">
+ <el-select v-model="formInline.type" placeholder="璇烽�夋嫨鍒嗙被" @change="SelectChange">
<el-option :label="item.label" :value="item.value" v-for="item in SearchObject.searchData" ></el-option>
</el-select>
</el-form-item>
- <el-form-item v-if="typeFlag" size="small">
- <el-select v-model="formInline.check" placeholder="璇烽�夋嫨鍒嗙被">
- <el-option label="1" value="0"></el-option>
- <el-option label="2" value="1"></el-option>
+<!-- 闆嗘垚鏃ュ織鏄惁鎴愬姛-->
+ <el-form-item v-if="(status.type == 'loge' && status.stateFlag)" size="small">
+ <el-select v-model="formInline.state" placeholder="璇烽�夋嫨鐘舵��">
+ <el-option label="鏄�" value="true"></el-option>
+ <el-option label="鍚�" value="false"></el-option>
</el-select>
</el-form-item>
- <el-form-item size="small" v-if="dateFlag">
+<!-- 闆嗘垚浠诲姟鏄惁鎺ㄩ�佹垚鍔�-->
+ <el-form-item v-if="(status.type == 'task' && status.stateTaskFlag)" size="small">
+ <el-select v-model="formInline.stateTask" placeholder="璇烽�夋嫨鐘舵��">
+ <el-option label="鏄�" value="true"></el-option>
+ <el-option label="鍚�" value="false"></el-option>
+ </el-select>
+ </el-form-item>
+<!-- 闆嗘垚鏃ュ織绫诲瀷-->
+ <el-form-item v-if="(status.type == 'loge' && status.typeFlag)" size="small">
+ <el-select v-model="formInline.cut" placeholder="璇烽�夋嫨绫诲瀷">
+ <el-option label="鏁版嵁鎺ㄩ��" value="pushData"></el-option>
+ <el-option label="鍒嗙被鎺ㄩ��" value="pushClassifyData"></el-option>
+ <el-option label="缂栫爜鐢宠" value="applyCode"></el-option>
+ <el-option label="缂栫爜缁存姢" value="syncEditData"></el-option>
+ <el-option label="鍒嗙被鏌ヨ" value="queryClassify"></el-option>
+ <el-option label="鍚紪鐮佽鍒欑殑鍒嗙被鏌ヨ" value="queryClassifyRule"></el-option>
+ <el-option label="鏁版嵁鏌ヨ" value="queryData"></el-option>
+ </el-select>
+ </el-form-item>
+<!-- 闆嗘垚浠诲姟鎺ㄩ�佺被鍨�-->
+ <el-form-item v-if="(status.type === 'task' && status.sendTypeFlga)" size="small">
+ <el-select v-model="formInline.taskCut" placeholder="璇烽�夋嫨鎺ㄩ�佺被鍨�">
+ <el-option label="鍙戝竷" value="Enabled"></el-option>
+ <el-option label="鍥炴敹" value="TakeBack"></el-option>
+ <el-option label="鍋滅敤" value="Disabled"></el-option>
+ </el-select>
+ </el-form-item>
+<!-- 鍒涘缓鏃ユ湡-->
+ <el-form-item size="small" v-if="((status.type == 'loge' ||status.type == 'task') && status.dateFlag)">
<el-date-picker
v-model="formInline.Date"
type="date"
placeholder="閫夋嫨鏃ユ湡鏃堕棿">
</el-date-picker>
</el-form-item>
- <el-form-item size="small" >
+<!-- 鏈�鍚庢帹閫佹椂闂�-->
+ <el-form-item size="small" v-if="status.type == 'task' && status.lastDateFlag">
+ <el-date-picker
+ v-model="formInline.lastDate"
+ type="date"
+ placeholder="閫夋嫨鏃ユ湡鏃堕棿">
+ </el-date-picker>
+ </el-form-item>
+<!-- 杈撳叆鍐呭-->
+ <el-form-item size="small" v-if="shouldShowInput">
<el-input v-model="formInline.text" placeholder="璇疯緭鍏ュ唴瀹�" @keyup.enter.native="SaveHandler"></el-input>
+ </el-form-item>
+<!-- 鏌ヨ鎸夐挳-->
+ <el-form-item size="small" v-if="shouldShowButton">
+ <el-button type="success" size="small">鏌ヨ</el-button>
</el-form-item>
</el-form>
</div>
@@ -30,35 +72,41 @@
import {getList} from "@/api/docking/loge";
export default {
name: "VciDockingSearch",
- props:['SearchObject','page'],
+ props:['SearchObject','page','formInline','status'],
data() {
return {
- typeFlag:false,
- dateFlag:false,
- formInline:{
- type:'',
- check:'',
- text:'',
- Date:''
- },
+ }
+ },
+ computed: {
+ //杈撳叆妗嗗垽鏂�
+ shouldShowInput() {
+ const isLogeType = this.status.type === 'loge';
+ const isTaskType = this.status.type === 'task';
+ return (
+ (isLogeType && !this.status.stateFlag && !this.status.dateFlag && !this.status.typeFlag) ||
+ (isTaskType && !this.status.stateTaskFlag && !this.status.dateFlag && !this.status.lastDateFlag && !this.status.sendTypeFlga)
+ );
+ },
+ //鎸夐挳鍒ゆ柇
+ shouldShowButton() {
+ const isLogeType = this.status.type === 'loge';
+ const isTaskType = this.status.type === 'task';
+ return(
+ (isLogeType && (this.status.dateFlag || this.status.stateFlag || this.status.typeFlag)) ||
+ (isTaskType && (this.status.stateTaskFlag || this.status.dateFlag || this.status.lastDateFlag || this.status.sendTypeFlga))
+ );
}
},
methods:{
- SelectChange(val){
- this.typeFlag = (this.SearchObject.type === 'loge' && val === 5);
- this.dateFlag = (this.SearchObject.type === 'loge' && val === 6);
- // if(this.SearchObject.type === 'loge'){
- // if(val === 5){
- // this.typeFlag=true;
- // }else {
- // this.typeFlag=false;
- // }
- // if(val === 6){
- // this.dateFlag=true;
- // }else {
- // this.dateFlag=false;
- // }
- // }
+ SelectChange(val) {
+ const logeType = this.status.type === 'loge';
+ const taskType = this.status.type === 'task';
+ this.status.typeFlag = logeType && val === 5;
+ this.status.dateFlag = (logeType && val === 6) || (taskType && val === 6);
+ this.status.stateFlag = logeType && val === 7;
+ this.status.stateTaskFlag = taskType && val === 8;
+ this.status.lastDateFlag = taskType && val === 7;
+ this.status.sendTypeFlga = taskType && val === 5;
},
SaveHandler(){
let name = this.SearchObject.searchData[this.formInline.type].prop;
@@ -70,6 +118,5 @@
}
</script>
-<style scoped>
-
+<style lang="scss" scoped>
</style>
diff --git a/Source/UBCS-WEB/src/views/docking/loge.vue b/Source/UBCS-WEB/src/views/docking/loge.vue
index 136ec29..d120764 100644
--- a/Source/UBCS-WEB/src/views/docking/loge.vue
+++ b/Source/UBCS-WEB/src/views/docking/loge.vue
@@ -16,7 +16,7 @@
@refresh-change="refreshChange"
@on-load="onLoad">
<template slot-scope="scope" slot="menuLeft">
- <vci-docking-search :SearchObject="SearchObject" :page="page"></vci-docking-search>
+ <vci-docking-search :SearchObject="SearchObject" :page="page" :formInline="formInline" :status="status"></vci-docking-search>
</template>
</avue-crud>
</basic-container>
@@ -32,8 +32,20 @@
data(){
return {
value:'',
- SearchObject:{
+ status:{
type:'loge',
+ typeFlag:false,
+ dateFlag:false,
+ stateFlag:false,
+ },
+ formInline:{
+ type:'',
+ cut:'',
+ text:'',
+ Date:'',
+ state:''
+ },
+ SearchObject:{
searchData:[
{
label:'鏁版嵁缂栫爜',
diff --git a/Source/UBCS-WEB/src/views/docking/task.vue b/Source/UBCS-WEB/src/views/docking/task.vue
index 4eab458..4c2cec2 100644
--- a/Source/UBCS-WEB/src/views/docking/task.vue
+++ b/Source/UBCS-WEB/src/views/docking/task.vue
@@ -16,12 +16,15 @@
@refresh-change="refreshChange"
@on-load="onLoad">
<template slot="menuLeft">
- <el-button type="primary"
- size="small"
- plain
- icon="el-icon-refresh-right"
- @click="handleSend">鎵嬪姩鎺ㄩ��
- </el-button>
+ <el-button type="primary"
+ size="small"
+ plain
+ icon="el-icon-refresh-right"
+ @click="handleSend">鎵嬪姩鎺ㄩ��
+ </el-button>
+ <div style="float: right;margin-left: 10px">
+ <vci-docking-search :formInline="formInline" :SearchObject="SearchObject" :page="page" :status="status"></vci-docking-search>
+ </div>
</template>
</avue-crud>
</basic-container>
@@ -37,6 +40,70 @@
name: "task",
data(){
return {
+ formInline:{
+ type:'',
+ stateTask:'',
+ lastDate:'',
+ Date:'',
+ text:'',
+ taskCut:''
+ },
+ status:{
+ type:'task',
+ stateTaskFlag:false,
+ dateFlag:false,
+ lastDateFlag:false,
+ sendTypeFlga:false
+ },
+ SearchObject:{
+ searchData:[
+ {
+ label:'鏁版嵁缂栫爜',
+ prop: "id",
+ value:0
+ },
+ {
+ label:'鍒嗙被浠ｅ彿',
+ prop: 'classifyId',
+ value:1
+ },
+ {
+ label:'鍒嗙被鍚嶇О',
+ prop: 'classifyName',
+ value:2
+ },
+ {
+ label:'闆嗘垚绯荤粺缂栧彿',
+ prop: 'systemCode',
+ value:3
+ },
+ {
+ label:'闆嗘垚绯荤粺鍚嶇О',
+ prop: 'systemName',
+ value:4
+ },
+ {
+ label:'鎺ㄩ�佺被鍨�',
+ prop: 'sendType',
+ value:5
+ },
+ {
+ label:'浠诲姟鍒涘缓鏃堕棿',
+ prop: 'createTime',
+ value:6
+ },
+ {
+ label:'鏈�鍚庢帹閫佹椂闂�',
+ prop: 'lastModifyTime',
+ value:7
+ },
+ {
+ label:'鏄惁鎺ㄩ�佹垚鍔�',
+ prop: 'sendFlag',
+ value:8
+ }
+ ]
+ },
value:'',
loading: false,
query: {},
--
Gitblit v1.9.3