cxmo 1 سال پیش
والد
کامیت
bad04e84e0

+ 76 - 0
src/api/modules/approve.js

@@ -0,0 +1,76 @@
+import http from "@/api/http.js"
+
+export const approveInterence = {
+    /**
+     * 获取审批流列表
+     * @param {Object} params 
+     * @param {Number} params.PageSize
+     * @param {Number} params.CurrentIndex
+     * @param {Number} params.ReportType 报告类型:1-中文研报;2-英文研报;3-智能研报
+     * @param {Number} params.ClassifyFirstId 关联报告一级分类ID
+     * @param {Number} params.ClassifySecondId 关联报告二级分类ID
+     * @param {String} params.Keyword
+     * @param {Number} params.SortRule 排序方式: 1-正序; 2-倒序(默认)
+     * @returns 
+     */
+    getApproveFlowList(params){
+        return http.get("/report_approve/list",params)
+    },
+    /**
+     * 获取报告分类树
+     * @param {Object} params 
+     * @param {Number} params.ReportApproveFlowId 审批流ID(非必填)
+     * @returns 
+     */
+    getReportClassifyTree(params){
+        return http.get("/report_approve/report/classify_tree",params)
+    },
+    /**
+     * 删除审批流
+     * @param {Object} params 
+     * @param {Number} params.ReportApproveFlowId
+     * @returns 
+     */
+    deleteApproveFlow(params){
+        return http.post("/report_approve/remove",params)
+    },
+    /**
+     * 获取审批流详情
+     * @param {Object} params 
+     * @param {Number} params.ReportApproveFlowId
+     * @returns 
+     */
+    getApproveFlowDetail(params){
+        return http.get("/report_approve/detail",params)
+    },
+    /**
+     * 新增审批流
+     * @param {Object} params 
+     * @param {String} params.FlowName 审批流名称
+     * @param {Number} params.ReportType 报告类型:1-中文研报;2-英文研报;3-智能研报
+     * @param {Number} params.ClassifyFirstId 一级分类ID
+     * @param {Number} params.ClassifySecondId 二级分类ID
+     * @param {Object[]} params.Nodes 审批节点
+     * @param {Number} params.Nodes[].ApproveType 审批类型:1-依次审批;2-会签;3-或签
+     * @param {Object[]} params.Nodes[].Users 审批人信息
+     * @param {String} params.Nodes[].Users[].UserType 审批人类型: user-用户; role-角色
+     * @param {Number} params.Nodes[].Users[].UserId 用户/角色ID
+     * @param {String} params.Nodes[].Users[].UserName 用户/角色姓名
+     * @param {String} params.Nodes[].Users[].Sort 依次审批时的排序
+     * @returns 
+     */
+    addNewApproveFlow(params){
+        return http.post("/report_approve/add",params)
+    },
+    /**
+     * 编辑审批流
+     * @param {Object} params 
+     * @param {Number} params.ReportApproveFlowId 审批流Id
+     * 其他参数同上
+     * @returns 
+     */
+    editApproveFlow(params){
+        return http.post("/report_approve/edit",params)
+    }
+
+}

+ 2 - 2
src/views/approve_manage/approveEdit.vue

@@ -2,7 +2,7 @@
     <!-- 添加编辑审批流 -->
     <div class="approve-edit-wrap page-wrap">
         <div class="head-box">
-            <el-form :inline="true" :model="approveForm" class="demo-form-inline">
+            <el-form :inline="true" :model="approveForm">
                 <el-form-item label="审批流名称">
                     <el-input v-model="approveForm.name" placeholder="请输入审批流名称"></el-input>
                 </el-form-item>
@@ -13,7 +13,7 @@
                     </el-select>
                 </el-form-item>
                 </el-form>
-            <div class="btn">
+            <div class="form-btn">
                 <el-button>取消</el-button>
                 <el-button @click="checkFlow">保存</el-button>
             </div>

+ 8 - 3
src/views/approve_manage/components/flowEdiotr.vue

@@ -17,16 +17,21 @@ import AddNode from './flowNode/addNode.vue';
 import ApproveNode from './flowNode/approveNode.vue';
 import EndNode from './flowNode/endNode.vue';
 export default {
+    props:{
+        flowConfig:{ //审批流原数据,只包含审批节点
+            type:Object,
+            default:{}
+        }
+    },
     data() {
         return {
-            mockFlow: {
+            mockFlow: { //如果审批流是树形结构,通过getNode拍平
                 nodeType: 1,
                 nodeName: 'StartNode',
-                initiator: '发起人张三',
                 childrenNode: {
                     nodeType: 2,
                     nodeName: 'ApproveNode',
-                    approvers: [],
+                    approvers: [],//审批人数组
                     childrenNode: {
                         nodeType:2,
                         nodeName:'ApproveNode',

+ 7 - 7
src/views/approve_manage/components/flowNode/approveNode.vue

@@ -18,14 +18,14 @@
         <AddNode :node="flowNode" v-on="$listeners"/>
         <el-drawer
             direction="rtl"
-            :visible.sync="drawer"
+            :visible.sync="drawerShow"
             :withHeader="false"
             :modal-append-to-body="false"
             >
             <div class="approve-drawer-wrap">
                 <div class="header">
                     <p>审批人设置</p>
-                    <span class="close-icon" @click="drawer=false"><i class="el-icon-close"></i></span>
+                    <span class="close-icon" @click="drawerShow=false"><i class="el-icon-close"></i></span>
                 </div>
                 <div class="drawer-content">
                     <div class="block">
@@ -78,7 +78,7 @@
                     </div>
                 </div>
                 <div class="drawer-btn">
-                    <el-button @click="drawer=false">取消</el-button>
+                    <el-button @click="drawerShow=false">取消</el-button>
                     <el-button @click="editApproveNode">确认</el-button>
                 </div>
             </div>
@@ -119,7 +119,7 @@ export default {
     },
     data() {
         return {
-            drawer: false,
+            drawerShow: false,
             block1: 1,
             block2: 1,
             chooseDialogShow: false,
@@ -127,7 +127,7 @@ export default {
         };
     },
     watch:{
-        drawer(val){
+        drawerShow(val){
             if(val){
                 this.choosedList = _.cloneDeep(this.flowNode.approvers||[])
             }
@@ -139,7 +139,7 @@ export default {
         },
         showDrawer() {
             //设置一下里面的文字啥的
-            this.drawer = true;
+            this.drawerShow = true;
         },
         getChoosedList(){
             this.choosedList = _.cloneDeep(this.$refs["tree-trans"].choosedList)
@@ -153,7 +153,7 @@ export default {
             const node = _.cloneDeep(this.flowNode)
             node.approvers = _.cloneDeep(this.choosedList)
             this.$emit('editNode',node)
-            this.drawer = false
+            this.drawerShow = false
         },
     },
     components: { TreeTransfer, draggable, AddNode }