ui-process-h5 0.1.40 → 1.0.1

package/src/packages/process/operation/complete.vue

@@ -1,5 +1,50 @@
 <template>
     <div class="process-popup-content">
+        <div class="process-pc-label" v-if="param.isDocument">
+            快捷回复
+        </div>
+        <div
+            class="process-pc-value"
+            style="display: flex;"
+            v-if="param.isDocument"
+        >
+            <div class="process-radio" style="width: 100%;">
+                <div
+                    class="process-radio-item"
+                    :class="
+                        value == commentMsg ? 'process-radio-item--check' : ''
+                    "
+                    v-for="value in msgCheckList"
+                    @click="() => (commentMsg = value)"
+                >
+                    <span>
+                        <img
+                            class="process-radio-item-check"
+                            v-if="value == commentMsg"
+                            :src="check"
+                        />
+                    </span>
+                    {{ value }}
+                </div>
+                <div
+                    class="process-radio-item"
+                    @click="handleOpenMsg()"
+                    v-if="param.isMsg"
+                    style="color: #1389ff; font-size: 14px; margin-left: auto;"
+                >
+                    常用意见
+                </div>
+            </div>
+        </div>
+        <div v-if="param.isMsg && !param.isDocument">
+            <div
+                class="process-radio-item"
+                @click="handleOpenMsg()"
+                style="color: #1389ff; font-size: 14px;"
+            >
+                常用意见
+            </div>
+        </div>
         <div class="process-pc-label">
             审批意见
             <span class="process-pc-label--re">*</span>
@@ -15,6 +60,11 @@
                     maxlength="200"
                 ></textarea>
             </div>
+            <div class="msg-btn" v-if="param.isMsg">
+                <span class="msg-btn-click" @click="handleMakeMsg()"
+                    >设置为常用意见</span
+                >
+            </div>
         </div>
 
         <template
@@ -33,13 +83,16 @@
                         "
                     >
                         <div class="process-pc-label">
-                            {{ item.userTaskModelDTO.name }}
-                            <br />
-                            审批人:
+                            <div>
+                                {{ item.userTaskModelDTO.name }}
+                                <br />
+                                审批人
+                                <span class="process-pc-label--re">*</span>
+                            </div>
                         </div>
                         <div
                             class="process-pc-value"
-                            @click="handleOpenPopup(item.id)"
+                            @click="handleOpenPopup(item)"
                         >
                             <div class="process-pc-value--people">
                                 <div
@@ -49,12 +102,17 @@
                                         partNode[item.id].length
                                     "
                                 >
-                                    <span v-for="(v, i) in partNode[item.id]">
-                                        {{ i == 0 ? v : `,${v}` }}
+                                    <span>
+                                        {{ partNode[item.id].join(",") }}
                                     </span>
                                 </div>
                                 <div
-                                    v-else
+                                    v-else-if="
+                                        item.humanPerformerName !==
+                                            '固定账户' &&
+                                        item.humanPerformerName !==
+                                            '与流程申请人相关'
+                                    "
                                     class="process-pc-value--data"
                                     style="color: #888;"
                                 >
@@ -62,9 +120,26 @@
                                         请选择审批人
                                     </span>
                                 </div>
+
+                                <div
+                                    v-else-if="
+                                        item.routeTxt && item.routeTxt.userNames
+                                    "
+                                    class="process-pc-value--data"
+                                >
+                                    {{ item.routeTxt.userNames }}
+                                </div>
                             </div>
                         </div>
                     </template>
+                    <template v-else-if="item.type != 'endEvent'">
+                        <div class="process-pc-label">
+                            {{ item.userTaskModelDTO.name }}
+                            <span v-if="personMakeList[item.id]"
+                                >：{{ personMakeList[item.id] }}</span
+                            >
+                        </div>
+                    </template>
                 </template>
             </template>
 
@@ -72,44 +147,165 @@
                 <template v-for="item in outGatewayUserTaskModel">
                     <template
                         v-if="
-                            item.type != 'endEvent' &&
-                            isOption(item.humanPerformerName)
+                            outGatewayUserTaskModel.childNode &&
+                            outGatewayUserTaskModel.childNode.length
                         "
                     >
+                        <template
+                            v-if="
+                                item.type != 'endEvent' &&
+                                isOption(
+                                    item?.userTaskModelDTO?.humanPerformer?.name
+                                )
+                            "
+                        >
+                            <div class="process-pc-label">
+                                <div>
+                                    {{ item.userTaskModelDTO.name }}
+                                    <br />
+                                    审批人
+                                    <span class="process-pc-label--re">*</span>
+                                </div>
+                            </div>
+                            <div
+                                class="process-pc-value"
+                                @click="handleOpenPopup(item)"
+                            >
+                                <div class="process-pc-value--people">
+                                    <div
+                                        class="process-pc-value--data"
+                                        v-if="
+                                            partNode[item.id] &&
+                                            partNode[item.id].length
+                                        "
+                                    >
+                                        <span>
+                                            {{ partNode[item.id].join(",") }}
+                                        </span>
+                                    </div>
+                                    <div
+                                        v-else
+                                        class="process-pc-value--data"
+                                        style="color: #888;"
+                                    >
+                                        <span>
+                                            请选择审批人
+                                        </span>
+                                    </div>
+                                </div>
+                            </div>
+                        </template>
+                        <template v-else-if="item.type != 'endEvent'">
+                            <div class="process-pc-label">
+                                {{ item.userTaskModelDTO.name }}
+                            </div>
+                        </template>
+                    </template>
+
+                    <template v-else>
                         <div class="process-pc-label">
-                            {{ item.name }}
-                            <br />
-                            审批人
+                            下一节点审批
                             <span class="process-pc-label--re">*</span>
                         </div>
-                        <div
-                            class="process-pc-value"
-                            @click="handleOpenPopup(item.id)"
-                        >
-                            <div class="process-pc-value--people">
+                        <div class="process-pc-value">
+                            <div class="process-radio">
                                 <div
-                                    class="process-pc-value--data"
-                                    v-if="
-                                        partNode[item.id] &&
-                                        partNode[item.id].length
+                                    class="process-radio-item"
+                                    :class="
+                                        value.id == radioCheck
+                                            ? 'process-radio-item--check'
+                                            : ''
                                     "
-                                >
-                                    <span v-for="(v, i) in partNode[item.id]">
-                                        {{ i == 0 ? v : `,${v}` }}
-                                    </span>
-                                </div>
-                                <div
-                                    v-else
-                                    class="process-pc-value--data"
-                                    style="color: #888;"
+                                    v-for="value in item.childNode"
+                                    @click="handleNode(value)"
                                 >
                                     <span>
-                                        请选择审批人
+                                        <img
+                                            class="process-radio-item-check"
+                                            v-if="value.id == radioCheck"
+                                            :src="check"
+                                        />
                                     </span>
+                                    {{ value.nodeName }}
+                                </div>
+                            </div>
+                        </div>
+                    </template>
+                </template>
+
+                <template v-if="radioCheck">
+                    <template
+                        v-if="
+                            radioCheckChild &&
+                            radioCheckChild.length &&
+                            radioCheckChild[0].type !== 'EndEventModel'
+                        "
+                    >
+                        <div v-for="item in radioCheckChild">
+                            <div
+                                class="process-pc-label"
+                                @click="handleSaveNode(item.id)"
+                            >
+                                <div class="process-checkbox">
+                                    下一节点审批:<br />
+                                    <div class="process-checkbox-item">
+                                        {{ item.nodeName }}
+                                        <span>
+                                            <img
+                                                v-if="
+                                                    radioCheckNameList.includes(
+                                                        item.id
+                                                    )
+                                                "
+                                                class="process-checkbox-item-check"
+                                                :src="checkS"
+                                            />
+                                        </span>
+                                    </div>
+                                </div>
+                            </div>
+
+                            <div
+                                class="process-pc-value"
+                                @click="handleOpenPopup(item)"
+                            >
+                                <div class="process-pc-value--people">
+                                    <div
+                                        class="process-pc-value--data"
+                                        v-if="
+                                            partNode[item.id] &&
+                                            partNode[item.id].length
+                                        "
+                                    >
+                                        <span>
+                                            {{ partNode[item.id].join(",") }}
+                                        </span>
+                                    </div>
+                                    <div
+                                        v-else
+                                        class="process-pc-value--data"
+                                        style="color: #888;"
+                                    >
+                                        <span>
+                                            请选择审批人
+                                        </span>
+                                    </div>
                                 </div>
                             </div>
                         </div>
                     </template>
+                    <template v-else>
+                        <div class="process-pc-label">
+                            下一节点审批
+                        </div>
+                        <div class="process-pc-value">
+                            {{
+                                radioCheckChild[0].type === "EndEventModel"
+                                    ? "结束事件"
+                                    : radioCheckName
+                            }}
+                        </div>
+                    </template>
                 </template>
             </template>
         </template>
@@ -127,15 +323,40 @@
             :isDrawer="true"
         >
             <departPerson
+                :isTitle="false"
                 :visible.sync="visible"
-                :request="param.request"
-                :businessId="param.formData.businessKey"
                 v-bind="entity"
                 @callback="handleCallback"
                 @cancel="handleCancel"
             >
             </departPerson>
-            <!-- 初始测试啊啊啊啊啊啊 -->
+        </TopPopup>
+
+        <TopPopup
+            v-bind:visible="visibleListMsg"
+            v-on:update:visible="(val) => (visibleListMsg = val)"
+            ref="TopPopup"
+            titleText="常用意见"
+            :isDrawer="true"
+        >
+            <MsgList
+                :visible="visibleListMsg"
+                :request="param.request"
+                :useInfo="param.userInfo"
+                @handleTips="handleTips"
+                @handleMsg="handleMsg"
+            ></MsgList>
+        </TopPopup>
+
+        <TopPopup
+            titleText="操作消息提示"
+            :isTips="true"
+            :context="`将${commentMsg}设置为常用意见`"
+            :cancel="handleTipsCancel"
+            :comfig="handleTipsComfig"
+            v-bind:visible="visibleMsgComfig"
+            v-on:update:visible="(val) => (visibleMsgComfig = val)"
+        >
         </TopPopup>
 
         <attchViews
@@ -155,12 +376,18 @@ import TopTips from "../../tip/index.vue";
 import attchViews from "../../attchUpload/index.vue";
 import TopPopup from "../../popup/index.vue";
 import { departPerson } from "checked-pick-app";
+import success from "@/assets/status/success.png";
+import checks from "@/assets/status/check.png";
+import MsgList from "./msgList.vue";
+import "checked-pick-app-style";
 export default {
     name: "complete",
     props: {
         param: {
             type: Object,
-            defalut: () => {},
+            defalut: () => {
+                visible: false;
+            },
         },
     },
     components: {
@@ -168,6 +395,15 @@ export default {
         attchViews,
         TopPopup,
         departPerson,
+        MsgList,
+    },
+    computed: {
+        check() {
+            return success;
+        },
+        checkS() {
+            return checks;
+        },
     },
     data() {
         return {
@@ -198,7 +434,6 @@ export default {
                 source: "0",
                 type: "0",
                 request: this.param.request, //'http://59.53.91.231:2100' 0002
-                businessId: this.param.businessKey,
                 codeType: [3], // 可选类型 1-主体 2-部门 3-人员
                 multiple: true, // 是否多选
             },
@@ -216,6 +451,30 @@ export default {
             partObjId: [],
             // 选中人员信息
             partNode: {},
+            // 是否可选
+            canCheck: true,
+            // radio
+            radioCheck: "",
+            radioCheckChild: [],
+            radioCheckName: "",
+            radioCheckNameList: [],
+            // 选人回显
+            partList: [],
+
+            //
+            gateVars: {},
+
+            // 固定账户id存储:[]
+            personMake: [],
+            personMakeList: {},
+
+            // 常用意见列表
+            visibleListMsg: false,
+            visibleMsgComfig: false,
+            msgCheck: "",
+            msgCheckList: ["同意", "如拟", "已阅"],
+
+            actionName: "",
         };
     },
     watch: {
@@ -224,53 +483,331 @@ export default {
                 this.nextNodeData = val.nextNodeData;
                 this.taskNode = val.taskNode;
                 this.outGatewayUserTaskModel = val.outGatewayUserTaskModel;
-                if (val.nextNodeData.length) {
-                    console.log("handler::::", this.nextNodeData[0]);
-                    if (
-                        this.nextNodeData[0].type == "userTask" ||
-                        this.nextNodeData[0].type == "UserTaskModel"
-                    ) {
-                        this.entity.multiple = false;
-                        this.entity.codeType = [3];
-                        this.entity.source = "1";
-                    } else if (
-                        this.nextNodeData[0].type == "ExclusiveGatewayModel"
-                    ) {
-                    } else if (
-                        this.nextNodeData[0].type == "InclusiveGatewayModel"
-                    ) {
-                    }
-                } else if (val.outGatewayUserTaskModel.length) {
-                    if (
-                        val.outGatewayUserTaskModel[0].type == "userTask" ||
-                        val.outGatewayUserTaskModel[0].type == "UserTaskModel"
-                    ) {
-                        this.entity.multiple = false;
-                        this.entity.codeType = [3];
-                        this.entity.source = "1";
-                    } else if (
-                        val.outGatewayUserTaskModel[0].type ==
-                        "ExclusiveGatewayModel"
-                    ) {
-                    } else if (
-                        val.outGatewayUserTaskModel[0].type ==
-                        "InclusiveGatewayModel"
-                    ) {
+                this.actionName = val.actionName;
+
+                console.log("param:::", val);
+                /*  if(this.nextNodeData) */
+
+                if (
+                    this.outGatewayUserTaskModel &&
+                    this.outGatewayUserTaskModel.length
+                ) {
+                    this.outGatewayUserTaskModel.map((v) => {
+                        if (v.type === "endEvent") return;
+                        v.userTaskModelDTO = {
+                            name: v.name,
+                            humanPerformer: {
+                                name: v.humanPerformerName,
+                            },
+                        };
+                        v.humanPerformer = {
+                            name: v.humanPerformerName,
+                        };
+                    });
+                }
+
+                ///userTaskModelDTO
+                if (this.nextNodeData && this.nextNodeData.length) {
+                    this.nextNodeData.map((v, i) => {
+                        if (v.type === "endEvent") return;
+
+                        if (
+                            v.userTaskModelDTO.participantList &&
+                            v.userTaskModelDTO.participantList.length
+                        ) {
+                            v.userTaskModelDTO.participantList.map((value) => {
+                                /* */
+                                if (!this.multiNodeParticipant[v.id]) {
+                                    this.multiNodeParticipant[v.id] = [];
+                                }
+                                if (!this.partNode[v.id]) {
+                                    this.partNode[v.id] = [];
+                                }
+
+                                if (
+                                    !this.multiNodeParticipant[v.id].includes(
+                                        value.id
+                                    )
+                                ) {
+                                    this.multiNodeParticipant[v.id].push(
+                                        value.id
+                                    );
+                                }
+
+                                if (!this.partNode[v.id].includes(value.name)) {
+                                    this.partNode[v.id].push(value.name);
+                                }
+                            });
+                        }
+
+                        /* console.log(
+                            "nextData",
+                            v.userTaskModelDTO.humanPerformer.name
+                        ); */
+                        if (
+                            v.userTaskModelDTO.humanPerformer.name ==
+                                "固定账户" ||
+                            v.userTaskModelDTO.humanPerformer.name ==
+                                "与流程申请人相关"
+                        ) {
+                            this.personMake.push(v.id);
+                        }
+                    });
+
+                    if (this.personMake && this.personMake.length) {
+                        this.param.request
+                            .post(
+                                `aws/repository/getParticipantsOfPerformerNames?taskInstId=${this.param.taskInstId}`,
+                                {
+                                    userTaskDefIds: this.personMake,
+                                }
+                            )
+                            .then((res) => {
+                                if (res.code == 200) {
+                                    this.personMakeList = res.data;
+                                }
+                            });
                     }
+                } else if (
+                    this.outGatewayUserTaskModel &&
+                    this.outGatewayUserTaskModel.length
+                ) {
+                    this.outGatewayUserTaskModel.map((v, i) => {
+                        if (v.type === "endEvent") return;
+                        if (v.participantList && v.participantList.length) {
+                            v.participantList.map((value) => {
+                                /* */
+                                if (!this.multiNodeParticipant[v.id]) {
+                                    this.multiNodeParticipant[v.id] = [];
+                                }
+                                if (!this.partNode[v.id]) {
+                                    this.partNode[v.id] = [];
+                                }
+
+                                if (
+                                    !this.multiNodeParticipant[v.id].includes(
+                                        value.id
+                                    )
+                                ) {
+                                    this.multiNodeParticipant[v.id].push(
+                                        value.id
+                                    );
+                                }
+
+                                if (!this.partNode[v.id].includes(value.name)) {
+                                    this.partNode[v.id].push(value.name);
+                                }
+                            });
+                        }
+                    });
                 }
+                console.log("userTaskModelDTO", this.multiNodeParticipant);
+                console.log(
+                    "outGatewayUserTaskModel",
+                    this.outGatewayUserTaskModel
+                );
             },
             immediate: true,
             deep: true,
         },
     },
     created() {
-        console.log("isVue2", this.param);
+        // console.log("isVue2", this.param);
         this.makeDelegateTaskButtonAnnex();
     },
     methods: {
-        handleOpenPopup(id) {
+        // 设置msg
+        handleMakeMsg() {
+            if (this.commentMsg == "" && !this.commentMsg.length) {
+                this.handleTips("请输入审批意见!", false, "success");
+                this.visibleMsgComfig = false;
+            } else {
+                this.visibleMsgComfig = true;
+            }
+        },
+
+        handleTipsCancel() {
+            this.visibleMsgComfig = false;
+        },
+        handleTipsComfig() {
+            this.handleTips("", true, "loading");
+            this.visibleMsgComfig = false;
+            this.param.request
+                .post("/auth//user/opinion/save", {
+                    opinionName: this.commentMsg,
+                })
+                .then((res) => {
+                    if (res.code === 200) {
+                        this.handleTips("设置成功!", true, "success");
+                    } else {
+                        this.handleTips(res.msg, true, "error");
+                    }
+                })
+                .catch((error) => {
+                    this.handleTips(error.msg, true, "error");
+                });
+        },
+        handleMsg(val) {
+            this.commentMsg = val;
+            this.visibleListMsg = false;
+        },
+        handleSaveNode(id) {
+            if (this.radioCheckNameList.includes(id)) {
+                this.radioCheckNameList.splice(
+                    this.radioCheckNameList.indexOf(id),
+                    1
+                );
+            } else {
+                this.radioCheckNameList.push(id);
+            }
+
+            // console.log("查看::", this.radioCheckNameList);
+        },
+        handleNode(item) {
+            this.radioCheck = item.id;
+            this.radioCheckName = item.nodeName;
+            this.radioCheckChild =
+                item.childNode && item.childNode.length
+                    ? item.childNode
+                    : [item];
+            console.log("当前选中", item, this.radioCheckChild);
+
+            if (
+                this.outGatewayUserTaskModel &&
+                this.outGatewayUserTaskModel.length
+            ) {
+                if (this.radioCheckChild && this.radioCheckChild.length) {
+                    this.gateVars[
+                        this.radioCheckChild[0].incomingConditionItemList[0].itemName
+                    ] = this.radioCheckChild[0].incomingConditionItemList[0].compareValue;
+
+                    this.gateVars[item.incomingConditionItemList[0].itemName] =
+                        item.incomingConditionItemList[0].compareValue;
+                } else {
+                    this.gateVars[item.incomingConditionItemList[0].itemName] =
+                        item.incomingConditionItemList[0].compareValue;
+                }
+            }
+        },
+        handleOpenPopup(item) {
             this.visible = true;
-            this.partObjId = id;
+            this.partObjId = item.id;
+
+            if (this.nextNodeData && this.nextNodeData.length) {
+                item = {
+                    ...item,
+                    ...item.userTaskModelDTO,
+                };
+            }
+            console.log("partNode", this.partObjId, item);
+            if (item.humanPerformer.name == "固定单位") {
+                let subjectName;
+                let checkedArray = [];
+                item.routeTxt.companyIds.map((v, i) => {
+                    subjectName = v.name;
+                });
+
+                if (
+                    this.multiNodeParticipant[item.id] &&
+                    this.multiNodeParticipant[item.id].length
+                ) {
+                    this.multiNodeParticipant[item.id].map((v, i) => {
+                        checkedArray.push({
+                            type: 3,
+                            uid: v,
+                        });
+                    });
+                }
+
+                this.entity = {
+                    source: "1",
+                    type: "0",
+                    request: this.param.request,
+                    codeType: [3],
+                    multiple:
+                        item.type == "InclusiveGatewayModel" ||
+                        item.loopCardinality > 1,
+                    maxMultiple: item.loopCardinality
+                        ? item.loopCardinality
+                        : item.loopCardinality,
+                    subjectName: subjectName,
+                    checkedArray: checkedArray,
+                };
+            } else if (item.humanPerformer.name == "固定部门") {
+                let deptCode;
+                let checkedArray = [];
+                item.routeTxt.departmentIds.map((v, i) => {
+                    deptCode = v.rangeId;
+                });
+
+                if (
+                    this.multiNodeParticipant[item.id] &&
+                    this.multiNodeParticipant[item.id].length
+                ) {
+                    this.multiNodeParticipant[item.id].map((v, i) => {
+                        checkedArray.push({
+                            type: 3,
+                            uid: v,
+                            deptId: deptCode,
+                        });
+                    });
+                }
+
+                console.log(
+                    "multiNodeParticipant",
+                    this.multiNodeParticipant[item.id],
+                    checkedArray
+                );
+
+                this.entity = {
+                    source: "1",
+                    type: "0",
+                    request: this.param.request,
+                    codeType: [3],
+                    multiple:
+                        item.type == "InclusiveGatewayModel" ||
+                        item.loopCardinality > 1,
+                    maxMultiple: item.loopCardinality
+                        ? item.loopCardinality
+                        : item.loopCardinality,
+                    deptCode: deptCode,
+                    checkedArray: checkedArray,
+                };
+            } else {
+                let checkedArray = [];
+
+                if (
+                    this.multiNodeParticipant[item.id] &&
+                    this.multiNodeParticipant[item.id].length
+                ) {
+                    this.multiNodeParticipant[item.id].map((v, i) => {
+                        checkedArray.push({
+                            type: 3,
+                            uid: v,
+                        });
+                    });
+                }
+
+                this.entity = {
+                    source: "1",
+                    type: "0",
+                    request: this.param.request,
+                    codeType: [3],
+                    multiple:
+                        item.type == "InclusiveGatewayModel" ||
+                        item.loopCardinality > 1,
+                    maxMultiple: item.loopCardinality
+                        ? item.loopCardinality
+                        : item.loopCardinality,
+                    checkedArray: checkedArray,
+                };
+
+                console.log("任意选人节点参数", this.entity);
+            }
+        },
+
+        handleOpenMsg() {
+            this.visibleListMsg = true;
         },
 
         async confirm() {
@@ -284,18 +821,42 @@ export default {
                 return;
             }
 
-            /*  let multiNodeParticipant =  {
-                [this.nextNodeData[0].id]:this.nextNodeData[0].
-            } */
+            let multiNodeParticipant = {};
+            if (this.radioCheckNameList && this.radioCheckNameList.length) {
+                let num = 0;
+                this.radioCheckNameList.map((v, i) => {
+                    if (
+                        !this.multiNodeParticipant[v] ||
+                        !this.multiNodeParticipant[v].length
+                    ) {
+                        num += 1;
+                    }
+                    multiNodeParticipant[v] = this.multiNodeParticipant[v];
+                });
+
+                if (num > 0) {
+                    this.handleTips("请选择审批人!", false, "success");
+                    return;
+                }
+            } else {
+                if (
+                    this.multiNodeParticipant[this.partObjId] &&
+                    !this.multiNodeParticipant[this.partObjId].length
+                ) {
+                    this.handleTips("请选择审批人!", false, "success");
+                    return;
+                }
+                multiNodeParticipant = this.multiNodeParticipant;
+            }
 
             this.handleTips("", true, "loading");
             await this.param.request
                 .post("/aws/tis/complete", {
-                    actionName: "提交",
+                    actionName: this.param.actionComplete,
                     commentMsg: this.commentMsg,
                     taskInstId: this.param.taskInstId,
-                    vars: this.param.vars,
-                    multiNodeParticipant: this.multiNodeParticipant,
+                    vars: this.param.vars || this.gateVars,
+                    multiNodeParticipant: multiNodeParticipant,
                 })
                 .then((res) => {
                     if (res.code == 200) {
@@ -303,7 +864,6 @@ export default {
                             this.uploadAttch();
                             return;
                         }
-
                         this.$emit("handleClosePopup1");
                         this.handleTips("提交成功!", false, "success");
                         this.handleFinal();
@@ -320,31 +880,27 @@ export default {
                 this.limit = str[2];
                 this.requires = JSON.parse(str[1]);
                 this.labels = str[0];
-                console.log(
-                    "makeDelegateTaskButtonAnnex",
-                    this.otherList,
-                    this.limit,
-                    this.requires,
-                    this.labels
-                );
             }
         },
 
         handleCallback(res) {
+            this.visible = false;
             this.multiNodeParticipant[this.partObjId] = [];
             this.partNode[this.partObjId] = [];
+
             res.map((v, i) => {
                 this.multiNodeParticipant[this.partObjId].push(v.uid);
                 this.partNode[this.partObjId].push(v.name);
             });
-            console.log("callback_OK", res, this.multiNodeParticipant);
+
+            // console.log("callback_OK", res, this.multiNodeParticipant);
         },
         handleCancel() {
-            console.log("cancel_No");
+            // console.log("cancel_No");
         },
 
         getValues(data) {
-            console.log("获取当前附件信息::::", data);
+            // console.log("获取当前附件信息::::", data);
             this.attchLists = data;
         },
 
@@ -368,10 +924,11 @@ export default {
                         saveMetaAnnexCmdList: param,
                     }
                 );
-                console.log("asd", ress);
+                // console.log("asd", ress);
                 if (ress.success) {
                     this.$emit("handleClosePopup1");
                     this.handleTips("提交成功!", false, "success");
+                    this.handleFinal();
                     this.commentMsg = "";
                 } else {
                     this.handleTips("上传失败", true, "error");
@@ -398,7 +955,7 @@ export default {
 
         handleFinal() {
             if (this.param.endFunction) {
-                this.param.endFunction();
+                this.param.endFunction("complete");
             }
         },
     },
@@ -463,6 +1020,11 @@ export default {
     margin: 0;
     text-decoration: inherit;
     height: 100%;
+    font-size: 14px;
+}
+
+.process-popup-textarea .textarea-item::placeholder {
+    line-height: 4;
 }
 .process-pc-label--re {
     color: #ee0000;
@@ -470,10 +1032,11 @@ export default {
 
 .process-pc-value--people {
     width: 100%;
-    height: 43px;
+    min-height: 43px;
     padding: 10px 26px 10px 0;
     box-sizing: border-box;
     position: relative;
+    font-size: 14px;
 }
 
 .process-pc-value--people::after {
@@ -485,4 +1048,79 @@ export default {
     bottom: 0;
     left: 0;
 }
+
+.process-tag {
+    width: 36px;
+    height: 20px;
+    box-sizing: border-box;
+    border: 1px solid #2979ff;
+    color: #2979ff;
+    font-size: 12px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    margin-right: 5px;
+}
+
+.process-radio {
+    display: flex;
+    justify-content: flex-start;
+}
+.process-radio-item,
+.process-checkbox-item {
+    display: flex;
+    align-items: center;
+    margin-right: 10px;
+    padding-top: 10px;
+}
+.process-radio-item span {
+    display: inline-block;
+    border: 1px solid #d1d1d1;
+    border-radius: 50%;
+    width: 24px;
+    height: 24px;
+    box-sizing: border-box;
+    background-color: #fff;
+    margin-right: 5px;
+}
+
+.process-checkbox-item span {
+    display: inline-block;
+    border: 1px solid #d1d1d1;
+    border-radius: 3px;
+    width: 24px;
+    height: 24px;
+    box-sizing: border-box;
+    background-color: #fff;
+    margin-left: 5px;
+}
+
+.process-radio-item--check span {
+    background-color: rgb(0, 122, 255);
+    border-color: rgb(0, 122, 255);
+}
+
+.process-radio-item-check {
+    width: 80%;
+    height: 80%;
+    transform: translate(12%, 18%);
+}
+
+.process-checkbox-item-check {
+    width: 80%;
+    height: 80%;
+    transform: translate(12%, 18%);
+}
+
+::v-deep .departPerson-main {
+    width: 100% !important;
+    height: 100% !important;
+}
+
+.msg-btn {
+    font-size: 14px;
+    margin: 8px 0;
+    text-align: right;
+    color: #1890ff;
+}
 </style>