From ec3add985f600fe56a7232484bbe89a11b73c23b Mon Sep 17 00:00:00 2001
From: wanghong <309858992@qq.com>
Date: 星期四, 21 十二月 2023 12:25:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue | 107 +++++++++++++++++++++++++++++------------------------
1 files changed, 59 insertions(+), 48 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue b/Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue
index fa4fa40..f928c61 100644
--- a/Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue
+++ b/Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue
@@ -104,6 +104,7 @@
<script>
import { getDictionary } from "@/api/omd/enum";
+import moment from 'moment';
import vciWebRefer from '../refer/vciWebRefer.vue';
export default {
components: { vciWebRefer },
@@ -204,57 +205,55 @@
const data = JSON.stringify(this.options);
this.initOptions = JSON.parse(data);
//console.log(this.initOptions);
- if(this.initOptions.length > 0){
- let array = [];
- this.initOptions.forEach((item,index) => {
- if(item.fieldType==='combox') {
- let enumCach = item.data || JSON.parse(localStorage.getItem(item.comboxKey));
- if(enumCach != null && enumCach.length > 0) {
- item.data = enumCach;
- }else {
- getDictionary({code: item.comboxKey}).then(res=>{
- item.data = res.data.data;
- localStorage.setItem(item.comboxKey,JSON.stringify(res.data.data));
- })
- }
- }else if(item.fieldType==='refer'){
- this.$set(item,"referConfigData",{
- title: item.title,
- showField: item.showField || item.field,
- field: item.field,
- placeholder: item.inputTip || '',
- options: Object.assign(item.referConfig,{width:"80%"}),
- })
- //console.log(item.referConfigData.options);
- //console.log(item);
- }
- // TODO: 杩欏効淇敼涓�涓嬪弬鐓х殑鏌ヨ鏉′欢
- let conditions = [];
- if(item.fieldType==='text'){
- conditions = this.searchConditions;
- }else if (item.fieldType==='combox'|| item.fieldType==='truefalse'){
- conditions = this.switchSearchConditions;
- }else if (item.fieldType==='datetime') {
- conditions = this.dateConditions;
+ if(this.initOptions.length > 0){
+ let array = [];
+ this.initOptions.forEach((item,index) => {
+ if(item.fieldType==='combox') {
+ let enumCach = item.data || JSON.parse(localStorage.getItem(item.comboxKey));
+ if(enumCach != null && enumCach.length > 0) {
+ item.data = enumCach;
}else {
- conditions = this.referSearchConditions;
+ getDictionary({code: item.comboxKey}).then(res=>{
+ item.data = res.data.data;
+ localStorage.setItem(item.comboxKey,JSON.stringify(res.data.data));
+ })
}
- // console.log(conditions);
- this.$set(item,"conditions",conditions)
+ }else if(item.fieldType==='refer'){
+ this.$set(item,"referConfigData",{
+ title: item.title,
+ showField: item.showField || item.field,
+ field: item.field,
+ placeholder: item.inputTip || '',
+ options: Object.assign(item.referConfig,{width:"80%"}),
+ })
+ //console.log(item.referConfigData.options);
+ //console.log(item);
+ }
+ let conditions = [];
+ if(item.fieldType==='text'){
+ conditions = this.searchConditions;
+ }else if (item.fieldType==='combox'|| item.fieldType==='truefalse'){
+ conditions = this.switchSearchConditions;
+ }else if (item.fieldType==='datetime' || item.fieldType==='date') {
+ conditions = this.dateConditions;
+ }else {
+ conditions = this.referSearchConditions;
+ }
+ // console.log(conditions);
+ this.$set(item,"conditions",conditions)
- let add = {
- queryField: String(item.queryField),
- condition: item.fieldType==='text' ? String("_like"):String("_equal"),
- fieldValue: item.fieldType==='truefalse' ? Boolean(false):String(''),
- }
- array.push(add)
- });
- this.searchFormArrays = array;
+ let add = {
+ queryField: String(item.queryField),
+ condition: item.fieldType==='text' ? String("_like"):String("_equal"),
+ fieldValue: item.fieldType==='truefalse' ? Boolean(false):String(''),
+ }
+ array.push(add)
+ });
+ this.searchFormArrays = array;
}
//console.log(this.initOptions);
//console.log(this.searchFormArrays);
},
-
/** 涓哄弬鐓х被鍨嬫椂鍊奸�夋嫨涔嬪悗鐨勫鐞� */
setReferValue(data,index){
if(data.field) {
@@ -313,15 +312,27 @@
// 瀛樺湪鐩稿悓鐨勬煡璇㈡潯浠�
if(condtionParam['conditionMap['+searchConditions[index].queryField+']']+'' != 'undefined' ) {
this.$message.warning("瀛樺湪閲嶅鏌ヨ鏉′欢锛岃浠旂粏鏍稿!");
- console.log(condtionParam['conditionMap['+searchConditions[index].queryField+']']);
+ //console.log(condtionParam['conditionMap['+searchConditions[index].queryField+']']);
return false;
}
- //鎷兼帴鎴恗ap瀵硅薄锛屽皢鏌ヨ瀵硅薄鍜宑ondition鎷兼帴鍦ㄤ竴璧凤紝缁勬垚楂樼骇鏌ヨmap鐨刱ey
- condtionParam['conditionMap['+searchConditions[index].queryField+searchConditions[index].condition+']'] = searchConditions[index].fieldValue;
+ let fieldType = this.initOptions[index].fieldType;
+ // 褰撳嚭鐜版煡璇㈡棩鏈熺殑鏍煎紡鏃�,闇�瑕佸鏃ユ湡鏍煎紡杩涜澶勭悊
+ if(fieldType==='datetime' || fieldType==='date'){
+ // 灏嗘椂闂磋浆鎹负鏈湴鏃堕棿
+ let localTime = moment.utc(searchConditions[index].fieldValue).local();
+ // 鏍煎紡鍖栨椂闂翠负鎮ㄦ兂瑕佺殑鏍煎紡
+ let formattedTime = localTime.format('YYYY-MM-DD HH:mm:ss');
+ condtionParam['conditionMap['+searchConditions[index].queryField+searchConditions[index].condition+']'] = formattedTime;
+ //console.log(formattedTime);
+ }else{
+ //鎷兼帴鎴恗ap瀵硅薄锛屽皢鏌ヨ瀵硅薄鍜宑ondition鎷兼帴鍦ㄤ竴璧凤紝缁勬垚楂樼骇鏌ヨmap鐨刱ey
+ condtionParam['conditionMap['+searchConditions[index].queryField+searchConditions[index].condition+']'] = searchConditions[index].fieldValue;
+ }
}
+
}
// 鏌ヨ鏉′欢娌℃湁鍑虹幇閲嶅灞炴�э紝骞朵笖杩囨护鎺変簡绌哄�硷紝灏变紶閫掔粰鐖剁粍浠�
- console.log(condtionParam);
+ //console.log(condtionParam);
this.$emit('echoContion',condtionParam)
this.isShowDialog = false;
},
--
Gitblit v1.9.3