入库去掉凭证,和填入报表

jg-waiwang-pro
XI_TENG\xixi_ 3 months ago
parent de91952026
commit 551b314da0

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="jnpf.mapper.SubjectDutyMapper">
</mapper>

@ -0,0 +1,16 @@
package jnpf.mapper;
import jnpf.entity.SubjectDutyEntity;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* subjectDuty
* V3.5
* https://www.jnpfsoft.com
* JNPF
* 2024-08-01
*/
public interface SubjectDutyMapper extends BaseMapper<SubjectDutyEntity> {
}

@ -0,0 +1,35 @@
package jnpf.service;
import jnpf.model.subjectduty.*;
import jnpf.entity.*;
import java.util.*;
import com.baomidou.mybatisplus.extension.service.IService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
/**
* subjectDuty
* V3.5
* https://www.jnpfsoft.com
* JNPF
* 2024-08-01
*/
public interface SubjectDutyService extends IService<SubjectDutyEntity> {
List<SubjectDutyEntity> getList(SubjectDutyPagination subjectDutyPagination);
List<SubjectDutyEntity> getTypeList(SubjectDutyPagination subjectDutyPagination,String dataType);
SubjectDutyEntity getInfo(String id);
void delete(SubjectDutyEntity entity);
void create(SubjectDutyEntity entity);
boolean update(String id, SubjectDutyEntity entity);
//子表方法
//副表数据方法
String checkForm(SubjectDutyForm form,int i);
void saveOrUpdate(SubjectDutyForm subjectDutyForm,String id, boolean isSave) throws Exception;
}

@ -0,0 +1,302 @@
package jnpf.service.impl;
import jnpf.entity.*;
import jnpf.mapper.SubjectDutyMapper;
import jnpf.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import jnpf.model.subjectduty.*;
import java.math.BigDecimal;
import cn.hutool.core.util.ObjectUtil;
import jnpf.permission.model.authorize.AuthorizeConditionModel;
import jnpf.util.GeneraterSwapUtil;
import jnpf.database.model.superQuery.SuperQueryJsonModel;
import jnpf.database.model.superQuery.ConditionJsonModel;
import jnpf.database.model.superQuery.SuperQueryConditionModel;
import java.lang.reflect.Field;
import com.baomidou.mybatisplus.annotation.TableField;
import java.util.regex.Pattern;
import jnpf.model.QueryModel;
import java.util.stream.Collectors;
import jnpf.base.model.ColumnDataModel;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import jnpf.database.model.superQuery.SuperJsonModel;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import java.text.SimpleDateFormat;
import jnpf.util.*;
import java.util.*;
import jnpf.base.UserInfo;
import jnpf.permission.entity.UserEntity;
/**
*
* subjectDuty
* V3.5
* https://www.jnpfsoft.com
* JNPF
* 2024-08-01
*/
@Service
public class SubjectDutyServiceImpl extends ServiceImpl<SubjectDutyMapper, SubjectDutyEntity> implements SubjectDutyService{
@Autowired
private GeneraterSwapUtil generaterSwapUtil;
@Autowired
private UserProvider userProvider;
@Override
public List<SubjectDutyEntity> getList(SubjectDutyPagination subjectDutyPagination){
return getTypeList(subjectDutyPagination,subjectDutyPagination.getDataType());
}
/** 列表查询 */
@Override
public List<SubjectDutyEntity> getTypeList(SubjectDutyPagination subjectDutyPagination,String dataType){
String userId=userProvider.get().getUserId();
List<String> AllIdList =new ArrayList();
List<List<String>> intersectionList =new ArrayList<>();
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
String columnData = !isPc ? SubjectDutyConstant.getAppColumnData() : SubjectDutyConstant.getColumnData();
ColumnDataModel columnDataModel = JsonUtil.getJsonToBean(columnData, ColumnDataModel.class);
String ruleJson = !isPc ? JsonUtil.getObjectToString(columnDataModel.getRuleListApp()) : JsonUtil.getObjectToString(columnDataModel.getRuleList());
int total=0;
int subjectDutyNum =0;
QueryWrapper<SubjectDutyEntity> subjectDutyQueryWrapper=new QueryWrapper<>();
List<String> allSuperIDlist = new ArrayList<>();
String superOp ="";
if (ObjectUtil.isNotEmpty(subjectDutyPagination.getSuperQueryJson())){
List<String> allSuperList = new ArrayList<>();
List<List<String>> intersectionSuperList = new ArrayList<>();
String queryJson = subjectDutyPagination.getSuperQueryJson();
SuperJsonModel superJsonModel = JsonUtil.getJsonToBean(queryJson, SuperJsonModel.class);
int superNum = 0;
QueryWrapper<SubjectDutyEntity> subjectDutySuperWrapper = new QueryWrapper<>();
subjectDutySuperWrapper = generaterSwapUtil.getCondition(new QueryModel(subjectDutySuperWrapper,SubjectDutyEntity.class,queryJson,"0"));
int subjectDutyNum1 = subjectDutySuperWrapper.getExpression().getNormal().size();
if (subjectDutyNum1>0){
List<String> subjectDutyList =this.list(subjectDutySuperWrapper).stream().map(SubjectDutyEntity::getId).collect(Collectors.toList());
allSuperList.addAll(subjectDutyList);
intersectionSuperList.add(subjectDutyList);
superNum++;
}
superOp = superNum > 0 ? superJsonModel.getMatchLogic() : "";
//and or
if(superOp.equalsIgnoreCase("and")){
allSuperIDlist = generaterSwapUtil.getIntersection(intersectionSuperList);
}else{
allSuperIDlist = allSuperList;
}
}
List<String> allRuleIDlist = new ArrayList<>();
String ruleOp ="";
if (ObjectUtil.isNotEmpty(ruleJson)){
List<String> allRuleList = new ArrayList<>();
List<List<String>> intersectionRuleList = new ArrayList<>();
SuperJsonModel ruleJsonModel = JsonUtil.getJsonToBean(ruleJson, SuperJsonModel.class);
int ruleNum = 0;
QueryWrapper<SubjectDutyEntity> subjectDutySuperWrapper = new QueryWrapper<>();
subjectDutySuperWrapper = generaterSwapUtil.getCondition(new QueryModel(subjectDutySuperWrapper,SubjectDutyEntity.class,ruleJson,"0"));
int subjectDutyNum1 = subjectDutySuperWrapper.getExpression().getNormal().size();
if (subjectDutyNum1>0){
List<String> subjectDutyList =this.list(subjectDutySuperWrapper).stream().map(SubjectDutyEntity::getId).collect(Collectors.toList());
allRuleList.addAll(subjectDutyList);
intersectionRuleList.add(subjectDutyList);
ruleNum++;
}
ruleOp = ruleNum > 0 ? ruleJsonModel.getMatchLogic() : "";
//and or
if(ruleOp.equalsIgnoreCase("and")){
allRuleIDlist = generaterSwapUtil.getIntersection(intersectionRuleList);
}else{
allRuleIDlist = allRuleList;
}
}
boolean pcPermission = true;
boolean appPermission = false;
if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){
Object subjectDutyObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(subjectDutyQueryWrapper,SubjectDutyEntity.class,subjectDutyPagination.getMenuId(),"0"));
if (ObjectUtil.isEmpty(subjectDutyObj)){
return new ArrayList<>();
} else {
subjectDutyQueryWrapper = (QueryWrapper<SubjectDutyEntity>)subjectDutyObj;
if( subjectDutyQueryWrapper.getExpression().getNormal().size()>0){
subjectDutyNum++;
}
}
}
}
if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){
Object subjectDutyObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(subjectDutyQueryWrapper,SubjectDutyEntity.class,subjectDutyPagination.getMenuId(),"0"));
if (ObjectUtil.isEmpty(subjectDutyObj)){
return new ArrayList<>();
} else {
subjectDutyQueryWrapper = (QueryWrapper<SubjectDutyEntity>)subjectDutyObj;
if( subjectDutyQueryWrapper.getExpression().getNormal().size()>0){
subjectDutyNum++;
}
}
}
}
if(isPc){
if(ObjectUtil.isNotEmpty(subjectDutyPagination.getSubject())){
subjectDutyNum++;
String value = subjectDutyPagination.getSubject() instanceof List ?
JsonUtil.getObjectToString(subjectDutyPagination.getSubject()) :
String.valueOf(subjectDutyPagination.getSubject());
subjectDutyQueryWrapper.lambda().like(SubjectDutyEntity::getSubject,value);
}
if(ObjectUtil.isNotEmpty(subjectDutyPagination.getSettlement())){
subjectDutyNum++;
String value = subjectDutyPagination.getSettlement() instanceof List ?
JsonUtil.getObjectToString(subjectDutyPagination.getSettlement()) :
String.valueOf(subjectDutyPagination.getSettlement());
subjectDutyQueryWrapper.lambda().like(SubjectDutyEntity::getSettlement,value);
}
if(ObjectUtil.isNotEmpty(subjectDutyPagination.getMouth())){
subjectDutyNum++;
List MouthList = JsonUtil.getJsonToList(subjectDutyPagination.getMouth(),String.class);
Long fir = Long.valueOf(String.valueOf(MouthList.get(0)));
Long sec = Long.valueOf(String.valueOf(MouthList.get(1)));
subjectDutyQueryWrapper.lambda().ge(SubjectDutyEntity::getMouth, new Date(fir))
.le(SubjectDutyEntity::getMouth, DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59"));
}
}
List<String> intersection = generaterSwapUtil.getIntersection(intersectionList);
if (total>0){
if (intersection.size()==0){
intersection.add("jnpfNullList");
}
subjectDutyQueryWrapper.lambda().in(SubjectDutyEntity::getId, intersection);
}
//是否有高级查询
if (StringUtil.isNotEmpty(superOp)){
if (allSuperIDlist.size()==0){
allSuperIDlist.add("jnpfNullList");
}
List<String> finalAllSuperIDlist = allSuperIDlist;
subjectDutyQueryWrapper.lambda().and(t->t.in(SubjectDutyEntity::getId, finalAllSuperIDlist));
}
//是否有数据过滤查询
if (StringUtil.isNotEmpty(ruleOp)){
if (allRuleIDlist.size()==0){
allRuleIDlist.add("jnpfNullList");
}
List<String> finalAllRuleIDlist = allRuleIDlist;
subjectDutyQueryWrapper.lambda().and(t->t.in(SubjectDutyEntity::getId, finalAllRuleIDlist));
}
//假删除标志
subjectDutyQueryWrapper.lambda().isNull(SubjectDutyEntity::getDeleteMark);
//排序
if(StringUtil.isEmpty(subjectDutyPagination.getSidx())){
subjectDutyQueryWrapper.lambda().orderByDesc(SubjectDutyEntity::getId);
}else{
try {
String sidx = subjectDutyPagination.getSidx();
String[] strs= sidx.split("_name");
SubjectDutyEntity subjectDutyEntity = new SubjectDutyEntity();
Field declaredField = subjectDutyEntity.getClass().getDeclaredField(strs[0]);
declaredField.setAccessible(true);
String value = declaredField.getAnnotation(TableField.class).value();
subjectDutyQueryWrapper="asc".equals(subjectDutyPagination.getSort().toLowerCase())?subjectDutyQueryWrapper.orderByAsc(value):subjectDutyQueryWrapper.orderByDesc(value);
} catch (NoSuchFieldException e) {
e.printStackTrace();
}
}
if("0".equals(dataType)){
if((total>0 && AllIdList.size()>0) || total==0){
Page<SubjectDutyEntity> page=new Page<>(subjectDutyPagination.getCurrentPage(), subjectDutyPagination.getPageSize());
IPage<SubjectDutyEntity> userIPage=this.page(page, subjectDutyQueryWrapper);
return subjectDutyPagination.setData(userIPage.getRecords(),userIPage.getTotal());
}else{
List<SubjectDutyEntity> list = new ArrayList();
return subjectDutyPagination.setData(list, list.size());
}
}else{
return this.list(subjectDutyQueryWrapper);
}
}
@Override
public SubjectDutyEntity getInfo(String id){
QueryWrapper<SubjectDutyEntity> queryWrapper=new QueryWrapper<>();
queryWrapper.lambda().eq(SubjectDutyEntity::getId,id);
return this.getOne(queryWrapper);
}
@Override
public void create(SubjectDutyEntity entity){
this.save(entity);
}
@Override
public boolean update(String id, SubjectDutyEntity entity){
return this.updateById(entity);
}
@Override
public void delete(SubjectDutyEntity entity){
if(entity!=null){
this.removeById(entity.getId());
}
}
/** 验证表单唯一字段,正则,非空 i-0新增-1修改*/
@Override
public String checkForm(SubjectDutyForm form,int i) {
boolean isUp =StringUtil.isNotEmpty(form.getId()) && !form.getId().equals("0");
String id="";
String countRecover = "";
if (isUp){
id = form.getId();
}
//主表字段验证
if(StringUtil.isEmpty(form.getSubject())){
return "供应商名称不能为空";
}
if(StringUtil.isEmpty(form.getAmount())){
return "当月供货金额(不含税)不能为空";
}
if(StringUtil.isEmpty(form.getSettlement())){
return "当月供货量(吨)不能为空";
}
return countRecover;
}
/**
* ()
* @param id
* @param subjectDutyForm
* @return
*/
@Override
@Transactional
public void saveOrUpdate(SubjectDutyForm subjectDutyForm,String id, boolean isSave) throws Exception{
UserInfo userInfo=userProvider.get();
UserEntity userEntity = generaterSwapUtil.getUser(userInfo.getUserId());
subjectDutyForm = JsonUtil.getJsonToBean(
generaterSwapUtil.swapDatetime(SubjectDutyConstant.getFormData(),subjectDutyForm),SubjectDutyForm.class);
SubjectDutyEntity entity = JsonUtil.getJsonToBean(subjectDutyForm, SubjectDutyEntity.class);
if(isSave){
String mainId = RandomUtil.uuId() ;
entity.setId(mainId);
entity.setVersion(0);
}else{
}
this.saveOrUpdate(entity);
}
}

@ -531,23 +531,23 @@ public class WarehousingStorageServiceImpl extends ServiceImpl<WarehousingStorag
// }
BigDecimal maxNum = BigDecimal.ZERO;
BigDecimal netWeightNum = BigDecimal.ZERO;
for (WarehousingStorageProductModel warehousingStorageProductModel : form.getWarehousingStorageProductList()) {
maxNum = maxNum.add( new BigDecimal(warehousingStorageProductModel.getStorageNumber())) ;
}
for (WarehousingStoragePoundlistModel warehousingStoragePoundlistModel : form.getWarehousingStoragePoundlistList()) {
netWeightNum = netWeightNum.add( warehousingStoragePoundlistModel.getNetWeight()) ;
}
BigDecimal result = maxNum.subtract(netWeightNum);
if (result.compareTo(BigDecimal.ZERO)<0){
return "凭证入库数量不能大于商品数量";
}else if (result.compareTo(BigDecimal.ZERO)>0){
return "凭证入库数量不能小于商品数量";
}
// BigDecimal maxNum = BigDecimal.ZERO;
// BigDecimal netWeightNum = BigDecimal.ZERO;
//
// for (WarehousingStorageProductModel warehousingStorageProductModel : form.getWarehousingStorageProductList()) {
// maxNum = maxNum.add( new BigDecimal(warehousingStorageProductModel.getStorageNumber())) ;
// }
// for (WarehousingStoragePoundlistModel warehousingStoragePoundlistModel : form.getWarehousingStoragePoundlistList()) {
// netWeightNum = netWeightNum.add( warehousingStoragePoundlistModel.getNetWeight()) ;
// }
// BigDecimal result = maxNum.subtract(netWeightNum);
//
// if (result.compareTo(BigDecimal.ZERO)<0){
// return "凭证入库数量不能大于商品数量";
// }else if (result.compareTo(BigDecimal.ZERO)>0){
// return "凭证入库数量不能小于商品数量";
//
// }
return countRecover;
}
/**
@ -669,36 +669,36 @@ public class WarehousingStorageServiceImpl extends ServiceImpl<WarehousingStorag
WarehousingStoragePoundlistqueryWrapper.lambda().eq(WarehousingStoragePoundlistEntity::getWarehousingStorageId, entity.getId());
warehousingStoragePoundlistService.remove(WarehousingStoragePoundlistqueryWrapper);
}
if (warehousingStorageForm.getWarehousingStoragePoundlistList()!=null){
List<WarehousingStoragePoundlistEntity> tableField114 = JsonUtil.getJsonToList(warehousingStorageForm.getWarehousingStoragePoundlistList(),WarehousingStoragePoundlistEntity.class);
for(WarehousingStoragePoundlistEntity entitys : tableField114){
//采购入库时在凭证子表里添加商品子表id以便于凭证和商品对应容易查询
if (entity.getWarehousingStorageType().equals("1")) {
QueryWrapper<WarehousingStorageProductEntity> productQueryWrapper = new QueryWrapper<>();
productQueryWrapper.lambda().eq(WarehousingStorageProductEntity::getProductId, entitys.getProductId());
productQueryWrapper.lambda().eq(WarehousingStorageProductEntity::getStorageUnit, entitys.getUnit());
productQueryWrapper.lambda().eq(WarehousingStorageProductEntity::getWarehousingStorageId, entity.getId());
List<WarehousingStorageProductEntity> warehousingStorageProductEntity = warehousingStorageProductService.list(productQueryWrapper);
for (WarehousingStorageProductEntity product : warehousingStorageProductEntity) {
entitys.setStorageProductId(product.getId());
}
}
entitys.setId(RandomUtil.uuId());
entitys.setWarehousingStorageId(entity.getId());
if(isSave){
}else{
}
warehousingStoragePoundlistService.saveOrUpdate(entitys);
//将凭证改为已被使用状态
if (StringUtils.isNotEmpty(entitys.getVoucherId())){
VoucherEntity voucherEntity = voucherMapper.selectById(entitys.getVoucherId());
voucherEntity.setIsUsed("2");
voucherMapper.updateById(voucherEntity);
}
}
}
// if (warehousingStorageForm.getWarehousingStoragePoundlistList()!=null){
// List<WarehousingStoragePoundlistEntity> tableField114 = JsonUtil.getJsonToList(warehousingStorageForm.getWarehousingStoragePoundlistList(),WarehousingStoragePoundlistEntity.class);
// for(WarehousingStoragePoundlistEntity entitys : tableField114){
// //采购入库时在凭证子表里添加商品子表id以便于凭证和商品对应容易查询
// if (entity.getWarehousingStorageType().equals("1")) {
// QueryWrapper<WarehousingStorageProductEntity> productQueryWrapper = new QueryWrapper<>();
// productQueryWrapper.lambda().eq(WarehousingStorageProductEntity::getProductId, entitys.getProductId());
// productQueryWrapper.lambda().eq(WarehousingStorageProductEntity::getStorageUnit, entitys.getUnit());
// productQueryWrapper.lambda().eq(WarehousingStorageProductEntity::getWarehousingStorageId, entity.getId());
// List<WarehousingStorageProductEntity> warehousingStorageProductEntity = warehousingStorageProductService.list(productQueryWrapper);
// for (WarehousingStorageProductEntity product : warehousingStorageProductEntity) {
// entitys.setStorageProductId(product.getId());
// }
// }
// entitys.setId(RandomUtil.uuId());
// entitys.setWarehousingStorageId(entity.getId());
// if(isSave){
//
// }else{
//
// }
// warehousingStoragePoundlistService.saveOrUpdate(entitys);
// //将凭证改为已被使用状态
// if (StringUtils.isNotEmpty(entitys.getVoucherId())){
// VoucherEntity voucherEntity = voucherMapper.selectById(entitys.getVoucherId());
// voucherEntity.setIsUsed("2");
// voucherMapper.updateById(voucherEntity);
// }
// }
// }
}
/**

@ -0,0 +1,357 @@
package jnpf.controller;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jnpf.base.ActionResult;
import jnpf.base.UserInfo;
import jnpf.exception.DataException;
import jnpf.permission.entity.UserEntity;
import jnpf.service.*;
import jnpf.entity.*;
import jnpf.util.*;
import jnpf.model.subjectduty.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.util.*;
import jnpf.annotation.JnpfField;
import jnpf.base.vo.PageListVO;
import jnpf.base.vo.PaginationVO;
import jnpf.base.vo.DownloadVO;
import jnpf.config.ConfigValueUtil;
import jnpf.base.entity.ProvinceEntity;
import java.io.IOException;
import java.util.stream.Collectors;
import jnpf.engine.entity.FlowTaskEntity;
import jnpf.exception.WorkFlowException;
import org.springframework.web.multipart.MultipartFile;
import cn.afterturn.easypoi.excel.ExcelExportUtil;
import cn.afterturn.easypoi.excel.ExcelImportUtil;
import cn.afterturn.easypoi.excel.entity.ExportParams;
import cn.afterturn.easypoi.excel.entity.ImportParams;
import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.usermodel.Workbook;
import java.io.File;
import jnpf.onlinedev.model.ExcelImFieldModel;
import jnpf.onlinedev.model.OnlineImport.ImportDataModel;
import jnpf.onlinedev.model.OnlineImport.ImportFormCheckUniqueModel;
import jnpf.onlinedev.model.OnlineImport.ExcelImportModel;
import jnpf.onlinedev.model.OnlineImport.VisualImportModel;
import cn.xuyanwu.spring.file.storage.FileInfo;
import lombok.Cleanup;
import jnpf.model.visualJson.config.HeaderModel;
import jnpf.base.model.ColumnDataModel;
import jnpf.base.util.VisualUtils;
import org.springframework.transaction.annotation.Transactional;
/**
* subjectDuty
* @ V3.5
* @ https://www.jnpfsoft.com
* @ JNPF
* @ 2024-08-01
*/
@Slf4j
@RestController
@Tag(name = "subjectDuty" , description = "scm")
@RequestMapping("/api/scm/SubjectDuty")
public class SubjectDutyController {
@Autowired
private GeneraterSwapUtil generaterSwapUtil;
@Autowired
private UserProvider userProvider;
@Autowired
private SubjectDutyService subjectDutyService;
@Autowired
private ConfigValueUtil configValueUtil;
/**
*
*
* @param subjectDutyPagination
* @return
*/
@Operation(summary = "获取列表")
@PostMapping("/getList")
public ActionResult list(@RequestBody SubjectDutyPagination subjectDutyPagination)throws IOException{
List<SubjectDutyEntity> list= subjectDutyService.getList(subjectDutyPagination);
List<Map<String, Object>> realList=new ArrayList<>();
for (SubjectDutyEntity entity : list) {
Map<String, Object> subjectDutyMap=JsonUtil.entityToMap(entity);
subjectDutyMap.put("id", subjectDutyMap.get("id"));
//副表数据
//子表数据
realList.add(subjectDutyMap);
}
//数据转换
realList = generaterSwapUtil.swapDataList(realList, SubjectDutyConstant.getFormData(), SubjectDutyConstant.getColumnData(), subjectDutyPagination.getModuleId(),false);
//返回对象
PageListVO vo = new PageListVO();
vo.setList(realList);
PaginationVO page = JsonUtil.getJsonToBean(subjectDutyPagination, PaginationVO.class);
vo.setPagination(page);
return ActionResult.success(vo);
}
/**
*
*
* @param subjectDutyForm
* @return
*/
@PostMapping()
@Operation(summary = "创建")
public ActionResult create(@RequestBody @Valid SubjectDutyForm subjectDutyForm) {
String b = subjectDutyService.checkForm(subjectDutyForm,0);
if (StringUtil.isNotEmpty(b)){
return ActionResult.fail(b );
}
try{
subjectDutyService.saveOrUpdate(subjectDutyForm, null ,true);
}catch(Exception e){
return ActionResult.fail("新增数据失败");
}
return ActionResult.success("创建成功");
}
/**
* Excel
*
* @return
*/
@Operation(summary = "导出Excel")
@PostMapping("/Actions/Export")
public ActionResult Export(@RequestBody SubjectDutyPagination subjectDutyPagination) throws IOException {
if (StringUtil.isEmpty(subjectDutyPagination.getSelectKey())){
return ActionResult.fail("请选择导出字段");
}
List<SubjectDutyEntity> list= subjectDutyService.getList(subjectDutyPagination);
List<Map<String, Object>> realList=new ArrayList<>();
for (SubjectDutyEntity entity : list) {
Map<String, Object> subjectDutyMap=JsonUtil.entityToMap(entity);
subjectDutyMap.put("id", subjectDutyMap.get("id"));
//副表数据
//子表数据
realList.add(subjectDutyMap);
}
//数据转换
realList = generaterSwapUtil.swapDataList(realList, SubjectDutyConstant.getFormData(), SubjectDutyConstant.getColumnData(), subjectDutyPagination.getModuleId(),false);
String[]keys=!StringUtil.isEmpty(subjectDutyPagination.getSelectKey())?subjectDutyPagination.getSelectKey():new String[0];
UserInfo userInfo=userProvider.get();
DownloadVO vo=this.creatModelExcel(configValueUtil.getTemporaryFilePath(),realList,keys,userInfo);
return ActionResult.success(vo);
}
/**
*
*/
public DownloadVO creatModelExcel(String path,List<Map<String, Object>>list,String[]keys,UserInfo userInfo){
DownloadVO vo=DownloadVO.builder().build();
List<ExcelExportEntity> entitys=new ArrayList<>();
if(keys.length>0){
for(String key:keys){
switch(key){
case "subject" :
entitys.add(new ExcelExportEntity("供应商名称" ,"subject"));
break;
case "amount" :
entitys.add(new ExcelExportEntity("当月供货金额(不含税)" ,"amount"));
break;
case "settlement" :
entitys.add(new ExcelExportEntity("当月供货量(吨)" ,"settlement"));
break;
case "pdf" :
entitys.add(new ExcelExportEntity("横版完税证明图片、PDF格式" ,"pdf"));
break;
case "mouth" :
entitys.add(new ExcelExportEntity("月份" ,"mouth"));
break;
case "reason" :
entitys.add(new ExcelExportEntity("未提供完税证明的原因分析" ,"reason"));
break;
case "remark" :
entitys.add(new ExcelExportEntity("备注" ,"remark"));
break;
default:
break;
}
}
}
ExportParams exportParams = new ExportParams(null, "表单信息");
exportParams.setType(ExcelType.XSSF);
try{
@Cleanup Workbook workbook = new HSSFWorkbook();
if (entitys.size()>0){
if (list.size()==0){
list.add(new HashMap<>());
}
//去除空数据
List<Map<String, Object>> dataList = new ArrayList<>();
for (Map<String, Object> map : list) {
int i = 0;
for (String key : keys) {
//子表
if (key.toLowerCase().startsWith("tablefield")) {
String tableField = key.substring(0, key.indexOf("-" ));
String field = key.substring(key.indexOf("-" ) + 1);
Object o = map.get(tableField);
if (o != null) {
List<Map<String, Object>> childList = (List<Map<String, Object>>) o;
for (Map<String, Object> childMap : childList) {
if (childMap.get(field) != null) {
i++;
}
}
}
} else {
Object o = map.get(key);
if (o != null) {
i++;
}
}
}
if (i > 0) {
dataList.add(map);
}
}
//复杂表头-表头和数据处理
ColumnDataModel columnDataModel = JsonUtil.getJsonToBean(SubjectDutyConstant.getColumnData(), ColumnDataModel.class);
List<HeaderModel> complexHeaderList = columnDataModel.getComplexHeaderList();
if (!Objects.equals(columnDataModel.getType(), 3) && !Objects.equals(columnDataModel.getType(), 5)) {
entitys = VisualUtils.complexHeaderHandel(entitys, complexHeaderList);
dataList = VisualUtils.complexHeaderDataHandel(dataList, complexHeaderList);
}
workbook = ExcelExportUtil.exportExcel(exportParams, entitys, dataList);
}
String fileName = "表单信息" + DateUtil.dateNow("yyyyMMdd") + "_" + RandomUtil.uuId() + ".xlsx";
MultipartFile multipartFile = ExcelUtil.workbookToCommonsMultipartFile(workbook, fileName);
String temporaryFilePath = configValueUtil.getTemporaryFilePath();
FileInfo fileInfo = FileUploadUtils.uploadFile(multipartFile, temporaryFilePath, fileName);
vo.setName(fileInfo.getFilename());
vo.setUrl(UploaderUtil.uploaderFile(fileInfo.getFilename() + "#" + "Temporary") + "&name=" + fileName);
} catch (Exception e) {
log.error("信息导出Excel错误:{}", e.getMessage());
e.printStackTrace();
}
return vo;
}
/**
*
* @param ids
* @return
*/
@DeleteMapping("/batchRemove")
@Transactional
@Operation(summary = "批量删除")
public ActionResult batchRemove(@RequestBody String ids){
List<String> idList = JsonUtil.getJsonToList(ids, String.class);
int i =0;
for (String allId : idList){
this.delete(allId);
i++;
}
if (i == 0 ){
return ActionResult.fail("删除失败");
}
return ActionResult.success("删除成功");
}
/**
*
* @param id
* @param subjectDutyForm
* @return
*/
@PutMapping("/{id}")
@Operation(summary = "更新")
public ActionResult update(@PathVariable("id") String id,@RequestBody @Valid SubjectDutyForm subjectDutyForm,
@RequestParam(value = "isImport", required = false) boolean isImport){
subjectDutyForm.setId(id);
if (!isImport) {
String b = subjectDutyService.checkForm(subjectDutyForm,1);
if (StringUtil.isNotEmpty(b)){
return ActionResult.fail(b );
}
}
SubjectDutyEntity entity= subjectDutyService.getInfo(id);
if(entity!=null){
try{
subjectDutyService.saveOrUpdate(subjectDutyForm,id,false);
}catch(Exception e){
return ActionResult.fail("修改数据失败");
}
return ActionResult.success("更新成功");
}else{
return ActionResult.fail("更新失败,数据不存在");
}
}
/**
*
* @param id
* @return
*/
@Operation(summary = "删除")
@DeleteMapping("/{id}")
@Transactional
public ActionResult delete(@PathVariable("id") String id){
SubjectDutyEntity entity= subjectDutyService.getInfo(id);
if(entity!=null){
//假删除
entity.setDeleteMark(1);
subjectDutyService.update(id,entity);
}
return ActionResult.success("删除成功");
}
/**
* ()
* 使-
* @param id
* @return
*/
@Operation(summary = "表单信息(详情页)")
@GetMapping("/detail/{id}")
public ActionResult detailInfo(@PathVariable("id") String id){
SubjectDutyEntity entity= subjectDutyService.getInfo(id);
if(entity==null){
return ActionResult.fail("表单数据不存在!");
}
Map<String, Object> subjectDutyMap=JsonUtil.entityToMap(entity);
subjectDutyMap.put("id", subjectDutyMap.get("id"));
//副表数据
//子表数据
subjectDutyMap = generaterSwapUtil.swapDataDetail(subjectDutyMap,SubjectDutyConstant.getFormData(),"588627114215912773",false);
return ActionResult.success(subjectDutyMap);
}
/**
* ()
* 使-
* @param id
* @return
*/
@Operation(summary = "信息")
@GetMapping("/{id}")
public ActionResult info(@PathVariable("id") String id){
SubjectDutyEntity entity= subjectDutyService.getInfo(id);
if(entity==null){
return ActionResult.fail("表单数据不存在!");
}
Map<String, Object> subjectDutyMap=JsonUtil.entityToMap(entity);
subjectDutyMap.put("id", subjectDutyMap.get("id"));
//副表数据
//子表数据
subjectDutyMap = generaterSwapUtil.swapDataForm(subjectDutyMap,SubjectDutyConstant.getFormData(),SubjectDutyConstant.TABLEFIELDKEY,SubjectDutyConstant.TABLERENAMES);
return ActionResult.success(subjectDutyMap);
}
}

@ -0,0 +1,61 @@
package jnpf.entity;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import java.util.Date;
import java.math.BigDecimal;
import java.math.BigDecimal;
/**
*
*
* @ V3.5
* @ https://www.jnpfsoft.com
* @ JNPF
* @ 2024-08-01
*/
@Data
@TableName("jg_subject_duty")
public class SubjectDutyEntity {
@TableId(value ="ID" )
private String id;
@TableField(value = "SUBJECT" , updateStrategy = FieldStrategy.IGNORED)
private String subject;
@TableField(value = "AMOUNT" , updateStrategy = FieldStrategy.IGNORED)
private BigDecimal amount;
@TableField(value = "SETTLEMENT" , updateStrategy = FieldStrategy.IGNORED)
private BigDecimal settlement;
@TableField(value = "PDF" , updateStrategy = FieldStrategy.IGNORED)
private String pdf;
@TableField(value = "REASON" , updateStrategy = FieldStrategy.IGNORED)
private String reason;
@TableField(value = "REMARK" , updateStrategy = FieldStrategy.IGNORED)
private String remark;
@TableField(value = "MOUTH" , updateStrategy = FieldStrategy.IGNORED)
private Date mouth;
@TableField("F_CREATOR_TIME")
private Date creatorTime;
@TableField("F_CREATOR_USER_ID")
private String creatorUserId;
@TableField("F_LAST_MODIFY_TIME")
private Date lastModifyTime;
@TableField("F_LAST_MODIFY_USER_ID")
private String lastModifyUserId;
@TableField("F_DELETE_TIME")
private Date deleteTime;
@TableField("F_DELETE_USER_ID")
private String deleteUserId;
@TableField("F_DELETE_MARK")
private Integer deleteMark;
@TableField("F_TENANT_ID")
private String tenantId;
@TableField("COMPANY_ID")
private String companyId;
@TableField("DEPARTMENT_ID")
private String departmentId;
@TableField("ORGANIZE_JSON_ID")
private String organizeJsonId;
@TableField("F_VERSION")
private Integer version;
@TableField("F_FLOW_ID")
private String flowId;
}

@ -0,0 +1,44 @@
package jnpf.model.subjectduty;
import lombok.Data;
import java.util.List;
import java.math.BigDecimal;
import com.fasterxml.jackson.annotation.JsonProperty;
/**
* subjectDuty
* @ V3.5
* @ https://www.jnpfsoft.com
* @ JNPF
* @ 2024-08-01
*/
@Data
public class SubjectDutyForm {
/** 主键 */
private String id;
/** 乐观锁 **/
@JsonProperty("version")
private Integer version;
/** 供应商名称 **/
@JsonProperty("subject")
private String subject;
/** 当月供货金额(不含税) **/
@JsonProperty("amount")
private String amount;
/** 当月供货量(吨) **/
@JsonProperty("settlement")
private String settlement;
/** 横版完税证明图片、PDF格式 **/
@JsonProperty("pdf")
private Object pdf;
/** 月份 **/
@JsonProperty("mouth")
private String mouth;
/** 未提供完税证明的原因分析 **/
@JsonProperty("reason")
private String reason;
/** 备注 **/
@JsonProperty("remark")
private String remark;
}

@ -0,0 +1,39 @@
package jnpf.model.subjectduty;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import jnpf.base.Pagination;
import java.util.List;
/**
*
* subjectDuty
* @ V3.5
* @ https://www.jnpfsoft.com
* @ JNPF
* @ 2024-08-01
*/
@Data
public class SubjectDutyPagination extends Pagination {
/** 查询key */
private String[] selectKey;
/** json */
private String json;
/** 数据类型 0-当前页1-全部数据 */
private String dataType;
/** 高级查询 */
private String superQueryJson;
/** 功能id */
private String moduleId;
/** 菜单id */
private String menuId;
/** 供应商名称 */
@JsonProperty("subject")
private Object subject;
/** 当月供货量(吨) */
@JsonProperty("settlement")
private Object settlement;
/** 月份 */
@JsonProperty("mouth")
private Object mouth;
}

@ -36,7 +36,7 @@
<template v-if="!loading">
<!-- 具体表单 -->
<el-col :span="8">
<jnpf-form-tip-item label="客户名称" prop="firstSubject">
<jnpf-form-tip-item label="客户名称" prop="firstSubject" label-width="200px">
<JnpfInput v-model="dataForm.firstSubject" @change="changeData('firstSubject',-1)"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</JnpfInput>
@ -52,7 +52,7 @@
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="月份" prop="mouth">
<jnpf-form-tip-item label="月份" prop="mouth" label-width="200px">
<JnpfDatePicker v-model="dataForm.mouth" @change="changeData('mouth',-1)"
:startTime="dateTime(false,1,1,'','')" :endTime="dateTime(false,1,1,'','')"
placeholder="请选择" clearable :style='{"width":"100%"}' type="month"
@ -61,21 +61,21 @@
</jnpf-form-tip-item>
</el-col>
<el-col :span="24">
<jnpf-form-tip-item label="主要合作商名称" prop="subjects">
<jnpf-form-tip-item label="主要合作商名称" prop="subjects" label-width="200px">
<JnpfInput v-model="dataForm.subjects" @change="changeData('subjects',-1)"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="客户月采购金额" prop="mouthAmount">
<jnpf-form-tip-item label="客户月采购金额" prop="mouthAmount" label-width="200px">
<JnpfInput v-model="dataForm.mouthAmount" @change="changeData('mouthAmount',-1)"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="本月我公司月销售金额" prop="settlementAmount">
<jnpf-form-tip-item label="本月我公司月销售金额" prop="settlementAmount" label-width="200px">
<JnpfInput v-model="dataForm.settlementAmount"
@change="changeData('settlementAmount',-1)" placeholder="请输入" clearable
:style='{"width":"100%"}'>
@ -83,7 +83,7 @@
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="我公司月销售金额占比" prop="rateAmount">
<jnpf-form-tip-item label="我公司月销售金额占比" prop="rateAmount" label-width="200px">
<JnpfInput v-model="dataForm.rateAmount" @change="changeData('rateAmount',-1)"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</JnpfInput>

@ -36,7 +36,7 @@
<template v-if="!loading">
<!-- 具体表单 -->
<el-col :span="8">
<jnpf-form-tip-item label="一级供应商名称" prop="firstSubject">
<jnpf-form-tip-item label="一级供应商名称" prop="firstSubject" label-width="200px">
<JnpfInput v-model="dataForm.firstSubject" @change="changeData('firstSubject',-1)"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</JnpfInput>
@ -52,7 +52,7 @@
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="月份" prop="mouth">
<jnpf-form-tip-item label="月份" prop="mouth" label-width="200px">
<JnpfDatePicker v-model="dataForm.mouth" @change="changeData('mouth',-1)"
:startTime="dateTime(false,1,1,'','')" :endTime="dateTime(false,1,1,'','')"
placeholder="请选择" clearable :style='{"width":"100%"}' type="month"
@ -61,21 +61,21 @@
</jnpf-form-tip-item>
</el-col>
<el-col :span="24">
<jnpf-form-tip-item label="一级供应商主要客户名称" prop="subjects">
<jnpf-form-tip-item label="一级供应商主要客户名称" prop="subjects" label-width="200px">
<JnpfInput v-model="dataForm.subjects" @change="changeData('subjects',-1)"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="一级供应商月开票金额" prop="mouthAmount">
<jnpf-form-tip-item label="一级供应商月开票金额" prop="mouthAmount" label-width="200px">
<JnpfInput v-model="dataForm.mouthAmount" @change="changeData('mouthAmount',-1)"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="本月我公司采购金额" prop="settlementAmount">
<jnpf-form-tip-item label="本月我公司采购金额" prop="settlementAmount" label-width="200px">
<JnpfInput v-model="dataForm.settlementAmount"
@change="changeData('settlementAmount',-1)" placeholder="请输入" clearable
:style='{"width":"100%"}'>
@ -83,7 +83,7 @@
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="我公司月采购金额占比" prop="rateAmount">
<jnpf-form-tip-item label="我公司月采购金额占比" prop="rateAmount" label-width="200px">
<JnpfInput v-model="dataForm.rateAmount" @change="changeData('rateAmount',-1)"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</JnpfInput>

@ -0,0 +1,134 @@
<template>
<transition name="el-zoom-in-center">
<div class="JNPF-preview-main">
<Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false" />
<div class="JNPF-common-page-header">
<el-page-header @back="goBack" content="详情" />
<div class="options">
<el-button @click="goBack"> </el-button>
</div>
</div>
<el-row :gutter="15" class=" main" :style="{margin: '0 auto',width: '100%'}">
<el-form ref="formRef" :model="dataForm" size="small" label-width="100px"
label-position="right">
<template v-if="!loading">
<el-col :span="8">
<jnpf-form-tip-item label-width="200px" label="供应商名称" prop="subject">
<p>{{dataForm.subject}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label-width="200px" label="当月供货金额(不含税)" prop="amount">
<p>{{dataForm.amount}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label-width="200px" label="当月供货量(吨)" prop="settlement">
<p>{{dataForm.settlement}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24">
<jnpf-form-tip-item label-width="200px" label="横版完税证明图片、PDF格式" prop="pdf">
<JnpfUploadFile v-model="dataForm.pdf" disabled detailed :fileSize="10"
sizeUnit="MB" :limit="9" pathType="defaultPath" :isAccount="0" buttonText="点击上传">
</JnpfUploadFile>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label-width="200px" label="月份" prop="mouth">
<p>{{dataForm.mouth}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24">
<jnpf-form-tip-item label-width="200px" label="未提供完税证明的原因分析" prop="reason">
<p>{{dataForm.reason}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24">
<jnpf-form-tip-item label-width="200px" label="备注" prop="remark">
<p>{{dataForm.remark}}</p>
</jnpf-form-tip-item>
</el-col>
</template>
</el-form>
</el-row>
</div>
</transition>
</template>
<script>
import request from '@/utils/request'
import { getConfigData } from '@/api/onlineDev/visualDev'
import jnpf from '@/utils/jnpf'
import Detail from '@/views/basic/dynamicModel/list/detail'
import { thousandsFormat } from "@/components/Generator/utils/index"
export default {
components: { Detail },
props: [],
data() {
return {
visible: false,
detailVisible: false,
loading: false,
dataForm: {
id: '',
subject: '',
amount: '',
settlement: '',
pdf: [],
mouth: '',
reason: '',
remark: '',
},
}
},
computed: {},
watch: {},
created() {
},
mounted() { },
methods: {
toDetail(defaultValue, modelId) {
if (!defaultValue) return
getConfigData(modelId).then(res => {
if (!res.data || !res.data.formData) return
let formData = JSON.parse(res.data.formData)
formData.popupType = 'general'
this.detailVisible = true
this.$nextTick(() => {
this.$refs.Detail.init(formData, modelId, defaultValue)
})
})
},
dataInfo(dataAll) {
let _dataAll = dataAll
this.dataForm = _dataAll
},
goBack() {
this.$emit('refresh')
},
init(id) {
this.dataForm.id = id || 0;
this.visible = true;
this.$nextTick(() => {
if (this.dataForm.id) {
this.loading = true
request({
url: '/api/scm/SubjectDuty/detail/' + this.dataForm.id,
method: 'get'
}).then(res => {
this.dataInfo(res.data)
this.loading = false
})
}
})
},
},
}
</script>

File diff suppressed because one or more lines are too long

@ -0,0 +1,489 @@
<template>
<transition name="el-zoom-in-center">
<div class="JNPF-preview-main">
<div class="JNPF-common-page-header">
<el-page-header @back="goBack" :content="!dataForm.id ? '新建':'编辑'" />
<div class="options">
<el-dropdown class="dropdown" placement="bottom">
<el-button style="width:70px">
<i class="el-icon-arrow-down el-icon--right"></i>
</el-button>
<el-dropdown-menu slot="dropdown">
<template v-if="dataForm.id">
<el-dropdown-item @click.native="prev" :disabled='prevDis'>
{{'上一条'}}
</el-dropdown-item>
<el-dropdown-item @click.native="next" :disabled='nextDis'>
{{'下一条'}}
</el-dropdown-item>
</template>
<el-dropdown-item type="primary" @click.native="dataFormSubmit(2)"
:loading="continueBtnLoading" :disabled='btnLoading'>
{{!dataForm.id ?'确定并新增':'确定并继续'}}</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
<el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading"
:disabled='continueBtnLoading'> </el-button>
<el-button @click="goBack"> </el-button>
</div>
</div>
<el-row :gutter="15" class=" main" :style="{margin: '0 auto',width: '100%'}">
<el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="100px"
label-position="right">
<template v-if="!loading">
<!-- 具体表单 -->
<el-col :span="8">
<jnpf-form-tip-item label="供应商名称" prop="subject" label-width="200px">
<JnpfInput v-model="dataForm.subject" @change="changeData('subject',-1)"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="当月供货金额(不含税)" prop="amount" label-width="200px">
<JnpfInput v-model="dataForm.amount" @change="changeData('amount',-1)"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="当月供货量(吨)" prop="settlement" label-width="200px">
<JnpfInput v-model="dataForm.settlement" @change="changeData('settlement',-1)"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24">
<jnpf-form-tip-item label="横版完税证明图片、PDF格式" prop="pdf" label-width="200px">
<JnpfUploadFile v-model="dataForm.pdf" @change="changeData('pdf',-1)" :fileSize="10"
sizeUnit="MB" :limit="9" pathType="defaultPath" :isAccount="0" buttonText="点击上传">
</JnpfUploadFile>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="月份" prop="mouth" label-width="200px">
<JnpfDatePicker v-model="dataForm.mouth" @change="changeData('mouth',-1)"
:startTime="dateTime(false,1,1,'','')" :endTime="dateTime(false,1,1,'','')"
placeholder="请选择" clearable :style='{"width":"100%"}' type="month"
format="yyyy-MM">
</JnpfDatePicker>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24">
<jnpf-form-tip-item label="未提供完税证明的原因分析" prop="reason" label-width="200px">
<JnpfInput v-model="dataForm.reason" @change="changeData('reason',-1)"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24">
<jnpf-form-tip-item label="备注" prop="remark" label-width="200px">
<JnpfInput v-model="dataForm.remark" @change="changeData('remark',-1)"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<!-- 表单结束 -->
</template>
</el-form>
<SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm"
ref="selectDialog" @select="addForSelect" @close="selectDialogVisible=false" />
</el-row>
</div>
</transition>
</template>
<script>
import request from '@/utils/request'
import { mapGetters } from "vuex";
import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
import { getDefaultCurrentValueUserId } from '@/api/permission/user'
import { getDefaultCurrentValueDepartmentId } from '@/api/permission/organize'
import { getDateDay, getLaterData, getBeforeData, getBeforeTime, getLaterTime } from '@/components/Generator/utils/index.js'
import { thousandsFormat } from "@/components/Generator/utils/index"
export default {
components: {},
props: [],
data() {
return {
dataFormSubmitType: 0,
continueBtnLoading: false,
index: 0,
prevDis: false,
nextDis: false,
allList: [],
visible: false,
loading: false,
btnLoading: false,
formRef: 'formRef',
setting: {},
eventType: '',
userBoxVisible: false,
selectDialogVisible: false,
currTableConf: {},
dataValueAll: {},
addTableConf: {
},
//
ableAll: {
},
tableRows: {
},
Vmodel: "",
currVmodel: "",
dataForm: {
subject: undefined,
amount: undefined,
settlement: undefined,
pdf: [],
mouth: undefined,
reason: undefined,
remark: undefined,
version: 0,
},
tableRequiredData: {},
dataRule:
{
subject: [
{
required: true,
message: '请输入',
trigger: 'blur'
},
],
amount: [
{
required: true,
message: '请输入',
trigger: 'blur'
},
],
settlement: [
{
required: true,
message: '请输入',
trigger: 'blur'
},
],
pdf: [
{
required: true,
message: '请至少选择一个',
trigger: 'change'
},
],
},
childIndex: -1,
isEdit: false,
interfaceRes: {
subject: [],
amount: [],
settlement: [],
pdf: [],
mouth: [],
reason: [],
remark: [],
},
}
},
computed: {
...mapGetters(['userInfo'])
},
watch: {},
created() {
this.dataAll()
this.initDefaultData()
this.dataValueAll = JSON.parse(JSON.stringify(this.dataForm))
},
mounted() { },
methods: {
prev() {
this.index--
if (this.index === 0) {
this.prevDis = true
}
this.nextDis = false
for (let index = 0; index < this.allList.length; index++) {
const element = this.allList[index];
if (this.index == index) {
this.getInfo(element.id)
}
}
},
next() {
this.index++
if (this.index === this.allList.length - 1) {
this.nextDis = true
}
this.prevDis = false
for (let index = 0; index < this.allList.length; index++) {
const element = this.allList[index];
if (this.index == index) {
this.getInfo(element.id)
}
}
},
getInfo(id) {
request({
url: '/api/scm/SubjectDuty/' + id,
method: 'get'
}).then(res => {
this.dataInfo(res.data)
});
},
goBack() {
this.visible = false
this.$emit('refreshDataList', true)
},
changeData(model, index) {
this.isEdit = false
this.childIndex = index
let modelAll = model.split("-");
let faceMode = "";
for (let i = 0; i < modelAll.length; i++) {
faceMode += modelAll[i];
}
for (let key in this.interfaceRes) {
if (key != faceMode) {
let faceReList = this.interfaceRes[key]
for (let i = 0; i < faceReList.length; i++) {
if (faceReList[i].relationField == model) {
let options = 'get' + key + 'Options';
if (this[options]) {
this[options]()
}
this.changeData(key, index)
}
}
}
}
},
changeDataFormData(type, data, model, index, defaultValue) {
if (!this.isEdit) {
if (type == 2) {
for (let i = 0; i < this.dataForm[data].length; i++) {
if (index == -1) {
this.dataForm[data][i][model] = defaultValue
} else if (index == i) {
this.dataForm[data][i][model] = defaultValue
}
}
} else {
this.dataForm[data] = defaultValue
}
}
},
dataAll() {
},
goBack() {
this.$emit('refresh')
},
clearData() {
this.dataForm = JSON.parse(JSON.stringify(this.dataValueAll))
},
init(id, isDetail, allList) {
this.prevDis = false
this.nextDis = false
this.allList = allList || []
if (allList.length) {
this.index = this.allList.findIndex(item => item.id === id)
if (this.index == 0) {
this.prevDis = true
}
if (this.index == this.allList.length - 1) {
this.nextDis = true
}
} else {
this.prevDis = true
this.nextDis = true
}
this.dataForm.id = id || 0;
this.visible = true;
this.$nextTick(() => {
if (this.dataForm.id) {
this.loading = true
request({
url: '/api/scm/SubjectDuty/' + this.dataForm.id,
method: 'get'
}).then(res => {
this.dataInfo(res.data)
this.loading = false
});
} else {
this.clearData()
this.initDefaultData()
}
});
this.$store.commit('generator/UPDATE_RELATION_DATA', {})
},
//
initDefaultData() {
},
//
dataFormSubmit(type) {
this.dataFormSubmitType = type ? type : 0
this.$refs['formRef'].validate((valid) => {
if (valid) {
this.request()
}
})
},
request() {
let _data = this.dataList()
if (this.dataFormSubmitType == 2) {
this.continueBtnLoading = true
} else {
this.btnLoading = true
}
if (!this.dataForm.id) {
request({
url: '/api/scm/SubjectDuty',
method: 'post',
data: _data
}).then((res) => {
this.$message({
message: res.msg,
type: 'success',
duration: 1000,
onClose: () => {
if (this.dataFormSubmitType == 2) {
this.$nextTick(() => {
this.clearData()
this.initDefaultData()
})
this.continueBtnLoading = false
return
}
this.visible = false
this.btnLoading = false
this.$emit('refresh', true)
}
})
}).catch(() => {
this.btnLoading = false
this.continueBtnLoading = false
})
} else {
request({
url: '/api/scm/SubjectDuty/' + this.dataForm.id,
method: 'PUT',
data: _data
}).then((res) => {
this.$message({
message: res.msg,
type: 'success',
duration: 1000,
onClose: () => {
if (this.dataFormSubmitType == 2) return this.continueBtnLoading = false
this.visible = false
this.btnLoading = false
this.$emit('refresh', true)
}
})
}).catch(() => {
this.btnLoading = false
this.continueBtnLoading = false
})
}
},
openSelectDialog(key) {
this.currTableConf = this.addTableConf[key]
this.currVmodel = key
this.selectDialogVisible = true
this.$nextTick(() => {
this.$refs.selectDialog.init()
})
},
addForSelect(data) {
for (let i = 0; i < data.length; i++) {
let t = data[i]
if (this['get' + this.currVmodel]) {
this['get' + this.currVmodel](t)
}
}
},
dateTime(timeRule, timeType, timeTarget, timeValueData, dataValue) {
let timeDataValue = null;
let timeValue = Number(timeValueData)
if (timeRule) {
if (timeType == 1) {
timeDataValue = timeValue
} else if (timeType == 2) {
timeDataValue = dataValue
} else if (timeType == 3) {
timeDataValue = new Date().getTime()
} else if (timeType == 4) {
let previousDate = '';
if (timeTarget == 1 || timeTarget == 2) {
previousDate = getDateDay(timeTarget, timeType, timeValue)
timeDataValue = new Date(previousDate).getTime()
} else if (timeTarget == 3) {
previousDate = getBeforeData(timeValue)
timeDataValue = new Date(previousDate).getTime()
} else {
timeDataValue = getBeforeTime(timeTarget, timeValue).getTime()
}
} else if (timeType == 5) {
let previousDate = '';
if (timeTarget == 1 || timeTarget == 2) {
previousDate = getDateDay(timeTarget, timeType, timeValue)
timeDataValue = new Date(previousDate).getTime()
} else if (timeTarget == 3) {
previousDate = getLaterData(timeValue)
timeDataValue = new Date(previousDate).getTime()
} else {
timeDataValue = getLaterTime(timeTarget, timeValue).getTime()
}
}
}
return timeDataValue;
},
time(timeRule, timeType, timeTarget, timeValue, formatType, dataValue) {
let format = formatType == 'HH:mm' ? 'HH:mm:00' : formatType
let timeDataValue = null
if (timeRule) {
if (timeType == 1) {
timeDataValue = timeValue || '00:00:00'
if (timeDataValue.split(':').length == 3) {
timeDataValue = timeDataValue
} else {
timeDataValue = timeDataValue + ':00'
}
} else if (timeType == 2) {
timeDataValue = dataValue
} else if (timeType == 3) {
timeDataValue = this.jnpf.toDate(new Date(), format)
} else if (timeType == 4) {
let previousDate = '';
previousDate = getBeforeTime(timeTarget, timeValue)
timeDataValue = this.jnpf.toDate(previousDate, format)
} else if (timeType == 5) {
let previousDate = '';
previousDate = getLaterTime(timeTarget, timeValue)
timeDataValue = this.jnpf.toDate(previousDate, format)
}
}
return timeDataValue;
},
dataList() {
var _data = this.dataForm;
return _data;
},
dataInfo(dataAll) {
let _dataAll = dataAll
this.dataForm = _dataAll
this.isEdit = true
this.dataAll()
this.childIndex = -1
},
},
}
</script>

@ -0,0 +1,496 @@
<template>
<div class="JNPF-common-layout">
<div class="JNPF-common-layout-center">
<el-row class="JNPF-common-search-box" :gutter="16">
<el-form @submit.native.prevent>
<el-col :span="6">
<el-form-item label="供应商名称">
<el-input v-model="query.subject" placeholder="请输入" clearable> </el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="当月供货量(吨)">
<el-input v-model="query.settlement" placeholder="请输入" clearable> </el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="月份">
<JnpfDateRangePicker v-model="query.mouth" format="yyyy-MM" startPlaceholder="开始日期"
endPlaceholder="结束日期">
</JnpfDateRangePicker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()"></el-button>
<el-button icon="el-icon-refresh-right" @click="reset()"></el-button>
</el-form-item>
</el-col>
</el-form>
</el-row>
<div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head">
<div>
<el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
@click="addOrUpdateHandle()">新增
</el-button>
<el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()"
v-has="'btn_download'">导出
</el-button>
<el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
v-has="'btn_batchRemove'">批量删除
</el-button>
</div>
<div class="JNPF-common-head-right">
<el-tooltip content="高级查询" placement="top" v-if="true">
<el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false"
@click="openSuperQuery()" />
</el-tooltip>
<el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
@click="initData()" />
</el-tooltip>
</div>
</div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
@selection-change="handleSelectionChange" :span-method="arraySpanMethod">
<el-table-column prop="subject" label="供应商名称" align="center">
</el-table-column>
<el-table-column prop="mouth" label="月份" align="center">
</el-table-column>
<el-table-column prop="amount" label="当月供货金额(不含税)" align="center">
</el-table-column>
<el-table-column prop="settlement" label="当月供货量(吨)" align="center">
</el-table-column>
<el-table-column prop="reason" label="未提供完税证明的原因分析" align="center">
</el-table-column>
<el-table-column prop="remark" label="备注" align="center">
</el-table-column>
<el-table-column label="操作" fixed="right" width="150">
<template slot-scope="scope">
<el-button type="text" @click="addOrUpdateHandle(scope.row)" v-has="'btn_edit'">
</el-button>
<el-button type="text" class="JNPF-table-delBtn" v-has="'btn_remove'"
@click="handleDel(scope.row.id)">删除
</el-button>
<el-button type="text" v-has="'btn_detail'" @click="goDetail(scope.row.id)">
</el-button>
</template>
</el-table-column>
</JNPF-table>
<pagination :total="total" :page.sync="listQuery.currentPage"
:limit.sync="listQuery.pageSize" @pagination="initData" />
</div>
</div>
<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
<ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
<Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false" />
<ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail"
@close="toFormDetailVisible = false" />
<SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson"
@superQuery="superQuery" />
</div>
</template>
<script>
import request from '@/utils/request'
import { mapGetters } from "vuex";
import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
import JNPFForm from './form'
import Detail from './Detail'
import ExportBox from '@/components/ExportBox'
import ToFormDetail from '@/views/basic/dynamicModel/list/detail'
import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
import { getConfigData } from '@/api/onlineDev/visualDev'
import { getDefaultCurrentValueUserIdAsync } from '@/api/permission/user'
import { getDefaultCurrentValueDepartmentIdAsync } from '@/api/permission/organize'
import columnList from './columnList'
import { thousandsFormat } from "@/components/Generator/utils/index"
import SuperQuery from '@/components/SuperQuery'
import superQueryJson from './superQueryJson'
export default {
components: {
JNPFForm,
Detail,
ExportBox, ToFormDetail, SuperQuery
},
data() {
return {
keyword: '',
expandsTree: true,
refreshTree: true,
toFormDetailVisible: false,
expandObj: {},
columnOptions: [],
mergeList: [],
exportList: [],
columnList,
superQueryVisible: false,
superQueryJson,
uploadBoxVisible: false,
detailVisible: false,
query: {
subject: undefined,
settlement: undefined,
mouth: undefined,
},
treeProps: {
children: 'children',
label: 'fullName',
value: 'id',
isLeaf: 'isLeaf'
},
list: [],
listLoading: true,
multipleSelection: [], total: 0,
queryData: {},
listQuery: {
superQueryJson: '',
currentPage: 1,
pageSize: 20,
sort: "desc",
sidx: "",
},
formVisible: false,
flowVisible: false,
flowListVisible: false,
flowList: [],
exportBoxVisible: false,
interfaceRes: {
},
}
},
computed: {
...mapGetters(['userInfo']),
menuId() {
return this.$route.meta.modelId || ''
}
},
created() {
this.getColumnList(),
this.initSearchDataAndListData()
this.queryData = JSON.parse(JSON.stringify(this.query))
},
methods: {
toDetail(defaultValue, modelId) {
if (!defaultValue) return
getConfigData(modelId).then(res => {
if (!res.data || !res.data.formData) return
let formData = JSON.parse(res.data.formData)
formData.popupType = 'general'
this.toFormDetailVisible = true
this.$nextTick(() => {
this.$refs.toFormDetail.init(formData, modelId, defaultValue)
})
})
},
toggleTreeExpand(expands) {
this.refreshTree = false
this.expandsTree = expands
this.$nextTick(() => {
this.refreshTree = true
this.$nextTick(() => {
this.$refs.treeBox.setCurrentKey(null)
})
})
},
filterNode(value, data) {
if (!value) return true;
return data[this.treeProps.label].indexOf(value) !== -1;
},
loadNode(node, resolve) {
const nodeData = node.data
const config = {
treeInterfaceId: "",
treeTemplateJson: []
}
if (config.treeInterfaceId) {
//
if (config.treeTemplateJson && config.treeTemplateJson.length) {
for (let i = 0; i < config.treeTemplateJson.length; i++) {
const element = config.treeTemplateJson[i];
element.defaultValue = nodeData[element.relationField] || ''
}
}
//
let query = {
paramList: config.treeTemplateJson || [],
}
//
getDataInterfaceRes(config.treeInterfaceId, query).then(res => {
let data = res.data
if (Array.isArray(data)) {
resolve(data);
} else {
resolve([]);
}
})
}
},
getColumnList() {
//
this.columnOptions = this.transformColumnList(this.columnList)
},
transformColumnList(columnList) {
let list = []
for (let i = 0; i < columnList.length; i++) {
const e = columnList[i];
if (!e.prop.includes('-')) {
list.push(e)
} else {
let prop = e.prop.split('-')[0]
let label = e.label.split('-')[0]
let vModel = e.prop.split('-')[1]
let newItem = {
align: "center",
jnpfKey: "table",
prop,
label,
children: []
}
e.vModel = vModel
if (!this.expandObj.hasOwnProperty(`${prop}Expand`)) this.$set(this.expandObj, `${prop}Expand`, false)
if (!list.some(o => o.prop === prop)) list.push(newItem)
for (let i = 0; i < list.length; i++) {
if (list[i].prop === prop) {
list[i].children.push(e)
break
}
}
}
}
this.getMergeList(list)
this.getExportList(list)
return list
},
arraySpanMethod({ column }) {
for (let i = 0; i < this.mergeList.length; i++) {
if (column.property == this.mergeList[i].prop) {
return [this.mergeList[i].rowspan, this.mergeList[i].colspan]
}
}
},
getMergeList(list) {
let newList = JSON.parse(JSON.stringify(list))
newList.forEach(item => {
if (item.children && item.children.length) {
let child = {
prop: item.prop + '-child-first'
}
item.children.unshift(child)
}
})
newList.forEach(item => {
if (item.children && item.children.length) {
item.children.forEach((child, index) => {
if (index == 0) {
this.mergeList.push({
prop: child.prop,
rowspan: 1,
colspan: item.children.length
})
} else {
this.mergeList.push({
prop: child.prop,
rowspan: 0,
colspan: 0
})
}
})
} else {
this.mergeList.push({
prop: item.prop,
rowspan: 1,
colspan: 1
})
}
})
},
getExportList(list) {
let exportList = []
for (let i = 0; i < list.length; i++) {
if (list[i].jnpfKey === 'table') {
for (let j = 0; j < list[i].children.length; j++) {
exportList.push(list[i].children[j])
}
} else {
exportList.push(list[i])
}
}
this.exportList = exportList
},
goDetail(id) {
this.detailVisible = true
this.$nextTick(() => {
this.$refs.Detail.init(id)
})
},
sortChange({ column, prop, order }) {
this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
this.listQuery.sidx = !order ? '' : prop
this.initData()
},
async initSearchDataAndListData() {
await this.initSearchData()
this.initData()
},
//
async initSearchData() {
},
initData() {
this.listLoading = true;
let _query = {
...this.listQuery,
...this.query,
keyword: this.keyword,
dataType: 0,
menuId: this.menuId,
moduleId: '588627114215912773',
type: 1,
};
request({
url: `/api/scm/SubjectDuty/getList`,
method: 'post',
data: _query
}).then(res => {
var _list = res.data.list;
this.list = _list.map(o => ({
...o,
...this.expandObj,
}))
this.total = res.data.pagination.total
this.listLoading = false
})
},
handleDel(id) {
this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
type: 'warning'
}).then(() => {
request({
url: `/api/scm/SubjectDuty/${id}`,
method: 'DELETE'
}).then(res => {
this.$message({
type: 'success',
message: res.msg,
onClose: () => {
this.initData()
}
});
})
}).catch(() => {
});
},
handelUpload() {
this.uploadBoxVisible = true
this.$nextTick(() => {
this.$refs.UploadBox.init("", "scm/SubjectDuty")
})
},
handleSelectionChange(val) {
const res = val.map(item => item.id)
this.multipleSelection = res
},
handleBatchRemoveDel() {
if (!this.multipleSelection.length) {
this.$message({
type: 'error',
message: '请选择一条数据',
duration: 1500,
})
return
}
const ids = this.multipleSelection
this.$confirm('您确定要删除这些数据吗, 是否继续?', '提示', {
type: 'warning'
}).then(() => {
request({
url: `/api/scm/SubjectDuty/batchRemove`,
data: ids,
method: 'DELETE'
}).then(res => {
this.$message({
type: 'success',
message: res.msg,
onClose: () => {
this.initData()
}
});
})
}).catch(() => {
})
},
openSuperQuery() {
this.superQueryVisible = true
this.$nextTick(() => {
this.$refs.SuperQuery.init()
})
},
superQuery(queryJson) {
this.listQuery.superQueryJson = queryJson
this.listQuery.currentPage = 1
this.initData()
},
addOrUpdateHandle(row, isDetail) {
let id = row ? row.id : ""
this.formVisible = true
this.$nextTick(() => {
this.$refs.JNPFForm.init(id, isDetail, this.list)
})
},
exportData() {
this.exportBoxVisible = true
this.$nextTick(() => {
this.$refs.ExportBox.init(this.exportList)
})
},
download(data) {
let query = { ...data, ...this.listQuery, ...this.query, menuId: this.menuId }
request({
url: `/api/scm/SubjectDuty/Actions/Export`,
method: 'post',
data: query
}).then(res => {
if (!res.data.url) return
this.jnpf.downloadFile(res.data.url)
this.$refs.ExportBox.visible = false
this.exportBoxVisible = false
})
},
search() {
this.listQuery.currentPage = 1
this.listQuery.pageSize = 20
this.listQuery.sort = "desc"
this.listQuery.sidx = ""
this.initData()
},
refresh(isrRefresh) {
this.formVisible = false
if (isrRefresh) this.reset()
},
reset() {
this.query = JSON.parse(JSON.stringify(this.queryData))
this.search()
},
colseFlow(isrRefresh) {
this.flowVisible = false
if (isrRefresh) this.reset()
},
}
}
</script>

@ -310,8 +310,8 @@
<el-button type="text" icon="el-icon-plus">添加</el-button>
</div> -->
</jnpf-form-tip-item>
</el-col>
<!-- </jnpf-form-tip-item>
</el-col> -->
<el-col :span="24">
<div style="padding:15px 0px">
<span style="color: #409EFF;"></span>

@ -146,39 +146,16 @@
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24">
<!-- <el-col :span="24">
<div style="padding:15px 0px">
<span style="color: #409EFF;"></span>
<span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">入库凭证</span>
</div>
</el-col>
<el-col :span="24" v-if="judgeShow('-${html.relationField}')">
</el-col> -->
<!-- <el-col :span="24" v-if="judgeShow('-${html.relationField}')">
<jnpf-form-tip-item label-width="0">
<el-table :data="dataForm.warehousingStoragePoundlistList" size='mini' border>
<el-table-column type="index" width="50" label="序号" align="center" fixed="left" />
<!-- <el-table-column label="关联凭证"
v-if="judgeShow('warehousingstoragepoundlist-voucherId')" prop="voucherId"
align="center" width="220" fixed="left">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('warehousingstoragepoundlistList-voucherId')">*</span>关联凭证
</template>
<template slot-scope="scope">
<JnpfPopupSelect v-model="scope.row.voucherId" @change="changeDataVoucher"
:rowIndex="scope.$index" :formData="dataForm"
:templateJson="interfaceRes.warehousingstoragepoundlistvoucherId"
placeholder="请选择"
:disabled="judgeWrite('warehousingstoragepoundlistList') || judgeWrite('warehousingstoragepoundlistList-voucherId')"
hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据"
popupType="dialog" relationField='voucher_code'
:field="'voucherId' + scope.$index" interfaceId="529621469341175685"
:pageSize="20"
:columnOptions="warehousingstoragepoundlistvoucherIdcolumnOptions" clearable
:style='{ "width": "100%" }'>
</JnpfPopupSelect>
</template>
</el-table-column> -->
<el-table-column label="关联凭证" prop="voucherCode" align="center" width="250">
<template slot="header">
@ -217,30 +194,6 @@
</template>
</el-table-column>
<!-- <el-table-column label="磅单编号" prop="poundCode" align="center" width="150">
<template slot="header">
<span class="required-sign"></span>磅单编号
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.poundCode" placeholder="请输入" disabled clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column> -->
<!-- <el-table-column label="磅单时间" prop="poundlistTime" align="center" width="150">
<template slot="header">
<span class="required-sign"></span>磅单时间
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.poundlistTime" placeholder="请输入" disabled
clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column> -->
<el-table-column label="磅单时间"
v-if="judgeShow('warehousingstoragepoundlist-poundlistTime')" prop="poundlistTime"
width="200" align="center">
@ -278,35 +231,35 @@
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.productName" placeholder="请输入" disabled clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</template>
<JnpfInput v-model="scope.row.productName" placeholder="请输入" disabled clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="规格" prop="spec" align="center" width="150">
<template slot="header">
<span class="required-sign"></span>规格
</template>
<span class="required-sign"></span>规格
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.spec" placeholder="请输入" disabled clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</template>
<JnpfInput v-model="scope.row.spec" placeholder="请输入" disabled clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="单位" prop="unit" align="center" width="150">
<template slot="header">
<span class="required-sign"></span>单位
</template>
<span class="required-sign"></span>单位
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.unit" placeholder="请输入" disabled clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</template>
<JnpfInput v-model="scope.row.unit" placeholder="请输入" disabled clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="毛重" prop="grossWeight" align="center" width="150">
@ -366,18 +319,18 @@
</template>
</el-table-column>
</el-table>
<!-- <div class="table-actions" @click="addwarehousingstoragepoundlistList()"
<div class="table-actions" @click="addwarehousingstoragepoundlistList()"
v-if="!judgeWrite('warehousingstoragepoundlistList')">
<el-button type="text" icon="el-icon-plus">添加</el-button>
</div> -->
</div>
<div class="table-actions" @click="choice(dataForm.warehousingId)"
v-if="!judgeWrite('warehousingstoragepoundlistList')">
<el-button type="text" icon="el-icon-plus">添加</el-button>
</div>
</div>
</jnpf-form-tip-item>
</el-col>
</el-col> -->
<el-col :span="24">
<div style="padding:15px 0px">
<span style="color: #409EFF;"></span>
@ -396,9 +349,9 @@
width="200" fixed="left" align="center">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('warehousingstorageproductList-productId')">*</span>商品名称
</template>
<span class="required-sign"
v-if="judgeRequired('warehousingstorageproductList-productId')">*</span>商品名称
</template>
<template slot-scope="scope">
<JnpfPopupSelect v-model="scope.row.productId" @change="changeDataProduct"
@ -949,56 +902,56 @@ export default {
}
}
}
if (!this.warehousingstoragepoundlistExist()) return
// if (!this.warehousingstoragepoundlistExist()) return
if (!this.warehousingstorageproductExist()) return
if (!this.warehousingstorageproductExist1()) return
// if (!this.warehousingstorageproductExist1()) return
return isOk
},
warehousingstoragepoundlistExist() {
let isOk = true;
for (let i = 0; i < this.dataForm.warehousingStoragePoundlistList.length; i++) {
const e = this.dataForm.warehousingStoragePoundlistList[i];//
if (!e.voucherId) {
this.$message({
message: '关联凭证id不能为空',
type: 'error',
duration: 1000
});
isOk = false
break
}
}
return isOk;
},
warehousingstorageproductExist1() {
let isOk = true;
var data = JSON.parse(JSON.stringify(this.dataForm.warehousingStoragePoundlistList))
var echararr = [];
for (var i = 0; i < data.length; i++) {
var arrindex = echararr.findIndex((item) => { return item.productId == data[i].productId && item.unit == data[i].unit })
if (arrindex == -1) {
echararr.push(data[i]);
} else {
echararr[arrindex].netWeight = this.jnpf.floatAdd(echararr[arrindex].netWeight, data[i].netWeight)
}
}
echararr.forEach(item => {
const flag = this.dataForm.warehousingStorageProductList.find(e => e.productId == item.productId && e.storageUnit == item.unit && e.storageNumber == item.netWeight)
if (!flag) {
this.$message({
message: '凭证与商品不一致',
type: 'error',
duration: 1000
});
isOk = false
return isOk
}
})
return isOk
},
// warehousingstoragepoundlistExist() {
// let isOk = true;
// for (let i = 0; i < this.dataForm.warehousingStoragePoundlistList.length; i++) {
// const e = this.dataForm.warehousingStoragePoundlistList[i];//
// if (!e.voucherId) {
// this.$message({
// message: 'id',
// type: 'error',
// duration: 1000
// });
// isOk = false
// break
// }
// }
// return isOk;
// },
// warehousingstorageproductExist1() {
// let isOk = true;
// var data = JSON.parse(JSON.stringify(this.dataForm.warehousingStoragePoundlistList))
// var echararr = [];
// for (var i = 0; i < data.length; i++) {
// var arrindex = echararr.findIndex((item) => { return item.productId == data[i].productId && item.unit == data[i].unit })
// if (arrindex == -1) {
// echararr.push(data[i]);
// } else {
// echararr[arrindex].netWeight = this.jnpf.floatAdd(echararr[arrindex].netWeight, data[i].netWeight)
// }
// }
// echararr.forEach(item => {
// const flag = this.dataForm.warehousingStorageProductList.find(e => e.productId == item.productId && e.storageUnit == item.unit && e.storageNumber == item.netWeight)
// if (!flag) {
// this.$message({
// message: '',
// type: 'error',
// duration: 1000
// });
// isOk = false
// return isOk
// }
// })
// return isOk
// },
warehousingstorageproductExist() {
let isOk = true;

Loading…
Cancel
Save