Merge remote-tracking branch 'origin/main'

SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/controller/PaymentdocController.java

@@ -207,6 +207,8 @@ public class PaymentdocController {
             //修改采购订单为已付款申请
             PurchaseorderEntity purchaseorderEntity = purchaseorderService.getById(entitys.getPurchaseorderId());
             purchaseorderEntity.setIsPayment("1");
+            int sum = purchaseorderEntity.getPaymentTime() + 1;
+            purchaseorderEntity.setPaymentTime(sum);
             purchaseorderService.updateById(purchaseorderEntity);
         }
         List<PaymentdocItem1Entity> PaymentdocItem1List = JsonUtil.getJsonToList(paymentdocCrForm.getPaymentdocitem1List(),PaymentdocItem1Entity.class);

SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/entity/PurchaseorderEntity.java

@@ -148,4 +148,7 @@ public class PurchaseorderEntity  {
     @TableField("is_payment")
     private String isPayment;
 
+    @TableField("PAYMENT_TIME")
+    private Integer paymentTime;
+
 }

SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/PurchaseorderitemEntity.java

@@ -155,6 +155,9 @@ public class PurchaseorderitemEntity {
     @TableField("IS_PAYMENT")
     private String isPayment;
 
+    @TableField("PAYMENT_TIME")
+    private Integer paymentTime;
+
     @TableField(exist = false)
     private List<PoundlistEntity> poundlistEntityList;
     @TableField(exist = false)

SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderInfoVO.java

@@ -126,6 +126,9 @@ public class PurchaseorderInfoVO{
         @JsonProperty("isPayment")
         private String isPayment;
 
+        @JsonProperty("paymentTime")
+        private String paymentTime;
+
         /** 子表数据 **/
         @JsonProperty("purchaseorder_item0List")
         private List<Purchaseorder_item0Model> purchaseorder_item0List;

SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderListVO.java

@@ -136,6 +136,9 @@ public class PurchaseorderListVO{
     @JsonProperty("isPayment")
     private String isPayment;
 
+    @JsonProperty("paymentTime")
+    private String paymentTime;
+
     @JsonProperty("poundlistEntityList")
     private List<PoundlistEntity> poundlistEntityList;
 }

SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderUpForm.java

@@ -2,6 +2,7 @@
 
 package jnpf.purchaseorder.model.purchaseorder;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import jnpf.payment.model.payment.PaymentListVO;
 import jnpf.purchaseback.entity.PurchasebackEntity;
 import jnpf.purchaseorder.model.purchaseorder.Purchaseorder_item0Model;
@@ -119,6 +120,9 @@ public class PurchaseorderUpForm{
     @JsonProperty("status")
     private String status;
 
+    @JsonProperty("paymentTime")
+    private String paymentTime;
+
     /** 子表数据 **/
     @JsonProperty("purchaseorder_item0List")
     private List<Purchaseorder_item0Model> purchaseorder_item0List;

SC-web/src/views/scm/basicInformation/natural/index.vue

@@ -82,6 +82,12 @@
               v-has="'btn_download'"
               >导出
             </el-button>
+            <!-- <el-button
+              type="text"
+              icon="el-icon-download"
+              @click="printData()"
+              >打印
+            </el-button> -->
             <el-button
               type="text"
               icon="el-icon-delete"
@@ -109,6 +115,7 @@
           @selection-change="handleSelectionChange"
           border
           custom-column
+          id="table-data"
         >
           <el-table-column type="index" fixed="left" width="1" />
           <el-table-column
@@ -200,6 +207,7 @@
       ref="Detail"
       @refresh="detailVisible = false"
     />
+    <iframe width="0" height="0" frameborder="0" id="iframe-spr">cs</iframe>
   </div>
 </template>
 
@@ -429,6 +437,13 @@ export default {
       }
       this.search();
     },
+    printData(){
+      let printHtml = document.getElementById('table-data').innerHTML;
+      let sysPrint = document.getElementById('iframe-spr');
+      sysPrint.contentDocument.body.innerHTML = printHtml;
+      sysPrint.contentDocument.execCommand('Print');
+      //window.print();
+    }
   },
 };
 </script>

SC-web/src/views/scm/basicInformation/purchaseorder/index.vue

@@ -284,7 +284,7 @@
             </template>
           </el-table-column>
           <el-table-column
-            label="是否付款申请"
+            label="付款申请中"
             sortable
             width="130"
             prop="isPayment"
@@ -333,6 +333,13 @@
             width="150"
             align="center"
           />
+          <el-table-column
+            prop="paymentTime"
+            label="申请次数"
+            sortable
+            width="150"
+            align="center"
+          />
           <el-table-column
             prop="creatorTime"
             label="制单时间"