From dbb9b8435ec49d20f89d2a770f6038a9199710ad Mon Sep 17 00:00:00 2001
From: tengxi <971623072@qq.com>
Date: Thu, 9 Feb 2023 17:15:50 +0800
Subject: [PATCH] 1

---
 .../controller/PaymentdocController.java      | 117 +++++++--
 .../paymentdoc/entity/PaymentdocEntity.java   |   5 +-
 .../entity/Paymentdoc_item0Entity.java        |  37 +--
 .../paymentdoc/mapper/PaymentdocMapper.java   |   2 +-
 .../mapper/Paymentdoc_item0Mapper.java        |   2 +-
 .../model/paymentdoc/PaymentdocCrForm.java    |  42 ++-
 .../model/paymentdoc/PaymentdocInfoVO.java    |  42 ++-
 .../model/paymentdoc/PaymentdocListQuery.java |   5 +-
 .../model/paymentdoc/PaymentdocListVO.java    |  47 +++-
 .../paymentdoc/PaymentdocPagination.java      |   5 +-
 .../PaymentdocPaginationExportModel.java      |   5 +-
 .../model/paymentdoc/PaymentdocUpForm.java    |  46 +++-
 .../paymentdoc/Paymentdoc_item0Model.java     |  60 +++--
 .../paymentdoc/service/PaymentdocService.java |   2 +-
 .../service/Paymentdoc_item0Service.java      |   2 +-
 .../service/impl/PaymentdocServiceImpl.java   |  12 +-
 .../impl/Paymentdoc_item0ServiceImpl.java     |   2 +-
 .../basicInformation/paymentdoc/Detail.vue    | 142 ++++++-----
 .../scm/basicInformation/paymentdoc/Form.vue  | 240 ++++++++++--------
 .../scm/basicInformation/paymentdoc/index.vue |  86 +++++--
 20 files changed, 589 insertions(+), 312 deletions(-)

diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/controller/PaymentdocController.java b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/controller/PaymentdocController.java
index 81a00832..7682cb7f 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/controller/PaymentdocController.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/controller/PaymentdocController.java
@@ -13,13 +13,17 @@ import jnpf.base.vo.PageListVO;
 import jnpf.base.vo.PaginationVO;
 import jnpf.base.UserInfo;
 import jnpf.base.vo.DownloadVO;
+import jnpf.collection.entity.CollectionEntity;
+import jnpf.collection.service.CollectionService;
 import jnpf.config.ConfigValueUtil;
 import jnpf.exception.DataException;
+import jnpf.payment.entity.PaymentEntity;
+import jnpf.payment.service.PaymentService;
 import org.springframework.transaction.annotation.Transactional;
 import jnpf.base.entity.ProvinceEntity;
 import jnpf.paymentdoc.model.paymentdoc.*;
-
-import jnpf.paymentdoc.entity.*;
+import jnpf.paymentdoc.model.paymentdoc.PaymentdocPagination;
+import jnpf.entity.*;
 import jnpf.paymentdoc.entity.Paymentdoc_item0Entity;
 import jnpf.util.*;
 import jnpf.base.util.*;
@@ -55,12 +59,12 @@ import jnpf.util.enums.FileTypeEnum;
  * @版本： V3.2.0
  * @版权： LINKAGE-BOOT
  * @作者： LINKAGE-BOOT研发团队
- * @日期： 2023-01-14
+ * @日期： 2023-02-09
  */
 @Slf4j
 @RestController
-@Api(tags = "paymentdoc" , value = "paymentdoc")
-@RequestMapping("/api/paymentdoc/Paymentdoc")
+@Api(tags = "paymentdoc" , value = "example")
+@RequestMapping("/api/example/Paymentdoc")
 public class PaymentdocController {
 
     @Autowired
@@ -77,6 +81,34 @@ public class PaymentdocController {
 
     @Autowired
     private Paymentdoc_item0Service paymentdoc_item0Service;
+    @Autowired
+    private PaymentService paymentService;
+
+    /**
+     * 付款申请
+     *
+     * @param
+     * @return
+     */
+//    @PostMapping("/paymentapplylist")
+//    public ActionResult paymentapplylist( @PathVariable("id") String id,@RequestBody @Valid PaymentdocCrForm paymentdocCrForm){
+//
+//        PaymentEntity paymentEntity = new PaymentEntity();
+//        String mainId =RandomUtil.uuId();
+//        UserInfo userInfo=userProvider.get();
+//
+//        paymentEntity.setCreatorUserName(paymentdocCrForm.getCreatorUserName());
+//        paymentEntity.setCreatorTime(new Date());
+//
+//        PaymentEntity entity = JsonUtil.getJsonToBean(paymentEntity, PaymentEntity.class);
+//        entity.setId(mainId);
+//        paymentService.save(entity);
+//
+//
+//        paymentdocCrForm.setIsPay("1");
+//        paymentdocService.update(paymentdocCrForm);
+//            return ActionResult.success("创建成功");
+//    }
 
 
 
@@ -91,7 +123,11 @@ public class PaymentdocController {
         List<PaymentdocEntity> list= paymentdocService.getList(paymentdocPagination);
         //处理id字段转名称，若无需转或者为空可删除
     for(PaymentdocEntity entity:list){
-
+						Map<String,Object> supplierNameMap = new HashMap<>();
+            entity.setSupplierName(generaterSwapUtil.getPopupSelectValue("393307526961100037","supplier_name","supplier_name",entity.getSupplierName(),supplierNameMap));
+            entity.setCreatorUserName(generaterSwapUtil.userSelectValue(entity.getCreatorUserName()));
+//            entity.setCreatorTime(generaterSwapUtil.userSelectValue(entity.getCreatorTime()));
+            entity.setLastModifyUserName(generaterSwapUtil.userSelectValue(entity.getLastModifyUserName()));
     }
 	List<PaymentdocListVO> listVO=JsonUtil.getJsonToList(list,PaymentdocListVO.class);
     for(PaymentdocListVO paymentdocVO:listVO){
@@ -117,6 +153,9 @@ public class PaymentdocController {
     public ActionResult create(@RequestBody @Valid PaymentdocCrForm paymentdocCrForm) throws DataException {
         String mainId =RandomUtil.uuId();
         UserInfo userInfo=userProvider.get();
+        paymentdocCrForm.setDocumentNo(generaterSwapUtil.getBillNumber("fukuanshenqing", false));
+        paymentdocCrForm.setCreatorUserName(userInfo.getUserId());
+        paymentdocCrForm.setCreatorTime(userInfo.getUserId());
         PaymentdocEntity entity = JsonUtil.getJsonToBean(paymentdocCrForm, PaymentdocEntity.class);
 				entity.setId(mainId);
                 paymentdocService.save(entity);
@@ -130,6 +169,12 @@ public class PaymentdocController {
 
 
 
+
+
+
+
+
+
                 paymentdoc_item0Service.save(entitys);
             }
 
@@ -173,6 +218,11 @@ public class PaymentdocController {
         List<PaymentdocEntity> list=  paymentdocService.getTypeList(paymentdocPagination,paymentdocPaginationExportModel.getDataType());
         //处理id字段转名称，若无需转或者为空可删除
     for(PaymentdocEntity entity:list){
+						Map<String,Object> supplierNameMap = new HashMap<>();
+            entity.setSupplierName(generaterSwapUtil.getPopupSelectValue("393307526961100037","supplier_name","supplier_name",entity.getSupplierName(),supplierNameMap));
+            entity.setCreatorUserName(generaterSwapUtil.userSelectValue(entity.getCreatorUserName()));
+//            entity.setCreatorTime(generaterSwapUtil.userSelectValue(entity.getCreatorTime()));
+            entity.setLastModifyUserName(generaterSwapUtil.userSelectValue(entity.getLastModifyUserName()));
     }
 	List<PaymentdocListVO> listVO=JsonUtil.getJsonToList(list,PaymentdocListVO.class);
     for(PaymentdocListVO paymentdocVO:listVO){
@@ -196,7 +246,13 @@ public class PaymentdocController {
                     entitys.add(new ExcelExportEntity("单据编号" ,"documentNo"));
                     break;
                     case "businessDate" :
-                    entitys.add(new ExcelExportEntity("业务日期 " ,"businessDate"));
+                    entitys.add(new ExcelExportEntity("申请时间" ,"businessDate"));
+                    break;
+                    case "supplierName" :
+                    entitys.add(new ExcelExportEntity("供应商名称" ,"supplierName"));
+                    break;
+                    case "paymentType" :
+                    entitys.add(new ExcelExportEntity("付款类型" ,"paymentType"));
                     break;
                     case "ramount" :
                     entitys.add(new ExcelExportEntity("申请金额" ,"ramount"));
@@ -204,8 +260,8 @@ public class PaymentdocController {
                     case "dueDate" :
                     entitys.add(new ExcelExportEntity("应付日期" ,"dueDate"));
                     break;
-                    case "paymentType" :
-                    entitys.add(new ExcelExportEntity("付款类型 " ,"paymentType"));
+                    case "currency" :
+                    entitys.add(new ExcelExportEntity("币别 " ,"currency"));
                     break;
                     case "collectionAccount" :
                     entitys.add(new ExcelExportEntity("收款账户" ,"collectionAccount"));
@@ -214,10 +270,7 @@ public class PaymentdocController {
                     entitys.add(new ExcelExportEntity("收款银行" ,"colectionBank"));
                     break;
                     case "settlementType" :
-                    entitys.add(new ExcelExportEntity("结算类型 " ,"settlementType"));
-                    break;
-                    case "currency" :
-                    entitys.add(new ExcelExportEntity("币别 " ,"currency"));
+                    entitys.add(new ExcelExportEntity("结算类型" ,"settlementType"));
                     break;
                     case "remark" :
                     entitys.add(new ExcelExportEntity("备注" ,"remark"));
@@ -234,6 +287,15 @@ public class PaymentdocController {
                     case "creatorUserName" :
                     entitys.add(new ExcelExportEntity("制单人" ,"creatorUserName"));
                     break;
+                    case "creatorTime" :
+                    entitys.add(new ExcelExportEntity("创建时间" ,"creatorTime"));
+                    break;
+                    case "lastModifyUserName" :
+                    entitys.add(new ExcelExportEntity("修改人名称" ,"lastModifyUserName"));
+                    break;
+                    case "lastModifyTime" :
+                    entitys.add(new ExcelExportEntity("修改时间" ,"lastModifyTime"));
+                    break;
             default:
                     break;
                     }
@@ -297,6 +359,12 @@ public class PaymentdocController {
     public ActionResult<PaymentdocInfoVO> info(@PathVariable("id") String id){
         PaymentdocEntity entity= paymentdocService.getInfo(id);
         PaymentdocInfoVO vo=JsonUtil.getJsonToBean(entity, PaymentdocInfoVO.class);
+         vo.setCreatorUserName(generaterSwapUtil.userSelectValue(vo.getCreatorUserName()));
+         vo.setCreatorTime(generaterSwapUtil.userSelectValue(vo.getCreatorTime()));
+         vo.setLastModifyUserName(generaterSwapUtil.userSelectValue(vo.getLastModifyUserName()));
+        if(vo.getLastModifyTime()!=null){
+            vo.setLastModifyTime(vo.getLastModifyTime());
+        }
 
     //子表
 		List<Paymentdoc_item0Entity> Paymentdoc_item0List = paymentdocService.GetPaymentdoc_item0List(id);
@@ -322,14 +390,19 @@ public class PaymentdocController {
 		List<Paymentdoc_item0Entity> jg_paymentdoc_item0List = paymentdocService.GetPaymentdoc_item0List(id);
 		List<Paymentdoc_item0Model> jg_paymentdoc_item0ModelList = JsonUtil.getJsonToList(jg_paymentdoc_item0List,Paymentdoc_item0Model.class);
 		for(Paymentdoc_item0Model jg_paymentdoc_item0Model : jg_paymentdoc_item0ModelList){
-            Map<String,Object> orderIdMap = new HashMap<>();
-            jg_paymentdoc_item0Model.setOrderId(generaterSwapUtil.getPopupSelectValue("383149471917185157","id","document_no",jg_paymentdoc_item0Model.getOrderId(),orderIdMap));
-        }
+								Map<String,Object> purchaseorderIdMap = new HashMap<>();
+                jg_paymentdoc_item0Model.setPurchaseorderId(generaterSwapUtil.getPopupSelectValue("393348986343324485","id","document_no",jg_paymentdoc_item0Model.getPurchaseorderId(),purchaseorderIdMap));
+    }
 		vo.setPaymentdoc_item0List(jg_paymentdoc_item0ModelList);
 
  //附表数据转换
 
 //添加到详情表单对象中
+						Map<String,Object> supplierNameMap = new HashMap<>();
+            vo.setSupplierName(generaterSwapUtil.getPopupSelectValue("393307526961100037","supplier_name","supplier_name",vo.getSupplierName(),supplierNameMap));
+            vo.setCreatorUserName(generaterSwapUtil.userSelectValue(vo.getCreatorUserName()));
+            vo.setCreatorTime(generaterSwapUtil.userSelectValue(vo.getCreatorTime()));
+            vo.setLastModifyUserName(generaterSwapUtil.userSelectValue(vo.getLastModifyUserName()));
 
         return ActionResult.success(vo);
 		}
@@ -349,9 +422,11 @@ public class PaymentdocController {
         UserInfo userInfo=userProvider.get();
         PaymentdocEntity entity= paymentdocService.getInfo(id);
         if(entity!=null){
+                paymentdocUpForm.setLastModifyUserName(userInfo.getUserId());
+                paymentdocUpForm.setLastModifyTime(DateUtil.getNow());
             PaymentdocEntity subentity=JsonUtil.getJsonToBean(paymentdocUpForm, PaymentdocEntity.class);
-            subentity.setCreatorTime(entity.getCreatorTime());
-            subentity.setCreatorUserName(entity.getCreatorUserName());
+					subentity.setCreatorUserName(entity.getCreatorUserName());
+					subentity.setCreatorTime(entity.getCreatorTime());
             paymentdocService.update(id, subentity);
 
             QueryWrapper<Paymentdoc_item0Entity> Paymentdoc_item0queryWrapper = new QueryWrapper<>();
@@ -366,6 +441,12 @@ public class PaymentdocController {
 
 
 
+
+
+
+
+
+
                 entitys.setId(RandomUtil.uuId());
                 entitys.setPaymentdocId(entity.getId());
                 paymentdoc_item0Service.save(entitys);
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/entity/PaymentdocEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/entity/PaymentdocEntity.java
index d8b790bd..cf6c10b9 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/entity/PaymentdocEntity.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/entity/PaymentdocEntity.java
@@ -19,7 +19,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  * @版本： V3.2.0
  * @版权： LINKAGE-BOOT
  * @作者： LINKAGE-BOOT研发团队
- * @日期： 2023-01-14
+ * @日期： 2023-02-09
  */
 @Data
 @TableName("jg_paymentdoc")
@@ -115,4 +115,7 @@ public class PaymentdocEntity  {
     @TableField("COLECTION_BANK")
     private String colectionBank;
 
+    @TableField("IS_PAY")
+    private String isPay;
+
 }
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/entity/Paymentdoc_item0Entity.java b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/entity/Paymentdoc_item0Entity.java
index 587f2ec5..cdc1a985 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/entity/Paymentdoc_item0Entity.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/entity/Paymentdoc_item0Entity.java
@@ -8,10 +8,6 @@ import lombok.Data;
 
 import java.util.Date;
 import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 
@@ -21,7 +17,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  * @版本： V3.2.0
  * @版权： LINKAGE-BOOT
  * @作者： LINKAGE-BOOT研发团队
- * @日期： 2023-01-14
+ * @日期： 2023-02-09
  */
 @Data
 @TableName("jg_paymentdoc_item0")
@@ -69,37 +65,10 @@ public class Paymentdoc_item0Entity  {
     @TableField("PAYMENTDOC_ID")
     private String paymentdocId;
 
-    @TableField("ORDER_ID")
-    private String orderId;
-
-    @TableField("CAR_NUMBER")
-    private String carNumber;
-
-    @TableField("MATERIAL_NAME")
-    private String materialName;
-
-    @TableField("QUANTITY")
-    private BigDecimal quantity;
-
-    @TableField("PURCHASE_PRICE")
-    private BigDecimal purchasePrice;
-
-    @TableField("TAX_RATE")
-    private String taxRate;
+    @TableField("PURCHASEORDER_ID")
+    private String purchaseorderId;
 
     @TableField("AMOUNT")
     private BigDecimal amount;
 
-    @TableField("AMOUNT_NOT_TAX")
-    private BigDecimal amountNotTax;
-
-    @TableField("TAX_AMOUNT")
-    private BigDecimal taxAmount;
-
-    @TableField("REMARK")
-    private String remark;
-
-    @TableField("IS_PAY")
-    private String isPay;
-
 }
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/mapper/PaymentdocMapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/mapper/PaymentdocMapper.java
index bd47085d..5239f82a 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/mapper/PaymentdocMapper.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/mapper/PaymentdocMapper.java
@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * 版本： V3.2.0
  * 版权： LINKAGE-BOOT
  * 作者： LINKAGE-BOOT研发团队
- * 日期： 2023-01-14
+ * 日期： 2023-02-09
  */
 public interface PaymentdocMapper extends BaseMapper<PaymentdocEntity> {
 
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/mapper/Paymentdoc_item0Mapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/mapper/Paymentdoc_item0Mapper.java
index 4e5b7d60..1fc04fc0 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/mapper/Paymentdoc_item0Mapper.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/mapper/Paymentdoc_item0Mapper.java
@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * 版本： V3.2.0
  * 版权： LINKAGE-BOOT
  * 作者： LINKAGE-BOOT研发团队
- * 日期： 2023-01-14
+ * 日期： 2023-02-09
  */
 public interface Paymentdoc_item0Mapper extends BaseMapper<Paymentdoc_item0Entity> {
 
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocCrForm.java b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocCrForm.java
index ba8c0ea2..e80504de 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocCrForm.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocCrForm.java
@@ -2,6 +2,7 @@
 
 package jnpf.paymentdoc.model.paymentdoc;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import jnpf.paymentdoc.model.paymentdoc.Paymentdoc_item0Model;
 import lombok.Data;
 import java.util.List;
@@ -15,7 +16,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  * @版本： V3.2.0
  * @版权： LINKAGE-BOOT
  * @作者： LINKAGE-BOOT研发团队
- * @日期： 2023-01-14
+ * @日期： 2023-02-09
  */
 @Data
 public class PaymentdocCrForm  {
@@ -24,9 +25,17 @@ public class PaymentdocCrForm  {
     @JsonProperty("documentNo")
     private String documentNo;
 
-    /** 业务日期  **/
+    /** 申请时间 **/
     @JsonProperty("businessDate")
-    private Long businessDate;
+    private Long  businessDate;
+
+    /** 供应商名称 **/
+    @JsonProperty("supplierName")
+    private String supplierName;
+
+    /** 付款类型 **/
+    @JsonProperty("paymentType")
+    private String paymentType;
 
     /** 申请金额 **/
     @JsonProperty("ramount")
@@ -36,9 +45,9 @@ public class PaymentdocCrForm  {
     @JsonProperty("dueDate")
     private Long  dueDate;
 
-    /** 付款类型  **/
-    @JsonProperty("paymentType")
-    private String paymentType;
+    /** 币别  **/
+    @JsonProperty("currency")
+    private String currency;
 
     /** 收款账户 **/
     @JsonProperty("collectionAccount")
@@ -48,14 +57,10 @@ public class PaymentdocCrForm  {
     @JsonProperty("colectionBank")
     private String colectionBank;
 
-    /** 结算类型  **/
+    /** 结算类型 **/
     @JsonProperty("settlementType")
     private String settlementType;
 
-    /** 币别  **/
-    @JsonProperty("currency")
-    private String currency;
-
     /** 备注 **/
     @JsonProperty("remark")
     private String remark;
@@ -76,9 +81,22 @@ public class PaymentdocCrForm  {
     @JsonProperty("creatorUserName")
     private String creatorUserName;
 
+    /** 创建时间 **/
+    @JsonProperty("creatorTime")
+    private String creatorTime;
+
+    /** 修改人名称 **/
+    @JsonProperty("lastModifyUserName")
+    private String lastModifyUserName;
+
+    /** 修改时间 **/
+    @JsonProperty("lastModifyTime")
+    private String lastModifyTime;
+
 	/** 子表数据 **/
 	@JsonProperty("paymentdoc_item0List")
 	private List<Paymentdoc_item0Model> paymentdoc_item0List;
 
-
+    @JsonProperty("isPay")
+    private String isPay;
 }
\ No newline at end of file
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocInfoVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocInfoVO.java
index a7e77e1b..744641a4 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocInfoVO.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocInfoVO.java
@@ -16,7 +16,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
  * @版本： V3.2.0
  * @版权： LINKAGE-BOOT
  * @作者： LINKAGE-BOOT研发团队
- * @日期： 2023-01-14
+ * @日期： 2023-02-09
  */
 @Data
 public class PaymentdocInfoVO{
@@ -28,9 +28,17 @@ public class PaymentdocInfoVO{
         @JsonProperty("documentNo")
         private String documentNo;
 
-        /** 业务日期  **/
+        /** 申请时间 **/
         @JsonProperty("businessDate")
-        private Long businessDate;
+        private Long  businessDate;
+
+        /** 供应商名称 **/
+        @JsonProperty("supplierName")
+        private String supplierName;
+
+        /** 付款类型 **/
+        @JsonProperty("paymentType")
+        private String paymentType;
 
         /** 申请金额 **/
         @JsonProperty("ramount")
@@ -40,9 +48,9 @@ public class PaymentdocInfoVO{
         @JsonProperty("dueDate")
         private Long  dueDate;
 
-        /** 付款类型  **/
-        @JsonProperty("paymentType")
-        private String paymentType;
+        /** 币别  **/
+        @JsonProperty("currency")
+        private String currency;
 
         /** 收款账户 **/
         @JsonProperty("collectionAccount")
@@ -52,14 +60,10 @@ public class PaymentdocInfoVO{
         @JsonProperty("colectionBank")
         private String colectionBank;
 
-        /** 结算类型  **/
+        /** 结算类型 **/
         @JsonProperty("settlementType")
         private String settlementType;
 
-        /** 币别  **/
-        @JsonProperty("currency")
-        private String currency;
-
         /** 备注 **/
         @JsonProperty("remark")
         private String remark;
@@ -80,7 +84,23 @@ public class PaymentdocInfoVO{
         @JsonProperty("creatorUserName")
         private String creatorUserName;
 
+        /** 创建时间 **/
+        @JsonProperty("creatorTime")
+        private String creatorTime;
+
+        /** 修改人名称 **/
+        @JsonProperty("lastModifyUserName")
+        private String lastModifyUserName;
+
+        /** 修改时间 **/
+        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+        @JsonProperty("lastModifyTime")
+        private Date  lastModifyTime;
+
         /** 子表数据 **/
         @JsonProperty("paymentdoc_item0List")
         private List<Paymentdoc_item0Model> paymentdoc_item0List;
+
+        @JsonProperty("isPay")
+        private String isPay;
 }
\ No newline at end of file
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocListQuery.java b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocListQuery.java
index 286f9d87..7aaf2ea3 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocListQuery.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocListQuery.java
@@ -10,13 +10,16 @@ import java.util.List;
  * @版本： V3.2.0
  * @版权： LINKAGE-BOOT
  * @作者： LINKAGE-BOOT研发团队
- * @日期： 2023-01-14
+ * @日期： 2023-02-09
  */
 @Data
 public class PaymentdocListQuery extends Pagination {
 
         /** 单据编号 */
         private String documentNo;
+
+        /** 单据状态  */
+        private String status;
 	/**
     * 菜单id
     */
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocListVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocListVO.java
index 710d2070..52ad5150 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocListVO.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocListVO.java
@@ -15,7 +15,7 @@ import java.math.BigDecimal;
  * @版本： V3.2.0
  * @版权： LINKAGE-BOOT
  * @作者： LINKAGE-BOOT研发团队
- * @日期： 2023-01-14
+ * @日期： 2023-02-09
  */
 @Data
 public class PaymentdocListVO{
@@ -29,9 +29,20 @@ public class PaymentdocListVO{
     private String documentNo;
 
 
-    /** 业务日期  **/
+    /** 申请时间 **/
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     @JsonProperty("businessDate")
-    private Date businessDate;
+    private Date  businessDate;
+
+
+    /** 供应商名称 **/
+    @JsonProperty("supplierName")
+    private String supplierName;
+
+
+    /** 付款类型 **/
+    @JsonProperty("paymentType")
+    private String paymentType;
 
 
     /** 申请金额 **/
@@ -45,9 +56,9 @@ public class PaymentdocListVO{
     private Date  dueDate;
 
 
-    /** 付款类型  **/
-    @JsonProperty("paymentType")
-    private String paymentType;
+    /** 币别  **/
+    @JsonProperty("currency")
+    private String currency;
 
 
     /** 收款账户 **/
@@ -60,16 +71,11 @@ public class PaymentdocListVO{
     private String colectionBank;
 
 
-    /** 结算类型  **/
+    /** 结算类型 **/
     @JsonProperty("settlementType")
     private String settlementType;
 
 
-    /** 币别  **/
-    @JsonProperty("currency")
-    private String currency;
-
-
     /** 备注 **/
     @JsonProperty("remark")
     private String remark;
@@ -95,4 +101,21 @@ public class PaymentdocListVO{
     private String creatorUserName;
 
 
+    /** 创建时间 **/
+    @JsonProperty("creatorTime")
+    private String creatorTime;
+
+
+    /** 修改人名称 **/
+    @JsonProperty("lastModifyUserName")
+    private String lastModifyUserName;
+
+
+    /** 修改时间 **/
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @JsonProperty("lastModifyTime")
+    private Date  lastModifyTime;
+
+    @JsonProperty("isPay")
+    private String isPay;
 }
\ No newline at end of file
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocPagination.java b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocPagination.java
index 02fe8098..2aee342d 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocPagination.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocPagination.java
@@ -11,13 +11,16 @@ import java.util.List;
  * @版本： V3.2.0
  * @版权： LINKAGE-BOOT
  * @作者： LINKAGE-BOOT研发团队
- * @日期： 2023-01-14
+ * @日期： 2023-02-09
  */
 @Data
 public class PaymentdocPagination extends Pagination {
 
         /** 单据编号 */
         private String documentNo;
+
+        /** 单据状态  */
+        private String status;
 	/**
     * 菜单id
     */
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocPaginationExportModel.java b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocPaginationExportModel.java
index aa511aa6..3ee7b2e9 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocPaginationExportModel.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocPaginationExportModel.java
@@ -9,7 +9,7 @@ import java.util.*;
  * @版本： V3.2.0
  * @版权： LINKAGE-BOOT
  * @作者： LINKAGE-BOOT研发团队
- * @日期： 2023-01-14
+ * @日期： 2023-02-09
  */
 @Data
 public class PaymentdocPaginationExportModel extends Pagination {
@@ -23,4 +23,7 @@ public class PaymentdocPaginationExportModel extends Pagination {
 
 			/** 单据编号 */
     private String documentNo;
+
+			/** 单据状态  */
+    private String status;
 }
\ No newline at end of file
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocUpForm.java b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocUpForm.java
index f8d722dc..ce59e392 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocUpForm.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocUpForm.java
@@ -16,7 +16,7 @@ import lombok.Data;
  * @版本： V3.2.0
  * @版权： LINKAGE-BOOT
  * @作者： LINKAGE-BOOT研发团队
- * @日期： 2023-01-14
+ * @日期： 2023-02-09
  */
 @Data
 public class PaymentdocUpForm{
@@ -29,9 +29,19 @@ public class PaymentdocUpForm{
     private String documentNo;
 
 
-    /** 业务日期  **/
+    /** 申请时间 **/
     @JsonProperty("businessDate")
-    private Long businessDate;
+    private Long  businessDate;
+
+
+    /** 供应商名称 **/
+    @JsonProperty("supplierName")
+    private String supplierName;
+
+
+    /** 付款类型 **/
+    @JsonProperty("paymentType")
+    private String paymentType;
 
 
     /** 申请金额 **/
@@ -44,9 +54,9 @@ public class PaymentdocUpForm{
     private Long  dueDate;
 
 
-    /** 付款类型  **/
-    @JsonProperty("paymentType")
-    private String paymentType;
+    /** 币别  **/
+    @JsonProperty("currency")
+    private String currency;
 
 
     /** 收款账户 **/
@@ -59,16 +69,11 @@ public class PaymentdocUpForm{
     private String colectionBank;
 
 
-    /** 结算类型  **/
+    /** 结算类型 **/
     @JsonProperty("settlementType")
     private String settlementType;
 
 
-    /** 币别  **/
-    @JsonProperty("currency")
-    private String currency;
-
-
     /** 备注 **/
     @JsonProperty("remark")
     private String remark;
@@ -93,8 +98,25 @@ public class PaymentdocUpForm{
     @JsonProperty("creatorUserName")
     private String creatorUserName;
 
+
+    /** 创建时间 **/
+    @JsonProperty("creatorTime")
+    private String creatorTime;
+
+
+    /** 修改人名称 **/
+    @JsonProperty("lastModifyUserName")
+    private String lastModifyUserName;
+
+
+    /** 修改时间 **/
+    @JsonProperty("lastModifyTime")
+    private String lastModifyTime;
+
     /** 子表数据 **/
     @JsonProperty("paymentdoc_item0List")
     private List<Paymentdoc_item0Model> paymentdoc_item0List;
 
+    @JsonProperty("isPay")
+    private String isPay;
 }
\ No newline at end of file
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/Paymentdoc_item0Model.java b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/Paymentdoc_item0Model.java
index be60858c..b09cfcf4 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/Paymentdoc_item0Model.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/Paymentdoc_item0Model.java
@@ -13,36 +13,58 @@ import com.alibaba.fastjson.annotation.JSONField;
  * 版本： V3.2.0
  * 版权: LINKAGE-BOOT
  * 作者： LINKAGE-BOOT研发团队
- * 日期： 2023-01-14
+ * 日期： 2023-02-09
  */
 @Data
 public class Paymentdoc_item0Model  {
 
-    /** 采购订单行id **/
-    @JsonProperty("orderId")
-    private String orderId;
-
-    /** 金额 **/
+    /** 申请金额 **/
     @JsonProperty("amount")
     private String amount;
 
-    /** 数量 **/
-    @JsonProperty("quantity")
-    private String quantity;
+    /** 订单金额 **/
+    @JsonProperty("creatorUserId")
+    private String creatorUserId;
+
+    /** 已付金额 **/
+    @JsonProperty("creatorUserName")
+    private String creatorUserName;
+
+    /** 订单编号 **/
+    @JsonProperty("purchaseorderId")
+    private String purchaseorderId;
+
+    /** 合同编号 **/
+    @JsonProperty("lastModifyUserId")
+    private String lastModifyUserId;
+
+    /** 重量 **/
+    @JsonProperty("lastModifyUserName")
+    private String lastModifyUserName;
 
-    /** 税率  **/
-    @JsonProperty("taxRate")
-    private String taxRate;
+    /** 税率(%) **/
+    @JsonProperty("deleteMark")
+    private String deleteMark;
+
+    /** 垫资金额 **/
+    @JsonProperty("departmentId")
+    private String departmentId;
 
     /** 税额 **/
-    @JsonProperty("taxAmount")
-    private String taxAmount;
+    @JsonProperty("orgnizeId")
+    private String orgnizeId;
 
     /** 不含税金额 **/
-    @JsonProperty("amountNotTax")
-    private String amountNotTax;
+    @JsonProperty("deleteUserId")
+    private String deleteUserId;
+
+    /** 业务类型 **/
+    @JsonProperty("deleteUserName")
+    private String deleteUserName;
+
+    /** 业务日期 **/
+    @JsonProperty("creatorTime")
+    private String creatorTime;
+
 
-    /** 备注信息 **/
-    @JsonProperty("remark")
-    private String remark;
 }
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/service/PaymentdocService.java b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/service/PaymentdocService.java
index 188a0c5d..1444364f 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/service/PaymentdocService.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/service/PaymentdocService.java
@@ -12,7 +12,7 @@ import java.util.*;
  * 版本： V3.2.0
  * 版权： LINKAGE-BOOT
  * 作者： LINKAGE-BOOT研发团队
- * 日期： 2023-01-14
+ * 日期： 2023-02-09
  */
 public interface PaymentdocService extends IService<PaymentdocEntity> {
 
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/service/Paymentdoc_item0Service.java b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/service/Paymentdoc_item0Service.java
index 1fc026a3..890a238a 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/service/Paymentdoc_item0Service.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/service/Paymentdoc_item0Service.java
@@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * 版本： V3.2.0
  * 版权： LINKAGE-BOOT
  * 作者： LINKAGE-BOOT研发团队
- * 日期： 2023-01-14
+ * 日期： 2023-02-09
  */
 public interface Paymentdoc_item0Service extends IService<Paymentdoc_item0Entity> {
 
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/service/impl/PaymentdocServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/service/impl/PaymentdocServiceImpl.java
index c67384ec..56384cbd 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/service/impl/PaymentdocServiceImpl.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/service/impl/PaymentdocServiceImpl.java
@@ -38,7 +38,7 @@ import java.util.*;
  * 版本： V3.2.0
  * 版权： LINKAGE-BOOT
  * 作者： LINKAGE-BOOT研发团队
- * 日期： 2023-01-14
+ * 日期： 2023-02-09
  */
 @Service
 public class PaymentdocServiceImpl extends ServiceImpl<PaymentdocMapper, PaymentdocEntity> implements PaymentdocService{
@@ -114,6 +114,11 @@ public class PaymentdocServiceImpl extends ServiceImpl<PaymentdocMapper, Payment
             paymentdocQueryWrapper.lambda().like(PaymentdocEntity::getDocumentNo,paymentdocPagination.getDocumentNo());
                     }
 
+			if(StringUtil.isNotEmpty(paymentdocPagination.getStatus())){
+            paymentdocNum++;
+                paymentdocQueryWrapper.lambda().eq(PaymentdocEntity::getStatus,paymentdocPagination.getStatus());
+                    }
+
         if(AllIdList.size()>0){
             paymentdocQueryWrapper.lambda().in(PaymentdocEntity::getId, AllIdList);
         }
@@ -198,6 +203,11 @@ public class PaymentdocServiceImpl extends ServiceImpl<PaymentdocMapper, Payment
             paymentdocQueryWrapper.lambda().like(PaymentdocEntity::getDocumentNo,paymentdocPagination.getDocumentNo());
                     }
 
+			if(StringUtil.isNotEmpty(paymentdocPagination.getStatus())){
+            paymentdocNum++;
+                paymentdocQueryWrapper.lambda().eq(PaymentdocEntity::getStatus,paymentdocPagination.getStatus());
+                    }
+
 		if(AllIdList.size()>0){
         paymentdocQueryWrapper.lambda().in(PaymentdocEntity::getId, AllIdList);
 				}
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/service/impl/Paymentdoc_item0ServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/service/impl/Paymentdoc_item0ServiceImpl.java
index fc0b3dc8..a8c53262 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/service/impl/Paymentdoc_item0ServiceImpl.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/service/impl/Paymentdoc_item0ServiceImpl.java
@@ -32,7 +32,7 @@ import java.util.*;
  * 版本： V3.2.0
  * 版权： LINKAGE-BOOT
  * 作者： LINKAGE-BOOT研发团队
- * 日期： 2023-01-14
+ * 日期： 2023-02-09
  */
 @Service
 public class Paymentdoc_item0ServiceImpl extends ServiceImpl<Paymentdoc_item0Mapper, Paymentdoc_item0Entity> implements Paymentdoc_item0Service{
diff --git a/SC-web/src/views/scm/basicInformation/paymentdoc/Detail.vue b/SC-web/src/views/scm/basicInformation/paymentdoc/Detail.vue
index c3cee130..c9882cdf 100644
--- a/SC-web/src/views/scm/basicInformation/paymentdoc/Detail.vue
+++ b/SC-web/src/views/scm/basicInformation/paymentdoc/Detail.vue
@@ -7,99 +7,91 @@
 <el-form ref="elForm" :model="dataForm" size="small" label-width="100px" label-position="right" >
     <template v-if="!loading">
             <el-col :span="8" >
-                <el-form-item  label="单据编号"
+                <el-form-item  label="单据编号"  
  prop="documentNo" >
                         <p>{{dataForm.documentNo}}</p>
                 </el-form-item>
             </el-col>
             <el-col :span="8" >
-                <el-form-item  label="业务日期 "
+                <el-form-item  label="申请时间"  
  prop="businessDate" >
-                        <p>{{dataForm.businessDate}}</p>
+                        <p>{{jnpf.dateFormat(dataForm.businessDate)}}</p>
                 </el-form-item>
             </el-col>
-
-      <el-col :span="8" >
-        <el-form-item  label="客户"
-                      >
-
-        </el-form-item>
-      </el-col>
-
             <el-col :span="8" >
-                <el-form-item  label="申请金额"
+                <el-form-item  label="供应商名称"  
+ prop="supplierName" >
+                        <p>{{dataForm.supplierName}}</p>
+                </el-form-item>
+            </el-col>
+            <el-col :span="8" >
+                <el-form-item  label="付款类型"  
+ prop="paymentType" >
+                         <p>{{ dataForm.paymentType | dynamicText(paymentTypeOptions) }} </p>
+                </el-form-item>
+            </el-col>
+            <el-col :span="8" >
+                <el-form-item  label="申请金额"  
  prop="ramount" >
                         <p>{{dataForm.ramount}}</p>
                 </el-form-item>
             </el-col>
             <el-col :span="8" >
-                <el-form-item  label="应付日期"
+                <el-form-item  label="应付日期"  
  prop="dueDate" >
                         <p>{{jnpf.dateFormat(dataForm.dueDate)}}</p>
                 </el-form-item>
             </el-col>
             <el-col :span="8" >
-                <el-form-item  label="付款类型 "
- prop="paymentType" >
-                         <p>{{ dataForm.paymentType | dynamicText(paymentTypeOptions) }} </p>
+                <el-form-item  label="币别 "  
+ prop="currency" >
+                         <p>{{ dataForm.currency | dynamicText(currencyOptions) }} </p>
                 </el-form-item>
             </el-col>
             <el-col :span="8" >
-                <el-form-item  label="收款账户"
+                <el-form-item  label="收款账户"  
  prop="collectionAccount" >
                         <p>{{dataForm.collectionAccount}}</p>
                 </el-form-item>
             </el-col>
             <el-col :span="8" >
-                <el-form-item  label="收款银行"
+                <el-form-item  label="收款银行"  
  prop="colectionBank" >
                         <p>{{dataForm.colectionBank}}</p>
                 </el-form-item>
             </el-col>
             <el-col :span="8" >
-                <el-form-item  label="结算类型 "
+                <el-form-item  label="结算类型"  
  prop="settlementType" >
                          <p>{{ dataForm.settlementType | dynamicText(settlementTypeOptions) }} </p>
                 </el-form-item>
             </el-col>
             <el-col :span="8" >
-                <el-form-item  label="币别 "
- prop="currency" >
-                         <p>{{ dataForm.currency | dynamicText(currencyOptions) }} </p>
-                </el-form-item>
-            </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="备注"
+                <el-form-item  label="备注"  
  prop="remark" >
                         <p>{{dataForm.remark}}</p>
                 </el-form-item>
             </el-col>
             <el-col :span="8" >
-                <el-form-item  label="付款金额"
+                <el-form-item  label="付款金额"  
  prop="paymentAmount" >
                         <p>{{dataForm.paymentAmount}}</p>
                 </el-form-item>
             </el-col>
             <el-col :span="8" >
-                <el-form-item  label="未付款金额"
+                <el-form-item  label="未付款金额"  
  prop="unpaymentAmount" >
                         <p>{{dataForm.unpaymentAmount}}</p>
                 </el-form-item>
             </el-col>
             <el-col :span="8" >
-                <el-form-item  label="单据状态 "
+                <el-form-item  label="单据状态 "  
  prop="status" >
                          <p>{{ dataForm.status | dynamicText(statusOptions) }} </p>
                 </el-form-item>
             </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="制单人"
- prop="creatorUserName" >
-                        <p>{{dataForm.creatorUserName}}</p>
-                </el-form-item>
-            </el-col>
             <el-col :span="24">
-                <el-tabs  v-model="activeyjmmtv"  tab-position="top" class="mb-20">
+                <el-tabs  v-model="activeshpeyb"  tab-position="top" class="mb-20">
                 <el-tab-pane  label="申请明细">
     <el-col :span="24"  >
     <el-form-item label-width="0">
@@ -108,43 +100,66 @@
             </div>
     <el-table :data="dataForm.paymentdoc_item0List" size='mini'   >
         <el-table-column type="index" width="50" label="序号" align="center" />
-            <el-table-column prop="orderId" label="采购订单行id">
+            <el-table-column prop="amount" label="申请金额">
             <template slot-scope="scope">
-                            <p>{{scope.row.orderId}}</p>
+                            <p>{{scope.row.amount}}</p>
         </template>
         </el-table-column>
-            <el-table-column prop="amount" label="金额">
+            <el-table-column prop="creatorUserId" label="订单金额">
             <template slot-scope="scope">
-                            <p>{{scope.row.amount}}</p>
+                            <p>{{scope.row.creatorUserId}}</p>
         </template>
         </el-table-column>
-            <el-table-column prop="quantity" label="数量">
+            <el-table-column prop="creatorUserName" label="已付金额">
             <template slot-scope="scope">
-                            <p>{{scope.row.quantity}}</p>
+                            <p>{{scope.row.creatorUserName}}</p>
         </template>
         </el-table-column>
-            <el-table-column prop="taxRate" label="税率 ">
+            <el-table-column prop="purchaseorderId" label="订单编号">
             <template slot-scope="scope">
-                        <p>{{ scope.row.taxRate | dynamicText(taxRateOptions) }}</p>
+                            <p>{{scope.row.purchaseorderId}}</p>
         </template>
         </el-table-column>
-            <el-table-column prop="taxAmount" label="税额">
+            <el-table-column prop="lastModifyUserId" label="合同编号">
             <template slot-scope="scope">
-                            <p>{{scope.row.taxAmount}}</p>
+                            <p>{{scope.row.lastModifyUserId}}</p>
         </template>
         </el-table-column>
-            <el-table-column prop="amountNotTax" label="不含税金额">
+            <el-table-column prop="lastModifyUserName" label="重量">
             <template slot-scope="scope">
-                            <p>{{scope.row.amountNotTax}}</p>
+                            <p>{{scope.row.lastModifyUserName}}</p>
         </template>
         </el-table-column>
-
-      <el-table-column prop="remark" label="备注信息">
-        <template slot-scope="scope">
-          <p>{{scope.row.remark}}</p>
+            <el-table-column prop="deleteMark" label="税率(%)">
+            <template slot-scope="scope">
+                            <p>{{scope.row.deleteMark}}</p>
         </template>
-      </el-table-column>
-
+        </el-table-column>
+            <el-table-column prop="departmentId" label="垫资金额">
+            <template slot-scope="scope">
+                            <p>{{scope.row.departmentId}}</p>
+        </template>
+        </el-table-column>
+            <el-table-column prop="orgnizeId" label="税额">
+            <template slot-scope="scope">
+                            <p>{{scope.row.orgnizeId}}</p>
+        </template>
+        </el-table-column>
+            <el-table-column prop="deleteUserId" label="不含税金额">
+            <template slot-scope="scope">
+                            <p>{{scope.row.deleteUserId}}</p>
+        </template>
+        </el-table-column>
+            <el-table-column prop="deleteUserName" label="业务类型">
+            <template slot-scope="scope">
+                            <p>{{scope.row.deleteUserName}}</p>
+        </template>
+        </el-table-column>
+            <el-table-column prop="creatorTime" label="业务日期">
+            <template slot-scope="scope">
+                            <p>{{scope.row.creatorTime}}</p>
+        </template>
+        </el-table-column>
     </el-table>
     </el-form-item>
     </el-col>
@@ -176,27 +191,30 @@
                 id :'',
                             documentNo : '',
                             businessDate : '',
+                            supplierName : "",
+                            paymentType : "0",
                             ramount : '',
                             dueDate : '',
-                            paymentType : "0",
+                            currency : "0",
                             collectionAccount : '',
                             colectionBank : '',
                             settlementType : "0",
-                            currency : "0",
                             remark : '',
                             paymentAmount : '',
                             unpaymentAmount : '',
                             status : "",
-                            creatorUserName : '',
+                            creatorUserName : "",
+                            creatorTime : "",
+                            lastModifyUserName : "",
+                            lastModifyTime : "",
                         paymentdoc_item0List:[],
             },
-                            activeyjmmtv:'0',
-                                paymentTypeOptions:[{"fullName":"贷款","id":"0"},{"fullName":"运费","id":"1"},{"fullName":"仓储","id":"2"}],
-                                settlementTypeOptions:[{"fullName":"现金","id":"0"},{"fullName":"赊购","id":"1"},{"fullName":"网银","id":"2"},{"fullName":"银企直连","id":"3"},{"fullName":"银票","id":"4"},{"fullName":"商票","id":"5"}],
+                            activeshpeyb:'0',
+                                paymentTypeOptions:[{"fullName":"贷款","id":"0"},{"fullName":"物流运费","id":"1"},{"fullName":"仓储费","id":"2"},{"fullName":"委外加工费","id":"3"},{"fullName":"其他费用","id":"4"}],
                                 currencyOptions:[{"fullName":"人民币","id":"0"},{"fullName":"美元","id":"1"},{"fullName":"英镑","id":"2"}],
+                                settlementTypeOptions:[{"fullName":"现金","id":"0"},{"fullName":"赊购","id":"1"},{"fullName":"网银","id":"2"},{"fullName":"银企直连","id":"3"},{"fullName":"银票","id":"4"},{"fullName":"商票","id":"5"}],
                                 statusOptions:[{"fullName":"已保存","id":"0"},{"fullName":"审批中","id":"1"},{"fullName":"已审批","id":"2"},{"fullName":"已付款","id":"3"}],
 
-                                    taxRateOptions:[{"fullName":"13","id":"0"},{"fullName":"9","id":"1"},{"fullName":"6","id":"2"},{"fullName":"5","id":"3"},{"fullName":"3","id":"4"},{"fullName":"0","id":"5"}],
         }
         },
         computed: {},
@@ -221,7 +239,7 @@
                     if(this.dataForm.id){
                         this.loading = true
                         request({
-                            url: '/api/paymentdoc/Paymentdoc/detail/'+this.dataForm.id,
+                            url: '/api/example/Paymentdoc/detail/'+this.dataForm.id,
                             method: 'get'
                         }).then(res => {
                             this.dataInfo(res.data)
diff --git a/SC-web/src/views/scm/basicInformation/paymentdoc/Form.vue b/SC-web/src/views/scm/basicInformation/paymentdoc/Form.vue
index 0dad270b..787ff246 100644
--- a/SC-web/src/views/scm/basicInformation/paymentdoc/Form.vue
+++ b/SC-web/src/views/scm/basicInformation/paymentdoc/Form.vue
@@ -2,7 +2,7 @@
 <el-dialog :title="!dataForm.id ? '新建' :  isDetail ? '详情':'编辑'"
            :close-on-click-modal="false" append-to-body
            :visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll
-           width="1000px">
+           width="1500px">
 <el-row :gutter="15" class="">
 <el-form ref="elForm" :model="dataForm" :rules="rules" size="small" label-width="100px" label-position="right" >
     <template v-if="!loading">
@@ -10,36 +10,46 @@
                 <el-form-item  label="单据编号"
  prop="documentNo" >
                     <el-input    v-model="dataForm.documentNo"
- placeholder="请输入单据编号"  clearable  :style='{"width":"100%"}'>
+ placeholder="系统自动生成"  readonly >
 
                 </el-input>
                 </el-form-item>
             </el-col>
             <el-col :span="8" >
-                <el-form-item  label="业务日期 "
+                <el-form-item  label="申请时间"
  prop="businessDate" >
                     <el-date-picker    v-model="dataForm.businessDate"
- placeholder="请输入业务日期"  clearable  :style='{"width":"100%"}' type="date"  format="yyyy-MM-dd"  value-format="timestamp">
+ placeholder="请选择"  clearable  :style='{"width":"100%"}' type="datetime"  format="yyyy-MM-dd HH:mm:ss"  value-format="timestamp" >
 
                 </el-date-picker>
                 </el-form-item>
             </el-col>
+            <el-col :span="8" >
+                <el-form-item  label="供应商名称"
+ prop="supplierName" >
+                    <popupSelect    v-model="dataForm.supplierName"
+ placeholder="请选择"  clearable  field="supplierName" interfaceId="393307526961100037" :columnOptions="supplierNamecolumnOptions" propsValue="supplier_name" relationField="supplier_name" popupType="dialog"
+ popupTitle="选择数据"  popupWidth="800px"
+  >
 
-      <el-col :span="8" >
-        <el-form-item  label="客户"
-                        >
-          <el-input
-                       placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-
-          </el-input>
-        </el-form-item>
-      </el-col>
+                </popupSelect>
+                </el-form-item>
+            </el-col>
+            <el-col :span="8" >
+                <el-form-item  label="付款类型"
+ prop="paymentType" >
+                    <el-select    v-model="dataForm.paymentType"
+ placeholder="请选择"  clearable  :style='{"width":"100%"}'>
+                            <el-option v-for="(item, index) in paymentTypeOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
 
+                </el-select>
+                </el-form-item>
+            </el-col>
             <el-col :span="8" >
                 <el-form-item  label="申请金额"
  prop="ramount" >
                     <el-input    v-model="dataForm.ramount"
- placeholder="请输入申请金额"  clearable  :style='{"width":"100%"}'>
+ placeholder="请输入"  readonly  clearable  :style='{"width":"100%"}'>
 
                 </el-input>
                 </el-form-item>
@@ -48,17 +58,17 @@
                 <el-form-item  label="应付日期"
  prop="dueDate" >
                     <el-date-picker    v-model="dataForm.dueDate"
- placeholder="请选择应付日期"  clearable  :style='{"width":"100%"}' type="date"  format="yyyy-MM-dd"  value-format="timestamp" >
+ placeholder="请选择"  clearable  :style='{"width":"100%"}' type="date"  format="yyyy-MM-dd"  value-format="timestamp" >
 
                 </el-date-picker>
                 </el-form-item>
             </el-col>
             <el-col :span="8" >
-                <el-form-item  label="付款类型 "
- prop="paymentType" >
-                    <el-select    v-model="dataForm.paymentType"
- placeholder="请选择付款类型"  clearable  :style='{"width":"100%"}'>
-                            <el-option v-for="(item, index) in paymentTypeOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
+                <el-form-item  label="币别 "
+ prop="currency" >
+                    <el-select    v-model="dataForm.currency"
+ placeholder="请选择"  clearable  :style='{"width":"100%"}'>
+                            <el-option v-for="(item, index) in currencyOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
 
                 </el-select>
                 </el-form-item>
@@ -67,7 +77,7 @@
                 <el-form-item  label="收款账户"
  prop="collectionAccount" >
                     <el-input    v-model="dataForm.collectionAccount"
- placeholder="收款账户"  clearable  :style='{"width":"100%"}'>
+ placeholder="请输入"  clearable  :style='{"width":"100%"}'>
 
                 </el-input>
                 </el-form-item>
@@ -76,36 +86,26 @@
                 <el-form-item  label="收款银行"
  prop="colectionBank" >
                     <el-input    v-model="dataForm.colectionBank"
- placeholder="请输入收款银行"  clearable  :style='{"width":"100%"}'>
+ placeholder="请输入"  clearable  :style='{"width":"100%"}'>
 
                 </el-input>
                 </el-form-item>
             </el-col>
             <el-col :span="8" >
-                <el-form-item  label="结算类型 "
+                <el-form-item  label="结算类型"
  prop="settlementType" >
                     <el-select    v-model="dataForm.settlementType"
- placeholder="请选择结算类型"  clearable  :style='{"width":"100%"}'>
+ placeholder="请选择"  clearable  :style='{"width":"100%"}'>
                             <el-option v-for="(item, index) in settlementTypeOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
 
                 </el-select>
                 </el-form-item>
             </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="币别 "
- prop="currency" >
-                    <el-select    v-model="dataForm.currency"
- placeholder="请选择币别"  clearable  :style='{"width":"100%"}'>
-                            <el-option v-for="(item, index) in currencyOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
-
-                </el-select>
-                </el-form-item>
-            </el-col>
             <el-col :span="8" >
                 <el-form-item  label="备注"
  prop="remark" >
                     <el-input    v-model="dataForm.remark"
- placeholder="请输入备注"  clearable  :style='{"width":"100%"}'>
+ placeholder="请输入"  clearable  :style='{"width":"100%"}'>
 
                 </el-input>
                 </el-form-item>
@@ -114,7 +114,7 @@
                 <el-form-item  label="付款金额"
  prop="paymentAmount" >
                     <el-input    v-model="dataForm.paymentAmount"
- placeholder="请输入付款金额"  clearable  :style='{"width":"100%"}'>
+ placeholder="请输入"  clearable  :style='{"width":"100%"}'>
 
                 </el-input>
                 </el-form-item>
@@ -123,7 +123,7 @@
                 <el-form-item  label="未付款金额"
  prop="unpaymentAmount" >
                     <el-input    v-model="dataForm.unpaymentAmount"
- placeholder="请输入未付款金额"  clearable  :style='{"width":"100%"}'>
+ placeholder="请输入"  clearable  :style='{"width":"100%"}'>
 
                 </el-input>
                 </el-form-item>
@@ -132,23 +132,14 @@
                 <el-form-item  label="单据状态 "
  prop="status" >
                     <el-select    v-model="dataForm.status"
- placeholder="请选择单据状态"  clearable  :style='{"width":"100%"}'>
+ placeholder="请选择"  clearable  :style='{"width":"100%"}'>
                             <el-option v-for="(item, index) in statusOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
 
                 </el-select>
                 </el-form-item>
             </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="制单人"
- prop="creatorUserName" >
-                    <el-input    v-model="dataForm.creatorUserName"
- placeholder="请输入制单人"  clearable  :style='{"width":"100%"}'>
-
-                </el-input>
-                </el-form-item>
-            </el-col>
             <el-col :span="24">
-                <el-tabs  v-model="activeyjmmtv"  tab-position="top" class="mb-20">
+                <el-tabs  v-model="activeshpeyb"  tab-position="top" class="mb-20">
                 <el-tab-pane  label="申请明细">
     <el-col :span="24"  >
     <el-form-item label-width="0">
@@ -157,67 +148,92 @@
             </div>
     <el-table :data="dataForm.paymentdoc_item0List" size='mini'   >
         <el-table-column type="index" width="50" label="序号" align="center" />
-            <el-table-column prop="orderId" label="采购订单行id">
+            <el-table-column prop="amount" label="申请金额">
                 <template slot-scope="scope">
-<!--                    <el-input   v-model="scope.row.orderId"-->
-<!-- placeholder="请输入"  clearable  :style='{"width":"100%"}'>-->
-<!--                </el-input>-->
-                  <popupSelect   v-model="scope.row.orderId"
-                                 placeholder="请选择"  clearable  :field="'orderId'+scope.$index"
-
-                                 interfaceId="383149471917185157" :columnOptions="jg_paymentdoc_item0orderIdcolumnOptions"
-                                 propsValue="id" relationField="document_no" popupType="dialog"
-                                 popupWidth="800px" @change="popupSelectChangeOrderId"
-                                 hasPage :pageSize="20"   >
-                  </popupSelect>
+                    <el-input   v-model="scope.row.amount"
+ placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+                </el-input>
             </template>
         </el-table-column>
-            <el-table-column prop="amount" label="金额">
+            <el-table-column prop="creatorUserId" label="订单金额">
                 <template slot-scope="scope">
-                    <el-input   v-model="scope.row.amount"
+                    <el-input   v-model="scope.row.creatorUserId"
  placeholder="请输入"  clearable  :style='{"width":"100%"}'>
                 </el-input>
             </template>
         </el-table-column>
-            <el-table-column prop="quantity" label="数量">
+            <el-table-column prop="creatorUserName" label="已付金额">
                 <template slot-scope="scope">
-                    <el-input   v-model="scope.row.quantity"
+                    <el-input   v-model="scope.row.creatorUserName"
  placeholder="请输入"  clearable  :style='{"width":"100%"}'>
                 </el-input>
             </template>
         </el-table-column>
-            <el-table-column prop="taxRate" label="税率 ">
+            <el-table-column prop="purchaseorderId" label="订单编号">
                 <template slot-scope="scope">
-                    <el-select   v-model="scope.row.taxRate"
- placeholder="请选择"  clearable  :style='{"width":"100%"}'>
-                            <el-option v-for="(item, index) in taxRateOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
-                </el-select>
+                    <popupSelect   v-model="scope.row.purchaseorderId"
+ placeholder="请选择"  clearable  :field="'purchaseorderId'+scope.$index"  interfaceId="393348986343324485" :bissId="dataForm.supplierName" :columnOptions="paymentdoc_item0purchaseorderIdcolumnOptions" propsValue="id" relationField="document_no" popupType="dialog"
+ popupWidth="800px" @change="popupSelectorder"
+ hasPage :pageSize="20"   >
+                </popupSelect>
             </template>
         </el-table-column>
-            <el-table-column prop="taxAmount" label="税额">
+            <el-table-column prop="lastModifyUserId" label="合同编号">
                 <template slot-scope="scope">
-                    <el-input   v-model="scope.row.taxAmount"
+                    <el-input   v-model="scope.row.lastModifyUserId"
  placeholder="请输入"  clearable  :style='{"width":"100%"}'>
                 </el-input>
             </template>
         </el-table-column>
-
-            <el-table-column prop="amountNotTax" label="不含税金额">
+            <el-table-column prop="lastModifyUserName" label="重量">
                 <template slot-scope="scope">
-                    <el-input   v-model="scope.row.amountNotTax"
+                    <el-input   v-model="scope.row.lastModifyUserName"
+ placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+                </el-input>
+            </template>
+        </el-table-column>
+            <el-table-column prop="deleteMark" label="税率(%)">
+                <template slot-scope="scope">
+                    <el-input   v-model="scope.row.deleteMark"
+ placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+                </el-input>
+            </template>
+        </el-table-column>
+            <el-table-column prop="departmentId" label="垫资金额">
+                <template slot-scope="scope">
+                    <el-input   v-model="scope.row.departmentId"
+ placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+                </el-input>
+            </template>
+        </el-table-column>
+            <el-table-column prop="orgnizeId" label="税额">
+                <template slot-scope="scope">
+                    <el-input   v-model="scope.row.orgnizeId"
+ placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+                </el-input>
+            </template>
+        </el-table-column>
+            <el-table-column prop="deleteUserId" label="不含税金额">
+                <template slot-scope="scope">
+                    <el-input   v-model="scope.row.deleteUserId"
+ placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+                </el-input>
+            </template>
+        </el-table-column>
+            <el-table-column prop="deleteUserName" label="业务类型">
+                <template slot-scope="scope">
+                    <el-input   v-model="scope.row.deleteUserName"
+ placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+                </el-input>
+            </template>
+        </el-table-column>
+            <el-table-column prop="creatorTime" label="业务日期">
+                <template slot-scope="scope">
+                    <el-input   v-model="scope.row.creatorTime"
  placeholder="请输入"  clearable  :style='{"width":"100%"}'>
                 </el-input>
             </template>
         </el-table-column>
-
-      <el-table-column prop="remark" label="备注信息">
-        <template slot-scope="scope">
-          <el-input   v-model="scope.row.remark"
-                      placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-          </el-input>
-        </template>
-      </el-table-column>
-
     <el-table-column label="操作" width="50" >
         <template slot-scope="scope">
             <el-button size="mini" type="text" class="JNPF-table-delBtn" @click="delpaymentdoc_item0List(scope.$index)">删除</el-button>
@@ -256,21 +272,25 @@
             dataForm: {
                             documentNo : '',
                             businessDate : '',
+                            supplierName : "",
+                            paymentType : "0",
                             ramount : '',
                             dueDate : '',
-                            paymentType : "0",
+                            currency : "0",
                             collectionAccount : '',
                             colectionBank : '',
                             settlementType : "0",
-                            currency : "0",
                             remark : '',
                             paymentAmount : '',
                             unpaymentAmount : '',
                             status : "",
-                            creatorUserName : '',
+                            creatorUserName : "",
+                            creatorTime : "",
+                            lastModifyUserName : "",
+                            lastModifyTime : "",
                         paymentdoc_item0List:[],
             },
-                            activeyjmmtv:'0',
+                            activeshpeyb:'0',
             rules:
             {
                             collectionAccount: [
@@ -281,12 +301,13 @@
                                 },
                         ],
             },
-                        paymentTypeOptions:[{"fullName":"贷款","id":"0"},{"fullName":"运费","id":"1"},{"fullName":"仓储","id":"2"}],
-                        settlementTypeOptions:[{"fullName":"现金","id":"0"},{"fullName":"赊购","id":"1"},{"fullName":"网银","id":"2"},{"fullName":"银企直连","id":"3"},{"fullName":"银票","id":"4"},{"fullName":"商票","id":"5"}],
+                    supplierNamecolumnOptions:[ {"label":"供应商名称","value":"supplier_name"}, {"label":"供应商编码","value":"supplier_code"},],
+                        paymentTypeOptions:[{"fullName":"贷款","id":"0"},{"fullName":"物流运费","id":"1"},{"fullName":"仓储费","id":"2"},{"fullName":"委外加工费","id":"3"},{"fullName":"其他费用","id":"4"}],
                         currencyOptions:[{"fullName":"人民币","id":"0"},{"fullName":"美元","id":"1"},{"fullName":"英镑","id":"2"}],
+                        settlementTypeOptions:[{"fullName":"现金","id":"0"},{"fullName":"赊购","id":"1"},{"fullName":"网银","id":"2"},{"fullName":"银企直连","id":"3"},{"fullName":"银票","id":"4"},{"fullName":"商票","id":"5"}],
                         statusOptions:[{"fullName":"已保存","id":"0"},{"fullName":"审批中","id":"1"},{"fullName":"已审批","id":"2"},{"fullName":"已付款","id":"3"}],
-                        jg_paymentdoc_item0orderIdcolumnOptions:[{"label":"单据编号","value":"document_no"},{"label":"金额","value":"amount"},],
-                        taxRateOptions:[{"fullName":"13","id":"0"},{"fullName":"9","id":"1"},{"fullName":"6","id":"2"},{"fullName":"5","id":"3"},{"fullName":"3","id":"4"},{"fullName":"0","id":"5"}],
+
+                        paymentdoc_item0purchaseorderIdcolumnOptions:[ {"label":"单据编号","value":"document_no"}, {"label":"合同编码","value":"contract_code"}, {"label":"重量","value":"num"}, {"label":"税额","value":"rate"}, {"label":"不含税金额","value":"not_amount"},],
         }
         },
         computed: {},
@@ -295,15 +316,22 @@
         },
         mounted() {},
         methods: {
-          popupSelectChangeOrderId(a, b){
+          popupSelectorder(a, b){
             for (let i = 0; i < this.dataForm.paymentdoc_item0List.length; i++) {
-              if(a == this.dataForm.paymentdoc_item0List[i].orderId){
-                this.dataForm.paymentdoc_item0List[i].amount = b.amount;
+              if(a == this.dataForm.paymentdoc_item0List[i].purchaseorderId){
+                this.dataForm.paymentdoc_item0List[i].lastModifyUserId = b.contract_code;
+                this.dataForm.paymentdoc_item0List[i].lastModifyUserName = b.num;
+                this.dataForm.paymentdoc_item0List[i].departmentId = b.advance_amount;
+                this.dataForm.paymentdoc_item0List[i].orgnizeId = b.rate;
+                this.dataForm.paymentdoc_item0List[i].deleteUserId = b.not_amount;
+
+                this.dataForm.ramount = parseFloat(this.dataForm.ramount) + parseFloat(b.amount);
 
               }
             }
           },
-				paymentdoc_item0Exist() {
+
+          paymentdoc_item0Exist() {
 				let isOk = true;
 					for(let i=0;i<this.dataForm.paymentdoc_item0List.length;i++){
 						const e = this.dataForm.paymentdoc_item0List[i];
@@ -330,7 +358,7 @@
                     if(this.dataForm.id){
                         this.loading = true
                         request({
-                            url: '/api/paymentdoc/Paymentdoc/'+this.dataForm.id,
+                            url: '/api/example/Paymentdoc/'+this.dataForm.id,
                             method: 'get'
                         }).then(res => {
                             this.dataInfo(res.data)
@@ -355,7 +383,7 @@
                 var _data =this.dataList()
                 if (!this.dataForm.id) {
                     request({
-                        url: '/api/paymentdoc/Paymentdoc',
+                        url: '/api/example/Paymentdoc',
                         method: 'post',
                         data: _data
                     }).then((res) => {
@@ -371,7 +399,7 @@
                     })
                 }else{
                     request({
-                        url: '/api/paymentdoc/Paymentdoc/'+this.dataForm.id,
+                        url: '/api/example/Paymentdoc/'+this.dataForm.id,
                         method: 'PUT',
                         data: _data
                     }).then((res) => {
@@ -389,12 +417,18 @@
             },
                 addpaymentdoc_item0List(){
                     let item = {
-                            orderId:undefined,
                             amount:undefined,
-                            quantity:undefined,
-                            taxRate:undefined,
-                            taxAmount:undefined,
-                            amountNotTax:undefined,
+                            creatorUserId:undefined,
+                            creatorUserName:undefined,
+                            purchaseorderId:undefined,
+                            lastModifyUserId:undefined,
+                            lastModifyUserName:undefined,
+                            deleteMark:undefined,
+                            departmentId:undefined,
+                            orgnizeId:undefined,
+                            deleteUserId:undefined,
+                            deleteUserName:undefined,
+                            creatorTime:undefined,
                 }
                     this.dataForm.paymentdoc_item0List.push(item)
                 },
diff --git a/SC-web/src/views/scm/basicInformation/paymentdoc/index.vue b/SC-web/src/views/scm/basicInformation/paymentdoc/index.vue
index 8405d9ff..a864ca97 100644
--- a/SC-web/src/views/scm/basicInformation/paymentdoc/index.vue
+++ b/SC-web/src/views/scm/basicInformation/paymentdoc/index.vue
@@ -9,6 +9,16 @@
                                         <el-input v-model="query.documentNo" placeholder="请输入" clearable>  </el-input>
                                 </el-form-item>
                             </el-col>
+                        <el-col :span="6">
+                                <el-form-item label="单据状态 ">
+                                        <el-select v-model="query.status" placeholder="请选择"
+                                                   clearable>
+                                            <el-option v-for="(item, index) in statusOptions" :key="index"
+                                                       :label="item.fullName" :value="item.id"
+                                                       :disabled="item.disabled"></el-option>
+                                        </el-select>
+                                </el-form-item>
+                            </el-col>
                     <el-col :span="6">
                         <el-form-item>
                             <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
@@ -26,6 +36,8 @@
                                     </el-button>
                                     <el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()" >批量删除
                                     </el-button>
+                      <el-button type="primary" icon="el-icon-plus" @click="paymentapply()" >付款
+                      </el-button>
                     </div>
                     <div class="JNPF-common-head-right">
                         <el-tooltip effect="dark" content="刷新" placement="top">
@@ -36,12 +48,12 @@
                     </div>
                 </div>
                 <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'  has-c @selection-change="handleSelectionChange">
-                            <el-table-column prop="businessDate" label="业务日期 " width="0" align="left"
-/>
                             <el-table-column prop="documentNo" label="单据编号" width="0" align="left"
 />
-                  <el-table-column label="客户 " width="0"  algin="left"
-                  />
+                            <el-table-column prop="businessDate" label="申请时间" width="0" align="left"
+/>
+                            <el-table-column prop="supplierName" label="供应商名称" width="0" align="left"
+/>
                                 <el-table-column label="币别 " width="0" prop="currency" algin="left"
 >
                                     <template slot-scope="scope">
@@ -53,20 +65,20 @@
                             <el-table-column prop="paymentAmount" label="付款金额" width="0" align="left"
 />
                             <el-table-column prop="unpaymentAmount" label="未付款金额" width="0" align="left"
+/>
+                            <el-table-column prop="dueDate" label="应付日期" width="0" align="left"
 />
                             <el-table-column prop="collectionAccount" label="收款账户" width="0" align="left"
 />
                             <el-table-column prop="colectionBank" label="收款银行" width="0" align="left"
 />
-                            <el-table-column prop="dueDate" label="应付日期" width="0" align="left"
-/>
-                                <el-table-column label="付款类型 " width="0" prop="paymentType" algin="left"
+                                <el-table-column label="付款类型" width="0" prop="paymentType" algin="left"
 >
                                     <template slot-scope="scope">
                                         {{ scope.row.paymentType | dynamicText(paymentTypeOptions) }}
                                     </template>
                                 </el-table-column>
-                                <el-table-column label="结算类型 " width="0" prop="settlementType" algin="left"
+                                <el-table-column label="结算类型" width="0" prop="settlementType" algin="left"
 >
                                     <template slot-scope="scope">
                                         {{ scope.row.settlementType | dynamicText(settlementTypeOptions) }}
@@ -118,6 +130,7 @@ width="150" >
                 detailVisible: false,
                 query: {
                                 documentNo:undefined,
+                                status:undefined,
                 },
                 treeProps: {
                     children: 'children',
@@ -136,26 +149,27 @@ width="150" >
                 formVisible: false,
                 exportBoxVisible: false,
                 columnList: [
-                    {prop: 'businessDate', label: '业务日期 '},
                     {prop: 'documentNo', label: '单据编号'},
+                    {prop: 'businessDate', label: '申请时间'},
+                    {prop: 'supplierName', label: '供应商名称'},
                     {prop: 'currency', label: '币别 '},
                     {prop: 'ramount', label: '申请金额'},
                     {prop: 'paymentAmount', label: '付款金额'},
                     {prop: 'unpaymentAmount', label: '未付款金额'},
+                    {prop: 'dueDate', label: '应付日期'},
                     {prop: 'collectionAccount', label: '收款账户'},
                     {prop: 'colectionBank', label: '收款银行'},
-                    {prop: 'dueDate', label: '应付日期'},
-                    {prop: 'paymentType', label: '付款类型 '},
-                    {prop: 'settlementType', label: '结算类型 '},
+                    {prop: 'paymentType', label: '付款类型'},
+                    {prop: 'settlementType', label: '结算类型'},
                     {prop: 'status', label: '单据状态 '},
                     {prop: 'creatorUserName', label: '制单人'},
                 ],
-                                paymentTypeOptions:[{"fullName":"贷款","id":"0"},{"fullName":"运费","id":"1"},{"fullName":"仓储","id":"2"}],
+                                paymentTypeOptions:[{"fullName":"贷款","id":"0"},{"fullName":"物流运费","id":"1"},{"fullName":"仓储费","id":"2"},{"fullName":"委外加工费","id":"3"},{"fullName":"其他费用","id":"4"}],
                             paymentTypeProps:{"label":"fullName","value":"id"},
-                                settlementTypeOptions:[{"fullName":"现金","id":"0"},{"fullName":"赊购","id":"1"},{"fullName":"网银","id":"2"},{"fullName":"银企直连","id":"3"},{"fullName":"银票","id":"4"},{"fullName":"商票","id":"5"}],
-                            settlementTypeProps:{"label":"fullName","value":"id"},
                                 currencyOptions:[{"fullName":"人民币","id":"0"},{"fullName":"美元","id":"1"},{"fullName":"英镑","id":"2"}],
                             currencyProps:{"label":"fullName","value":"id"},
+                                settlementTypeOptions:[{"fullName":"现金","id":"0"},{"fullName":"赊购","id":"1"},{"fullName":"网银","id":"2"},{"fullName":"银企直连","id":"3"},{"fullName":"银票","id":"4"},{"fullName":"商票","id":"5"}],
+                            settlementTypeProps:{"label":"fullName","value":"id"},
                                 statusOptions:[{"fullName":"已保存","id":"0"},{"fullName":"审批中","id":"1"},{"fullName":"已审批","id":"2"},{"fullName":"已付款","id":"3"}],
                             statusProps:{"label":"fullName","value":"id"},
             }
@@ -188,7 +202,7 @@ width="150" >
                     menuId:this.menuId
                 };
                 request({
-                    url: `/api/paymentdoc/Paymentdoc/getList`,
+                    url: `/api/example/Paymentdoc/getList`,
                     method: 'post',
                     data: _query
                 }).then(res => {
@@ -208,7 +222,7 @@ width="150" >
                     type: 'warning'
                 }).then(() => {
                     request({
-                        url: `/api/paymentdoc/Paymentdoc/${id}`,
+                        url: `/api/example/Paymentdoc/${id}`,
                         method: 'DELETE'
                     }).then(res => {
                         this.$message({
@@ -226,6 +240,40 @@ width="150" >
                     const res = val.map(item => item.id)
                     this.multipleSelection = res
                 },
+          paymentapply(){
+            if (!this.multipleSelection.length) {
+              this.$message({
+                type: 'error',
+                message: '请选择一条数据',
+                duration: 1500,
+              })
+              return
+            }
+            let ids = this.multipleSelection.join()
+            if (this.multipleSelection.length ===1){
+              let info = {};
+              info = this.list.find(function(info) {
+                return info.id == ids
+              })
+              if (info.status != 2){
+                this.$message({
+                  type: 'error',
+                  message: '审核中，请先通过审核',
+                  duration: 1500,
+                })
+                return
+              }else{
+                debugger
+                this.$router.push({path:'/api/collection/Collection'})
+              }
+            }if (this.multipleSelection.length >1){
+              this.$message({
+                type: 'error',
+                message: '请选择单条数据',
+                duration: 1500,
+              })
+            }
+          },
                 handleBatchRemoveDel() {
                     if (!this.multipleSelection.length) {
                         this.$message({
@@ -240,7 +288,7 @@ width="150" >
                         type: 'warning'
                     }).then(() => {
                         request({
-                            url: `/api/paymentdoc/Paymentdoc/batchRemove/${ids}`,
+                            url: `/api/example/Paymentdoc/batchRemove/${ids}`,
                             method: 'DELETE'
                         }).then(res => {
                             this.$message({
@@ -269,7 +317,7 @@ width="150" >
             download(data) {
                 let query = {...data, ...this.listQuery, ...this.query,menuId:this.menuId}
                 request({
-                    url: `/api/paymentdoc/Paymentdoc/Actions/Export`,
+                    url: `/api/example/Paymentdoc/Actions/Export`,
                     method: 'GET',
                     data: query
                 }).then(res => {