feat(All)个别页面新增

.env.development

@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = RuoYi-Flowable-Plus后台管理系统
+VUE_APP_TITLE = 报价管理系统
 
 # 开发环境配置
 ENV = 'development'

.env.production

@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = RuoYi-Flowable-Plus后台管理系统
+VUE_APP_TITLE = 报价管理系统
 
 # 生产环境配置
 ENV = 'production'

package.json

@@ -1,7 +1,7 @@
 {
-  "name": "ruoyi-flowable-plus",
+  "name": "quotation-system",
   "version": "0.8.3",
-  "description": "RuoYi-Flowable-Plus后台管理系统",
+  "description": "报价管理系统",
   "author": "KonBAI",
   "license": "MIT",
   "scripts": {

src/api/business/supplier.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询供应商信息列表
+export function listSupplier(query) {
+  return request({
+    url: '/business/supplier/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询供应商信息详细
+export function getSupplier(supplierId) {
+  return request({
+    url: '/business/supplier/' + supplierId,
+    method: 'get'
+  })
+}
+
+// 新增供应商信息
+export function addSupplier(data) {
+  return request({
+    url: '/business/supplier',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改供应商信息
+export function updateSupplier(data) {
+  return request({
+    url: '/business/supplier',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除供应商信息
+export function delSupplier(supplierId) {
+  return request({
+    url: '/business/supplier/' + supplierId,
+    method: 'delete'
+  })
+}

src/layout/components/Sidebar/Logo.vue

@@ -35,7 +35,7 @@ export default {
   },
   data() {
     return {
-      title: 'RuoYi-Flowable-Plus',
+      title: '报价管理系统',
       logo: logoImg
     }
   }

src/views/business/supplier/index.vue

@@ -0,0 +1,313 @@
+<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="supplierName">
+        <el-input
+          v-model="queryParams.supplierName"
+          placeholder="请输入供应商名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="地址" prop="supplierAddress">
+        <el-input
+          v-model="queryParams.supplierAddress"
+          placeholder="请输入供应商地址"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="联系人" prop="supplierContact">
+        <el-input
+          v-model="queryParams.supplierContact"
+          placeholder="请输入供应商联系人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="联系方式" prop="supplierContactNum">
+        <el-input
+          v-model="queryParams.supplierContactNum"
+          placeholder="请输入供应商联系方式"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </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="['business:supplier: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="['business:supplier: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="['business:supplier: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="['business:supplier:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="supplierList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="65" align="center" />
+      <!-- <el-table-column label="供应商Id" align="center" prop="supplierId" v-if="true"/> -->
+      <el-table-column label="供应商名称" align="center" prop="supplierName" />
+      <el-table-column label="供应商地址" align="center" prop="supplierAddress" />
+      <el-table-column label="供应商联系人" align="center" prop="supplierContact" />
+      <el-table-column label="供应商联系方式" align="center" prop="supplierContactNum" />
+      <el-table-column label="认领人" align="center" />
+      <!-- <el-table-column label="备注" align="center" prop="remark" /> -->
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['business:supplier:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['business:supplier:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改供应商信息对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="160px">
+        <el-form-item label="供应商名称" prop="supplierName">
+          <el-input v-model="form.supplierName" placeholder="请输入供应商名称" />
+        </el-form-item>
+        <el-form-item label="供应商地址" prop="supplierAddress">
+          <el-input v-model="form.supplierAddress" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="供应商联系人" prop="supplierContact">
+          <el-input v-model="form.supplierContact" placeholder="请输入供应商联系人" />
+        </el-form-item>
+        <el-form-item label="供应商联系方式" prop="supplierContactNum">
+          <el-input v-model="form.supplierContactNum" placeholder="请输入供应商联系方式" />
+        </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">
+        <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listSupplier, getSupplier, delSupplier, addSupplier, updateSupplier } from "@/api/business/supplier";
+
+export default {
+  name: "Supplier",
+  data() {
+    return {
+      // 按钮loading
+      buttonLoading: false,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 供应商信息表格数据
+      supplierList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        supplierName: undefined,
+        supplierAddress: undefined,
+        supplierContact: undefined,
+        supplierContactNum: undefined,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        supplierId: [
+          { required: true, message: "供应商Id不能为空", trigger: "blur" }
+        ],
+        supplierName: [
+          { required: true, message: "供应商名称不能为空", trigger: "blur" }
+        ]
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询供应商信息列表 */
+    getList() {
+      this.loading = true;
+      listSupplier(this.queryParams).then(response => {
+        this.supplierList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        supplierId: undefined,
+        supplierName: undefined,
+        supplierAddress: undefined,
+        supplierContact: undefined,
+        supplierContactNum: undefined,
+        remark: undefined
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.supplierId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加供应商信息";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.loading = true;
+      this.reset();
+      const supplierId = row.supplierId || this.ids
+      getSupplier(supplierId).then(response => {
+        this.loading = false;
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改供应商信息";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.buttonLoading = true;
+          if (this.form.supplierId != null) {
+            updateSupplier(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          } else {
+            addSupplier(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const supplierIds = row.supplierId || this.ids;
+      this.$modal.confirm('是否确认删除供应商信息编号为"' + supplierIds + '"的数据项？').then(() => {
+        this.loading = true;
+        return delSupplier(supplierIds);
+      }).then(() => {
+        this.loading = false;
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {
+      }).finally(() => {
+        this.loading = false;
+      });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('business/supplier/export', {
+        ...this.queryParams
+      }, `supplier_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

src/views/login.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="login">
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
-      <h3 class="title">RuoYi-Flowable-Plus后台管理系统</h3>
+      <h3 class="title">报价管理系统</h3>
       <el-form-item prop="username">
         <el-input
           v-model="loginForm.username"

src/views/system/notice/index.vue

@@ -240,7 +240,16 @@
       width="70%"
       center
     >
-    <div v-html="noticeContent"></div>
+      
+        <el-card class="box-card" shadow="never" v-for="(formInfo, index) in processFormList" :key="index">
+            <div slot="header" class="clearfix">
+              <span>{{ formInfo.title }}</span>
+            </div>
+            <!--流程处理表单模块-->
+            <el-col :span="20" :offset="2">
+              <parser :form-conf="formInfo"/>
+            </el-col>
+          </el-card>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary">我要申领</el-button>
         <el-button >我已知晓</el-button>
@@ -258,9 +267,13 @@ import {
   updateNotice,
 } from "@/api/system/notice";
 import { getInfo } from "@/api/login";
+import Parser from '@/utils/generator/parser'
 
 export default {
   name: "Notice",
+  components: {
+    Parser,
+  },
   dicts: ["sys_notice_status", "sys_notice_type"],
   data() {
     return {
@@ -290,6 +303,8 @@ export default {
       noticeTitle: "",
       // 通知内容
       noticeContent: "",
+      // 详细模型设计卡片内容
+      processFormList: [],
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -421,7 +436,7 @@ export default {
       console.log(row);
       this.noticeDetail = true;
       this.noticeTitle = row.noticeTitle;
-      this.noticeContent = row.noticeContent;
+      this.processFormList = JSON.parse(row.noticeContent);
     },
   },
 };

src/views/tool/build/RightPanel.vue

@@ -339,6 +339,64 @@
             <el-divider />
           </template>
 
+          <!-- 单选下拉框 -->
+          <!-- <template v-if="['el-select'].indexOf(activeData.__config__.tag) > -1">
+            <el-divider>选项</el-divider>
+            <el-form-item label="数据类型">
+              <el-radio-group v-model="activeData.__config__.dataType" size="small">
+                <el-radio-button label="dynamic">
+                  动态数据
+                </el-radio-button>
+                <el-radio-button label="static">
+                  静态数据
+                </el-radio-button>
+              </el-radio-group>
+            </el-form-item>
+
+            <template v-if="activeData.__config__.dataType === 'dynamic'">
+              <el-form-item label="接口地址">
+                <el-input
+                  v-model="activeData.__config__.url"
+                  :title="activeData.__config__.url"
+                  placeholder="请输入接口地址"
+                  clearable
+                >
+                  <el-select
+                    slot="prepend"
+                    v-model="activeData.__config__.method"
+                    :style="{width: '85px'}"
+                  >
+                    <el-option label="get" value="get" />
+                    <el-option label="post" value="post" />
+                    <el-option label="put" value="put" />
+                    <el-option label="delete" value="delete" />
+                  </el-select>
+                </el-input>
+              </el-form-item>
+              <el-form-item label="数据位置">
+                <el-input v-model="activeData.__config__.dataKey" placeholder="请输入标签键名" />
+              </el-form-item>
+              <el-form-item label="标签键名">
+                <el-input v-model="activeData.props.props.label" placeholder="请输入标签键名" />
+              </el-form-item>
+              <el-form-item label="值键名">
+                <el-input v-model="activeData.props.props.value" placeholder="请输入值键名" />
+              </el-form-item>
+            </template>
+
+            <div v-if="activeData.__config__.dataType === 'static'" style="margin-left: 20px">
+              <el-button
+                style="padding-bottom: 0"
+                icon="el-icon-circle-plus-outline"
+                type="text"
+                @click="addTreeItem"
+              >
+                添加父级
+              </el-button>
+            </div>
+            <el-divider />
+          </template> -->
+
           <template v-if="['el-cascader'].indexOf(activeData.__config__.tag) > -1">
             <el-divider>选项</el-divider>
             <el-form-item label="数据类型">

vue.config.js

@@ -7,7 +7,7 @@ function resolve(dir) {
 
 const CompressionPlugin = require('compression-webpack-plugin')
 
-const name = process.env.VUE_APP_TITLE || 'RuoYi-Flowable-Plus后台管理系统' // 网页标题
+const name = process.env.VUE_APP_TITLE || '报价管理系统' // 网页标题
 
 const port = process.env.port || process.env.npm_config_port || 80 // 端口