Merge branch 'master' of https://gitea.qinmian.online/2112A-ONE/cloud-ui

src/api/quest/middle.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询任务结点中间表列表
+export function listMiddle(query) {
+  return request({
+    url: '/quest/middle/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询任务结点中间表详细
+export function getMiddle(id) {
+  return request({
+    url: '/quest/middle/' + id,
+    method: 'get'
+  })
+}
+
+// 新增任务结点中间表
+export function addMiddle(data) {
+  return request({
+    url: '/quest/middle',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改任务结点中间表
+export function updateMiddle(data) {
+  return request({
+    url: '/quest/middle',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除任务结点中间表
+export function delMiddle(id) {
+  return request({
+    url: '/quest/middle/' + id,
+    method: 'delete'
+  })
+}

src/api/quest/node.js

@@ -18,9 +18,9 @@ export function getNode(id) {
 }
 
 // 新增节点管理
-export function addNode(data) {
+export function addNode(data, taskCode) {
   return request({
-    url: '/quest/node',
+    url: '/quest/node/'+taskCode,
     method: 'post',
     data: data
   })
@@ -36,9 +36,9 @@ export function updateNode(data) {
 }
 
 // 删除节点管理
-export function delNode(id) {
+export function delNode(id, taskCode) {
   return request({
-    url: '/quest/node/' + id,
+    url: '/quest/node/' + id + '/' + taskCode,
     method: 'delete'
   })
 }

src/api/rule/rule.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询规则列表
+export function listRule(query) {
+  return request({
+    url: '/rule/rule/list',
+    method: 'post',
+    params: query
+  })
+}
+
+// 查询规则详细
+export function getRule(id) {
+  return request({
+    url: '/rule/rule/' + id,
+    method: 'get'
+  })
+}
+
+// 新增规则
+export function addRule(data) {
+  return request({
+    url: '/rule/rule',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改规则
+export function updateRule(data) {
+  return request({
+    url: '/rule/rule',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除规则
+export function delRule(id) {
+  return request({
+    url: '/rule/rule/' + id,
+    method: 'delete'
+  })
+}

src/views/market/apitype/index.vue

@@ -1,5 +1,19 @@
 <template>
   <div class="app-container">
+    <el-tabs v-model="activeNameL" type="card" @change="getType(activeNameL)">
+      <el-tab-pane
+        :key="all"
+        :label="all"
+        :name="all"
+      >
+      </el-tab-pane>
+      <el-tab-pane
+        :key="item.sysLeixingpick"
+        v-for="(item,index) in editableTabs"
+        :label="item.sysLeixingpick"
+        :name="item.sysLeixingpick"
+      >
+      </el-tab-pane>
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
           <el-form-item label="产品编号" prop="sysSerial">
             <el-input
@@ -9,18 +23,10 @@
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
-      <el-form-item label="简介" prop="sysIntro">
+          <el-form-item label="产品名称" prop="sysIntro">
             <el-input
               v-model="queryParams.sysIntro"
-          placeholder="请输入简介"
+              placeholder="请输入产品名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="产品状态" prop="sysTypes">
-        <el-input
-          v-model="queryParams.sysTypes"
-          placeholder="请输入产品状态"
               clearable
               @keyup.enter.native="handleQuery"
             />
@@ -33,18 +39,10 @@
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
-      <el-form-item label="类型选择" prop="sysLeixingpick">
+          <el-form-item label="元/次" prop="sysNumber">
-        <el-input
-          v-model="queryParams.sysLeixingpick"
-          placeholder="请输入类型选择"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="次/元 时间" prop="sysNumber">
             <el-input
               v-model="queryParams.sysNumber"
-          placeholder="请输入次/元 时间"
+              placeholder="请输入元/次"
               clearable
               @keyup.enter.native="handleQuery"
             />
@@ -55,81 +53,20 @@
           </el-form-item>
         </el-form>
 
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['market:apitype:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['market:apitype:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['market:apitype:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['market:apitype:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
 
-    <el-row :gutter="10">
+        <el-row :gutter="10" >
-      <el-empty description="暂无支付客户" v-if="apitypeList.length == 0"></el-empty>
+          <el-empty description="暂无商品" v-if="apitypeList.length == 0"></el-empty>
-      <el-col :span="8" v-for="customer in apitypeList" v-if="apitypeList.length != 0">
+          <el-col :span="8" v-for="customer in apitypeList" v-if="apitypeList.length != 0&&activeNameL=='全部类型'||customer.sysLeixingpick==activeNameL">
             <el-card class="box-card">
               <div slot="header" class="clearfix">
+                <el-image :src="customer.sysTypes">
+                  <div slot="placeholder" class="image-slot">
+                    加载中<span class="dot">...</span>
+                  </div>
+                </el-image>
+                <br>
                 <span style="font-size: 18px;font-weight: 900;">{{customer.sysIntro}}</span>
-            <el-switch
+                <span style="float: right;font-size: 18px;font-weight: 900;" >{{customer.sysNumber}}元/次</span>
-              style="float: right;padding: 5px; margin: 4px 5px 0;"
-              v-model="customer.sysTypes"
-              active-value="1"
-              inactive-value="2"
-              active-color="#13ce66"
-              inactive-color="#ff4949"
-              @change="handleStatusChange(customer)"
-            >
-            </el-switch>
-
-
-            <el-button
-              style="float: right;padding: 5px; margin: 0 5px" type="primary" icon="el-icon-edit" circle
-              @click="handleUpdate(customer)"
-              v-hasPermi="['market:apitype:edit']"
-            ></el-button>
-            <el-button
-              style="float: right;padding: 5px; margin: 0 5px" type="danger" icon="el-icon-delete" circle
-              @click="handleDelete(customer)"
-              v-hasPermi="['market:apitype:remove']"
-            ></el-button>
-
               </div>
               <div >
                 <el-descriptions class="margin-top"  :column="1" :size="size" border>
@@ -138,11 +75,6 @@
                       <i class="el-icon-user"> </i>产品编号</template>
                     {{customer.sysSerial}}
                   </el-descriptions-item>
-              <el-descriptions-item>
-                <template slot="label">
-                  <i class="el-icon-user"> </i>元/次</template>
-                {{customer.sysNumber}}
-              </el-descriptions-item>
                   <el-descriptions-item>
                     <template slot="label">
                       <i class="el-icon-user"> </i>备注</template>
@@ -191,16 +123,22 @@
             <el-button @click="cancel">取 消</el-button>
           </div>
         </el-dialog>
+    </el-tabs>
+
+
   </div>
 </template>
 
 <script>
-import { listApitype, getApitype, delApitype, addApitype, updateApitype } from "/src/api/market/apitype";
+import { listApitype, getApitype, delApitype, addApitype, updateApitype } from "@/api/market/apitype";
 
 export default {
   name: "Apitype",
   data() {
     return {
+      all:"全部类型",
+      activeNameL:"全部类型",
+      editableTabs: [],
       // 遮罩层
       loading: true,
       // 选中数组
@@ -241,6 +179,9 @@ export default {
     this.getList();
   },
   methods: {
+    getType(activeNameL){
+      this.activeNameL=activeNameL
+    },
     /** 查询接口列表 */
     getList() {
       this.loading = true;
@@ -248,6 +189,15 @@ export default {
         console.log(response);
         if(200==response.code){
           this.apitypeList = response.data.rows;
+
+          const uniqueSysLeixingpick = new Map();
+          response.data.rows.forEach(item => {
+            uniqueSysLeixingpick.set(item.sysLeixingpick, item);
+          });
+
+          // 将 Map 的值（即去重后的对象）转换回数组
+          this.editableTabs = Array.from(uniqueSysLeixingpick.values()) ;
+
           this.total = response.data.total;
           this.loading = false;
         }

src/views/rule/rule/index.vue

@@ -1,23 +1,29 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="规则分类名称" prop="ruleTypeName">
+      <el-form-item label="规则名称" prop="name">
         <el-input
-          v-model="queryParams.ruleTypeName"
+          v-model="queryParams.name"
-          placeholder="请输入规则分类名称"
+          placeholder="请输入规则名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="启用状态" prop="state">
+      <el-form-item label="是否激活" prop="isActivate">
-        <el-select v-model="queryParams.state" placeholder="请选择启用状态" clearable>
+        <el-input
-          <el-option
+          v-model="queryParams.isActivate"
-            v-for="dict in dict.type.sys_yes_no"
+          placeholder="请输入是否激活"
-            :key="dict.value"
+          clearable
-            :label="dict.label"
+          @keyup.enter.native="handleQuery"
-            :value="dict.value"
+        />
+      </el-form-item>
+      <el-form-item label="规则代码" prop="ruleCode">
+        <el-input
+          v-model="queryParams.ruleCode"
+          placeholder="请输入规则代码"
+          clearable
+          @keyup.enter.native="handleQuery"
         />
-        </el-select>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -33,7 +39,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['rule:ruleType:add']"
+          v-hasPermi="['rule:rule:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -44,7 +50,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['rule:ruleType:edit']"
+          v-hasPermi="['rule:rule:edit']"
         >修改</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -55,7 +61,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['rule:ruleType:remove']"
+          v-hasPermi="['rule:rule:remove']"
         >删除</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -65,23 +71,20 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['rule:ruleType:export']"
+          v-hasPermi="['rule:rule:export']"
         >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="ruleTypeList" @selection-change="handleSelectionChange">
+    <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="id" />
-      <el-table-column label="规则分类编码" align="center" prop="ruleType" />
+      <el-table-column label="规则名称" align="center" prop="name" />
-<!--      <el-table-column label="规则分类名称" align="center" prop="ruleTypeName" />-->
+      <el-table-column label="规则类型" align="center" prop="ruleType" />
-<!--      <el-table-column label="类型描述" align="center" prop="ruleTypeDesc" />-->
+      <el-table-column label="是否激活" align="center" prop="isActivate" />
-<!--      <el-table-column label="启用状态" align="center" prop="state">-->
+      <el-table-column label="规则描述" align="center" prop="ruleDesc" />
-<!--        <template slot-scope="scope">-->
+      <el-table-column label="规则代码" align="center" prop="ruleCode" />
-<!--          <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.state"/>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -89,14 +92,14 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['rule:ruleType:edit']"
+            v-hasPermi="['rule:rule:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['rule:ruleType:remove']"
+            v-hasPermi="['rule:rule:remove']"
           >删除</el-button>
         </template>
       </el-table-column>
@@ -110,29 +113,20 @@
       @pagination="getList"
     />
 
-    <!-- 添加或修改规则分类对话框 -->
+    <!-- 添加或修改规则对话框 -->
     <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="ruleTypeCode">
+        <el-form-item label="规则名称" prop="name">
-          <el-input v-model="form.ruleTypeCode" placeholder="请输入规则分类编码" />
+          <el-input v-model="form.name" placeholder="请输入规则名称" />
         </el-form-item>
-        <el-form-item label="规则分类名称" prop="ruleTypeName">
+        <el-form-item label="是否激活" prop="isActivate">
-          <el-input v-model="form.ruleTypeName" placeholder="请输入规则分类名称" />
+          <el-input v-model="form.isActivate" placeholder="请输入是否激活" />
         </el-form-item>
-        <el-form-item label="类型描述">
+        <el-form-item label="规则描述" prop="ruleDesc">
-          <editor v-model="form.ruleTypeDesc" :min-height="192"/>
+          <el-input v-model="form.ruleDesc" type="textarea" placeholder="请输入内容" />
         </el-form-item>
-        <el-form-item label="启用状态" prop="state">
+        <el-form-item label="规则代码" prop="ruleCode">
-          <el-radio-group v-model="form.state">
+          <el-input v-model="form.ruleCode" placeholder="请输入规则代码" />
-            <el-radio
-              v-for="dict in dict.type.sys_yes_no"
-              :key="dict.value"
-              :label="dict.value"
-            >{{dict.label}}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -144,11 +138,10 @@
 </template>
 
 <script>
-import { listRuleType, getRuleType, delRuleType, addRuleType, updateRuleType } from "/src/api/rule/ruleType";
+import { listRule, getRule, delRule, addRule, updateRule } from "/src/api/rule/rule";
 
 export default {
-  name: "RuleType",
+  name: "Rule",
-  dicts: ['sys_yes_no'],
   data() {
     return {
       // 遮罩层
@@ -163,8 +156,8 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
-      // 规则分类表格数据
+      // 规则表格数据
-      ruleTypeList: [],
+      ruleList: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -173,15 +166,18 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        ruleTypeName: null,
+        name: null,
-        state: null,
+        ruleType: null,
+        isActivate: null,
+        ruleDesc: null,
+        ruleCode: null,
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
-        ruleTypeCode: [
+        isActivate: [
-          { required: true, message: "规则分类编码不能为空", trigger: "blur" }
+          { required: true, message: "是否激活;是否激活不能为空", trigger: "blur" }
         ],
       }
     };
@@ -190,12 +186,12 @@ export default {
     this.getList();
   },
   methods: {
-    /** 查询规则分类列表 */
+    /** 查询规则列表 */
     getList() {
       this.loading = true;
-      listRuleType(this.queryParams).then(response => {
+      listRule(this.queryParams).then(response => {
-        this.ruleTypeList = response.rows;
+        this.ruleList = response.data.rows;
-        this.total = response.total;
+        this.total = response.data.total;
         this.loading = false;
       });
     },
@@ -208,15 +204,15 @@ export default {
     reset() {
       this.form = {
         id: null,
-        ruleTypeCode: null,
+        name: null,
-        ruleTypeName: null,
+        ruleType: null,
-        ruleTypeDesc: null,
+        isActivate: null,
-        state: null,
+        ruleDesc: null,
+        ruleCode: null,
         createBy: null,
         createTime: null,
         updateBy: null,
-        updateTime: null,
+        updateTime: null
-        remark: null
       };
       this.resetForm("form");
     },
@@ -240,16 +236,16 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加规则分类";
+      this.title = "添加规则";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
       const id = row.id || this.ids
-      getRuleType(id).then(response => {
+      getRule(id).then(response => {
         this.form = response.data;
         this.open = true;
-        this.title = "修改规则分类";
+        this.title = "修改规则";
       });
     },
     /** 提交按钮 */
@@ -257,13 +253,13 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.id != null) {
-            updateRuleType(this.form).then(response => {
+            updateRule(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            addRuleType(this.form).then(response => {
+            addRule(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -275,8 +271,8 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除规则分类编号为"' + ids + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除规则编号为"' + ids + '"的数据项？').then(function() {
-        return delRuleType(ids);
+        return delRule(ids);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
@@ -284,9 +280,9 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('rule/ruleType/export', {
+      this.download('rule/rule/export', {
         ...this.queryParams
-      }, `ruleType_${new Date().getTime()}.xlsx`)
+      }, `rule_${new Date().getTime()}.xlsx`)
     }
   }
 };