Browse Source

[fix]销售模块:客户报价审核流程,报价流程模型图未能显示,销售订单审核流程

dev
zhangsiqi 6 months ago
parent
commit
bbbcfe6317
  1. 2
      ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysCustomerQuoteController.java
  2. 6
      ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSalesOrderController.java
  3. 53
      ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysCustomerQuote.java
  4. 197
      ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSalesOrder.java
  5. 176
      ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSalesOrderChild.java
  6. 1
      ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysSalesOrderService.java
  7. 4
      ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerQuoteServiceImpl.java
  8. 47
      ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesOrderServiceImpl.java
  9. 8
      ruoyi-admin/src/main/resources/mapper/system/SysCustomerMapper.xml
  10. 8
      ruoyi-admin/src/main/resources/mapper/system/SysCustomerQuoteMapper.xml
  11. 217
      ruoyi-admin/src/main/resources/mapper/system/SysSalesOrderMapper.xml
  12. 18
      ruoyi-admin/src/main/resources/templates/erp/material/add.html
  13. 9
      ruoyi-admin/src/main/resources/templates/system/contacts/contacts.html
  14. 3
      ruoyi-admin/src/main/resources/templates/system/customer/customer.html
  15. 1
      ruoyi-admin/src/main/resources/templates/system/customer/taskModifyApply.html
  16. 1
      ruoyi-admin/src/main/resources/templates/system/customer/taskYwjlVerify.html
  17. 1
      ruoyi-admin/src/main/resources/templates/system/customer/taskYwzgVerify.html
  18. 1
      ruoyi-admin/src/main/resources/templates/system/customer/taskZozjVerify.html
  19. 20
      ruoyi-admin/src/main/resources/templates/system/customerQuote/add.html
  20. 2
      ruoyi-admin/src/main/resources/templates/system/customerQuote/customerQuote.html
  21. 55
      ruoyi-admin/src/main/resources/templates/system/customerQuote/edit.html
  22. 1106
      ruoyi-admin/src/main/resources/templates/system/salesOrder/add.html
  23. 460
      ruoyi-admin/src/main/resources/templates/system/salesOrder/edit.html
  24. 52
      ruoyi-admin/src/main/resources/templates/system/salesOrder/salesOrder.html
  25. 2
      ruoyi-admin/src/main/resources/templates/system/shippingaddress/add.html

2
ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysCustomerQuoteController.java

@ -307,7 +307,7 @@ public class SysCustomerQuoteController extends BaseController
@RequestMapping("/getCustomerQuoteSelList")
@ResponseBody
public AjaxResult ggetCustomerQuoteSelList(@RequestParam(required = false,value = "keyword")String keyword){
public AjaxResult getCustomerQuoteSelList(@RequestParam(required = false,value = "keyword")String keyword){
SysCustomerQuoteVo sysCustomerQuoteVo = new SysCustomerQuoteVo();
sysCustomerQuoteVo.setKeyword(keyword);
return success(sysCustomerQuoteService.selectSysCustomerQuoteList(sysCustomerQuoteVo));

6
ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSalesOrderController.java

@ -150,10 +150,10 @@ public class SysSalesOrderController extends BaseController
/**
* 修改销售订单
*/
@GetMapping("/edit/{salesOrderId}")
public String edit(@PathVariable("salesOrderId") Long salesOrderId, ModelMap mmap)
@GetMapping("/edit/{id}")
public String edit(@PathVariable("id") Long id, ModelMap mmap)
{
SysSalesOrder sysSalesOrder = sysSalesOrderService.selectSysSalesOrderById(salesOrderId);
SysSalesOrder sysSalesOrder = sysSalesOrderService.selectSysSalesOrderById(id);
mmap.put("sysSalesOrder", sysSalesOrder);
return prefix + "/edit";
}

53
ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysCustomerQuote.java

@ -62,14 +62,14 @@ public class SysCustomerQuote extends BaseEntity
/** 不含税总价(RMB) */
@Excel(name = "不含税总价(RMB)")
private Decimal noRmbSum;
private Double noRmbSum;
@Excel(name = "不含税单价(RMB)")
private Decimal noRmb;
private Double noRmb;
@Excel(name = "含税单价(RMB)")
private Decimal rmb;
private Double rmb;
/** 含税总价(RMB) */
@Excel(name = "含税总价(RMB)")
private Decimal rmbSum;
private Double rmbSum;
/** 不含税单价(美元) */
@Excel(name = "不含税单价(美元)")
@ -79,10 +79,10 @@ public class SysCustomerQuote extends BaseEntity
private Double noUsdSum;
/** 含税总价(美元) */
@Excel(name = "含税单价(美元)")
private Decimal usd;
private Double usd;
/** 含税总价(美元) */
@Excel(name = "含税总价(美元)")
private Decimal usdSum;
private Double usdSum;
private String businessMembers;
@Excel(name = "审核标志: 0未审核 1审核成功 2审核拒绝")
@ -224,35 +224,35 @@ public class SysCustomerQuote extends BaseEntity
return enterpriseSum;
}
public Decimal getNoRmbSum() {
public Double getNoRmbSum() {
return noRmbSum;
}
public void setNoRmbSum(Decimal noRmbSum) {
public void setNoRmbSum(Double noRmbSum) {
this.noRmbSum = noRmbSum;
}
public Decimal getNoRmb() {
public Double getNoRmb() {
return noRmb;
}
public void setNoRmb(Decimal noRmb) {
public void setNoRmb(Double noRmb) {
this.noRmb = noRmb;
}
public Decimal getRmb() {
public Double getRmb() {
return rmb;
}
public void setRmb(Decimal rmb) {
public void setRmb(Double rmb) {
this.rmb = rmb;
}
public Decimal getRmbSum() {
public Double getRmbSum() {
return rmbSum;
}
public void setRmbSum(Decimal rmbSum) {
public void setRmbSum(Double rmbSum) {
this.rmbSum = rmbSum;
}
@ -272,31 +272,38 @@ public class SysCustomerQuote extends BaseEntity
this.noUsdSum = noUsdSum;
}
public Decimal getUsd() {
public Double getUsd() {
return usd;
}
public void setUsd(Decimal usd) {
public void setUsd(Double usd) {
this.usd = usd;
}
public Decimal getUsdSum() {
public Double getUsdSum() {
return usdSum;
}
public void setUsdSum(Decimal usdSum) {
public void setUsdSum(Double usdSum) {
this.usdSum = usdSum;
}
public void setDelFlag(String delFlag)
{
this.delFlag = delFlag;
public String getDeginFlag() {
return deginFlag;
}
public String getDelFlag()
{
public void setDeginFlag(String deginFlag) {
this.deginFlag = deginFlag;
}
public String getDelFlag() {
return delFlag;
}
public void setDelFlag(String delFlag) {
this.delFlag = delFlag;
}
public List<SysCustomerQuoteChild> getSysCustomerQuoteChildList() {
return sysCustomerQuoteChildList;
}

197
ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSalesOrder.java

@ -41,16 +41,25 @@ public class SysSalesOrder extends BaseEntity {
/* 客户代码*/
@Excel(name = "客户代码")
private String enterpriseCode;
@Excel(name="币种")
private String commonCurrency;
/*美元汇率*/
private Double usdTax;
/*税率*/
private String taxRate;
/*是否开票*/
private String invoice;
/* 客户名称*/
@Excel(name = "客户名称")
private String enterpriseName;
/*事业部*/
private String customerPurser;
/*客户电话*/
private String customerPhone;
/*物料合计*/
private String materialSum;
private Double materialSum;
/*数量合计*/
private String enterpriseSum;
private Double enterpriseSum;
/*不含税单价(RMB)*/
private Double noRmbPrice;
/*不含税总价(RMB)*/
@ -69,6 +78,10 @@ public class SysSalesOrder extends BaseEntity {
private String usdTaxSum;
/*计划交付时间*/
private String deliveryTime;
/*客户收货人*/
private String customerDelivery;
/*客户收货人电话*/
private String deliveryPhone;
/* 交货条件*/
@Excel(name = "交货条件")
private String deliveryConditions;
@ -96,6 +109,10 @@ public class SysSalesOrder extends BaseEntity {
/* 传真号码*/
@Excel(name = "传真号码")
private String customerFax;
@Excel(name = "邮箱")
private String contactEmail;
@Excel(name="联系人职务")
private String contactPost;
/*业务人员*/
@Excel(name = "业务人员")
private String businessMembers;
@ -106,9 +123,6 @@ public class SysSalesOrder extends BaseEntity {
/* 修改日期*/
@Excel(name = "客户验收时间")
private String modificationTime;
/* 税率*/
@Excel(name = "税率")
private String taxRate;
/* 合计金额*/
@Excel(name = "合计金额")
private String totalAmount;
@ -227,6 +241,38 @@ public class SysSalesOrder extends BaseEntity {
this.enterpriseCode = enterpriseCode;
}
public String getCommonCurrency() {
return commonCurrency;
}
public void setCommonCurrency(String commonCurrency) {
this.commonCurrency = commonCurrency;
}
public Double getUsdTax() {
return usdTax;
}
public void setUsdTax(Double usdTax) {
this.usdTax = usdTax;
}
public String getTaxRate() {
return taxRate;
}
public void setTaxRate(String taxRate) {
this.taxRate = taxRate;
}
public String getInvoice() {
return invoice;
}
public void setInvoice(String invoice) {
this.invoice = invoice;
}
public String getEnterpriseName() {
return enterpriseName;
}
@ -235,6 +281,14 @@ public class SysSalesOrder extends BaseEntity {
this.enterpriseName = enterpriseName;
}
public String getCustomerPurser() {
return customerPurser;
}
public void setCustomerPurser(String customerPurser) {
this.customerPurser = customerPurser;
}
public String getCustomerPhone() {
return customerPhone;
}
@ -243,20 +297,19 @@ public class SysSalesOrder extends BaseEntity {
this.customerPhone = customerPhone;
}
public String getMaterialSum() {
public Double getMaterialSum() {
return materialSum;
}
public void setMaterialSum(String materialSum) {
public void setMaterialSum(Double materialSum) {
this.materialSum = materialSum;
}
public String getEnterpriseSum() {
public Double getEnterpriseSum() {
return enterpriseSum;
}
public void setEnterpriseSum(String enterpriseSum) {
public void setEnterpriseSum(Double enterpriseSum) {
this.enterpriseSum = enterpriseSum;
}
@ -332,6 +385,22 @@ public class SysSalesOrder extends BaseEntity {
this.deliveryTime = deliveryTime;
}
public String getCustomerDelivery() {
return customerDelivery;
}
public void setCustomerDelivery(String customerDelivery) {
this.customerDelivery = customerDelivery;
}
public String getDeliveryPhone() {
return deliveryPhone;
}
public void setDeliveryPhone(String deliveryPhone) {
this.deliveryPhone = deliveryPhone;
}
public String getDeliveryConditions() {
return deliveryConditions;
}
@ -404,6 +473,22 @@ public class SysSalesOrder extends BaseEntity {
this.customerFax = customerFax;
}
public String getContactEmail() {
return contactEmail;
}
public void setContactEmail(String contactEmail) {
this.contactEmail = contactEmail;
}
public String getContactPost() {
return contactPost;
}
public void setContactPost(String contactPost) {
this.contactPost = contactPost;
}
public String getBusinessMembers() {
return businessMembers;
}
@ -420,12 +505,12 @@ public class SysSalesOrder extends BaseEntity {
this.confirmTax = confirmTax;
}
public String getTaxRate() {
return taxRate;
public String getModificationTime() {
return modificationTime;
}
public void setTaxRate(String taxRate) {
this.taxRate = taxRate;
public void setModificationTime(String modificationTime) {
this.modificationTime = modificationTime;
}
public String getTotalAmount() {
@ -476,14 +561,6 @@ public class SysSalesOrder extends BaseEntity {
this.updateInfoTime = updateInfoTime;
}
public String getModificationTime() {
return modificationTime;
}
public void setModificationTime(String modificationTime) {
this.modificationTime = modificationTime;
}
public String getTradeClause() {
return tradeClause;
}
@ -492,11 +569,11 @@ public class SysSalesOrder extends BaseEntity {
this.tradeClause = tradeClause;
}
public Integer getOutboundQuantity() {
public Integer getOutBoundQuantity() {
return outBoundQuantity;
}
public void setOutboundQuantity(Integer outBoundQuantity) {
public void setOutBoundQuantity(Integer outBoundQuantity) {
this.outBoundQuantity = outBoundQuantity;
}
@ -508,13 +585,12 @@ public class SysSalesOrder extends BaseEntity {
this.unBoundQuantity = unBoundQuantity;
}
public Integer getOutBoundQuantity() {
return outBoundQuantity;
public String getApplyUser() {
return applyUser;
}
public void setOutBoundQuantity(Integer outBoundQuantity) {
this.outBoundQuantity = outBoundQuantity;
public void setApplyUser(String applyUser) {
this.applyUser = applyUser;
}
public Date getApplyTime() {
@ -541,6 +617,22 @@ public class SysSalesOrder extends BaseEntity {
this.applyTitle = applyTitle;
}
public String getInstanceId() {
return instanceId;
}
public void setInstanceId(String instanceId) {
this.instanceId = instanceId;
}
public String getInstanceType() {
return instanceType;
}
public void setInstanceType(String instanceType) {
this.instanceType = instanceType;
}
public String getCancelInstanceId() {
return cancelInstanceId;
}
@ -578,7 +670,12 @@ public class SysSalesOrder extends BaseEntity {
.add("salesOrderNumber", salesOrderNumber)
.add("salesOrderType", salesOrderType)
.add("enterpriseCode", enterpriseCode)
.add("commonCurrency", commonCurrency)
.add("usdTax", usdTax)
.add("taxRate", taxRate)
.add("invoice", invoice)
.add("enterpriseName", enterpriseName)
.add("customerPurser", customerPurser)
.add("customerPhone", customerPhone)
.add("materialSum", materialSum)
.add("enterpriseSum", enterpriseSum)
@ -591,6 +688,8 @@ public class SysSalesOrder extends BaseEntity {
.add("usdPrice", usdPrice)
.add("usdTaxSum", usdTaxSum)
.add("deliveryTime", deliveryTime)
.add("customerDelivery", customerDelivery)
.add("deliveryPhone", deliveryPhone)
.add("deliveryConditions", deliveryConditions)
.add("deliveryMethod", deliveryMethod)
.add("deliveryAddress", deliveryAddress)
@ -600,10 +699,11 @@ public class SysSalesOrder extends BaseEntity {
.add("customerContact", customerContact)
.add("contactNumber", contactNumber)
.add("customerFax", customerFax)
.add("contactEmail", contactEmail)
.add("contactPost", contactPost)
.add("businessMembers", businessMembers)
.add("confirmTax", confirmTax)
.add("modificationTime", modificationTime)
.add("taxRate", taxRate)
.add("totalAmount", totalAmount)
.add("fileUpload", fileUpload)
.add("standbyOne", standbyOne)
@ -611,32 +711,17 @@ public class SysSalesOrder extends BaseEntity {
.add("firstAddTime", firstAddTime)
.add("updateInfoTime", updateInfoTime)
.add("tradeClause", tradeClause)
.add("outboundQuantity", outBoundQuantity)
.add("outBoundQuantity", outBoundQuantity)
.add("unBoundQuantity", unBoundQuantity)
.add("applyUser", applyUser)
.add("applyTime", applyTime)
.add("submitInstanceId", submitInstanceId)
.add("applyTitle", applyTitle)
.add("instanceId", instanceId)
.add("instanceType", instanceType)
.add("cancelInstanceId", cancelInstanceId)
.add("restoreInstanceId", restoreInstanceId)
.add("sysSalesOrderChildList", sysSalesOrderChildList)
.toString();
}
public String getInstanceId() {
return instanceId;
}
public void setInstanceId(String instanceId) {
this.instanceId = instanceId;
}
public String getInstanceType() {
return instanceType;
}
public void setInstanceType(String instanceType) {
this.instanceType = instanceType;
}
public String getApplyUser() {
return applyUser;
}
public void setApplyUser(String applyUser) {
this.applyUser = applyUser;
}
}

176
ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSalesOrderChild.java

@ -56,6 +56,9 @@ public class SysSalesOrderChild extends BaseEntity {
@Excel(name = "物料的品牌")
private String brand;
@Excel(name="单位")
private String unit;
/** 物料的图片 */
@Excel(name = "物料的图片")
private String photoUrl;
@ -66,31 +69,50 @@ public class SysSalesOrderChild extends BaseEntity {
/** 国内税率 */
@Excel(name = "国内税率")
private BigDecimal countTax;
private Double countTax;
/** 美元汇率 */
@Excel(name = "美元汇率")
private BigDecimal usdTax;
private Double usdTax;
/*物料合计*/
private String materialSum;
private Double materialSum;
/*数量合计*/
private String enterpriseSum;
/*不含税单价(RMB)*/
private Double noRmbPrice;
/*不含税总价(RMB)*/
private Double noRmbSum;
/*含税单价(RMB)*/
private Double rmbPrice;
/*含税总价(RMB)*/
private Double rmbTaxSum;
/*不含税单价(美元)*/
private Double noUsdPrice;
/*不含税总价(美元)*/
private Double noUsdSum;
/*含税单价(美元)*/
private Double usdPrice;
/*含税总价(美元)*/
private String usdTaxSum;
private Double enterpriseSum;
@Excel(name = "物料的对外售价")
private BigDecimal materialSole;
/** 物料的不含税单价(RMB) */
@Excel(name = "物料的不含税单价(RMB) ")
private BigDecimal materialRmb;
/** 物料的含税单价(RMB) */
@Excel(name = "物料的含税单价(RMB)")
private BigDecimal materialNoRmb;
/** 物料的不含税单价(USD) */
@Excel(name = "物料的不含税单价(USD)")
private BigDecimal materialNoUsd;
/** 物料的含税单价(USD) */
@Excel(name = "物料的含税单价(USD)")
private BigDecimal materialUsd;
/** 物料的含税总价(USD) */
@Excel(name = "物料的含税总价(USD)")
private BigDecimal materialUsdSum;
/** 物料的不含税总价(USD) */
@Excel(name = "物料的不含税总价(USD)")
private BigDecimal materialNoUsdSum;
/** 物料的含税总价(RMB) */
@Excel(name = "物料的含税总价(RMB)")
private BigDecimal materialNoRmbSum;
/** 物料的不含税总价(RMB) */
@Excel(name = "物料的不含税总价(RMB)")
private BigDecimal materialRmbSum;
/*业务人员*/
@Excel(name = "业务人员")
private String businessMembers;
@ -203,6 +225,14 @@ public class SysSalesOrderChild extends BaseEntity {
this.brand = brand;
}
public String getUnit() {
return unit;
}
public void setUnit(String unit) {
this.unit = unit;
}
public String getPhotoUrl() {
return photoUrl;
}
@ -219,100 +249,108 @@ public class SysSalesOrderChild extends BaseEntity {
this.describe = describe;
}
public BigDecimal getCountTax() {
public Double getCountTax() {
return countTax;
}
public void setCountTax(BigDecimal countTax) {
public void setCountTax(Double countTax) {
this.countTax = countTax;
}
public BigDecimal getUsdTax() {
public Double getUsdTax() {
return usdTax;
}
public void setUsdTax(BigDecimal usdTax) {
public void setUsdTax(Double usdTax) {
this.usdTax = usdTax;
}
public String getMaterialSum() {
public Double getMaterialSum() {
return materialSum;
}
public void setMaterialSum(String materialSum) {
public void setMaterialSum(Double materialSum) {
this.materialSum = materialSum;
}
public String getEnterpriseSum() {
public Double getEnterpriseSum() {
return enterpriseSum;
}
public void setEnterpriseSum(String enterpriseSum) {
public void setEnterpriseSum(Double enterpriseSum) {
this.enterpriseSum = enterpriseSum;
}
public Double getNoRmbPrice() {
return noRmbPrice;
public BigDecimal getMaterialSole() {
return materialSole;
}
public void setMaterialSole(BigDecimal materialSole) {
this.materialSole = materialSole;
}
public BigDecimal getMaterialRmb() {
return materialRmb;
}
public void setNoRmbPrice(Double noRmbPrice) {
this.noRmbPrice = noRmbPrice;
public void setMaterialRmb(BigDecimal materialRmb) {
this.materialRmb = materialRmb;
}
public Double getNoRmbSum() {
return noRmbSum;
public BigDecimal getMaterialNoRmb() {
return materialNoRmb;
}
public void setNoRmbSum(Double noRmbSum) {
this.noRmbSum = noRmbSum;
public void setMaterialNoRmb(BigDecimal materialNoRmb) {
this.materialNoRmb = materialNoRmb;
}
public Double getRmbPrice() {
return rmbPrice;
public BigDecimal getMaterialNoUsd() {
return materialNoUsd;
}
public void setRmbPrice(Double rmbPrice) {
this.rmbPrice = rmbPrice;
public void setMaterialNoUsd(BigDecimal materialNoUsd) {
this.materialNoUsd = materialNoUsd;
}
public Double getRmbTaxSum() {
return rmbTaxSum;
public BigDecimal getMaterialUsd() {
return materialUsd;
}
public void setRmbTaxSum(Double rmbTaxSum) {
this.rmbTaxSum = rmbTaxSum;
public void setMaterialUsd(BigDecimal materialUsd) {
this.materialUsd = materialUsd;
}
public Double getNoUsdPrice() {
return noUsdPrice;
public BigDecimal getMaterialUsdSum() {
return materialUsdSum;
}
public void setNoUsdPrice(Double noUsdPrice) {
this.noUsdPrice = noUsdPrice;
public void setMaterialUsdSum(BigDecimal materialUsdSum) {
this.materialUsdSum = materialUsdSum;
}
public Double getNoUsdSum() {
return noUsdSum;
public BigDecimal getMaterialNoUsdSum() {
return materialNoUsdSum;
}
public void setNoUsdSum(Double noUsdSum) {
this.noUsdSum = noUsdSum;
public void setMaterialNoUsdSum(BigDecimal materialNoUsdSum) {
this.materialNoUsdSum = materialNoUsdSum;
}
public Double getUsdPrice() {
return usdPrice;
public BigDecimal getMaterialNoRmbSum() {
return materialNoRmbSum;
}
public void setUsdPrice(Double usdPrice) {
this.usdPrice = usdPrice;
public void setMaterialNoRmbSum(BigDecimal materialNoRmbSum) {
this.materialNoRmbSum = materialNoRmbSum;
}
public String getUsdTaxSum() {
return usdTaxSum;
public BigDecimal getMaterialRmbSum() {
return materialRmbSum;
}
public void setUsdTaxSum(String usdTaxSum) {
this.usdTaxSum = usdTaxSum;
public void setMaterialRmbSum(BigDecimal materialRmbSum) {
this.materialRmbSum = materialRmbSum;
}
public String getBusinessMembers() {
@ -370,20 +408,22 @@ public class SysSalesOrderChild extends BaseEntity {
.add("materialType", materialType)
.add("processMethod", processMethod)
.add("brand", brand)
.add("unit", unit)
.add("photoUrl", photoUrl)
.add("describe", describe)
.add("countTax", countTax)
.add("usdTax", usdTax)
.add("materialSum", materialSum)
.add("enterpriseSum", enterpriseSum)
.add("noRmbPrice", noRmbPrice)
.add("noRmbSum", noRmbSum)
.add("rmbPrice", rmbPrice)
.add("rmbTaxSum", rmbTaxSum)
.add("noUsdPrice", noUsdPrice)
.add("noUsdSum", noUsdSum)
.add("usdPrice", usdPrice)
.add("usdTaxSum", usdTaxSum)
.add("materialSole", materialSole)
.add("materialRmb", materialRmb)
.add("materialNoRmb", materialNoRmb)
.add("materialNoUsd", materialNoUsd)
.add("materialUsd", materialUsd)
.add("materialUsdSum", materialUsdSum)
.add("materialNoUsdSum", materialNoUsdSum)
.add("materialNoRmbSum", materialNoRmbSum)
.add("materialRmbSum", materialRmbSum)
.add("businessMembers", businessMembers)
.add("confirmTax", confirmTax)
.add("taxRate", taxRate)

1
ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysSalesOrderService.java

@ -70,7 +70,6 @@ public interface ISysSalesOrderService
@Transactional(rollbackFor = Exception.class)
ProcessInstance cancelSysCustomerById(Long id);
@Transactional(rollbackFor = Exception.class)
ProcessInstance restoreSysCustomerById(Long id);
@Transactional(rollbackFor = Exception.class)
ProcessInstance submitApply(SysSalesOrder sysSalesOrder);

4
ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerQuoteServiceImpl.java

@ -89,7 +89,7 @@ public class SysCustomerQuoteServiceImpl implements ISysCustomerQuoteService {
if (sysUser2!=null){
customerQuoteVo.setApplyUserName(sysUser2.getUserName());
}
String instanceId = sysCustomerQuoteVo.getInstanceId();
String instanceId = customerQuoteVo.getInstanceId();
// 当前环节
if (StringUtils.isNotBlank(instanceId)) {
List<Task> taskList = taskService.createTaskQuery()
@ -99,7 +99,7 @@ public class SysCustomerQuoteServiceImpl implements ISysCustomerQuoteService {
if (!CollectionUtils.isEmpty(taskList)) {
TaskEntityImpl task = (TaskEntityImpl) taskList.get(0);
String taskId = task.getId();
sysCustomerQuoteVo.setTaskId(taskId);
customerQuoteVo.setTaskId(taskId);
// 设置待办用户
List<String> todoUserList = todoItemMapper.selectUndealTodoUserList(taskId);
if(!CollectionUtils.isEmpty(taskList)){

47
ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesOrderServiceImpl.java

@ -15,10 +15,7 @@ import com.ruoyi.process.todoitem.mapper.BizTodoItemMapper;
import com.ruoyi.system.domain.*;
import com.ruoyi.system.mapper.SysSalesOrderMapper;
import com.ruoyi.system.mapper.SysUserMapper;
import com.ruoyi.system.service.ISysAttachFileService;
import com.ruoyi.system.service.ISysAttachService;
import com.ruoyi.system.service.ISysRoleService;
import com.ruoyi.system.service.ISysSalesOrderService;
import com.ruoyi.system.service.*;
import org.activiti.engine.TaskService;
import org.activiti.engine.impl.persistence.entity.TaskEntityImpl;
import org.activiti.engine.runtime.ProcessInstance;
@ -70,6 +67,9 @@ public class SysSalesOrderServiceImpl implements ISysSalesOrderService
@Autowired
private ISysRoleService roleService;
@Autowired
private ISysSalesOrderChildService sysSalesOrderChildService;
/**
* 查询销售订单
*
@ -164,6 +164,16 @@ public class SysSalesOrderServiceImpl implements ISysSalesOrderService
public int insertSysSalesOrder(SysSalesOrder sysSalesOrder){
String loginName = ShiroUtils.getLoginName();
sysSalesOrder.setCreateBy(loginName);
int s = sysSalesOrder.getSysSalesOrderChildList().size();
if (s == 0){
return 0;
}
for (int i = 0; i < s ;i++) {
SysSalesOrderChild sysSalesOrderChild = sysSalesOrder.getSysSalesOrderChildList().get(i);
sysSalesOrderChild.setQuoteId(sysSalesOrder.getSalesOrderCode());
sysSalesOrderChild.setCreateBy(loginName);
sysSalesOrderChildService.insertSysSalesOrderChild(sysSalesOrderChild);
}
return sysSalesOrderMapper.insertSysSalesOrder(sysSalesOrder);
}
@ -177,9 +187,32 @@ public class SysSalesOrderServiceImpl implements ISysSalesOrderService
@Override
public int updateSysSalesOrder(SysSalesOrder sysSalesOrder)
{
String loginName = ShiroUtils.getLoginName();
sysSalesOrder.setUpdateBy(loginName);
sysSalesOrder.setUpdateTime(DateUtils.getNowDate());
sysSalesOrder.setAuditStatus("0");
SysUser user = ShiroUtils.getSysUser();
// 启动流程
String applyTitle = user.getUserName()+"发起了修改销售订单审批-"+ DateUtils.dateTimeNow();
String instanceType = "cancel";
ProcessInstance processInstance = startProcessInstance(applyTitle,instanceType,sysSalesOrder, user);
String processInstanceId = processInstance.getProcessInstanceId();
// 作废实例id
sysSalesOrder.setCancelInstanceId(processInstanceId);
// 存在提交完就流程结束的情况
boolean processIsFinish = processService.judgeProcessIsFinish(processInstanceId);
if(processIsFinish){
// 审核状态-审核通过
sysSalesOrder.setAuditStatus("1");
// 使用状态-已作废
sysSalesOrder.setUseStatus("2");
};
List<SysSalesOrderChild> sysSalesOrderChildList = sysSalesOrder.getSysSalesOrderChildList();
for (SysSalesOrderChild sysSalesOrderChild:sysSalesOrderChildList) {
if (sysSalesOrderChild.getId() != null && sysSalesOrderChild.getId() != 0){
sysSalesOrderChildService.updateSysSalesOrderChild(sysSalesOrderChild);
}else{
sysSalesOrderChild.setQuoteId(sysSalesOrder.getSalesOrderCode());
sysSalesOrderChildService.insertSysSalesOrderChild(sysSalesOrderChild);
}
}
return sysSalesOrderMapper.updateSysSalesOrder(sysSalesOrder);
}

8
ruoyi-admin/src/main/resources/mapper/system/SysCustomerMapper.xml

@ -135,11 +135,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
established_time,s.invoicing_customer_name,s.invoicing_company_name,s.invoice_code,s.deposit_bank,s.bank_account,s.
common_currency,s.confirm_tax,s.tax_rate,s.integrity_rating,s.registered_capital,s.payment_terms,s.customs_code,s.
customer_contact_id,s.customer_contact,s.customer_office,s.contact_number,s.customer_email,s.customer_fax,s.
delivery_address_id,s.delivery_customer_person,s.delivery_customer_phone,s.
delivery_address,s.delivery_customer_postal,s.delivery_customer_fax,s.business_members,
s.identifying_people,s.first_add_time,s.update_info_time,s.audit_status,s.use_status,s.update_by,
s.instance_id, s.nstance_type,
p.dict_value as instance_type_name,
delivery_address_id,s.delivery_customer_person,s.delivery_customer_phone,s.delivery_address,
s.delivery_customer_postal,s.delivery_customer_fax,s.business_members,s.identifying_people,s.first_add_time,
s.update_info_time,s.audit_status,s.use_status,s.update_by,s.instance_id, s.instance_type,p.dict_value as instance_type_name,
s.submit_instance_id, s.cancel_instance_id, s.restore_instance_id, s.apply_title, s.apply_user, s.apply_time
from sys_customer as s
left join(

8
ruoyi-admin/src/main/resources/mapper/system/SysCustomerQuoteMapper.xml

@ -110,7 +110,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="pricingDate != null and pricingDate != ''" >pricingDate,</if>
<if test="enterprise != null and enterprise != ''" >enterprise,</if>
<if test="enterpriseSum != null">enterpriseSum,</if>
<if test="commonCurrency =null and commonCurrency != ''" >common_currency,</if>
<if test="commonCurrency !=null and commonCurrency != ''" >common_currency,</if>
<if test="confirmFax != null and confirmFax != ''" >confirm_fax,</if>
<if test="rmbTax != null" >rmbTax,</if>
<if test="usdTax != null">usdTax,</if>
@ -146,11 +146,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="pricingDate != null and pricingDate != ''" >#{pricingDate},</if>
<if test="enterprise != null and enterprise != ''" >#{enterprise},</if>
<if test="enterpriseSum != null">#{enterpriseSum},</if>
<if test="commonCurrency =null and commonCurrency != ''" >#{commonCurrency},</if>
<if test="commonCurrency !=null and commonCurrency != ''" >#{commonCurrency},</if>
<if test="confirmFax != null and confirmFax != ''" >#{confirmFax},</if>
<if test="rmbTax != null" >#{rmbTax},</if>
<if test="usdTax != null ">#{usdTax},</if>
<if test="noRmb != null " >#{noRmb},</if>
<if test="noRmb != null" >#{noRmb},</if>
<if test="noRmbSum != null" >#{noRmbSum},</if>
<if test="rmb != null" >#{rmb},</if>
<if test="rmbSum != null " >#{rmbSum},</if>
@ -186,7 +186,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="pricingDate != null and pricingDate != ''" >pricingDate = #{pricingDate},</if>
<if test="enterprise != null and enterprise != ''" >enterprise = #{enterprise},</if>
<if test="enterpriseSum != null" >enterpriseSum = #{enterpriseSum},</if>
<if test="commonCurrency =null and commonCurrency != ''" >common_currency = #{common_currency},</if>
<if test="commonCurrency !=null and commonCurrency != ''" >common_currency = #{commonCurrency},</if>
<if test="confirmFax != null and confirmFax != ''" >confirm_fax = #{confirmFax},</if>
<if test="rmbTax != null" >rmbTax = #{rmbTax},</if>
<if test="usdTax != null ">usdTax = #{usdTax},</if>

217
ruoyi-admin/src/main/resources/mapper/system/SysSalesOrderMapper.xml

@ -16,6 +16,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="salesOrderType" column="sales_order_type" />
<result property="enterpriseCode" column="enterprise_code" />
<result property="enterpriseName" column="enterprise_name" />
<result property="commonCurrency" column="common_currency" />
<result property="customerPurser" column="customer_purser" />
<result property="materialSum" column="material_sum" />
<result property="enterpriseSum" column="enterprise_sum" />
<result property="noRmbPrice" column="noRmbPrice" />
@ -30,14 +32,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="deliveryTime" column="delivery_time" />
<result property="deliveryConditions" column="delivery_conditions" />
<result property="deliveryMethod" column="delivery_method" />
<result property="customerDelivery" column="customer_delivery" />
<result property="deliveryPhone" column="delivery_phone" />
<result property="deliveryAddress" column="delivery_address" />
<result property="orderReceivingMode" column="order_receiving_mode" />
<result property="customerContact" column="customer_contact" />
<result property="contactNumber" column="contact_number" />
<result property="customerFax" column="customer_fax" />
<result property="customerFax" column="customer_fax" />
<result property="contactEmail" column="contact_email" />
<result property="contactPost" column="contact_post" />
<result property="businessMembers" column="business_members" />
<result property="confirmTax" column="confirm_tax" />
<result property="taxRate" column="tax_rate" />
<result property="usdTax" column="usd_tax" />
<result property="invoice" column="invoice" />
<result property="totalAmount" column="total_amount" />
<result property="modificationTime" column="modification_time" />
<result property="standbyOne" column="standby_one" />
@ -65,29 +73,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectSysSalesOrderVo">
select sales_order_id, use_status, audit_status, make_status, delivery_status,
close_status, sales_order_code, sales_order_number, sales_order_type,enterprise_code,
enterprise_name, material_sum, enterprise_sum, noRmbPrice, noRmbSum, rmbPrice, rmbTaxSum,
noUsdPrice, noUsdSum, usdPrice, usdTaxSum, payment_terms, delivery_time,
delivery_conditions, delivery_method, delivery_address, order_receiving_mode,
customer_contact, contact_number, customer_fax, business_members, confirm_tax, tax_rate,
total_amount, billing_time, modification_time,standby_one, standby_two, first_add_time,
update_info_time, file_upload, create_by, create_time, update_by, update_time, remark,
out_bound_quantity, un_bound_quantity, trade_clause, instance_id, instance_type,
submit_instance_id, cancel_instance_id, restore_instance_id, apply_title, apply_user, apply_time
from sys_sales_order
select
sales_order_id, use_status, audit_status, make_status, delivery_status,close_status,
sales_order_code, sales_order_number, sales_order_type,enterprise_code,customer_purser,
common_currency,enterprise_name, material_sum, enterprise_sum, noRmbPrice, noRmbSum, rmbPrice,
rmbTaxSum,noUsdPrice, noUsdSum, usdPrice, usdTaxSum, payment_terms, delivery_time,
delivery_conditions, delivery_method, delivery_address,delivery_phone,customer_delivery,
order_receiving_mode,customer_contact, contact_number,contact_email, contact_post,
customer_fax, business_members, confirm_tax, tax_rate,usd_tax,invoice,total_amount,
modification_time,standby_one,standby_two, first_add_time, update_info_time, file_upload,
create_by, create_time, update_by, update_time,trade_clause, remark, out_bound_quantity,
un_bound_quantity, instance_id, instance_type,submit_instance_id, cancel_instance_id,
restore_instance_id, apply_title,apply_user, apply_time
from sys_sales_order
</sql>
<select id="selectSysSalesOrderList" parameterType="SysSalesOrderVo" resultMap="SysSalesOrderResult">
select s.sales_order_id, s.use_status, s.audit_status, s.make_status, s.delivery_status,
s.close_status, s.sales_order_code, s.sales_order_number, s.sales_order_type,s.enterprise_code,
s.close_status, s.sales_order_code, s.sales_order_number, s.sales_order_type,s.enterprise_code,s.customer_purser,s.common_currency,
s.enterprise_name, s.material_sum, s.enterprise_sum, s.noRmbPrice, s.noRmbSum, s.rmbPrice, s.rmbTaxSum,
s.noUsdPrice, s.noUsdSum, s.usdPrice, s.usdTaxSum, s.payment_terms, s.delivery_time,
s.delivery_conditions, s.delivery_method, s.delivery_address, s.order_receiving_mode,
s.customer_contact, s.contact_number, s.customer_fax, s.business_members, s.confirm_tax, s.tax_rate,
s.total_amount, s.billing_time, s.modification_time,s.standby_one,s.standby_two, s.first_add_time,
s.delivery_conditions, s.delivery_method, s.delivery_address,s.delivery_phone,s.customer_delivery,
s.order_receiving_mode,s.customer_contact, s.contact_number,s.contact_email, s.contact_post, s.customer_fax,
s.business_members, s.confirm_tax, s.tax_rate, s.usd_tax,s.invoice,s.total_amount, s.billing_time,
s.modification_time,s.standby_one,s.standby_two, s.first_add_time,
s.update_info_time, s.file_upload, s.create_by, s.create_time, s.update_by, s.update_time, s.remark,
s.out_bound_quantity, s.un_bound_quantity, s.trade_clause, s.instance_id, s.nstance_type,
s.out_bound_quantity, s.un_bound_quantity, s.trade_clause, s.instance_id, s.instance_type,
s.submit_instance_id, s.cancel_instance_id, s.restore_instance_id, s.apply_title, s.apply_user,
s.apply_time,p.dict_value as instance_type_name
from sys_sales_order as s
@ -109,6 +120,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="makeStatus != null and makeStatus != ''"> and s.make_status = #{makeStatus}</if>
<if test="deliveryStatus != null and deliveryStatus != ''"> and s.delivery_status = #{deliveryStatus}</if>
<if test="closeStatus != null and closeStatus != ''"> and s.close_status = #{closeStatus}</if>
<if test="instanceType != null and instanceType != ''"> and s.instance_type = #{instanceType}</if>
<if test="instanceId != null and instanceId != ''"> and s.instance_id = #{instanceId}</if>
<if test="applyUser != null and applyUser != ''"> and s.apply_user = #{applyUser}</if>
<if test="applyTime != null and applyTime != ''"> and s.apply_time = #{applyTime}</if>
<if test="applyTitle != null and applyTitle != ''"> and s.apply_title = #{applyTitle}</if>
</where>
</select>
@ -122,118 +138,185 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="salesOrderCode != null">sales_order_code,</if>
<if test="salesOrderNumber != null">sales_order_number,</if>
<if test="salesOrderType !=null">sales_order_type,</if>
<if test="enterpriseCode != null">enterprise_code,</if>
<if test="enterpriseName != null">enterprise_name,</if>
<if test="customerPurser !=null">customer_purser,</if>
<if test="commonCurrency !=null">common_currency,</if>
<if test="materialSum != null">material_sum,</if>
<if test="enterpriseSum != null">enterprise_sum,</if>
<if test="noRmbPrice != null">noRmbPrice,</if>
<if test="noRmbSum != null">noRmbSum,</if>
<if test="rmbPrice != null">rmbPrice,</if>
<if test="rmbTaxSum != null">rmbTaxSum,</if>
<if test="noUsdPrice != null">noUsdPrice,</if>
<if test="noUsdSum != null">noUsdSum,</if>
<if test="usdPrice != null">usdPrice,</if>
<if test="usdTaxSum != null">usdTaxSum,</if>
<if test="confirmTax != null">confirm_tax,</if>
<if test="taxRate != null">tax_rate,</if>
<if test="usdTax != null">usd_tax,</if>
<if test="invoice != null">invoice,</if>
<if test="paymentTerms != null">payment_terms,</if>
<if test="deliveryTime != null">delivery_time,</if>
<if test="deliveryAddress != null">#{deliveryAddress},</if>
<if test="deliveryConditions != null">delivery_conditions,</if>
<if test="deliveryMethod != null">delivery_method,</if>
<if test="deliveryMethod != null">delivery_method ,</if>
<if test="deliveryPhone != null">delivery_phone,</if>
<if test="deliveryAddress != null">delivery_address,</if>
<if test="customerDelivery != null">customer_delivery,</if>
<if test="orderReceivingMode != null">order_receiving_mode,</if>
<if test="orderReceivingTime != null">order_receiving_time,</if>
<if test="customerContact != null">customer_contact,</if>
<if test="contactEmail != null">contact_email,</if>
<if test="contactPost != null">contact_post,</if>
<if test="contactNumber != null">contact_number,</if>
<if test="businessMembers != null">business_members,</if>
<if test="customerFax != null">customer_fax,</if>
<if test="deliveryAddress != null">delivery_address,</if>
<if test="orderReceivingTime != null">order_receiving_time,</if>
<if test="orderReceivingMode != null">order_receiving_mode,</if>
<if test="confirmTax != null">confirm_tax,</if>
<if test="taxRate != null">tax_rate,</if>
<if test="totalAmount != null">total_amount,</if>
<if test="businessMembers != null">business_members,</if>
<if test="totalAmount !=null">total_amount,</if>
<if test="modificationTime != null">modification_time,</if>
<if test="tradeClause != null">trade_clause,</if>
<if test="standbyOne != null">standby_one,</if>
<if test="standbyTwo != null">standby_two,</if>
<if test="fileUpload != null">file_upload,</if>
<if test="createBy != null">create_by,</if>
<if test="remark != null">remark,</if>
<if test="outBoundQuantity != null">out_bound_quantity,</if>
<if test="unBoundQuantity != null">un_bound_quantity,</if>
<if test="unBoundQuantity != null"> un_bound_quantity </if>
<if test="tradeClause != null">trade_clause,</if>
<if test="instanceId != null">instance_id,</if>
<if test="useStatus != null">use_status,</if>
<if test="auditStatus != null">audit_status,</if>
<if test="makeStatus != null">make_status,</if>
<if test="deliveryStatus != null">delivery_status,</if>
<if test="closeStatus != null">close_status,</if>
<if test="instanceType != null">instance_type,</if>
<if test="submitInstanceId != null">submit_instance_id,</if>
<if test="cancelInstanceId != null">cancel_instance_id,</if>
<if test="restoreInstanceId != null">restore_instance_id,</if>
<if test="applyTitle != null">apply_title,</if>
<if test="instanceId != null">instance_id,</if>
<if test="applyUser != null">apply_user,</if>
<if test="applyTime != null">apply_time,</if>
<if test="applyTitle != null">apply_title,</if>
first_add_time,create_time
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="salesOrderCode != null">#{salesOrderCode},</if>
<if test="salesOrderNumber != null">#{salesOrderNumber},</if>
<if test="salesOrderType !=null">#{salesOrderType},</if>
<if test="enterpriseCode != null">#{enterpriseCode},</if>
<if test="enterpriseName != null">#{enterpriseName},</if>
<if test="customerPurser !=null">#{customerPurser},</if>
<if test="commonCurrency != null">#{commonCurrency},</if>
<if test="materialSum != null">#{materialSum},</if>
<if test="enterpriseSum != null">#{enterpriseSum},</if>
<if test="noRmbPrice != null">#{noRmbPrice},</if>
<if test="noRmbSum != null">#{noRmbSum},</if>
<if test="rmbPrice != null">#{rmbPrice},</if>
<if test="rmbTaxSum != null">#{rmbTaxSum},</if>
<if test="noUsdPrice != null">#{noUsdPrice},</if>
<if test="noUsdSum != null">#{noUsdSum},</if>
<if test="usdPrice != null">#{usdPrice},</if>
<if test="usdTaxSum != null">#{usdTaxSum},</if>
<if test="confirmTax != null">#{confirmTax},</if>
<if test="taxRate != null">#{taxRate},</if>
<if test="usdTax != null">#{usdTax},</if>
<if test="invoice != null">#{invoice},</if>
<if test="paymentTerms != null">#{paymentTerms},</if>
<if test="deliveryTime != null">#{deliveryTime},</if>
<if test="deliveryStatus != null">#{deliveryStatus},</if>
<if test="deliveryConditions != null">#{deliveryConditions},</if>
<if test="deliveryMethod != null">#{deliveryMethod},</if>
<if test="deliveryPhone != null">#{deliveryPhone},</if>
<if test="deliveryAddress != null">#{deliveryAddress},</if>
<if test="customerDelivery != null">#{customerDelivery},</if>
<if test="orderReceivingMode != null">#{orderReceivingMode},</if>
<if test="orderReceivingTime != null">#{orderReceivingTime},</if>
<if test="customerContact != null">#{customerContact},</if>
<if test="contactEmail != null">#{contactEmail},</if>
<if test="contactPost != null">#{contactPost},</if>
<if test="contactNumber != null">#{contactNumber},</if>
<if test="businessMembers != null">#{businessMembers},</if>
<if test="customerFax != null">#{customerFax},</if>
<if test="deliveryAddress != null">#{deliveryAddress},</if>
<if test="orderReceivingTime != null">#{orderReceivingTime},</if>
<if test="orderReceivingMode != null">#{orderReceivingMode},</if>
<if test="confirmTax != null">#{confirmTax},</if>
<if test="taxRate != null">#{taxRate},</if>
<if test="totalAmount != null">#{totalAmount},</if>
<if test="businessMembers != null">#{businessMembers},</if>
<if test="totalAmount !=null">#{totalAmount},</if>
<if test="modificationTime != null">#{modificationTime},</if>
<if test="tradeClause != null">#{tradeClause},</if>
<if test="standbyOne != null">#{standbyOne},</if>
<if test="standbyTwo != null">#{standbyTwo},</if>
<if test="fileUpload != null">#{fileUpload},</if>
<if test="createBy != null">#{createBy},</if>
<if test="remark != null">#{remark},</if>
<if test="outBoundQuantity != null">#{outBoundQuantity},</if>
<if test="unBoundQuantity != null">#{unBoundQuantity},</if>
<if test="outBoundQuantity != null">#{unBoundQuantity},</if>
<if test="unBoundQuantity != null">#{unBoundQuantity}</if>
<if test="tradeClause != null">#{tradeClause},</if>
<if test="instanceId != null">#{instanceId},</if>
<if test="useStatus != null">#{useStatus},</if>
<if test="auditStatus != null">#{auditStatus},</if>
<if test="makeStatus != null">#{makeStatus},</if>
<if test="deliveryStatus != null">#{deliveryStatus},</if>
<if test="closeStatus != null">#{closeStatus},</if>
<if test="instanceType != null">#{instanceType},</if>
<if test="submitInstanceId != null">#{submitInstanceId},</if>
<if test="cancelInstanceId != null">#{cancelInstanceId},</if>
<if test="restoreInstanceId != null">#{restoreInstanceId},</if>
<if test="applyTitle != null">#{applyTitle},</if>
<if test="instanceId != null">#{instanceId},</if>
<if test="applyUser != null">#{applyUser},</if>
<if test="applyTime != null">#{applyTime},</if>
<if test="applyTitle != null">#{applyTitle},</if>
now(),now()
</trim>
</insert>
<update id="updateSysSalesOrder" parameterType="SysSalesOrderVo">
update sys_sales_order
<trim prefix="SET" suffixOverrides=",">
<if test="salesOrderCode != null">sales_order_code = #{salesOrderCode},</if>
<if test="salesOrderCode != null"> sales_order_code = #{salesOrderCode},</if>
<if test="salesOrderNumber != null">sales_order_number = #{salesOrderNumber},</if>
<if test="appointmentNumber != null">appointment_number = #{appointmentNumber},</if>
<if test="salesOrderType !=null">sales_order_type = #{salesOrderType},</if>
<if test="customerPurser !=null">customer_purser = #{customerPurser},</if>
<if test="enterpriseCode != null">enterprise_code = #{enterpriseCode},</if>
<if test="enterpriseName != null">enterprise_name = #{enterpriseName},</if>
<if test="enterpriseName != null">enterprise_name =#{enterpriseName},</if>
<if test="materialSum != null">material_sum = #{materialSum},</if>
<if test="enterpriseSum != null">enterprise_sum = #{enterpriseSum},</if>
<if test="commonCurrency != null">common_currency = #{commonCurrency},</if>
<if test="noRmbPrice != null">noRmbPrice = #{noRmbPrice},</if>
<if test="noRmbSum != null">noRmbSum = #{noRmbSum},</if>
<if test="rmbPrice != null">rmbPrice = #{rmbPrice},</if>
<if test="rmbTaxSum != null">rmbTaxSum = #{rmbTaxSum},</if>
<if test="noUsdPrice != null">noUsdPrice = #{noUsdPrice},</if>
<if test="noUsdSum != null">noUsdSum = #{noUsdSum},</if>
<if test="usdPrice != null">usdPrice = #{usdPrice},</if>
<if test="usdTaxSum != null">usdTaxSum = #{usdTaxSum},</if>
<if test="confirmTax != null">confirm_tax = #{confirmTax},</if>
<if test="taxRate != null">tax_rate = #{taxRate},</if>
<if test="usdTax != null">usd_tax = #{usdTax},</if>
<if test="invoice != null">invoice = #{invoice},</if>
<if test="paymentTerms != null">payment_terms = #{paymentTerms},</if>
<if test="deliveryConditions != null">delivery_conditions = #{deliveryConditions},</if>
<if test="deliveryTime != null">delivery_time = #{deliveryTime},</if>
<if test="deliveryAddress != null">delivery_address = #{deliveryAddress},</if>
<if test="deliveryConditions != null">delivery_conditions = #{deliveryConditions},</if>
<if test="deliveryMethod != null">delivery_method = #{deliveryMethod},</if>
<if test="deliveryPhone != null">delivery_phone = #{deliveryPhone},</if>
<if test="deliveryAddress != null">delivery_address = #{deliveryAddress},</if>
<if test="customerDelivery != null">customer_delivery = #{customerDelivery},</if>
<if test="orderReceivingMode != null">order_receiving_mode = #{orderReceivingMode},</if>
<if test="orderReceivingTime != null">order_receiving_time =#{orderReceivingTime},</if>
<if test="customerContact != null">customer_contact = #{customerContact},</if>
<if test="contactEmail != null">contact_email = #{contactEmail},</if>
<if test="contactPost != null">contact_post = #{contactPost},</if>
<if test="contactNumber != null">contact_number = #{contactNumber},</if>
<if test="customerFax != null">csutomer_fax = #{customerFax},</if>
<if test="businessMembers != null">business_members = #{businessMembers},</if>
<if test="customerFax != null">customer_fax = #{customerFax},</if>
<if test="deliveryAddress != null">delivery_address = #{deliveryAddress},</if>
<if test="orderReceivingTime != null">order_receiving_time = #{orderReceivingTime},</if>
<if test="creditLimit != null">credit_limit = #{creditLimit},</if>
<if test="unpaidAmount != null">unpaid_amount = #{unpaidAmount},</if>
<if test="confirmTax != null">confirm_tax = #{confirmTax},</if>
<if test="taxRate != null">tax_rate = #{taxRate},</if>
<if test="totalAmount != null">total_amount = #{totalAmount},</if>
<if test="totalAmount !=null">total_amount = #{totalAmount},</if>
<if test="modificationTime != null">modification_time = #{modificationTime},</if>
<if test="tradeClause != null">tarde_clause = #{tradeClause},</if>
<if test="standbyOne != null">standby_one = #{standbyOne},</if>
<if test="standbyTwo != null">standby_two = #{standbyTwo},</if>
<if test="fileUpload != null">file_upload = #{fileUpload},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="outBoundQuantity != null">out_bound_quantity = #{outBoundQuantity},</if>
<if test="unBoundQuantity != null"> un_bound_quantity = #{unBoundQuantity}</if>
<if test="outBoundQuantity != null">un_bound_quantity = #{unBoundQuantity},</if>
<if test="unBoundQuantity != null">un_bound_quantity =#{unBoundQuantity}</if>
<if test="tradeClause != null">trade_clause = #{tradeClause},</if>
update_info_time = CONCAT_WS(',',NOW(),update_info_time),
update_time = #{updateTime}
<if test="useStatus != null">use_status = #{useStatus},</if>
<if test="auditStatus != null">audit_status = #{auditStatus},</if>
<if test="makeStatus != null">make_status = #{makeStatus},</if>
<if test="deliveryStatus != null">delivery_status = #{deliveryStatus},</if>
<if test="closeStatus != null">close_status = #{closeStatus},</if>
<if test="instanceType != null">instance_type = #{instanceType},</if>
<if test="instanceId != null">instance_id = #{instanceId},</if>
<if test="submitInstanceId != null">submit_instance_id = #{submitInstanceId},</if>
<if test="cancelInstanceId != null">cancel_instance_id = #{cancelInstanceId},</if>
<if test="restoreInstanceId != null">restore_instance_id = #{restoreInstanceId},</if>
<if test="applyUser != null">apply_user = #{applyUser},</if>
<if test="applyTime != null">apply_time = #{applyTime},</if>
<if test="applyTitle != null">apply_title = #{applyTitle},</if>
update_time = now()
</trim>
where sales_order_id = #{salesOrderId}
</update>

18
ruoyi-admin/src/main/resources/templates/erp/material/add.html

@ -20,24 +20,6 @@
<input name="materialName" class="form-control" type="text" required>
</div>
</div>
<!--<div class="form-group">
<label class="col-sm-3 control-label">审核状态:</label>
<div class="col-sm-8">
<div class="radio-box" th:each="dict : ${@dict.getType('auditStatus')}">
<input type="radio" th:id="${'auditStatus_' + dict.dictCode}" name="auditStatus" th:value="${dict.dictValue}" th:checked="${dict.default}">
<label th:for="${'auditStatus_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">使用状态:</label>
<div class="col-sm-8">
<div class="radio-box" th:each="dict : ${@dict.getType('useStatus')}">
<input type="radio" th:id="${'useStatus_' + dict.dictCode}" name="useStatus" th:value="${dict.dictValue}" th:checked="${dict.default}">
<label th:for="${'useStatus_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
</div>
</div>
</div>-->
<div class="form-group">
<label class="col-sm-3 control-label">是否有生产团队:</label>
<div class="col-sm-8">

9
ruoyi-admin/src/main/resources/templates/system/contacts/contacts.html

@ -39,15 +39,6 @@
<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:contacts:add">
<i class="fa fa-plus"></i> 添加
</a>
<!-- <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:contacts:edit">
<i class="fa fa-edit"></i> 修改
</a>
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:contacts:remove">
<i class="fa fa-remove"></i> 删除
</a>
<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:contacts:export">
<i class="fa fa-download"></i> 导出
</a>-->
</div>
<div class="col-sm-12 select-table table-striped" style="white-space: nowrap">
<table id="bootstrap-table"></table>

3
ruoyi-admin/src/main/resources/templates/system/customer/customer.html

@ -352,8 +352,7 @@
var auditStatusDatas = [[${@dict.getType('auditStatus')}]];
var useStatusDatas = [[${@dict.getType('useStatus')}]];
var userName = [[${@permission.getPrincipalProperty('userName')}]];
var currentUser = [[${currentUser}]];
var loginName = currentUser.loginName;
var loginName = [[${@permission.getPrincipalProperty('loginName')}]];
var prefix = ctx + "system/customer";
// 联系人
var prefix1 = ctx + "system/contacts"

1
ruoyi-admin/src/main/resources/templates/system/customer/taskModifyApply.html

@ -286,6 +286,7 @@
</select>
</div>
</div>
</div>
</form>
</div>
<th:block th:include="include :: footer" />

1
ruoyi-admin/src/main/resources/templates/system/customer/taskYwjlVerify.html

@ -292,6 +292,7 @@
<textarea name="comment" class="form-control"></textarea>
</div>
</div>
</div>
</form>
</div>
<th:block th:include="include :: footer" />

1
ruoyi-admin/src/main/resources/templates/system/customer/taskYwzgVerify.html

@ -292,6 +292,7 @@
<textarea name="comment" class="form-control"></textarea>
</div>
</div>
</div>
</form>
</div>
<th:block th:include="include :: footer" />

1
ruoyi-admin/src/main/resources/templates/system/customer/taskGozjVerify.html → ruoyi-admin/src/main/resources/templates/system/customer/taskZozjVerify.html

@ -292,6 +292,7 @@
<textarea name="comment" class="form-control"></textarea>
</div>
</div>
</div>
</form>
</div>
<th:block th:include="include :: footer" />

20
ruoyi-admin/src/main/resources/templates/system/customerQuote/add.html

@ -49,7 +49,7 @@
<div class="form-group">
<label class="col-sm-4 control-label">美元汇率:</label>
<div class="col-sm-8">
<input name="usdTax" id="usdTax" class="form-control" type="number" placeholder="美元对人民币汇率">
<input name="usdTax" id="usdTax_add" class="form-control" type="number" placeholder="美元对人民币汇率">
</div>
</div>
<div class="form-group">
@ -65,7 +65,7 @@
<div class="form-group">
<label class="col-sm-4 control-label">国内税率:</label>
<div class="col-sm-8">
<input name="rmbTax" id="rmbTax" class="form-control" type="number" placeholder="13" tloop="%"/>
<input name="rmbTax" id="rmbTax_add" class="form-control" type="number" placeholder="13" tloop="%"/>
</div>
</div>
<div class="form-group">
@ -345,14 +345,14 @@
],
onEditableSave:function(field, row, oldValue, $el){
var commonCurrency1 = $("#commonCurrency_add option:selected").val();
var rmb1 = $("#rmbTax").val();
var rmb1 = $("#rmbTax_add").val();
if (rmb1 =='' || rmb1== null){
rmb1 = 0;
}else{
rmb1 = $("#rmbTax").val();
rmb1 = $("#rmbTax_add").val();
}
var rmb = Number(rmb1).toFixed(2) / 100;
var usd = $("#usdTax").val();
var usd = $("#usdTax_add").val();
if (usd =='' || usd== null){
usd = 0;
}else{
@ -458,15 +458,15 @@
}
})
layer.close(index);
var enterpriseSum = $("#enterpriseSum").val();
$("#enterpriseSum").val((enterpriseSum==null?0:enterpriseSum) + 1);
var enterpriseSum = $("#enterpriseSum_add").val();
$("#enterpriseSum_add").val((enterpriseSum==null?0:enterpriseSum) + 1);
}
function insertRow() {
if ($("#customerCode").val() == null || $("#customerCode").val() == '') {
$.modal.alertWarning("请先选择客户");
return;
}
if ($("#rmbTax").val() == null || $("#rmbTax").val() == '') {
if ($("#rmbTax_add").val() == null || $("#rmbTax_add").val() == '') {
$.modal.alertWarning("请先选择输入国内的税率");
return;
}
@ -484,8 +484,8 @@
field: 'id',
values: id
})
var enterpriseSum = parseInt($("#enterpriseSum").val());
$("#enterpriseSum").val((enterpriseSum==null?0:enterpriseSum) - 1);
var enterpriseSum = parseInt($("#enterpriseSum_add").val());
$("#enterpriseSum_add").val((enterpriseSum==null?0:enterpriseSum) - 1);
}
$("input[name='pricingDate']").datetimepicker({
format: "yyyy-mm-dd",

2
ruoyi-admin/src/main/resources/templates/system/customerQuote/customerQuote.html

@ -160,7 +160,7 @@
{title: '数量合计',field: 'enterpriseSum'},
{title: '报价币种',field: 'commonCurrency',
formatter: function (value, row, index) {
return $.table.selectDictLabel(currencyDatas, value);
return $.table.selectDictLabel(currencyDatas, value);
}},
{title: '国内汇率',field: 'rmbTax'},
{title: '美元汇率',field: 'usdTax'},

55
ruoyi-admin/src/main/resources/templates/system/customerQuote/edit.html

@ -87,46 +87,45 @@
<textarea readonly name="remark" th:field="*{remark}" class="form-control"></textarea>
</div>
</div>
<div class="container">
<div class="flex-row-m">
<h4 class="form-header h4">计算</h4>
<div class="col-xs-12 form-row">
<label class=" col-sm-2">物料合计:</label><input class="col-sm-4" name="enterprise" id="enterprise_edit" th:field="*{enterprise}" type="text" disabled/>
<label class=" col-sm-2">数量合计:</label><input class="col-sm-4" name="enterpriseSum" id="enterpriseSum_edit" th:field="*{enterpriseSum}" type="number" disabled/>
<label class=" col-sm-2">物料合计:</label><input class="col-sm-4" name="enterprise" id="enterprise_edit" type="text" readonly/>
<label class=" col-sm-2">数量合计:</label><input class="col-sm-4" name="enterpriseSum" id="enterpriseSum_edit" type="number" readonly/>
</div>
<div class="col-xs-12 form-row">
<label class="col-sm-2"> 不含税单价:</label><input placeholder="RMB" class="col-sm-4" name="noRmb" id="noRmb_edit" th:field="*{noRmb}" type="number" disabled />
<label class="col-sm-2"> 不含税总价:</label><input placeholder="RMB" class="col-sm-4" name="noRmbSum" id="noRmbSum_edit" th:field="*{noRmbSum}" type="number" disabled/>
<label class="col-sm-2"> 含税单价:</label><input placeholder="RMB" class="col-sm-4" name="rmb" id="rmb_edit" type="number" th:field="*{rmb}" disabled/>
<label class="col-sm-2"> 含税总价:</label><input placeholder="RMB" class="col-sm-4" name="rmbSum" id="rmbSum_edit" th:field="*{rmbSum}" type="number" disabled/>
<label class="col-sm-2"> 不含税单价:</label><input placeholder="RMB" class="col-sm-4" name="noRmb" id="noRmb_edit" type="number" readonly/>
<label class="col-sm-2"> 不含税总价:</label><input placeholder="RMB" class="col-sm-4" name="noRmbSum" id="noRmbSum_edit" type="number" readonly/>
<label class="col-sm-2"> 含税单价:</label><input placeholder="RMB" class="col-sm-4" name="rmb" id="rmb_edit" type="number" readonly/>
<label class="col-sm-2"> 含税总价:</label><input placeholder="RMB" class="col-sm-4" name="rmbSum" id="rmbSum_edit" type="number" readonly/>
</div>
<div class="col-xs-12">
<label class="col-sm-2">不含税单价:</label><input placeholder="美元" class="col-sm-4" name="noUsd" id="noUsd_edit" th:field="*{noUsd}" type="number" disabled/>
<label class="col-sm-2">不含税总价:</label><input placeholder="美元" class="col-sm-4" name="noUsdSum" id="noUsdSum_edit" th:field="*{noUsdSum}" type="number" disabled/>
<label class="col-sm-2">含税单价:</label><input placeholder="美元" class="col-sm-4" name="usd" id="usd_edit" th:field="*{usd}" type="number" disabled/>
<label class="col-sm-2">含税总价:</label><input placeholder="美元" class="col-sm-4" name="usdSum" id="usdSum_edit" th:field="*{usdSum}" type="number" disabled/>
<label class="col-sm-2">不含税单价:</label><input placeholder="美元" class="col-sm-4" name="noUsd" id="noUsd_edit" type="number" readonly/>
<label class="col-sm-2">不含税总价:</label><input placeholder="美元" class="col-sm-4" name="noUsdSum" id="noUsdSum_edit" type="number" readonly/>
<label class="col-sm-2">含税单价:</label><input placeholder="美元" class="col-sm-4" name="usd" id="usd_edit" type="number" readonly/>
<label class="col-sm-2">含税总价:</label><input placeholder="美元" class="col-sm-4" name="usdSum" id="usdSum_edit" type="number" readonly/>
</div>
</div>
<div class="other container">
<div class="form-row">
<div class="btn-group-sm" id="toolbar" role="group">
<span>选择报价信息</span>
<a class="btn btn-success" onclick="insertRow()">
<i class="fa fa-plus"></i> 添加物料
</a>
<a class="btn btn-danger multiple disabled" onclick="insertNRow()">
<i class="fa fa-remove"></i> 添加无料号物料
</a>
</div>
</form>
<div class="other container">
<div class="form-row">
<div class="btn-group-sm" id="toolbar" role="group">
<span>选择报价信息</span>
<a class="btn btn-success" onclick="insertRow()">
<i class="fa fa-plus"></i> 添加物料
</a>
<a class="btn btn-danger multiple disabled" onclick="insertNRow()">
<i class="fa fa-remove"></i> 添加无料号物料
</a>
</div>
<div class="row">
<div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table-Quote-child"></table>
</div>
</div>
<div class="row">
<div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table-Quote-child"></table>
</div>
</div>
</form>
</div>
</div>
<th:block th:include="include :: footer" />
<th:block th:include="include :: bootstrap-table-editable-js" />

1106
ruoyi-admin/src/main/resources/templates/system/salesOrder/add.html

File diff suppressed because it is too large

460
ruoyi-admin/src/main/resources/templates/system/salesOrder/edit.html

@ -68,11 +68,11 @@
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m " id="form-salesOrder-edit">
<form class="form-horizontal m " id="form-salesOrder-edit" th:object="${sysSalesOrder}">
<div class="form-group" hidden="hidden">
<label class="col-sm-3 control-label is-required">订单索引号:</label>
<div class="col-sm-8">
<input name="salesOrderID" class="form-control" th:field="*{salesOrderId}" type="text" required >
<input name="salesOrderID" class="form-control" th:field="*{salesOrderId}" type="number" required >
</div>
</div>
<div class="form-group" hidden="hidden">
@ -84,15 +84,14 @@
<div class="form-group">
<label class="col-sm-3 control-label is-required">客户ID:</label>
<div class="col-sm-8">
<select id="enterpriseCode" name="enterpriseCode" class="form-control m-b" th:field="*{enterpriseCode}" required>
<option value="">请选择</option>
<select id="enterpriseCode_edit" name="enterpriseCode" class="form-control m-b" required>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">客户名称:</label>
<div class="col-sm-8">
<input required name="enterpriseName" class="form-control" type="text" th:field="*{enterpriseName}" readonly>
<input name="enterpriseName" class="form-control" type="text" th:field="*{enterpriseName}" readonly>
</div>
</div>
<div class="form-group">
@ -104,51 +103,51 @@
<div class="form-group">
<label class="col-sm-3 control-label is-required">客户联系人:</label>
<div class="col-sm-8">
<select id="customerContact" name="customerContact" th:field="*{customerContact}" class="form-control m-b" required>
<select id="customerContact_edit" name="customerContact" th:field="*{customerContact}" class="form-control m-b" required>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">联系人职务:</label>
<div class="col-sm-8">
<input readonly name="salesOrderNumber" th:field="*{salesOrderNumber}" class="form-control" type="text" >
<input readonly name="contactPost" th:field="*{contactPost}" class="form-control" type="text" >
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label ">联系人电话:</label>
<div class="col-sm-8">
<input readonly name="salesOrderNumber" th:field="*{salesOrderNumber}" class="form-control" type="text" >
<input readonly name="contactNumber" th:field="*{contactNumber}" class="form-control" type="text" >
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">联系人邮箱:</label>
<div class="col-sm-8">
<input readonly name="contactEmail" class="form-control" type="text" required>
<input name="contactEmail" th:field="*{contactEmail}" class="form-control" type="text" required>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">客户收货人:</label>
<div class="col-sm-8">
<select name="customerAddcess" class="form-control m-b" required>
<select name="customerDelivery_edit" th:field="*{customerDelivery}" class="form-control m-b" >
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">收货人电话:</label>
<div class="col-sm-8">
<input readonly name="salesOrderNumber" class="form-control" type="text" required>
<input name="deliveryPhone" th:field="*{deliveryPhone}" class="form-control" type="text" >
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">收货地址:</label>
<div class="col-sm-8">
<input readonly name="deliveryAddress" class="form-control" type="text" required>
<input name="deliveryAddress" th:field="*{deliveryAddress}" class="form-control" type="text" required>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">客户订单号:</label>
<div class="col-sm-8">
<input name="salesOrderNo" class="form-control" type="text" required>
<input name="salesOrderNumber" th:field="*{salesOrderNumber}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
@ -187,7 +186,7 @@
<div class="form-group">
<label class="col-sm-3 control-label is-required">美元汇率:</label>
<div class="col-sm-8">
<input name="udsTax" class="form-control" th:field="*{udsTax}" type="text" required />
<input name="usdTax" id="usdTax_edit" class="form-control" th:field="*{usdTax}" type="number" required />
</div>
</div>
<div class="form-group">
@ -203,7 +202,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">税率:</label>
<div class="col-sm-8">
<input name="taxRate" th:field="*{taxRate}" class="form-control" type="text">
<input name="taxRate" id="taxRate_edit" th:field="*{taxRate}" class="form-control" type="number">
</div>
</div>
<div class="form-group">
@ -247,7 +246,7 @@
<label class="col-sm-3 control-label">客户验收时间:</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="" class="form-control" placeholder="yyyy-mm-dd" type="text">
<input name="modificationTime" th:field="*{modificationTime}" class="form-control" placeholder="yyyy-mm-dd" type="text" />
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div>
</div>
@ -272,23 +271,27 @@
</select>
</div>
</div>
<div class="form-row-m">
<div class="container">
<h4 class="form-header h4">计算</h4>
<div class="col-xs-12 form-row">
<label class=" col-sm-2">物料合计:</label><input class="col-sm-2" name="materialSum" id="enterprise_edit" type="text" readonly/>
<label class=" col-sm-2">数量合计:</label><input class="col-sm-2" name="enterpriseSum" id="enterpriseSum_edit" type="number" readonly/>
<label class=" col-sm-2">物料合计:</label><input class="col-sm-4" name="materialSum" id="enterprise_edit" type="text" readonly/>
<label class=" col-sm-2">数量合计:</label><input class="col-sm-4" name="enterpriseSum" id="enterpriseSum_edit" type="number" readonly/>
</div>
<div class="col-xs-12 form-row">
<label class="col-sm-2"> 不含税单价:</label><input placeholder="RMB" class="col-sm-4" name="noRmbPrice" id="noRmb_edit" type="number" readonly/>
<label class="col-sm-2"> 不含税总价:</label><input placeholder="RMB" class="col-sm-4" name="noRmbSum" id="noRmbSum_edit" type="number" readonly/>
</div>
<div class="col-xs-12 form-row">
<label class="col-sm-2"> 不含税单价:</label><input placeholder="RMB" class="col-sm-3" name="noRmbPrice" id="noRmb_edit" type="number" readonly/>
<label class="col-sm-2"> 不含税总价:</label><input placeholder="RMB" class="col-sm-3" name="noRmbSum" id="noRmbSum_edit" type="number" readonly/>
<label class="col-sm-2"> 含税单价:</label><input placeholder="RMB" class="col-sm-3" name="rmbPrice" id="rmb_edit" type="number" readonly/>
<label class="col-sm-2"> 含税总价:</label><input placeholder="RMB" class="col-sm-3" name="rmbTaxSum" id="_edit" type="number" readonly/>
<label class="col-sm-2"> 含税单价:</label><input placeholder="RMB" class="col-sm-4" name="rmbPrice" id="rmb_edit" type="number" readonly/>
<label class="col-sm-2"> 含税总价:</label><input placeholder="RMB" class="col-sm-4" name="rmbTaxSum" id="rmbTax_edit" type="number" readonly/>
</div>
<div class="col-xs-12">
<label class="col-sm-2">不含税单价:</label><input placeholder="美元" class="col-sm-3" name="noUsdPrice" id="noUsd_edit" type="number" readonly/>
<label class="col-sm-2">不含税总价:</label><input placeholder="美元" class="col-sm-3" name="noUsdSum" id="noUsdSum_edit" type="number"readonly/>
<label class="col-sm-2">含税单价:</label><input placeholder="美元" class="col-sm-3" name="usdPrice" id="usd_edit" type="number" readonly/>
<label class="col-sm-2">含税总价:</label><input placeholder="美元" class="col-sm-3" name="usdTaxSum" id="usdSum_edit" type="number"readonly/>
<label class="col-sm-2">不含税单价:</label><input placeholder="美元" class="col-sm-4" name="noUsdPrice" id="noUsd_edit" type="number" readonly/>
<label class="col-sm-2">不含税总价:</label><input placeholder="美元" class="col-sm-4" name="noUsdSum" id="noUsdSum_edit" type="number" readonly/>
</div>
<div class="col-xs-12 form-row">
<label class="col-sm-2">含税单价:</label><input placeholder="美元" class="col-sm-4" name="usdPrice" id="usd_edit" type="number" readonly/>
<label class="col-sm-2">含税总价:</label><input placeholder="美元" class="col-sm-4" name="usdTaxSum" id="usdSum_edit" type="number" readonly/>
</div>
</div>
</form>
@ -303,7 +306,7 @@
</div>
<div class="row">
<div class="col-sm-12 select-table table-striped">
<table id="bootstrap-sub-table-quoteChild"></table>
<table id="bootstrap-sub-table-editOrder"></table>
</div>
</div>
</div>
@ -314,89 +317,47 @@
<th:block th:include="include :: datetimepicker-js" />
<th:block th:include="include :: bootstrap-fileinput-js"/>
<script th:inline="javascript">
var getData = [[${sysSalesOrder}]];
var prefix = ctx + "system/salesOrder";
var commonCurrencyDatas = [[${@dict.getType('sys_common_currency')}]];
var materialTypeDatas = [[${@category.getType('sys_material_type')}]];
var auditStatusDatas = [[${@dict.getType('auditStatus')}]];
var sysUnitClassDatas = [[${@dict.getType('sys_unit_class')}]];
var processMethodDatas = [[${@dict.getType('processMethod')}]];
var sysSalesOrder = [[${sysSalesOrder}]];
$("#form-salesOrder-edit").validate({
focusCleanup: true
});
// 时间
var today = new Date();
today.setTime(today.getTime());
var time = today.getFullYear() + "-" + (today.getMonth() + 1) + "-" + today.getDate();
$(".file-upload").each(function (i) {
var val = $("input[name='" + this.id + "']").val()
$(this).fileinput({
'uploadUrl': prefix + '/upload',
initialPreviewAsData: true,
initialPreview: [val],
maxFileCount: 1,
autoReplace: true,
showPreview: true,
}).on('fileuploaded', function (event, data, previewId, index) {
$("input[name='" + event.currentTarget.id + "']").val(data.response.url)
}).on('fileremoved', function (event, id, index) {
$("input[name='" + event.currentTarget.id + "']").val('')
})
$(this).fileinput('_initFileActions');
});
Date.prototype.Format = function (fmt) {
var o = {
"M+": this.getMonth() + 1, //月份
"d+": this.getDate(), //日
"H+": this.getHours(), //小时
"m+": this.getMinutes(), //分
"s+": this.getSeconds(), //秒
"q+": Math.floor((this.getMonth() + 3) / 3), //季度
"S": this.getMilliseconds() //毫秒
};
if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (this.getFullYear() + "").substr(4 - RegExp.$1.length));
for (var k in o)
if (new RegExp("(" + k + ")").test(fmt)) fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)));
return fmt;
}
$(function() {
var options = {
id: "bootstrap-table-Quote-child",
url: ctx + "system/quoteChild/list",
queryParams: queryParams,
id:'bootstrap-sub-table-editOrder',
url: ctx + "system/orderChild/list",
pagination: false,
queryParams: queryParams,
sidePagination: "client",
clickToSelect: true,
showExport: true,
showSearch: false,
showRefresh: false,
showToggle: false,
showColumns: false,
showPaginationSwitch: false,
model: "物料报价信息",
columns: [
{checkbox: true},
{title: '序号',align: 'center',
{field: 'index',align: 'center', title: "序号",
formatter: function (value, row, index) {
return $.table.serialNumber(index);
var columnIndex = $.common.sprintf("<input type='hidden' name='index' value='%s'>", $.table.serialNumber(index));
return columnIndex + $.table.serialNumber(index);
}
},
{title: '报价子表id',field: 'id',align: 'center',visible: false},
{title: '物料报价主表id',field: 'quoteId',align: 'center',visible: false},
{title: '物料索引',field: 'materialId',align: 'center',visible: false},
{title: '物料索引id',field: 'materialId',align: 'center',visible: false},
{title: '料号',field: 'materialCode',align: 'center'},
{title: '物料名称',field: 'materialName',align: 'center'},
{title: '图片',field: 'photoUrl',
formatter: function(value, row, index) {
return $.table.imageView(value);
}
},
{title: '物料类型',field: 'materialType',align: 'center',
formatter: function(value, row, index) {
$.table.selectCategoryLabel(materialTypeDatas, value);
return $.table.selectCategoryLabel(materialTypeDatas, value);
}
},
{ title: '描述',field: 'describe',align: 'center'},
{title: '品牌',field: 'brand',align: 'center'},
{
title: '图片', field: 'photoUrl', align: 'center',
formatter: function (value, row, index) {
return $.table.imageView(value);
}
},
{ title: '单位',field: 'unit',align: 'center',
formatter: function(value, row, index) {
return $.table.selectDictLabel(sysUnitClassDatas, value);
@ -407,19 +368,98 @@
return $.table.selectDictLabel(processMethodDatas, value);
}
},
{title: '国内税率',field: 'countTax',align: 'center',editable: true},
{title: '美元汇率',field: 'usdTax', align: 'center',editable: true},
{title: '对外售价',field: 'materialSole',editable: true},
{title: '物料的数量',field: 'materialNum',align: 'center',editable: true},
{title: '物料的不含税单价(RMB)',field: 'materialNoRmb',align: 'center',editable: commonCurrency==1?true:false},
{title: '物料的不含税单价(美元)',field: 'materialNoUsd',align: 'center',editable: commonCurrency==2?true:false},
{title: '物料的含税单价(RMB)',field: 'materialRmb',align: 'center'},
{title: '物料的含税总价(RMB)',field: 'materialNoRmbSum',align: 'center'},
{title: '物料的不含税总价(RMB)',field: 'materialRmbSum',align: 'center'},
{title: '物料的含税单价(美元)',field: 'materialUsd',align: 'center'},
{title: '物料的含税总价(美元)',field: 'materialUsdSum',align: 'center'},
{title: '物料的不含税总价(美元)', field: 'materialNoUsdSum',align: 'center'},
{field: 'remark',align: 'center',title: '备注',visible: false},
{ title: '对外售价',field: 'materialSole',editable: true},
{title: '国内税率',field: 'countTax',align: 'center',editable: true,
},
{ title: '美元汇率',field: 'usdTax', align: 'center',editable: true,
},
{field: 'materialNum',align: 'center',title: '物料的数量',editable: true,
},
{ title: '物料的不含税单价(RMB)',
field: 'materialNoRmb',
align: 'center',
editable: function(value, row, index) {
commonCurrency = $("#commonCurrency_edit option:selected").val();
if (commonCurrency == 1){
return true;
}else{
return false;
}
}
},
{title: '物料的不含税单价(美元)',
field: 'materialNoUsd',
align: 'center',
editable: function(value, row, index) {
commonCurrency = $("#commonCurrency_edit option:selected").val();
if (commonCurrency == 2){
return true;
}else{
return false;
}
}
},
{ title: '物料的含税单价(美元)',
field: 'materialUsd',
align: 'center',
},
{ title: '物料的含税总价(美元)',
field: 'materialUsdSum',
align: 'center',
},
{ title: '物料的不含税总价(美元)',
field: 'materialNoUsdSum',
align: 'center',
},
{ title: '物料的含税总价(RMB)',
field: 'materialNoRmbSum',
align: 'center',
},
{title: '物料的不含税总价(RMB)',
field: 'materialRmbSum',
align: 'center',
},
{
field: 'createBy',
align: 'center',
title: '录入人',
visible: false
},
{
field: 'createTime',
align: 'center',
title: '录入时间',
visible: false
},
{
field: 'updateBy',
align: 'center',
title: '更新人',
visible: false
},
{
field: 'updateTime',
align: 'center',
title: '上次更新时间',
visible: false
},
{
field: 'remark',
align: 'center',
title: '备注',
visible: false
},
{
field: 'auditStatus',
align: 'center',
title: '审核状态',
visible: false,
formatter: function(value, row, index) {
return $.table.selectDictLabel(auditStatusDatas, value);
}
},
{title: '操作', align: 'center',
formatter: function (value, row, index) {
var actions = [];
@ -429,31 +469,34 @@
}
],
onEditableSave:function(field, row, oldValue, $el){
var commonCurrency1 = $("#commonCurrency_add option:selected").val();
var rmb1 = $("#rmbTax_add").val();
var commonCurrency1 = $("#commonCurrency_edit option:selected").val();
var rmb1 = $("#taxRate_edit").val();
if (rmb1 =='' || rmb1== null){
rmb1 = 0;
}else{
rmb1 = $("#rmbTax_add").val();
rmb1 = $("#taxRate_edit").val();
}
var rmb = Number(rmb1).toFixed(2) / 100;
var usd = $("#usdTax_add").val();
var usd = $("#usdTax_edit").val();
if (usd =='' || usd== null){
usd = 0;
}else{
usd = Number(usd).toFixed(2);
}
console.log(commonCurrency);
console.log(commonCurrency1);
if(commonCurrency1 == 1){
row.materialNoRmb = Number(row.materialNoRmb).toFixed(2);
row.materialRmb = Number(row.materialNoRmb * Number(1 + rmb));
row.materialNoRmbSum = Number(row.materialNum * Number(row.materialNoRmb)).toFixed(2);
row.materialRmbSum = Number(row.materialRmb * row.materialNum).toFixed(2);
row.materialNoUsd = Number(row.materialNoRmb / usd).toFixed(2);
row.materialNoUsdSum = Number(row.materialNum) * Number(row.materialNoUsd);
row.materialNoUsdSum = Number(row.materialNum * row.materialNoUsd).toFixed(2);
row.materialUsd = Number(row.materialNoUsd).toFixed(2)
row.materialUsdSum = Number(row.materialNum * Number(row.materialUsd)).toFixed(2);
}
else if( commonCurrency1 == 2){
row.materialNoUsd = Number(row.materialNoUsd).toFixed(2);
row.materialUsd = Number(row.materialNoUsd).toFixed(2);
row.materialUsdSum = Number(row.materialNum * row.materialUsd).toFixed(2);
row.materialNoUsdSum = Number(row.materialNoUsd * row.materialNum).toFixed(2);
@ -467,97 +510,17 @@
};
$.table.init(options);
});
function submitHandler() {
if ($.validate.form()) {
confirmFinish();
updateFinish();
$.operate.save(prefix + "/edit", $('#form-salesOrder-edit').serialize());
}
function queryParams(params) {
var curParams = {
// 传递参数查询参数
pageSize: params.limit,
pageNum: params.offset / params.limit + 1,
quoteId: sysSalesOrder.salesOrderCode,
};
curParams.quoteId = sysSalesOrder.salesOrderCode;
return curParams;
}
$("input[name='orderReceivingTime']").datetimepicker({
format: "yyyy-mm-dd",
minView: "month",
autoclose: true
});
$("input[name='modificationTime']").datetimepicker({
format: "yyyy-mm-dd",
minView: "month",
autoclose: true
});
$("input[name='deliveryTime']").datetimepicker({
format: "yyyy-mm-dd",
minView: "month",
autoclose: true
});
//客户信息
var customerodata = [];
$.ajax({
url: ctx + "system/customer/customerList",
success: function (res) {
// console.log(res)
if (res.rows.length > 0) {
customerodata = res.rows;
//alert(JSON.stringify(data));
console.log(res.rows)
for (let i in customerodata) {
$("select[name='enterpriseCode']").append("<option value='" + customerodata[i].enterpriseCode + "'>" + customerodata[i].enterpriseCode + "</option>");
// $("select[name='enterpriseName']").append("<option value='" + customerodata[i].enterpriseName + "'>" + customerodata[i].enterpriseName + "</option>");
}
$("select[name='enterpriseCode']").val(getData.enterpriseCode).trigger("change");
$("select[name='customerFactory']").val(getData.customerFactory).trigger("change");
} else {
$.modal.msgError(res.msg);
}
},
error: function () {
$.modal.msgError("后台出错啦!");
}
})
$.ajax({
url: ctx + "system/contcat/list",
type: "POST",
success: function (res) {
// console.log(res)
if (res.rows.length > 0) {
customerodata = res.rows;
//alert(JSON.stringify(data));
console.log(res.rows)
for (let i in customerodata) {
$("select[name='contactName']").append("<option value='" + customerodata[i].contactName + "'>" + customerodata[i].contactName + "</option>");
// $("select[name='enterpriseName']").append("<option value='" + customerodata[i].enterpriseName + "'>" + customerodata[i].enterpriseName + "</option>");
}
} else {
$.modal.msgError(res.msg);
}
},
error: function () {
$.modal.msgError("后台出错啦!");
}
})
$("select[name='enterpriseCode']").change(function () {
var enterpriseCode = $(this).val()
for (i = 0; i < customerodata.length; i++) {
if (customerodata[i].enterpriseCode === enterpriseCode) {
$("input[name='enterpriseName']").val(customerodata[i].enterpriseName)
$("input[name='contactNumber']").val(customerodata[i].contactNumber)
$("input[name='customerFax']").val(customerodata[i].customerFax)
$("input[name='deliveryAddress']").val(customerodata[i].deliveryAddress)
$("input[name='customerContact']").val(customerodata[i].customerContact)
$("input[name='paymentTerms']").val(customerodata[i].paymentTerms)
if (customerodata[i].confirmTax == 1) {
$("input[name='confirmTax']").val("是")
} else {
$("input[name='confirmTax']").val("否")
}
$("input[name='taxRate']").val(customerodata[i].taxRate)
}
}
})
/*用户列表*/
/*业务员列表*/
$.ajax({
url: ctx + 'system/user/list',
type: 'post',
@ -565,27 +528,23 @@
console.log(res)
if (res.rows.length > 0) {
var usertData = res.rows;
//alert(JSON.stringify(data));
for (let i in usertData) {
// console.log(finishProductData[i].finishProductCode)
$("#form-salesOrder-edit select[name='businessMembers']").append("<option value='" + usertData[i].userName + "'>" + usertData[i].userName + "</option>");
$("#form-salesOrder-edit select[name='businessMembers']").append(
"<option value='" + usertData[i].userName + "'>" + usertData[i].userName + "</option>");
}
$("#form-salesOrder-edit select[name='businessMembers']").val(getData.businessMembers).trigger("change")
$("#form-salesOrder-edit select[name='businessMembers']").val(userName).trigger("change");
} else {
$.modal.msgError(res.msg);
}
}
})
});
function doSubmit(index, layero,uniqueId){
console.log(uniqueId);
var iframeWin = window[layero.find('iframe')[0]['name']];
var rowData = iframeWin.$('#bootstrap-select-table').bootstrapTable('getSelections')[0];
console.log("rowData: "+rowData);
let enterpriseSum = $("#enterpriseSum_edit").val();
$("#enterpriseSum_edit").val((enterpriseSum==''?0:enterpriseSum) + 1);
var timestamp = new Date().getTime();
var totalNum = $("#bootstrap-table-Quote-child").bootstrapTable('getData').length;
$("#bootstrap-table-Quote-child").bootstrapTable('insertRow', {
var totalNum = $("#bootstrap-select-table").bootstrapTable('getData').length;
$("#bootstrap-sub-table-editOrder").bootstrapTable('insertRow', {
index: totalNum,
row: {
id:'',
@ -626,32 +585,61 @@
}
/* 删除指定表格行 */
function removeRow(rowData){
$.table.bootstrapTable('remove', {
$("#bootstrap-sub-table-editOrder").bootstrapTable('remove', {
field: 'id',
values: rowData.id
values: rowData.index
})
let enterpriseSum = $("#enterpriseSum_edit").val();
$("#enterpriseSum_edit").val((enterpriseSum==null?0:enterpriseSum) - rowData.materialNum);
}
$("input[name='pricingDate']").datetimepicker({
format: "yyyy-mm-dd",
minView: "month",
autoclose: true
});
// $("input[name='pricingDate']").datetimepicker({
// format: "yyyy-mm-dd",
// minView: "month",
// autoclose: true
// });
// $("input[name='deliveryTime']").datetimepicker({
// format: "yyyy-mm-dd",
// minView: "month",
// autoclose: true
// });
// $("input[name='orderReceivingTime']").datetimepicker({
// format: "yyyy-mm-dd",
// minView: "month",
// autoclose: true
// });
// $("input[name='modificationTime']").datetimepicker({
// format: "yyyy-mm-dd",
// minView: "month",
// autoclose: true
// });
function submitHandler() {
if ($.validate.form()) {
var formData = $("#form-salesOrder-edit").serializeArray();
console.log("formData",formData);
var tableData = $("#bootstrap-sub-table-editOrder").bootstrapTable('getData');
console.log("tableData",JSON.stringify(tableData));
var rows = tableData.length;
if(rows==0){
$.modal.alertWarning("子表数据不能为空!");
}else{
formData.push({"name": "sysSalesOrderChildList", "value": tableData});
var jsonData = $.common.formDataToJson(formData);
console.log("jsonData");
console.log(jsonData);
$.operate.saveJson(prefix + "/edit", jsonData);
}
}
}
//计算
function getTotalAmount(){
// $("#addFinishbomTable").bootstrapTable('refresh');
let getData = $("#bootstrap-table-Quote-child").bootstrapTable('getData', true);
var enterprise = "";
let enterpriseSum = 0;
let noRmb = 0;let rmb = 0;let noRmbSum = 0;
let rmbSum = 0;let noUsd = 0;let usd = 0;
let noUsdSum = 0;let usdSum = 0;
for(var i=0;i<getData.length;i++){
enterprise += getData[i].materialName + ": 数量" + getData[i].materialNum +"; ";
enterpriseSum +=getData[i].materialNum;
noRmb += getData[i].materialNoRmb ;
rmb +=getData[i].materialRmb;
let getData = $("#bootstrap-sub-table-editOrder").bootstrapTable('getData', true);
var enterprise = "";let enterpriseSum = 0; let noRmb = 0;
let rmb = 0;let noRmbSum = 0;let rmbSum = 0;let noUsd = 0;
let usd = 0;let noUsdSum = 0; let usdSum = 0;
for(let i=0;i<getData.length;i++){
enterprise += getData[i].materialName + ":" + getData[i].materialNum +",";
enterpriseSum += getData[i].materialNum;
noRmb += getData[i].materialNoRmb;
rmb += getData[i].materialRmb ;
noRmbSum += getData[i].materialNoRmbSum;
rmbSum += getData[i].materialRmbSum;
noUsd += getData[i].materialNoUsd ;
@ -659,16 +647,16 @@
noUsdSum += getData[i].materialNoUsdSum;
usdSum += getData[i].materialUsdSum;
}
$("#enterprise_add").val(enterprise);
$("#enterpriseSum_add").val(enterpriseSum);
$("#noRmb_add").val(noRmb);
$("#rmb_add").val(rmb);
$("#noRmbSum_add").val(noRmbSum);
$("#rmbSum_add").val(rmbSum);
$("#noUsd_add").val(noUsd);
$("#usd_add").val(usd);
$("#noUsdSum_add").val(noUsdSum);
$("#usdSum_add").val(usdSum);
$("#enterprise_edit").val(enterprise);
$("#enterpriseSum_edit").val(Number(enterpriseSum).toFixed(2));
$("#noRmb_edit").val(Number(noRmb).toFixed(2));
$("#rmb_edit").val(Number(rmb).toFixed(2));
$("#noRmbSum_edit").val(Number(noRmbSum).toFixed(2));
$("#rmbSum_edit").val(Number(rmbSum).toFixed(2));
$("#noUsd_edit").val(Number(noUsd).toFixed(2));
$("#usd_edit").val(Number(usd).toFixed(2));
$("#noUsdSum_edit").val(Number(noUsdSum).toFixed(2));
$("#usdSum_edit").val(Number(usdSum).toFixed(2));
}
// 结算金额
</script>

52
ruoyi-admin/src/main/resources/templates/system/salesOrder/salesOrder.html

@ -193,8 +193,6 @@
<script th:inline="javascript">
var editFlag = [[${@permission.hasPermi('system:salesOrder:edit')}]];
var removeFlag = [[${@permission.hasPermi('system:salesOrder:remove')}]];
var auditFlag = [[${@permission.hasPermi('system:salesOrder:audit')}]];
var addFlag = [[${@permission.hasPermi('system:salesOrder:add')}]];
var salesOrderTypeDatas = [[${@dict.getType('sys_order_type')}]];
var useStatusDatas = [[${@dict.getType('useStatus')}]];
var auditStatusDatas = [[${@dict.getType('auditStatus')}]];
@ -230,6 +228,7 @@
updateUrl: prefix + "/edit/{id}",
removeUrl: prefix + "/remove",
exportUrl: prefix + "/export",
detailUrl: prefix + "/detail/{id}",
clickToSelect: true,
modalName: "销售订单",
fixedColumns:true,
@ -356,34 +355,35 @@
{title: '操作',
align: 'center',
formatter: function (value, row, index) {
if(row.auditStatus=="1" && row.useStatus=="1" && !row.cancelInstanceId){
var actions = [];
// 作废
actions.push('<a class="btn btn-danger btn-xs" href="javascript:void(0)" onclick="$.operate.cancel(\'' + row.id + '\')"><i class="fa fa-remove"></i> 作废</a>');
actions.push('<a class="btn btn-danger btn-xs" href="javascript:void(0)" onclick="$.operate.cancel(\'' + row.salesOrderId + '\')"><i class="fa fa-remove"></i> 作废</a>');
// 编辑
actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i> 编辑</a> ');
}
actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.salesOrderId + '\')"><i class="fa fa-edit"></i> 编辑</a> ');
// 已作废
if(row.useStatus=="2" && !row.restoreInstanceId){
// 恢复
actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="$.operate.restore(\'' + row.id + '\')"><i class="fa fa-window-restore"></i> 恢复</a> ');
}
// 有流程实例id
if (row.instanceId) {
// 有待办人展示审批按钮,
if (row.todoUserId) {
var todoUserIdList = row.todoUserId.split(",");
if(todoUserIdList.includes(loginName) || loginName == 'admin'){
var nodeName = row.taskName=='驳回调整'?' 调整申请':' 审批';
actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="showVerifyDialog(\'' + prefix + '\',\'' + row.taskId + '\', \'' + row.taskName+"-"+row.instanceTypeName+"申请" + '\')"><i class="fa fa-edit"></i> '+nodeName+'</a> ');
}
}
// 审批历史
actions.push('<a class="btn btn-warning btn-xs" href="javascript:void(0)" onclick="showHistoryDialog(\'' + row.instanceId + '\')"><i class="fa fa-list"></i> 审批历史</a> ');
// 进度查看
actions.push('<a class="btn btn-info btn-xs" href="javascript:void(0)" onclick="showProcessImgDialog(\'' + row.instanceId + '\')"><i class="fa fa-image"></i> 进度查看</a> ');
}
// if(row.useStatus=="2" && !row.restoreInstanceId){
// // 恢复
// actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="$.operate.restore(\'' + row.id + '\')"><i class="fa fa-window-restore"></i> 恢复</a> ');
// }
// // 有流程实例id
// if (row.instanceId) {
// // 有待办人展示审批按钮,
// if (row.todoUserId) {
// var todoUserIdList = row.todoUserId.split(",");
// if(todoUserIdList.includes(loginName) || loginName == 'admin'){
// var nodeName = row.taskName=='驳回调整'?' 调整申请':' 审批';
// actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="showVerifyDialog(\'' + prefix + '\',\'' + row.taskId + '\', \'' + row.taskName+"-"+row.instanceTypeName+"申请" + '\')"><i class="fa fa-edit"></i> '+nodeName+'</a> ');
// }
// }
// // 审批历史
// actions.push('<a class="btn btn-warning btn-xs" href="javascript:void(0)" onclick="showHistoryDialog(\'' + row.instanceId + '\')"><i class="fa fa-list"></i> 审批历史</a> ');
// // 进度查看
// actions.push('<a class="btn btn-info btn-xs" href="javascript:void(0)" onclick="showProcessImgDialog(\'' + row.instanceId + '\')"><i class="fa fa-image"></i> 进度查看</a> ');
// }
// 详情
actions.push('<a class="btn btn-primary btn-xs" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.id + '\')"><i class="fa fa-eye"></i> 详情</a> ');
actions.push('<a class="btn btn-primary btn-xs" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.salesOrderId + '\')"><i class="fa fa-eye"></i> 详情</a> ');
return actions.join('');
}
}
]

2
ruoyi-admin/src/main/resources/templates/system/shippingaddress/add.html

@ -90,7 +90,7 @@
//客户信息
var customerodata = []
$.ajax({
url: ctx + "system/customer/list",
url: ctx + "system/customer/customerList",
type: "POST",
success: function (res) {
// console.log(res)

Loading…
Cancel
Save