修改其他结算异步问题、打印样式

oa-ui/src/views/flowable/form/components/print/settlePrint.vue

@@ -3,19 +3,23 @@
     <div id="printArea">
       <h2 class="text-center title">生产项目委托管理结算清单</h2>
       <table border="1">
-        <tr>
+        <tr v-if="chooseProject">
           <td :colspan="2" class="fontbold">项目名称</td>
           <td :colspan="4">{{ chooseProject.projectName }}</td>
           <td :colspan="2" class="fontbold">项目编号</td>
           <td :colspan="2">{{ chooseProject.projectNumber }}</td>
         </tr>
-        <tr>
+        <tr v-if="chooseProject">
           <td :colspan="2" class="fontbold">承担部门</td>
           <!-- <td :colspan="4">{{ undertakingDept.join('，') }}</td> -->
           <td :colspan="4">{{ chooseProject.undertakingDeptName }}</td>
           <td :colspan="2" class="fontbold">项目负责人</td>
           <td :colspan="2">{{ chooseProject.projectLeaderUser ? chooseProject.projectLeaderUser.nickName : "" }}</td>
         </tr>
+        <tr v-if="!chooseProject">
+          <td :colspan="2" class="fontbold">其他项目名称</td>
+          <td :colspan="8">{{ form.xmName }}</td>
+        </tr>
         <tr>
           <td :colspan="10" class="header bg">测绘项目完成工作量及费用计算</td>
         </tr>
@@ -92,43 +96,50 @@
         <tr>
           <td :colspan="2" class="fontbold">综合事务部(设备领用情况)</td>
           <td :colspan="4" class="conment-width">{{ form.zhComment }}</td>
-          <td :colspan="2" style="text-align:left;min-width:120px;">签名：<span class="auditor">{{ getUserName(form.zhUserId) }}</span></td>
+          <td :colspan="2" style="text-align:left;min-width:120px;">签名：<span class="auditor">{{
+            getUserName(form.zhUserId) }}</span></td>
           <td :colspan="2" style="text-align:left;width:120px;">日期：{{ form.zhTime }}</td>
         </tr>
         <tr>
           <td :colspan="2" class="fontbold">综合事务部(车辆排班情况)</td>
           <td :colspan="4" class="conment-width">{{ form.jsbComment }}</td>
-          <td :colspan="2" style="text-align:left;min-width:120px;">签名：<span class="auditor">{{ getUserName(form.jsbUserId) }}</span></td>
+          <td :colspan="2" style="text-align:left;min-width:120px;">签名：<span class="auditor">{{
+            getUserName(form.jsbUserId) }}</span></td>
           <td :colspan="2" style="text-align:left;width:120px;">日期：{{ form.jsbTime }}</td>
         </tr>
         <tr>
           <td :colspan="2" class="fontbold">技术质量与安全部(质量及工作量)</td>
           <td :colspan="4" class="conment-width">{{ form.jsComment }}</td>
-          <td :colspan="2" style="text-align:left;min-width:120px;">签名：<span class="auditor">{{ getUserName(form.jsUserId) }}</span></td>
+          <td :colspan="2" style="text-align:left;min-width:120px;">签名：<span class="auditor">{{
+            getUserName(form.jsUserId) }}</span></td>
           <td :colspan="2" style="text-align:left;width:120px;">日期：{{ form.jsTime }}</td>
         </tr>
         <tr>
           <td :colspan="2" class="fontbold">经营发展部(校核)</td>
           <td :colspan="4" class="conment-width">{{ form.jyComment }}</td>
-          <td :colspan="2" style="text-align:left;min-width:120px;">签名：<span class="auditor">{{ getUserName(form.jyUserId) }}</span></td>
+          <td :colspan="2" style="text-align:left;min-width:120px;">签名：<span class="auditor">{{
+            getUserName(form.jyUserId) }}</span></td>
           <td :colspan="2" style="text-align:left;width:120px;">日期：{{ form.jyTime }}</td>
         </tr>
         <tr>
           <td :colspan="2" class="fontbold">分管领导(审核)</td>
           <td :colspan="4" class="conment-width">{{ form.managerComment }}</td>
-          <td :colspan="2" style="text-align:left;min-width:120px;">签名：<span class="auditor">{{ getUserName(form.managerUserId) }}</span></td>
+          <td :colspan="2" style="text-align:left;min-width:120px;">签名：<span class="auditor">{{
+            getUserName(form.managerUserId) }}</span></td>
           <td :colspan="2" style="text-align:left;width:120px;">日期：{{ form.managerTime }}</td>
         </tr>
         <tr>
           <td :colspan="2" class="fontbold">总经理(审批)</td>
           <td :colspan="4" class="conment-width">{{ form.gmComment }}</td>
-          <td :colspan="2" style="text-align:left;min-width:120px;">签名：<span class="auditor">{{ getUserName(form.gmUserId) }}</span></td>
+          <td :colspan="2" style="text-align:left;min-width:120px;">签名：<span class="auditor">{{
+            getUserName(form.gmUserId) }}</span></td>
           <td :colspan="2" style="text-align:left;width:120px;">日期：{{ form.gmTime }}</td>
         </tr>
         <tr v-if="form.dszTime">
           <td :colspan="2" class="fontbold">董事长（批准）</td>
           <td :colspan="4" class="conment-width">{{ form.dszComment }}</td>
-          <td :colspan="2" style="text-align:left;min-width:120px;">签名：<span class="auditor">{{ getUserName(form.dszUserId) }}</span></td>
+          <td :colspan="2" style="text-align:left;min-width:120px;">签名：<span class="auditor">{{
+            getUserName(form.dszUserId) }}</span></td>
           <td :colspan="2" style="text-align:left;width:120px;">日期：{{ form.dszTime }}</td>
         </tr>
       </table>
@@ -156,8 +167,8 @@ export default {
       type: Array
     }
   },
-  watch:{
-    settleList(val){
+  watch: {
+    settleList(val) {
       this.initTable();
     }
   },
@@ -166,7 +177,7 @@ export default {
       settleSum: {},
       deptSettleList: [],
       deductionsList: [],
-      actualSumSettle: '',
+      actualSumSettle: 0,
       undertakingDept: [],
       print: {
         id: 'printArea',
@@ -203,7 +214,11 @@ export default {
           this.settleSum = s
         }
       }
-      this.print.popTitle = this.chooseProject.projectName + '结算表单'
+      if(this.chooseProject){
+        this.print.popTitle = this.chooseProject.projectName + '结算表单'
+      }else{
+        this.print.popTitle = this.form.xmName + '结算表单'
+      }
       this.calculateActualSumSettle()
     },
     calculateActualSumSettle() {
@@ -265,13 +280,14 @@ table {
 
 @page {
   size: auto;
-  /* 去除页脚 */ 
-  margin-bottom: 0; 
+  /* 去除页脚 */
+  margin-bottom: 0;
   // 横向A4
   // size:A4 landscape;
 }
+
 @media print {
-  #print table{
+  #print table {
     width: 100%;
   }
 }

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

@@ -653,7 +653,7 @@ export default {
     },
     calculateSettle(work) {
       let sum = work.workload * work.coefficient * work.price;
-      if (sum < 600) {
+      if (sum < 600 && sum != 0 && work.priceId != 147) {
         this.$message.warning('不足600，按600算')
         work.remark = '不足600，按600算'
         sum = 600
@@ -733,25 +733,25 @@ export default {
         }
       });
     },
-    addSettleWorkFn(settleId) {
+    async addSettleWorkFn(settleId) {
       for (let work of this.settleWorkList) {
         work.settleId = settleId;
-        addSettleWork(work);
+        await addSettleWork(work);
       }
     },
-    addSettleSummaryFn(settleId) {
+    async addSettleSummaryFn(settleId) {
       this.settleSumTr.settleId = settleId;
-      addSettleSummary(this.settleSumTr);
+      await addSettleSummary(this.settleSumTr);
       for (let item of this.settleSumList) {
         item.settleId = settleId;
-        addSettleSummary(item);
+        await addSettleSummary(item);
       }
       for (let item of this.deptSettleList) {
         item.settleId = settleId;
-        addSettleSummary(item);
+        await addSettleSummary(item);
       }
       let obj = { settleId: settleId, content: '实际结算总金额', amount: (this.actualSumSettle).toFixed(2), tableNumber: 1 }
-      addSettleSummary(obj)
+      await addSettleSummary(obj)
     },
 
     // 更新数据