Browse Source

增加已办流程提醒

lamphua 10 hours ago
parent
commit
e58906bd12

+ 5
- 3
oa-ui-app/pages/form/borrow/borrow.vue View File

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

+ 3
- 1
oa-ui-app/pages/form/car/car.vue View File

753
         "用车事由:" + this.form.applyReason + " \n>" + 
753
         "用车事由:" + this.form.applyReason + " \n>" + 
754
         "开始日期:" + this.form.beginDate + " \n>" + 
754
         "开始日期:" + this.form.beginDate + " \n>" + 
755
         "结束日期:" + this.form.endDate + " \n>" + 
755
         "结束日期:" + this.form.endDate + " \n>" + 
756
-        "乘车人数:" + this.form.passengers + "人  \n>";
756
+        "乘车人数:" + this.form.passengers + "人 \n>" + 
757
+        "\n>" + 
758
+		"已办流程:<font color='comment'>" + this.taskName + "</font> \n>";
757
         formData.append('message', message);
759
         formData.append('message', message);
758
         let userString = [];
760
         let userString = [];
759
         for (let u of userIds) {
761
         for (let u of userIds) {

+ 5
- 3
oa-ui-app/pages/form/device/device.vue View File

835
           }
835
           }
836
         }
836
         }
837
         
837
         
838
-        message = "您有一条新的设备申请:  \n>" + 
839
-        "申请人:<font color='info'>" + this.getUserName(this.form.applier) + "</font>  \n>" + 
838
+        message = "您有一条新的设备申请 \n>" + 
839
+        "申请人:<font color='info'>" + this.getUserName(this.form.applier) + "</font> \n>" + 
840
         "开始日期:" + this.form.beginDate + " \n>" + 
840
         "开始日期:" + this.form.beginDate + " \n>" + 
841
         "结束日期:" + this.form.endDate + " \n>" +  
841
         "结束日期:" + this.form.endDate + " \n>" +  
842
-        "申请事由:" + this.form.applyReason + "  \n>";
842
+        "申请事由:" + this.form.applyReason + " \n>" + 
843
+        "\n>" + 
844
+		"已办流程:<font color='comment'>" + this.taskName + "</font> \n>";
843
         
845
         
844
         formData.append('message', message);
846
         formData.append('message', message);
845
         formData.append('userString', userString.join('|') + '|YuSiHan|WangRongHua')
847
         formData.append('userString', userString.join('|') + '|YuSiHan|WangRongHua')

+ 1
- 1
oa-ui/src/views/flowable/form/changeForm.vue View File

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

+ 19
- 15
oa-ui/src/views/flowable/form/finance/borrowForm.vue View File

832
               else if (this.taskName == '总经理审核') {
832
               else if (this.taskName == '总经理审核') {
833
                 this.$set(this.taskForm.variables, "exceed", this.exceed);
833
                 this.$set(this.taskForm.variables, "exceed", this.exceed);
834
                 if (!this.exceed) {
834
                 if (!this.exceed) {
835
-                  userIds = this.submitFD();
835
+                  userIds = await this.submitFD();
836
                 }
836
                 }
837
                 else {
837
                 else {
838
                   const res1 = await getUserByPost({ postName: '董事长' });
838
                   const res1 = await getUserByPost({ postName: '董事长' });
842
                 }
842
                 }
843
               }
843
               }
844
               else if (this.taskName == '董事长批准') {
844
               else if (this.taskName == '董事长批准') {
845
-                userIds = this.submitFD();
845
+                userIds = await this.submitFD();
846
               }
846
               }
847
               else if (this.taskName == '党工团审核') {
847
               else if (this.taskName == '党工团审核') {
848
-                userIds = this.submitFD();
848
+                userIds = await this.submitFD();
849
               }
849
               }
850
               else if (this.taskName == '财务处理') {
850
               else if (this.taskName == '财务处理') {
851
                 this.handleComplete(this.taskForm);
851
                 this.handleComplete(this.taskForm);
854
                 let { data } = await getUser(u)
854
                 let { data } = await getUser(u)
855
                 userString.push(data.pinyin)
855
                 userString.push(data.pinyin)
856
               }
856
               }
857
-              message = "您有一条新的借款申请:  \n>" + 
858
-              "申请人:<font color='info'>" + this.form.applierUser.nickName + "</font>  \n>" + 
859
-              "借款金额:<font color='warning'>" + this.form.applyAmount + "</font> 元  \n>" + 
860
-              "借款说明:" + (this.form.applyReason ? this.form.applyReason : this.form.remark) + "  \n>"
857
+              message = "您有一条新的借款申请: \n>" +
858
+                "申请人:<font color='info'>" + this.getUserName(this.form.applier) + "</font> \n>" +
859
+                "借款金额:<font color='warning'>" + this.form.applyAmount + "</font> 元 \n>" +
860
+                "借款说明:" + (this.form.applyReason ? this.form.applyReason : this.form.remark) + " \n>" +
861
+                "\n>" +
862
+                "已办流程:<font color='comment'>" + this.taskName + "</font> \n>";
861
               formData.append('message', message)
863
               formData.append('message', message)
862
               formData.append('userString', userString.join('|') + '|YuSiHan|WangRongHua')
864
               formData.append('userString', userString.join('|') + '|YuSiHan|WangRongHua')
863
-              
865
+
864
               if (userIds.length > 0)
866
               if (userIds.length > 0)
865
-                sendQyMessage(formData);
867
+                await sendQyMessage(formData);
866
 
868
 
867
             } else {
869
             } else {
868
               delBorrowDetail(this.taskForm.formId).then(() => {
870
               delBorrowDetail(this.taskForm.formId).then(() => {
884
                 let { data } = await getUser(u)
886
                 let { data } = await getUser(u)
885
                 userString.push(data.pinyin)
887
                 userString.push(data.pinyin)
886
               }
888
               }
887
-              message = "您有一条新的借款申请:  \n>" + 
888
-              "申请人:<font color='info'>" + this.getUserName(this.form.applier) + "</font>  \n>" + 
889
-              "借款金额:<font color='warning'>" + this.form.applyAmount + "</font> 元  \n>" + 
890
-              "借款说明:" + (this.form.applyReason ? this.form.applyReason : this.form.remark) + "  \n>"
889
+              message = "您有一条新的借款申请: \n>" +
890
+                "申请人:<font color='info'>" + this.getUserName(this.form.applier) + "</font> \n>" +
891
+                "借款金额:<font color='warning'>" + this.form.applyAmount + "</font> 元 \n>" +
892
+                "借款说明:" + (this.form.applyReason ? this.form.applyReason : this.form.remark) + " \n>" +
893
+                "\n>" +
894
+                "已办流程:<font color='comment'>" + this.taskName + "</font> \n>";
891
               formData.append('message', message)
895
               formData.append('message', message)
892
               formData.append('userString', userString.join('|') + '|YuSiHan|WangRongHua')
896
               formData.append('userString', userString.join('|') + '|YuSiHan|WangRongHua')
893
-              
897
+
894
               if (userIds.length > 0)
898
               if (userIds.length > 0)
895
-                sendQyMessage(formData);
899
+                await sendQyMessage(formData);
896
             }
900
             }
897
           } else {
901
           } else {
898
             this.$message.error('请完善必填项')
902
             this.$message.error('请完善必填项')

+ 16
- 13
oa-ui/src/views/flowable/form/oa/carForm.vue View File

2
  * @Author: ysh
2
  * @Author: ysh
3
  * @Date: 2024-02-29 11:44:28
3
  * @Date: 2024-02-29 11:44:28
4
  * @LastEditors: wrh
4
  * @LastEditors: wrh
5
- * @LastEditTime: 2026-03-03 17:28:05
5
+ * @LastEditTime: 2026-03-13 16:09:18
6
 -->
6
 -->
7
 
7
 
8
 <template>
8
 <template>
56
                 </el-select> -->
56
                 </el-select> -->
57
                 <el-descriptions border v-if="isSelect" style="margin-top: 10px;" :column="1">
57
                 <el-descriptions border v-if="isSelect" style="margin-top: 10px;" :column="1">
58
                   <el-descriptions-item label="项目编号" label-class-name="my-label">{{ chooseProject.projectNumber
58
                   <el-descriptions-item label="项目编号" label-class-name="my-label">{{ chooseProject.projectNumber
59
-                    }}</el-descriptions-item>
59
+                  }}</el-descriptions-item>
60
                   <el-descriptions-item label="项目名称" label-class-name="my-label">{{ chooseProject.projectName
60
                   <el-descriptions-item label="项目名称" label-class-name="my-label">{{ chooseProject.projectName
61
-                    }}</el-descriptions-item>
61
+                  }}</el-descriptions-item>
62
                   <el-descriptions-item label="项目负责人" label-class-name="my-label">{{ chooseProject.projectLeaderUser ?
62
                   <el-descriptions-item label="项目负责人" label-class-name="my-label">{{ chooseProject.projectLeaderUser ?
63
                     chooseProject.projectLeaderUser.nickName : ''
63
                     chooseProject.projectLeaderUser.nickName : ''
64
-                    }}</el-descriptions-item>
64
+                  }}</el-descriptions-item>
65
                   <el-descriptions-item label="承担部门" label-class-name="my-label">
65
                   <el-descriptions-item label="承担部门" label-class-name="my-label">
66
                     <el-tag size="small">{{ chooseProject.undertakingDeptName }}</el-tag>
66
                     <el-tag size="small">{{ chooseProject.undertakingDeptName }}</el-tag>
67
                   </el-descriptions-item>
67
                   </el-descriptions-item>
68
                   <el-descriptions-item label="项目类型" label-class-name="my-label">{{ chooseProject.projectType
68
                   <el-descriptions-item label="项目类型" label-class-name="my-label">{{ chooseProject.projectType
69
-                    }}</el-descriptions-item>
69
+                  }}</el-descriptions-item>
70
                 </el-descriptions>
70
                 </el-descriptions>
71
               </el-form-item>
71
               </el-form-item>
72
               <el-form-item label="用车事由:" prop="applyReason">
72
               <el-form-item label="用车事由:" prop="applyReason">
252
             </el-row>
252
             </el-row>
253
             <el-row style="text-align: center;" v-else>
253
             <el-row style="text-align: center;" v-else>
254
               <el-button type="warning" @click="saves()" v-if="taskName == '安排用车'">保存</el-button>
254
               <el-button type="warning" @click="saves()" v-if="taskName == '安排用车'">保存</el-button>
255
-              <el-button type="primary" v-if="taskName" @click="completeApply" :disabled="taskName == '安排用车' && !form.returnDate">完成审批</el-button>
255
+              <el-button type="primary" v-if="taskName" @click="completeApply"
256
+                :disabled="taskName == '安排用车' && !form.returnDate">完成审批</el-button>
256
             </el-row>
257
             </el-row>
257
           </div>
258
           </div>
258
         </el-card>
259
         </el-card>
554
     },
555
     },
555
     saves() {
556
     saves() {
556
       if (this.taskName == '安排用车') {
557
       if (this.taskName == '安排用车') {
557
-        if(!this.form.dispatchComment){
558
+        if (!this.form.dispatchComment) {
558
           this.$message.error('请填写安排用车意见')
559
           this.$message.error('请填写安排用车意见')
559
           return
560
           return
560
         }
561
         }
801
     async sendQyMessage(userIds) {
802
     async sendQyMessage(userIds) {
802
       if (userIds && userIds.length > 0) {
803
       if (userIds && userIds.length > 0) {
803
         let formData = new FormData();
804
         let formData = new FormData();
804
-        let message = "您有一条新的用车申请:  \n>" + 
805
-        "申请人:<font color='info'>" + this.getUserName(this.form.applier) + "</font> \n>" + 
806
-        "用车事由:" + this.form.applyReason + " \n>" + 
807
-        "开始日期:" + this.form.beginDate + " \n>" + 
808
-        "结束日期:" + this.form.endDate + " \n>" + 
809
-        "乘车人数:" + this.form.passengers + "人  \n>";
805
+        let message = "您有一条新的用车申请:  \n>" +
806
+          "申请人:<font color='info'>" + this.getUserName(this.form.applier) + "</font> \n>" +
807
+          "用车事由:" + this.form.applyReason + " \n>" +
808
+          "开始日期:" + this.form.beginDate + " \n>" +
809
+          "结束日期:" + this.form.endDate + " \n>" +
810
+          "乘车人数:" + this.form.passengers + "人 \n>" +
811
+          "\n>" +
812
+          "已办流程:<font color='comment'>" + this.taskName + "</font> \n>";
810
         formData.append('message', message);
813
         formData.append('message', message);
811
         let userString = [];
814
         let userString = [];
812
         for (let u of userIds) {
815
         for (let u of userIds) {

+ 24
- 20
oa-ui/src/views/flowable/form/oa/deviceForm.vue View File

469
                 userString.push(data.pinyin);
469
                 userString.push(data.pinyin);
470
               }
470
               }
471
             }
471
             }
472
-            
473
-            message = "您有一条新的设备申请:  \n>" + 
474
-            "申请人:<font color='info'>" + this.getUserName(this.form.applier) + "</font>  \n>" + 
475
-            "开始日期:" + this.form.beginDate + " \n>" + 
476
-            "结束日期:" + this.form.endDate + " \n>" +  
477
-            "申请事由:" + this.form.applyReason + "  \n>";
478
-            
472
+
473
+            message = "您有一条新的设备申请:  \n>" +
474
+              "申请人:<font color='info'>" + this.getUserName(this.form.applier) + "</font> \n>" +
475
+              "开始日期:" + this.form.beginDate + " \n>" +
476
+              "结束日期:" + this.form.endDate + " \n>" +
477
+              "申请事由:" + this.form.applyReason + " \n>" +
478
+              "\n>" +
479
+              "已办流程:<font color='comment'>" + this.taskName + "</font> \n>";
480
+
479
             formData.append('message', message);
481
             formData.append('message', message);
480
             formData.append('userString', userString.join('|') + '|YuSiHan|WangRongHua')
482
             formData.append('userString', userString.join('|') + '|YuSiHan|WangRongHua')
481
-            
483
+
482
             if (userIds.length > 0) {
484
             if (userIds.length > 0) {
483
-              sendQyMessage(formData);
485
+              await sendQyMessage(formData);
484
             }
486
             }
485
           })
487
           })
486
         } else {
488
         } else {
520
             let userString = [];
522
             let userString = [];
521
             let message = '';
523
             let message = '';
522
             let formData = new FormData();
524
             let formData = new FormData();
523
-            
525
+
524
             for (let u of userIds) {
526
             for (let u of userIds) {
525
               let { data } = await getUser(u);
527
               let { data } = await getUser(u);
526
               if (data) {
528
               if (data) {
527
                 userString.push(data.pinyin);
529
                 userString.push(data.pinyin);
528
               }
530
               }
529
             }
531
             }
530
-            
531
-            message = "您有一条新的设备申请:  \n>" + 
532
-            "申请人:<font color='info'>" + this.getUserName(this.form.applier) + "</font>  \n>" + 
533
-            "开始日期:" + this.form.beginDate + " \n>" + 
534
-            "结束日期:" + this.form.endDate + " \n>" +  
535
-            "申请事由:" + this.form.applyReason + "  \n>";
536
-            
532
+
533
+            message = "您有一条新的设备申请:  \n>" +
534
+              "申请人:<font color='info'>" + this.getUserName(this.form.applier) + "</font> \n>" +
535
+              "开始日期:" + this.form.beginDate + " \n>" +
536
+              "结束日期:" + this.form.endDate + " \n>" +
537
+              "申请事由:" + this.form.applyReason + " \n>" +
538
+              "\n>" +
539
+              "已办流程:<font color='comment'>" + this.taskName + "</font> \n>";
540
+
537
             formData.append('message', message);
541
             formData.append('message', message);
538
             formData.append('userString', userString.join('|') + '|YuSiHan|WangRongHua')
542
             formData.append('userString', userString.join('|') + '|YuSiHan|WangRongHua')
539
-            
543
+
540
             if (userIds.length > 0) {
544
             if (userIds.length > 0) {
541
-              sendQyMessage(formData);
545
+              await sendQyMessage(formData);
542
             }
546
             }
543
           })
547
           })
544
         } else {
548
         } else {
558
           this.$emit('goBack')
562
           this.$emit('goBack')
559
         });
563
         });
560
       } else if (this.taskName == '安排设备') {
564
       } else if (this.taskName == '安排设备') {
561
-        const res = await getUsersManageLeader({ userId: this.form.applier });        
565
+        const res = await getUsersManageLeader({ userId: this.form.applier });
562
         res.data.forEach(user => {
566
         res.data.forEach(user => {
563
           userIds.push(user.userId)
567
           userIds.push(user.userId)
564
         })
568
         })

Loading…
Cancel
Save