From 956e426deb65f6a3edd524fcfb633cf35f82ca36 Mon Sep 17 00:00:00 2001 From: 田源 <lastanimals@163.com> Date: 星期二, 12 九月 2023 11:56:02 +0800 Subject: [PATCH] 集成数据搜索-集成系统搜索组件 --- Source/UBCS-WEB/src/components/dockingSearch/VciDockingSearch.vue | 39 +++++++++++++++++++++++---------------- 1 files changed, 23 insertions(+), 16 deletions(-) diff --git a/Source/UBCS-WEB/src/components/dockingSearch/VciDockingSearch.vue b/Source/UBCS-WEB/src/components/dockingSearch/VciDockingSearch.vue index 81b9f58..e34488d 100644 --- a/Source/UBCS-WEB/src/components/dockingSearch/VciDockingSearch.vue +++ b/Source/UBCS-WEB/src/components/dockingSearch/VciDockingSearch.vue @@ -1,21 +1,15 @@ <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-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="(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 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> @@ -32,15 +26,22 @@ <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-form-item v-if="((status.type == 'task' || status.type == 'data')&& status.stateTaskDataFlag)" 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 === 'task' || status.type === 'data') && 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" @@ -48,7 +49,7 @@ placeholder="閫夋嫨鏃ユ湡鏃堕棿"> </el-date-picker> </el-form-item> -<!-- 鏈�鍚庢帹閫佹椂闂�--> +<!-- 闆嗘垚浠诲姟 鏈�鍚庢帹閫佹椂闂�--> <el-form-item size="small" v-if="status.type == 'task' && status.lastDateFlag"> <el-date-picker v-model="formInline.lastDate" @@ -56,6 +57,7 @@ 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> @@ -82,18 +84,22 @@ shouldShowInput() { const isLogeType = this.status.type === 'loge'; const isTaskType = this.status.type === 'task'; + const isDataType = this.status.type === 'data'; return ( (isLogeType && !this.status.stateFlag && !this.status.dateFlag && !this.status.typeFlag) || - (isTaskType && !this.status.stateTaskFlag && !this.status.dateFlag && !this.status.lastDateFlag && !this.status.sendTypeFlga) + (isTaskType && !this.status.stateTaskDataFlag && !this.status.dateFlag && !this.status.lastDateFlag && !this.status.sendTypeFlga) || + (isDataType && !this.status.stateTaskDataFlag && !this.status.sendTypeFlga) ); }, //鎸夐挳鍒ゆ柇 shouldShowButton() { const isLogeType = this.status.type === 'loge'; const isTaskType = this.status.type === 'task'; + const isDataType = this.status.type === 'data'; return( (isLogeType && (this.status.dateFlag || this.status.stateFlag || this.status.typeFlag)) || - (isTaskType && (this.status.stateTaskFlag || this.status.dateFlag || this.status.lastDateFlag || this.status.sendTypeFlga)) + (isTaskType && (this.status.stateTaskDataFlag || this.status.dateFlag || this.status.lastDateFlag || this.status.sendTypeFlga)) || + (isDataType && (this.status.stateTaskDataFlag || this.status.sendTypeFlga)) ); } }, @@ -101,12 +107,13 @@ SelectChange(val) { const logeType = this.status.type === 'loge'; const taskType = this.status.type === 'task'; + const dataType = this.status.type === 'data'; 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; + this.status.stateTaskDataFlag = (taskType && val === 8) || (dataType && val === 4); + this.status.sendTypeFlga = (taskType && val === 5) || (dataType && val === 3); }, SaveHandler(){ let name = this.SearchObject.searchData[this.formInline.type].prop; -- Gitblit v1.9.3