规则配置

src/i18n/zh-CN.js

@@ -132,7 +132,7 @@ export default {
     BaseData_BaseWare_PlatformMaintenance: '月台维护',
     BaseData_BaseWare_billType: '单据类型',
     BaseData_item: '物料管理',
-    BaseData_ruleConfigure: '系统规则配置',
+    BaseData_ruleConfigure: '提醒规则配置',
     BaseData_timing: '定时任务配置',
     Business_asn: '入库管理',
     Business_asn_xppRecord: '现品票采集上架',

src/views/base-data/dict/dictDetail.vue

@@ -0,0 +1,115 @@
+<template>
+  <div>
+    <div v-if="query.dictName === ''">
+      <div class="my-code">点击字典查看详情</div>
+    </div>
+    <div v-else>
+      <!--工具栏-->
+      <div class="head-container">
+        <div v-if="crud.props.searchToggle">
+          <!-- 搜索 -->
+          <el-input v-model="query.label" clearable size="small" placeholder="输入字典标签查询" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
+          <rrOperation />
+        </div>
+      </div>
+      <!--表单组件-->
+      <el-dialog append-to-body :close-on-click-modal="false" :before-close="crud.cancelCU" :visible="crud.status.cu > 0" :title="crud.status.title" width="500px">
+        <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
+          <el-form-item label="字典标签" prop="label">
+            <el-input v-model="form.label" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="字典值" prop="value">
+            <el-input v-model="form.value" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="排序" prop="dictSort">
+            <el-input-number v-model.number="form.dictSort" :min="0" :max="999" controls-position="right" style="width: 370px;" />
+          </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="text" @click="crud.cancelCU">取消</el-button>
+          <el-button :loading="crud.status.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
+        </div>
+      </el-dialog>
+      <!--表格渲染-->
+      <el-table ref="table" v-loading="crud.loading" :data="crud.data" highlight-current-row style="width: 100%;" @selection-change="crud.selectionChangeHandler">
+        <el-table-column label="所属字典">
+          {{ query.dictName }}
+        </el-table-column>
+        <el-table-column prop="label" label="字典标签" />
+        <el-table-column prop="value" label="字典值" />
+        <el-table-column prop="dictSort" label="排序" />
+        <el-table-column v-if="checkPer(['admin','dict:edit','dict:del'])" label="操作" width="130px" align="center" fixed="right">
+          <template slot-scope="scope">
+            <udOperation
+              :data="scope.row"
+              :permission="permission"
+            />
+          </template>
+        </el-table-column>
+      </el-table>
+      <!--分页组件-->
+      <pagination />
+    </div>
+  </div>
+</template>
+
+<script>
+import crudDictDetail from '@/api/system/dictDetail'
+import CRUD, { presenter, header, form } from '@crud/crud'
+import pagination from '@crud/Pagination'
+import rrOperation from '@crud/RR.operation'
+import udOperation from '@crud/UD.operation'
+
+const defaultForm = { id: null, label: null, value: null, dictSort: 999 }
+
+export default {
+  components: { pagination, rrOperation, udOperation },
+  cruds() {
+    return [
+      CRUD({ title: '字典详情', url: 'api/dictDetail', query: { dictName: '' }, sort: ['dictSort,asc', 'id,desc'],
+        crudMethod: { ...crudDictDetail },
+        optShow: {
+          add: true,
+          edit: true,
+          del: true,
+          reset: false
+        },
+        queryOnPresenterCreated: false
+      })
+    ]
+  },
+  mixins: [
+    presenter(),
+    header(),
+    form(function() {
+      return Object.assign({ dict: { id: this.dictId }}, defaultForm)
+    })],
+  data() {
+    return {
+      dictId: null,
+      rules: {
+        label: [
+          { required: true, message: '请输入字典标签', trigger: 'blur' }
+        ],
+        value: [
+          { required: true, message: '请输入字典值', trigger: 'blur' }
+        ],
+        dictSort: [
+          { required: true, message: '请输入序号', trigger: 'blur', type: 'number' }
+        ]
+      },
+      permission: {
+        add: ['admin', 'dict:add'],
+        edit: ['admin', 'dict:edit'],
+        del: ['admin', 'dict:del']
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+ ::v-deep .el-input-number .el-input__inner {
+    text-align: left;
+  }
+</style>

src/views/base-data/dict/index.vue

@@ -0,0 +1,135 @@
+<template>
+  <div class="app-container">
+    <!--表单组件-->
+    <el-dialog append-to-body :close-on-click-modal="false" :before-close="crud.cancelCU" :visible="crud.status.cu > 0" :title="crud.status.title" width="500px">
+      <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
+        <el-form-item label="字典名称" prop="name">
+          <el-input v-model="form.name" style="width: 370px;" />
+        </el-form-item>
+        <el-form-item label="描述">
+          <el-input v-model="form.description" style="width: 370px;" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="text" @click="crud.cancelCU">取消</el-button>
+        <el-button :loading="crud.status.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
+      </div>
+    </el-dialog>
+    <!-- 字典列表 -->
+    <el-row :gutter="10">
+      <el-col :xs="24" :sm="24" :md="10" :lg="11" :xl="11" style="margin-bottom: 10px">
+        <el-card class="box-card">
+          <!--工具栏-->
+          <div class="head-container">
+            <div v-if="crud.props.searchToggle">
+              <!-- 搜索 -->
+              <el-input v-model="query.blurry" clearable size="small" placeholder="输入名称或者描述搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="crud.toQuery" />
+              <rrOperation />
+            </div>
+            <crudOperation :permission="permission" :tableKey="this.$options.name"/>
+          </div>
+          <!--表格渲染-->
+          <el-table ref="table" v-loading="crud.loading" :data="crud.data" highlight-current-row style="width: 100%;" @selection-change="crud.selectionChangeHandler" @current-change="handleCurrentChange">
+            <el-table-column type="selection" width="55" />
+            <el-table-column :show-overflow-tooltip="true" prop="name" label="名称" />
+            <el-table-column :show-overflow-tooltip="true" prop="description" label="描述" />
+            <el-table-column v-if="checkPer(['admin','dict:edit','dict:del'])" label="操作" width="130px" align="center" fixed="right">
+              <template slot-scope="scope">
+                <udOperation
+                  :data="scope.row"
+                  :permission="permission"
+                />
+              </template>
+            </el-table-column>
+          </el-table>
+          <!--分页组件-->
+          <pagination />
+        </el-card>
+      </el-col>
+      <!-- 字典详情列表 -->
+      <el-col :xs="24" :sm="24" :md="14" :lg="13" :xl="13">
+        <el-card class="box-card">
+          <div slot="header" class="clearfix">
+            <span>字典详情</span>
+            <el-button
+              v-if="checkPer(['admin','dict:add']) && this.$refs.dictDetail && this.$refs.dictDetail.query.dictName"
+              class="filter-item"
+              size="mini"
+              style="float: right;padding: 4px 10px"
+              type="primary"
+              icon="el-icon-plus"
+              @click="$refs.dictDetail && $refs.dictDetail.crud.toAdd()"
+            >新增</el-button>
+          </div>
+          <dictDetail ref="dictDetail" :permission="permission" />
+        </el-card>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import dictDetail from './dictDetail'
+import crudDict from '@/api/system/dict'
+import CRUD, { presenter, header, form } from '@crud/crud'
+import crudOperation from '@crud/CRUD.operation'
+import pagination from '@crud/Pagination'
+import rrOperation from '@crud/RR.operation'
+import udOperation from '@crud/UD.operation'
+
+const defaultForm = { id: null, name: null, description: null, dictDetails: [] }
+
+export default {
+  name: 'Dict',
+  components: { crudOperation, pagination, rrOperation, udOperation, dictDetail },
+  cruds() {
+    return [
+      CRUD({ title: '字典', url: 'api/dict', crudMethod: { ...crudDict }})
+    ]
+  },
+  mixins: [presenter(), header(), form(defaultForm)],
+  data() {
+    return {
+      queryTypeOptions: [
+        { key: 'name', display_name: '字典名称' },
+        { key: 'description', display_name: '描述' }
+      ],
+      rules: {
+        name: [
+          { required: true, message: '请输入名称', trigger: 'blur' }
+        ]
+      },
+      permission: {
+        add: ['admin', 'dict:add'],
+        edit: ['admin', 'dict:edit'],
+        del: ['admin', 'dict:del']
+      }
+    }
+  },
+  methods: {
+    // 获取数据前设置好接口地址
+    [CRUD.HOOK.beforeRefresh]() {
+      if (this.$refs.dictDetail) {
+        this.$refs.dictDetail.query.dictName = ''
+      }
+      return true
+    },
+    // 选中字典后，设置字典详情数据
+    handleCurrentChange(val) {
+      if (val) {
+        this.$refs.dictDetail.query.dictName = val.name
+        this.$refs.dictDetail.dictId = val.id
+        this.$refs.dictDetail.crud.toQuery()
+      }
+    },
+    // 编辑前将字典明细临时清空，避免日志入库数据过长
+    [CRUD.HOOK.beforeToEdit](crud, form) {
+      // 将角色的菜单清空，避免日志入库数据过长
+      form.dictDetails = null
+    }
+  }
+}
+</script>
+
+<style scoped>
+</style>

src/views/base-data/rule/dictDetail.vue

@@ -0,0 +1,112 @@
+<template>
+  <div>
+    <div v-if="query.dictName === ''">
+      <div class="my-code">点击规则查看详情</div>
+    </div>
+    <div v-else>
+      <!--工具栏-->
+      <div class="head-container">
+        <div v-if="crud.props.searchToggle">
+          <!-- 搜索 -->
+          <el-input v-model="query.label" clearable size="small" placeholder="输入规则编码查询" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
+          <rrOperation />
+        </div>
+      </div>
+      <!--表单组件-->
+      <el-dialog append-to-body :close-on-click-modal="false" :before-close="crud.cancelCU" :visible="crud.status.cu > 0" :title="crud.status.title" width="500px">
+        <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
+          <el-form-item label="规则编码" prop="label">
+            <el-input v-model="form.label" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="规则内容" prop="value">
+            <el-input v-model="form.value" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="优先级" prop="dictSort">
+            <el-input-number v-model.number="form.dictSort" :min="0" :max="999" controls-position="right" style="width: 370px;" />
+          </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="text" @click="crud.cancelCU">取消</el-button>
+          <el-button :loading="crud.status.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
+        </div>
+      </el-dialog>
+      <!--表格渲染-->
+      <el-table ref="table" v-loading="crud.loading" :data="crud.data" highlight-current-row style="width: 100%;" @selection-change="crud.selectionChangeHandler">
+        <el-table-column prop="label" label="规则编码" />
+        <el-table-column prop="value" label="规则内容" />
+        <el-table-column prop="dictSort" label="优先级" />
+        <el-table-column v-if="checkPer(['admin','dict:edit','dict:del'])" label="操作" width="130px" align="center" fixed="right">
+          <template slot-scope="scope">
+            <udOperation
+              :data="scope.row"
+              :permission="permission"
+            />
+          </template>
+        </el-table-column>
+      </el-table>
+      <!--分页组件-->
+      <pagination />
+    </div>
+  </div>
+</template>
+
+<script>
+import crudDictDetail from '@/api/system/dictDetail'
+import CRUD, { presenter, header, form } from '@crud/crud'
+import pagination from '@crud/Pagination'
+import rrOperation from '@crud/RR.operation'
+import udOperation from '@crud/UD.operation'
+
+const defaultForm = { id: null, label: null, value: null, dictSort: 1 }
+
+export default {
+  components: { pagination, rrOperation, udOperation },
+  cruds() {
+    return [
+      CRUD({ title: '规则详情', url: 'api/dictDetail', query: { dictName: '' }, sort: ['dictSort,asc', 'id,desc'],
+        crudMethod: { ...crudDictDetail },
+        optShow: {
+          add: true,
+          edit: true,
+          del: true,
+          reset: false
+        },
+        queryOnPresenterCreated: false
+      })
+    ]
+  },
+  mixins: [
+    presenter(),
+    header(),
+    form(function() {
+      return Object.assign({ dict: { id: this.dictId }}, defaultForm)
+    })],
+  data() {
+    return {
+      dictId: null,
+      rules: {
+        label: [
+          { required: true, message: '请输入规则编码', trigger: 'blur' }
+        ],
+        value: [
+          { required: true, message: '请输入规则内容', trigger: 'blur' }
+        ],
+        dictSort: [
+          { required: true, message: '请输入优先级', trigger: 'blur', type: 'number' }
+        ]
+      },
+      permission: {
+        add: ['admin', 'dict:add'],
+        edit: ['admin', 'dict:edit'],
+        del: ['admin', 'dict:del']
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+ ::v-deep .el-input-number .el-input__inner {
+    text-align: left;
+  }
+</style>

src/views/base-data/rule/index.vue

@@ -0,0 +1,142 @@
+<template>
+  <div class="app-container">
+    <!--表单组件-->
+    <el-dialog append-to-body :close-on-click-modal="false" :before-close="crud.cancelCU" :visible="crud.status.cu > 0" :title="crud.status.title" width="500px">
+      <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
+        <el-form-item label="规则编码" prop="code">
+          <el-input v-model="form.code" style="width: 370px;" />
+        </el-form-item>
+        <el-form-item label="规则名称" prop="name">
+          <el-input v-model="form.name" style="width: 370px;" />
+        </el-form-item>
+        <el-form-item label="描述">
+          <el-input v-model="form.description" style="width: 370px;" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="text" @click="crud.cancelCU">取消</el-button>
+        <el-button :loading="crud.status.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
+      </div>
+    </el-dialog>
+    <!-- 规则列表 -->
+    <el-row :gutter="10">
+      <el-col :xs="24" :sm="24" :md="10" :lg="11" :xl="11" style="margin-bottom: 10px">
+        <el-card class="box-card">
+          <!--工具栏-->
+          <div class="head-container">
+            <div v-if="crud.props.searchToggle">
+              <!-- 搜索 -->
+              <el-input v-model="query.blurry" clearable size="small" placeholder="输入名称或者描述搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="crud.toQuery" />
+              <rrOperation />
+            </div>
+            <crudOperation :permission="permission" :tableKey="this.$options.name"/>
+          </div>
+          <!--表格渲染-->
+          <el-table ref="table" v-loading="crud.loading" :data="crud.data" highlight-current-row style="width: 100%;" @selection-change="crud.selectionChangeHandler" @current-change="handleCurrentChange">
+            <el-table-column type="selection" width="55" />
+            <el-table-column :show-overflow-tooltip="true" prop="code" label="编码" />
+            <el-table-column :show-overflow-tooltip="true" prop="name" label="名称" />
+            <el-table-column :show-overflow-tooltip="true" prop="description" label="描述" />
+            <el-table-column v-if="checkPer(['admin','dict:edit','dict:del'])" label="操作" width="130px" align="center" fixed="right">
+              <template slot-scope="scope">
+                <udOperation
+                  :data="scope.row"
+                  :permission="permission"
+                />
+              </template>
+            </el-table-column>
+          </el-table>
+          <!--分页组件-->
+          <pagination />
+        </el-card>
+      </el-col>
+      <!-- 规则详情列表 -->
+      <el-col :xs="24" :sm="24" :md="14" :lg="13" :xl="13">
+        <el-card class="box-card">
+          <div slot="header" class="clearfix">
+            <span>规则详情</span>
+            <el-button
+              v-if="checkPer(['admin','dict:add']) && this.$refs.dictDetail && this.$refs.dictDetail.query.dictName"
+              class="filter-item"
+              size="mini"
+              style="float: right;padding: 4px 10px"
+              type="primary"
+              icon="el-icon-plus"
+              @click="$refs.dictDetail && $refs.dictDetail.crud.toAdd()"
+            >新增</el-button>
+          </div>
+          <dictDetail ref="dictDetail" :permission="permission" />
+        </el-card>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import dictDetail from './dictDetail'
+import crudDict from '@/api/system/dict'
+import CRUD, { presenter, header, form } from '@crud/crud'
+import crudOperation from '@crud/CRUD.operation'
+import pagination from '@crud/Pagination'
+import rrOperation from '@crud/RR.operation'
+import udOperation from '@crud/UD.operation'
+
+const defaultForm = { id: null,code:null, name: null,type:1, description: null, dictDetails: [] }
+
+export default {
+  name: 'Dict',
+  components: { crudOperation, pagination, rrOperation, udOperation, dictDetail },
+  cruds() {
+    return [
+      CRUD({ title: '规则', url: 'api/dict/queryRule', crudMethod: { ...crudDict }})
+    ]
+  },
+  mixins: [presenter(), header(), form(defaultForm)],
+  data() {
+    return {
+      queryTypeOptions: [
+        { key: 'name', display_name: '规则名称' },
+        { key: 'description', display_name: '描述' }
+      ],
+      rules: {
+        name: [
+          { required: true, message: '请输入名称', trigger: 'blur' }
+        ],
+        code: [
+          { required: true, message: '请输入代码', trigger: 'blur' }
+        ]
+      },
+      permission: {
+        add: ['admin', 'dict:add'],
+        edit: ['admin', 'dict:edit'],
+        del: ['admin', 'dict:del']
+      }
+    }
+  },
+  methods: {
+    // 获取数据前设置好接口地址
+    [CRUD.HOOK.beforeRefresh]() {
+      if (this.$refs.dictDetail) {
+        this.$refs.dictDetail.query.dictName = ''
+      }
+      return true
+    },
+    // 选中规则后，设置规则详情数据
+    handleCurrentChange(val) {
+      if (val) {
+        this.$refs.dictDetail.query.dictName = val.name
+        this.$refs.dictDetail.dictId = val.id
+        this.$refs.dictDetail.crud.toQuery()
+      }
+    },
+    // 编辑前将规则明细临时清空，避免日志入库数据过长
+    [CRUD.HOOK.beforeToEdit](crud, form) {
+      // 将角色的菜单清空，避免日志入库数据过长
+      form.dictDetails = null
+    }
+  }
+}
+</script>
+
+<style scoped>
+</style>

src/views/base-data/ruleConfigure/index.vue

@@ -13,10 +13,10 @@
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
       <crudOperation :permission="permission" :tableKey="this.$options.name"/>
       <!--表单组件-->
-      <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="550px">
-        <el-form ref="form" :model="form" :rules="rules" size="small" label-width="120px">
+      <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="600px">
+        <el-form ref="form" :model="form"  :inline="true" :rules="rules" size="small" label-width="90px">
           <el-form-item label="规则类型" prop="ruleType">
-            <el-select v-model="form.ruleType" filterable placeholder="请选择">
+            <el-select v-model="form.ruleType" filterable placeholder="请选择"  style="width: 370px;">
               <el-option
                 v-for="item in dict.rule_type"
                 :key="item.id"
@@ -31,7 +31,7 @@
             <el-checkbox v-model="form.beyj"/>
           </el-form-item>
           <el-form-item label="邮件备注">
-            <el-input v-model="form.yjDes" style="width: 370px;" />
+            <el-input v-model="form.yjDes" style="width: 250px;" />
           </el-form-item>
           <el-form-item label="邮件收件人">
             <el-input v-model="form.yjSjr" style="width: 370px;" />
@@ -40,18 +40,18 @@
             <el-checkbox v-model="form.betc"/>
           </el-form-item>
           <el-form-item label="弹窗消息">
-            <el-input v-model="form.tcMsg" style="width: 370px;" />
+            <el-input v-model="form.tcMsg" style="width: 250px;" />
           </el-form-item>
           <el-form-item label="颜色标记">
             <el-checkbox v-model="form.beys"/>
           </el-form-item>
-          <el-form-item label="标记颜色值">
-            <el-input v-model="form.ysFlg" style="width: 370px;" />
+          <el-form-item label="标记值">
+            <el-input v-model="form.ysFlg" style="width: 70px;" />
           </el-form-item>
-          <el-form-item label="标记颜色字段">
-            <el-input v-model="form.ysField" style="width: 370px;" />
+          <el-form-item label="标记字段">
+            <el-input v-model="form.ysField" style="width: 75px;" />
           </el-form-item>
-          <el-form-item label="校验正则表达式">
+          <el-form-item label="校验正则式">
             <el-input v-model="form.gsContent" style="width: 370px;" />
           </el-form-item>
           <el-form-item label="描述">