From 80ef464bf93212805d6b36f12b7791edda04e23e Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期五, 15 九月 2023 09:36:22 +0800
Subject: [PATCH] 集成模块 搜索回显
---
Source/UBCS-WEB/src/views/docking/data.vue | 5 +
Source/UBCS-WEB/src/views/docking/loge.vue | 6 +
Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue | 137 +++++++++++++++++++++++----------------------
Source/UBCS-WEB/src/views/code/code.vue | 3
Source/UBCS-WEB/src/views/system/PasswordManagement/passwords.vue | 4
Source/UBCS-WEB/src/components/dockingSearch/VciDockingSearch.vue | 11 ++-
Source/UBCS-WEB/src/views/docking/task.vue | 5 +
7 files changed, 93 insertions(+), 78 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue b/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
index 7f41850..adfb9af 100644
--- a/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
+++ b/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
@@ -1824,59 +1824,65 @@
input.focus();
}
});
- if (column.property == 'referConfig') {
- this.referConfigVisble = true;
- this.referConfigOption = {
- referConfig: this.CurrentCell.referConfig || '',
- }
- if (this.CurrentCell.referConfig == '') {
+ const columnActions = {
+ referConfig: () => {
+ this.referConfigVisble = true;
this.referConfigOption = {
- referConfig: '',
+ referConfig: this.CurrentCell.referConfig || '',
+ }
+ if (this.CurrentCell.referConfig == '') {
+ this.referConfigOption = {
+ referConfig: '',
+ }
+ }
+ },
+ classifyInvokeText: () => {
+ this.injectVisible = true;
+ if (this.CurrentCell.classifyInvokeAttr != '') {
+ this.injectOption = {
+ classifyInvokeAttr: this.CurrentCell.classifyInvokeAttr,
+ classifyInvokeAttrName: this.CurrentCell.classifyInvokeAttrName,
+ classifyInvokeEditFlag: this.CurrentCell.classifyInvokeEditFlag,
+ classifyInvokeLevel: this.CurrentCell.classifyInvokeLevel == 'min' ? 'min' : 'max',
+ classifyNumber: this.CurrentCell.classifyInvokeLevel == 'min' ? '' : this.CurrentCell.classifyInvokeLevel
+ };
+ }
+ },
+ componentRule: () => {
+ this.isShowformulaEdit = true;
+ },
+ enumString: () => {
+ this.enumVisible = true;
+ this.tableData = [];
+ if (this.CurrentCell.enumString != "") {
+ this.tableData = JSON.parse(this.CurrentCell.enumString)
+ return;
+ }
+ },
+ parentCode: () => {
+ gridCodeClassifyTemplateAttr({
+ 'conditionMap[classifyTemplateOid]': this.Formlist[0].oid,
+ 'conditionMap[oid_notequal]': this.CurrentCell.oid,
+ limit: -1
+ }).then(res => {
+ this.CascadeData = res.data.data;
+ })
+ this.CascadeVisible = true;
+ },
+ verifyRule: () => {
+ this.RulesForm.expressionTextt = this.CurrentCell.verifyRule;
+ this.rulesVisible = true;
+ },
+ attributeGroup: () => {
+ this.attrVisible = true;
+ if (this.CurrentCell.attributeGroup !== '') {
+ this.attrModel = this.CurrentCell.attributeGroup
}
}
- // this.$refs.referConfigFormDialog.onloadAttrData();
- } else if (column.property == 'classifyInvokeText') {
- this.injectVisible = true;
- if (this.CurrentCell.classifyInvokeAttr != '') {
- this.injectOption = {
- classifyInvokeAttr: this.CurrentCell.classifyInvokeAttr,
- classifyInvokeAttrName: this.CurrentCell.classifyInvokeAttrName,
- classifyInvokeEditFlag: this.CurrentCell.classifyInvokeEditFlag,
- classifyInvokeLevel: this.CurrentCell.classifyInvokeLevel == 'min' ? 'min' : 'max',
- classifyNumber: this.CurrentCell.classifyInvokeLevel == 'min' ? '' : this.CurrentCell.classifyInvokeLevel
- };
- } else {
- // this.injectHandleReset();
- }
- } else if (column.property == 'componentRule') {
- if (this.CurrentCell) {
- // this.CurrentCell.componentRule = this.componentRuleText;
- }
- this.isShowformulaEdit = true;
- } else if (column.property == 'enumString') {
- this.enumVisible = true;
- this.tableData=[];
- if (this.CurrentCell.enumString != "") {
- this.tableData = JSON.parse(this.CurrentCell.enumString)
- return
- }
- } else if (column.property == 'parentCode') {
- gridCodeClassifyTemplateAttr({
- 'conditionMap[classifyTemplateOid]': this.Formlist[0].oid,
- 'conditionMap[oid_notequal]': this.CurrentCell.oid,
- limit: -1
- }).then(res => {
- this.CascadeData = res.data.data;
- })
- this.CascadeVisible = true;
- } else if (column.property == 'verifyRule') {
- this.RulesForm.expressionTextt = this.CurrentCell.verifyRule;
- this.rulesVisible = true;
- } else if (column.property == 'attributeGroup') {
- this.attrVisible = true;
- if (this.CurrentCell.attributeGroup !== '') {
- this.attrModel = this.CurrentCell.attributeGroup
- }
+ };
+
+ if (column.property in columnActions) {
+ columnActions[column.property]();
}
}
},
@@ -2018,32 +2024,29 @@
},
//鍒嗙被娉ㄥ叆淇濆瓨
injectAddHandle() {
- // 瀹氫箟灞曠ず绫诲瀷
- let data = {
- "娉ㄥ叆绫诲瀷": this.injectOption.classifyInvokeAttr,
- "娉ㄥ叆绫诲瀷鍚嶇О": this.injectOption.classifyInvokeAttrName,
- "灞傜骇璁剧疆": this.injectOption.classifyInvokeLevel == 'max' ? this.injectOption.classifyNumber : 'min',
- "鏄惁鍙慨鏀�": this.injectOption.classifyInvokeEditFlag
- }
- //鍕鹃�夋搷浣�
+ const { classifyInvokeAttr, classifyInvokeAttrName, classifyInvokeLevel, classifyInvokeEditFlag, classifyNumber } = this.injectOption;
+
+ const data = {
+ "娉ㄥ叆绫诲瀷": classifyInvokeAttr,
+ "娉ㄥ叆绫诲瀷鍚嶇О": classifyInvokeAttrName,
+ "灞傜骇璁剧疆": classifyInvokeLevel === 'max' ? classifyNumber : 'min',
+ "鏄惁鍙慨鏀�": classifyInvokeEditFlag
+ };
for (const key in this.injectOption) {
this.attrSelectList[0][key] = this.injectOption[key];
- //濡傛灉鏄寚瀹氬眰璧嬪�间负鏁板瓧
- if (this.injectOption.classifyInvokeLevel !== 'min') {
- this.attrSelectList[0].classifyInvokeLevel = this.injectOption.classifyNumber
+ if (classifyInvokeLevel !== 'min') {
+ this.attrSelectList[0].classifyInvokeLevel = classifyNumber;
} else {
- this.attrSelectList[0].classifyInvokeLevel = 'min'
+ this.attrSelectList[0].classifyInvokeLevel = 'min';
}
- this.$set(this.attrSelectList[0], 'classifyInvokeText', data)
+ this.$set(this.attrSelectList[0], 'classifyInvokeText', data);
}
- // this.injectHandleReset()
- if (this.injectOption.classifyInvokeLevel !== 'min') {
- this.injectOption.classifyInvokeLevel = this.injectOption.classifyNumber;
+ if (classifyInvokeLevel !== 'min') {
+ this.injectOption.classifyInvokeLevel = classifyNumber;
} else {
this.injectOption.classifyNumber = 0;
}
this.injectVisible = false;
-
},
//鍒嗙被娉ㄥ叆娓呯┖
injectHandleReset() {
diff --git a/Source/UBCS-WEB/src/components/dockingSearch/VciDockingSearch.vue b/Source/UBCS-WEB/src/components/dockingSearch/VciDockingSearch.vue
index 0b17c75..0edd298 100644
--- a/Source/UBCS-WEB/src/components/dockingSearch/VciDockingSearch.vue
+++ b/Source/UBCS-WEB/src/components/dockingSearch/VciDockingSearch.vue
@@ -118,7 +118,12 @@
SaveHandler(){
let name = this.SearchObject.searchData[this.formInline.type].prop;
getList(this.page.currentPage, this.page.pageSize, { [`conditionMap[${name}_like]`]: this.formInline.text}).then(res => {
- console.log(res);
+ if(!res.data.data.records){
+ this.$message.error('鏆傛湭鏌ュ埌鏁版嵁锛�')
+ }else {
+ let Data=res.data.data;
+ this.$emit('getList',Data);
+ }
});
},
handleSearch() {
@@ -157,8 +162,8 @@
if(!res.data.data.records){
this.$message.error('鏆傛湭鏌ュ埌鏁版嵁锛�')
}else {
- let Data=res.data.data.records;
- this.$emit('getList',Data)
+ let Data=res.data.data;
+ this.$emit('getList',Data);
}
});
}
diff --git a/Source/UBCS-WEB/src/views/code/code.vue b/Source/UBCS-WEB/src/views/code/code.vue
index dbc4044..942065e 100644
--- a/Source/UBCS-WEB/src/views/code/code.vue
+++ b/Source/UBCS-WEB/src/views/code/code.vue
@@ -1868,8 +1868,7 @@
if (!this.tipsCodeSecValueMessage(this.codeFixdForm.id)) {
return;
}
- this.codeFixdForm.codeFixedSecOid =
- this.codefixedsecOrCodeclassifysec.oid;
+ this.codeFixdForm.codeFixedSecOid = this.codefixedsecOrCodeclassifysec.oid;
addSaveCodeFixedValue(this.codeFixdForm).then(
() => {
this.loadFixedValueTableData({
diff --git a/Source/UBCS-WEB/src/views/docking/data.vue b/Source/UBCS-WEB/src/views/docking/data.vue
index e249724..e4abbc5 100644
--- a/Source/UBCS-WEB/src/views/docking/data.vue
+++ b/Source/UBCS-WEB/src/views/docking/data.vue
@@ -190,7 +190,10 @@
},
methods: {
dockingGetList(val){
- this.data=val;
+ this.data=val.records;
+ this.page.pageSize=val.size;
+ this.page.currentPage=val.current;
+ this.page.total=val.total;
},
async cellDbClick(row, column, cell, event) {
for (const key in row) {
diff --git a/Source/UBCS-WEB/src/views/docking/loge.vue b/Source/UBCS-WEB/src/views/docking/loge.vue
index 2de73b5..36a1bd8 100644
--- a/Source/UBCS-WEB/src/views/docking/loge.vue
+++ b/Source/UBCS-WEB/src/views/docking/loge.vue
@@ -219,8 +219,10 @@
},
methods: {
dockingGetList(val){
- console.log(val,'val')
- this.data=val;
+ this.data=val.records;
+ this.page.pageSize=val.size;
+ this.page.currentPage=val.current;
+ this.page.total=val.total;
},
async cellDbClick(row, column, cell, event) {
for (const key in row) {
diff --git a/Source/UBCS-WEB/src/views/docking/task.vue b/Source/UBCS-WEB/src/views/docking/task.vue
index 2d637e1..00c0348 100644
--- a/Source/UBCS-WEB/src/views/docking/task.vue
+++ b/Source/UBCS-WEB/src/views/docking/task.vue
@@ -243,7 +243,10 @@
},
methods: {
dockingGetList(val){
- this.data=val;
+ this.data=val.records;
+ this.page.pageSize=val.size;
+ this.page.currentPage=val.current;
+ this.page.total=val.total;
},
async cellDbClick(row, column, cell, event) {
for (const key in row) {
diff --git a/Source/UBCS-WEB/src/views/system/PasswordManagement/passwords.vue b/Source/UBCS-WEB/src/views/system/PasswordManagement/passwords.vue
index aa9b662..3a39a37 100644
--- a/Source/UBCS-WEB/src/views/system/PasswordManagement/passwords.vue
+++ b/Source/UBCS-WEB/src/views/system/PasswordManagement/passwords.vue
@@ -1,5 +1,5 @@
<template>
- <basic-container>
+ <basic-container >
<avue-crud v-model="form" :option="option" :data="data" ref="crud" @on-load="onLoad" @row-save="rowSave" @row-update="rowUpdate" @row-del="rowDel" :page.sync="page">
<template slot="menu" slot-scope="{ row, index }">
<el-button
@@ -132,6 +132,7 @@
index: true,
rowKey:'id',
editBtn:false,
+ height:700,
delBtn:false,
column: [
{
@@ -176,7 +177,6 @@
},
{
- //鍐欎袱涓粍鍚堟柟娉曟槸鍥犱负id鍜宯ame涓嶈兘鍚屾椂缁戝畾杩欎釜prop鏉ユ覆鏌擄紝涓�涓〃鏍煎仛闅愯棌鏉ユ暟鎹搷浣滐紙琛ㄥ崟闅愯棌锛夛紝鍙︿竴涓〃鏍煎仛鏄剧ず鍙樉绀哄湪椤甸潰锛堣〃鍗曢殣钘忥級銆�
label: '缁勫悎鏂规硶',
prop: 'combinationIds',
type: "checkbox",
--
Gitblit v1.9.3