From 549ecbf13b14a4deb74e42828abcd46ccb68a7c0 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 09 五月 2023 17:18:07 +0800
Subject: [PATCH] 前端代码提交

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

diff --git a/Source/UBCS-WEB/src/views/code/code.vue b/Source/UBCS-WEB/src/views/code/code.vue
index ba79473..704bd33 100644
--- a/Source/UBCS-WEB/src/views/code/code.vue
+++ b/Source/UBCS-WEB/src/views/code/code.vue
@@ -1133,6 +1133,7 @@
             type: "success",
             message: "鎿嶄綔鎴愬姛!"
           });
+<<<<<<< HEAD
         })
       },
       //鍩虹鐮佹鏌ヨ
@@ -1169,6 +1170,31 @@
           this.$message({
             type: "success",
             message: "鎿嶄綔鎴愬姛!"
+=======
+        },
+        //鍒锋柊浣跨敤鑼冨洿鍒楄〃
+        refreshUseRangeChange(){
+          this.getRangeCodeList();
+        },
+        //鍗曞嚮缂栫爜瑙勫垯瀹炵幇琛岄�夋嫨
+        codeRuleRowClick (row) {
+          this.$refs.crud.toggleSelection();
+          this.selectionList = row;
+          this.$refs.crud.setCurrentRow(row);
+          this.$refs.crud.toggleRowSelection(row); //閫変腑褰撳墠琛�
+          this.loadBasic(row);
+        },
+        // 鍚敤涓庡仠鐢�
+        enableOrDeactivatse(oId,update){
+          updateStatus({"oid":oId,"ts":new Date().getTime,"update":update}).then(() => {
+            this.onLoad(this.page);
+            this.$message({
+              type: "success",
+              message: "鎿嶄綔鎴愬姛!"
+            });
+          }, error => {
+            window.console.log(error);
+>>>>>>> 7938e5bedb3ff3b17dae51eb9588e8c8e71136c2
           });
         }, error => {
           window.console.log(error);
@@ -1299,7 +1325,56 @@
 };
 </script>
 
+<<<<<<< HEAD
 <style>
+=======
+<style scope>
+
+  .code-rule-crud > .avue-crud__search ,.code-basic-crud > .avue-crud__search {
+    margin-bottom: -15px;
+  }
+
+  .code-rule-crud > .avue-crud__pagination {
+    padding: 14px 0 2px 20px;
+  }
+  
+
+  .clone-input-textarea > .el-form-item__content {
+    width: 495px;
+  }
+
+  .clone-avue-crud > .el-card > .el-card__body > .avue-crud__menu {
+    display: none!important;
+  }
+
+  .fixed-avue-crud > .el-card> .el-card__body > .avue-crud__menu {
+    display: none!important;
+  }
+
+  .other-clone-codebasic-crud > .el-card> .el-card__body > .avue-crud__menu {
+    display: none!important;
+  }
+
+  .other-clone-coderule-crud > .el-card> .el-card__body > .avue-crud__menu {
+    display: none!important;
+  }
+  
+  .el-table--small .el-table__cell {
+    padding: 3px 0;
+  }
+
+  .classify_value_box > .el-scrollbar {
+    height: 95%;
+  }
+
+  .basic-container > .el-card  > .el-card__body {
+    margin: -10px 0;
+  }
+  .code-basicsec-container{
+    padding: 1px 6px;
+  }
+
+>>>>>>> 7938e5bedb3ff3b17dae51eb9588e8c8e71136c2
   .el-divider--horizontal {
       margin-top: 19px !important;
       margin-bottom: -20px !important;

--
Gitblit v1.9.3