增加已办流程提醒

oa-ui-app/pages/form/borrow/borrow.vue

@@ -648,10 +648,12 @@ export default {
     async sendQyMessage(userIds) {
       if (userIds && userIds.length > 0) {
         let formData = new FormData();
-        let message = "您有一条新的借款申请:  \n>" + 
+        let message = "您有一条新的借款申请： \n>" + 
         "申请人：<font color='info'>" + this.getUserName(this.form.applier) + "</font> \n>" + 
-        "借款金额：<font color='warning'>" + this.form.applyAmount + "</font> 元  \n>" + 
-        "借款说明：" + (this.form.applyReason ? this.form.applyReason : this.form.remark) + "  \n>";
+        "借款金额：<font color='warning'>" + this.form.applyAmount + "</font> 元 \n>" + 
+        "借款说明：" + (this.form.applyReason ? this.form.applyReason : this.form.remark) + " \n>" + 
+        "\n>" + 
+		"已办流程：<font color='comment'>" + this.taskName + "</font> \n>";
         formData.append('message', message);
         let userString = [];
         for (let u of userIds) {

oa-ui-app/pages/form/car/car.vue

@@ -753,7 +753,9 @@ export default {
         "用车事由：" + this.form.applyReason + " \n>" + 
         "开始日期：" + this.form.beginDate + " \n>" + 
         "结束日期：" + this.form.endDate + " \n>" + 
-        "乘车人数：" + this.form.passengers + "人  \n>";
+        "乘车人数：" + this.form.passengers + "人 \n>" + 
+        "\n>" + 
+		"已办流程：<font color='comment'>" + this.taskName + "</font> \n>";
         formData.append('message', message);
         let userString = [];
         for (let u of userIds) {

oa-ui-app/pages/form/device/device.vue

@@ -835,11 +835,13 @@ export default {
           }
         }
         
-        message = "您有一条新的设备申请:  \n>" + 
-        "申请人：<font color='info'>" + this.getUserName(this.form.applier) + "</font>  \n>" + 
+        message = "您有一条新的设备申请： \n>" + 
+        "申请人：<font color='info'>" + this.getUserName(this.form.applier) + "</font> \n>" + 
         "开始日期：" + this.form.beginDate + " \n>" + 
         "结束日期：" + this.form.endDate + " \n>" +  
-        "申请事由：" + this.form.applyReason + "  \n>";
+        "申请事由：" + this.form.applyReason + " \n>" + 
+        "\n>" + 
+		"已办流程：<font color='comment'>" + this.taskName + "</font> \n>";
         
         formData.append('message', message);
         formData.append('userString', userString.join('|') + '|YuSiHan|WangRongHua')

oa-ui/src/views/flowable/form/changeForm.vue

@@ -299,7 +299,7 @@ export default {
     async sendQyMessage(userIds) {
       if (userIds && userIds.length > 0) {
         let formData = new FormData();
-        let message = "经营发展部发起项目变更通知:  \n>" +
+        let message = "经营发展部发起项目变更通知： \n>" +
           "登记人：<font color='info'>" + this.getUserName(this.form.registrant) + "</font> \n>" +
           "变更项目：" + this.chooseProject.projectNumber + "-" + this.chooseProject.projectName + " \n>" +
           "变更内容：" + this.form.content + " \n>";

oa-ui/src/views/flowable/form/finance/borrowForm.vue

@@ -832,7 +832,7 @@ export default {
               else if (this.taskName == '总经理审核') {
                 this.$set(this.taskForm.variables, "exceed", this.exceed);
                 if (!this.exceed) {
-                  userIds = this.submitFD();
+                  userIds = await this.submitFD();
                 }
                 else {
                   const res1 = await getUserByPost({ postName: '董事长' });
@@ -842,10 +842,10 @@ export default {
                 }
               }
               else if (this.taskName == '董事长批准') {
-                userIds = this.submitFD();
+                userIds = await this.submitFD();
               }
               else if (this.taskName == '党工团审核') {
-                userIds = this.submitFD();
+                userIds = await this.submitFD();
               }
               else if (this.taskName == '财务处理') {
                 this.handleComplete(this.taskForm);
@@ -854,15 +854,17 @@ export default {
                 let { data } = await getUser(u)
                 userString.push(data.pinyin)
               }
-              message = "您有一条新的借款申请:  \n>" + 
-              "申请人：<font color='info'>" + this.form.applierUser.nickName + "</font>  \n>" + 
-              "借款金额：<font color='warning'>" + this.form.applyAmount + "</font> 元  \n>" + 
-              "借款说明：" + (this.form.applyReason ? this.form.applyReason : this.form.remark) + "  \n>"
+              message = "您有一条新的借款申请： \n>" +
+                "申请人：<font color='info'>" + this.getUserName(this.form.applier) + "</font> \n>" +
+                "借款金额：<font color='warning'>" + this.form.applyAmount + "</font> 元 \n>" +
+                "借款说明：" + (this.form.applyReason ? this.form.applyReason : this.form.remark) + " \n>" +
+                "\n>" +
+                "已办流程：<font color='comment'>" + this.taskName + "</font> \n>";
               formData.append('message', message)
               formData.append('userString', userString.join('|') + '|YuSiHan|WangRongHua')
-              
+
               if (userIds.length > 0)
-                sendQyMessage(formData);
+                await sendQyMessage(formData);
 
             } else {
               delBorrowDetail(this.taskForm.formId).then(() => {
@@ -884,15 +886,17 @@ export default {
                 let { data } = await getUser(u)
                 userString.push(data.pinyin)
               }
-              message = "您有一条新的借款申请:  \n>" + 
-              "申请人：<font color='info'>" + this.getUserName(this.form.applier) + "</font>  \n>" + 
-              "借款金额：<font color='warning'>" + this.form.applyAmount + "</font> 元  \n>" + 
-              "借款说明：" + (this.form.applyReason ? this.form.applyReason : this.form.remark) + "  \n>"
+              message = "您有一条新的借款申请： \n>" +
+                "申请人：<font color='info'>" + this.getUserName(this.form.applier) + "</font> \n>" +
+                "借款金额：<font color='warning'>" + this.form.applyAmount + "</font> 元 \n>" +
+                "借款说明：" + (this.form.applyReason ? this.form.applyReason : this.form.remark) + " \n>" +
+                "\n>" +
+                "已办流程：<font color='comment'>" + this.taskName + "</font> \n>";
               formData.append('message', message)
               formData.append('userString', userString.join('|') + '|YuSiHan|WangRongHua')
-              
+
               if (userIds.length > 0)
-                sendQyMessage(formData);
+                await sendQyMessage(formData);
             }
           } else {
             this.$message.error('请完善必填项')

oa-ui/src/views/flowable/form/oa/carForm.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-02-29 11:44:28
  * @LastEditors: wrh
- * @LastEditTime: 2026-03-03 17:28:05
+ * @LastEditTime: 2026-03-13 16:09:18
 -->
 
 <template>
@@ -56,17 +56,17 @@
                 </el-select> -->
                 <el-descriptions border v-if="isSelect" style="margin-top: 10px;" :column="1">
                   <el-descriptions-item label="项目编号" label-class-name="my-label">{{ chooseProject.projectNumber
-                    }}</el-descriptions-item>
+                  }}</el-descriptions-item>
                   <el-descriptions-item label="项目名称" label-class-name="my-label">{{ chooseProject.projectName
-                    }}</el-descriptions-item>
+                  }}</el-descriptions-item>
                   <el-descriptions-item label="项目负责人" label-class-name="my-label">{{ chooseProject.projectLeaderUser ?
                     chooseProject.projectLeaderUser.nickName : ''
-                    }}</el-descriptions-item>
+                  }}</el-descriptions-item>
                   <el-descriptions-item label="承担部门" label-class-name="my-label">
                     <el-tag size="small">{{ chooseProject.undertakingDeptName }}</el-tag>
                   </el-descriptions-item>
                   <el-descriptions-item label="项目类型" label-class-name="my-label">{{ chooseProject.projectType
-                    }}</el-descriptions-item>
+                  }}</el-descriptions-item>
                 </el-descriptions>
               </el-form-item>
               <el-form-item label="用车事由：" prop="applyReason">
@@ -252,7 +252,8 @@
             </el-row>
             <el-row style="text-align: center;" v-else>
               <el-button type="warning" @click="saves()" v-if="taskName == '安排用车'">保存</el-button>
-              <el-button type="primary" v-if="taskName" @click="completeApply" :disabled="taskName == '安排用车' && !form.returnDate">完成审批</el-button>
+              <el-button type="primary" v-if="taskName" @click="completeApply"
+                :disabled="taskName == '安排用车' && !form.returnDate">完成审批</el-button>
             </el-row>
           </div>
         </el-card>
@@ -554,7 +555,7 @@ export default {
     },
     saves() {
       if (this.taskName == '安排用车') {
-        if(!this.form.dispatchComment){
+        if (!this.form.dispatchComment) {
           this.$message.error('请填写安排用车意见')
           return
         }
@@ -801,12 +802,14 @@ export default {
     async sendQyMessage(userIds) {
       if (userIds && userIds.length > 0) {
         let formData = new FormData();
-        let message = "您有一条新的用车申请:  \n>" + 
-        "申请人：<font color='info'>" + this.getUserName(this.form.applier) + "</font> \n>" + 
-        "用车事由：" + this.form.applyReason + " \n>" + 
-        "开始日期：" + this.form.beginDate + " \n>" + 
-        "结束日期：" + this.form.endDate + " \n>" + 
-        "乘车人数：" + this.form.passengers + "人  \n>";
+        let message = "您有一条新的用车申请:  \n>" +
+          "申请人：<font color='info'>" + this.getUserName(this.form.applier) + "</font> \n>" +
+          "用车事由：" + this.form.applyReason + " \n>" +
+          "开始日期：" + this.form.beginDate + " \n>" +
+          "结束日期：" + this.form.endDate + " \n>" +
+          "乘车人数：" + this.form.passengers + "人 \n>" +
+          "\n>" +
+          "已办流程：<font color='comment'>" + this.taskName + "</font> \n>";
         formData.append('message', message);
         let userString = [];
         for (let u of userIds) {

oa-ui/src/views/flowable/form/oa/deviceForm.vue

@@ -469,18 +469,20 @@ export default {
                 userString.push(data.pinyin);
               }
             }
-            
-            message = "您有一条新的设备申请:  \n>" + 
-            "申请人：<font color='info'>" + this.getUserName(this.form.applier) + "</font>  \n>" + 
-            "开始日期：" + this.form.beginDate + " \n>" + 
-            "结束日期：" + this.form.endDate + " \n>" +  
-            "申请事由：" + this.form.applyReason + "  \n>";
-            
+
+            message = "您有一条新的设备申请:  \n>" +
+              "申请人：<font color='info'>" + this.getUserName(this.form.applier) + "</font> \n>" +
+              "开始日期：" + this.form.beginDate + " \n>" +
+              "结束日期：" + this.form.endDate + " \n>" +
+              "申请事由：" + this.form.applyReason + " \n>" +
+              "\n>" +
+              "已办流程：<font color='comment'>" + this.taskName + "</font> \n>";
+
             formData.append('message', message);
             formData.append('userString', userString.join('|') + '|YuSiHan|WangRongHua')
-            
+
             if (userIds.length > 0) {
-              sendQyMessage(formData);
+              await sendQyMessage(formData);
             }
           })
         } else {
@@ -520,25 +522,27 @@ export default {
             let userString = [];
             let message = '';
             let formData = new FormData();
-            
+
             for (let u of userIds) {
               let { data } = await getUser(u);
               if (data) {
                 userString.push(data.pinyin);
               }
             }
-            
-            message = "您有一条新的设备申请:  \n>" + 
-            "申请人：<font color='info'>" + this.getUserName(this.form.applier) + "</font>  \n>" + 
-            "开始日期：" + this.form.beginDate + " \n>" + 
-            "结束日期：" + this.form.endDate + " \n>" +  
-            "申请事由：" + this.form.applyReason + "  \n>";
-            
+
+            message = "您有一条新的设备申请:  \n>" +
+              "申请人：<font color='info'>" + this.getUserName(this.form.applier) + "</font> \n>" +
+              "开始日期：" + this.form.beginDate + " \n>" +
+              "结束日期：" + this.form.endDate + " \n>" +
+              "申请事由：" + this.form.applyReason + " \n>" +
+              "\n>" +
+              "已办流程：<font color='comment'>" + this.taskName + "</font> \n>";
+
             formData.append('message', message);
             formData.append('userString', userString.join('|') + '|YuSiHan|WangRongHua')
-            
+
             if (userIds.length > 0) {
-              sendQyMessage(formData);
+              await sendQyMessage(formData);
             }
           })
         } else {
@@ -558,7 +562,7 @@ export default {
           this.$emit('goBack')
         });
       } else if (this.taskName == '安排设备') {
-        const res = await getUsersManageLeader({ userId: this.form.applier });        
+        const res = await getUsersManageLeader({ userId: this.form.applier });
         res.data.forEach(user => {
           userIds.push(user.userId)
         })