ui-process-h5 0.1.40 → 1.0.1

package/src/packages/process/index.vue

@@ -1,25 +1,39 @@
 <template>
     <div>
         <div class="process-warp">
-            <div class="process-main" v-if="processStatus.status">
+            <div
+                class="process-main"
+                v-if="
+                    formData.currentState ||
+                    processStatus.bizStatusName ||
+                    processStatus.status
+                "
+                id="process-header"
+                ref="processheader"
+            >
                 <div class="process-ml-item border">
                     <div class="process-mli-name">流程状态</div>
-                    <!-- <div class="process-mli-name" @click="handleTest">测试</div> -->
+                    <!-- <div class="process-mli-name" @click="handleTestS">测试</div> -->
                     <div class="process-mli-value">
                         <div
                             class="process-mliv-dd"
                             :style="{
-                                background: getColor(processStatus.status),
+                                background: getColor(
+                                    formData.currentState ||
+                                        processStatus.bizStatusName ||
+                                        processStatus.status
+                                ),
                             }"
                             v-if="
-                                processStatus.status ||
-                                processStatus.bizStatusName
+                                formData.currentState ||
+                                processStatus.bizStatusName ||
+                                processStatus.status
                             "
                         >
                             {{
-                                processStatus.bizStatusName
-                                    ? processStatus.bizStatusName
-                                    : processStatus.status
+                                formData.currentState ||
+                                processStatus.bizStatusName ||
+                                processStatus.status
                             }}
                         </div>
                     </div>
@@ -39,7 +53,10 @@
                     "
                 >
                     <div class="process-mli-name">审批节点</div>
-                    <div class="process-mli-value">
+                    <div
+                        class="process-mli-value"
+                        style="width: 50%; text-align: right;"
+                    >
                         <span class="process-mliv-jd">{{
                             `${
                                 processStatus.taskState == 4
@@ -59,48 +76,90 @@
                     :taskComment="taskCommentList"
                     :trackList="trackList"
                 >
-                    <template #default><slot></slot></template>
+                    <template v-if="selfTapList && selfTapList.length">
+                        <div
+                            v-for="(v, i) in selfTapList"
+                            :key="i"
+                            :slot="v.slot"
+                        >
+                            <slot :name="v.slot"></slot>
+                        </div>
+                    </template>
+                    <template v-else>
+                        <div slot="default" style="100%">
+                            <slot name="default"> </slot>
+                        </div>
+                        <div
+                            style="100%"
+                            v-for="(v, i) in tapList"
+                            :key="i"
+                            :slot="v.slot"
+                        >
+                            <slot :name="v.slot"></slot>
+                        </div>
+                    </template>
                 </TopTab>
             </div>
-            <div class="process-foot" v-if="isAdditional">
-                <div class="footBtnRow">
-                    <slot name="btn"></slot>
+            <div
+                class="process-btn"
+                id="process-footer"
+                :style="{ bottom: processBtn }"
+                v-if="!isView"
+            >
+                <div class="footBtnRow" v-if="isAdditional">
+                    <slot name="btn" :data="processStatus"></slot>
                 </div>
-            </div>
-            <div class="process-btn">
-                <template v-if="processStatus.status != '已完成'">
-                    <div
+                <template v-else>
+                    <template
                         v-if="
-                            processStatus.status === '已撤销' ||
-                            processStatus.status === '已驳回'
+                            isDocument &&
+                            (formData.currentState == '编文号套红' ||
+                                formData.currentState == '盖章')
                         "
-                        class="top-button"
-                        :style="getBtnStyle('default')"
-                        @click="handleRestart"
                     >
-                        重新提交
-                    </div>
-                    <template v-else v-for="(item, index) in operBtn">
+                        <div class="top-button" :style="getBtnStyle('default')">
+                            请去PC端处理该流程
+                        </div>
+                    </template>
+                    <template v-else>
+                        <template
+                            v-if="
+                                formData.currentState != '已完成' ||
+                                processStatus.status != '已完成' ||
+                                processStatus.bizStatusName != '已完成'
+                            "
+                        >
+                            <template v-for="(item, index) in operBtn">
+                                <div
+                                    class="top-button"
+                                    :style="
+                                        getBtnStyle(
+                                            item.btnProps.type.toString()
+                                        )
+                                    "
+                                    :key="item.name"
+                                    v-if="index < 3"
+                                    @click="item.click(item.name)"
+                                >
+                                    {{ item.name }}
+                                </div>
+                            </template>
+                        </template>
                         <div
-                            class="top-button"
-                            :style="getBtnStyle(item.btnProps.type.toString())"
-                            :key="item.name"
-                            v-if="index < 3"
-                            @click="item.click(item.name)"
+                            class="elips"
+                            v-if="
+                                operBtn.length > 3 &&
+                                actionBtn &&
+                                actionBtn.length
+                            "
+                            @click="handleActionOpen"
                         >
-                            {{ item.name }}
+                            <div class="circle"></div>
+                            <div class="circle"></div>
+                            <div class="circle"></div>
                         </div>
                     </template>
                 </template>
-                <div
-                    class="elips"
-                    v-if="operBtn.length > 3 && actionBtn && actionBtn.length"
-                    @click="handleActionOpen"
-                >
-                    <div class="circle"></div>
-                    <div class="circle"></div>
-                    <div class="circle"></div>
-                </div>
             </div>
         </div>
         <TopPopup
@@ -108,6 +167,7 @@
             :cancel="handleCancel"
             :comfig="handleComfig"
             :titleText="titleText"
+            :visible.sync="TopPopup1"
         >
             <!--  @success="operationSuccess"
             @fail="operationFail" -->
@@ -181,6 +241,20 @@
                     : 'visibility: hidden; opacity: 0;'
             "
         ></div>
+        <TopSumbitPopup
+            :visible.sync="visibleSong"
+            ref="actionPop"
+            :request="request"
+            :appId="processStatus.appId"
+            :id="formData.businessKey"
+            :resubmit="true"
+            v-bind="restartDataS"
+            @successFn="endFunction"
+            :selfList="selfList"
+            @change="handleTestsss"
+        ></TopSumbitPopup>
+        <!--  @change="handleChange"
+            :todoParameter="todoParameter" :resubmit="resubmit" :beforeFunction="saveAndStart" -->
     </div>
 </template>
 <script src="./index.js"></script>

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

@@ -25,6 +25,15 @@
             ></TopDownSelect>
         </div>
 
+        <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>
@@ -39,6 +48,11 @@
                     maxlength="200"
                 ></textarea>
             </div>
+            <div class="msg-btn" v-if="param.isMsg">
+                <span class="msg-btn-click" @click="handleMakeMsg()"
+                    >设置为常用意见</span
+                >
+            </div>
         </div>
 
         <TopTips
@@ -47,23 +61,32 @@
             :statusTips="statusTips"
             :type="typeTips"
         />
-        <!-- <TopPopup
-            v-bind:visible="visible"
-            v-on:update:visible="(val) => (visible = val)"
+        <TopPopup
+            v-bind:visible="visibleListMsg"
+            v-on:update:visible="(val) => (visibleListMsg = val)"
             ref="TopPopup"
-            titleText="选人"
+            titleText="常用意见"
             :isDrawer="true"
         >
-            <departPerson
-                :visible.sync="visible"
+            <MsgList
+                :visible="visibleListMsg"
                 :request="param.request"
-                :businessId="param.formData.businessKey"
-                v-bind="entity"
-                @callback="handleCallback"
-                @cancel="handleCancel"
-            >
-            </departPerson>
-        </TopPopup> -->
+                :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
             v-if="labels == '退回'"
@@ -81,6 +104,7 @@ import attchViews from "../../attchUpload/index.vue";
 import TopPopup from "../../popup/index.vue";
 import TopDownSelect from "../../downSelect/index.vue";
 import { departPerson } from "checked-pick-app";
+import MsgList from "./msgList.vue";
 export default {
     name: "backNode",
     props: {
@@ -95,6 +119,7 @@ export default {
         TopPopup,
         departPerson,
         TopDownSelect,
+        MsgList,
     },
     data() {
         return {
@@ -125,9 +150,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",
@@ -146,6 +171,10 @@ export default {
             // 下拉节点
             option: [],
             nodeId: "",
+
+            actionName: "",
+            visibleListMsg: false,
+            visibleMsgComfig: false,
         };
     },
     watch: {
@@ -154,6 +183,9 @@ export default {
                 this.nextNodeData = val.nextNodeData;
                 this.taskNode = val.taskNode;
                 this.outGatewayUserTaskModel = val.outGatewayUserTaskModel;
+                this.entity.checkedArray = [];
+
+                this.actionName = val.actionName;
             },
             immediate: true,
             deep: true,
@@ -164,8 +196,45 @@ export default {
         this.getReturnNode();
     },
     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;
+        },
         getReturnNode() {
-            console.log("this.param.taskInstId", this.param.taskInstId);
+            // console.log("this.param.taskInstId", this.param.taskInstId);
             this.param.request
                 .get("/aws/tis/getReturnableNodes", {
                     params: { taskId: this.param.taskInstId },
@@ -177,7 +246,7 @@ export default {
                 });
         },
         handleChange(val) {
-            console.log("退回节点,", val);
+            // console.log("退回节点,", val);
             this.nodeId = val.id;
         },
         handleOpenPopup(id) {
@@ -208,6 +277,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");
@@ -224,31 +294,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;
         },
 
@@ -272,11 +347,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");
@@ -303,7 +378,7 @@ export default {
 
         handleFinal() {
             if (this.param.endFunction) {
-                this.param.endFunction();
+                this.param.endFunction("退回");
             }
         },
     },
@@ -368,6 +443,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;
@@ -375,7 +455,7 @@ export default {
 
 .process-pc-value--people {
     width: 100%;
-    height: 43px;
+    min-height: 43px;
     padding: 10px 26px 10px 0;
     box-sizing: border-box;
     position: relative;
@@ -390,4 +470,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>