+
+
- | 序号 |
- 产品编码 |
- 产品型号 |
- 描述 |
- 数量 |
- 目录单价(¥) |
- 指导折扣 |
- 折扣 |
- 单价(¥) |
- 总价(¥) |
- 目录总价(¥) |
- 备注 |
- 操作 |
+ 序号 |
+ 产品编码 |
+ 产品型号 |
+ 描述 |
+ 数量 |
+ 目录单价(¥) |
+ 指导折扣 |
+ 折扣 |
+ 单价(¥) |
+ 总价(¥) |
+ 目录总价(¥) |
+ 备注 |
+ 操作 |
+
- |
-
+
|
-
+
|
@@ -182,7 +164,7 @@
| |
-
+
|
@@ -194,7 +176,7 @@
|
-
+
|
@@ -231,12 +213,12 @@
|
- |
-
+
|
@@ -254,7 +236,11 @@
initSearchProduct('11,22,99')
initPrice()
}
-
+ function getData(that,name){
+ let currentTd = $(that).closest('td'); // 获取当前 td 元素
+ let priceVal = currentTd.find('.'+name).val()
+ $(that).val(priceVal)
+ }
function initPrice() {
$('.productTable .quantity').on('input', function () {
let num = $(this).val()
@@ -291,7 +277,7 @@
}
})
- // $('.productTable .guidanceDiscount').on('input', function () {
+ // $('.productTable .guidanceDiscount-format').on('input', function () {
// let val = $(this).val()
// let cataloguePrice = $(this).parent().parent().find('.cataloguePrice').val()
// $(this).parent().parent().find('.discount').val(val)
@@ -317,11 +303,19 @@
let allPrice = $(this).parent().parent().parent().find('.allPrice').val()
$(this).parent().parent().parent().find('.allPrice-formmat').val(formatAmountNumber(allPrice))
})
- $('.productTable .price').change('input', function () {
+ $('.productTable .price-formmat').change('input', function () {
let val = $(this).val()
let num = $(this).parent().parent().find('.quantity').val()
+ $(this).parent().parent().find('.price').val(val)
+
$(this).parent().parent().find('.allPrice').val((val * num).toFixed(2))
$(this).parent().parent().find('.allPrice-formmat').val(formatAmountNumber((val * num).toFixed(2)))
+
+ let cataloguePrice = $(this).parent().parent().find('.cataloguePrice').val()
+ let discount = (val*1.0000/cataloguePrice).toFixed(4);
+ $(this).parent().parent().find('.discount').val(discount)
+ $(this).parent().parent().find('.discount-format').val(discount * 100)
+ // $(this).val(formatAmountNumber(val))
})
}
@@ -351,6 +345,7 @@
$.modal.close(index);
}
+
/*]]>*/
diff --git a/ruoyi-admin/src/main/resources/templates/manage/order/add.html b/ruoyi-admin/src/main/resources/templates/manage/order/add.html
index ca809349..d4779448 100644
--- a/ruoyi-admin/src/main/resources/templates/manage/order/add.html
+++ b/ruoyi-admin/src/main/resources/templates/manage/order/add.html
@@ -102,7 +102,7 @@
diff --git a/ruoyi-admin/src/main/resources/templates/manage/order/edit.html b/ruoyi-admin/src/main/resources/templates/manage/order/edit.html
index 3d11e276..548647bd 100644
--- a/ruoyi-admin/src/main/resources/templates/manage/order/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/manage/order/edit.html
@@ -102,7 +102,7 @@
diff --git a/ruoyi-admin/src/main/resources/templates/project/order/add.html b/ruoyi-admin/src/main/resources/templates/project/order/add.html
index e55c6303..43aa52c6 100644
--- a/ruoyi-admin/src/main/resources/templates/project/order/add.html
+++ b/ruoyi-admin/src/main/resources/templates/project/order/add.html
@@ -377,20 +377,13 @@
}
function changeName(){
- console.log('11111111')
let name = $('#projectName').val()
- console.log(name)
let versionCode = $('#versionCode').val()
- console.log(versionCode)
let result='';
if (name){
result=name;
- console.log('22222')
- console.log(result)
if (versionCode){
- result+='Rev '+versionCode;
- console.log('33333333')
- console.log(result)
+ result+='Rev.'+versionCode;
}
}
@@ -469,7 +462,7 @@
window.localStorage.setItem('getDetail', 1)
$.operate.get(ctx + `sip/project/query/${id}`, function (res) {
let data = res.data
- $('#projectNameBox').text(data.projectName+'Rev 1')
+ $('#projectNameBox').text(data.projectName+'Rev.1')
$('[name="customerCode"]').val(data.customerCode);
$('[name="customerName"]').val(data.customerName);
$('[name="projectCode"]').val(data.projectCode);
@@ -523,6 +516,17 @@
minView: "month",
autoclose: true
});
+
+
+
+ let user=[[${user}]]
+ if (user){
+ $("input[name='duty']").val(user.userId)
+ $("input[name='dutyName']").val(user.userName)
+ $("input[name='dutyEmail']").val(user.email)
+ $("input[name='dutyPhone']").val(user.phonenumber)
+ }
+
})
function searchProject() {
@@ -567,7 +571,7 @@
$.modal.alertWarning("请选择一个项目");
return;
}
- $('#projectNameBox').text(rows[0].projectName+'Rev 1')
+ $('#projectNameBox').text(rows[0].projectName+'Rev.1')
$('[name="customerCode"]').val(rows[0].customerCode);
$('[name="customerName"]').val(rows[0].customerName);
$('[name="projectCode"]').val(rows[0].projectCode);
@@ -835,23 +839,25 @@ ${
function initSaveDraft() {
let draft = $(`
- 保存草稿`)
- parent.$('.layui-layer-btn').before(draft)
+ color: #fff;cursor: pointer"> 保存`)
+ parent.$('.layui-layer-btn1').before(draft)
parent.$('.saveDraft').on('click', function () {
$('[name="orderStatus"]').val(0)
submitHandler('draft')
})
+
parent.$('.layui-layer-btn0').on('click', function () {
$('[name="orderStatus"]').val(1)
submitHandler()
})
+ parent.$('.layui-layer-btn0').attr('style','display:none')
}
diff --git a/ruoyi-admin/src/main/resources/templates/project/order/edit.html b/ruoyi-admin/src/main/resources/templates/project/order/edit.html
index b891b989..476d7c24 100644
--- a/ruoyi-admin/src/main/resources/templates/project/order/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/project/order/edit.html
@@ -110,6 +110,8 @@
编辑订单
|
+
@@ -208,7 +210,7 @@
required>
| 版本号* |
- |
@@ -485,6 +487,21 @@
autoclose: true
});
initData()
+
+
+ let user = [[${user}]]
+ if (user) {
+ if (!$("input[name='dutyName']").val()) {
+ $("input[name='dutyName']").val(user.userName)
+ $("input[name='duty']").val(user.userId)
+ }
+ if (!$("input[name='dutyEmail']").val()) {
+ $("input[name='dutyEmail']").val(user.email)
+ }
+ if (!$("input[name='dutyPhone']").val()) {
+ $("input[name='dutyPhone']").val(user.phonenumber)
+ }
+ }
})
function searchProject() {
@@ -567,12 +584,32 @@
$('[name="industryType"]').val([[${projectOrderInfo.industryType}]]);
let name = [[${projectOrderInfo.projectName}]];
let versionCode = [[${projectOrderInfo.versionCode}]];
+ let version = ''
if (versionCode){
- name=name + 'Rev ' + versionCode
+ version += 'Rev.' + versionCode + ' ';
}
+ let orderDate = [[${projectOrderInfo.estimatedOrderTime}]]
+ if (orderDate) {
+ version += [[${#dates.format(projectOrderInfo.estimatedOrderTime, 'yyyy-MM-dd')}]];
+ }
+ $('#version-show').text(version)
+ if (name) {
$('#projectNameBox').text(name)
+ }
}
+ function changeName() {
+ let versionCode = $('input[name="versionCode"]').val()
+ let version = ''
+ if (versionCode) {
+ version += 'Rev.' + versionCode + ' ';
+ }
+ let orderDate = [[${projectOrderInfo.estimatedOrderTime}]]
+ if (orderDate) {
+ version += [[${#dates.format(projectOrderInfo.estimatedOrderTime, 'yyyy-MM-dd')}]];
+ }
+ $('#version-show').text(version)
+ }
function doSubmitPeople(index, layero) {
var rows = layero.find("iframe")[0].contentWindow.getSelections();
if (rows.length == 0) {
@@ -795,15 +832,15 @@ ${
function initSaveDraft() {
let draft = $(`
- 保存草稿`)
- parent.$('.layui-layer-btn').before(draft)
+ color: #fff;cursor: pointer"> 保存`)
+ parent.$('.layui-layer-btn1').before(draft)
parent.$('.saveDraft').on('click', function () {
$('[name="orderStatus"]').val(0)
submitHandler('draft')
@@ -812,6 +849,7 @@ ${
$('[name="orderStatus"]').val(1)
submitHandler()
})
+ parent.$('.layui-layer-btn0').attr('style', 'display:none')
}
diff --git a/ruoyi-admin/src/main/resources/templates/system/partner/partner.html b/ruoyi-admin/src/main/resources/templates/system/partner/partner.html
index fa904dde..642e8305 100644
--- a/ruoyi-admin/src/main/resources/templates/system/partner/partner.html
+++ b/ruoyi-admin/src/main/resources/templates/system/partner/partner.html
@@ -137,7 +137,7 @@
},
{
field: 'createAt',
- title: ''
+ title: '创建时间'
},
{
title: '操作',
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/ProjectOrderInfoController.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/ProjectOrderInfoController.java
index f73c1964..175b7631 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/ProjectOrderInfoController.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/ProjectOrderInfoController.java
@@ -94,8 +94,9 @@ public class ProjectOrderInfoController extends BaseController
*/
@RequiresPermissions("project:order:add")
@GetMapping("/add")
- public String add()
+ public String add(ModelMap mmap)
{
+ mmap.put("user", ShiroUtils.getSysUser());
return prefix + "/add";
}
@@ -120,6 +121,7 @@ public class ProjectOrderInfoController extends BaseController
{
ProjectOrderInfo projectOrderInfo = projectOrderInfoService.selectProjectOrderInfoById(id);
mmap.put("projectOrderInfo", projectOrderInfo);
+ mmap.put("user", ShiroUtils.getSysUser());
return prefix + "/edit";
}
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OrderInfo.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OrderInfo.java
index a88285fd..3f98e050 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OrderInfo.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OrderInfo.java
@@ -102,6 +102,10 @@ public class OrderInfo extends BaseEntity
private List orderListList;
private String serialNumber;
private String createByName;
+ /**
+ * 0: 未发货 1:已发货
+ */
+ private String ship;
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OrderInfoServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OrderInfoServiceImpl.java
index 544a84b7..25811f83 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OrderInfoServiceImpl.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OrderInfoServiceImpl.java
@@ -202,7 +202,7 @@ public class OrderInfoServiceImpl implements IOrderInfoService
if (StringUtils.isNotEmpty(dto.getSerialNumber())){
queryParams.setSerialNumber(dto.getSerialNumber());
}
-
+queryParams.setShip("1");
List orderInfos = orderInfoMapper.selectOrderInfoList(queryParams);
if (CollUtil.isEmpty(orderInfos)) {
return Collections.emptyList();
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java
index 20d53d30..da13efb1 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java
@@ -397,25 +397,26 @@ public class ProjectOrderInfoServiceImpl implements IProjectOrderInfoService {
headerList.add(Collections.singletonList("行业"));
headerList.add(Collections.singletonList("代表处"));
headerList.add(Collections.singletonList("进货商接口人"));
- headerList.add(Collections.singletonList("Email"));
+// headerList.add(Collections.singletonList("Email"));
headerList.add(Collections.singletonList("联系方式"));
headerList.add(Collections.singletonList("合同编号"));
headerList.add(Collections.singletonList("币种"));
headerList.add(Collections.singletonList("订单金额"));
headerList.add(Collections.singletonList("维保金额"));
- headerList.add(Collections.singletonList("执行单有效截止时间"));
- headerList.add(Collections.singletonList("要求到货时间"));
- headerList.add(Collections.singletonList("公司直发"));
+ headerList.add(Collections.singletonList("下单时间"));
+// headerList.add(Collections.singletonList("执行单有效截止时间"));
+// headerList.add(Collections.singletonList("要求到货时间"));
+// headerList.add(Collections.singletonList("公司直发"));
headerList.add(Collections.singletonList("下单通路"));
- headerList.add(Collections.singletonList("供货商"));
+// headerList.add(Collections.singletonList("供货商"));
headerList.add(Collections.singletonList("汇智责任人"));
- headerList.add(Collections.singletonList("Email"));
- headerList.add(Collections.singletonList("联系方式"));
+// headerList.add(Collections.singletonList("Email"));
+// headerList.add(Collections.singletonList("联系方式"));
headerList.add(Collections.singletonList("进货商"));
- headerList.add(Collections.singletonList("进货商代码"));
+// headerList.add(Collections.singletonList("进货商代码"));
headerList.add(Collections.singletonList("进货商类型"));
headerList.add(Collections.singletonList("进货商联系人"));
- headerList.add(Collections.singletonList("Email"));
+// headerList.add(Collections.singletonList("Email"));
headerList.add(Collections.singletonList("联系方式"));
headerList.add(Collections.singletonList("其他特别说明"));
headerList.add(Collections.singletonList("订单状态"));
@@ -463,26 +464,27 @@ public class ProjectOrderInfoServiceImpl implements IProjectOrderInfoService {
row.add(info.getIndustryType());
row.add(info.getAgentName());
row.add(info.getBusinessPerson());
- row.add(info.getBusinessEmail());
+// row.add(info.getBusinessEmail());
row.add(info.getBusinessPhone());
row.add(info.getOrderCode());
row.add(DictUtils.getDictLabel("currency_type", info.getCurrencyType()));
row.add(info.getShipmentAmount() != null ? info.getShipmentAmount().toString() : "");
- row.add(DateUtil.format(info.getOrderEndTime(), "yyyy-MM-dd"));
- row.add(DateUtil.format(info.getDeliveryTime(), "yyyy-MM-dd"));
- row.add(DictUtils.getDictLabel("company_delivery", info.getCompanyDelivery()));
+ row.add(DateUtil.format(info.getEstimatedOrderTime(), "yyyy-MM-dd"));
+// row.add(DateUtil.format(info.getOrderEndTime(), "yyyy-MM-dd"));
+// row.add(DateUtil.format(info.getDeliveryTime(), "yyyy-MM-dd"));
+// row.add(DictUtils.getDictLabel("company_delivery", info.getCompanyDelivery()));
row.add(StringUtils.isEmpty(info.getOrderChannel()) ? "" :
"1".equals(info.getOrderChannel()) ? "总代" : "直签");
- row.add(info.getSupplier());
+// row.add(info.getSupplier());
row.add(info.getDutyName());
- row.add(info.getDutyEmail());
- row.add(info.getDutyPhone());
+// row.add(info.getDutyEmail());
+// row.add(info.getDutyPhone());
row.add(info.getPartnerName());
- row.add(info.getPartnerCode());
+// row.add(info.getPartnerCode());
row.add(DictUtils.getDictLabel("identify_level", info.getLevel()));
row.add(info.getPartnerUserName());
- row.add(info.getPartnerEmail());
+// row.add(info.getPartnerEmail());
row.add(info.getPartnerPhone());
row.add(info.getRemark());
row.add(DictUtils.getDictLabel("order_status", info.getOrderStatus()));
@@ -537,7 +539,7 @@ public class ProjectOrderInfoServiceImpl implements IProjectOrderInfoService {
row.add(totalPrice.toString());
//维保金额
- row.add(12, maintenancePrice.toString());
+ row.add(11, maintenancePrice.toString());
dataList.add(row);
}
diff --git a/ruoyi-sip/src/main/resources/mapper/manage/OrderInfoMapper.xml b/ruoyi-sip/src/main/resources/mapper/manage/OrderInfoMapper.xml
index 4656007f..6f4bf278 100644
--- a/ruoyi-sip/src/main/resources/mapper/manage/OrderInfoMapper.xml
+++ b/ruoyi-sip/src/main/resources/mapper/manage/OrderInfoMapper.xml
@@ -124,13 +124,30 @@
t1.update_by,
t2.user_name as create_by_name
from order_info t1
- left join sys_user t2 on t1.create_by=t2.user_id
+ left join sys_user t2 on t1.create_by=t2.user_id
and t1.status=0
+
+
+
+ and t1.id in (SELECT DISTINCT t2.order_id FROM delivery_list t1 INNER JOIN order_delivery t2 ON
+ t1.delivery_id = t2.id)
+
+
+ and t1.id not in (SELECT DISTINCT t2.order_id FROM delivery_list t1 INNER JOIN order_delivery t2
+ ON t1.delivery_id = t2.id)
+
+
+
+
+
and t1.order_code like concat('%', #{orderCode}, '%')
and t1.order_name like concat('%', #{orderName}, '%')
- and t1.project_code like concat('%', #{projectCode}, '%')
- and t1.customer_name like concat('%', #{customerName},
+ and t1.project_code like concat('%', #{projectCode},
+ '%')
+
+ and t1.customer_name like concat('%',
+ #{customerName},
'%')
and t1.order_type = #{orderType}
|