diff --git a/jnpf-app/pages/workFlow/flowBefore/index.vue b/jnpf-app/pages/workFlow/flowBefore/index.vue index 509c416e..2ef4bc80 100644 --- a/jnpf-app/pages/workFlow/flowBefore/index.vue +++ b/jnpf-app/pages/workFlow/flowBefore/index.vue @@ -106,8 +106,7 @@ - {{properties.auditBtnText||'通过'}} + @click.stop="eventLauncher('audit')">审批 diff --git a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/CwaccountvoucherMapper.xml b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/CwaccountvoucherMapper.xml index f1a21434..633e50f1 100644 --- a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/CwaccountvoucherMapper.xml +++ b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/CwaccountvoucherMapper.xml @@ -139,7 +139,7 @@ LEFT JOIN jg_contract i on h.contract_id = i.id LEFT JOIN jg_contract_commodity j on (j.contract_id = i.id and f.product_id = j.product_id) LEFT JOIN jg_product k on f.product_id = k.id - LEFT JOIN jg_business_order_product_relational m on (h.id = m.business_order_id and c.order_no = m.ord_ln) + LEFT JOIN jg_business_order_product_relational m on (h.id = m.business_order_id and f.order_line_id = m.ord_ln) where a.warehousing_storage_id in @@ -190,7 +190,7 @@ LEFT JOIN jg_contract i on h.contract_id = i.id LEFT JOIN jg_contract_commodity j on (j.contract_id = i.id and f.product_id = j.product_id) LEFT JOIN jg_product k on f.product_id = k.id - LEFT JOIN jg_business_order_product_relational m on (h.id = m.business_order_id and c.order_no = m.ord_ln) + LEFT JOIN jg_business_order_product_relational m on (h.id = m.business_order_id and f.order_line_id = m.ord_ln) where a.warehousing_storage_id in @@ -241,7 +241,7 @@ LEFT JOIN jg_contract i on h.contract_id = i.id LEFT JOIN jg_contract_commodity j on (j.contract_id = i.id and f.product_id = j.product_id) LEFT JOIN jg_product k on f.product_id = k.id - LEFT JOIN jg_business_order_product_relational m on (h.id = m.business_order_id and c.order_no = m.ord_ln) + LEFT JOIN jg_business_order_product_relational m on (h.id = m.business_order_id and f.order_line_id = m.ord_ln) where a.warehousing_storage_id in @@ -291,7 +291,7 @@ LEFT JOIN jg_contract_commodity j on (j.contract_id = i.id and f.product_id = j.product_id) LEFT JOIN jg_product k on f.product_id = k.id LEFT JOIN jg_warehousing_storage_product l on l.warehousing_storage_id = b.id - LEFT JOIN jg_business_order_product_relational m on (h.id = m.business_order_id and c.order_no = m.ord_ln) + LEFT JOIN jg_business_order_product_relational m on (h.id = m.business_order_id and f.order_line_id = m.ord_ln) where a.warehousing_storage_id in @@ -342,7 +342,7 @@ LEFT JOIN jg_contract i on h.contract_id = i.id LEFT JOIN jg_contract_commodity j on (j.contract_id = i.id and f.product_id = j.product_id) LEFT JOIN jg_product k on f.product_id = k.id - LEFT JOIN jg_business_order_product_relational m on (h.id = m.business_order_id and c.order_no = m.ord_ln) + LEFT JOIN jg_business_order_product_relational m on (h.id = m.business_order_id and f.order_line_id = m.ord_ln) where a.warehousing_outbound_id in @@ -392,7 +392,7 @@ LEFT JOIN jg_contract i on h.contract_id = i.id LEFT JOIN jg_contract_commodity j on (j.contract_id = i.id and f.product_id = j.product_id) LEFT JOIN jg_product k on f.product_id = k.id - LEFT JOIN jg_business_order_product_relational m on (h.id = m.business_order_id and c.order_no = m.ord_ln) + LEFT JOIN jg_business_order_product_relational m on (h.id = m.business_order_id and f.order_line_id = m.ord_ln) where a.warehousing_outbound_id in @@ -443,7 +443,7 @@ LEFT JOIN jg_contract_commodity j on (j.contract_id = i.id and f.product_id = j.product_id) LEFT JOIN jg_product k on f.product_id = k.id LEFT JOIN jg_warehousing_outbound_product l on l.warehousing_outbound_id = b.id - LEFT JOIN jg_business_order_product_relational m on (h.id = m.business_order_id and c.order_no = m.ord_ln) + LEFT JOIN jg_business_order_product_relational m on (h.id = m.business_order_id and f.order_line_id = m.ord_ln) where a.warehousing_outbound_id in @@ -494,7 +494,7 @@ LEFT JOIN jg_contract i on h.contract_id = i.id LEFT JOIN jg_contract_commodity j on (j.contract_id = i.id and f.product_id = j.product_id) LEFT JOIN jg_product k on f.product_id = k.id - LEFT JOIN jg_business_order_product_relational m on (h.id = m.business_order_id and c.order_no = m.ord_ln) + LEFT JOIN jg_business_order_product_relational m on (h.id = m.business_order_id and f.order_line_id = m.ord_ln) where a.warehousing_outbound_id in diff --git a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/VoucherMapper.xml b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/VoucherMapper.xml index cc955e6a..9dd98f0d 100644 --- a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/VoucherMapper.xml +++ b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/VoucherMapper.xml @@ -710,4 +710,10 @@ from jg_voucher a where a.f_delete_mark is null and a.is_transfer = '2' and a.business_order_id = #{id} + + + update jg_voucher set order_no = #{voucherEntity.orderNo} + where voucher_code = #{voucherEntity.voucherCode} + + diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/VoucherMapper.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/VoucherMapper.java index 95fb2e8d..aa7a17dd 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/VoucherMapper.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/VoucherMapper.java @@ -51,4 +51,6 @@ public interface VoucherMapper extends BaseMapper { BigDecimal queryVoucherByBusinessOrder(@Param("id") String id); Map queryAmountByBusinessOrder(@Param("id") String id); + + void updateByVoucherCode(@Param("voucherEntity") VoucherEntity voucherEntity); } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/VoucherService.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/VoucherService.java index a9a006d9..9684eded 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/VoucherService.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/VoucherService.java @@ -78,4 +78,6 @@ public interface VoucherService extends IService { BigDecimal queryVoucherProductNetWeightInfo(String id); BigDecimal queryVoucherByBusinessOrderInfo(String id); Map queryAmountByBusinessOrder(String id); + + void updateByVoucherCode(VoucherEntity voucherEntity); } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/CwaccountServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/CwaccountServiceImpl.java index a88e0dcb..9b8efe9d 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/CwaccountServiceImpl.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/CwaccountServiceImpl.java @@ -673,82 +673,6 @@ public class CwaccountServiceImpl extends ServiceImpl 0){ - for(CwaccountvoucherModel t : form.getCwaccountvoucherList()){ - if(StringUtil.isNotEmpty(t.getBucklesWeight())){ - t.setBucklesWeight(t.getBucklesWeight().trim()); - } - else{ - return "凭证信息-扣杂重量不能为空"; - } - /*if(StringUtil.isNotEmpty(t.getBucklesWeight())){ - if(!Pattern.compile("^([1-9][\\d]*|0)(\\.[\\d]+)?$").matcher(String.valueOf(t.getBucklesWeight())).matches()){ - return "请输入正确的金额"; - } - }*/ - } - for(CwaccountvoucherModel t : form.getCwaccountvoucherList()){ - if(StringUtil.isNotEmpty(t.getSettlementSum())){ - t.setSettlementSum(t.getSettlementSum().trim()); - } - else{ - return "凭证信息-结算数量不能为空"; - } - /*if(StringUtil.isNotEmpty(t.getSettlementSum())){ - if(!Pattern.compile("^([1-9][\\d]*|0)(\\.[\\d]+)?$").matcher(String.valueOf(t.getSettlementSum())).matches()){ - return "请输入正确的金额"; - } - }*/ - } - for(CwaccountvoucherModel t : form.getCwaccountvoucherList()){ - if(StringUtil.isNotEmpty(t.getSettlementPrice())){ - t.setSettlementPrice(t.getSettlementPrice().trim()); - } - else{ - return "凭证信息-结算单价（含税）不能为空"; - } - /*if(StringUtil.isNotEmpty(t.getSettlementPrice())){ - if(!Pattern.compile("^([1-9][\\d]*|0)(\\.[\\d]+)?$").matcher(String.valueOf(t.getSettlementPrice())).matches()){ - return "请输入正确的金额"; - } - }*/ - } - for(CwaccountvoucherModel t : form.getCwaccountvoucherList()){ - if(StringUtil.isNotEmpty(t.getSettlementSubtotal())){ - t.setSettlementSubtotal(t.getSettlementSubtotal().trim()); - } - else{ - return "凭证信息-结算小计（含税）不能为空"; - } - /*if(StringUtil.isNotEmpty(t.getSettlementSubtotal())){ - if(!Pattern.compile("^([1-9][\\d]*|0)(\\.[\\d]+)?$").matcher(String.valueOf(t.getSettlementSubtotal())).matches()){ - return "请输入正确的金额"; - } - }*/ - } - for(CwaccountvoucherModel t : form.getCwaccountvoucherList()){ - if(StringUtil.isNotEmpty(t.getSettlementPriceNo())){ - t.setSettlementPriceNo(t.getSettlementPriceNo().trim()); - } - /*if(StringUtil.isNotEmpty(t.getSettlementPriceNo())){ - if(!Pattern.compile("^([1-9][\\d]*|0)(\\.[\\d]+)?$").matcher(String.valueOf(t.getSettlementPriceNo())).matches()){ - return "请输入正确的金额"; - } - }*/ - } - for(CwaccountvoucherModel t : form.getCwaccountvoucherList()){ - if(StringUtil.isNotEmpty(t.getOtherExpenses())){ - t.setOtherExpenses(t.getOtherExpenses().trim()); - } - /*if(StringUtil.isNotEmpty(t.getOtherExpenses())){ - if(!Pattern.compile("^([1-9][\\d]*|0)(\\.[\\d]+)?$").matcher(String.valueOf(t.getOtherExpenses())).matches()){ - return "请输入正确的金额"; - } - }*/ - } - }else{ - return "凭证信息不能为空"; - } if (form.getCwaccountsummaryList()==null || form.getCwaccountsummaryList().size() == 0){ return "汇总信息不能为空"; } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/VoucherServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/VoucherServiceImpl.java index 33fbd14b..f1d7fe03 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/VoucherServiceImpl.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/VoucherServiceImpl.java @@ -1068,13 +1068,36 @@ public class VoucherServiceImpl extends ServiceImpl contractLQueryWrapper=new QueryWrapper<>(); - contractLQueryWrapper.lambda().eq(ContractLEntity::getContractNumber, voucherEntity.getPurchaseContractNo()); + if(voucherEntity.getBusinessType().equals("1")){ + contractLQueryWrapper.lambda().eq(ContractLEntity::getContractNumber, voucherEntity.getPurchaseContractNo()); + }else{ + contractLQueryWrapper.lambda().eq(ContractLEntity::getContractNumber, voucherEntity.getSaleContractNo()); + } List contractLEntityList = contractLService.list(contractLQueryWrapper); if(contractLEntityList != null && contractLEntityList.size() > 0){ + if(voucherEntity.getBusinessType().equals("1")){ + if(voucherEntity.getDocumentType().equals("1")){ + //采购收货 + voucherEntity.setCustomerId(contractLEntityList.get(0).getDeptId()); + voucherEntity.setSupplierId(contractLEntityList.get(0).getSubject()); + }else{ + //采购发货 + voucherEntity.setCustomerId(contractLEntityList.get(0).getSubject()); + voucherEntity.setSupplierId(contractLEntityList.get(0).getDeptId()); + } + }else{ + if(voucherEntity.getDocumentType().equals("1")){ + //销售收货 + voucherEntity.setCustomerId(contractLEntityList.get(0).getDeptId()); + voucherEntity.setSupplierId(contractLEntityList.get(0).getSubject()); + }else{ + //销售发货 + voucherEntity.setCustomerId(contractLEntityList.get(0).getSubject()); + voucherEntity.setSupplierId(contractLEntityList.get(0).getDeptId()); + } + } voucherEntity.setModeTransport(contractLEntityList.get(0).getModeTransport());//运输方式 - voucherEntity.setCustomerId(contractLEntityList.get(0).getDeptId()); voucherEntity.setCustomerName(""); - voucherEntity.setSupplierId(contractLEntityList.get(0).getSubject()); voucherEntity.setSupplierName(""); }else{ num ++; @@ -1353,4 +1376,9 @@ public class VoucherServiceImpl extends ServiceImpl queryAmountByBusinessOrder(String id) { return voucherMapper.queryAmountByBusinessOrder(id); } + + @Override + public void updateByVoucherCode(VoucherEntity voucherEntity) { + voucherMapper.updateByVoucherCode(voucherEntity); + } } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/VehicleController.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/VehicleController.java index 58542eb2..56defa3c 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/VehicleController.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/VehicleController.java @@ -7,6 +7,7 @@ import io.swagger.v3.oas.annotations.tags.Tag; import jnpf.base.ActionResult; import jnpf.base.UserInfo; import jnpf.exception.DataException; +import jnpf.model.voucher.*; import jnpf.permission.entity.UserEntity; import jnpf.service.*; import jnpf.entity.*; @@ -73,7 +74,8 @@ public class VehicleController { @Autowired private VehicleDriverService vehicleDriverService; - + @Autowired + private VoucherService voucherService; @Autowired private ConfigValueUtil configValueUtil; @@ -370,4 +372,194 @@ public class VehicleController { return ActionResult.success(vehicleMap); } + + + + + + + + + + + + + + + @Operation(summary = "上传文件") + @PostMapping("/Uploader") + public ActionResult Uploader() { + List list = UpUtil.getFileAll(); + MultipartFile file = list.get(0); + if (file.getOriginalFilename().endsWith(".xlsx") || file.getOriginalFilename().endsWith(".xls")) { + String filePath = XSSEscape.escape(configValueUtil.getTemporaryFilePath()); + String fileName = XSSEscape.escape(RandomUtil.uuId() + "." + UpUtil.getFileType(file)); + //上传文件 + FileInfo fileInfo = FileUploadUtils.uploadFile(file, filePath, fileName); + DownloadVO vo = DownloadVO.builder().build(); + vo.setName(fileInfo.getFilename()); + return ActionResult.success(vo); + } else { + return ActionResult.fail("选择文件不符合导入"); + } + } + + /** + * 模板下载 + * + * @return + */ + @Operation(summary = "模板下载") + @GetMapping("/TemplateDownload") + public ActionResult TemplateDownload(){ + DownloadVO vo = DownloadVO.builder().build(); + UserInfo userInfo = userProvider.get(); + Map dataMap = new HashMap<>(); + //主表对象 + List entitys = new ArrayList<>(); + //以下添加字段 + entitys.add(new ExcelExportEntity("凭证编号" ,"voucherCode")); + entitys.add(new ExcelExportEntity("订单序号" ,"orderNo")); + entitys.add(new ExcelExportEntity("单据类型" ,"documentType")); + entitys.add(new ExcelExportEntity("凭证类型" ,"voucherType")); + entitys.add(new ExcelExportEntity("凭证状态" ,"voucherStatus")); + entitys.add(new ExcelExportEntity("磅单编号" ,"poundCode")); + entitys.add(new ExcelExportEntity("关联单据号" ,"associatedDocumentNo")); + entitys.add(new ExcelExportEntity("车牌号" ,"vehicleName")); + entitys.add(new ExcelExportEntity("运输方式" ,"modeTransport")); + entitys.add(new ExcelExportEntity("承运方式" ,"transportationMethod")); + entitys.add(new ExcelExportEntity("承运商" ,"carrier")); + entitys.add(new ExcelExportEntity("运费" ,"freight")); + entitys.add(new ExcelExportEntity("起运地" ,"placeDispatch")); + entitys.add(new ExcelExportEntity("到达地" ,"destination")); + entitys.add(new ExcelExportEntity("三级供应商" ,"thirdSupplyName")); + entitys.add(new ExcelExportEntity("制单时间" ,"preparationTime")); + List> list = new ArrayList<>(); + list.add(dataMap); + + 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<>()); + } + //复杂表头-表头和数据处理 + ColumnDataModel columnDataModel = JsonUtil.getJsonToBean(VoucherConstant.getColumnData(), ColumnDataModel.class); + List complexHeaderList = columnDataModel.getComplexHeaderList(); + if (!Objects.equals(columnDataModel.getType(), 3) && !Objects.equals(columnDataModel.getType(), 5)) { + entitys = VisualUtils.complexHeaderHandel(entitys, complexHeaderList); + list = VisualUtils.complexHeaderDataHandel(list, complexHeaderList); + } + workbook = ExcelExportUtil.exportExcel(exportParams, entitys, list); + } + String fileName = "凭证单模板" + DateUtil.dateNow("yyyyMMddHHmmss") + ".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 ActionResult.success(vo); + } + + /** + * 导入预览 + * + * @return + */ + @Operation(summary = "导入预览" ) + @GetMapping("/ImportPreview") + public ActionResult> ImportPreview(String fileName) throws Exception { + Map headAndDataMap = new HashMap<>(2); + String filePath = FileUploadUtils.getLocalBasePath() + configValueUtil.getTemporaryFilePath(); + FileUploadUtils.downLocal(configValueUtil.getTemporaryFilePath(), filePath, fileName); + File temporary = new File(XSSEscape.escapePath(filePath + fileName)); + int headerRowIndex = 1; + ImportParams params = new ImportParams(); + params.setTitleRows(0); + params.setHeadRows(headerRowIndex); + params.setNeedVerify(true); + try { + List excelDataList = ExcelImportUtil.importExcel(temporary, VoucherExcelVO333.class, params); + // 导入字段 + List columns = new ArrayList<>(); + columns.add(new ExcelImFieldModel("voucherCode","凭证编号")); + columns.add(new ExcelImFieldModel("orderNo","订单序号")); + columns.add(new ExcelImFieldModel("documentType","单据类型")); + columns.add(new ExcelImFieldModel("voucherType","凭证类型")); + columns.add(new ExcelImFieldModel("preparationTime","制单时间")); + columns.add(new ExcelImFieldModel("poundCode","磅单编号")); + columns.add(new ExcelImFieldModel("vehicleName","车牌号")); + columns.add(new ExcelImFieldModel("supplierName","发货单位")); + columns.add(new ExcelImFieldModel("customerName","收货单位")); + columns.add(new ExcelImFieldModel("modeTransport","运输方式")); + columns.add(new ExcelImFieldModel("transportationMethod","承运方式")); + columns.add(new ExcelImFieldModel("carrier","承运商")); + columns.add(new ExcelImFieldModel("placeDispatch","起运地")); + columns.add(new ExcelImFieldModel("destination","到达地")); + columns.add(new ExcelImFieldModel("freight","运费")); + columns.add(new ExcelImFieldModel("voucherStatus","凭证状态")); + headAndDataMap.put("dataRow" , JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(excelDataList))); + headAndDataMap.put("headerRow" , JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(columns))); + } catch (Exception e){ + e.printStackTrace(); + return ActionResult.fail("表头名称不可更改,表头行不能删除"); + } + return ActionResult.success(headAndDataMap); + } + + /** + * 导入数据 + * + * @return + */ + @Operation(summary = "导入数据" ) + @PostMapping("/ImportData") + public ActionResult ImportData(@RequestBody VisualImportModel visualImportModel) throws Exception { + List> listData=new ArrayList<>(); + for(Map map : visualImportModel.getList()){ + voucherService.updateByVoucherCode(JsonUtil.getJsonToBean(map, VoucherEntity.class)); + } + ExcelImportModel excelImportModel = new ExcelImportModel(); + excelImportModel.setSnum(visualImportModel.getList().size()); + excelImportModel.setFnum(0); + excelImportModel.setResultType(0); + return ActionResult.success(excelImportModel); + } + + /** + * 导出异常报告 + * + * @return + */ + @Operation(summary = "导出异常报告") + @PostMapping("/ImportExceptionData") + public ActionResult ImportExceptionData(@RequestBody VisualImportModel visualImportModel) { + DownloadVO vo=DownloadVO.builder().build(); + List voucherVOList = JsonUtil.getJsonToList(visualImportModel.getList(), VoucherExcelErrorVO.class); + UserInfo userInfo = userProvider.get(); + + try{ + @Cleanup Workbook workbook = new HSSFWorkbook(); + ExportParams exportParams = new ExportParams(null, "错误报告"); + exportParams.setType(ExcelType.XSSF); + workbook = ExcelExportUtil.exportExcel(exportParams, + VoucherExcelErrorVO.class, voucherVOList); + + 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) { + e.printStackTrace(); + } + return ActionResult.success(vo); + } } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/voucher/VoucherExcelVO.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/voucher/VoucherExcelVO.java index 30aad9e8..22b8840e 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/voucher/VoucherExcelVO.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/voucher/VoucherExcelVO.java @@ -26,6 +26,10 @@ public class VoucherExcelVO{ @JSONField(name = "voucherCode") @Excel(name = "凭证编号" ) private String voucherCode; + /** 订单序号 **/ + @JSONField(name = "orderNo") + @Excel(name = "订单序号") + private String orderNo; /** 凭证类型 **/ @JSONField(name = "voucherType") @@ -102,7 +106,6 @@ public class VoucherExcelVO{ @JSONField(name = "voucherStatus") @Excel(name = "凭证状态" ) private String voucherStatus; - @JsonProperty("tableField111") @ExcelCollection(name="",orderNum = "8") private List tableField111; diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/voucher/VoucherExcelVO333.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/voucher/VoucherExcelVO333.java new file mode 100644 index 00000000..59558862 --- /dev/null +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/voucher/VoucherExcelVO333.java @@ -0,0 +1,109 @@ +package jnpf.model.voucher; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import cn.afterturn.easypoi.excel.annotation.ExcelCollection; +import com.alibaba.fastjson.annotation.JSONField; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; + +import java.util.List; + +/** + * + * Voucher + * @版本： V3.5 + * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） + * @作者： JNPF开发平台组 + * @日期： 2024-05-10 + */ +@Data +public class VoucherExcelVO333 { + + /** 凭证编号 **/ + @JSONField(name = "voucherCode") + @Excel(name = "凭证编号" ) + private String voucherCode; + + /** 订单序号 **/ + @JSONField(name = "orderNo") + @Excel(name = "订单序号") + private String orderNo; + + /** 单据类型 **/ + @JSONField(name = "documentType") + @Excel(name = "单据类型") + private String documentType; + + /** 凭证类型 **/ + @JSONField(name = "voucherType") + @Excel(name = "凭证类型") + private String voucherType; + + /** 凭证状态 **/ + @JSONField(name = "voucherStatus") + @Excel(name = "凭证状态" ) + private String voucherStatus; + + /** 制单时间 **/ + @JSONField(name = "preparationTime") + @Excel(name = "制单时间" ) + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + private String preparationTime; + + /** 磅单编号 **/ + @JSONField(name = "poundCode") + @Excel(name = "磅单编号" ) + private String poundCode; + + /** 车牌号 **/ + @JSONField(name = "vehicleName") + @Excel(name = "车牌号" ) + private String vehicleName; + + /** 发货单位 **/ + @JSONField(name = "supplierName") + @Excel(name = "发货单位" ) + private String supplierName; + + /** 收货单位 **/ + @JSONField(name = "customerName") + @Excel(name = "收货单位" ) + private String customerName; + + /** 运输方式 **/ + @JSONField(name = "modeTransport") + @Excel(name = "运输方式" ) + private String modeTransport; + + /** 承运方式 **/ + @JSONField(name = "transportationMethod") + @Excel(name = "承运方式" ) + private String transportationMethod; + + /** 承运商 **/ + @JSONField(name = "carrier") + @Excel(name = "承运商" ) + private String carrier; + + /** 起运地 **/ + @JSONField(name = "placeDispatch") + @Excel(name = "起运地" ) + private String placeDispatch; + + /** 到达地 **/ + @JSONField(name = "destination") + @Excel(name = "到达地" ) + private String destination; + + /** 运费 **/ + @JSONField(name = "freight") + @Excel(name = "运费" ) + private String freight; + + /** 关联单据号 **/ + @JSONField(name = "associatedDocumentNo") + @Excel(name = "关联单据号" ) + private String associatedDocumentNo; + +} diff --git a/jnpf-java-boot/jnpf-web/src/views/extend/cwaccount/form.vue b/jnpf-java-boot/jnpf-web/src/views/extend/cwaccount/form.vue index b707ade3..ae5f8b0e 100644 --- a/jnpf-java-boot/jnpf-web/src/views/extend/cwaccount/form.vue +++ b/jnpf-java-boot/jnpf-web/src/views/extend/cwaccount/form.vue @@ -752,7 +752,7 @@
+ v-if="!judgeWrite('cwaccountcontractList')"> 添加
@@ -899,467 +899,6 @@ 添加 - -
- ▋ - 凭证信息 -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- 加载凭证 -
- -
▋ @@ -1369,7 +908,7 @@ @@ -1866,7 +1405,7 @@ export default { Vmodel: "", currVmodel: "", dataForm: { - summaryType: '1', + summaryType: '2', subjectId: '', contractType: '', type: '1', @@ -2344,6 +1883,7 @@ export default { const e = list[i]; this.dataForm.cwaccountstorageList.push(e) } + this.addcwaccountvoucherList(); }, typeChangeData() { this.dataForm.cwaccountsubjectList = []; @@ -2359,22 +1899,22 @@ export default { this.dataForm.businessType = '3' } }, - contractChangeData(model, row) { - this.dataForm.cwaccountcontractList[0].contractName = row.contract_name - this.dataForm.cwaccountcontractList[0].contractPeriodTime = row.contract_period_time ? row.contract_period_time.substring(0, 10) : ''; - this.dataForm.cwaccountcontractList[0].contractPeriodTimeEnd = row.contract_period_time_end ? row.contract_period_time_end.substring(0, 10) : ''; + contractChangeData(model, row, rowIndex) { + this.dataForm.cwaccountcontractList[rowIndex].contractName = row.contract_name + this.dataForm.cwaccountcontractList[rowIndex].contractPeriodTime = row.contract_period_time ? row.contract_period_time.substring(0, 10) : ''; + this.dataForm.cwaccountcontractList[rowIndex].contractPeriodTimeEnd = row.contract_period_time_end ? row.contract_period_time_end.substring(0, 10) : ''; //this.dataForm.cwaccountcontractList[0].currency = row.currency; - this.dataForm.cwaccountcontractList[0].procurementModel = row.procurement_model; - this.dataForm.cwaccountcontractList[0].pricingModel = row.pricing_model; - this.dataForm.cwaccountcontractList[0].relatedContractId = row.related_contract_id; - this.dataForm.cwaccountcontractList[0].subject = row.subject; - this.dataForm.cwaccountcontractList[0].subject2 = row.subject2; - this.dataForm.cwaccountcontractList[0].deliveryTime = row.delivery_time ? row.delivery_time.substring(0, 10) : ''; - this.dataForm.cwaccountcontractList[0].deliveryTimeEnd = row.delivery_time_end ? row.delivery_time_end.substring(0, 10) : ''; - this.dataForm.cwaccountcontractList[0].deliveryModel = row.delivery_model; - this.dataForm.cwaccountcontractList[0].deliveryMethod = row.delivery_method; - this.dataForm.cwaccountcontractList[0].modeTransport = row.mode_transport; - this.dataForm.cwaccountcontractList[0].costBearingMian = row.cost_bearing_mian; + this.dataForm.cwaccountcontractList[rowIndex].procurementModel = row.procurement_model; + this.dataForm.cwaccountcontractList[rowIndex].pricingModel = row.pricing_model; + this.dataForm.cwaccountcontractList[rowIndex].relatedContractId = row.related_contract_id; + this.dataForm.cwaccountcontractList[rowIndex].subject = row.subject; + this.dataForm.cwaccountcontractList[rowIndex].subject2 = row.subject2; + this.dataForm.cwaccountcontractList[rowIndex].deliveryTime = row.delivery_time ? row.delivery_time.substring(0, 10) : ''; + this.dataForm.cwaccountcontractList[rowIndex].deliveryTimeEnd = row.delivery_time_end ? row.delivery_time_end.substring(0, 10) : ''; + this.dataForm.cwaccountcontractList[rowIndex].deliveryModel = row.delivery_model; + this.dataForm.cwaccountcontractList[rowIndex].deliveryMethod = row.delivery_method; + this.dataForm.cwaccountcontractList[rowIndex].modeTransport = row.mode_transport; + this.dataForm.cwaccountcontractList[rowIndex].costBearingMian = row.cost_bearing_mian; }, subjectChangeData(model, row) { this.dataForm.subjectId = row.id; @@ -2516,7 +2056,7 @@ export default { if (!this.cwaccountsubjectExist()) return if (!this.cwaccountcontractExist()) return if (!this.cwaccountstorageExist()) return - if (!this.cwaccountvoucherExist()) return + // if (!this.cwaccountvoucherExist()) return if (!this.cwaccountsummaryExist()) return return isOk }, diff --git a/jnpf-java-boot/jnpf-web/src/views/extend/cwsettlement/form.vue b/jnpf-java-boot/jnpf-web/src/views/extend/cwsettlement/form.vue index 37402e4c..e96ca718 100644 --- a/jnpf-java-boot/jnpf-web/src/views/extend/cwsettlement/form.vue +++ b/jnpf-java-boot/jnpf-web/src/views/extend/cwsettlement/form.vue @@ -758,7 +758,7 @@
+ v-if="!judgeWrite('cwsettlementcontractList')"> 添加
@@ -2506,22 +2506,22 @@ export default { this.$refs.goodsBox2.init(excludeIdList, this.dataForm.cwsettlementsubjectList[0].subjectId) }) }, - contractChangeData(model, row) { - this.dataForm.cwsettlementcontractList[0].contractName = row.contract_name - this.dataForm.cwsettlementcontractList[0].contractPeriodTime = row.contract_period_time ? row.contract_period_time.substring(0, 10) : ''; - this.dataForm.cwsettlementcontractList[0].contractPeriodTimeEnd = row.contract_period_time_end ? row.contract_period_time_end.substring(0, 10) : ''; + contractChangeData(model, row, rowIndex) { + this.dataForm.cwsettlementcontractList[rowIndex].contractName = row.contract_name + this.dataForm.cwsettlementcontractList[rowIndex].contractPeriodTime = row.contract_period_time ? row.contract_period_time.substring(0, 10) : ''; + this.dataForm.cwsettlementcontractList[rowIndex].contractPeriodTimeEnd = row.contract_period_time_end ? row.contract_period_time_end.substring(0, 10) : ''; //this.dataForm.cwsettlementcontractList[0].currency = row.currency; - this.dataForm.cwsettlementcontractList[0].procurementModel = row.procurement_model; - this.dataForm.cwsettlementcontractList[0].pricingModel = row.pricing_model; - this.dataForm.cwsettlementcontractList[0].relatedContractId = row.related_contract_id; - this.dataForm.cwsettlementcontractList[0].subject = row.subject; - this.dataForm.cwsettlementcontractList[0].subject2 = row.subject2; - this.dataForm.cwsettlementcontractList[0].deliveryTime = row.delivery_time ? row.delivery_time.substring(0, 10) : ''; - this.dataForm.cwsettlementcontractList[0].deliveryTimeEnd = row.delivery_time_end ? row.delivery_time_end.substring(0, 10) : ''; - this.dataForm.cwsettlementcontractList[0].deliveryModel = row.delivery_model; - this.dataForm.cwsettlementcontractList[0].deliveryMethod = row.delivery_method; - this.dataForm.cwsettlementcontractList[0].modeTransport = row.mode_transport; - this.dataForm.cwsettlementcontractList[0].costBearingMian = row.cost_bearing_mian; + this.dataForm.cwsettlementcontractList[rowIndex].procurementModel = row.procurement_model; + this.dataForm.cwsettlementcontractList[rowIndex].pricingModel = row.pricing_model; + this.dataForm.cwsettlementcontractList[rowIndex].relatedContractId = row.related_contract_id; + this.dataForm.cwsettlementcontractList[rowIndex].subject = row.subject; + this.dataForm.cwsettlementcontractList[rowIndex].subject2 = row.subject2; + this.dataForm.cwsettlementcontractList[rowIndex].deliveryTime = row.delivery_time ? row.delivery_time.substring(0, 10) : ''; + this.dataForm.cwsettlementcontractList[rowIndex].deliveryTimeEnd = row.delivery_time_end ? row.delivery_time_end.substring(0, 10) : ''; + this.dataForm.cwsettlementcontractList[rowIndex].deliveryModel = row.delivery_model; + this.dataForm.cwsettlementcontractList[rowIndex].deliveryMethod = row.delivery_method; + this.dataForm.cwsettlementcontractList[rowIndex].modeTransport = row.mode_transport; + this.dataForm.cwsettlementcontractList[rowIndex].costBearingMian = row.cost_bearing_mian; }, subjectChangeData(model, row) { let aaa = {}; diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/deliveryVoucher/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/deliveryVoucher/index.vue index e1e6347d..af5abb93 100644 --- a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/deliveryVoucher/index.vue +++ b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/deliveryVoucher/index.vue @@ -669,7 +669,7 @@ export default { handelUpload() { this.uploadBoxVisible = true this.$nextTick(() => { - this.$refs.UploadBox.init("", "scm/Voucher", undefined, undefined, "采购", "退供凭证") + this.$refs.UploadBox.init("", "scm/Voucher", undefined, undefined, "采购", "收货凭证") }) }, handleSelectionChange(val) { diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryVoucher/columnList.js b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryVoucher/columnList.js index 045b1d3f..13ce2901 100644 --- a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryVoucher/columnList.js +++ b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryVoucher/columnList.js @@ -1,2 +1,2 @@ -const columnList = [{"jnpfKey":"billRule","fullName":"凭证编号","label":"凭证编号","sortable":false,"align":"left","__config__":{"formId":101,"visibility":["pc","app"],"jnpfKey":"billRule","defaultValue":null,"noShow":false,"tipLabel":"","dragDisabled":false,"rule":"ssdj","className":[],"label":"凭证编号","trigger":"change","showLabel":true,"required":false,"tableName":"jg_voucher","renderKey":1707042861597,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-documents","ruleName":"销售订单","tag":"JnpfInput","span":8},"readonly":true,"prop":"voucherCode","width":0,"__vModel__":"voucherCode","fixed":"none","style":{"width":"100%"},"id":"voucherCode","placeholder":"系统自动生成"},{"filterable":false,"clearable":true,"jnpfKey":"select","multiple":false,"fullName":"单据类型","label":"单据类型","sortable":false,"align":"left","props":{"label":"fullName","value":"id"},"__config__":{"formId":148,"visibility":["pc","app"],"jnpfKey":"select","defaultValue":"2","noShow":false,"dataType":"static","dictionaryType":"","tipLabel":"","dragDisabled":false,"className":[],"label":"单据类型","trigger":"change","propsUrl":"","templateJson":[],"showLabel":true,"required":false,"tableName":"jg_voucher","renderKey":1707044178909,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-select","propsName":"","tag":"JnpfSelect","regList":[],"span":24},"prop":"documentType","width":0,"options":[{"fullName":"收货凭证","id":"1"},{"fullName":"发货凭证","id":"2"}],"__vModel__":"documentType","fixed":"none","style":{"width":"100%"},"disabled":false,"interfaceHasPage":false,"id":"documentType","placeholder":"请选择","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"filterable":false,"clearable":true,"jnpfKey":"select","multiple":false,"fullName":"凭证类型","label":"凭证类型","sortable":false,"align":"left","props":{"label":"fullName","value":"id"},"__config__":{"formId":102,"visibility":["pc","app"],"jnpfKey":"select","defaultValue":"","noShow":false,"dataType":"static","dictionaryType":"","tipLabel":"","dragDisabled":false,"className":[],"label":"凭证类型","trigger":"change","propsUrl":"","templateJson":[],"showLabel":true,"required":true,"tableName":"jg_voucher","renderKey":1707042898113,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-select","propsName":"","tag":"JnpfSelect","regList":[],"span":8},"prop":"voucherType","width":0,"options":[{"fullName":"磅单","id":"1"},{"fullName":"收据","id":"2"},{"fullName":"其他","id":"3"}],"__vModel__":"voucherType","fixed":"none","style":{"width":"100%"},"disabled":false,"interfaceHasPage":false,"id":"voucherType","placeholder":"请选择","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"filterable":false,"clearable":true,"jnpfKey":"select","multiple":false,"fullName":"凭证状态","label":"凭证状态","sortable":false,"align":"left","props":{"label":"fullName","value":"id"},"__config__":{"formId":147,"visibility":["pc","app"],"jnpfKey":"select","defaultValue":"1","noShow":false,"dataType":"static","dictionaryType":"","tipLabel":"","dragDisabled":false,"className":[],"label":"凭证状态","trigger":"change","propsUrl":"","templateJson":[],"showLabel":true,"required":false,"tableName":"jg_voucher","renderKey":1707044013618,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-select","propsName":"","tag":"JnpfSelect","regList":[],"span":24},"prop":"voucherStatus","width":0,"options":[{"fullName":"待提交","id":"1"},{"fullName":"待审核","id":"2"},{"fullName":"已驳回","id":"3"},{"fullName":"待确认","id":"4"},{"fullName":"待收货","id":"5"},{"fullName":"已完成","id":"6"},{"fullName":"已取消","id":"7"}],"__vModel__":"voucherStatus","fixed":"none","style":{"width":"100%"},"disabled":false,"interfaceHasPage":false,"id":"voucherStatus","placeholder":"请选择","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"maxlength":null,"jnpfKey":"input","suffixIcon":"","fullName":"磅单编号","label":"磅单编号","sortable":false,"align":"left","addonAfter":"","__config__":{"formId":107,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"磅单编号","trigger":"blur","showLabel":true,"required":true,"tableName":"jg_voucher","renderKey":1707043053878,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":8},"readonly":false,"prop":"poundCode","showWordLimit":false,"width":0,"__vModel__":"poundCode","showPassword":false,"fixed":"none","style":{"width":"100%"},"disabled":false,"id":"poundCode","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"maxlength":null,"jnpfKey":"input","suffixIcon":"","fullName":"关联单据号","label":"关联单据号","sortable":false,"align":"left","addonAfter":"","__config__":{"formId":149,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"关联单据号","trigger":"blur","showLabel":true,"required":false,"tableName":"jg_voucher","renderKey":1707044269999,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":24},"readonly":false,"prop":"associatedDocumentNo","showWordLimit":false,"width":0,"__vModel__":"associatedDocumentNo","showPassword":false,"fixed":"none","style":{"width":"100%"},"disabled":false,"id":"associatedDocumentNo","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"maxlength":null,"jnpfKey":"input","suffixIcon":"","fullName":"车牌号","label":"车牌号","sortable":false,"align":"left","addonAfter":"","__config__":{"formId":108,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"车牌号","trigger":"blur","showLabel":true,"required":true,"tableName":"jg_voucher","renderKey":1707043061839,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":8},"readonly":false,"prop":"vehicleName","showWordLimit":false,"width":0,"__vModel__":"vehicleName","showPassword":false,"fixed":"none","style":{"width":"100%"},"disabled":false,"id":"vehicleName","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"filterable":false,"clearable":true,"jnpfKey":"select","multiple":false,"fullName":"运输方式","label":"运输方式","sortable":false,"align":"left","props":{"label":"fullName","value":"id"},"__config__":{"formId":124,"visibility":["pc","app"],"jnpfKey":"select","defaultValue":"","noShow":false,"dataType":"static","dictionaryType":"","tipLabel":"","dragDisabled":false,"className":[],"label":"运输方式","trigger":"change","propsUrl":"","templateJson":[],"showLabel":true,"required":true,"tableName":"jg_voucher","renderKey":1707043292813,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-select","propsName":"","tag":"JnpfSelect","regList":[],"span":8},"prop":"modeTransport","width":0,"options":[{"fullName":"公路","id":"1"},{"fullName":"铁路","id":"2"},{"fullName":"轮船","id":"3"},{"fullName":"空运","id":"4"},{"fullName":"无","id":"5"}],"__vModel__":"modeTransport","fixed":"none","style":{"width":"100%"},"disabled":false,"interfaceHasPage":false,"id":"modeTransport","placeholder":"请选择","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"filterable":false,"clearable":true,"jnpfKey":"select","multiple":false,"fullName":"承运方式","label":"承运方式","sortable":false,"align":"left","props":{"label":"fullName","value":"id"},"__config__":{"formId":125,"visibility":["pc","app"],"jnpfKey":"select","defaultValue":"","noShow":false,"dataType":"static","dictionaryType":"","tipLabel":"","dragDisabled":false,"className":[],"label":"承运方式","trigger":"change","propsUrl":"","templateJson":[],"showLabel":true,"required":true,"tableName":"jg_voucher","renderKey":1707043357400,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-select","propsName":"","tag":"JnpfSelect","regList":[],"span":8},"prop":"transportationMethod","width":0,"options":[{"fullName":"仓库承运(DC)","id":"1"},{"fullName":"承运商","id":"2"},{"fullName":"供应商","id":"3"},{"fullName":"自提","id":"4"}],"__vModel__":"transportationMethod","fixed":"none","style":{"width":"100%"},"disabled":false,"interfaceHasPage":false,"id":"transportationMethod","placeholder":"请选择","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"maxlength":null,"jnpfKey":"input","suffixIcon":"","fullName":"承运商","label":"承运商","sortable":false,"align":"left","addonAfter":"","__config__":{"formId":126,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"承运商","trigger":"blur","showLabel":true,"required":true,"tableName":"jg_voucher","renderKey":1707043416601,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":8},"readonly":false,"prop":"carrier","showWordLimit":false,"width":0,"__vModel__":"carrier","showPassword":false,"fixed":"none","style":{"width":"100%"},"disabled":false,"id":"carrier","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"maxlength":null,"jnpfKey":"input","suffixIcon":"","fullName":"运费","label":"运费","sortable":false,"align":"left","addonAfter":"","__config__":{"formId":129,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"运费","trigger":"blur","showLabel":true,"required":true,"tableName":"jg_voucher","renderKey":1707043496461,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":8},"readonly":false,"prop":"freight","showWordLimit":false,"width":0,"__vModel__":"freight","showPassword":false,"fixed":"none","style":{"width":"100%"},"disabled":false,"id":"freight","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"ableAddressIds":[],"filterable":false,"clearable":true,"level":2,"jnpfKey":"areaSelect","multiple":false,"fullName":"起运地","label":"起运地","sortable":false,"align":"left","__config__":{"formId":127,"visibility":["pc","app"],"jnpfKey":"areaSelect","defaultValue":[],"noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"起运地","trigger":"change","showLabel":true,"required":true,"tableName":"jg_voucher","renderKey":1707043464585,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-Provinces","tag":"JnpfAreaSelect","regList":[],"span":8},"prop":"placeDispatch","width":0,"__vModel__":"placeDispatch","fixed":"none","style":{"width":"100%"},"disabled":false,"selectType":"all","id":"placeDispatch","placeholder":"请选择","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"ableAddressIds":[],"filterable":false,"clearable":true,"level":2,"jnpfKey":"areaSelect","multiple":false,"fullName":"到达地","label":"到达地","sortable":false,"align":"left","__config__":{"formId":128,"visibility":["pc","app"],"jnpfKey":"areaSelect","defaultValue":[],"noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"到达地","trigger":"change","showLabel":true,"required":true,"tableName":"jg_voucher","renderKey":1707043487551,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-Provinces","tag":"JnpfAreaSelect","regList":[],"span":8},"prop":"destination","width":0,"__vModel__":"destination","fixed":"none","style":{"width":"100%"},"disabled":false,"selectType":"all","id":"destination","placeholder":"请选择","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"popupType":"dialog","hasPage":false,"pageSize":20,"columnOptions":[{"label":"供应商编码","value":"code"},{"label":"供应商名称","value":"name"}],"align":"left","templateJson":[],"__config__":{"formId":146,"visibility":["pc","app"],"jnpfKey":"popupSelect","defaultValue":"","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"三级供应商","trigger":"change","showLabel":true,"required":false,"tableName":"jg_voucher","renderKey":1707043714156,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-popup","tag":"JnpfPopupSelect","regList":[],"span":8},"prop":"associateThirdSuppliers","__vModel__":"associateThirdSuppliers","disabled":false,"id":"associateThirdSuppliers","placeholder":"请选择","interfaceName":"销售-发货凭证","popupWidth":"800px","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"},"clearable":true,"jnpfKey":"popupSelect","fullName":"三级供应商","label":"三级供应商","sortable":false,"relationField":"name","popupTitle":"选择数据","width":0,"fixed":"none","style":{"width":"100%"},"interfaceHasPage":false,"interfaceId":"523899951990705477","propsValue":"id"},{"clearable":true,"jnpfKey":"datePicker","format":"yyyy-MM-dd","fullName":"制单时间","label":"制单时间","sortable":false,"align":"left","type":"date","__config__":{"endRelationField":"","defaultValue":null,"dragDisabled":false,"className":[],"showLabel":true,"required":true,"tableName":"jg_voucher","renderKey":1707042958272,"tagIcon":"icon-ym icon-ym-generator-date","startRelationField":"","defaultCurrent":false,"tag":"JnpfDatePicker","formId":103,"visibility":["pc","app"],"jnpfKey":"datePicker","noShow":false,"endTimeTarget":1,"tipLabel":"","startTimeType":1,"endTimeRule":false,"label":"制单时间","startTimeRule":false,"startTimeValue":"","trigger":"change","endTimeValue":"","endTimeType":1,"layout":"colFormItem","startTimeTarget":1,"regList":[],"span":8},"readonly":false,"prop":"preparationTime","width":0,"__vModel__":"preparationTime","fixed":"none","style":{"width":"100%"},"disabled":false,"startTime":null,"id":"preparationTime","placeholder":"请选择","endTime":null,"on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}}] -export default columnList \ No newline at end of file +const columnList = [{"jnpfKey":"billRule","fullName":"凭证编号","label":"凭证编号","sortable":false,"align":"left","__config__":{"formId":101,"visibility":["pc","app"],"jnpfKey":"billRule","defaultValue":null,"noShow":false,"tipLabel":"","dragDisabled":false,"rule":"ssdj","className":[],"label":"凭证编号","trigger":"change","showLabel":true,"required":false,"tableName":"jg_voucher","renderKey":1707042861597,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-documents","ruleName":"销售订单","tag":"JnpfInput","span":8},"readonly":true,"prop":"voucherCode","width":0,"__vModel__":"voucherCode","fixed":"none","style":{"width":"100%"},"id":"voucherCode","placeholder":"系统自动生成"},{"filterable":false,"clearable":true,"jnpfKey":"select","multiple":false,"fullName":"单据类型","label":"单据类型","sortable":false,"align":"left","props":{"label":"fullName","value":"id"},"__config__":{"formId":148,"visibility":["pc","app"],"jnpfKey":"select","defaultValue":"2","noShow":false,"dataType":"static","dictionaryType":"","tipLabel":"","dragDisabled":false,"className":[],"label":"单据类型","trigger":"change","propsUrl":"","templateJson":[],"showLabel":true,"required":false,"tableName":"jg_voucher","renderKey":1707044178909,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-select","propsName":"","tag":"JnpfSelect","regList":[],"span":24},"prop":"documentType","width":0,"options":[{"fullName":"收货凭证","id":"1"},{"fullName":"发货凭证","id":"2"}],"__vModel__":"documentType","fixed":"none","style":{"width":"100%"},"disabled":false,"interfaceHasPage":false,"id":"documentType","placeholder":"请选择","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"filterable":false,"clearable":true,"jnpfKey":"select","multiple":false,"fullName":"凭证类型","label":"凭证类型","sortable":false,"align":"left","props":{"label":"fullName","value":"id"},"__config__":{"formId":102,"visibility":["pc","app"],"jnpfKey":"select","defaultValue":"","noShow":false,"dataType":"static","dictionaryType":"","tipLabel":"","dragDisabled":false,"className":[],"label":"凭证类型","trigger":"change","propsUrl":"","templateJson":[],"showLabel":true,"required":true,"tableName":"jg_voucher","renderKey":1707042898113,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-select","propsName":"","tag":"JnpfSelect","regList":[],"span":8},"prop":"voucherType","width":0,"options":[{"fullName":"磅单","id":"1"},{"fullName":"收据","id":"2"},{"fullName":"其他","id":"3"}],"__vModel__":"voucherType","fixed":"none","style":{"width":"100%"},"disabled":false,"interfaceHasPage":false,"id":"voucherType","placeholder":"请选择","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"filterable":false,"clearable":true,"jnpfKey":"select","multiple":false,"fullName":"凭证状态","label":"凭证状态","sortable":false,"align":"left","props":{"label":"fullName","value":"id"},"__config__":{"formId":147,"visibility":["pc","app"],"jnpfKey":"select","defaultValue":"1","noShow":false,"dataType":"static","dictionaryType":"","tipLabel":"","dragDisabled":false,"className":[],"label":"凭证状态","trigger":"change","propsUrl":"","templateJson":[],"showLabel":true,"required":false,"tableName":"jg_voucher","renderKey":1707044013618,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-select","propsName":"","tag":"JnpfSelect","regList":[],"span":24},"prop":"voucherStatus","width":0,"options":[{"fullName":"待提交","id":"1"},{"fullName":"待审核","id":"2"},{"fullName":"已驳回","id":"3"},{"fullName":"待确认","id":"4"},{"fullName":"待收货","id":"5"},{"fullName":"已完成","id":"6"},{"fullName":"已取消","id":"7"}],"__vModel__":"voucherStatus","fixed":"none","style":{"width":"100%"},"disabled":false,"interfaceHasPage":false,"id":"voucherStatus","placeholder":"请选择","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"maxlength":null,"jnpfKey":"input","suffixIcon":"","fullName":"磅单编号","label":"磅单编号","sortable":false,"align":"left","addonAfter":"","__config__":{"formId":107,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"磅单编号","trigger":"blur","showLabel":true,"required":true,"tableName":"jg_voucher","renderKey":1707043053878,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":8},"readonly":false,"prop":"poundCode","showWordLimit":false,"width":0,"__vModel__":"poundCode","showPassword":false,"fixed":"none","style":{"width":"100%"},"disabled":false,"id":"poundCode","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"maxlength":null,"jnpfKey":"input","suffixIcon":"","fullName":"关联单据号","label":"关联单据号","sortable":false,"align":"left","addonAfter":"","__config__":{"formId":149,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"关联单据号","trigger":"blur","showLabel":true,"required":false,"tableName":"jg_voucher","renderKey":1707044269999,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":24},"readonly":false,"prop":"associatedDocumentNo","showWordLimit":false,"width":0,"__vModel__":"associatedDocumentNo","showPassword":false,"fixed":"none","style":{"width":"100%"},"disabled":false,"id":"associatedDocumentNo","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"maxlength":null,"jnpfKey":"input","suffixIcon":"","fullName":"车牌号","label":"车牌号","sortable":false,"align":"left","addonAfter":"","__config__":{"formId":108,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"车牌号","trigger":"blur","showLabel":true,"required":true,"tableName":"jg_voucher","renderKey":1707043061839,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":8},"readonly":false,"prop":"vehicleName","showWordLimit":false,"width":0,"__vModel__":"vehicleName","showPassword":false,"fixed":"none","style":{"width":"100%"},"disabled":false,"id":"vehicleName","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"filterable":false,"clearable":true,"jnpfKey":"select","multiple":false,"fullName":"运输方式","label":"运输方式","sortable":false,"align":"left","props":{"label":"fullName","value":"id"},"__config__":{"formId":124,"visibility":["pc","app"],"jnpfKey":"select","defaultValue":"","noShow":false,"dataType":"static","dictionaryType":"","tipLabel":"","dragDisabled":false,"className":[],"label":"运输方式","trigger":"change","propsUrl":"","templateJson":[],"showLabel":true,"required":true,"tableName":"jg_voucher","renderKey":1707043292813,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-select","propsName":"","tag":"JnpfSelect","regList":[],"span":8},"prop":"modeTransport","width":0,"options":[{"fullName":"公路","id":"1"},{"fullName":"铁路","id":"2"},{"fullName":"轮船","id":"3"},{"fullName":"空运","id":"4"},{"fullName":"无","id":"5"}],"__vModel__":"modeTransport","fixed":"none","style":{"width":"100%"},"disabled":false,"interfaceHasPage":false,"id":"modeTransport","placeholder":"请选择","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"filterable":false,"clearable":true,"jnpfKey":"select","multiple":false,"fullName":"承运方式","label":"承运方式","sortable":false,"align":"left","props":{"label":"fullName","value":"id"},"__config__":{"formId":125,"visibility":["pc","app"],"jnpfKey":"select","defaultValue":"","noShow":false,"dataType":"static","dictionaryType":"","tipLabel":"","dragDisabled":false,"className":[],"label":"承运方式","trigger":"change","propsUrl":"","templateJson":[],"showLabel":true,"required":true,"tableName":"jg_voucher","renderKey":1707043357400,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-select","propsName":"","tag":"JnpfSelect","regList":[],"span":8},"prop":"transportationMethod","width":0,"options":[{"fullName":"仓库承运(DC)","id":"1"},{"fullName":"承运商","id":"2"},{"fullName":"供应商","id":"3"},{"fullName":"自提","id":"4"}],"__vModel__":"transportationMethod","fixed":"none","style":{"width":"100%"},"disabled":false,"interfaceHasPage":false,"id":"transportationMethod","placeholder":"请选择","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"maxlength":null,"jnpfKey":"input","suffixIcon":"","fullName":"承运商","label":"承运商","sortable":false,"align":"left","addonAfter":"","__config__":{"formId":126,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"承运商","trigger":"blur","showLabel":true,"required":true,"tableName":"jg_voucher","renderKey":1707043416601,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":8},"readonly":false,"prop":"carrier","showWordLimit":false,"width":0,"__vModel__":"carrier","showPassword":false,"fixed":"none","style":{"width":"100%"},"disabled":false,"id":"carrier","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"maxlength":null,"jnpfKey":"input","suffixIcon":"","fullName":"运费","label":"运费","sortable":false,"align":"left","addonAfter":"","__config__":{"formId":129,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"运费","trigger":"blur","showLabel":true,"required":true,"tableName":"jg_voucher","renderKey":1707043496461,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":8},"readonly":false,"prop":"freight","showWordLimit":false,"width":0,"__vModel__":"freight","showPassword":false,"fixed":"none","style":{"width":"100%"},"disabled":false,"id":"freight","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"ableAddressIds":[],"filterable":false,"clearable":true,"level":2,"jnpfKey":"areaSelect","multiple":false,"fullName":"起运地","label":"起运地","sortable":false,"align":"left","__config__":{"formId":127,"visibility":["pc","app"],"jnpfKey":"areaSelect","defaultValue":[],"noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"起运地","trigger":"change","showLabel":true,"required":true,"tableName":"jg_voucher","renderKey":1707043464585,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-Provinces","tag":"JnpfAreaSelect","regList":[],"span":8},"prop":"placeDispatch","width":0,"__vModel__":"placeDispatch","fixed":"none","style":{"width":"100%"},"disabled":false,"selectType":"all","id":"placeDispatch","placeholder":"请选择","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"ableAddressIds":[],"filterable":false,"clearable":true,"level":2,"jnpfKey":"areaSelect","multiple":false,"fullName":"到达地","label":"到达地","sortable":false,"align":"left","__config__":{"formId":128,"visibility":["pc","app"],"jnpfKey":"areaSelect","defaultValue":[],"noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"到达地","trigger":"change","showLabel":true,"required":true,"tableName":"jg_voucher","renderKey":1707043487551,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-Provinces","tag":"JnpfAreaSelect","regList":[],"span":8},"prop":"destination","width":0,"__vModel__":"destination","fixed":"none","style":{"width":"100%"},"disabled":false,"selectType":"all","id":"destination","placeholder":"请选择","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"popupType":"dialog","hasPage":false,"pageSize":20,"columnOptions":[{"label":"供应商编码","value":"code"},{"label":"供应商名称","value":"name"}],"align":"left","templateJson":[],"__config__":{"formId":146,"visibility":["pc","app"],"jnpfKey":"popupSelect","defaultValue":"","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"三级供应商","trigger":"change","showLabel":true,"required":false,"tableName":"jg_voucher","renderKey":1707043714156,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-popup","tag":"JnpfPopupSelect","regList":[],"span":8},"prop":"associateThirdSuppliers","__vModel__":"associateThirdSuppliers","disabled":false,"id":"associateThirdSuppliers","placeholder":"请选择","interfaceName":"销售-发货凭证","popupWidth":"800px","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"},"clearable":true,"jnpfKey":"popupSelect","fullName":"三级供应商","label":"三级供应商","sortable":false,"relationField":"name","popupTitle":"选择数据","width":0,"fixed":"none","style":{"width":"100%"},"interfaceHasPage":false,"interfaceId":"523899951990705477","propsValue":"id"},{"clearable":true,"jnpfKey":"datePicker","format":"yyyy-MM-dd","fullName":"制单时间","label":"制单时间","sortable":false,"align":"left","type":"date","__config__":{"endRelationField":"","defaultValue":null,"dragDisabled":false,"className":[],"showLabel":true,"required":true,"tableName":"jg_voucher","renderKey":1707042958272,"tagIcon":"icon-ym icon-ym-generator-date","startRelationField":"","defaultCurrent":false,"tag":"JnpfDatePicker","formId":103,"visibility":["pc","app"],"jnpfKey":"datePicker","noShow":false,"endTimeTarget":1,"tipLabel":"","startTimeType":1,"endTimeRule":false,"label":"制单时间","startTimeRule":false,"startTimeValue":"","trigger":"change","endTimeValue":"","endTimeType":1,"layout":"colFormItem","startTimeTarget":1,"regList":[],"span":8},"readonly":false,"prop":"preparationTime","width":0,"__vModel__":"preparationTime","fixed":"none","style":{"width":"100%"},"disabled":false,"startTime":null,"id":"preparationTime","placeholder":"请选择","endTime":null,"on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"maxlength":null,"jnpfKey":"input","suffixIcon":"","fullName":"订单序号","label":"订单序号","sortable":false,"align":"left","addonAfter":"","__config__":{"formId":153,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"订单序号","trigger":"blur","showLabel":true,"required":false,"tableName":"jg_voucher","renderKey":1719471876257,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":24},"readonly":false,"prop":"orderNo","showWordLimit":false,"width":0,"__vModel__":"orderNo","showPassword":false,"fixed":"none","style":{"width":"100%"},"disabled":false,"id":"orderNo","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}}] +export default columnList diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryVoucher/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryVoucher/index.vue index 14a49cad..8a78ff0a 100644 --- a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryVoucher/index.vue +++ b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryVoucher/index.vue @@ -83,7 +83,9 @@ 导出 - + 导入 + 生成销售单 @@ -881,7 +883,7 @@ export default { handelUpload() { this.uploadBoxVisible = true this.$nextTick(() => { - this.$refs.UploadBox.init("", "scm/Voucher") + this.$refs.UploadBox.init("", "scm/Vehicle") }) }, handleSelectionChange(val) { diff --git a/jnpf-java-boot/jnpf-web/src/views/workFlow/components/FlowBox.vue b/jnpf-java-boot/jnpf-web/src/views/workFlow/components/FlowBox.vue index 3324e84f..c199ce2f 100644 --- a/jnpf-java-boot/jnpf-web/src/views/workFlow/components/FlowBox.vue +++ b/jnpf-java-boot/jnpf-web/src/views/workFlow/components/FlowBox.vue @@ -48,7 +48,7 @@ :loading="candidateLoading" :disabled="allBtnDisabled"> {{ properties.submitBtnText || '提 交' }} {{ properties.auditBtnText || '通 过' }} + v-if="setting.opType == 1 && properties.hasAuditBtn">审 批 @@ -176,7 +176,7 @@ {{ $t('common.cancelButton') }} - {{ $t('common.confirmButton') }} + 通 过 @@ -210,7 +210,7 @@ {{ $t('common.cancelButton') }} - {{ $t('common.confirmButton') }} + 通 过