up

src/views/contract/components/contractSign.vue

@@ -176,6 +176,7 @@
 </template>
 
 <script>
+  import { MessageBox } from 'element-ui';
   import {
     addContractSign,
     getContractSign,
@@ -325,6 +326,15 @@
     methods: {
       //合同签订
       sign() {
+        console.log(this.signList)
+        console.log(this.signList.length)
+        if (this.signList.length == 0) {
+          Message({
+            type: 'error',
+            message: '该项目未设置付款计划，请设置付款计划后保存'
+          })
+          return false;
+        }
 
         editorContract({
           id: this.contractId,
@@ -384,6 +394,7 @@
       },
       submit() {
         console.log(this.planForm)
+
         addContractSign({
           contract_id: this.contract.id,
           date: `${new Date(this.planForm.date).getFullYear()}-${new Date(this.planForm.date).getMonth()+1}-${new Date(this.planForm.date).getDate()}`,

src/views/contract/components/printRegistration.vue

@@ -6,11 +6,17 @@
           <div class="print-table1-title">苏州市河道管理处资金划拨审批单</div>
 
           <div class="print-table1-grid">
-            <div style="grid-area: tb1-1" class="print-table1-grid-top">项目名称：<span style="font-weight: 600">{{registration.contract.name}}</span></div>
+            <div style="grid-area: tb1-1" class="print-table1-grid-top">项目名称：<span
+                style="font-weight: 600">{{registration.contract.name}}</span></div>
             <div style="grid-area: tb1-2;justify-content: center;align-items: center;flex-direction: column;">
-              <div>本次为第 <span style="font-weight: 600;padding: 0 1vw;">{{payIndex}}</span> 次付款</div> <div>{{registration.remark}}</div></div>
+              <div>本次为第 <span style="font-weight: 600;padding: 0 1vw;">{{payIndex}}</span> 次付款</div>
-            <div style="grid-area: tb2-1" class="print-table1-grid-top">承包商/供货商：<span style="font-weight: 600">{{registration.contract.supply}}</span></div>
+              <div>{{registration.remark}}</div>
-            <div style="grid-area: tb2-2" class="print-table1-grid-top">合同服务时间：<span style="font-weight: 600">{{registration.contract.start_date}} - {{registration.contract.end_date}}</span></div>
+            </div>
+            <div style="grid-area: tb2-1" class="print-table1-grid-top">承包商/供货商：<span
+                style="font-weight: 600">{{registration.contract.supply}}</span></div>
+            <div style="grid-area: tb2-2" class="print-table1-grid-top">合同服务时间：<span
+                style="font-weight: 600">{{registration.contract.start_date}} -
+                {{registration.contract.end_date}}</span></div>
 
             <div style="grid-area: tb3-1" class="print-table1-grid-title1">付款情形</div>
             <div style="grid-area: tb3-2" class="print-table1-grid-title1">金额（单位：元）</div>
@@ -18,7 +24,8 @@
 
             <div style="grid-area: tb4-1" class="print-table1-grid-center">A</div>
             <div style="grid-area: tb4-2" class="print-table1-grid-center">合同金额</div>
-            <div style="grid-area: tb4-3" class="print-table1-grid-center">{{priceFormat(registration.contract.money)}}</div>
+            <div style="grid-area: tb4-3" class="print-table1-grid-center">{{priceFormat(registration.contract.money)}}
+            </div>
             <div style="grid-area: tb4-4"></div>
             <div style="grid-area: tb5-1" class="print-table1-grid-center">B</div>
             <div style="grid-area: tb5-2" class="print-table1-grid-center">审计金额</div>
@@ -26,15 +33,18 @@
             <div style="grid-area: tb5-4"></div>
             <div style="grid-area: tb6-1" class="print-table1-grid-center">C</div>
             <div style="grid-area: tb6-2" class="print-table1-grid-center">前期累计已支付</div>
-            <div style="grid-area: tb6-3" class="print-table1-grid-center">{{priceFormat(registration.total_act_money)}}</div>
+            <div style="grid-area: tb6-3" class="print-table1-grid-center">{{priceFormat(registration.total_act_money)}}
+            </div>
             <div style="grid-area: tb6-4"></div>
             <div style="grid-area: tb7-1" class="print-table1-grid-center">D</div>
             <div style="grid-area: tb7-2" class="print-table1-grid-center">本期扣款</div>
-            <div style="grid-area: tb7-3" class="print-table1-grid-center">{{priceFormat(registration.discount_money)}}</div>
+            <div style="grid-area: tb7-3" class="print-table1-grid-center">{{priceFormat(registration.discount_money)}}
+            </div>
             <div style="grid-area: tb7-4"></div>
             <div style="grid-area: tb8-1" class="print-table1-grid-center">E</div>
             <div style="grid-area: tb8-2;font-weight: 600" class="print-table1-grid-center">本期应付款</div>
-            <div style="grid-area: tb8-3;font-weight: 600" class="print-table1-grid-center">{{priceFormat(registration.apply_money)}}</div>
+            <div style="grid-area: tb8-3;font-weight: 600" class="print-table1-grid-center">
+              {{priceFormat(registration.apply_money)}}</div>
             <div style="grid-area: tb8-4;padding-left: 0.6vw;display: block;">
               <div style="display: flex;align-items: center;">
                 <div><span v-if="registration.type == '进度款'">✔</span>进度款</div>
@@ -42,23 +52,29 @@
               </div>
               <div style="display: flex;align-items: center;">
                 <div><span v-if="registration.type == '质保金'">✔</span>质保金</div>
-                <div style="height: 1.8vw;min-width: 6vw;border-bottom: 2px #000 solid;margin-left: 2vw;font-size: 15px;">
+                <div
-                  <span v-if="registration.type!='进度款'&&registration.type!='质保金'&&registration.type!='结算款'">✔ {{registration.type}} </span>
+                  style="height: 1.8vw;min-width: 6vw;border-bottom: 2px #000 solid;margin-left: 2vw;font-size: 15px;">
+                  <span v-if="registration.type!='进度款'&&registration.type!='质保金'&&registration.type!='结算款'">✔
+                    {{registration.type}} </span>
                 </div>
                 <div>（其他）</div>
               </div>
             </div>
             <div style="grid-area: tb9-1" class="print-table1-grid-center">F</div>
             <div style="grid-area: tb9-2" class="print-table1-grid-center">累计支付</div>
-            <div style="grid-area: tb9-3" class="print-table1-grid-center">{{priceFormat(Number(registration.total_act_money)+Number(registration.apply_money))}}</div>
+            <div style="grid-area: tb9-3" class="print-table1-grid-center">
+              {{priceFormat(Number(registration.total_act_money)+Number(registration.apply_money))}}</div>
             <div style="grid-area: tb9-4"></div>
             <div style="grid-area: tb10-1" class="print-table1-grid-center">G</div>
             <div style="grid-area: tb10-2" class="print-table1-grid-center">累计扣款</div>
-            <div style="grid-area: tb10-3" class="print-table1-grid-center">{{priceFormat(Number(registration.total_discount_money)+Number(registration.discount_money))}}</div>
+            <div style="grid-area: tb10-3" class="print-table1-grid-center">
+              {{priceFormat(Number(registration.total_discount_money)+Number(registration.discount_money))}}</div>
             <div style="grid-area: tb10-4"></div>
             <div style="grid-area: tb11-1" class="print-table1-grid-center">H</div>
             <div style="grid-area: tb11-2" class="print-table1-grid-center">质保金</div>
-            <div style="grid-area: tb11-3;align-items: center;">{{guaranteeRate(registration.contract.guarantee_money,registration.contract.money)}}%，质保期{{registration.contract.guarantee_year}}年，需审计的以审计价为计费依据。</div>
+            <div style="grid-area: tb11-3;align-items: center;">
+              {{guaranteeRate(registration.contract.guarantee_money,registration.contract.money)}}%，质保期{{registration.contract.guarantee_year}}年，需审计的以审计价为计费依据。
+            </div>
 
             <div style="grid-area: tb12" class="print-table1-grid-bottom1">
               资金列支渠道：{{moneyWayFormat(registration.money_way_detail)}}
@@ -77,7 +93,8 @@
             <div style="grid-area: tb14-3;" class="print-table1-grid-bottom3">单位负责人：</div>
           </div>
 
-          <div style="text-align: right;padding-top: 0.3vw;font-size: 1.5vw;">打印时间：{{new Date().getFullYear()}}.{{new Date().getMonth()+1}}.{{new Date().getDate()}}</div>
+          <div style="text-align: right;padding-top: 0.3vw;font-size: 1.5vw;">
+            打印时间：{{new Date().getFullYear()}}.{{new Date().getMonth()+1}}.{{new Date().getDate()}}</div>
         </div>
       </template>
     </xy-dialog>
@@ -86,11 +103,17 @@
 </template>
 
 <script>
-import {detailFundLog,getFundLog} from "@/api/paymentRegistration/fundLog"
+  import {
+    detailFundLog,
+    getFundLog
+  } from "@/api/paymentRegistration/fundLog"
 
   import html2canvas from 'html2canvas'
   import * as printJS from "print-js";
-import {parseTime,moneyRecovery} from "@/utils";
+  import {
+    parseTime,
+    moneyRecovery
+  } from "@/utils";
 
   export default {
     data() {
@@ -113,9 +136,14 @@ export default {
       },
 
       async getDetailFundLog(id) {
-      let res = await detailFundLog({id})
+        let res = await detailFundLog({
+          id
+        })
         this.registration = res
-      let res1 = await getFundLog({contract_id:this.registration.contract.id})
+        let res1 = await getFundLog({
+          page_size: 999,
+          contract_id: this.registration.contract.id
+        })
         if (res1.data.length > 0) {
           res1.data.map(item => {
             this.beforeTotalMoney += Number(item.act_money)
@@ -171,6 +199,7 @@ export default {
 <style scoped lang="scss">
   .print-table1 {
     box-sizing: border-box;
+
     &-title {
       font-size: 2vw;
       letter-spacing: 2px;
@@ -208,16 +237,19 @@ export default {
         display: flex;
 
       }
+
       &-top {
 
         padding: 0.4vw 0 3.6vw 0.4vw;
       }
+
       &-title1 {
         text-align: center;
         justify-content: center;
 
         padding: 0.2vw 0;
       }
+
       &-center {
         text-align: center;
         justify-content: center;
@@ -225,19 +257,21 @@ export default {
 
         padding: 1vw 0;
       }
+
       &-bottom1 {
 
         padding: 0.4vw 0 4vw 0.4vw;
       }
+
       &-bottom2 {
 
         padding: 0.4vw 0 4vw 0.4vw;
       }
+
       &-bottom3 {
 
         padding: 0.4vw 0 6vw 0.4vw;
       }
     }
   }
-
 </style>