yunxi
/
SC-MOM
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
product
chuang 2 years ago
parent 5123311151 fadb9543bc
commit 750c88a777
9 changed files with 1332 additions and 1081 deletions
Show Stats Download Patch File Download Diff File

10
SC-boot/linkage-scm/src/main/java/jnpf/payment/entity/PaymentEntity.java
Unescape View File

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

1
SC-boot/linkage-scm/src/main/java/jnpf/payment/mapper/PaymentMapper.java
Unescape View File

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

99
SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/controller/PaymentdocController.java
Unescape View File

@ -13,23 +13,19 @@ import jnpf.base.vo.PageListVO;
import jnpf.base.vo.PaginationVO; import jnpf.base.vo.PaginationVO;
import jnpf.base.UserInfo; import jnpf.base.UserInfo;
import jnpf.base.vo.DownloadVO; import jnpf.base.vo.DownloadVO;
import jnpf.collection.entity.CollectionEntity;
import jnpf.collection.service.CollectionService;
import jnpf.config.ConfigValueUtil; import jnpf.config.ConfigValueUtil;
import jnpf.exception.DataException; import jnpf.exception.DataException;
import jnpf.payment.entity.PaymentEntity; 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.PaymentService;
import jnpf.payment.service.Payment_item0Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import jnpf.base.entity.ProvinceEntity;
import jnpf.paymentdoc.model.paymentdoc.*; import jnpf.paymentdoc.model.paymentdoc.*;
import jnpf.paymentdoc.model.paymentdoc.PaymentdocPagination; import jnpf.paymentdoc.model.paymentdoc.PaymentdocPagination;
import jnpf.entity.*;
import jnpf.paymentdoc.entity.Paymentdoc_item0Entity; import jnpf.paymentdoc.entity.Paymentdoc_item0Entity;
import jnpf.util.*; 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.extern.slf4j.Slf4j;
import lombok.Cleanup; import lombok.Cleanup;
import org.apache.poi.hssf.usermodel.HSSFWorkbook; 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 org.springframework.web.bind.annotation.RestController;
import jnpf.paymentdoc.entity.PaymentdocEntity; import jnpf.paymentdoc.entity.PaymentdocEntity;
import jnpf.paymentdoc.service.PaymentdocService; import jnpf.paymentdoc.service.PaymentdocService;
import jnpf.paymentdoc.entity.Paymentdoc_item0Entity;
import jnpf.paymentdoc.service.Paymentdoc_item0Service; import jnpf.paymentdoc.service.Paymentdoc_item0Service;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.multipart.MultipartFile;
import javax.validation.Valid; import javax.validation.Valid;
import java.io.FileNotFoundException;
import java.io.FileOutputStream; import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
import jnpf.util.GeneraterSwapUtil; import jnpf.util.GeneraterSwapUtil;
@ -83,6 +77,10 @@ public class PaymentdocController {
private Paymentdoc_item0Service paymentdoc_item0Service; private Paymentdoc_item0Service paymentdoc_item0Service;
@Autowired @Autowired
private PaymentService paymentService; private PaymentService paymentService;
@Autowired
private PaymentMapper paymentMapper;
@Autowired
private Payment_item0Service payment_item0Service;
/** /**
* 付款申请 * 付款申请
@ -90,25 +88,62 @@ public class PaymentdocController {
* @param * @param
* @return * @return
*/ */
// @PostMapping("/paymentapplylist") // @GetMapping("/{id}")
// public ActionResult paymentapplylist( @PathVariable("id") String id,@RequestBody @Valid PaymentdocCrForm paymentdocCrForm){ @PostMapping("/paymentapplylist")
// public ActionResult paymentapplylist(@RequestBody PaymentdocCrForms paymentdocCrForms) throws DataException {
// PaymentEntity paymentEntity = new PaymentEntity();
PaymentEntity paymentEntity = new PaymentEntity();
PaymentCrForm paymentCrForm =new PaymentCrForm();
// String mainId =RandomUtil.uuId(); // String mainId =RandomUtil.uuId();
// UserInfo userInfo=userProvider.get(); // UserInfo userInfo=userProvider.get();
// // paymentEntity.setCreatorUserName(paymentdocUpForms.getCreatorUserName());
// paymentEntity.setCreatorUserName(paymentdocCrForm.getCreatorUserName());
// paymentEntity.setCreatorTime(new Date()); // paymentEntity.setCreatorTime(new Date());
// PaymentEntity entity = JsonUtil.getJsonToBean(paymentEntity, PaymentEntity.class);
// PaymentEntity entity = JsonUtil.getJsonToBean(paymentEntity, PaymentEntity.class);
// entity.setId(mainId); // entity.setId(mainId);
// paymentService.save(entity);
// PaymentdocEntity paymentdocEntity=paymentdocService.getById(paymentdocCrForms.getId());
// //添加到付款单
// paymentdocCrForm.setIsPay("1"); // paymentEntity.setId(paymentdocUpForms.getId());
// paymentdocService.update(paymentdocCrForm);
// return ActionResult.success("创建成功"); 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){ for(Paymentdoc_item0Entity entitys : Paymentdoc_item0List){
entitys.setId(RandomUtil.uuId()); entitys.setId(RandomUtil.uuId());
entitys.setPaymentdocId(entity.getId()); entitys.setPaymentdocId(entity.getId());
paymentdoc_item0Service.save(entitys); paymentdoc_item0Service.save(entitys);
} }

121
SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocCrForms.java
Unescape View File

@ -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;
}

36
SC-web/package-lock.json generated
Unescape View File

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

61
SC-web/src/views/scm/basicInformation/areasetting/Form.vue
Unescape View File

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

135
SC-web/src/views/scm/basicInformation/monitormanage/Form.vue
Unescape View File

@ -15,12 +15,24 @@
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24">
<el-form-item label="设备序列号"
prop="mName">
<el-input v-model="dataForm.serialnumber"
placeholder="请输入序列号" clearable :style='{"width":"100%"}'>
</el-input>
</el-form-item>
</el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="区域" <el-form-item label="区域"
prop="monitoringId"> prop="monitoringId">
<el-select v-model="dataForm.monitoringId" <el-select v-model="dataForm.monitoringId"
placeholder="请选择区域" clearable :style='{"width":"100%"}' filterable> placeholder="请选择区域" clearable :style='{"width":"100%"}' filterable>
<el-option v-for="(item, index) in monitoringIdOptions" :key="index" :label="item.m_name" :value="item.id" :disabled="item.disabled" ></el-option> <el-option v-for="(item, index) in monitoringIdOptions" :key="index" :label="item.m_name"
:value="item.id" :disabled="item.disabled"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -30,7 +42,8 @@
prop="mStatus"> prop="mStatus">
<el-select v-model="dataForm.mStatus" <el-select v-model="dataForm.mStatus"
placeholder="请选择设备状态" clearable :style='{"width":"100%"}'> placeholder="请选择设备状态" clearable :style='{"width":"100%"}'>
<el-option v-for="(item, index) in mStatusOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option> <el-option v-for="(item, index) in mStatusOptions" :key="index" :label="item.fullName" :value="item.id"
:disabled="item.disabled"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -67,47 +80,50 @@
prop="isEnable"> prop="isEnable">
<el-select v-model="dataForm.isEnable" <el-select v-model="dataForm.isEnable"
placeholder="请选择是否显示" clearable :style='{"width":"100%"}'> placeholder="请选择是否显示" clearable :style='{"width":"100%"}'>
<el-option v-for="(item, index) in isEnableOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option> <el-option v-for="(item, index) in isEnableOptions" :key="index" :label="item.fullName" :value="item.id"
:disabled="item.disabled"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24" > <!-- <el-col :span="24">-->
<el-form-item label="修改时间" <!-- <el-form-item label="修改时间"-->
prop="lastmodifytime" > <!-- prop="lastmodifytime">-->
<el-date-picker v-model="dataForm.lastmodifytime" <!-- <el-date-picker v-model="dataForm.lastmodifytime"-->
placeholder="请选择" readonly clearable :style='{"width":"100%"}' type="datetime" format="yyyy-MM-dd HH:mm:ss" value-format="timestamp" > <!-- placeholder="请选择" readonly clearable :style='{"width":"100%"}' type="datetime"-->
<!-- format="yyyy-MM-dd HH:mm:ss" value-format="timestamp">-->
</el-date-picker> <!-- </el-date-picker>-->
</el-form-item> <!-- </el-form-item>-->
</el-col> <!-- </el-col>-->
<el-col :span="24" > <!-- <el-col :span="24">-->
<el-form-item label="修改人id" <!-- <el-form-item label="修改人id"-->
prop="deleteUserId" > <!-- prop="deleteUserId">-->
<el-input v-model="dataForm.deleteUserId" <!-- <el-input v-model="dataForm.deleteUserId"-->
placeholder="请输入" readonly clearable :style='{"width":"100%"}'> <!-- placeholder="请输入" readonly clearable :style='{"width":"100%"}'>-->
</el-input> <!-- </el-input>-->
</el-form-item> <!-- </el-form-item>-->
</el-col> <!-- </el-col>-->
<el-col :span="24" > <!-- <el-col :span="24">-->
<el-form-item label="创建人名称" <!-- <el-form-item label="创建人名称"-->
prop="creatorUserName" > <!-- prop="creatorUserName">-->
<el-input v-model="dataForm.creatorUserName" <!-- <el-input v-model="dataForm.creatorUserName"-->
placeholder="请输入" readonly clearable :style='{"width":"100%"}'> <!-- placeholder="请输入" readonly clearable :style='{"width":"100%"}'>-->
</el-input> <!-- </el-input>-->
</el-form-item> <!-- </el-form-item>-->
</el-col> <!-- </el-col>-->
<el-col :span="24" > <!-- <el-col :span="24">-->
<el-form-item label="创建时间" <!-- <el-form-item label="创建时间"-->
prop="creatorTime" > <!-- prop="creatorTime">-->
<el-date-picker v-model="dataForm.creatorTime" <!-- <el-date-picker v-model="dataForm.creatorTime"-->
placeholder="请选择" readonly clearable :style='{"width":"100%"}' type="datetime" format="yyyy-MM-dd HH:mm:ss" value-format="timestamp" > <!-- placeholder="请选择" readonly clearable :style='{"width":"100%"}' type="datetime"-->
<!-- format="yyyy-MM-dd HH:mm:ss" value-format="timestamp">-->
</el-date-picker> <!-- </el-date-picker>-->
</el-form-item> <!-- </el-form-item>-->
</el-col> <!-- </el-col>-->
</template> </template>
</el-form> </el-form>
</el-row> </el-row>
@ -121,6 +137,7 @@
import request from '@/utils/request' import request from '@/utils/request'
import { getDataInterfaceRes } from '@/api/systemData/dataInterface' import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
import { getDictionaryDataSelector } from '@/api/systemData/dictionary' import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
export default { export default {
components: {}, components: {},
props: [], props: [],
@ -131,17 +148,18 @@
isDetail: false, isDetail: false,
dataForm: { dataForm: {
mName: '', mName: '',
monitoringId : "", monitoringId: '',
serialnumber: '', serialnumber: '',
mStatus : "0", mStatus: '0',
flvAddress: '', flvAddress: '',
flvHdAddress: '', flvHdAddress: '',
channelNumber: '', channelNumber: '',
isEnable : "0", isEnable: '0',
lastmodifytime: '', lastmodifytime: '',
deleteUserId: '', deleteUserId: '',
creatorUserName: '', creatorUserName: '',
creatorTime : '', creatorTime: ''
}, },
rules: rules:
{ {
@ -150,21 +168,22 @@
required: true, required: true,
message: '请输入设备名称', message: '请输入设备名称',
trigger: 'blur' trigger: 'blur'
}, }
], ]
}, },
monitoringIdOptions: [], monitoringIdOptions: [],
mStatusOptions:[{"fullName":"在线","id":"1"},{"fullName":"不在线","id":"0"}], mStatusOptions: [{ 'fullName': '在线', 'id': '1' }, { 'fullName': '不在线', 'id': '0' }],
isEnableOptions:[{"fullName":"显示","id":"1"},{"fullName":"不显示","id":"0"}], isEnableOptions: [{ 'fullName': '显示', 'id': '1' }, { 'fullName': '不显示', 'id': '0' }]
} }
}, },
computed: {}, computed: {},
watch: {}, watch: {},
created() { created() {
this.getmonitoringIdOptions(); this.getmonitoringIdOptions()
},
mounted() {
}, },
mounted() {},
methods: { methods: {
getmonitoringIdOptions() { getmonitoringIdOptions() {
getDataInterfaceRes('370933183241262469').then(res => { getDataInterfaceRes('370933183241262469').then(res => {
@ -175,20 +194,20 @@
clearData(data) { clearData(data) {
for (let key in data) { for (let key in data) {
if (data[key] instanceof Array) { if (data[key] instanceof Array) {
data[key] = []; data[key] = []
} else if (data[key] instanceof Object) { } else if (data[key] instanceof Object) {
this.clearData(data[key]); this.clearData(data[key])
} else { } else {
data[key] = ""; data[key] = ''
} }
} }
}, },
init(id, isDetail) { init(id, isDetail) {
this.dataForm.id = id || 0; this.dataForm.id = id || 0
this.visible = true; this.visible = true
this.isDetail = isDetail || false; this.isDetail = isDetail || false
this.$nextTick(() => { this.$nextTick(() => {
this.$refs['elForm'].resetFields(); this.$refs['elForm'].resetFields()
if (this.dataForm.id) { if (this.dataForm.id) {
this.loading = true this.loading = true
request({ request({
@ -197,11 +216,11 @@
}).then(res => { }).then(res => {
this.dataInfo(res.data) this.dataInfo(res.data)
this.loading = false this.loading = false
}); })
} else { } else {
this.clearData(this.dataForm) this.clearData(this.dataForm)
} }
}); })
this.$store.commit('generator/UPDATE_RELATION_DATA', {}) this.$store.commit('generator/UPDATE_RELATION_DATA', {})
}, },
// 表单提交 // 表单提交
@ -249,14 +268,14 @@
} }
}, },
dataList() { dataList() {
var _data = JSON.parse(JSON.stringify(this.dataForm)); var _data = JSON.parse(JSON.stringify(this.dataForm))
return _data; return _data
}, },
dataInfo(dataAll) { dataInfo(dataAll) {
let _dataAll = dataAll let _dataAll = dataAll
this.dataForm = _dataAll this.dataForm = _dataAll
}, }
}, }
} }
</script> </script>

145
SC-web/src/views/scm/basicInformation/paymentdoc/Form.vue
Unescape View File

@ -19,7 +19,8 @@
<el-form-item label="申请时间" <el-form-item label="申请时间"
prop="businessDate"> prop="businessDate">
<el-date-picker v-model="dataForm.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-date-picker>
</el-form-item> </el-form-item>
@ -28,8 +29,11 @@
<el-form-item label="供应商名称" <el-form-item label="供应商名称"
prop="supplierName"> prop="supplierName">
<popupSelect v-model="dataForm.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" popupTitle="选择数据" popupWidth="800px"
hasPage :pageSize="20"
> >
</popupSelect> </popupSelect>
@ -40,7 +44,8 @@
prop="paymentType"> prop="paymentType">
<el-select v-model="dataForm.paymentType" <el-select v-model="dataForm.paymentType"
placeholder="请选择" clearable :style='{"width":"100%"}'> 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-select>
</el-form-item> </el-form-item>
@ -58,7 +63,8 @@
<el-form-item label="应付日期" <el-form-item label="应付日期"
prop="dueDate"> prop="dueDate">
<el-date-picker v-model="dataForm.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-date-picker>
</el-form-item> </el-form-item>
@ -68,7 +74,8 @@
prop="currency"> prop="currency">
<el-select v-model="dataForm.currency" <el-select v-model="dataForm.currency"
placeholder="请选择" clearable :style='{"width":"100%"}'> 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-select>
</el-form-item> </el-form-item>
@ -96,7 +103,8 @@
prop="settlementType"> prop="settlementType">
<el-select v-model="dataForm.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-option v-for="(item, index) in settlementTypeOptions" :key="index" :label="item.fullName"
:value="item.id" :disabled="item.disabled"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -133,7 +141,8 @@
prop="status"> prop="status">
<el-select v-model="dataForm.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-option v-for="(item, index) in statusOptions" :key="index" :label="item.fullName" :value="item.id"
:disabled="item.disabled"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -172,7 +181,10 @@
<el-table-column prop="purchaseorderId" label="订单编号"> <el-table-column prop="purchaseorderId" label="订单编号">
<template slot-scope="scope"> <template slot-scope="scope">
<popupSelect v-model="scope.row.purchaseorderId" <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" popupWidth="800px" @change="popupSelectorder"
hasPage :pageSize="20"> hasPage :pageSize="20">
</popupSelect> </popupSelect>
@ -236,7 +248,9 @@
</el-table-column> </el-table-column>
<el-table-column label="操作" width="50"> <el-table-column label="操作" width="50">
<template slot-scope="scope"> <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> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -261,6 +275,7 @@
import request from '@/utils/request' import request from '@/utils/request'
import { getDataInterfaceRes } from '@/api/systemData/dataInterface' import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
import { getDictionaryDataSelector } from '@/api/systemData/dictionary' import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
export default { export default {
components: {}, components: {},
props: [], props: [],
@ -272,23 +287,23 @@
dataForm: { dataForm: {
documentNo: '', documentNo: '',
businessDate: '', businessDate: '',
supplierName : "", supplierName: '',
paymentType : "0", paymentType: '0',
ramount: '', ramount: '',
dueDate: '', dueDate: '',
currency : "0", currency: '0',
collectionAccount: '', collectionAccount: '',
colectionBank: '', colectionBank: '',
settlementType : "0", settlementType: '0',
remark: '', remark: '',
paymentAmount: '', paymentAmount: '',
unpaymentAmount: '', unpaymentAmount: '',
status : "", status: '',
creatorUserName : "", creatorUserName: '',
creatorTime : "", creatorTime: '',
lastModifyUserName : "", lastModifyUserName: '',
lastModifyTime : "", lastModifyTime: '',
paymentdoc_item0List:[], paymentdoc_item0List: []
}, },
activeshpeyb: '0', activeshpeyb: '0',
rules: rules:
@ -298,63 +313,87 @@
required: true, required: true,
message: '请输入', message: '请输入',
trigger: 'blur' trigger: 'blur'
}, }
], ],
amount: [{ required: true, message: '请输入', trigger: 'blur' }]
}, },
supplierNamecolumnOptions:[ {"label":"供应商名称","value":"supplier_name"}, {"label":"供应商编码","value":"supplier_code"},], supplierNamecolumnOptions: [{ 'label': '供应商名称', 'value': 'supplier_name' }, {
paymentTypeOptions:[{"fullName":"贷款","id":"0"},{"fullName":"物流运费","id":"1"},{"fullName":"仓储费","id":"2"},{"fullName":"委外加工费","id":"3"},{"fullName":"其他费用","id":"4"}], 'label': '供应商编码',
currencyOptions:[{"fullName":"人民币","id":"0"},{"fullName":"美元","id":"1"},{"fullName":"英镑","id":"2"}], 'value': 'supplier_code'
settlementTypeOptions:[{"fullName":"现金","id":"0"},{"fullName":"赊购","id":"1"},{"fullName":"网银","id":"2"},{"fullName":"银企直连","id":"3"},{"fullName":"银票","id":"4"},{"fullName":"商票","id":"5"}], }, { 'label': '供应商地点名称', 'value': 'supplier_site_code' }],
statusOptions:[{"fullName":"已保存","id":"0"},{"fullName":"审批中","id":"1"},{"fullName":"已审批","id":"2"},{"fullName":"已付款","id":"3"}], 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: {}, computed: {},
watch: {}, watch: {},
created() { created() {
}, },
mounted() {}, mounted() {
},
methods: { methods: {
popupSelectorder(a, b) { popupSelectorder(a, b) {
for (let i = 0; i < this.dataForm.paymentdoc_item0List.length; i++) { for (let i = 0; i < this.dataForm.paymentdoc_item0List.length; i++) {
if (a == this.dataForm.paymentdoc_item0List[i].purchaseorderId) { if (a == this.dataForm.paymentdoc_item0List[i].purchaseorderId) {
this.dataForm.paymentdoc_item0List[i].lastModifyUserId = b.contract_code; this.dataForm.paymentdoc_item0List[i].lastModifyUserId = b.contract_code
this.dataForm.paymentdoc_item0List[i].lastModifyUserName = b.num; this.dataForm.paymentdoc_item0List[i].lastModifyUserName = b.num
this.dataForm.paymentdoc_item0List[i].departmentId = b.advance_amount; this.dataForm.paymentdoc_item0List[i].departmentId = b.advance_amount
this.dataForm.paymentdoc_item0List[i].orgnizeId = b.rate; this.dataForm.paymentdoc_item0List[i].orgnizeId = b.rate
this.dataForm.paymentdoc_item0List[i].deleteUserId = b.not_amount; 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() { paymentdoc_item0Exist() {
let isOk = true; let isOk = true
for (let i = 0; i < this.dataForm.paymentdoc_item0List.length; i++) { 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) { clearData(data) {
for (let key in data) { for (let key in data) {
if (data[key] instanceof Array) { if (data[key] instanceof Array) {
data[key] = []; data[key] = []
} else if (data[key] instanceof Object) { } else if (data[key] instanceof Object) {
this.clearData(data[key]); this.clearData(data[key])
} else { } else {
data[key] = ""; data[key] = ''
} }
} }
}, },
init(id, isDetail) { init(id, isDetail) {
this.dataForm.id = id || 0; this.dataForm.id = id || 0
this.visible = true; this.visible = true
this.isDetail = isDetail || false; this.isDetail = isDetail || false
this.$nextTick(() => { this.$nextTick(() => {
this.$refs['elForm'].resetFields(); this.$refs['elForm'].resetFields()
if (this.dataForm.id) { if (this.dataForm.id) {
this.loading = true this.loading = true
request({ request({
@ -363,11 +402,11 @@
}).then(res => { }).then(res => {
this.dataInfo(res.data) this.dataInfo(res.data)
this.loading = false this.loading = false
}); })
} else { } else {
this.clearData(this.dataForm) this.clearData(this.dataForm)
} }
}); })
this.$store.commit('generator/UPDATE_RELATION_DATA', {}) this.$store.commit('generator/UPDATE_RELATION_DATA', {})
}, },
// 表单提交 // 表单提交
@ -428,28 +467,28 @@
orgnizeId: undefined, orgnizeId: undefined,
deleteUserId: undefined, deleteUserId: undefined,
deleteUserName: undefined, deleteUserName: undefined,
creatorTime:undefined, creatorTime: undefined
} }
this.dataForm.paymentdoc_item0List.push(item) this.dataForm.paymentdoc_item0List.push(item)
}, },
delpaymentdoc_item0List(index) { delpaymentdoc_item0List(index) {
this.dataForm.paymentdoc_item0List.splice(index, 1); this.dataForm.paymentdoc_item0List.splice(index, 1)
}, },
dataList() { 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++) { 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) { dataInfo(dataAll) {
let _dataAll = dataAll let _dataAll = dataAll
for (let i = 0; i < _dataAll.paymentdoc_item0List.length; i++) { 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 this.dataForm = _dataAll
}, }
}, }
} }
</script> </script>

99
SC-web/src/views/scm/basicInformation/paymentdoc/index.vue
Unescape View File

@ -36,7 +36,7 @@
</el-button> </el-button>
<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除 <el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
</el-button> </el-button>
<el-button type="primary" icon="el-icon-plus" @click="paymentapply()" >付款 <el-button type="success" size="medium" @click="paymentapply()">付款
</el-button> </el-button>
</div> </div>
<div class="JNPF-common-head-right"> <div class="JNPF-common-head-right">
@ -47,7 +47,8 @@
<screenfull isContainer/> <screenfull isContainer/>
</div> </div>
</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="documentNo" label="单据编号" width="0" align="left"
/> />
<el-table-column prop="businessDate" label="申请时间" width="0" align="left" <el-table-column prop="businessDate" label="申请时间" width="0" align="left"
@ -106,7 +107,8 @@ width="150" >
</template> </template>
</el-table-column> </el-table-column>
</JNPF-table> </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>
</div> </div>
<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh"/> <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh"/>
@ -130,7 +132,7 @@ width="150" >
detailVisible: false, detailVisible: false,
query: { query: {
documentNo: undefined, documentNo: undefined,
status:undefined, status: undefined
}, },
treeProps: { treeProps: {
children: 'children', children: 'children',
@ -143,8 +145,8 @@ width="150" >
listQuery: { listQuery: {
currentPage: 1, currentPage: 1,
pageSize: 20, pageSize: 20,
sort: "desc", sort: 'desc',
sidx: "", sidx: ''
}, },
formVisible: false, formVisible: false,
exportBoxVisible: false, exportBoxVisible: false,
@ -162,16 +164,28 @@ width="150" >
{ prop: 'paymentType', label: '付款类型' }, { prop: 'paymentType', label: '付款类型' },
{ prop: 'settlementType', label: '结算类型' }, { prop: 'settlementType', label: '结算类型' },
{ prop: 'status', 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"}], paymentTypeOptions: [{ 'fullName': '贷款', 'id': '0' }, { 'fullName': '物流运费', 'id': '1' }, {
paymentTypeProps:{"label":"fullName","value":"id"}, 'fullName': '仓储费',
currencyOptions:[{"fullName":"人民币","id":"0"},{"fullName":"美元","id":"1"},{"fullName":"英镑","id":"2"}], 'id': '2'
currencyProps:{"label":"fullName","value":"id"}, }, { 'fullName': '委外加工费', 'id': '3' }, { 'fullName': '其他费用', 'id': '4' }],
settlementTypeOptions:[{"fullName":"现金","id":"0"},{"fullName":"赊购","id":"1"},{"fullName":"网银","id":"2"},{"fullName":"银企直连","id":"3"},{"fullName":"银票","id":"4"},{"fullName":"商票","id":"5"}], paymentTypeProps: { 'label': 'fullName', 'value': 'id' },
settlementTypeProps:{"label":"fullName","value":"id"}, currencyOptions: [{ 'fullName': '人民币', 'id': '0' }, { 'fullName': '美元', 'id': '1' }, {
statusOptions:[{"fullName":"已保存","id":"0"},{"fullName":"审批中","id":"1"},{"fullName":"已审批","id":"2"},{"fullName":"已付款","id":"3"}], 'fullName': '英镑',
statusProps:{"label":"fullName","value":"id"}, '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: { computed: {
@ -195,20 +209,20 @@ width="150" >
this.initData() this.initData()
}, },
initData() { initData() {
this.listLoading = true; this.listLoading = true
let _query = { let _query = {
...this.listQuery, ...this.listQuery,
...this.query, ...this.query,
menuId: this.menuId menuId: this.menuId
}; }
request({ request({
url: `/api/example/Paymentdoc/getList`, url: `/api/example/Paymentdoc/getList`,
method: 'post', method: 'post',
data: _query data: _query
}).then(res => { }).then(res => {
var _list =[]; var _list = []
for (let i = 0; i < res.data.list.length; i++) { 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) _list.push(_data)
} }
this.list = _list this.list = _list
@ -231,10 +245,10 @@ width="150" >
onClose: () => { onClose: () => {
this.initData() this.initData()
} }
}); })
}) })
}).catch(() => { }).catch(() => {
}); })
}, },
handleSelectionChange(val) { handleSelectionChange(val) {
const res = val.map(item => item.id) const res = val.map(item => item.id)
@ -245,13 +259,13 @@ width="150" >
this.$message({ this.$message({
type: 'error', type: 'error',
message: '请选择一条数据', message: '请选择一条数据',
duration: 1500, duration: 1500
}) })
return return
} }
let ids = this.multipleSelection.join() let ids = this.multipleSelection.join()
if (this.multipleSelection.length === 1) { if (this.multipleSelection.length === 1) {
let info = {}; let info = {}
info = this.list.find(function(info) { info = this.list.find(function(info) {
return info.id == ids return info.id == ids
}) })
@ -259,27 +273,48 @@ width="150" >
this.$message({ this.$message({
type: 'error', type: 'error',
message: '审核中，请先通过审核', message: '审核中，请先通过审核',
duration: 1500, duration: 1500
}) })
return return
}else{ }
let id = this.multipleSelection.join()
let param = {}
param = this.list.find(function(param) {
return param.id == id
})
debugger 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({ this.$message({
type: 'error', type: 'error',
message: '请选择单条数据', message: '请选择单条数据',
duration: 1500, duration: 1500
}) })
} }
}, },
handleBatchRemoveDel() { handleBatchRemoveDel() {
if (!this.multipleSelection.length) { if (!this.multipleSelection.length) {
this.$message({ this.$message({
type: 'error', type: 'error',
message: '请选择一条数据', message: '请选择一条数据',
duration: 1500, duration: 1500
}) })
return return
} }
@ -297,7 +332,7 @@ width="150" >
onClose: () => { onClose: () => {
this.initData() this.initData()
} }
}); })
}) })
}).catch(() => { }).catch(() => {
}) })
@ -331,8 +366,8 @@ width="150" >
this.listQuery = { this.listQuery = {
currentPage: 1, currentPage: 1,
pageSize: 20, pageSize: 20,
sort: "desc", sort: 'desc',
sidx: "", sidx: ''
} }
this.initData() this.initData()
}, },

Write Preview
Loading…
Cancel
Save