product
tengxi 2 years ago
parent 73dcc3513b
commit 5a9f59d172

@ -31,7 +31,7 @@ public class PaymentEntity {
private String creatorUserName;
@TableField("CREATOR_TIME")
private Date creatorTime;
private String creatorTime;
@TableField("LAST_MODIFY_USER_ID")
private String lastModifyUserId;
@ -40,7 +40,7 @@ public class PaymentEntity {
private String lastModifyUserName;
@TableField("LAST_MODIFY_TIME")
private Date lastModifyTime;
private String lastModifyTime;
@TableField("DELETE_USER_ID")
private String deleteUserId;
@ -49,7 +49,7 @@ public class PaymentEntity {
private String deleteUserName;
@TableField("DELETE_TIME")
private Date deleteTime;
private String deleteTime;
@TableField("DELETE_MARK")
private String deleteMark;
@ -73,10 +73,10 @@ public class PaymentEntity {
private BigDecimal requestedamount;
@TableField("BUSINESSDATE")
private Date businessdate;
private String businessdate;
@TableField("DUEDATE")
private Date duedate;
private String duedate;
@TableField("STATUS")
private String status;

@ -15,3 +15,4 @@ import jnpf.payment.entity.PaymentEntity;
public interface PaymentMapper extends BaseMapper<PaymentEntity> {
}

@ -13,23 +13,19 @@ 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.entity.Payment_item0Entity;
import jnpf.payment.mapper.PaymentMapper;
import jnpf.payment.model.payment.PaymentCrForm;
import jnpf.payment.service.PaymentService;
import jnpf.payment.service.Payment_item0Service;
import org.springframework.transaction.annotation.Transactional;
import jnpf.base.entity.ProvinceEntity;
import jnpf.paymentdoc.model.paymentdoc.*;
import jnpf.paymentdoc.model.paymentdoc.PaymentdocPagination;
import jnpf.entity.*;
import jnpf.paymentdoc.entity.Paymentdoc_item0Entity;
import jnpf.util.*;
import jnpf.base.util.*;
import jnpf.base.vo.ListVO;
import jnpf.util.context.SpringContext;
import cn.hutool.core.util.ObjectUtil;
import lombok.extern.slf4j.Slf4j;
import lombok.Cleanup;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
@ -38,13 +34,11 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import jnpf.paymentdoc.entity.PaymentdocEntity;
import jnpf.paymentdoc.service.PaymentdocService;
import jnpf.paymentdoc.entity.Paymentdoc_item0Entity;
import jnpf.paymentdoc.service.Paymentdoc_item0Service;
import org.springframework.web.bind.annotation.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.multipart.MultipartFile;
import javax.validation.Valid;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import jnpf.util.GeneraterSwapUtil;
@ -83,6 +77,10 @@ public class PaymentdocController {
private Paymentdoc_item0Service paymentdoc_item0Service;
@Autowired
private PaymentService paymentService;
@Autowired
private PaymentMapper paymentMapper;
@Autowired
private Payment_item0Service payment_item0Service;
/**
*
@ -90,25 +88,62 @@ public class PaymentdocController {
* @param
* @return
*/
// @PostMapping("/paymentapplylist")
// public ActionResult paymentapplylist( @PathVariable("id") String id,@RequestBody @Valid PaymentdocCrForm paymentdocCrForm){
//
// PaymentEntity paymentEntity = new PaymentEntity();
// @GetMapping("/{id}")
@PostMapping("/paymentapplylist")
public ActionResult paymentapplylist(@RequestBody PaymentdocCrForms paymentdocCrForms) throws DataException {
PaymentEntity paymentEntity = new PaymentEntity();
PaymentCrForm paymentCrForm =new PaymentCrForm();
// String mainId =RandomUtil.uuId();
// UserInfo userInfo=userProvider.get();
//
// paymentEntity.setCreatorUserName(paymentdocCrForm.getCreatorUserName());
// paymentEntity.setCreatorUserName(paymentdocUpForms.getCreatorUserName());
// paymentEntity.setCreatorTime(new Date());
//
// PaymentEntity entity = JsonUtil.getJsonToBean(paymentEntity, PaymentEntity.class);
PaymentEntity entity = JsonUtil.getJsonToBean(paymentEntity, PaymentEntity.class);
// entity.setId(mainId);
// paymentService.save(entity);
//
//
// paymentdocCrForm.setIsPay("1");
// paymentdocService.update(paymentdocCrForm);
// return ActionResult.success("创建成功");
// }
PaymentdocEntity paymentdocEntity=paymentdocService.getById(paymentdocCrForms.getId());
//添加到付款单
// paymentEntity.setId(paymentdocUpForms.getId());
paymentEntity.setDocumentno(generaterSwapUtil.getBillNumber("payment" ,false));
paymentEntity.setPaymentno(paymentdocCrForms.getDocumentNo());
paymentEntity.setPaymentamount(paymentdocCrForms.getPaymentAmount());
paymentEntity.setRequestedamount(paymentdocCrForms.getRamount());
paymentEntity.setBusinessdate(paymentdocCrForms.getBusinessDate());
paymentEntity.setDuedate(paymentdocCrForms.getDueDate());
paymentEntity.setStatus(paymentdocCrForms.getStatus());
paymentEntity.setSuppliercode(paymentdocCrForms.getSupplierCode());
paymentEntity.setSuppliername(paymentdocCrForms.getSupplierName());
paymentEntity.setCurrency(paymentCrForm.getCurrency());
paymentEntity.setPaymenttype(paymentdocCrForms.getPaymentType());
paymentEntity.setSettlementtype(paymentdocCrForms.getSettlementType());
paymentEntity.setRemark(paymentdocCrForms.getRemark());
paymentEntity.setCollectionaccount(paymentdocCrForms.getCollectionAccount());
paymentEntity.setCollectionbank(paymentdocCrForms.getColectionBank());
paymentEntity.setCreatorUserId(paymentdocCrForms.getCreatorUserId());
paymentEntity.setCreatorUserName(paymentdocCrForms.getCreatorUserName());
paymentEntity.setCreatorTime(paymentdocCrForms.getCreatorTime());
paymentEntity.setLastModifyUserId(paymentdocCrForms.getLastModifyUserId());
paymentEntity.setLastModifyUserName(paymentdocCrForms.getLastModifyUserName());
paymentEntity.setLastModifyTime(paymentdocCrForms.getLastModifyTime());
paymentMapper.insert(paymentEntity);
//修改付款状态
paymentdocEntity.setIsPay("1");
paymentdocService.updateById(paymentdocEntity);
//子表
List<Paymentdoc_item0Entity> Paymentdoc_item0List = JsonUtil.getJsonToList(paymentdocCrForms.getPaymentdoc_item0List(),Paymentdoc_item0Entity.class);
List<Payment_item0Entity> Payment_item0List = JsonUtil.getJsonToList(paymentdocCrForms.getPayment_item0List(),Payment_item0Entity.class);
for(Payment_item0Entity entitys : Payment_item0List){
entitys.setId(RandomUtil.uuId());
entitys.setPaymentId(entity.getId());
payment_item0Service.save(entitys);
}
return ActionResult.success("修改(付款)成功");
}
@ -163,18 +198,6 @@ public class PaymentdocController {
for(Paymentdoc_item0Entity entitys : Paymentdoc_item0List){
entitys.setId(RandomUtil.uuId());
entitys.setPaymentdocId(entity.getId());
paymentdoc_item0Service.save(entitys);
}

@ -0,0 +1,121 @@
package jnpf.paymentdoc.model.paymentdoc;
import com.fasterxml.jackson.annotation.JsonProperty;
import jnpf.payment.entity.PaymentEntity;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
/**
*
*
* @ V3.2.0
* @ LINKAGE-BOOT
* @ LINKAGE-BOOT
* @ 2023-02-09
*/
@Data
public class PaymentdocCrForms {
/** id **/
@JsonProperty("id")
private String id;
/** 单据编号 **/
@JsonProperty("documentNo")
private String documentNo;
/** 供应商编码 **/
@JsonProperty("supplierCode")
private String supplierCode;
/** 供应商名称 **/
@JsonProperty("supplierName")
private String supplierName;
/** 付款类型 **/
@JsonProperty("paymentType")
private String paymentType;
/** 申请金额 **/
@JsonProperty("ramount")
private BigDecimal ramount;
/** 申请时间 **/
@JsonProperty("businessDate")
private String businessDate;
/** 应付日期 **/
@JsonProperty("dueDate")
private String dueDate;
/** 币别 **/
@JsonProperty("currency")
private String currency;
/** 收款账户 **/
@JsonProperty("collectionAccount")
private String collectionAccount;
/** 收款银行 **/
@JsonProperty("colectionBank")
private String colectionBank;
/** 结算类型 **/
@JsonProperty("settlementType")
private String settlementType;
/** 备注 **/
@JsonProperty("remark")
private String remark;
/** 付款金额 **/
@JsonProperty("paymentAmount")
private BigDecimal paymentAmount;
/** 未付款金额 **/
@JsonProperty("unpaymentAmount")
private String unpaymentAmount;
/** 单据状态 **/
@JsonProperty("status")
private String status;
/** 制单人id **/
@JsonProperty("CreatorUserId")
private String CreatorUserId;
/** 制单人 **/
@JsonProperty("creatorUserName")
private String creatorUserName;
/** 创建时间 **/
@JsonProperty("creatorTime")
private String creatorTime;
/** 修改人ID **/
@JsonProperty("lastModifyUserId")
private String lastModifyUserId;
/** 修改人名称 **/
@JsonProperty("lastModifyUserName")
private String lastModifyUserName;
/** 修改时间 **/
@JsonProperty("lastModifyTime")
private String lastModifyTime;
@JsonProperty("isPay")
private String isPay;
/** 子表数据 **/
@JsonProperty("paymentdoc_item0List")
private List<Paymentdoc_item0Model> paymentdoc_item0List;
/** 子表数据付款 **/
@JsonProperty("payment_item0List")
private List<PaymentEntity> payment_item0List;
}

@ -22463,7 +22463,8 @@
"@fullcalendar/bootstrap": {
"version": "4.4.2",
"resolved": "https://registry.npmjs.org/@fullcalendar/bootstrap/-/bootstrap-4.4.2.tgz",
"integrity": "sha512-zxtQvpZqr7zeBCfszo/i1e4zCvGwLh2zOp8J6Wxw5s73HsB1zuftWop7sPO+qhRrhX5MdM9i/wr8/nNY8BZSmw=="
"integrity": "sha512-zxtQvpZqr7zeBCfszo/i1e4zCvGwLh2zOp8J6Wxw5s73HsB1zuftWop7sPO+qhRrhX5MdM9i/wr8/nNY8BZSmw==",
"requires": {}
},
"@fullcalendar/core": {
"version": "4.4.2",
@ -22473,12 +22474,14 @@
"@fullcalendar/daygrid": {
"version": "4.4.2",
"resolved": "https://registry.npmjs.org/@fullcalendar/daygrid/-/daygrid-4.4.2.tgz",
"integrity": "sha512-axjfMhxEXHShV3r2TZjf+2niJ1C6LdAxkHKmg7mVq4jXtUQHOldU5XsjV0v2lUAt1urJBFi2zajfK8798ukL3Q=="
"integrity": "sha512-axjfMhxEXHShV3r2TZjf+2niJ1C6LdAxkHKmg7mVq4jXtUQHOldU5XsjV0v2lUAt1urJBFi2zajfK8798ukL3Q==",
"requires": {}
},
"@fullcalendar/interaction": {
"version": "4.4.2",
"resolved": "https://registry.npmjs.org/@fullcalendar/interaction/-/interaction-4.4.2.tgz",
"integrity": "sha512-3ItpGFnxcYQT4NClqhq93QTQwOI8x3mlMf5M4DgK5avVaSzpv9g8p+opqeotK2yzpFeINps06cuQyB1h7vcv1Q=="
"integrity": "sha512-3ItpGFnxcYQT4NClqhq93QTQwOI8x3mlMf5M4DgK5avVaSzpv9g8p+opqeotK2yzpFeINps06cuQyB1h7vcv1Q==",
"requires": {}
},
"@fullcalendar/timegrid": {
"version": "4.4.2",
@ -22638,7 +22641,8 @@
"@tinymce/tinymce-vue": {
"version": "3.2.8",
"resolved": "https://registry.npmjs.org/@tinymce/tinymce-vue/-/tinymce-vue-3.2.8.tgz",
"integrity": "sha512-jEz+NZ0g+FZFz273OEUWz9QkwPMyjc5AJYyxOgu51O1Y5UaJ/6IUddXTX6A20mwCleEv5ebwNYdalviafx4fnA=="
"integrity": "sha512-jEz+NZ0g+FZFz273OEUWz9QkwPMyjc5AJYyxOgu51O1Y5UaJ/6IUddXTX6A20mwCleEv5ebwNYdalviafx4fnA==",
"requires": {}
},
"@types/glob": {
"version": "7.1.3",
@ -23276,7 +23280,8 @@
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/@vue/preload-webpack-plugin/-/preload-webpack-plugin-1.1.2.tgz",
"integrity": "sha512-LIZMuJk38pk9U9Ur4YzHjlIyMuxPlACdBIHH9/nGYVTsaGKOSnSuELiE8vS9wa+dJpIYspYUOqk+L1Q4pgHQHQ==",
"dev": true
"dev": true,
"requires": {}
},
"@vue/test-utils": {
"version": "1.0.0-beta.29",
@ -23588,13 +23593,15 @@
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.1.tgz",
"integrity": "sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==",
"dev": true
"dev": true,
"requires": {}
},
"ajv-keywords": {
"version": "3.5.2",
"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
"integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
"dev": true
"dev": true,
"requires": {}
},
"alphanum-sort": {
"version": "1.0.2",
@ -23960,7 +23967,8 @@
"version": "7.0.0-bridge.0",
"resolved": "https://registry.npmjs.org/babel-core/-/babel-core-7.0.0-bridge.0.tgz",
"integrity": "sha512-poPX9mZH/5CSanm50Q+1toVci6pv5KSRv/5TWCwtzQS5XEwn40BcCrgIeMFWP9CKKIniKXNxoIOnOq4VVlGXhg==",
"dev": true
"dev": true,
"requires": {}
},
"babel-eslint": {
"version": "10.0.1",
@ -27194,7 +27202,8 @@
"version": "5.3.1",
"resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.1.tgz",
"integrity": "sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==",
"dev": true
"dev": true,
"requires": {}
},
"ansi-regex": {
"version": "3.0.0",
@ -27471,7 +27480,8 @@
"version": "5.3.1",
"resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.1.tgz",
"integrity": "sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==",
"dev": true
"dev": true,
"requires": {}
},
"debug": {
"version": "4.3.1",
@ -28883,7 +28893,8 @@
"highcharts-vue": {
"version": "1.3.5",
"resolved": "https://registry.npmjs.org/highcharts-vue/-/highcharts-vue-1.3.5.tgz",
"integrity": "sha512-By1kc3m8XoI20pMshs/ue69j4rH6eQioDPoIrtC20RTti4QyvNAx8DisGSO3GAWe9sn50hPk8NsyxcwZIGaz3Q=="
"integrity": "sha512-By1kc3m8XoI20pMshs/ue69j4rH6eQioDPoIrtC20RTti4QyvNAx8DisGSO3GAWe9sn50hPk8NsyxcwZIGaz3Q==",
"requires": {}
},
"hmac-drbg": {
"version": "1.0.1",
@ -37288,7 +37299,8 @@
"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-2.1.1.tgz",
"integrity": "sha1-YXmX/F9gV2iUxDX5QNgZ4TW4B2I=",
"dev": true,
"optional": true
"optional": true,
"requires": {}
},
"ansi-regex": {
"version": "3.0.0",

@ -12,40 +12,41 @@
</el-input>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="创建时间" prop="creatortime">
<el-date-picker v-model="dataForm.creatortime" placeholder="请选择" clearable
:style='{"width":"100%"}' type="datetime" format="yyyy-MM-dd HH:mm:ss"
value-format="timestamp">
<!-- <el-col :span="24">-->
<!-- <el-form-item label="创建时间" prop="creatortime">-->
<!-- <el-date-picker v-model="dataForm.creatortime" 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="24">
<el-form-item label="创建人名称" prop="creatorusername">
<el-input v-model="dataForm.creatorusername" placeholder="请输入" clearable
:style='{"width":"100%"}'>
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="24">-->
<!-- <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-form-item label="修改时间" prop="lastmodifytime">
<el-date-picker v-model="dataForm.lastmodifytime" placeholder="请选择" clearable
:style='{"width":"100%"}' type="datetime" format="yyyy-MM-dd HH:mm:ss"
value-format="timestamp">
<!-- </el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="24">-->
<!-- <el-form-item label="修改时间" prop="lastmodifytime">-->
<!-- <el-date-picker v-model="dataForm.lastmodifytime" 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="24">
<el-form-item label="修改人名称" prop="lastmodifyusername">
<el-input v-model="dataForm.lastmodifyusername" placeholder="请输入" clearable
:style='{"width":"100%"}'>
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="24">-->
<!-- <el-form-item label="修改人名称" prop="lastmodifyusername">-->
<!-- <el-input v-model="dataForm.lastmodifyusername" placeholder="请输入" clearable-->
<!-- :style='{"width":"100%"}'>-->
<!-- </el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
</el-input>
</el-form-item>
</el-col>
</template>
</el-form>
</el-row>

@ -19,7 +19,8 @@
<el-form-item label="申请时间"
prop="businessDate">
<el-date-picker v-model="dataForm.businessDate"
placeholder="请选择" clearable :style='{"width":"100%"}' type="datetime" format="yyyy-MM-dd HH:mm:ss" 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>
@ -28,8 +29,11 @@
<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"
placeholder="请选择供应商名称" clearable field="supplierName" interfaceId="393307526961100037"
:columnOptions="supplierNamecolumnOptions" propsValue="supplier_name"
relationField="supplier_name" popupType="dialog"
popupTitle="选择数据" popupWidth="800px"
hasPage :pageSize="20"
>
</popupSelect>
@ -40,7 +44,8 @@
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-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>
@ -58,7 +63,8 @@
<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>
@ -68,7 +74,8 @@
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-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>
@ -96,7 +103,8 @@
prop="settlementType">
<el-select v-model="dataForm.settlementType"
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-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>
@ -133,7 +141,8 @@
prop="status">
<el-select v-model="dataForm.status"
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-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>
@ -172,7 +181,10 @@
<el-table-column prop="purchaseorderId" label="订单编号">
<template slot-scope="scope">
<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"
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>
@ -236,7 +248,9 @@
</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>
<el-button size="mini" type="text" class="JNPF-table-delBtn"
@click="delpaymentdoc_item0List(scope.$index)">删除
</el-button>
</template>
</el-table-column>
</el-table>
@ -261,6 +275,7 @@
import request from '@/utils/request'
import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
export default {
components: {},
props: [],
@ -272,23 +287,23 @@
dataForm: {
documentNo: '',
businessDate: '',
supplierName : "",
paymentType : "0",
supplierName: '',
paymentType: '0',
ramount: '',
dueDate: '',
currency : "0",
currency: '0',
collectionAccount: '',
colectionBank: '',
settlementType : "0",
settlementType: '0',
remark: '',
paymentAmount: '',
unpaymentAmount: '',
status : "",
creatorUserName : "",
creatorTime : "",
lastModifyUserName : "",
lastModifyTime : "",
paymentdoc_item0List:[],
status: '',
creatorUserName: '',
creatorTime: '',
lastModifyUserName: '',
lastModifyTime: '',
paymentdoc_item0List: []
},
activeshpeyb: '0',
rules:
@ -298,63 +313,87 @@
required: true,
message: '请输入',
trigger: 'blur'
},
}
],
amount: [{ required: true, message: '请输入', trigger: 'blur' }]
},
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"}],
supplierNamecolumnOptions: [{ 'label': '供应商名称', 'value': 'supplier_name' }, {
'label': '供应商编码',
'value': 'supplier_code'
}, { 'label': '供应商地点名称', 'value': 'supplier_site_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' }],
paymentdoc_item0purchaseorderIdcolumnOptions:[ {"label":"单据编号","value":"document_no"}, {"label":"合同编码","value":"contract_code"}, {"label":"重量","value":"num"}, {"label":"税额","value":"rate"}, {"label":"不含税金额","value":"not_amount"},],
paymentdoc_item0purchaseorderIdcolumnOptions: [{ 'label': '单据编号', 'value': 'document_no' }, {
'label': '合同编码',
'value': 'contract_code'
}, { 'label': '重量', 'value': 'num' }, { 'label': '税额', 'value': 'rate' }, {
'label': '不含税金额',
'value': 'not_amount'
}]
}
},
computed: {},
watch: {},
created() {
},
mounted() {},
mounted() {
},
methods: {
popupSelectorder(a, b) {
for (let i = 0; i < this.dataForm.paymentdoc_item0List.length; i++) {
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.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);
this.dataForm.ramount = parseFloat(this.dataForm.ramount) + parseFloat(b.amount)
}
}
},
paymentdoc_item0Exist() {
let isOk = true;
let isOk = true
for (let i = 0; i < this.dataForm.paymentdoc_item0List.length; i++) {
const e = this.dataForm.paymentdoc_item0List[i];
const e = this.dataForm.paymentdoc_item0List[i]
}
return isOk;
return isOk
},
clearData(data) {
for (let key in data) {
if (data[key] instanceof Array) {
data[key] = [];
data[key] = []
} else if (data[key] instanceof Object) {
this.clearData(data[key]);
this.clearData(data[key])
} else {
data[key] = "";
data[key] = ''
}
}
},
init(id, isDetail) {
this.dataForm.id = id || 0;
this.visible = true;
this.isDetail = isDetail || false;
this.dataForm.id = id || 0
this.visible = true
this.isDetail = isDetail || false
this.$nextTick(() => {
this.$refs['elForm'].resetFields();
this.$refs['elForm'].resetFields()
if (this.dataForm.id) {
this.loading = true
request({
@ -363,11 +402,11 @@
}).then(res => {
this.dataInfo(res.data)
this.loading = false
});
})
} else {
this.clearData(this.dataForm)
}
});
})
this.$store.commit('generator/UPDATE_RELATION_DATA', {})
},
//
@ -428,28 +467,28 @@
orgnizeId: undefined,
deleteUserId: undefined,
deleteUserName: undefined,
creatorTime:undefined,
creatorTime: undefined
}
this.dataForm.paymentdoc_item0List.push(item)
},
delpaymentdoc_item0List(index) {
this.dataForm.paymentdoc_item0List.splice(index, 1);
this.dataForm.paymentdoc_item0List.splice(index, 1)
},
dataList() {
var _data = JSON.parse(JSON.stringify(this.dataForm));
var _data = JSON.parse(JSON.stringify(this.dataForm))
for (let i = 0; i < _data.paymentdoc_item0List.length; i++) {
var _list = _data.paymentdoc_item0List[i];
var _list = _data.paymentdoc_item0List[i]
}
return _data;
return _data
},
dataInfo(dataAll) {
let _dataAll = dataAll
for (let i = 0; i < _dataAll.paymentdoc_item0List.length; i++) {
var _list = _dataAll.paymentdoc_item0List[i];
var _list = _dataAll.paymentdoc_item0List[i]
}
this.dataForm = _dataAll
},
},
}
}
}
</script>

@ -36,7 +36,7 @@
</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 type="success" size="medium" @click="paymentapply()">
</el-button>
</div>
<div class="JNPF-common-head-right">
@ -47,7 +47,8 @@
<screenfull isContainer/>
</div>
</div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c @selection-change="handleSelectionChange">
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
@selection-change="handleSelectionChange">
<el-table-column prop="documentNo" label="单据编号" width="0" align="left"
/>
<el-table-column prop="businessDate" label="申请时间" width="0" align="left"
@ -106,7 +107,8 @@ width="150" >
</template>
</el-table-column>
</JNPF-table>
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData"/>
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
@pagination="initData"/>
</div>
</div>
<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh"/>
@ -130,7 +132,7 @@ width="150" >
detailVisible: false,
query: {
documentNo: undefined,
status:undefined,
status: undefined
},
treeProps: {
children: 'children',
@ -143,8 +145,8 @@ width="150" >
listQuery: {
currentPage: 1,
pageSize: 20,
sort: "desc",
sidx: "",
sort: 'desc',
sidx: ''
},
formVisible: false,
exportBoxVisible: false,
@ -162,16 +164,28 @@ width="150" >
{ prop: 'paymentType', label: '付款类型' },
{ prop: 'settlementType', label: '结算类型' },
{ prop: 'status', label: '单据状态 ' },
{prop: 'creatorUserName', label: '制单人'},
{ prop: 'creatorUserName', label: '制单人' }
],
paymentTypeOptions:[{"fullName":"贷款","id":"0"},{"fullName":"物流运费","id":"1"},{"fullName":"仓储费","id":"2"},{"fullName":"委外加工费","id":"3"},{"fullName":"其他费用","id":"4"}],
paymentTypeProps:{"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"},
paymentTypeOptions: [{ 'fullName': '贷款', 'id': '0' }, { 'fullName': '物流运费', 'id': '1' }, {
'fullName': '仓储费',
'id': '2'
}, { 'fullName': '委外加工费', 'id': '3' }, { 'fullName': '其他费用', 'id': '4' }],
paymentTypeProps: { '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' }
}
},
computed: {
@ -195,20 +209,20 @@ width="150" >
this.initData()
},
initData() {
this.listLoading = true;
this.listLoading = true
let _query = {
...this.listQuery,
...this.query,
menuId: this.menuId
};
}
request({
url: `/api/example/Paymentdoc/getList`,
method: 'post',
data: _query
}).then(res => {
var _list =[];
var _list = []
for (let i = 0; i < res.data.list.length; i++) {
let _data = res.data.list[i];
let _data = res.data.list[i]
_list.push(_data)
}
this.list = _list
@ -231,10 +245,10 @@ width="150" >
onClose: () => {
this.initData()
}
});
})
})
}).catch(() => {
});
})
},
handleSelectionChange(val) {
const res = val.map(item => item.id)
@ -245,13 +259,13 @@ width="150" >
this.$message({
type: 'error',
message: '请选择一条数据',
duration: 1500,
duration: 1500
})
return
}
let ids = this.multipleSelection.join()
if (this.multipleSelection.length === 1) {
let info = {};
let info = {}
info = this.list.find(function(info) {
return info.id == ids
})
@ -259,27 +273,48 @@ width="150" >
this.$message({
type: 'error',
message: '审核中,请先通过审核',
duration: 1500,
duration: 1500
})
return
}else{
}
let id = this.multipleSelection.join()
let param = {}
param = this.list.find(function(param) {
return param.id == id
})
debugger
this.$router.push({path:'/api/collection/Collection'})
this.$router.push({ path: '/paymentdoc' })
request({
url: `/api/example/Paymentdoc/paymentapplylist`,
method: 'post',
data: param
}).then(res => {
this.$message({
type: 'success',
message: res.msg,
onClose: () => {
this.initData()
}
})
})
}
}if (this.multipleSelection.length >1){
if (this.multipleSelection.length > 1) {
this.$message({
type: 'error',
message: '请选择单条数据',
duration: 1500,
duration: 1500
})
}
},
handleBatchRemoveDel() {
if (!this.multipleSelection.length) {
this.$message({
type: 'error',
message: '请选择一条数据',
duration: 1500,
duration: 1500
})
return
}
@ -297,7 +332,7 @@ width="150" >
onClose: () => {
this.initData()
}
});
})
})
}).catch(() => {
})
@ -331,8 +366,8 @@ width="150" >
this.listQuery = {
currentPage: 1,
pageSize: 20,
sort: "desc",
sidx: "",
sort: 'desc',
sidx: ''
}
this.initData()
},

Loading…
Cancel
Save