From c659560c7ee8d8f8278b938421de13bf65d1e1b1 Mon Sep 17 00:00:00 2001
From: ludc <ludc@vci-tech.com>
Date: 星期三, 15 一月 2025 14:28:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/formQueryDialog.vue | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/formQueryDialog.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/formQueryDialog.vue
index 837849b..f03a5b9 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/formQueryDialog.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/formQueryDialog.vue
@@ -13,18 +13,18 @@
style="width: 32%;display: inline-block;text-align: right;word-break: break-all">{{ condition.clause }}</span>
<avue-select v-model="condition.operator" :clearable="false" :dic="condition.operatorDic" :disabled="readOnly"
style="width: 80px;margin: 0 5px;" type="tree"></avue-select>
- <!--<el-date-picker v-if="condition.type=='VTDate'" v-model="condition.ordinaryValue" :disabled="readOnly"
- style="width:300px;margin-right: 5px;display: inline-block;" type="date"
+ <el-date-picker v-if="condition.type=='VTDate'" v-model="condition.ordinaryValue" :disabled="readOnly"
+ style="width:36%;margin-right: 5px;display: inline-block;" type="date"
value-format="YYYY-MM-DD">
</el-date-picker>
<el-date-picker v-else-if="condition.type=='VTDateTime'" v-model="condition.ordinaryValue" :disabled="readOnly"
- style="width:300px;margin-right: 5px;display: inline-block;"
+ style="width:36%;margin-right: 5px;display: inline-block;"
type="datetime">
</el-date-picker>
<el-time-select v-else-if="condition.type=='VTTime'" v-model="condition.ordinaryValue" :disabled="readOnly"
- style="width:300px;margin-right: 5px;display: inline-block;" value-format="HH:mm:ss">
+ style="width:36%;margin-right: 5px;display: inline-block;" value-format="HH:mm:ss">
</el-time-select>
- <avue-input-number v-else-if="condition.type=='VTInteger'" v-model="condition.ordinaryValue"
+ <!--<avue-input-number v-else-if="condition.type=='VTInteger'" v-model="condition.ordinaryValue"
:disabled="readOnly"
precision="0"
style="width:300px;margin-right: 5px;display: inline-block;"></avue-input-number>
@@ -34,7 +34,7 @@
style="width:300px;margin-right: 5px;display: inline-block;"></avue-input-number>
<avue-input v-else v-model="condition.ordinaryValue" :disabled="readOnly" placeholder=""
style="width: 300px;margin-right: 5px;"></avue-input>-->
- <avue-input v-model="condition.ordinaryValue" :disabled="readOnly" placeholder=""
+ <avue-input v-else v-model="condition.ordinaryValue" :disabled="readOnly" placeholder=""
style="width: 36%;margin-right: 5px;"></avue-input>
<el-button v-if="!readOnly" plain size="mini" type="primary" @click="checkTemp(index)">閫夋嫨鏌ヨ妯℃澘</el-button>
<el-button v-if="!readOnly" icon="el-icon-delete" size="mini" style="padding: 7px 8px" type="danger"
@@ -49,11 +49,11 @@
@node-click="nodeClick"></avue-tree>
</div>
<div v-if="!readOnly" style="text-align: right;margin-top: 10px;">
- <el-button v-if="radioForm==1" plain size="mini" type="primary" @click="addHandler">澧炲姞閫昏緫</el-button>
- <el-button v-if="radioForm==1" plain size="mini" type="primary" @click="editHandler">淇敼鏉′欢</el-button>
- <el-button v-if="radioForm==1" plain size="mini" type="primary" @click="delHandler">鍒犻櫎</el-button>
+ <el-button v-show="radioForm==1" plain size="mini" type="primary" @click="addHandler">澧炲姞閫昏緫</el-button>
+ <el-button v-show="radioForm==1" plain size="mini" type="primary" @click="editHandler">淇敼鏉′欢</el-button>
+ <el-button v-show="radioForm==1" plain size="mini" type="primary" @click="delHandler">鍒犻櫎</el-button>
<el-button plain size="mini" type="primary" @click="queryHandler">鏌ヨ</el-button>
- <el-button plain size="mini" type="primary" @click="">鍙栨秷</el-button>
+ <!--<el-button plain size="mini" type="primary" @click="">鍙栨秷</el-button>-->
</div>
<!--淇敼鏉′欢-->
@@ -155,7 +155,6 @@
<script>
import basicOption from "@/util/basic-option";
import {getAllQTs} from "@/api/queryTemplate/queryDefine";
-import {getCriteria} from "@/api/queryTemplate/linkTypeQuery";
import {dateFormat} from "@/util/date"
export default {
@@ -506,7 +505,9 @@
}
},
created() {
- this.getTemp();
+ if (!this.readOnly) {
+ this.getTemp();
+ }
},
methods: {
// 鎷栨嫿鍒版椂
@@ -681,7 +682,8 @@
//閫夋嫨鏌ヨ妯℃澘
checkTemp(index) {
if (index >= 0) {
- if (['VTInteger', 'VTDouble', 'VTLong', 'VTDateTime', 'VTDate', 'VTTime'].includes(this.conditionList[index].type)) {
+ if (['VTDateTime', 'VTDate', 'VTTime'].includes(this.conditionList[index].type)) {
+ this.$message.warning("璇ュ睘鎬х被鍨嬩笉鑳介�夋嫨鏌ヨ妯℃澘");
return false;
}
}
--
Gitblit v1.9.3