Merge remote-tracking branch 'origin/master'

QMPlusVuePage/src/api/workflow.js

@@ -0,0 +1,15 @@
+import service from '@/utils/request'
+// @Summary 删除角色
+// @Security ApiKeyAuth
+// @accept application/json
+// @Produce application/json
+// @Param data body {authorityId uint} true "删除角色"
+// @Success 200 {string} json "{"success":true,"data":{},"msg":"获取成功"}"
+// @Router /authority/deleteAuthority [post]
+export const createWorkFlow = (data) => {
+    return service({
+        url: "/workflow/createWorkFlow",
+        method: 'post',
+        data
+    })
+}

QMPlusVuePage/src/view/example/excel/excel.vue

@@ -1,10 +1,48 @@
 <template>
     <div>
-        excel导入导出
+        <el-upload
+                class="upload-demo"
+                :headers="{'x-token':token}"
+                action="/api/fileUploadAndDownload/upload"
+                :on-preview="handlePreview"
+                :on-remove="handleRemove"
+                :before-remove="beforeRemove"
+                multiple
+                :limit="10"
+                :on-exceed="handleExceed"
+                :file-list="fileList">
+            <el-button size="small" type="primary">点击上传</el-button>
+            <div slot="tip" class="el-upload__tip">未对文件格式及大小做校验</div>
+        </el-upload>
+        </el-upload>
     </div>
 </template>
 <script>
+    import { mapGetters } from 'vuex'
 export default {
-    name:'Excel'
+    name:'Excel',
+    data() {
+        return {
+            fileList: [{name: 'food.jpeg', url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100'}, {name: 'food2.jpeg', url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100'}]
+        };
+
+    },
+    computed: {
+       ...mapGetters('user', ['userInfo', 'token'])
+    },
+    methods: {
+        handleRemove(file, fileList) {
+            console.log(file, fileList);
+        },
+        handlePreview(file) {
+            console.log(file);
+        },
+        handleExceed(files, fileList) {
+            this.$message.warning(`当前限制选择 3 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`);
+        },
+        beforeRemove(file, fileList) {
+            return this.$confirm(`确定移除 ${ file.name }？`);
+        }
+    }
 }
 </script>

QMPlusVuePage/src/view/workflow/workflow.vue

@@ -0,0 +1,123 @@
+<template>
+    <div>
+        <el-form label-width="100px" :model="form" ref="form">
+            <el-form-item label="工作流名称" >
+                <el-input type="text" v-model="form.workflowNickName"></el-input>
+            </el-form-item>
+            <el-form-item label="工作流英文id" >
+                <el-input type="text" v-model="form.workflowName"></el-input>
+            </el-form-item>
+            <el-form-item label="工作流描述" >
+                <el-input type="text" v-model="form.workflowDescription"></el-input>
+            </el-form-item>
+        </el-form>
+        <el-table
+                :data="tableData"
+                border
+                style="width: 100%">
+            <el-table-column
+                    prop="isEnd"
+                    label="是否是完结流节点">
+                <template scope="scope">
+                    <el-select v-model="scope.row.isEnd" placeholder="请选择">
+                        <el-option v-for="item in options"
+                        :label="item.name"
+                        :value="item.value">
+                        </el-option>
+                    </el-select>
+                </template>
+            </el-table-column>
+            <el-table-column
+                    prop="isStrat"
+                    label="是否是开始流节点">
+                <template scope="scope">
+                    <el-select v-model="scope.row.isStrat" placeholder="请选择">
+                        <el-option v-for="item in options"
+                                   :label="item.name"
+                                   :value="item.value">
+                        </el-option>
+                    </el-select>
+                </template>
+
+            </el-table-column>
+            <el-table-column
+                    prop="stepAuthorityID"
+                    label="操作者级别id">
+                <template scope="scope">
+                    <el-input type="text" placeholder="请输入" v-model="scope.row.stepAuthorityID"></el-input>
+                </template>
+            </el-table-column>
+            <el-table-column
+                    prop="stepName"
+                    label="工作流名称">
+                <template scope="scope">
+                    <el-input type="text" placeholder="请输入" v-model="scope.row.stepName"></el-input>
+                </template>
+            </el-table-column>
+            <el-table-column
+                    prop="stepNo"
+                    label="步骤id">
+                <template scope="scope">
+                    <el-input type="text" placeholder="请输入" v-model="scope.row.stepNo"></el-input>
+                </template>
+            </el-table-column>
+        </el-table>
+        <el-button type="primary" @click="submit">提交</el-button>
+    </div>
+</template>
+
+<script>
+import { createWorkFlow } from '@/api/workflow'
+    export default {
+        name: "workflow",
+        data() {
+            return {
+                form: {
+                    workflowName:'',
+                    workflowDescription:'',
+                    workflowNickName:''
+                },
+                tableData: [{
+                    isEnd: '',
+                    isStrat: '',
+                    stepAuthorityID: '',
+                    stepName:'',
+                    stepNo:''
+                }],
+                options:[
+                    {
+                        name:'是',
+                        value:true
+                    },
+                    {
+                        name:'否',
+                        value:false
+                    }
+                ]
+            }
+        },
+        component: {},
+        methods: {
+            async submit() {
+                let params = {
+                        "workflowDescription": this.form.workflowDescription,
+                            "workflowName": this.form.workflowName,
+                            "workflowNickName": this.form.workflowNickName,
+                            "workflowStep": [
+                        {
+                            "isEnd": this.tableData[0].isEnd,
+                            "isStrat": this.tableData[0].isStrat,
+                            "stepAuthorityID": this.tableData[0].stepAuthorityID,
+                            "stepName": this.tableData[0].stepName,
+                            "stepNo": this.tableData[0].stepNo
+                        }]
+                }
+                const res = await createWorkFlow(params)
+                console.log(res)
+            }
+        }
+    }
+</script>
+<style scoped>
+
+</style>