From fe8200d8de32ade9099a7c97b8cb58b428afceef Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期二, 19 十一月 2024 16:35:25 +0800
Subject: [PATCH] 修改树查询
---
Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-tree.vue | 6 +++---
Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-table.vue | 3 +++
Source/plt-web/plt-web-ui/src/api/base/ui.js | 8 ++++----
Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/businessType/index.vue | 18 +++++++++++++++---
4 files changed, 25 insertions(+), 10 deletions(-)
diff --git a/Source/plt-web/plt-web-ui/src/api/base/ui.js b/Source/plt-web/plt-web-ui/src/api/base/ui.js
index 7c451a8..2b42e07 100644
--- a/Source/plt-web/plt-web-ui/src/api/base/ui.js
+++ b/Source/plt-web/plt-web-ui/src/api/base/ui.js
@@ -10,7 +10,7 @@
}
//UI涓婁笅鏂囧垪琛ㄦ煡璇�
-export const getList = (current, size, params) => {
+export const getList = (current, size, params,url) => {
let formData = new FormData()
for(let key in params){
formData.append(key.replaceAll('"',''),params[key])
@@ -18,7 +18,7 @@
formData.append("page",current)
formData.append("limit",size)
return request({
- url: '/api/uiDataController/dataGridQuery',
+ url: url||'/api/uiDataController/dataGridQuery',
method: 'post',
emulateJSON:true,
headers:{"Content-Type": "application/text"},
@@ -27,7 +27,7 @@
}
//UI涓婁笅鏂囨爲鏌ヨ
-export const getTree = (parentOid,parentBtmName, params) => {
+export const getTree = (parentOid,parentBtmName, params,url) => {
let formData = new FormData()
for(let key in params){
formData.append(key.replaceAll('"',''),params[key])
@@ -37,7 +37,7 @@
formData.append("parentBtmName",parentBtmName)
formData.append("parentBtmType",parentBtmName)
return request({
- url: '/api/uiDataController/getDataForTree',
+ url: url||'/api/uiDataController/getDataForTree',
method: 'post',
headers:{"Content-Type": "application/text"},
data: formData
diff --git a/Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-table.vue b/Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-table.vue
index 9f80fae..8cc40c2 100644
--- a/Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-table.vue
+++ b/Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-table.vue
@@ -58,6 +58,9 @@
:size="scope.size"></el-button>
</el-tooltip>
</template>
+ <template #icon="{ row }">
+ <i :class="'iconfont '+row.icon"> </i>
+ </template>
</avue-crud>
</div>
</template>
diff --git a/Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-tree.vue b/Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-tree.vue
index 0e751cd..629106e 100644
--- a/Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-tree.vue
+++ b/Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-tree.vue
@@ -167,7 +167,7 @@
if (!value) return true;
return data[this.defaultProps.label].indexOf(value) !== -1;
},
- sourceDataMap: function () {debugger;
+ sourceDataMap: function () {
const sourceDataMap = {};
if (Object.keys(this.sourceData).length > 0) {
if (this.sourceData.oid) {
@@ -194,13 +194,13 @@
}
return sourceDataMap;
},
- getParams: function () {debugger;
+ getParams: function () {
let parentFieldName = "";
if (this.componentVO.treeDefineVO.showLinkAbs) {
parentFieldName = this.componentVO.treeDefineVO.showLinkAbs.split(",")[0];
}
const queryTemplate=this.sourceData.querytemplate || this.paramVOS.querytemplate;
- const linkTypeFlag=this.sourceData.queryType==0?false:(!validatenull(this.sourceData.linkType)?true:(this.paramVOS.querytype==0?false:true));
+ const linkTypeFlag=this.sourceData.querytype==0?false:(!validatenull(this.sourceData.linktype)?true:(this.paramVOS.querytype==0?false:true));
const treeParams = {
queryAllLevel: !this.lazy,
loadType: this.componentVO.treeDefineVO.loadType,
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/businessType/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/businessType/index.vue
index da5ebf9..fe3446f 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/businessType/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/businessType/index.vue
@@ -168,9 +168,19 @@
<el-form-item label="绫诲瀷鍚嶇О锛�" prop="id">
<el-input v-model="form.id" :readOnly="title === 'edit'"></el-input>
</el-form-item>
- <el-form-item label="鏍囩锛�">
- <el-input v-model="form.name"></el-input>
- </el-form-item>
+ <el-row :span="24">
+ <el-col :span="12">
+ <el-form-item label="鏍囩锛�">
+ <el-input v-model="form.name"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鍥炬爣锛�">
+ <avue-input-icon v-model="form.icon" :icon-list="iconList" placeholder="璇烽�夋嫨鍥炬爣">
+ </avue-input-icon>
+ </el-form-item>
+ </el-col>
+ </el-row>
<el-form-item label="缁ф壙鑷細">
<avue-input-tree :disabled="title === 'add'"
v-model="form.fName"
@@ -420,11 +430,13 @@
import func from "@/util/func";
import {getUsedVersionRuleList, getVersionRuleAllList} from "@/api/modeling/version/api";
import {gridLifeCycle} from "@/api/modeling/lifeCycle/api";
+import iconList from "@/config/iconList";
export default {
name: "index",
data() {
return {
+ iconList: iconList,
indexLoading: false,
indexFormRead: false,
indexAttrRow: {},
--
Gitblit v1.9.3