From 238dc3dc948214a8747fbd52cc4067f8168a6ce6 Mon Sep 17 00:00:00 2001
From: chentaisen <14615430+chentaisen@user.noreply.gitee.com>
Date: Tue, 27 Aug 2024 15:06:03 +0800
Subject: [PATCH] Changes

---
 src/views/rule/rule/index.vue   | 63 ++++++++++++++++++++-------------
 src/views/rule/rule/version.vue |  7 ++--
 2 files changed, 43 insertions(+), 27 deletions(-)

diff --git a/src/views/rule/rule/index.vue b/src/views/rule/rule/index.vue
index e3670f9..90da45e 100644
--- a/src/views/rule/rule/index.vue
+++ b/src/views/rule/rule/index.vue
@@ -40,7 +40,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['rule:rule:add']"
-        >新增</el-button>
+        >新增
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -51,7 +52,8 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['rule:rule:edit']"
-        >修改</el-button>
+        >修改
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -62,7 +64,8 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['rule:rule:remove']"
-        >删除</el-button>
+        >删除
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -72,19 +75,20 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['rule:rule:export']"
-        >导出</el-button>
+        >导出
+        </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="ruleList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="主键" align="center" prop="id" />
-      <el-table-column label="规则名称" align="center" prop="name" />
-      <el-table-column label="规则类型" align="center" prop="ruleType" />
-      <el-table-column label="是否激活" align="center" prop="isActivate" />
-      <el-table-column label="规则描述" align="center" prop="ruleDesc" />
-      <el-table-column label="规则代码" align="center" prop="ruleCode" />
+      <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column label="主键" align="center" prop="id"/>
+      <el-table-column label="规则名称" align="center" prop="name"/>
+      <el-table-column label="规则类型" align="center" prop="ruleType"/>
+      <el-table-column label="是否激活" align="center" prop="isActivate"/>
+      <el-table-column label="规则描述" align="center" prop="ruleDesc"/>
+      <el-table-column label="规则代码" align="center" prop="ruleCode"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -93,21 +97,24 @@
             icon="el-icon-edit"
             @click="handleMaintain(scope.row)"
             v-hasPermi="['rule:rule:remove']"
-          >规则维护</el-button>
+          >规则维护
+          </el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['rule:rule:edit']"
-          >修改</el-button>
+          >修改
+          </el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['rule:rule:remove']"
-          >删除</el-button>
+          >删除
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -124,21 +131,28 @@
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="规则名称" prop="name">
-          <el-input v-model="form.name" placeholder="请输入规则名称" />
+          <el-input v-model="form.name" placeholder="请输入规则名称"/>
         </el-form-item>
 
+
         <el-form-item label="是否激活">
           <el-radio-group v-model="form.isActivate" placeholder="请输入是否激活">
             <el-radio label="Y"></el-radio>
             <el-radio label="N"></el-radio>
           </el-radio-group>
         </el-form-item>
+        <el-form-item label="是否激活">
+          <el-radio-group v-model="form.ruleType" placeholder="请输入规则">
+            <el-radio label="自定义规则"></el-radio>
+            <el-radio label="规则模板"></el-radio>
+          </el-radio-group>
+        </el-form-item>
 
         <el-form-item label="规则描述" prop="ruleDesc">
-          <el-input v-model="form.ruleDesc" type="textarea" placeholder="请输入内容" />
+          <el-input v-model="form.ruleDesc" type="textarea" placeholder="请输入内容"/>
         </el-form-item>
         <el-form-item label="规则代码" prop="ruleCode">
-          <el-input v-model="form.ruleCode" placeholder="请输入规则代码" />
+          <el-input v-model="form.ruleCode" placeholder="请输入规则代码"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -150,7 +164,7 @@
 </template>
 
 <script>
-import { listRule, getRule, delRule, addRule, updateRule } from "/src/api/rule/rule";
+import {listRule, getRule, delRule, addRule, updateRule} from "/src/api/rule/rule";
 
 export default {
   name: "Rule",
@@ -189,7 +203,7 @@ export default {
       // 表单校验
       rules: {
         isActivate: [
-          { required: true, message: "是否激活;是否激活不能为空", trigger: "blur" }
+          {required: true, message: "是否激活;是否激活不能为空", trigger: "blur"}
         ],
       }
     };
@@ -241,7 +255,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
@@ -253,8 +267,8 @@ export default {
     /** 规则维护按钮操作 */
     handleMaintain(row) {
       this.$router.push({
-        path:'version',
-        query:{id:row.id}
+        path: 'version',
+        query: {id: row.id}
       })
     },
     /** 修改按钮操作 */
@@ -290,12 +304,13 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除规则编号为"' + ids + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除规则编号为"' + ids + '"的数据项？').then(function () {
         return delRule(ids);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      }).catch(() => {
+      });
     },
     /** 导出按钮操作 */
     handleExport() {
diff --git a/src/views/rule/rule/version.vue b/src/views/rule/rule/version.vue
index efabf14..4f5d36a 100644
--- a/src/views/rule/rule/version.vue
+++ b/src/views/rule/rule/version.vue
@@ -329,8 +329,8 @@
         <el-form-item label="内容" prop="ruleContent">
           <el-input v-model="form.ruleContent" placeholder="请输入内容"/>
         </el-form-item>
-        <el-form-item label="内容" prop="ruleId">
-          <el-input v-model="form.ruleId" placeholder="请输入内容"/>
+        <el-form-item label="版本" prop="ruleId">
+          <el-input v-model="form.ruleId" disabled placeholder="请输入版本"/>
         </el-form-item>
 
       </el-form>
@@ -344,7 +344,7 @@
 
 <script>
 import {getRule, delRule, updateRule} from "/src/api/rule/rule";
-import {getEditionList, addRule} from "@/api/rule/ruleEdition";
+import {getEditionList, addRule, enable, disable} from "@/api/rule/ruleEdition";
 
 export default {
   name: "Rule",
@@ -496,6 +496,7 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
+      this.form.ruleId = this.ruleAndVersion.id
       this.title = "添加规则";
     },
     // /** 规则维护按钮操作 */