Changes

src/api/rule/ruleEdition.js

@@ -25,15 +25,15 @@ export function addRule(data) {
     data: data
   })
 }
-//
+
-// // 修改规则
+// 修改规则
-// export function updateRule(data) {
+export function updateRule(data) {
-//   return request({
+  return request({
-//     url: '/rule/rule/update',
+    url: '/rule/ruleEdition/update',
-//     method: 'put',
+    method: 'put',
-//     data: data
+    data: data
-//   })
+  })
-// }
+}
 //
 //
 // // 删除规则

src/views/rule/rule/version.vue

@@ -98,13 +98,7 @@
     <!--            @click="handleMaintain(scope.row)"-->
     <!--            v-hasPermi="['rule:rule:remove']"-->
     <!--          >规则维护</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-->
     <!--            size="mini"-->
     <!--            type="text"-->
@@ -116,8 +110,8 @@
     <!--      </el-table-column>-->
     <!--    </el-table>-->
 
-
+    {{ rule.name }}
-    <el-descriptions class="margin-top" title="规则版本" :column="3" border>
+    <el-descriptions class="margin-top" :column="3" border>
       <template slot="extra">
         <el-dropdown split-button type="primary">
           更多操作
@@ -192,13 +186,10 @@
     <el-row :gutter="10">
       <!--            <el-empty description="暂无支付客户" v-if="customerList.length === 0"></el-empty>-->
       <el-col :span="12" v-for="customer in ruleAndEditionList">
-
         <el-card class="box-card">
-
           <div slot="header" class="clearfix">
             <div>
-
+              <el-descriptions class="margin-top" title="规则引擎版本" :column="3" border>
-              <el-descriptions class="margin-top" title="带边框列表" :column="3" :size="size" border>
                 <template slot="extra">
 
                   <el-dropdown>
@@ -207,11 +198,16 @@
                 </span>
                     <el-dropdown-menu slot="dropdown">
                       <el-dropdown-item>
-
+                        <el-button
-                        规格详情
+                          size="mini"
-
+                          type="text"
+                          icon="el-icon-edit"
+                          @click="handleUpdate(customer.id)"
+                          v-hasPermi="['rule:rule:edit']"
+                        >规格详情
+                        </el-button>
                       </el-dropdown-item>
-                      <el-dropdown-item disabled>双皮奶</el-dropdown-item>
+
                       <el-dropdown-item>
                         <el-switch
                           style="float: right; margin: 4px 5px 0;"
@@ -339,12 +335,52 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+
+
+    <!-- 添加或修改规则对话框 -->
+<!--    <el-dialog :title="title" :visible.sync="opens" width="80%" append-to-body>-->
+<!--      <el-form ref="form" :model="form" :rules="rules" label-width="80px">-->
+<!--        <el-form-item label="版本主键" prop="id">-->
+<!--          <el-input v-model="form.id" placeholder="请输入版本类"/>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="版本类" prop="ruleKind">-->
+<!--          <el-input v-model="form.ruleKind" placeholder="请输入版本名称"/>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="版本名称" prop="name">-->
+<!--          <el-input v-model="form.name" type="textarea" placeholder="请输入编码"/>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="编码" prop="ruleCoding">-->
+<!--          <el-radio-group v-model="form.ruleCoding" placeholder="请输入是否激活">-->
+<!--            <el-radio label="Y"></el-radio>-->
+<!--            <el-radio label="N"></el-radio>-->
+<!--          </el-radio-group>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="是否激活" prop="ruleActivate">-->
+<!--          <el-input v-model="form.ruleActivate" placeholder="请输入状态"/>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="状态" prop="status">-->
+<!--          <el-input v-model="form.status" placeholder="请输入内容"/>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="内容" prop="ruleContent">-->
+<!--          <el-input v-model="form.ruleContent" disabled placeholder="请输入版本"/>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="规则ID" prop="ruleId">-->
+<!--          <el-input v-model="form.ruleId" disabled placeholder="请输入版本"/>-->
+<!--        </el-form-item>-->
+
+
+<!--      </el-form>-->
+<!--      <div slot="footer" class="dialog-footer">-->
+<!--        <el-button type="primary" @click="submitForm">确 定</el-button>-->
+<!--        <el-button @click="cancel">取 消</el-button>-->
+<!--      </div>-->
+<!--    </el-dialog>-->
   </div>
 </template>
 
 <script>
-import {getRule, delRule, updateRule} from "/src/api/rule/rule";
+import {getRule, delRule} from "/src/api/rule/rule";
-import {getEditionList, addRule, enable, disable} from "@/api/rule/ruleEdition";
+import {getEditionList, addRule, enable, disable, updateRule} from "@/api/rule/ruleEdition";
 
 export default {
   name: "Rule",
@@ -371,6 +407,7 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      // opens: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -431,6 +468,7 @@ export default {
         console.log(this.rule)
       })
     },
+
     /** 客户状态更改触发 */
     handleStatusChange(row) {
       console.log(row)
@@ -510,7 +548,7 @@ export default {
     handleUpdate(row) {
       this.reset();
       const id = row.id || this.ids
-      getRule(id).then(response => {
+      updateRule(id).then(response => {
         this.form = response.data[0];
         this.open = true;
         this.title = "修改规则";