From f1c8fd135a28cc253d10e4134b780533bdaa68b4 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 19 十二月 2023 15:35:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue | 52 +++++++++++++++++++++++++++++++++-------------------
1 files changed, 33 insertions(+), 19 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
index 82d1ebe..6abed72 100644
--- a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
@@ -283,7 +283,6 @@
btmtype: '',
code: "",
type: '',
- // this.visibleDeactivate ?'ENABLE':this.visibleEnable ? 'DISABLE' :this.visibleRecovery ? 'ROLLBACK' :'PUBLIC'
processName: "",
vars: {
codeClassifyOid: "",
@@ -348,6 +347,7 @@
fileOptions: {},
result: '',
elapsedTime: '',
+ conditionMap: [],
};
},
computed: {
@@ -393,7 +393,6 @@
},
tableDataArray: {
handler(newval, oldval) {
- // console.log('tableData',newval)
this.tableData = newval;
this.searchResults = newval
this.doLayout();
@@ -410,7 +409,6 @@
},
tableHeadFindData: {
handler(newval, oldval) {
- // console.log(newval)
newval.forEach((record, _index) => {
if (record.queryField == 'id' && validatenull(record.templet)) {
//浼佷笟缂栫爜鐨勯粯璁ゆ坊鍔犺秴閾炬帴,鏆傛湭瀹炵幇
@@ -427,7 +425,7 @@
}
if (_index == 0) {
- this.keyWordFind = record.queryField
+ this.keyWordFind = record.queryField;
}
})
this.tableHeadFindDatas = newval;
@@ -479,11 +477,15 @@
},
},
methods: {
+ // 缃┖鏌ヨ鏉′欢
+ resetConditionMap() {
+ this.conditionMap = {};
+ },
+
CodeLinkHandler(row) {
this.LinkObject = row;
this.LinkVisible = true;
this.LinkList = Object.keys(row).map(property => property)
-
},
//鐘舵�佹悳绱�
cellSelectHandler(row) {
@@ -495,6 +497,7 @@
},
cellStatusFind(lcstatus) {
this.isLoading = true;
+ this.conditionMap["conditionMap[lcstatus]"] = lcstatus;
TableData({
templateOid: this.templateOid,
codeClassifyOid: this.codeClassifyOid,
@@ -854,6 +857,7 @@
codeClassifyOid: this.codeClassifyOid,
page: this.page.currentPage,
limit: this.page.pageSize,
+ ...this.conditionMap, /**甯︿笂鍒嗛〉鏌ヨ鏉′欢 */
});
const endTime = performance.now();
this.elapsedTime = Math.floor(endTime - startTime) * 1;
@@ -915,7 +919,7 @@
});
});
},
- // 灏嗘鍦ㄧ紪杈戠殑琛岀殑鐘舵�佸彉涓� null 锛屽嵆閫�鍑虹紪杈戠姸鎬�
+ //灏嗘鍦ㄧ紪杈戠殑琛岀殑鐘舵�佸彉涓� null 锛屽嵆閫�鍑虹紪杈戠姸鎬�
saveRow() {
this.editingRow = null;
},
@@ -939,6 +943,7 @@
sort: val.prop,
page: this.page.currentPage,
limit: this.page.pageSize,
+ ...this.conditionMap
});
this.data = data.data;
} finally {
@@ -948,7 +953,6 @@
//鍒嗛〉鍒锋柊
async onLoad(val) {
this.isLoading = true;
-
try {
let conditionMap = {};
if (this.statusSelect !== 'all') {
@@ -1001,11 +1005,14 @@
},
// 楂樼骇鏌ヨ
async echoContion(val) {
+ this.conditionMap = val;
try {
const res = await FindData({
templateOid: this.templateOid,
codeClassifyOid: this.codeClassifyOid,
...val,
+ page: this.page.currentPage = 1,/** 姣忔鐐瑰嚮楂樼骇鏌ヨ閮藉簲璇ヤ粠绗竴椤靛紑濮�*/
+ limit: this.page.pageSize
});
this.tableData = res.data.data;
this.page.total = res.data.total
@@ -1017,28 +1024,33 @@
similarHandler() {
if (this.selectRow.length <= 0) {
this.$message.warning("璇烽�夋嫨涓�鏉℃暟鎹�");
- } else if (this.selectRow.length > 1) {
- this.$message.warning("鍙兘閫夋嫨涓�鏉℃暟鎹�");
- } else {
- this.similarVisible = true;
+ return;
}
+ if (this.selectRow.length > 1) {
+ this.$message.warning("鍙兘閫夋嫨涓�鏉℃暟鎹�");
+ return;
+ }
+ this.similarVisible = true;
},
//鏁版嵁鏇存敼
DataChange() {
if (this.selectRow.length <= 0) {
this.$message.warning("璇烽�夋嫨涓�鏉℃暟鎹�");
- } else if (this.selectRow.length > 1) {
- this.$message.warning("鍙兘閫夋嫨涓�鏉℃暟鎹�");
- } else if (this.selectRow[0].lcstatus != "Released") {
- this.$message.warning("鍙湁鐘舵�佷负宸插彂甯冪殑鏁版嵁鎵嶈兘杩涜鏁版嵁鏇存敼");
- } else {
- this.DataVisible = true;
- this.rowOid = this.selectRow[0]['oid']
+ return
}
+ if (this.selectRow.length > 1) {
+ this.$message.warning("鍙兘閫夋嫨涓�鏉℃暟鎹�");
+ return;
+ }
+ if (this.selectRow[0].lcstatus != "Released") {
+ this.$message.warning("鍙湁鐘舵�佷负宸插彂甯冪殑鏁版嵁鎵嶈兘杩涜鏁版嵁鏇存敼");
+ return;
+ }
+ this.DataVisible = true;
+ this.rowOid = this.selectRow[0]['oid']
},
//澧炲姞淇濆瓨
AddSumbit(val) {
- // console.log('val',val)
if (func.notEmpty(val.ts)) {
val.ts = func.formattedDateTime(val.ts);
//console.log(val.ts);
@@ -1082,6 +1094,8 @@
tableFindInp() {
this.isLoading = true;
try {
+ // 瀛樺偍鏌ヨ鏉′欢锛屼富瑕佹槸涓轰簡鐐瑰嚮椤电爜鏃跺甫涓婅繖涓潯浠�
+ this.conditionMap["conditionMap[" + this.keyWordFind + "]"] = '*' + this.WupinFindValue + '*';
TableData({
templateOid: this.templateOid,
codeClassifyOid: this.codeClassifyOid,
--
Gitblit v1.10.0