product
杨世强 2 years ago
parent 5a496e868a
commit 26c3e82552

@ -157,6 +157,7 @@ public class CollectionController {
String mainId =RandomUtil.uuId();
UserInfo userInfo=userProvider.get();
collectionCrForm.setDocumentNo(generaterSwapUtil.getBillNumber("collection", false));
collectionCrForm.setCreatorUserName(userInfo.getUserId());
CollectionEntity entity = JsonUtil.getJsonToBean(collectionCrForm, CollectionEntity.class);
entity.setId(mainId);
collectionService.save(entity);

@ -182,6 +182,7 @@ public class PurchaseorderController {
purchaseorderCrForm.setCreatorTime(DateUtil.getNow());
PurchaseorderitemEntity entity = JsonUtil.getJsonToBean(purchaseorderCrForm, PurchaseorderitemEntity.class);
entity.setId(mainId);
entity.setStatus(null);
purchaseorderitemService.save(entity);
List<Purchaseorder_item0Entity> Purchaseorder_item0List = JsonUtil.getJsonToList(purchaseorderCrForm.getPurchaseorder_item0List(),Purchaseorder_item0Entity.class);
for(Purchaseorder_item0Entity entitys : Purchaseorder_item0List){

@ -52,7 +52,7 @@ import jnpf.util.enums.FileTypeEnum;
* @ V3.2.0
* @ LINKAGE-BOOT
* @ LINKAGE-BOOT
* @ 2023-01-09
* @ 2023-02-16
*/
@Slf4j
@RestController
@ -81,20 +81,25 @@ public class TradeuploadController {
* @param tradeuploadPagination
* @return
*/
@ApiOperation("贸易上传")
@PostMapping("/getList")
public ActionResult list(@RequestBody TradeuploadPagination tradeuploadPagination)throws IOException{
List<TradeuploadEntity> list= tradeuploadService.getList(tradeuploadPagination);
//处理id字段转名称若无需转或者为空可删除
for(TradeuploadEntity entity:list){
Map<String,Object> materialCodeMap = new HashMap<>();
entity.setMaterialCode(generaterSwapUtil.getPopupSelectValue("381037852907038533","item_code","item_code",entity.getMaterialCode(),materialCodeMap));
Map<String,Object> salesNameMap = new HashMap<>();
entity.setSalesName(generaterSwapUtil.getPopupSelectValue("381038993740949317","contract_name","contract_name",entity.getSalesName(),salesNameMap));
Map<String,Object> licenseNoMap = new HashMap<>();
entity.setLicenseNo(generaterSwapUtil.getPopupSelectValue("381432451370615173","ticketno","ticketno",entity.getLicenseNo(),licenseNoMap));
entity.setPoundPictures(generaterSwapUtil.getFileNameInJson(entity.getPoundPictures()));
Map<String,Object> materialIdMap = new HashMap<>();
entity.setMaterialId(generaterSwapUtil.getPopupSelectValue("381037852907038533","id","description",entity.getMaterialId(),materialIdMap));
Map<String,Object> customerIdMap = new HashMap<>();
entity.setCustomerId(generaterSwapUtil.getPopupSelectValue("395936123471343749","id","supplier_nm",entity.getCustomerId(),customerIdMap));
Map<String,Object> salesIdMap = new HashMap<>();
entity.setSalesId(generaterSwapUtil.getPopupSelectValue("381037852907038533","id","contract_name",entity.getSalesId(),salesIdMap));
Map<String,Object> vehicleIdMap = new HashMap<>();
entity.setVehicleId(generaterSwapUtil.getPopupSelectValue("381432451370615173","id","ticketno",entity.getVehicleId(),vehicleIdMap));
entity.setVehiclePictures(generaterSwapUtil.getFileNameInJson(entity.getVehiclePictures()));
Map<String,Object> creatorUserNameMap = new HashMap<>();
entity.setCreatorUserName(generaterSwapUtil.getPopupSelectValue("ebcc44be142e43b795c0d769abd6d25a","F_RealName","F_RealName",entity.getCreatorUserName(),creatorUserNameMap));
Map<String,Object> naturalIdMap = new HashMap<>();
entity.setNaturalId(generaterSwapUtil.getPopupSelectValue("395933800510599301","id","name",entity.getNaturalId(),naturalIdMap));
}
List<TradeuploadListVO> listVO=JsonUtil.getJsonToList(list,TradeuploadListVO.class);
for(TradeuploadListVO tradeuploadVO:listVO){
@ -120,6 +125,7 @@ public class TradeuploadController {
public ActionResult create(@RequestBody @Valid TradeuploadCrForm tradeuploadCrForm) throws DataException {
String mainId =RandomUtil.uuId();
UserInfo userInfo=userProvider.get();
tradeuploadCrForm.setCreatorTime(DateUtil.getNow());
TradeuploadEntity entity = JsonUtil.getJsonToBean(tradeuploadCrForm, TradeuploadEntity.class);
entity.setId(mainId);
tradeuploadService.save(entity);
@ -163,14 +169,20 @@ public class TradeuploadController {
List<TradeuploadEntity> list= tradeuploadService.getTypeList(tradeuploadPagination,tradeuploadPaginationExportModel.getDataType());
//处理id字段转名称若无需转或者为空可删除
for(TradeuploadEntity entity:list){
Map<String,Object> materialCodeMap = new HashMap<>();
entity.setMaterialCode(generaterSwapUtil.swapRelationFormValue("selectField121",entity.getMaterialCode(),"294090217084722181",materialCodeMap));
Map<String,Object> salesNameMap = new HashMap<>();
entity.setSalesName(generaterSwapUtil.swapRelationFormValue("selectField121",entity.getSalesName(),"294090217084722181",salesNameMap));
Map<String,Object> licenseNoMap = new HashMap<>();
entity.setLicenseNo(generaterSwapUtil.swapRelationFormValue("selectField122",entity.getLicenseNo(),"294090217084722181",licenseNoMap));
entity.setPoundPictures(generaterSwapUtil.getFileNameInJson(entity.getPoundPictures()));
Map<String,Object> materialIdMap = new HashMap<>();
entity.setMaterialId(generaterSwapUtil.getPopupSelectValue("381037852907038533","id","description",entity.getMaterialId(),materialIdMap));
Map<String,Object> customerIdMap = new HashMap<>();
entity.setCustomerId(generaterSwapUtil.getPopupSelectValue("395936123471343749","id","supplier_nm",entity.getCustomerId(),customerIdMap));
Map<String,Object> salesIdMap = new HashMap<>();
entity.setSalesId(generaterSwapUtil.getPopupSelectValue("381037852907038533","id","contract_name",entity.getSalesId(),salesIdMap));
Map<String,Object> vehicleIdMap = new HashMap<>();
entity.setVehicleId(generaterSwapUtil.getPopupSelectValue("381432451370615173","id","ticketno",entity.getVehicleId(),vehicleIdMap));
entity.setVehiclePictures(generaterSwapUtil.getFileNameInJson(entity.getVehiclePictures()));
Map<String,Object> creatorUserNameMap = new HashMap<>();
entity.setCreatorUserName(generaterSwapUtil.getPopupSelectValue("ebcc44be142e43b795c0d769abd6d25a","F_RealName","F_RealName",entity.getCreatorUserName(),creatorUserNameMap));
Map<String,Object> naturalIdMap = new HashMap<>();
entity.setNaturalId(generaterSwapUtil.getPopupSelectValue("395933800510599301","id","name",entity.getNaturalId(),naturalIdMap));
}
List<TradeuploadListVO> listVO=JsonUtil.getJsonToList(list,TradeuploadListVO.class);
for(TradeuploadListVO tradeuploadVO:listVO){
@ -190,38 +202,29 @@ public class TradeuploadController {
if(keys.length>0){
for(String key:keys){
switch(key){
case "materialCode" :
entitys.add(new ExcelExportEntity("物料编码" ,"materialCode"));
break;
case "materialName" :
entitys.add(new ExcelExportEntity("物料名称" ,"materialName"));
break;
case "salesName" :
entitys.add(new ExcelExportEntity("销售合同" ,"salesName"));
case "poundPictures" :
entitys.add(new ExcelExportEntity("磅单上传" ,"poundPictures"));
break;
case "customerName" :
entitys.add(new ExcelExportEntity("客户名称" ,"customerName"));
case "materialId" :
entitys.add(new ExcelExportEntity("物料名称" ,"materialId"));
break;
case "advance" :
entitys.add(new ExcelExportEntity("是否垫资" ,"advance"));
case "customerId" :
entitys.add(new ExcelExportEntity("客户名称" ,"customerId"));
break;
case "salesPrice" :
entitys.add(new ExcelExportEntity("销售价格" ,"salesPrice"));
case "salesId" :
entitys.add(new ExcelExportEntity("销售合同" ,"salesId"));
break;
case "transportType" :
entitys.add(new ExcelExportEntity("运输方式" ,"transportType"));
case "vehicleId" :
entitys.add(new ExcelExportEntity("车牌号" ,"vehicleId"));
break;
case "transportPrice" :
entitys.add(new ExcelExportEntity("运费" ,"transportPrice"));
case "vehiclePictures" :
entitys.add(new ExcelExportEntity("车辆图片" ,"vehiclePictures"));
break;
case "licenseNo" :
entitys.add(new ExcelExportEntity("车号" ,"licenseNo"));
case "poundDate" :
entitys.add(new ExcelExportEntity("磅单时间" ,"poundDate"));
break;
case "businessName" :
entitys.add(new ExcelExportEntity("业务员名称" ,"businessName"));
break;
case "poundPictures" :
entitys.add(new ExcelExportEntity("磅单图片" ,"poundPictures"));
case "poundlistNo" :
entitys.add(new ExcelExportEntity("磅单号" ,"poundlistNo"));
break;
case "tareWeight" :
entitys.add(new ExcelExportEntity("皮重" ,"tareWeight"));
@ -235,17 +238,32 @@ public class TradeuploadController {
case "netWeight" :
entitys.add(new ExcelExportEntity("净重" ,"netWeight"));
break;
case "remark" :
entitys.add(new ExcelExportEntity("备注" ,"remark"));
case "unit" :
entitys.add(new ExcelExportEntity("单位 " ,"unit"));
break;
case "driverName" :
entitys.add(new ExcelExportEntity("司机名称" ,"driverName"));
case "transportType" :
entitys.add(new ExcelExportEntity("运输类型" ,"transportType"));
break;
case "vehiclePictures" :
entitys.add(new ExcelExportEntity("车辆图片" ,"vehiclePictures"));
case "advance" :
entitys.add(new ExcelExportEntity("是否垫资" ,"advance"));
break;
case "transportPrice" :
entitys.add(new ExcelExportEntity("运费" ,"transportPrice"));
break;
case "salesPrice" :
entitys.add(new ExcelExportEntity("销售价格" ,"salesPrice"));
break;
case "creatorUserName" :
entitys.add(new ExcelExportEntity("制单人" ,"creatorUserName"));
entitys.add(new ExcelExportEntity("业务员" ,"creatorUserName"));
break;
case "naturalId" :
entitys.add(new ExcelExportEntity("自然人" ,"naturalId"));
break;
case "remark" :
entitys.add(new ExcelExportEntity("备注" ,"remark"));
break;
case "creatorTime" :
entitys.add(new ExcelExportEntity("磅单日期" ,"creatorTime"));
break;
default:
break;
@ -310,6 +328,9 @@ public class TradeuploadController {
public ActionResult<TradeuploadInfoVO> info(@PathVariable("id") String id){
TradeuploadEntity entity= tradeuploadService.getInfo(id);
TradeuploadInfoVO vo=JsonUtil.getJsonToBean(entity, TradeuploadInfoVO.class);
if(vo.getCreatorTime()!=null){
vo.setCreatorTime(vo.getCreatorTime());
}
//子表
//副表
@ -332,14 +353,20 @@ public class TradeuploadController {
//附表数据转换
//添加到详情表单对象中
Map<String,Object> materialCodeMap = new HashMap<>();
vo.setMaterialCode(generaterSwapUtil.swapRelationFormValue("selectField121",vo.getMaterialCode(),"294090217084722181",materialCodeMap));
Map<String,Object> salesNameMap = new HashMap<>();
vo.setSalesName(generaterSwapUtil.swapRelationFormValue("selectField121",vo.getSalesName(),"294090217084722181",salesNameMap));
Map<String,Object> licenseNoMap = new HashMap<>();
vo.setLicenseNo(generaterSwapUtil.swapRelationFormValue("selectField122",vo.getLicenseNo(),"294090217084722181",licenseNoMap));
vo.setPoundPictures(generaterSwapUtil.getFileNameInJson(vo.getPoundPictures()));
Map<String,Object> materialIdMap = new HashMap<>();
vo.setMaterialId(generaterSwapUtil.getPopupSelectValue("381037852907038533","id","description",vo.getMaterialId(),materialIdMap));
Map<String,Object> customerIdMap = new HashMap<>();
vo.setCustomerId(generaterSwapUtil.getPopupSelectValue("395936123471343749","id","supplier_nm",vo.getCustomerId(),customerIdMap));
Map<String,Object> salesIdMap = new HashMap<>();
vo.setSalesId(generaterSwapUtil.getPopupSelectValue("381037852907038533","id","contract_name",vo.getSalesId(),salesIdMap));
Map<String,Object> vehicleIdMap = new HashMap<>();
vo.setVehicleId(generaterSwapUtil.getPopupSelectValue("381432451370615173","id","ticketno",vo.getVehicleId(),vehicleIdMap));
vo.setVehiclePictures(generaterSwapUtil.getFileNameInJson(vo.getVehiclePictures()));
Map<String,Object> creatorUserNameMap = new HashMap<>();
vo.setCreatorUserName(generaterSwapUtil.getPopupSelectValue("ebcc44be142e43b795c0d769abd6d25a","F_RealName","F_RealName",vo.getCreatorUserName(),creatorUserNameMap));
Map<String,Object> naturalIdMap = new HashMap<>();
vo.setNaturalId(generaterSwapUtil.getPopupSelectValue("395933800510599301","id","name",vo.getNaturalId(),naturalIdMap));
return ActionResult.success(vo);
}
@ -360,6 +387,7 @@ public class TradeuploadController {
TradeuploadEntity entity= tradeuploadService.getInfo(id);
if(entity!=null){
TradeuploadEntity subentity=JsonUtil.getJsonToBean(tradeuploadUpForm, TradeuploadEntity.class);
subentity.setCreatorTime(entity.getCreatorTime());
tradeuploadService.update(id, subentity);
return ActionResult.success("更新成功");
}else{
@ -391,4 +419,9 @@ public class TradeuploadController {
}

@ -24,7 +24,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
* @ V3.2.0
* @ LINKAGE-BOOT
* @ LINKAGE-BOOT
* @ 2023-01-09
* @ 2023-02-16
*/
@Data
@TableName("jg_poundlist")
@ -34,34 +34,34 @@ public class TradeuploadEntity {
private String id;
@TableField("CREATOR_USER_ID")
private String creatoruserid;
private String creatorUserId;
@TableField("CREATOR_USER_NAME")
private String creatorusername;
private String creatorUserName;
@TableField("CREATOR_TIME")
private Date creatortime;
private Date creatorTime;
@TableField("LAST_MODIFY_USER_ID")
private String lastmodifyuserid;
private String lastModifyUserId;
@TableField("LAST_MODIFY_USER_NAME")
private String lastmodifyusername;
private String lastModifyUserName;
@TableField("LAST_MODIFY_TIME")
private Date lastmodifytime;
private Date lastModifyTime;
@TableField("DELETE_USER_ID")
private String deleteuserid;
private String deleteUserId;
@TableField("DELETE_USER_NAME")
private String deleteusername;
private String deleteUserName;
@TableField("DELETE_TIME")
private Date deletetime;
private Date deleteTime;
@TableField("DELETE_MARK")
private String deletemark;
private String deleteMark;
@TableField("ORGNIZE_ID")
private String orgnizeId;
@ -69,38 +69,23 @@ public class TradeuploadEntity {
@TableField("DEPARTMENT_ID")
private String departmentId;
@TableField("LICENSE_NO")
private String licenseNo;
@TableField("CUSTOMER_ID")
private String customerId;
@TableField("CUSTOMER_CODE")
private String customerCode;
@TableField("SALES_ID")
private String salesId;
@TableField("CUSTOMER_NAME")
private String customerName;
@TableField("SALES_CODE")
private String salesCode;
@TableField("SALES_NAME")
private String salesName;
@TableField("SUPPLIER_CODE")
private String supplierCode;
@TableField("SUPPLIER_ID")
private String supplierId;
@TableField("SUPPLIER_NAME")
private String supplierName;
@TableField("PURCHASE_CODE")
private String purchaseCode;
@TableField("PURCHASE_NAME")
private String purchaseName;
@TableField("PURCHASE_ID")
private String purchaseId;
@TableField("MATERIAL_CODE")
private String materialCode;
@TableField("MATERIAL_NAME")
private String materialName;
@TableField("MATERIAL_ID")
private String materialId;
@TableField("ADVANCE")
private String advance;
@ -144,11 +129,8 @@ public class TradeuploadEntity {
@TableField("POUND_DATE")
private Date poundDate;
@TableField("BUSINESS_CODE")
private String businessCode;
@TableField("BUSINESS_NAME")
private String businessName;
@TableField("BUSINESS_ID")
private String businessId;
@TableField("POUND_PICTURES")
private String poundPictures;
@ -156,9 +138,6 @@ public class TradeuploadEntity {
@TableField("VEHICLE_PICTURES")
private String vehiclePictures;
@TableField("DRIVER_NAME")
private String driverName;
@TableField("POUND_TYPE")
private String poundType;
@ -180,4 +159,31 @@ public class TradeuploadEntity {
@TableField("TRANSPORT_PRICE")
private BigDecimal transportPrice;
@TableField("ORIGIN_PLACE")
private String originPlace;
@TableField("NATURAL_ID")
private String naturalId;
@TableField("POUNDLIST_NO")
private String poundlistNo;
@TableField("VEHICLE_ID")
private String vehicleId;
@TableField("IS_EXAMINE")
private String isExamine;
@TableField("IS_INVOICING")
private String isInvoicing;
@TableField("IS_PAY")
private String isPay;
@TableField("IS_COLLECTION")
private String isCollection;
@TableField("IS_EXPENSE")
private String isExpense;
}

@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* V3.2.0
* LINKAGE-BOOT
* LINKAGE-BOOT
* 2023-01-09
* 2023-02-16
*/
public interface TradeuploadMapper extends BaseMapper<TradeuploadEntity> {

@ -14,87 +14,95 @@ import com.fasterxml.jackson.annotation.JsonProperty;
* @ V3.2.0
* @ LINKAGE-BOOT
* @ LINKAGE-BOOT
* @ 2023-01-09
* @ 2023-02-16
*/
@Data
public class TradeuploadCrForm {
/** 物料编码 **/
@JsonProperty("materialCode")
private String materialCode;
/** 磅单上传 **/
@JsonProperty("poundPictures")
private String poundPictures;
/** 物料名称 **/
@JsonProperty("materialName")
private String materialName;
/** 销售合同 **/
@JsonProperty("salesName")
private String salesName;
@JsonProperty("materialId")
private String materialId;
/** 客户名称 **/
@JsonProperty("customerName")
private String customerName;
/** 是否垫资 **/
@JsonProperty("advance")
private String advance;
/** 销售价格 **/
@JsonProperty("salesPrice")
private Integer salesPrice;
@JsonProperty("customerId")
private String customerId;
/** 运输方式 **/
@JsonProperty("transportType")
private String transportType;
/** 销售合同 **/
@JsonProperty("salesId")
private String salesId;
/** 运费 **/
@JsonProperty("transportPrice")
private Integer transportPrice;
/** 车牌号 **/
@JsonProperty("vehicleId")
private String vehicleId;
/** 车 **/
@JsonProperty("licenseNo")
private String licenseNo;
/** 车辆图片 **/
@JsonProperty("vehiclePictures")
private String vehiclePictures;
/** 业务员名称 **/
@JsonProperty("businessName")
private String businessName;
/** 磅单时间 **/
@JsonProperty("poundDate")
private Long poundDate;
/** 磅单图片 **/
@JsonProperty("poundPictures")
private String poundPictures;
/** 磅单 **/
@JsonProperty("poundlistNo")
private String poundlistNo;
/** 皮重 **/
@JsonProperty("tareWeight")
private Integer tareWeight;
private String tareWeight;
/** 毛重 **/
@JsonProperty("grossWeight")
private Integer grossWeight;
private String grossWeight;
/** 扣重 **/
@JsonProperty("buckleWeight")
private Integer buckleWeight;
private String buckleWeight;
/** 净重 **/
@JsonProperty("netWeight")
private Integer netWeight;
private String netWeight;
/** 备注 **/
@JsonProperty("remark")
private String remark;
/** 单位 **/
@JsonProperty("unit")
private String unit;
/** 司机名称 **/
@JsonProperty("driverName")
private String driverName;
/** 运输类型 **/
@JsonProperty("transportType")
private String transportType;
/** 车辆图片 **/
@JsonProperty("vehiclePictures")
private String vehiclePictures;
/** 是否垫资 **/
@JsonProperty("advance")
private String advance;
/** 运费 **/
@JsonProperty("transportPrice")
private String transportPrice;
/** 销售价格 **/
@JsonProperty("salesPrice")
private String salesPrice;
/** 制单人 **/
/** 业务员 **/
@JsonProperty("creatorUserName")
private String creatorUserName;
/** 自然人 **/
@JsonProperty("naturalId")
private String naturalId;
/** 备注 **/
@JsonProperty("remark")
private String remark;
/** 磅单日期 **/
@JsonProperty("creatorTime")
private String creatorTime;
}

@ -15,7 +15,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
* @ V3.2.0
* @ LINKAGE-BOOT
* @ LINKAGE-BOOT
* @ 2023-01-09
* @ 2023-02-16
*/
@Data
public class TradeuploadInfoVO{
@ -23,80 +23,89 @@ public class TradeuploadInfoVO{
@JsonProperty("id")
private String id;
/** 物料编码 **/
@JsonProperty("materialCode")
private String materialCode;
/** 磅单上传 **/
@JsonProperty("poundPictures")
private String poundPictures;
/** 物料名称 **/
@JsonProperty("materialName")
private String materialName;
/** 销售合同 **/
@JsonProperty("salesName")
private String salesName;
@JsonProperty("materialId")
private String materialId;
/** 客户名称 **/
@JsonProperty("customerName")
private String customerName;
/** 是否垫资 **/
@JsonProperty("advance")
private String advance;
/** 销售价格 **/
@JsonProperty("salesPrice")
private Integer salesPrice;
@JsonProperty("customerId")
private String customerId;
/** 运输方式 **/
@JsonProperty("transportType")
private String transportType;
/** 销售合同 **/
@JsonProperty("salesId")
private String salesId;
/** 运费 **/
@JsonProperty("transportPrice")
private Integer transportPrice;
/** 车牌号 **/
@JsonProperty("vehicleId")
private String vehicleId;
/** 车 **/
@JsonProperty("licenseNo")
private String licenseNo;
/** 车辆图片 **/
@JsonProperty("vehiclePictures")
private String vehiclePictures;
/** 业务员名称 **/
@JsonProperty("businessName")
private String businessName;
/** 磅单时间 **/
@JsonProperty("poundDate")
private Long poundDate;
/** 磅单图片 **/
@JsonProperty("poundPictures")
private String poundPictures;
/** 磅单 **/
@JsonProperty("poundlistNo")
private String poundlistNo;
/** 皮重 **/
@JsonProperty("tareWeight")
private Integer tareWeight;
private String tareWeight;
/** 毛重 **/
@JsonProperty("grossWeight")
private Integer grossWeight;
private String grossWeight;
/** 扣重 **/
@JsonProperty("buckleWeight")
private Integer buckleWeight;
private String buckleWeight;
/** 净重 **/
@JsonProperty("netWeight")
private Integer netWeight;
private String netWeight;
/** 备注 **/
@JsonProperty("remark")
private String remark;
/** 单位 **/
@JsonProperty("unit")
private String unit;
/** 司机名称 **/
@JsonProperty("driverName")
private String driverName;
/** 运输类型 **/
@JsonProperty("transportType")
private String transportType;
/** 车辆图片 **/
@JsonProperty("vehiclePictures")
private String vehiclePictures;
/** 是否垫资 **/
@JsonProperty("advance")
private String advance;
/** 运费 **/
@JsonProperty("transportPrice")
private String transportPrice;
/** 销售价格 **/
@JsonProperty("salesPrice")
private String salesPrice;
/** 制单人 **/
/** 业务员 **/
@JsonProperty("creatorUserName")
private String creatorUserName;
/** 自然人 **/
@JsonProperty("naturalId")
private String naturalId;
/** 备注 **/
@JsonProperty("remark")
private String remark;
/** 磅单日期 **/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@JsonProperty("creatorTime")
private Date creatorTime;
}

@ -10,13 +10,16 @@ import java.util.List;
* @ V3.2.0
* @ LINKAGE-BOOT
* @ LINKAGE-BOOT
* @ 2023-01-09
* @ 2023-02-16
*/
@Data
public class TradeuploadListQuery extends Pagination {
/** 物料名称 */
private String materialName;
/** 磅单时间 */
private List<String> poundDate;
/** 磅单号 */
private String poundlistNo;
/**
* id
*/

@ -15,7 +15,7 @@ import java.math.BigDecimal;
* @ V3.2.0
* @ LINKAGE-BOOT
* @ LINKAGE-BOOT
* @ 2023-01-09
* @ 2023-02-16
*/
@Data
public class TradeuploadListVO{
@ -24,93 +24,111 @@ public class TradeuploadListVO{
private String id;
/** 物料编码 **/
@JsonProperty("materialCode")
private String materialCode;
/** 磅单上传 **/
@JsonProperty("poundPictures")
private String poundPictures;
/** 物料名称 **/
@JsonProperty("materialName")
private String materialName;
/** 销售合同 **/
@JsonProperty("salesName")
private String salesName;
@JsonProperty("materialId")
private String materialId;
/** 客户名称 **/
@JsonProperty("customerName")
private String customerName;
@JsonProperty("customerId")
private String customerId;
/** 是否垫资 **/
@JsonProperty("advance")
private String advance;
/** 销售合同 **/
@JsonProperty("salesId")
private String salesId;
/** 销售价格 **/
@JsonProperty("salesPrice")
private Integer salesPrice;
/** 运输方式 **/
@JsonProperty("transportType")
private String transportType;
/** 车牌号 **/
@JsonProperty("vehicleId")
private String vehicleId;
/** 运费 **/
@JsonProperty("transportPrice")
private Integer transportPrice;
/** 车辆图片 **/
@JsonProperty("vehiclePictures")
private String vehiclePictures;
/** 车号 **/
@JsonProperty("licenseNo")
private String licenseNo;
/** 磅单时间 **/
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
@JsonProperty("poundDate")
private Date poundDate;
/** 业务员名称 **/
@JsonProperty("businessName")
private String businessName;
/** 磅单图片 **/
@JsonProperty("poundPictures")
private String poundPictures;
/** 磅单号 **/
@JsonProperty("poundlistNo")
private String poundlistNo;
/** 皮重 **/
@JsonProperty("tareWeight")
private Integer tareWeight;
private String tareWeight;
/** 毛重 **/
@JsonProperty("grossWeight")
private Integer grossWeight;
private String grossWeight;
/** 扣重 **/
@JsonProperty("buckleWeight")
private Integer buckleWeight;
private String buckleWeight;
/** 净重 **/
@JsonProperty("netWeight")
private Integer netWeight;
private String netWeight;
/** 备注 **/
@JsonProperty("remark")
private String remark;
/** 单位 **/
@JsonProperty("unit")
private String unit;
/** 司机名称 **/
@JsonProperty("driverName")
private String driverName;
/** 运输类型 **/
@JsonProperty("transportType")
private String transportType;
/** 车辆图片 **/
@JsonProperty("vehiclePictures")
private String vehiclePictures;
/** 是否垫资 **/
@JsonProperty("advance")
private String advance;
/** 运费 **/
@JsonProperty("transportPrice")
private String transportPrice;
/** 制单人 **/
/** 销售价格 **/
@JsonProperty("salesPrice")
private String salesPrice;
/** 业务员 **/
@JsonProperty("creatorUserName")
private String creatorUserName;
/** 自然人 **/
@JsonProperty("naturalId")
private String naturalId;
/** 备注 **/
@JsonProperty("remark")
private String remark;
/** 磅单日期 **/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@JsonProperty("creatorTime")
private Date creatorTime;
}

@ -11,13 +11,16 @@ import java.util.List;
* @ V3.2.0
* @ LINKAGE-BOOT
* @ LINKAGE-BOOT
* @ 2023-01-09
* @ 2023-02-16
*/
@Data
public class TradeuploadPagination extends Pagination {
/** 物料名称 */
private String materialName;
/** 磅单时间 */
private List<String> poundDate;
/** 磅单号 */
private String poundlistNo;
/**
* id
*/

@ -9,7 +9,7 @@ import java.util.*;
* @ V3.2.0
* @ LINKAGE-BOOT
* @ LINKAGE-BOOT
* @ 2023-01-09
* @ 2023-02-16
*/
@Data
public class TradeuploadPaginationExportModel extends Pagination {
@ -21,6 +21,9 @@ public class TradeuploadPaginationExportModel extends Pagination {
private String dataType;
/** 物料名称 */
private String materialName;
/** 磅单时间 */
private List<String> poundDate;
/** 磅单号 */
private String poundlistNo;
}

@ -15,7 +15,7 @@ import lombok.Data;
* @ V3.2.0
* @ LINKAGE-BOOT
* @ LINKAGE-BOOT
* @ 2023-01-09
* @ 2023-02-16
*/
@Data
public class TradeuploadUpForm{
@ -23,99 +23,109 @@ public class TradeuploadUpForm{
private String id;
/** 物料编码 **/
@JsonProperty("materialCode")
private String materialCode;
/** 磅单上传 **/
@JsonProperty("poundPictures")
private String poundPictures;
/** 物料名称 **/
@JsonProperty("materialName")
private String materialName;
/** 销售合同 **/
@JsonProperty("salesName")
private String salesName;
@JsonProperty("materialId")
private String materialId;
/** 客户名称 **/
@JsonProperty("customerName")
private String customerName;
/** 是否垫资 **/
@JsonProperty("advance")
private String advance;
/** 销售价格 **/
@JsonProperty("salesPrice")
private Integer salesPrice;
@JsonProperty("customerId")
private String customerId;
/** 运输方式 **/
@JsonProperty("transportType")
private String transportType;
/** 销售合同 **/
@JsonProperty("salesId")
private String salesId;
/** 运费 **/
@JsonProperty("transportPrice")
private Integer transportPrice;
/** 车牌号 **/
@JsonProperty("vehicleId")
private String vehicleId;
/** 车 **/
@JsonProperty("licenseNo")
private String licenseNo;
/** 车辆图片 **/
@JsonProperty("vehiclePictures")
private String vehiclePictures;
/** 业务员名称 **/
@JsonProperty("businessName")
private String businessName;
/** 磅单时间 **/
@JsonProperty("poundDate")
private Long poundDate;
/** 磅单图片 **/
@JsonProperty("poundPictures")
private String poundPictures;
/** 磅单 **/
@JsonProperty("poundlistNo")
private String poundlistNo;
/** 皮重 **/
@JsonProperty("tareWeight")
private Integer tareWeight;
private String tareWeight;
/** 毛重 **/
@JsonProperty("grossWeight")
private Integer grossWeight;
private String grossWeight;
/** 扣重 **/
@JsonProperty("buckleWeight")
private Integer buckleWeight;
private String buckleWeight;
/** 净重 **/
@JsonProperty("netWeight")
private Integer netWeight;
private String netWeight;
/** 备注 **/
@JsonProperty("remark")
private String remark;
/** 单位 **/
@JsonProperty("unit")
private String unit;
/** 司机名称 **/
@JsonProperty("driverName")
private String driverName;
/** 运输类型 **/
@JsonProperty("transportType")
private String transportType;
/** 车辆图片 **/
@JsonProperty("vehiclePictures")
private String vehiclePictures;
/** 是否垫资 **/
@JsonProperty("advance")
private String advance;
/** 运费 **/
@JsonProperty("transportPrice")
private String transportPrice;
/** 制单人 **/
/** 销售价格 **/
@JsonProperty("salesPrice")
private String salesPrice;
/** 业务员 **/
@JsonProperty("creatorUserName")
private String creatorUserName;
/** 自然人 **/
@JsonProperty("naturalId")
private String naturalId;
/** 备注 **/
@JsonProperty("remark")
private String remark;
/** 磅单日期 **/
@JsonProperty("creatorTime")
private String creatorTime;
}

@ -10,7 +10,7 @@ import java.util.*;
* V3.2.0
* LINKAGE-BOOT
* LINKAGE-BOOT
* 2023-01-09
* 2023-02-16
*/
public interface TradeuploadService extends IService<TradeuploadEntity> {

@ -38,7 +38,7 @@ import java.util.*;
* V3.2.0
* LINKAGE-BOOT
* LINKAGE-BOOT
* 2023-01-09
* 2023-02-16
*/
@Service
public class TradeuploadServiceImpl extends ServiceImpl<TradeuploadMapper, TradeuploadEntity> implements TradeuploadService{
@ -61,6 +61,8 @@ public class TradeuploadServiceImpl extends ServiceImpl<TradeuploadMapper, Trade
int total=0;
int tradeuploadNum =0;
QueryWrapper<TradeuploadEntity> tradeuploadQueryWrapper=new QueryWrapper<>();
tradeuploadQueryWrapper.lambda().eq(TradeuploadEntity::getIsExamine,"0");
tradeuploadQueryWrapper.lambda().eq(TradeuploadEntity::getPoundType,"0");
boolean pcPermission = false;
boolean appPermission = false;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
@ -88,9 +90,20 @@ public class TradeuploadServiceImpl extends ServiceImpl<TradeuploadMapper, Trade
}
}
if(StringUtil.isNotEmpty(tradeuploadPagination.getMaterialName())){
if(StringUtil.isNotEmpty(tradeuploadPagination.getPoundDate())){
tradeuploadNum++;
tradeuploadQueryWrapper.lambda().like(TradeuploadEntity::getMaterialName,tradeuploadPagination.getMaterialName());
List<String> PoundDateList = tradeuploadPagination.getPoundDate();
Long fir = Long.valueOf(PoundDateList.get(0));
Long sec = Long.valueOf(PoundDateList.get(1));
tradeuploadQueryWrapper.lambda().ge(TradeuploadEntity::getPoundDate, new Date(fir))
.le(TradeuploadEntity::getPoundDate, DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59"));
}
if(StringUtil.isNotEmpty(tradeuploadPagination.getPoundlistNo())){
tradeuploadNum++;
tradeuploadQueryWrapper.lambda().like(TradeuploadEntity::getPoundlistNo,tradeuploadPagination.getPoundlistNo());
}
if(AllIdList.size()>0){
@ -154,9 +167,20 @@ public class TradeuploadServiceImpl extends ServiceImpl<TradeuploadMapper, Trade
}
}
if(StringUtil.isNotEmpty(tradeuploadPagination.getMaterialName())){
if(StringUtil.isNotEmpty(tradeuploadPagination.getPoundDate())){
tradeuploadNum++;
List<String> PoundDateList = tradeuploadPagination.getPoundDate();
Long fir = Long.valueOf(PoundDateList.get(0));
Long sec = Long.valueOf(PoundDateList.get(1));
tradeuploadQueryWrapper.lambda().ge(TradeuploadEntity::getPoundDate, new Date(fir))
.le(TradeuploadEntity::getPoundDate, DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59"));
}
if(StringUtil.isNotEmpty(tradeuploadPagination.getPoundlistNo())){
tradeuploadNum++;
tradeuploadQueryWrapper.lambda().like(TradeuploadEntity::getMaterialName,tradeuploadPagination.getMaterialName());
tradeuploadQueryWrapper.lambda().like(TradeuploadEntity::getPoundlistNo,tradeuploadPagination.getPoundlistNo());
}
if(AllIdList.size()>0){

@ -2,7 +2,7 @@
<el-dialog :title="!dataForm.id ? '新建' : isDetail ? '详情':'编辑'"
:close-on-click-modal="false" append-to-body
:visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll
width="1000px">
width="1500px">
<el-row :gutter="15" class="">
<el-form ref="elForm" :model="dataForm" :rules="rules" size="small" label-width="100px" label-position="right" >
<template v-if="!loading">
@ -114,7 +114,7 @@
<el-form-item label="制单人"
prop="creatorUserName" >
<el-input v-model="dataForm.creatorUserName"
placeholder="请输入" clearable :style='{"width":"100%"}'>
placeholder="系统自动生成" readonly>
</el-input>
</el-form-item>
@ -127,46 +127,46 @@
<div class="JNPF-common-title">
<h2></h2>
</div>
<el-table :data="dataForm.collection_item0List" size='mini' >
<el-table :data="dataForm.collection_item0List" size='mini' show-summary :summary-method="getSummaries" >
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column prop="amount" label="收款金额">
<el-table-column prop="amount" label="收款金额" width="120" align="center">
<template slot-scope="scope">
<el-input v-model="scope.row.amount"
placeholder="请输入" clearable :style='{"width":"200%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column prop="creatorUserId" label="订单金额">
<el-table-column prop="creatorUserId" label="订单金额" width="130" align="center">
<template slot-scope="scope">
<el-input v-model="scope.row.price"
placeholder="请输入" clearable :style='{"width":"200%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column prop="creatorUserName" label="已收款金额">
<el-table-column prop="creatorUserName" label="已收款金额" width="130" align="center">
<template slot-scope="scope">
<el-input v-model="scope.row.amountCollected"
placeholder="请输入" clearable :style='{"width":"200%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column prop="deleteTime" label="销售订单编号">
<el-table-column prop="deleteTime" label="销售订单编号" width="130" align="center">
<template slot-scope="scope">
<popupSelect v-model="scope.row.documentNo"
placeholder="请选择" clearable :field="'deleteTime'+scope.$index" interfaceId="393372436705378053" :columnOptions="jg_collection_item0deleteTimecolumnOptions" propsValue="document_no" relationField="document_no" popupType="dialog"
popupWidth="800px" :bissId="dataForm.customerCode" @change="popupSelect2"
popupWidth="800px" :bissId="dataForm.customerCode" :excludeFields="excludeFields" @change="popupSelect2"
>
</popupSelect>
</template>
</el-table-column>
<el-table-column prop="lastModifyUserId" label="合同编号">
<el-table-column prop="lastModifyUserId" label="合同编号" width="130" align="center">
<template slot-scope="scope">
<el-input v-model="scope.row.contractCode"
placeholder="请输入" clearable :style='{"width":"200%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column prop="lastModifyUserName" label="重量">
<el-table-column prop="lastModifyUserName" label="重量" width="130" align="center">
<template slot-scope="scope">
<el-input v-model="scope.row.num"
placeholder="请输入" clearable :style='{"width":"200%"}'>
@ -181,35 +181,35 @@
<!-- </el-select>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column prop="lastModifyTime" label="垫资金额">
<el-table-column prop="lastModifyTime" label="垫资金额" width="130" align="center">
<template slot-scope="scope">
<el-input v-model="scope.row.advanceAmount"
placeholder="请输入" clearable :style='{"width":"200%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column prop="deleteUserId" label="税额">
<el-table-column prop="deleteUserId" label="税额" width="130" align="center">
<template slot-scope="scope">
<el-input v-model="scope.row.rate"
placeholder="请输入" clearable :style='{"width":"200%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column prop="deleteUserName" label="不含税金额">
<el-table-column prop="deleteUserName" label="不含税金额" width="130" align="center">
<template slot-scope="scope">
<el-input v-model="scope.row.notPrice"
placeholder="请输入" clearable :style='{"width":"200%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column prop="creatorTime" label="业务日期">
<el-table-column prop="creatorTime" label="业务日期" width="130" align="center">
<template slot-scope="scope">
<el-date-picker v-model="scope.row.creatorTime"
placeholder="请选择" clearable :style='{"width":"200%"}' type="date" format="yyyy-MM-dd" value-format="timestamp" >
</el-date-picker>
</template>
</el-table-column>
<el-table-column label="操作" width="50" >
<el-table-column label="操作" width="50" align="center">
<template slot-scope="scope">
<el-button size="mini" type="text" class="JNPF-table-delBtn" @click="delcollection_item0List(scope.$index)"></el-button>
</template>
@ -241,6 +241,7 @@
props: [],
data() {
return {
excludeFields: [],
visible: false,
loading: false,
isDetail: false,
@ -283,11 +284,40 @@
},
mounted() {},
methods: {
getSummaries(param) {
const { columns, data } = param;
const sums = [];
columns.forEach((column, index) => {
if (index === 0) {
sums[index] = '合计';
return;
}
const values = data.map(item => Number(item[column.property]));
if (!values.every(value => isNaN(value)) && (index === 1)) {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr);
if (!isNaN(value)) {
return prev + curr;
} else {
return prev;
}
}, 0);
} else {
sums[index] = '';
}
});
return sums;
},
popupSelect(e,d){
this.excludeFields = [];
this.dataForm.collection_item0List = [];
this.dataForm.customerCode = d.id;
},
popupSelect2(a,b) {
var excludeFields = [];
for (let i = 0; i < this.dataForm.collection_item0List.length; i++) {
excludeFields.push(this.dataForm.collection_item0List[i].documentNo);
if (a == this.dataForm.collection_item0List[i].documentNo) {
this.dataForm.collection_item0List[i].id = b.id;
this.dataForm.collection_item0List[i].price = b.price;
@ -300,6 +330,7 @@
this.dataForm.collection_item0List[i].creatorTime = b.creator_time;
}
}
this.excludeFields = excludeFields;
},
collection_item0Exist() {
let isOk = true;

@ -20,13 +20,23 @@
<div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head">
<div>
<el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()">
<el-button type="text" icon="el-icon-plus" @click="addOrUpdateHandle()">
</el-button>
<el-button type="text" icon="el-icon-plus" @click="addOrUpdateHandle()">
</el-button>
<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">
</el-button>
<el-button type="text" icon="el-icon-download" @click="exportData()" >导入
</el-button>
<el-button type="text" icon="el-icon-download" @click="exportData()" >导出
</el-button>
<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()" >批量删除
<el-button type="text" icon="el-icon-document-checked" @click="confirmprice()">
</el-button>
<el-button type="text" icon="el-icon-document-delete" @click="confirmprice()">
</el-button>
<el-button type="text" icon="el-icon-check" @click="confirmprice()">
</el-button>
<el-button type="primary" icon="el-icon-plus" @click="confirmprice()">
<el-button type="text" icon="el-icon-check" @click="confirmprice()">
</el-button>
</div>
<div class="JNPF-common-head-right">
@ -37,45 +47,35 @@
<screenfull isContainer/>
</div>
</div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c @selection-change="handleSelectionChange">
<el-table-column prop="documentNo" label="单据编号" width="0" align="left"
/>
<el-table-column prop="customerName" label="客户名称" width="0" align="left"
/>
<el-table-column label="币别 " width="0" prop="currency" algin="left"
>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c :hasNO="false" @selection-change="handleSelectionChange" border>
<el-table-column type="index" width="50" label="序号" fixed="left" align="center" />
<el-table-column prop="documentNo" label="单据编号" sortable width="200 " align="center" fixed="left"/>
<el-table-column prop="customerName" label="客户名称" sortable width="220" align="center" fixed="left"/>
<el-table-column label="币别 " sortable width="90" prop="currency" algin="center">
<template slot-scope="scope">
{{ scope.row.currency | dynamicText(currencyOptions) }}
</template>
</el-table-column>
<el-table-column prop="amountCollected" label="收款金额" width="0" align="left"
/>
<el-table-column prop="collectionCount" label="收款账户" width="0" align="left"
/>
<el-table-column prop="collectionBank" label="收款银行" width="0" align="left"
/>
<el-table-column label="收款类型 " width="0" prop="paymentType" algin="left"
>
<el-table-column prop="amountCollected" sortable label="收款金额" width="150" align="center"/>
<el-table-column prop="collectionCount" sortable label="收款账户" width="160" align="center"/>
<el-table-column prop="collectionBank" sortable label="收款银行" width="130" align="center"/>
<el-table-column label="收款类型 " sortable width="100" prop="paymentType" algin="center">
<template slot-scope="scope">
{{ scope.row.paymentType | dynamicText(paymentTypeOptions) }}
</template>
</el-table-column>
<el-table-column label="结算类型" width="0" prop="settlementType" algin="left"
>
<el-table-column label="结算类型" sortable width="100" prop="settlementType" algin="center">
<template slot-scope="scope">
{{ scope.row.settlementType | dynamicText(settlementTypeOptions) }}
</template>
</el-table-column>
<el-table-column label="单据状态 " width="0" prop="status" algin="left"
>
<el-table-column label="单据状态" sortable width="110" prop="status" algin="center">
<template slot-scope="scope">
{{ scope.row.status | dynamicText(statusOptions) }}
</template>
</el-table-column>
<el-table-column prop="creatorUserName" label="制单人" width="0" align="left"
/>
<el-table-column label="操作" fixed="right"
width="150" >
<el-table-column prop="creatorUserName" label="制单人" sortable width="130" align="center"/>
<el-table-column label="操作" fixed="right" width="150" align="center">
<template slot-scope="scope">
<el-button type="text"
@click="addOrUpdateHandle(scope.row.id)" >编辑

@ -34,11 +34,18 @@
</el-form-item>
</el-col>
<el-col :span="24" >
<el-form-item label="安全库存"
prop="safety" >
<el-input-number v-model="dataForm.safety"
placeholder="数字文本" :step="1" >
<el-form-item label="安全库存" prop="safety" :rules="[
{
required: true,
message: '请输入',
trigger: 'blur'
},
{
validator:this.numberRule,
trigger: 'blur'
}
]" >
<el-input-number v-model="dataForm.safety" placeholder="数字文本" :step="1" >
</el-input-number>
</el-form-item>
</el-col>
@ -99,13 +106,21 @@
maximum : 1,
safety : 1,
minimum : 1,
unit : "",
unit : "0",
warehouseId : "",
creatorTime : "",
lastModifyTime : "",
},
rules:
{
areaname: [
{
required: true,
message: '请输入',
trigger: 'change'
},
],
warehouseId: [
{
required: true,
@ -118,6 +133,14 @@
warehouseIdcolumnOptions:[ {"label":"仓库名称","value":"NAME"}, {"label":"ERP库存组织名称","value":"inventory_org_name"}, {"label":"ERP库存组织详情名称","value":"inventory_org_detail_name"},],
}
const numberRule = (rule,value,callback) => {
if(this.dataForm.safety(value) > this.dataForm.maximum){
callback(new Error('安全库存不能大于最高库存'))
}
}
return {
numberRule: numberRule(),
}
},
computed: {},
watch: {},

@ -2,77 +2,62 @@
<el-dialog title="详情"
:close-on-click-modal="false" append-to-body
:visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll
width="800px">
width="1000px">
<el-row :gutter="15" class="">
<el-form ref="elForm" :model="dataForm" size="small" label-width="100px" label-position="right" >
<template v-if="!loading">
<el-col :span="12" >
<el-form-item label="物料编码"
prop="materialCode" >
<p>{{dataForm.materialCode}}</p>
<el-col :span="24" >
<el-form-item label="磅单上传"
prop="poundPictures" >
<JNPF-UploadFz v-model="dataForm.poundPictures"
disabled
detailed :fileSize="500" sizeUnit="MB" :limit="9" buttonText="点击上传" >
</JNPF-UploadFz>
</el-form-item>
</el-col>
<el-col :span="12" >
<el-form-item label="物料名称"
prop="materialName" >
<p>{{dataForm.materialName}}</p>
</el-form-item>
</el-col>
<el-col :span="12" >
<el-form-item label="销售合同"
prop="salesName" >
<p>{{dataForm.salesName}}</p>
prop="materialId" >
<p>{{dataForm.materialId}}</p>
</el-form-item>
</el-col>
<el-col :span="12" >
<el-form-item label="客户名称"
prop="customerName" >
<p>{{dataForm.customerName}}</p>
prop="customerId" >
<p>{{dataForm.customerId}}</p>
</el-form-item>
</el-col>
<el-col :span="12" >
<el-form-item label="是否垫资"
prop="advance" >
<p>{{ dataForm.advance | dynamicText(advanceOptions) }} </p>
</el-form-item>
</el-col>
<el-col :span="12" >
<el-form-item label="销售价格"
prop="salesPrice" >
<p>{{dataForm.salesPrice}}</p>
<el-form-item label="销售合同"
prop="salesId" >
<p>{{dataForm.salesId}}</p>
</el-form-item>
</el-col>
<el-col :span="12" >
<el-form-item label="运输方式"
prop="transportType" >
<p>{{ dataForm.transportType | dynamicText(transportTypeOptions) }} </p>
<el-form-item label="车牌号"
prop="vehicleId" >
<p>{{dataForm.vehicleId}}</p>
</el-form-item>
</el-col>
<el-col :span="12" >
<el-form-item label="运费"
prop="departmentId" >
<p>{{dataForm.departmentId}}</p>
<el-col :span="24" >
<el-form-item label="车辆图片"
prop="vehiclePictures" >
<JNPF-UploadImg v-model="dataForm.vehiclePictures"
disabled
detailed :fileSize="500" sizeUnit="MB" :limit="9" >
</JNPF-UploadImg>
</el-form-item>
</el-col>
<el-col :span="12" >
<el-form-item label="车号"
prop="licenseNo" >
<p>{{dataForm.licenseNo}}</p>
<el-form-item label="磅单时间"
prop="poundDate" >
<p>{{jnpf.dateFormat(dataForm.poundDate)}}</p>
</el-form-item>
</el-col>
<el-col :span="12" >
<el-form-item label="业务员名称"
prop="businessName" >
<p>{{dataForm.businessName}}</p>
</el-form-item>
</el-col>
<el-col :span="24" >
<el-form-item label="磅单图片"
prop="poundPictures" >
<JNPF-UploadImg v-model="dataForm.poundPictures"
disabled
detailed :fileSize="500" sizeUnit="MB" :limit="9" >
</JNPF-UploadImg>
<el-form-item label="磅单号"
prop="poundlistNo" >
<p>{{dataForm.poundlistNo}}</p>
</el-form-item>
</el-col>
<el-col :span="12" >
@ -99,31 +84,58 @@
<p>{{dataForm.netWeight}}</p>
</el-form-item>
</el-col>
<el-col :span="24" >
<el-form-item label="备注"
prop="remark" >
<p>{{dataForm.remark}}</p>
<el-col :span="12" >
<el-form-item label="单位 "
prop="unit" >
<p>{{ dataForm.unit | dynamicText(unitOptions) }} </p>
</el-form-item>
</el-col>
<el-col :span="24" >
<el-form-item label="司机名称"
prop="driverName" >
<p>{{dataForm.driverName}}</p>
<el-col :span="12" >
<el-form-item label="运输类型"
prop="transportType" >
<p>{{ dataForm.transportType | dynamicText(transportTypeOptions) }} </p>
</el-form-item>
</el-col>
<el-col :span="24" >
<el-form-item label="车辆图片"
prop="vehiclePictures" >
<JNPF-UploadImg v-model="dataForm.vehiclePictures"
disabled
detailed :fileSize="500" sizeUnit="MB" :limit="9" >
</JNPF-UploadImg>
<el-col :span="12" >
<el-form-item label="是否垫资"
prop="advance" >
<p>{{ dataForm.advance | dynamicText(advanceOptions) }} </p>
</el-form-item>
</el-col>
<el-col :span="12" >
<el-form-item label="运费"
prop="transportPrice" >
<p>{{dataForm.transportPrice}}</p>
</el-form-item>
</el-col>
<el-col :span="12" >
<el-form-item label="销售价格"
prop="salesPrice" >
<p>{{dataForm.salesPrice}}</p>
</el-form-item>
</el-col>
<el-col :span="12" >
<el-form-item label="业务员"
prop="creatorUserName" >
<p>{{dataForm.creatorUserName}}</p>
</el-form-item>
</el-col>
<el-col :span="12" >
<el-form-item label="自然人"
prop="naturalId" >
<p>{{dataForm.naturalId}}</p>
</el-form-item>
</el-col>
<el-col :span="12" >
<el-form-item label="备注"
prop="remark" >
<p>{{dataForm.remark}}</p>
</el-form-item>
</el-col>
<el-col :span="24" >
<el-form-item label="制单人"
prop="creatorusername" >
<p>{{dataForm.creatorusername}}</p>
<el-form-item label="磅单日期"
prop="creatorTime" >
<p>{{dataForm.creatorTime}}</p>
</el-form-item>
</el-col>
</template>
@ -149,28 +161,31 @@
printId: '',
dataForm: {
id :'',
materialCode : "",
materialName : '',
salesName : "",
customerName : '',
advance : "",
salesPrice : '',
transportType : "",
departmentId : 11.225,
licenseNo : "",
businessName : '',
poundPictures : [],
tareWeight : '',
grossWeight : '',
buckleWeight : '',
netWeight : '',
remark : '',
driverName : '',
materialId : "",
customerId : "",
salesId : "",
vehicleId : "",
vehiclePictures : [],
creatorusername : '',
poundDate : '',
poundlistNo : '',
tareWeight : 0,
grossWeight : 0,
buckleWeight : 0,
netWeight : 0,
unit : "0",
transportType : "0",
advance : "0",
transportPrice : 0,
salesPrice : '',
creatorUserName : "",
naturalId : "",
remark : '',
creatorTime : "",
},
advanceOptions:[{"fullName":"是","id":"1"},{"fullName":"否","id":"0"}],
unitOptions:[{"fullName":"吨","id":"0"},{"fullName":"千克","id":"1"}],
transportTypeOptions:[{"fullName":"汽运","id":"0"},{"fullName":"船运","id":"1"},{"fullName":"火车","id":"2"}],
advanceOptions:[{"fullName":"否","id":"0"},{"fullName":"是","id":"1"}],
}
},

@ -1,417 +1,467 @@
<template>
<el-dialog :title="!dataForm.id ? '新建' : isDetail ? '详情':'编辑'" :close-on-click-modal="false" append-to-body
:visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll width="1000px">
<el-row :gutter="15" class="">
<el-form ref="elForm" :model="dataForm" :rules="rules" size="small" label-width="100px"
label-position="right">
<template v-if="!loading">
<el-col :span="12" >
<el-form-item label="物料编码"
prop="materialCode" >
<popupSelect v-model="dataForm.materialCode"
placeholder="请选择" clearable field="materialCode" interfaceId="381037852907038533" :columnOptions="materialCodecolumnOptions" propsValue="item_code" relationField="item_code" popupType="dialog"
popupTitle="选择数据" popupWidth="800px">
<el-dialog :title="!dataForm.id ? '新建' : isDetail ? '详情':'编辑'"
:close-on-click-modal="false" append-to-body
:visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll
width="1000px">
<el-row :gutter="15" class="">
<el-form ref="elForm" :model="dataForm" :rules="rules" size="small" label-width="100px" label-position="right" >
<template v-if="!loading">
<el-col :span="24" >
<el-form-item label="磅单上传"
prop="poundPictures" >
<JNPF-UploadFz v-model="dataForm.poundPictures"
:fileSize="500" sizeUnit="MB" :limit="9" buttonText="点击上传" >
</popupSelect>
</el-form-item>
</el-col>
<el-col :span="12" >
<el-form-item label="物料名称"
prop="materialName" >
<el-input v-model="dataForm.materialName"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</JNPF-UploadFz>
</el-form-item>
</el-col>
<el-col :span="12" >
<el-form-item label="物料名称"
prop="materialId" >
<popupSelect v-model="dataForm.materialId"
placeholder="请选择物料编码" clearable field="materialId" interfaceId="381037852907038533" :columnOptions="materialIdcolumnOptions" propsValue="id" relationField="description" popupType="dialog"
popupTitle="选择数据" popupWidth="800px"
hasPage :pageSize="20" >
</el-input>
</el-form-item>
</el-col>
<!-- <el-col :span="12" >
<el-form-item label="物料名称"
>
<popupAttr
relationField="materialCode" showField="description" >
v-model="dataForm.materialCode"
</popupAttr>
</el-form-item>
</el-col>-->
<el-col :span="12">
<el-form-item label="销售合同" prop="salesName">
<popupSelect v-model="dataForm.salesName" placeholder="请选择" clearable field="salesName"
interfaceId="381038993740949317" :columnOptions="salesNamecolumnOptions" propsValue="contract_name" relationField="contract_name" popupType="dialog"
popupTitle="选择数据" popupWidth="800px">
</popupSelect>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="客户名称" prop="customerName">
<el-input v-model="dataForm.customerName" placeholder="请输入" clearable
:style='{"width":"100%"}'>
</popupSelect>
</el-form-item>
</el-col>
<el-col :span="12" >
<el-form-item label="客户名称"
prop="customerId" >
<popupSelect v-model="dataForm.customerId"
placeholder="请选择客户" clearable field="customerId" interfaceId="395936123471343749" :columnOptions="customerIdcolumnOptions" propsValue="id" relationField="supplier_nm" popupType="dialog"
popupTitle="选择数据" popupWidth="800px"
hasPage :pageSize="20" >
</el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="是否垫资" prop="advance">
<el-select v-model="dataForm.advance" placeholder="请选择" clearable :style='{"width":"100%"}'>
<el-option v-for="(item, index) in advanceOptions" :key="index" :label="item.fullName"
:value="item.id" :disabled="item.disabled"></el-option>
</popupSelect>
</el-form-item>
</el-col>
<el-col :span="12" >
<el-form-item label="销售合同"
prop="salesId" >
<popupSelect v-model="dataForm.salesId"
placeholder="请选择合同" clearable field="salesId" interfaceId="381037852907038533" :columnOptions="salesIdcolumnOptions" propsValue="id" relationField="contract_name" popupType="dialog"
popupTitle="选择数据" popupWidth="800px"
hasPage :pageSize="20" >
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="销售价格" prop="salesPrice">
<el-input-number v-model="dataForm.salesPrice" placeholder="数字文本" :step="1">
</popupSelect>
</el-form-item>
</el-col>
<el-col :span="12" >
<el-form-item label="车牌号"
prop="vehicleId" >
<popupSelect v-model="dataForm.vehicleId"
placeholder="请选择车辆" clearable field="vehicleId" interfaceId="381432451370615173" :columnOptions="vehicleIdcolumnOptions" propsValue="id" relationField="ticketno" popupType="dialog"
popupTitle="选择数据" popupWidth="800px"
hasPage :pageSize="20" >
</el-input-number>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="运输方式" prop="transportType">
<el-select v-model="dataForm.transportType" placeholder="请选择" clearable
:style='{"width":"100%"}'>
<el-option v-for="(item, index) in transportTypeOptions" :key="index"
:label="item.fullName" :value="item.id" :disabled="item.disabled"></el-option>
</popupSelect>
</el-form-item>
</el-col>
<el-col :span="24" >
<el-form-item label="车辆图片"
prop="vehiclePictures" >
<JNPF-UploadImg v-model="dataForm.vehiclePictures"
:fileSize="500" sizeUnit="MB" :limit="9" >
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="运费" prop="departmentId">
<el-input-number v-model="dataForm.departmentId" placeholder="数字文本" :step="1">
</JNPF-UploadImg>
</el-form-item>
</el-col>
<el-col :span="12" >
<el-form-item label="磅单时间"
prop="poundDate" >
<el-date-picker v-model="dataForm.poundDate"
placeholder="请选择" clearable :style='{"width":"100%"}' type="date" format="yyyy-MM-dd" value-format="timestamp" >
</el-input-number>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="车号" prop="licenseNo">
<popupSelect v-model="dataForm.licenseNo" placeholder="请选择" clearable field="licenseNo"
interfaceId="381432451370615173" :columnOptions="licenseNocolumnOptions" propsValue="ticketno" relationField="ticketno" popupType="dialog"
popupTitle="选择数据" popupWidth="800px">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12" >
<el-form-item label="磅单号"
prop="poundlistNo" >
<el-input v-model="dataForm.poundlistNo"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</popupSelect>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="业务员名称" prop="businessName">
<el-input v-model="dataForm.businessName" placeholder="请输入" clearable
:style='{"width":"100%"}'>
</el-input>
</el-form-item>
</el-col>
<el-col :span="12" >
<el-form-item label="皮重"
prop="tareWeight" >
<el-input v-model="dataForm.tareWeight"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="磅单图片" prop="poundPictures">
<JNPF-UploadImg v-model="dataForm.poundPictures" :fileSize="500" sizeUnit="MB" :limit="9">
</el-input>
</el-form-item>
</el-col>
<el-col :span="12" >
<el-form-item label="毛重"
prop="grossWeight" >
<el-input v-model="dataForm.grossWeight"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</JNPF-UploadImg>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="皮重" prop="tareWeight">
<el-input-number v-model="dataForm.tareWeight" placeholder="数字文本" :step="1">
</el-input>
</el-form-item>
</el-col>
<el-col :span="12" >
<el-form-item label="扣重"
prop="buckleWeight" >
<el-input v-model="dataForm.buckleWeight"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input-number>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="毛重" prop="grossWeight">
<el-input-number v-model="dataForm.grossWeight" placeholder="数字文本" :step="1">
</el-input>
</el-form-item>
</el-col>
<el-col :span="12" >
<el-form-item label="净重"
prop="netWeight" >
<el-input v-model="dataForm.netWeight"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input-number>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="扣重" prop="buckleWeight">
<el-input-number v-model="dataForm.buckleWeight" placeholder="数字文本" :step="1">
</el-input>
</el-form-item>
</el-col>
<el-col :span="12" >
<el-form-item label="单位 "
prop="unit" >
<el-select v-model="dataForm.unit"
placeholder="请选择" clearable :style='{"width":"100%"}'>
<el-option v-for="(item, index) in unitOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
</el-input-number>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="净重" prop="netWeight">
<el-input-number v-model="dataForm.netWeight" placeholder="数字文本" :step="1">
</el-select>
</el-form-item>
</el-col>
<el-col :span="12" >
<el-form-item label="运输类型"
prop="transportType" >
<el-select v-model="dataForm.transportType"
placeholder="请选择" clearable :style='{"width":"100%"}'>
<el-option v-for="(item, index) in transportTypeOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
</el-input-number>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="备注" prop="remark">
<el-input v-model="dataForm.remark" placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12" >
<el-form-item label="是否垫资"
prop="advance" >
<el-select v-model="dataForm.advance"
placeholder="请选择" clearable :style='{"width":"100%"}'>
<el-option v-for="(item, index) in advanceOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
</el-input>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="司机名称" prop="driverName">
<el-input v-model="dataForm.driverName" placeholder="请输入" clearable
:style='{"width":"100%"}'>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12" >
<el-form-item label="运费"
prop="transportPrice" >
<el-input v-model="dataForm.transportPrice"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="车辆图片" prop="vehiclePictures">
<JNPF-UploadImg v-model="dataForm.vehiclePictures" :fileSize="500" sizeUnit="MB" :limit="9">
</el-input>
</el-form-item>
</el-col>
<el-col :span="12" >
<el-form-item label="销售价格"
prop="salesPrice" >
<el-input v-model="dataForm.salesPrice"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</JNPF-UploadImg>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="制单人" prop="creatorusername">
<el-input v-model="dataForm.creatorusername" placeholder="请输入" clearable
:style='{"width":"100%"}'>
</el-input>
</el-form-item>
</el-col>
<el-col :span="12" >
<el-form-item label="业务员"
prop="creatorUserName" >
<popupSelect v-model="dataForm.creatorUserName"
placeholder="请选择业务员" clearable field="creatorUserName" interfaceId="ebcc44be142e43b795c0d769abd6d25a" :columnOptions="creatorUserNamecolumnOptions" propsValue="F_RealName" relationField="F_RealName" popupType="dialog"
popupTitle="选择数据" popupWidth="800px"
hasPage :pageSize="20" >
</el-input>
</el-form-item>
</el-col>
</template>
</el-form>
</el-row>
<span slot="footer" class="dialog-footer">
<el-button @click="visible = false"> </el-button>
<el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail"> </el-button>
</span>
</el-dialog>
</popupSelect>
</el-form-item>
</el-col>
<el-col :span="12" >
<el-form-item label="自然人"
prop="naturalId" >
<popupSelect v-model="dataForm.naturalId"
placeholder="请选择自然人" clearable field="naturalId" interfaceId="395933800510599301" :columnOptions="naturalIdcolumnOptions" propsValue="id" relationField="name" popupType="dialog"
popupTitle="选择数据" popupWidth="800px"
hasPage :pageSize="20" >
</popupSelect>
</el-form-item>
</el-col>
<el-col :span="12" >
<el-form-item label="备注"
prop="remark" >
<el-input v-model="dataForm.remark"
placeholder="请输入备注信息" clearable :style='{"width":"100%"}'>
</el-input>
</el-form-item>
</el-col>
<el-col :span="24" >
<el-form-item label="磅单日期"
prop="creatorTime" >
<el-input v-model="dataForm.creatorTime"
placeholder="系统自动生成" readonly >
</el-input>
</el-form-item>
</el-col>
</template>
</el-form>
</el-row>
<span slot="footer" class="dialog-footer">
<el-button @click="visible = false"> </el-button>
<el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail"> </el-button>
</span>
</el-dialog>
</template>
<script>
import request from '@/utils/request'
import {
getDataInterfaceRes
} from '@/api/systemData/dataInterface'
import {
getDictionaryDataSelector
} from '@/api/systemData/dictionary'
export default {
components: {},
props: [],
data() {
return {
visible: false,
loading: false,
isDetail: false,
dataForm: {
materialCode: "",
materialName: '',
salesName: "",
customerName: '',
advance: "",
salesPrice: '',
transportType: "",
departmentId: 11.225,
licenseNo: "",
businessName: '',
poundPictures: [],
tareWeight: '',
grossWeight: '',
buckleWeight: '',
netWeight: '',
remark: '',
driverName: '',
vehiclePictures: [],
creatorusername: '',
},
rules: {
materialCode: [{
required: true,
message: '请选择',
trigger: 'change'
}, ],
salesName: [{
required: true,
message: '请选择',
trigger: 'change'
}, ],
licenseNo: [{
required: true,
message: '请选择',
trigger: 'change'
}, ],
// poundPictures: [
// {
// required: true,
// message: '',
// trigger: 'click'
// },
// ],
tareWeight: [{
required: true,
message: '数字文本',
trigger: ["blur", "change"]
}, ],
grossWeight: [{
required: true,
message: '数字文本',
trigger: ["blur", "change"]
}, ],
buckleWeight: [{
required: true,
message: '数字文本',
trigger: ["blur", "change"]
}, ],
netWeight: [{
required: true,
message: '数字文本',
trigger: ["blur", "change"]
}, ],
},
materialCodecolumnOptions:[ {"label":"物料编码","value":"item_code"},
{"label":"物料名称","value":"description"},
{"label":"库存组织","value":"organization_id"},
{"label":"默认库区","value":"areaname"},],
salesNamecolumnOptions: [{
"label": "合同编码",
"value": "contract_code"
},
{
"label": "合同名称",
"value": "contract_name"
},
{
"label": "合同类型",
"value": "contract_type"
},
{
"label": "供应商/客户名称",
"value": "name"
},],
advanceOptions: [{
"fullName": "是",
"id": "1"
}, {
"fullName": "否",
"id": "0"
}],
transportTypeOptions: [{
"fullName": "汽运",
"id": "0"
}, {
"fullName": "船运",
"id": "1"
}, {
"fullName": "火车",
"id": "2"
}],
licenseNocolumnOptions: [{
"label": "车牌号",
"value": "ticketno"
},
{
"label": "司机",
"value": "drivername"
},
{
"label": "车辆照片",
"value": "vehiclephotos"
},
{
"label": "手机号",
"value": "contact"
},
{
"label": "创建人",
"value": "f_creatorusername"
},
{
"label": "创建时间",
"value": "f_creatortime"
},],
import request from '@/utils/request'
import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
export default {
components: {},
props: [],
data() {
return {
visible: false,
loading: false,
isDetail: false,
dataForm: {
poundPictures : [],
materialId : "",
customerId : "",
salesId : "",
vehicleId : "",
vehiclePictures : [],
poundDate : '',
poundlistNo : '',
tareWeight : 0,
grossWeight : 0,
buckleWeight : 0,
netWeight : 0,
unit : "0",
transportType : "0",
advance : "0",
transportPrice : 0,
salesPrice : '',
creatorUserName : "",
naturalId : "",
remark : '',
creatorTime : "",
},
rules:
{
poundPictures: [
{
required: true,
message: '请至少选择一个',
trigger: 'click'
},
],
materialId: [
{
required: true,
message: '请选择物料编码',
trigger: 'change'
},
],
customerId: [
{
required: true,
message: '请选择客户',
trigger: 'change'
},
],
salesId: [
{
required: true,
message: '请选择合同',
trigger: 'change'
},
],
vehicleId: [
{
required: true,
message: '请选择车辆',
trigger: 'change'
},
],
vehiclePictures: [
{
required: true,
message: '请至少选择一个',
trigger: 'click'
},
],
poundDate: [
{
required: true,
message: '请选择',
trigger: 'change'
},
],
poundlistNo: [
{
required: true,
message: '请输入',
trigger: 'blur'
},
],
tareWeight: [
{
required: true,
message: '请输入',
trigger: 'blur'
},
],
grossWeight: [
{
required: true,
message: '请输入',
trigger: 'blur'
},
],
buckleWeight: [
{
required: true,
message: '请输入',
trigger: 'blur'
},
],
netWeight: [
{
required: true,
message: '请输入',
trigger: 'blur'
},
],
salesPrice: [
{
required: true,
message: '请输入',
trigger: 'blur'
},
],
creatorUserName: [
{
required: true,
message: '请选择业务员',
trigger: 'change'
},
],
},
materialIdcolumnOptions:[ {"label":"物料编码","value":"item_code"}, {"label":"物料名称","value":"description"}, {"label":"默认库区","value":"areaname"}, {"label":"库存组织","value":"organization_id"},],
customerIdcolumnOptions:[ {"label":"客户编码","value":"supplier_cd"}, {"label":"客户名称","value":"supplier_nm"}, {"label":"地址","value":"address"}, {"label":"银行账号","value":"bank_account"},],
salesIdcolumnOptions:[ {"label":"合同编码","value":"contract_code"}, {"label":"合同名称","value":"contract_name"}, {"label":"合同类型","value":"contract_type"}, {"label":"供应商/客户名称","value":"name"},],
vehicleIdcolumnOptions:[ {"label":"车牌号","value":"ticketno"}, {"label":"司机","value":"drivername"}, {"label":"车辆照片","value":"vehiclephotos"}, {"label":"手机号","value":"contact"},],
unitOptions:[{"fullName":"吨","id":"0"},{"fullName":"千克","id":"1"}],
transportTypeOptions:[{"fullName":"汽运","id":"0"},{"fullName":"船运","id":"1"},{"fullName":"火车","id":"2"}],
advanceOptions:[{"fullName":"否","id":"0"},{"fullName":"是","id":"1"}],
creatorUserNamecolumnOptions:[ {"label":"人员名称","value":"F_RealName"}, {"label":"人员职位","value":"F_FullName"},],
naturalIdcolumnOptions:[ {"label":"自然人名称","value":"name"}, {"label":"自然人手机号","value":"contact"}, {"label":"自然人地址","value":"adress"},],
}
},
computed: {},
watch: {},
created() {
},
mounted() {},
methods: {
clearData(data){
for (let key in data) {
if (data[key] instanceof Array) {
data[key] = [];
} else if (data[key] instanceof Object) {
this.clearData(data[key]);
} else {
data[key] = "";
}
}
},
init(id, isDetail) {
this.dataForm.id = id || 0;
this.visible = true;
this.isDetail = isDetail || false;
this.$nextTick(() => {
this.$refs['elForm'].resetFields();
if(this.dataForm.id){
this.loading = true
request({
url: '/api/tradeupload/Tradeupload/'+this.dataForm.id,
method: 'get'
}).then(res => {
this.dataInfo(res.data)
this.loading = false
});
}else{
this.clearData(this.dataForm)
}
});
this.$store.commit('generator/UPDATE_RELATION_DATA', {})
},
//
dataFormSubmit() {
this.$refs['elForm'].validate((valid) => {
if (valid) {
this.request()
}
})
},
request() {
var _data =this.dataList()
if (!this.dataForm.id) {
request({
url: '/api/tradeupload/Tradeupload',
method: 'post',
data: _data
}).then((res) => {
this.$message({
message: res.msg,
type: 'success',
duration: 1000,
onClose: () => {
this.visible = false
this.$emit('refresh', true)
}
})
})
}else{
request({
url: '/api/tradeupload/Tradeupload/'+this.dataForm.id,
method: 'PUT',
data: _data
}).then((res) => {
this.$message({
message: res.msg,
type: 'success',
duration: 1000,
onClose: () => {
this.visible = false
this.$emit('refresh', true)
}
})
})
}
},
dataList(){
var _data = JSON.parse(JSON.stringify(this.dataForm));
_data.poundPictures = JSON.stringify(_data.poundPictures)
_data.vehiclePictures = JSON.stringify(_data.vehiclePictures)
return _data;
},
dataInfo(dataAll){
let _dataAll =dataAll
_dataAll.poundPictures = JSON.parse( _dataAll.poundPictures)
_dataAll.vehiclePictures = JSON.parse( _dataAll.vehiclePictures)
this.dataForm = _dataAll
},
},
}
}
},
computed: {},
watch: {},
created() {},
mounted() {},
methods: {
clearData(data) {
for (let key in data) {
if (data[key] instanceof Array) {
data[key] = [];
} else if (data[key] instanceof Object) {
this.clearData(data[key]);
} else {
data[key] = "";
}
}
},
init(id, isDetail) {
this.dataForm.id = id || 0;
this.visible = true;
this.isDetail = isDetail || false;
this.$nextTick(() => {
this.$refs['elForm'].resetFields();
if (this.dataForm.id) {
this.loading = true
request({
url: '/api/tradeupload/Tradeupload/' + this.dataForm.id,
method: 'get'
}).then(res => {
this.dataInfo(res.data)
this.loading = false
});
} else {
this.clearData(this.dataForm)
}
});
this.$store.commit('generator/UPDATE_RELATION_DATA', {})
},
//
dataFormSubmit() {
this.$refs['elForm'].validate((valid) => {
if (valid) {
this.request()
}
})
},
request() {
var _data = this.dataList()
if (!this.dataForm.id) {
request({
url: '/api/tradeupload/Tradeupload',
method: 'post',
data: _data
}).then((res) => {
this.$message({
message: res.msg,
type: 'success',
duration: 1000,
onClose: () => {
this.visible = false
this.$emit('refresh', true)
}
})
})
} else {
request({
url: '/api/tradeupload/Tradeupload/' + this.dataForm.id,
method: 'PUT',
data: _data
}).then((res) => {
this.$message({
message: res.msg,
type: 'success',
duration: 1000,
onClose: () => {
this.visible = false
this.$emit('refresh', true)
}
})
})
}
},
dataList() {
var _data = JSON.parse(JSON.stringify(this.dataForm));
_data.poundPictures = JSON.stringify(_data.poundPictures)
_data.vehiclePictures = JSON.stringify(_data.vehiclePictures)
return _data;
},
dataInfo(dataAll) {
let _dataAll = dataAll
_dataAll.poundPictures = JSON.parse(_dataAll.poundPictures)
_dataAll.vehiclePictures = JSON.parse(_dataAll.vehiclePictures)
this.dataForm = _dataAll
},
},
}
</script>

@ -1,393 +1,306 @@
<template>
<div class="JNPF-common-layout">
<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.materialName" placeholder="请输入" clearable> </el-input>
</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="el-icon-plus" @click="addOrUpdateHandle()">
</el-button>
<el-button type="text" icon="el-icon-download" @click="exportData()">
</el-button>
<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">
</el-button>
</div>
<div class="JNPF-common-head-right">
<el-tooltip effect="dark" content="刷新" placement="top">
<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
@click="reset()" />
</el-tooltip>
<screenfull isContainer />
</div>
</div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
@selection-change="handleSelectionChange">
<el-table-column prop="licenseNo" label="车号" width="0" align="left" />
<el-table-column prop="materialName" label="物料名称" width="0" align="left" />
<el-table-column prop="grossWeight" label="毛重" width="0" align="left" />
<el-table-column prop="tareWeight" label="皮重" width="0" align="left" />
<el-table-column prop="buckleWeight" label="扣重" width="0" align="left" />
<el-table-column prop="netWeight" label="净重" width="0" align="left" />
<el-table-column prop="driverName" label="司机名称" width="0" align="left" />
<el-table-column prop="customerName" label="客户名称" width="0" align="left" />
<el-table-column prop="salesName" label="销售合同" width="0" align="left" />
<el-table-column label="是否垫资" width="0" prop="advance" algin="left">
<template slot-scope="scope">
{{ scope.row.advance | dynamicText(advanceOptions) }}
</template>
</el-table-column>
<el-table-column label="运输方式" width="0" prop="transportType" algin="left">
<template slot-scope="scope">
{{ scope.row.transportType | dynamicText(transportTypeOptions) }}
</template>
</el-table-column>
<el-table-column prop="departmentId" label="运费" width="0" align="left" />
<el-table-column prop="salesPrice" label="销售价格" width="0" align="left" />
<el-table-column prop="creatorusername" label="制单人" width="0" align="left" />
<el-table-column prop="businessName" label="业务员" width="0" align="left" />
<el-table-column prop="remark" label="备注" width="0" align="left" />
<el-table-column prop="poundPictures" label="磅单图片" width="0" align="left">
<template slot-scope="scope">
<span v-for="(item,index) in JSON.parse(scope.row.poundPictures)" :key="index">
<el-popover placement="bottom" trigger="click" width="1000">
<img :src="`/dev${item.url}`" width="100%" />
<img
slot="reference"
:src="`/dev${item.url}`"
:alt="`/dev${item.url}`"
style="max-height: 70px;max-width: 70px; padding: 5px"
/>
</el-popover>
</span>
</template>
</el-table-column>
<el-table-column prop="vehiclePictures" label="车辆图片" width="0" align="left">
<template slot-scope="scope">
<span v-for="(item,index) in JSON.parse(scope.row.vehiclePictures)" :key="index">
<el-popover placement="bottom" trigger="click" width="1000">
<img :src="`/dev${item.url}`" width="100%" />
<img
slot="reference"
:src="`/dev${item.url}`"
:alt="`/dev${item.url}`"
style="max-height: 70px;max-width: 70px; padding: 5px"
/>
</el-popover>
</span>
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" width="100">
<template slot-scope="scope">
<el-button type="text" @click="addOrUpdateHandle(scope.row.id)">
</el-button>
<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(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" />
<Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false" />
</div>
<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-date-picker v-model="query.poundDate" type="daterange"
value-format="timestamp" format="yyyy-MM-dd" start-placeholder="开始日期"
end-placeholder="结束日期" >
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="磅单号">
<el-input v-model="query.poundlistNo" placeholder="请输入" clearable> </el-input>
</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="el-icon-plus" @click="addOrUpdateHandle()">
</el-button>
<el-button type="text" icon="el-icon-download" @click="exportData()" >导出
</el-button>
<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()" >批量删除
</el-button>
</div>
<div class="JNPF-common-head-right">
<el-tooltip effect="dark" content="刷新" placement="top">
<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
@click="reset()"/>
</el-tooltip>
<screenfull isContainer/>
</div>
</div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c @selection-change="handleSelectionChange">
<el-table-column prop="creatorTime" label="磅单日期" width="0" align="left"
/>
<el-table-column prop="vehicleId" label="车牌号" width="0" align="left"
/>
<el-table-column prop="materialId" label="物料名称" width="0" align="left"
/>
<el-table-column prop="grossWeight" label="毛重" width="0" align="left"
/>
<el-table-column prop="tareWeight" label="皮重" width="0" align="left"
/>
<el-table-column prop="buckleWeight" label="扣重" width="0" align="left"
/>
<el-table-column prop="netWeight" label="净重" width="0" align="left"
/>
<el-table-column prop="customerId" label="客户名称" width="0" align="left"
/>
<el-table-column prop="salesId" label="销售合同" width="0" align="left"
/>
<el-table-column label="是否垫资" width="0" prop="advance" algin="left"
>
<template slot-scope="scope">
{{ scope.row.advance | dynamicText(advanceOptions) }}
</template>
</el-table-column>
<el-table-column label="运输类型" width="0" prop="transportType" algin="left"
>
<template slot-scope="scope">
{{ scope.row.transportType | dynamicText(transportTypeOptions) }}
</template>
</el-table-column>
<el-table-column prop="transportPrice" label="运费" width="0" align="left"
/>
<el-table-column prop="salesPrice" label="销售价格" width="0" align="left"
/>
<el-table-column prop="creatorUserName" label="业务员" width="0" align="left"
/>
<el-table-column prop="remark" label="备注" width="0" align="left"
/>
<el-table-column label="操作" fixed="right"
width="150" >
<template slot-scope="scope">
<el-button type="text"
@click="addOrUpdateHandle(scope.row.id)" >编辑
</el-button>
<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">
</el-button>
<el-button type="text"
@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"/>
<Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false"/>
</div>
</template>
<script>
import request from '@/utils/request'
import {
getDictionaryDataSelector
} from '@/api/systemData/dictionary'
import JNPFForm from './Form'
import ExportBox from './ExportBox'
import {
getDataInterfaceRes
} from '@/api/systemData/dataInterface'
import Detail from './Detail'
import request from '@/utils/request'
import {getDictionaryDataSelector} from '@/api/systemData/dictionary'
import JNPFForm from './Form'
import ExportBox from './ExportBox'
import {getDataInterfaceRes} from '@/api/systemData/dataInterface'
import Detail from './Detail'
export default {
components: {
JNPFForm,
ExportBox,
Detail
},
data() {
return {
detailVisible: false,
query: {
materialName: undefined,
},
treeProps: {
children: 'children',
label: 'fullName',
value: 'id'
},
list: [],
listLoading: true,
multipleSelection: [],
total: 0,
listQuery: {
currentPage: 1,
pageSize: 20,
sort: "desc",
sidx: "",
},
formVisible: false,
exportBoxVisible: false,
columnList: [{
prop: 'licenseNo',
label: '车号'
},
{
prop: 'materialName',
label: '物料名称'
},
{
prop: 'grossWeight',
label: '毛重'
},
{
prop: 'tareWeight',
label: '皮重'
},
{
prop: 'buckleWeight',
label: '扣重'
},
{
prop: 'netWeight',
label: '净重'
},
{
prop: 'driverName',
label: '司机名称'
},
{
prop: 'customerName',
label: '客户名称'
},
{
prop: 'salesName',
label: '销售合同'
},
{
prop: 'advance',
label: '是否垫资'
},
{
prop: 'transportType',
label: '运输方式'
},
{
prop: 'departmentId',
label: '运费'
},
{
prop: 'salesPrice',
label: '销售价格'
},
{
prop: 'creatorusername',
label: '制单人'
},
{
prop: 'businessName',
label: '业务员名称'
},
{
prop: 'remark',
label: '备注'
},
],
advanceOptions: [{
"fullName": "是",
"id": "1"
}, {
"fullName": "否",
"id": "0"
}],
advanceProps: {
"label": "fullName",
"value": "id"
},
transportTypeOptions: [{
"fullName": "汽运",
"id": "0"
}, {
"fullName": "船运",
"id": "1"
}, {
"fullName": "火车",
"id": "2"
}],
transportTypeProps: {
"label": "fullName",
"value": "id"
},
}
},
computed: {
menuId() {
return this.$route.meta.modelId || ''
}
},
created() {
this.initData()
},
methods: {
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()
},
initData() {
this.listLoading = true;
let _query = {
...this.listQuery,
...this.query,
menuId: this.menuId
};
request({
url: `/api/tradeupload/Tradeupload/getList`,
method: 'post',
data: _query
}).then(res => {
var _list = [];
for (let i = 0; i < res.data.list.length; i++) {
let _data = res.data.list[i];
_list.push(_data)
}
this.list = _list
this.total = res.data.pagination.total
export default {
components: {JNPFForm, ExportBox,Detail},
data() {
return {
detailVisible: false,
query: {
poundDate:undefined,
poundlistNo:undefined,
},
treeProps: {
children: 'children',
label: 'fullName',
value: 'id'
},
list: [],
listLoading: true,
multipleSelection: [], total: 0,
listQuery: {
currentPage: 1,
pageSize: 20,
sort: "desc",
sidx: "",
},
formVisible: false,
exportBoxVisible: false,
columnList: [
{prop: 'creatorTime', label: '磅单日期'},
{prop: 'vehicleId', label: '车牌号'},
{prop: 'materialId', label: '物料名称'},
{prop: 'grossWeight', label: '毛重'},
{prop: 'tareWeight', label: '皮重'},
{prop: 'buckleWeight', label: '扣重'},
{prop: 'netWeight', label: '净重'},
{prop: 'customerId', label: '客户名称'},
{prop: 'salesId', label: '销售合同'},
{prop: 'advance', label: '是否垫资'},
{prop: 'transportType', label: '运输类型'},
{prop: 'transportPrice', label: '运费'},
{prop: 'salesPrice', label: '销售价格'},
{prop: 'creatorUserName', label: '业务员'},
{prop: 'remark', label: '备注'},
],
unitOptions:[{"fullName":"吨","id":"0"},{"fullName":"千克","id":"1"}],
unitProps:{"label":"fullName","value":"id"},
transportTypeOptions:[{"fullName":"汽运","id":"0"},{"fullName":"船运","id":"1"},{"fullName":"火车","id":"2"}],
transportTypeProps:{"label":"fullName","value":"id"},
advanceOptions:[{"fullName":"否","id":"0"},{"fullName":"是","id":"1"}],
advanceProps:{"label":"fullName","value":"id"},
}
},
computed: {
menuId() {
return this.$route.meta.modelId || ''
}
},
created() {
this.initData()
},
methods: {
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()
},
initData() {
this.listLoading = true;
let _query = {
...this.listQuery,
...this.query,
menuId:this.menuId
};
request({
url: `/api/tradeupload/Tradeupload/getList`,
method: 'post',
data: _query
}).then(res => {
var _list =[];
for(let i=0;i<res.data.list.length;i++){
let _data = res.data.list[i];
_list.push(_data)
}
this.list = _list
this.total = res.data.pagination.total
this.listLoading = false
})
},
handleDel(id) {
this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
type: 'warning'
}).then(() => {
request({
url: `/api/tradeupload/Tradeupload/${id}`,
method: 'DELETE'
}).then(res => {
this.$message({
type: 'success',
message: res.msg,
onClose: () => {
this.initData()
}
});
})
}).catch(() => {});
},
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.join()
this.$confirm('您确定要删除这些数据吗, 是否继续?', '提示', {
type: 'warning'
}).then(() => {
request({
url: `/api/tradeupload/Tradeupload/batchRemove/${ids}`,
method: 'DELETE'
}).then(res => {
this.$message({
type: 'success',
message: res.msg,
onClose: () => {
this.initData()
}
});
})
}).catch(() => {})
},
addOrUpdateHandle(id, isDetail) {
this.formVisible = true
this.$nextTick(() => {
this.$refs.JNPFForm.init(id, isDetail)
})
},
exportData() {
this.exportBoxVisible = true
this.$nextTick(() => {
this.$refs.ExportBox.init(this.columnList)
})
},
download(data) {
let query = {
...data,
...this.listQuery,
...this.query,
menuId: this.menuId
}
request({
url: `/api/tradeupload/Tradeupload/Actions/Export`,
method: 'GET',
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,
pageSize: 20,
sort: "desc",
sidx: "",
}
this.initData()
},
refresh(isrRefresh) {
this.formVisible = false
if (isrRefresh) this.reset()
},
reset() {
for (let key in this.query) {
this.query[key] = undefined
}
this.search()
}
}
}
this.listLoading = false
})
},
handleDel(id) {
this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
type: 'warning'
}).then(() => {
request({
url: `/api/tradeupload/Tradeupload/${id}`,
method: 'DELETE'
}).then(res => {
this.$message({
type: 'success',
message: res.msg,
onClose: () => {
this.initData()
}
});
})
}).catch(() => {
});
},
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.join()
this.$confirm('您确定要删除这些数据吗, 是否继续?', '提示', {
type: 'warning'
}).then(() => {
request({
url: `/api/tradeupload/Tradeupload/batchRemove/${ids}`,
method: 'DELETE'
}).then(res => {
this.$message({
type: 'success',
message: res.msg,
onClose: () => {
this.initData()
}
});
})
}).catch(() => {
})
},
addOrUpdateHandle(id, isDetail) {
this.formVisible = true
this.$nextTick(() => {
this.$refs.JNPFForm.init(id, isDetail)
})
},
exportData() {
this.exportBoxVisible = true
this.$nextTick(() => {
this.$refs.ExportBox.init(this.columnList)
})
},
download(data) {
let query = {...data, ...this.listQuery, ...this.query,menuId:this.menuId}
request({
url: `/api/tradeupload/Tradeupload/Actions/Export`,
method: 'GET',
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,
pageSize: 20,
sort: "desc",
sidx: "",
}
this.initData()
},
refresh(isrRefresh) {
this.formVisible = false
if (isrRefresh) this.reset()
},
reset() {
for (let key in this.query) {
this.query[key] = undefined
}
this.search()
}
}
}
</script>

Loading…
Cancel
Save