From c38a3bb6a9cb89297356a1c97ffe87f5ed165c89 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 25 十月 2023 09:51:09 +0800
Subject: [PATCH] 编码规则删除码段提示修改，前端按钮缓存结构修改上传

---
 Source/UBCS-WEB/src/views/code/code.vue |   31 ++++++++++++++++++++++++++++---
 1 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/Source/UBCS-WEB/src/views/code/code.vue b/Source/UBCS-WEB/src/views/code/code.vue
index 4455cfb..1c397cf 100644
--- a/Source/UBCS-WEB/src/views/code/code.vue
+++ b/Source/UBCS-WEB/src/views/code/code.vue
@@ -1324,6 +1324,7 @@
 export default {
   data() {
     return {
+      crudOption:{...optionRule},
       ruleForm: {},
       query: {},
       loading: true,
@@ -1646,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);
@@ -2302,6 +2304,12 @@
             queryField: "lcStatus",
             comboxKey: "codeSearchLCStatus",
           },
+          {
+            data: [],
+            title: "鎵�鏈夎��",
+            fieldType: "text",
+            queryField: "ownerText",
+          },
         ];
       } else {
         this.advancedQueryParam.options = [
@@ -2536,7 +2544,7 @@
       this.query = {};
       this.onLoad(this.page);
     },
-    // 缂栫爜瑙勫垯蹇�熸煡璇�
+    // 缂栫爜瑙勫垯蹇�熸煡璇earchChange
     searchChange(params, done) {
       this.page.currentPage = 1;
       // 澶氫釜conditionMap杩欐牱浼犲弬锛屽揩閫熸煡璇㈤粯璁ら噰鐢ㄦā绯婃煡璇�
@@ -2549,6 +2557,11 @@
       }
       this.query = requestData;
       this.onLoad(this.page, this.query);
+      // console.log(  this.findObject(this.optionRule.column,'id'))
+      // console.log(this.crudOption.column[0])
+      // this.crudOption.column && this.crudOption.column.length > 0
+      //   ? (this.crudOption.column[0].value = '')
+      //   : null;
       done();
     },
     /** 缂栫爜瑙勫垯褰撳墠閫変腑琛屽彉鍖栫殑鏃跺�欒Е鍙�*/
@@ -2586,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;
@@ -2915,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;
@@ -3376,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