diff --git a/ruoyi-admin/src/main/resources/.DS_Store b/ruoyi-admin/src/main/resources/.DS_Store index 18661cdb..0ec5eecf 100644 Binary files a/ruoyi-admin/src/main/resources/.DS_Store and b/ruoyi-admin/src/main/resources/.DS_Store differ diff --git a/ruoyi-admin/src/main/resources/templates/login.html b/ruoyi-admin/src/main/resources/templates/login.html index abf4108c..3a1fab2a 100644 --- a/ruoyi-admin/src/main/resources/templates/login.html +++ b/ruoyi-admin/src/main/resources/templates/login.html @@ -45,7 +45,7 @@

登录：

你若不离不弃，我必生死相依

- +
diff --git a/ruoyi-admin/src/main/resources/templates/manage/delivery/delivery.html b/ruoyi-admin/src/main/resources/templates/manage/delivery/delivery.html index f85b245f..6a34a025 100644 --- a/ruoyi-admin/src/main/resources/templates/manage/delivery/delivery.html +++ b/ruoyi-admin/src/main/resources/templates/manage/delivery/delivery.html @@ -10,10 +10,6 @@
    -
  • - - -
  • @@ -90,7 +86,7 @@ }, { field: 'id', - title: '主键，自增', + title: '主键', visible: false }, { diff --git a/ruoyi-admin/src/main/resources/templates/manage/delivery/edit.html b/ruoyi-admin/src/main/resources/templates/manage/delivery/edit.html index 20c841d5..2e85eaa4 100644 --- a/ruoyi-admin/src/main/resources/templates/manage/delivery/edit.html +++ b/ruoyi-admin/src/main/resources/templates/manage/delivery/edit.html @@ -10,7 +10,7 @@
    - +
    - +
    + + + +
    @@ -248,7 +251,7 @@ $("#treeName").val(body.find('#treeName').val()); $.modal.close(index); } - function selectDeptTreePartener() { + function selectDeptTreePartner() { var deptId = $.common.isEmpty($("#treeId1").val()) ? "100" : $("#treeId1").val(); console.log(deptId) var url = ctx + "system/user/selectDeptTree/" + deptId; @@ -256,11 +259,11 @@ title: '选择部门', width: "380", url: url, - callBack: doSubmitPartener + callBack: doSubmitPartner }; $.modal.openOptions(options); } - function doSubmitPartener(index, layero){ + function doSubmitPartner(index, layero){ var body = $.modal.getChildFrame(index); $("#treeId1").val(body.find('#treeId').val()); $("#treeName1").val(body.find('#treeName').val()); 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 29f50cda..b056c24e 100644 --- a/ruoyi-admin/src/main/resources/templates/manage/order/edit.html +++ b/ruoyi-admin/src/main/resources/templates/manage/order/edit.html @@ -7,7 +7,6 @@
    -

    合同档案信息

    @@ -88,13 +87,10 @@
    - -
    -
    - - - -
    +
    + + +
    @@ -103,8 +99,11 @@
    - - +
    + + + +
    @@ -121,8 +120,8 @@
    - -
    + +
    @@ -170,7 +169,7 @@ $("#treeName").val(body.find('#treeName').val()); $.modal.close(index); } - function selectDeptTreePartener() { + function selectDeptTreePartner() { var deptId = $.common.isEmpty($("#treeId1").val()) ? "100" : $("#treeId1").val(); console.log(deptId) var url = ctx + "system/user/selectDeptTree/" + deptId; @@ -178,11 +177,11 @@ title: '选择部门', width: "380", url: url, - callBack: doSubmitPartener + callBack: doSubmitPartner }; $.modal.openOptions(options); } - function doSubmitPartener(index, layero){ + function doSubmitPartner(index, layero){ var body = $.modal.getChildFrame(index); $("#treeId1").val(body.find('#treeId').val()); $("#treeName1").val(body.find('#treeName').val()); diff --git a/ruoyi-admin/src/main/resources/templates/manage/order/order.html b/ruoyi-admin/src/main/resources/templates/manage/order/order.html index 3251cd91..61b8cb45 100644 --- a/ruoyi-admin/src/main/resources/templates/manage/order/order.html +++ b/ruoyi-admin/src/main/resources/templates/manage/order/order.html @@ -77,7 +77,7 @@ }, { field: 'id', - title: '主键，自增', + title: '主键', visible: false }, { diff --git a/ruoyi-admin/src/main/resources/templates/system/product/product.html b/ruoyi-admin/src/main/resources/templates/system/product/product.html index bbf773cb..d2c72a17 100644 --- a/ruoyi-admin/src/main/resources/templates/system/product/product.html +++ b/ruoyi-admin/src/main/resources/templates/system/product/product.html @@ -11,7 +11,7 @@
    • - +
    • @@ -84,14 +84,6 @@ field: 'model', title: '产品型号' }, - { - field: 'description', - title: '产品描述' - }, - { - field: 'remark', - title: '备注' - }, { field: 'createdAt', title: '创建时间' 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 38a8d63b..c134ec6b 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 @@ -58,8 +58,8 @@ public class OrderInfo extends BaseEntity private String orderDeptName; /** 代理商编码 */ - private Long partenerDept; - private String partenerDeptName; + private Long partnerDept; + private String partnerDeptName; /** 合同签定日期 */ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @@ -192,14 +192,14 @@ public class OrderInfo extends BaseEntity return orderDept; } - public void setPartenerDept(Long partenerDept) + public void setPartnerDept(Long partnerDept) { - this.partenerDept = partenerDept; + this.partnerDept = partnerDept; } - public Long getPartenerDept() + public Long getPartnerDept() { - return partenerDept; + return partnerDept; } public void setOrderDate(Date orderDate) @@ -270,12 +270,12 @@ public class OrderInfo extends BaseEntity this.orderDeptName = orderDeptName; } - public String getPartenerDeptName() { - return partenerDeptName; + public String getPartnerDeptName() { + return partnerDeptName; } - public void setPartenerDeptName(String partenerDeptName) { - this.partenerDeptName = partenerDeptName; + public void setPartnerDeptName(String partnerDeptName) { + this.partnerDeptName = partnerDeptName; } @Override @@ -292,7 +292,7 @@ public class OrderInfo extends BaseEntity .append("customerEmail", getCustomerEmail()) .append("orderType", getOrderType()) .append("orderDept", getOrderDept()) - .append("partenerDept", getPartenerDept()) + .append("partnerDept", getPartnerDept()) .append("orderDate", getOrderDate()) .append("status", getStatus()) .append("remark", getRemark()) diff --git a/ruoyi-sip/src/main/resources/mapper/manage/OrderInfoMapper.xml b/ruoyi-sip/src/main/resources/mapper/manage/OrderInfoMapper.xml index 052c54ab..5bdf0416 100644 --- a/ruoyi-sip/src/main/resources/mapper/manage/OrderInfoMapper.xml +++ b/ruoyi-sip/src/main/resources/mapper/manage/OrderInfoMapper.xml @@ -16,7 +16,7 @@ - + @@ -54,7 +54,7 @@ customer_email, order_type, order_dept, - partener_dept, + partner_dept, order_date, status, remark, @@ -89,7 +89,7 @@ t1.customer_email, t1.order_type, t1.order_dept, - t1.partener_dept, + t1.partner_dept, t1.order_date, t1.status, t1.remark, @@ -97,10 +97,10 @@ t1. updated_at, t1.deleted_at, t2.dept_name as order_dept_name, - t3.dept_name as partener_dept_name + t3.dept_name as partner_dept_name from order_info t1 left join sys_dept t2 on t1.order_dept = t2.dept_id - left join sys_dept t3 on t1.partener_dept = t3.dept_id + left join sys_dept t3 on t1.partner_dept = t3.dept_id where t1.id = #{id} @@ -148,11 +148,11 @@ customer_email, order_type, order_dept, - partener_dept, + partner_dept, order_date, status, remark, - created_at,status, + created_at,status #{projectCode}, @@ -165,7 +165,7 @@ #{customerEmail}, #{orderType}, #{orderDept}, - #{partenerDept}, + #{partnerDept}, #{orderDate}, #{status}, #{remark}, @@ -186,7 +186,7 @@ customer_email = #{customerEmail}, order_type = #{orderType}, order_dept = #{orderDept}, - partener_dept = #{partenerDept}, + partner_dept = #{partnerDept}, order_date = #{orderDate}, status = #{status}, remark = #{remark}, @@ -232,7 +232,7 @@ - update order_list set status=1,deleted_at=now() where order_id in + update order_list set status=1, deleted_at=now() where order_id in #{orderId} diff --git a/ruoyi-sip/src/main/resources/mapper/system/ProductInfoMapper.xml b/ruoyi-sip/src/main/resources/mapper/system/ProductInfoMapper.xml index a3f2f474..30c85aab 100644 --- a/ruoyi-sip/src/main/resources/mapper/system/ProductInfoMapper.xml +++ b/ruoyi-sip/src/main/resources/mapper/system/ProductInfoMapper.xml @@ -22,11 +22,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -52,7 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" model, description, remark, - created_at, + created_at,status #{productCode}, @@ -60,7 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{model}, #{description}, #{remark}, - NOW(), + NOW(),0 @@ -80,11 +80,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from product_info where id = #{id} + update product_info set status=1, deleted_at=now() where id = #{id} - delete from product_info where id in + update product_info set status=1, deleted_at=now() where id in #{id}