ui-process-h5 0.1.40 → 1.0.1

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

@@ -1,5 +1,14 @@
 <template>
     <div class="process-popup-content">
+        <div v-if="param.isMsg">
+            <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>
         </div>
@@ -14,6 +23,11 @@
                     maxlength="200"
                 ></textarea>
             </div>
+            <div class="msg-btn" v-if="param.isMsg">
+                <span class="msg-btn-click" @click="handleMakeMsg()"
+                    >设置为常用意见</span
+                >
+            </div>
         </div>
         <template
             v-if="
@@ -30,10 +44,11 @@
                             )
                         "
                     >
-                        <div class="process-pc-label">
+                        <div>
                             {{ item.userTaskModelDTO.name }}
                             <br />
-                            审批人:
+                            审批人
+                            <span class="process-pc-label--re">*</span>
                         </div>
                         <div
                             class="process-pc-value"
@@ -104,9 +119,9 @@
             :isDrawer="true"
         >
             <departPerson
+                :isTitle="false"
                 :visible.sync="visible"
                 :request="param.request"
-                :businessId="param.formData.businessKey"
                 v-bind="entity"
                 @callback="handleCallback"
                 @cancel="handleCancel"
@@ -123,6 +138,33 @@
             :linkUrl="param.linkUrl"
             @getValue="getValues"
         />
+
+        <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>
     </div>
 </template>
 <script>
@@ -130,6 +172,7 @@ 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 MsgList from "./msgList.vue";
 export default {
     name: "cancel",
     props: {
@@ -143,10 +186,22 @@ export default {
         attchViews,
         TopPopup,
         departPerson,
+        MsgList,
+    },
+    watch: {
+        param: {
+            async handler(val, preVal) {
+                this.entity.checkedArray = [];
+                this.actionName = val.actionName;
+            },
+            immediate: true,
+            deep: true,
+        },
     },
     data() {
         return {
             commentMsg: "",
+            actionName: "",
             style: {
                 color: "#333",
                 disableColor: "#F7F6F6",
@@ -173,9 +228,9 @@ 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, // 是否多选
+                checkedArray: [],
             },
             /* {
                 source: "0",
@@ -191,13 +246,53 @@ export default {
             partObjId: [],
             // 选中人员信息
             partNode: {},
+
+            visibleListMsg: false,
+            visibleMsgComfig: false,
         };
     },
     created() {
-        console.log("isVue2", this.param);
+        // console.log("isVue2", this.param);
         this.makeDelegateTaskButtonAnnex();
     },
     methods: {
+        // 设置msg
+        handleMakeMsg() {
+            if (this.commentMsg == "" && !this.commentMsg.length) {
+                this.handleTips("请输入审批意见!", false, "success");
+                this.visibleMsgComfig = false;
+            } else {
+                this.visibleMsgComfig = true;
+            }
+        },
+        handleOpenMsg() {
+            this.visibleListMsg = 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;
+        },
         handleOpenPopup(id) {
             this.visible = true;
             this.partObjId = id;
@@ -217,6 +312,7 @@ export default {
                     if (res.code == 200) {
                         this.$emit("handleClosePopup1");
                         this.handleTips("提交成功!", false, "success");
+                        this.handleFinal();
                         this.commentMsg = "";
                     } else {
                         this.handleTips(res.msg, true, "error");
@@ -230,31 +326,36 @@ export default {
                 this.limit = str[2];
                 this.requires = JSON.parse(str[1]);
                 this.labels = str[0];
-                console.log(
+                /* 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);
+                this.entity.checkedArray.push({
+                    type: 3,
+                    uid: v.uid,
+                });
             });
-            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;
         },
 
@@ -278,11 +379,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.handleFinal();
                     this.commentMsg = "";
                 } else {
                     this.handleTips("上传失败", true, "error");
@@ -309,7 +410,7 @@ export default {
 
         handleFinal() {
             if (this.param.endFunction) {
-                this.param.endFunction();
+                this.param.endFunction("拒绝");
             }
         },
     },
@@ -374,6 +475,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;
@@ -381,10 +487,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 {
@@ -396,4 +503,16 @@ export default {
     bottom: 0;
     left: 0;
 }
+
+::v-deep .departPerson-main {
+    width: 100% !important;
+    height: 100% !important;
+}
+
+.msg-btn {
+    font-size: 14px;
+    margin: 8px 0;
+    text-align: right;
+    color: #1890ff;
+}
 </style>

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

@@ -9,16 +9,12 @@
                 <template v-for="item in nextNodeData">
                     <template
                         v-if="
-                            item.type != 'endEvent' &&
-                            isOption(
-                                item?.userTaskModelDTO?.humanPerformer?.name
-                            )
+                            item.type != 'endEvent'
                         "
                     >
-                        <div class="process-pc-label">
-                            {{ item.userTaskModelDTO.name }}
-                            <br />
-                            审批人:
+                        <div>
+                            抄送人员
+                            <span class="process-pc-label--re">*</span>
                         </div>
                         <div
                             class="process-pc-value"
@@ -42,7 +38,7 @@
                                     style="color: #888;"
                                 >
                                     <span>
-                                        请选择审批人
+                                        请选择抄送人员
                                     </span>
                                 </div>
                             </div>
@@ -53,16 +49,9 @@
 
             <template v-else-if="outGatewayUserTaskModel.length">
                 <template v-for="item in outGatewayUserTaskModel">
-                    <template
-                        v-if="
-                            item.type != 'endEvent' &&
-                            isOption(item.humanPerformerName)
-                        "
-                    >
-                        <div class="process-pc-label">
-                            {{ item.name }}
-                            <br />
-                            审批人
+                    <template v-if="item.type != 'endEvent'">
+                        <div>
+                            抄送人员
                             <span class="process-pc-label--re">*</span>
                         </div>
                         <div
@@ -78,7 +67,7 @@
                                     "
                                 >
                                     <span v-for="(v, i) in partNode[item.id]">
-                                        {{ i == 0 ? v : `,${v}` }}
+                                        {{ i == 0 ? v : `；${v}` }}
                                     </span>
                                 </div>
                                 <div
@@ -87,7 +76,7 @@
                                     style="color: #888;"
                                 >
                                     <span>
-                                        请选择审批人
+                                        请选择抄送人员
                                     </span>
                                 </div>
                             </div>
@@ -110,9 +99,9 @@
             :isDrawer="true"
         >
             <departPerson
+                :isTitle="false"
                 :visible.sync="visible"
                 :request="param.request"
-                :businessId="param.formData.businessKey"
                 v-bind="entity"
                 @callback="handleCallback"
                 @cancel="handleCancel"
@@ -179,9 +168,9 @@ 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, // 是否多选
+                checkedArray: [],
             },
             /* {
                 source: "0",
@@ -197,6 +186,7 @@ export default {
             partObjId: [],
             // 选中人员信息
             partNode: {},
+            actionName: "",
         };
     },
     watch: {
@@ -205,8 +195,9 @@ export default {
                 this.nextNodeData = val.nextNodeData;
                 this.taskNode = val.taskNode;
                 this.outGatewayUserTaskModel = val.outGatewayUserTaskModel;
+                this.actionName = val.actionName;
                 if (val.nextNodeData.length) {
-                    console.log("handler::::", this.nextNodeData[0]);
+                    // console.log("handler::::", this.nextNodeData[0]);
                     if (
                         this.nextNodeData[0].type == "userTask" ||
                         this.nextNodeData[0].type == "UserTaskModel"
@@ -214,6 +205,7 @@ export default {
                         this.entity.multiple = true;
                         this.entity.codeType = [3];
                         this.entity.source = "1";
+                        this.entity.checkedArray = [];
                     } else if (
                         this.nextNodeData[0].type == "ExclusiveGatewayModel"
                     ) {
@@ -226,6 +218,7 @@ export default {
                         this.entity.multiple = true;
                         this.entity.codeType = [3];
                         this.entity.source = "1";
+                        this.entity.checkedArray = [];
                     } else if (
                         val.outGatewayUserTaskModel[0].type ==
                         "ExclusiveGatewayModel"
@@ -239,6 +232,7 @@ export default {
                     ) {
                         this.entity.multiple = true;
                         this.entity.codeType = [3];
+                        this.entity.checkedArray = [];
                         this.entity.source = "1";
                     }
                 }
@@ -248,7 +242,7 @@ export default {
         },
     },
     created() {
-        console.log("isVue2", this.param);
+        // console.log("isVue2", this.param);
         this.makeDelegateTaskButtonAnnex();
     },
     methods: {
@@ -280,6 +274,7 @@ export default {
                     if (res.code == 200) {
                         this.$emit("handleClosePopup1");
                         this.handleTips("提交成功!", false, "success");
+                        this.handleFinal();
                     } else {
                         this.handleTips(res.msg, true, "error");
                     }
@@ -292,31 +287,36 @@ export default {
                 this.limit = str[2];
                 this.requires = JSON.parse(str[1]);
                 this.labels = str[0];
-                console.log(
+                /* 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);
+                this.entity.checkedArray.push({
+                    type: 3,
+                    uid: v.uid,
+                });
             });
-            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;
         },
 
@@ -340,11 +340,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.handleFinal();
                     this.commentMsg = "";
                 } else {
                     this.handleTips("上传失败", true, "error");
@@ -371,7 +371,7 @@ export default {
 
         handleFinal() {
             if (this.param.endFunction) {
-                this.param.endFunction();
+                this.param.endFunction("ccTask");
             }
         },
     },
@@ -436,17 +436,24 @@ 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;
 }
 
 .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 {
@@ -458,4 +465,9 @@ export default {
     bottom: 0;
     left: 0;
 }
+
+::v-deep .departPerson-main {
+    width: 100% !important;
+    height: 100% !important;
+}
 </style>