From 584ae5476c319cd1551a97b64c01ee1e5e5ff5a6 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 25 十月 2023 15:46:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/code/code.vue | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/code/code.vue b/Source/UBCS-WEB/src/views/code/code.vue
index 8fe7297..1c397cf 100644
--- a/Source/UBCS-WEB/src/views/code/code.vue
+++ b/Source/UBCS-WEB/src/views/code/code.vue
@@ -1647,6 +1647,7 @@
if (JSON.stringify(conditionMaps) != "{}") {
if (this.advancedQueryParam.currentOpen == "codeRule") {
this.query = conditionMaps;
+ // console.log(this.query);
this.onLoad(this.page);
} else {
this.sendGridCodeBasicSec(conditionMaps, true);
@@ -2303,6 +2304,12 @@
queryField: "lcStatus",
comboxKey: "codeSearchLCStatus",
},
+ {
+ data: [],
+ title: "鎵�鏈夎��",
+ fieldType: "text",
+ queryField: "ownerText",
+ },
];
} else {
this.advancedQueryParam.options = [
@@ -2592,7 +2599,11 @@
},
onLoad(page, params = {}) {
this.loading = true;
- gridCodeRule(page.currentPage, page.pageSize, params).then((res) => {
+ gridCodeRule(
+ page.currentPage,
+ page.pageSize,
+ Object.assign({},params,this.query),
+ ).then((res) => {
//console.log(res.data);
const data = res.data.data;
this.page.total = data.total;
@@ -2921,6 +2932,10 @@
/** 鍩虹鐮佹鍒犻櫎*/
deleteBasicCode() {
if (!this.tipsMessage(this.selectionBasicList)) {
+ return;
+ }
+ if (this.selectionBasicList[0].lcStatus != "Editing") {
+ this.$message.warning('缂栫爜瑙勫垯鐘舵�佷笉鏄�"缂栬緫涓�"锛屼笉鍏佽鍒犻櫎鐮佹!');
return;
}
let oid = this.selectionBasicList[0].oid;
@@ -3382,10 +3397,14 @@
},
// 鏈�澶ф祦姘村彿
maxSerialNum() {
- if (this.selectionList.length === 0) {
+ if (this.selectionList.length <= 0) {
this.$message.warning("璇烽�夋嫨涓�鏉＄紪鐮佽鍒欙紒");
return;
}
+ if(this.selectionList.length> 1){
+ this.$message.warning("鍙兘閫夋嫨涓�鏉＄紪鐮佽鍒欙紒");
+ return;
+ }
this.maxSerial.visible = true;
this.maxSerial.ruleOid = this.selectionList[0]["oid"];
},
--
Gitblit v1.9.3