ui-process-h5 0.1.40 → 1.0.1

package/src/packages/process/index.js

@@ -4,7 +4,7 @@ import TopTips from "../tip/index.vue";
 import TopSumbitPopup from "../submitPopup/index.vue";
 import * as operation from "./operation";
 import { defineComponent } from "vue-demi";
-import "checked-pick-app/style.css";
+import "checked-pick-app-style";
 
 export default defineComponent({
     name: "TopProcess",
@@ -24,8 +24,6 @@ export default defineComponent({
         processInstId: { require: true, default: "", type: String },
         isAdditional: { require: false, default: false, type: Boolean },
         isView: { default: false, type: Boolean },
-        // 当前账号 id
-        userId: { require: true, default: "", type: String },
         // 表单信息
         formData: { default: {}, type: Object },
 
@@ -35,23 +33,56 @@ export default defineComponent({
 
         // 请求
         request: {
-            type: Function,
+            type: [Function, Object],
             default: () => {
-                return { get: () => {}, post: () => {}, upload: () => {} };
+                return { get: () => {}, post: () => {} };
             },
         },
 
-        // appid
-        appId: {
-            type: String,
-            default: "",
-        },
-
         // 结束执行事件
         endFunction: {
             type: Function,
             default: null,
         },
+        // 弹窗开启前触发
+        beforeFunction: {
+            type: Function,
+            default: null,
+        },
+        // 是否开启公文独立配置
+        isDocument: {
+            type: Boolean,
+            default: false,
+        },
+        // 送审参数
+        restartData: {
+            type: Object,
+            default: {
+                businessType: "",
+                showType: "",
+                processName: "",
+            },
+        },
+        selfList: {
+            type: Array,
+            default: () => [],
+        },
+        selfBtn: {
+            type: Array,
+            default: () => [],
+        },
+
+        // 炎黄userId this.user.
+        uid: {
+            type: String,
+            default: "",
+        },
+
+        // is Msg
+        isMsg: {
+            type: Boolean,
+            default: false,
+        },
     },
     data() {
         return {
@@ -112,13 +143,33 @@ export default defineComponent({
             visibleSong: false,
 
             trackList: [],
+            user: {},
+            // 是否可选
+            canCheck: true,
+
+            // 节点信息
+            approveNode: {},
+
+            // 重新提交
+            restartDataS: {},
+            selfBtnList: [],
+
+            // 高度信息
+            topNum: 144,
+            bottomNum: 70,
+
+            userIdData: "",
+            TopPopup1: false,
         };
     },
     watch: {
         processInstId: {
             // 初始化获取流程相关信息
             async handler(val, preVal) {
-                this.processIntId = this.processInstId;
+                this.processIntId =
+                    this.processInstId ||
+                    this.formData.processId ||
+                    this.formData.processInstId;
                 if (val) {
                     // 流程图
                     this.request
@@ -162,6 +213,9 @@ export default defineComponent({
                             }
                         });
 
+                    // info信息
+                    this.getUserInfo();
+
                     // id
                     this.request
                         .get("/aws/pis/getProcessInstanceById", {
@@ -172,7 +226,6 @@ export default defineComponent({
                                 this.ProcessInsObj = res.data;
                             }
                         });
-
                     // task信息  任务节点
                     await this.request
                         .get("/aws/repository/queryTaskNodeList", {
@@ -211,7 +264,33 @@ export default defineComponent({
             immediate: true,
             deep: true,
         },
+        restartData: {
+            handler(val, preVal) {
+                this.restartDataS = val;
+            },
+            immediate: true,
+            deep: true,
+        },
+        selfBtn: {
+            handler(val, preVal) {
+                if (val && val.length) {
+                    this.selfBtnList = val;
+                }
+            },
+            immediate: true,
+            deep: true,
+        },
+        uid: {
+            handler(val, preVal) {
+                if (val) {
+                    this.userIdData = val;
+                }
+            },
+            immediate: true,
+            deep: true,
+        },
     },
+    mounted() {},
     computed: {
         //筛选
         actionBtn() {
@@ -228,6 +307,23 @@ export default defineComponent({
                 this.taskNode[0] &&
                 this.taskNode[0].taskState != 4;
 
+            // 当前是否为重新提交
+            if (
+                this.formData.currentState === "已撤销" ||
+                this.formData.currentState === "已驳回" ||
+                this.processStatus.status === "已撤销" ||
+                this.processStatus.status === "已驳回" ||
+                this.processStatus.bizStatusName === "已撤销" ||
+                this.processStatus.bizStatusName === "已驳回"
+            ) {
+                let obj = {};
+                obj.name = "重新提交";
+                obj.btnProps = { type: "default" };
+                btnList.push(obj);
+                obj.click = this.handleTest;
+                // handleRestart
+            }
+
             //处理
             if (flag && !this.isView && this.taskObj.completeButtonLabel) {
                 let obj = {};
@@ -235,7 +331,6 @@ export default defineComponent({
                 obj.btnProps = { type: "primary" };
                 btnList.push(obj);
                 obj.click = (name) => {
-                    this.$refs.TopPopup1.handleOpen();
                     this.handleActionClose();
                     this.showOperation(
                         operation.complete,
@@ -253,7 +348,6 @@ export default defineComponent({
                 obj.btnProps = { type: "danger" };
                 btnList.push(obj);
                 obj.click = (name) => {
-                    this.$refs.TopPopup1.handleOpen();
                     this.handleActionClose();
                     this.showOperation(
                         operation.cancel,
@@ -264,6 +358,17 @@ export default defineComponent({
                 };
             }
 
+            // 自定义
+            if (this.selfBtnList && this.selfBtnList.length) {
+                this.selfBtnList.map((v) => {
+                    let obj = {};
+                    obj.name = v.name;
+                    obj.btnProps = { type: v.type };
+                    btnList.push(obj);
+                    obj.click = v.click;
+                });
+            }
+
             // 退回
             if (
                 flag &&
@@ -278,7 +383,6 @@ export default defineComponent({
                         obj.btnProps = { type: "danger" };
                         btnList.push(obj);
                         obj.click = (name) => {
-                            this.$refs.TopPopup1.handleOpen();
                             this.handleActionClose();
                             this.showOperation(
                                 operation.backNode,
@@ -297,7 +401,6 @@ export default defineComponent({
                 obj.name = this.taskObj.ccTaskButtonLabel;
                 obj.btnProps = { type: "default" };
                 obj.click = (name) => {
-                    this.$refs.TopPopup1.handleOpen();
                     this.handleActionClose();
                     this.showOperation(
                         operation.ccTask,
@@ -315,7 +418,6 @@ export default defineComponent({
                 obj.name = this.taskObj.delegateTaskButtonLabel;
                 obj.btnProps = { type: "default" };
                 obj.click = (name) => {
-                    this.$refs.TopPopup1.handleOpen();
                     this.handleActionClose();
                     this.showOperation(
                         operation.delegateTask,
@@ -333,7 +435,6 @@ export default defineComponent({
                 obj.name = this.taskObj.counterSignLabel;
                 obj.btnProps = { type: "primary" };
                 obj.click = (name) => {
-                    this.$refs.TopPopup1.handleOpen();
                     this.handleActionClose();
                     this.showOperation(
                         operation.counterSign,
@@ -348,7 +449,7 @@ export default defineComponent({
             // 催办
             if (
                 this.processIntId &&
-                this.processStatus.createTopUserId == this.userId &&
+                this.processStatus.createUid == this.userIdData &&
                 this.taskNode[0]?.taskState != 2 &&
                 this.processStatus.status !== "已驳回" &&
                 this.processStatus.status !== "已撤销"
@@ -369,7 +470,7 @@ export default defineComponent({
             // 撤销
             if (
                 this.processIntId &&
-                this.processStatus.createTopUserId == this.userId &&
+                this.processStatus.createUid == this.userIdData &&
                 this.taskNode[0]?.taskState != 2 &&
                 this.processStatus.status !== "已驳回" &&
                 this.processStatus.status !== "已撤销"
@@ -390,21 +491,54 @@ export default defineComponent({
         },
         // 底部高度
         processCardHeight() {
-            let num = 210;
-            //  || !this.operBtn || this.operBtn?.length == 0
-            /* if (this.ProcessInsObj.end) {
-                num -= 80;
-            } */
-            if (!this.processStatus.status) num -= 140;
-            else if (!this.processStatus.currUserName) num -= 40;
+            console.log("btnList", this.operBtn);
+
+            let num = this.topNum + this.bottomNum - 10;
+            if (
+                this.isAdditional &&
+                !this.operBtn &&
+                !this.operBtn.length &&
+                !this.ProcessInsObj.end
+            ) {
+                num -= this.bottomNum;
+            }
             return `calc(100vh - ${num}px)`;
         },
+        // 底部按钮定位
+        processBtn() {
+            console.log("btnList", this.operBtn);
+
+            if (
+                this.isAdditional &&
+                !this.operBtn &&
+                !this.operBtn.length &&
+                !this.ProcessInsObj.end
+            ) {
+                return `-${this.bottomNum}px`;
+            }
+        },
     },
     methods: {
+        handleTestsss(val, vals) {
+            console.log("==========:::", val, vals);
+        },
         // 测试
+        handleTestS() {
+            this.handleTips("提交成功!", false, "success");
+        },
+
+        // 重新提交
         handleTest() {
-            // this.visibleSong = true
+            this.visibleSong = true;
+        },
+        // 用户信息
+        async getUserInfo() {
+            let res = await this.request.get("/app/user/info");
+            if (res.code === 200) {
+                this.user = res.data || {};
+            }
         },
+
         // 流程查询
         async handleGetSimulation(vars) {
             this.handleTips("", true, "loading");
@@ -412,6 +546,7 @@ export default defineComponent({
                 processInstId: this.processInstId,
                 taskInstId: this.taskNode.length ? this.taskNode[0].taskId : "",
                 vars: vars,
+                errorTip: false,
             };
 
             let simulationData = await this.request.post(
@@ -422,23 +557,63 @@ export default defineComponent({
             if (simulationData.success) {
                 this.handleTips("", false, "success");
                 this.nextNodeData = simulationData.data;
+
+                for (let i = 0; i < this.nextNodeData.length; i++) {
+                    this.approveNode = this.nextNodeData[i];
+                }
             } else {
-                await this.request
-                    .get("/aws/repository/getOutgoingProcessNode", {
-                        params: {
-                            taskId: this.taskNode.length
-                                ? this.taskNode[0].taskId
-                                : "",
-                            processNodeId: "",
-                        },
-                    })
-                    .then((res) => {
-                        this.handleTips("", false, "success");
-                        console.log("outGatewayUserTaskModel", res);
-                        this.outGatewayUserTaskModel = res.data;
-                    });
+                let taskIDCopy =
+                    this.taskNode && this.taskNode.length
+                        ? this.taskNode[0].taskId
+                        : "";
+                this.outGatewayUserTaskModel = await this.getOutgoingProcessNode(
+                    taskIDCopy,
+                    ""
+                );
             }
         },
+        async getOutgoingProcessNode(taskId, processNodeId) {
+            let res = await this.request.get(
+                "/aws/repository/getOutgoingProcessNode",
+                {
+                    params: {
+                        taskId: taskId,
+                        processNodeId: processNodeId,
+                    },
+                }
+            );
+
+            if (res.code == 200) {
+                if (res.data && res.data.length) {
+                    for (let i = 0; i < res.data.length; i++) {
+                        let o = res.data[i];
+                        if (o.type != "UserTaskModel") {
+                            let childNode = await this.getOutgoingProcessNode(
+                                taskId,
+                                o.id
+                            );
+
+                            if (childNode && childNode.length) {
+                                await childNode.map((v, i) => {
+                                    v.nodeName =
+                                        v.incomingConditionItemList &&
+                                        v.incomingConditionItemList.length
+                                            ? v.incomingConditionItemList[0]
+                                                  .compareValue
+                                            : "";
+                                });
+                                o.childNode = childNode;
+                            }
+                        }
+                    }
+                    this.handleTips("", false, "success");
+                    return res.data;
+                }
+                this.handleTips("", false, "success");
+                return [];
+            }
+            return [];
+        },
 
         // 集合
         handleGet(task) {
@@ -450,6 +625,7 @@ export default defineComponent({
         },
         // 流程状态
         handleGetProcessStatus() {
+            this.handleTips("", true, "loading");
             this.request
                 .get("/aws/pis/getProcessStatus", {
                     params: {
@@ -461,7 +637,23 @@ export default defineComponent({
                 })
                 .then((res) => {
                     if (res.code == 200) {
+                        // res.data.allUserNames = [];
                         this.processStatus = res.data;
+                        this.$emit("processStatus", this.processStatus);
+                        // this.canCheck
+                        if (
+                            this.processStatus.userNodeGroup &&
+                            this.processStatus.userNodeGroup[
+                                this.taskNode[0].nodeName
+                            ] &&
+                            this.processStatus.userNodeGroup[
+                                this.taskNode[0].nodeName
+                            ].length > 1
+                        ) {
+                            this.canCheck = false;
+                        } else {
+                            this.canCheck = true;
+                        }
                     }
                 });
         },
@@ -477,6 +669,30 @@ export default defineComponent({
                     .then((res) => {
                         if (res.code == 200) {
                             this.taskObj = res.data;
+                            /* this.handleTips("加载完成", true, "success"); */
+                            this.$nextTick(() => {
+                                setTimeout(() => {
+                                    let header = document.getElementById(
+                                        "process-header"
+                                    );
+                                    let footer = document.getElementById(
+                                        "process-footer"
+                                    );
+
+                                    this.bottomNum = footer
+                                        ? footer.scrollHeight + 10
+                                        : 70;
+                                    this.topNum = header
+                                        ? header.scrollHeight + 10
+                                        : 144;
+                                    console.log(
+                                        this.bottomNum,
+                                        "diss::",
+                                        this.topNum
+                                    );
+                                }, 1000);
+                            });
+                            this.$refs.topTips.handleClose();
                         }
                     });
             }
@@ -484,6 +700,13 @@ export default defineComponent({
 
         // 弹窗内部渲染
         async showOperation(com, label, request, annex) {
+            if (this.beforeFunction) {
+                let flag = this.beforeFunction();
+                if (!flag) {
+                    return;
+                }
+            }
+
             if (
                 this.processStatus.allUserNames &&
                 this.processStatus.allUserNames.length == 1
@@ -500,18 +723,28 @@ export default defineComponent({
 
             if (request) {
                 this.operationParam.request = request;
+                this.annexlabel = annex;
             }
-            if (request) this.annexlabel = annex;
             this.titleText = label;
             this.operationCom = com;
 
+            /*  this.$refs.TopPopup1.handleOpen(); */
+            this.TopPopup1 = true;
+
+            this.operationParam.visible = this.TopPopup1;
             this.operationParam.annex = annex;
             this.operationParam.subjectId = this.formData.subjectId;
             this.operationParam.processInstId = this.processIntId;
-            this.operationParam.taskInstId = this.taskNode[0].taskId;
+            this.operationParam.taskInstId =
+                this.taskNode && this.taskNode.length
+                    ? this.taskNode[0].taskId
+                    : "";
             this.operationParam.actionName = label;
             this.operationParam.formData = this.formData;
 
+            // 个人信息
+            this.operationParam.userInfo = this.user;
+
             // 下次节点数据
             this.operationParam.nextNodeData = this.nextNodeData;
             this.operationParam.outGatewayUserTaskModel = this.outGatewayUserTaskModel;
@@ -519,13 +752,26 @@ export default defineComponent({
             this.operationParam.taskNode = this.taskNode;
 
             this.operationParam.appId = this.processStatus.appId;
-
             // 弹窗确认结束事件
             this.operationParam.endFunction = this.endFunction;
+
+            // 公文配置参数
+            this.operationParam.isDocument = this.isDocument;
+            this.operationParam.isMsg = this.isMsg;
+            // 是否可选择
+            this.operationParam.canCheck = this.canCheck;
+            // 处理字段处理
+            let actionModel = this.taskObj.commentModels;
+            actionModel.some(
+                (item) =>
+                    (this.operationParam.actionComplete = item?.isDefault
+                        ? item.actionName
+                        : "")
+            );
         },
         // 弹窗取消
         handleCancel() {
-            console.log("handleCancel");
+            // console.log("handleCancel");
         },
         // 弹窗确认
         async handleComfig() {
@@ -533,7 +779,8 @@ export default defineComponent({
         },
         // 关闭弹窗TopPopup1
         handleClosePopup1() {
-            this.$refs.TopPopup1.handleClose();
+            // this.$refs.TopPopup1.handleClose();
+            this.TopPopup1 = false;
         },
         // 确认弹窗(催办,撤销)
         handleTipsComfig() {
@@ -547,6 +794,7 @@ export default defineComponent({
                     .then((res) => {
                         if (res.code == 200) {
                             this.handleTips("催办成功", true, "success");
+                            this.endFunction("催办");
                         } else {
                             this.handleTips(res.msg, true, "error");
                         }
@@ -563,6 +811,7 @@ export default defineComponent({
                     .then((res) => {
                         if (res.code == 200) {
                             this.handleTips("撤销成功", true, "success");
+                            this.endFunction("撤销");
                         } else {
                             this.textTips = res.msg;
                             this.typeTips = "error";
@@ -572,7 +821,7 @@ export default defineComponent({
             }
         },
         handleTipsCancel() {
-            console.log("handleTipsCancel");
+            // console.log("handleTipsCancel");
         },
 
         // 当前流程进度状态回显
@@ -594,7 +843,6 @@ export default defineComponent({
         },
         // 按钮执行方法
         actionClick(name) {
-            this.$refs.TopPopup1.handleOpen();
             this.titleText = name;
             this.actionShow = false;
         },
@@ -640,15 +888,11 @@ export default defineComponent({
                                     },
                                 })
                                 .then((res) => {
-                                    console.log(
-                                        "getProcessInstanceByBusinessKey:::",
-                                        res
-                                    );
                                     this.getFirstProcessNode = res.data[0];
                                     this.operationParam.getFirstProcessNode = this.getFirstProcessNode;
                                     this.operationParam.formData = this.formData;
                                     this.handleTips("", false, "success");
-                                    this.$refs.TopPopup1.handleOpen();
+
                                     this.handleActionClose();
                                     this.showOperation(
                                         operation.restart,

package/src/packages/process/index.scss

@@ -13,6 +13,7 @@
     padding: 0 17px;
     background: #fff;
     margin: 0 0 10px 0;
+    height: auto;
 }
 
 .process-main .border {
@@ -35,6 +36,9 @@
 
 .process-main .process-ml-item .process-mli-value {
     color: #888888;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
 }
 
 .process-main .process-ml-item .process-mli-value .process-mliv-dd {
@@ -64,6 +68,9 @@
     justify-content: center;
     align-items: center;
     flex-direction: row-reverse;
+    position: fixed;
+    bottom: 0;
+    width: 100%;
 }
 
 .process-btn .top-button,
@@ -161,4 +168,8 @@
     justify-content: center;
     display: flex;
     align-items: center;
-}
+}
+
+.footBtnRow {
+    width: 100%;
+}