Changes

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,7 +75,8 @@
           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>
@@ -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>
@@ -127,12 +134,19 @@
           <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="请输入内容"/>
@@ -295,7 +309,8 @@ export default {
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      }).catch(() => {
+      });
     },
     /** 导出按钮操作 */
     handleExport() {

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-form-item label="版本" prop="ruleId">
-          <el-input v-model="form.ruleId" placeholder="请输入内容"/>
+          <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 = "添加规则";
     },
     // /** 规则维护按钮操作 */