新增打印结算表单

oa-ui/package.json

@@ -63,6 +63,7 @@
     "vue-count-to": "1.0.13",
     "vue-cropper": "0.5.5",
     "vue-meta": "2.4.0",
+    "vue-print-nb": "^1.7.5",
     "vue-router": "3.4.9",
     "vuedraggable": "2.24.3",
     "vuex": "3.6.0",

oa-ui/src/main.js

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-01-03 09:23:11
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-04-24 15:36:45
+ * @LastEditTime: 2024-05-09 14:49:27
  */
 import Vue from 'vue'
 
@@ -51,6 +51,7 @@ import Tinymce from '@/components/tinymce/index.vue'
 
 import publicData from '@/assets/datas/publicData'
 
+import Print from 'vue-print-nb'
 
 // 全局方法挂载
 Vue.prototype.getDicts = getDicts
@@ -77,6 +78,7 @@ Vue.component('RowTitle', RowTitle)
 Vue.use(directive)
 Vue.use(plugins)
 Vue.use(VueMeta)
+Vue.use(Print)
 DictData.install()
 
 /**

oa-ui/src/views/flowable/form/projectProcess/inProgress.vue

@@ -1,14 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-04-15 09:35:41
- * @LastEditors: wrh
- * @LastEditTime: 2024-05-08 16:01:53
--->
-<!--
- * @Author: ysh
- * @Date: 2024-04-08 13:56:14
- * @LastEditors: wrh
- * @LastEditTime: 2024-04-29 14:33:39
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-05-09 11:12:07
 -->
 <template>
   <div>
@@ -301,6 +295,7 @@ export default {
       })
     },
     submitNextFlow() {
+      this.preserve();
       const params = { taskId: this.taskForm.taskId };
       // 获取下一个流程节点
       getNextFlowNode(params).then(res => {

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

@@ -2,10 +2,14 @@
  * @Author: ysh
  * @Date: 2024-04-30 09:03:14
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-05-08 17:54:13
+ * @LastEditTime: 2024-05-09 16:02:23
 -->
 <template>
   <div class="app-container" v-loading="loading">
+    <el-button type="warning" icon="el-icon-printer" @click="printOpen = true">打印</el-button>
+    <el-dialog title="打印结算表" :visible.sync="printOpen" width="65%" append-to-body>
+      <settle-print :form="form" :chooseProject="chooseProject" :workList="settleWorkList" :settleList="oldSettleSumList"></settle-print>
+    </el-dialog>
     <el-row :gutter="20">
       <el-col :span="19" :xs="24">
         <h2 class="text-center">项目结算表</h2>
@@ -235,8 +239,8 @@
                   </el-input>
                 </td>
                 <td>
-                  <el-input-number :precision="2" style="width: 200px" v-model="dept.amount" clearable
-                    :controls="false" @blur="calculateDeptAmount(index)"></el-input-number>
+                  <el-input-number :precision="2" style="width: 200px" v-model="dept.amount" clearable :controls="false"
+                    @blur="calculateDeptAmount(index)"></el-input-number>
                 </td>
                 <td>
                   <el-input v-model="dept.remark" type="textarea" clearable :autosize="{ minRows: 2, maxRows: 10 }">
@@ -429,10 +433,12 @@ import ChoosePrice from "./components/choosePrice.vue";
 import { getUser } from "@/api/system/user";
 import { complete, getNextFlowNode } from "@/api/flowable/todo";
 import { getUsersDeptLeader, getUsersDeptLeaderByDept, getUsersManageLeaderByDept } from '@/api/system/post.js'
+import SettlePrint from './components/settlePrint.vue';
 export default {
   components: {
     flow,
     ChoosePrice,
+    SettlePrint,
   },
   props: {
     taskName: {
@@ -449,10 +455,11 @@ export default {
     }
   },
   watch: {
-    
+
   },
   data() {
     return {
+      printOpen: false,
       loading: true,
       drawer: false,
       flag: false,
@@ -628,7 +635,7 @@ export default {
         this.updateSettleFn();
         this.updateSettleSummaryFn();
         this.updateSettleWorkFn();
-
+        this.$message.success('保存成功')
       } else {
         this.addSettleFn();
       }
@@ -798,13 +805,12 @@ export default {
       }
       this.actualSumSettle = Number(this.settleSumTr.amount) - sum;
     },
-    calculateDeptAmount(index){
-      debugger
+    calculateDeptAmount(index) {
       let num = 0
       let len = this.deptSettleList.length
-      if (len > 1){
-        if(index == len - 1){
-          for(let i = 0; i< index ;i ++){
+      if (len > 1) {
+        if (index == len - 1) {
+          for (let i = 0; i < index; i++) {
             num = num + this.deptSettleList[i].amount
           }
           this.deptSettleList[index].amount = this.actualSumSettle - num
@@ -835,27 +841,25 @@ export default {
     addSettleFn() {
       let settleId = this.taskForm.formId;
       this.form.settleId = settleId;
-      getSettle(this.taskForm.formId).then(res=>{
-        if(res.data){
+      getSettle(this.taskForm.formId).then(res => {
+        if (res.data) {
           updateSettle(this.form);
           this.addSettleWorkFn(settleId);
           this.addSettleSummaryFn(settleId);
-        }else{
+        } else {
           addSettle(this.form).then(res => {
-          this.addSettleWorkFn(settleId);
-          this.addSettleSummaryFn(settleId);
-        });
+            this.addSettleWorkFn(settleId);
+            this.addSettleSummaryFn(settleId);
+          });
         }
-        
+
       })
-      
+
     },
     addSettleWorkFn(settleId) {
       for (let work of this.settleWorkList) {
         work.settleId = settleId;
-        setTimeout(() => {
-          addSettleWork(work);
-        }, 500)
+        addSettleWork(work);
       }
     },
     addSettleSummaryFn(settleId) {
@@ -863,19 +867,11 @@ export default {
       addSettleSummary(this.settleSumTr);
       for (let item of this.settleSumList) {
         item.settleId = settleId;
-        setTimeout(() => {
-          addSettleSummary(item).then(res=>{
-            console.log(item);
-          });
-        }, 1000)
+        addSettleSummary(item)
       }
       for (let item of this.deptSettleList) {
         item.settleId = settleId;
-        setTimeout(() => {
-          addSettleSummary(item).then(res=>{
-            console.log(item);
-          });
-        }, 1000)
+        addSettleSummary(item)
       }
     },
     // 获取数据
@@ -917,10 +913,7 @@ export default {
     },
     // 更新数据
     updateSettleFn() {
-      updateSettle(this.form).then(res => {
-        if (res.code == 200)
-          this.$message.success('保存成功')
-      })
+      updateSettle(this.form)
     },
     updateSettleWorkFn() {
       delSettleWork([this.taskForm.formId]).then(res => {