mula
/
unis_sip
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改了合同档案的显示问题

master
mula.liu 2025-04-22 15:42:53 +08:00
parent 2f11fabc3e
commit 3e4a0c6272
12 changed files with 78 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
ruoyi-admin/src/main/resources/.DS_Store vendored
View File

Binary file not shown.

2
ruoyi-admin/src/main/resources/templates/login.html
View File

@ -45,7 +45,7 @@
<h4 class="no-margins">登录：</h4> <h4 class="no-margins">登录：</h4>
<p class="m-t-md">你若不离不弃，我必生死相依</p> <p class="m-t-md">你若不离不弃，我必生死相依</p>
<input type="text" name="username" class="form-control uname" placeholder="用户名" value="admin" /> <input type="text" name="username" class="form-control uname" placeholder="用户名" value="admin" />
<input type="password" name="password" class="form-control pword" placeholder="密码" value="admin123" /> <input type="password" name="password" class="form-control pword" placeholder="密码" value="admin@123" />
<div class="row m-t" th:if="${captchaEnabled==true}"> <div class="row m-t" th:if="${captchaEnabled==true}">
<div class="col-xs-6"> <div class="col-xs-6">
<input type="text" name="validateCode" class="form-control code" placeholder="验证码" maxlength="5" /> <input type="text" name="validateCode" class="form-control code" placeholder="验证码" maxlength="5" />

6
ruoyi-admin/src/main/resources/templates/manage/delivery/delivery.html
View File

@ -10,10 +10,6 @@
<form id="formId"> <form id="formId">
<div class="select-list"> <div class="select-list">
<ul> <ul>
<li>
<label>关联合同id：</label>
<input type="text" name="orderId"/>
</li>
<li> <li>
<label>发货单号：</label> <label>发货单号：</label>
<input type="text" name="deliveryCode"/> <input type="text" name="deliveryCode"/>
@ -90,7 +86,7 @@
}, },
{ {
field: 'id', field: 'id',
title: '主键，自增', title: '主键',
visible: false visible: false
}, },
{ {

2
ruoyi-admin/src/main/resources/templates/manage/delivery/edit.html
View File

@ -10,7 +10,7 @@
<input name="id" th:field="*{id}" type="hidden"> <input name="id" th:field="*{id}" type="hidden">
<div class="col-xs-6"> <div class="col-xs-6">
<div class="form-group"> <div class="form-group">
<label class="col-sm-4 control-label is-required">关联合同id：</label> <label class="col-sm-4 control-label is-required">关联合同：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<select name="orderId" class="form-control" th:orderId="*{orderId}" required> <select name="orderId" class="form-control" th:orderId="*{orderId}" required>

48
ruoyi-admin/src/main/resources/templates/manage/delivery/import.html
View File

@ -48,33 +48,33 @@ url: prefix + "/list",
params:{ params:{
deliveryId:$('#bootstrap-table').attr('deliveryid') deliveryId:$('#bootstrap-table').attr('deliveryid')
}, },
columns: [{ columns: [{
checkbox: false, checkbox: false,
},
{
field: 'id',
title: '主键，自增',
},
{
field: 'orderCode',
title: '合同编号'
}, },
{
field: 'productCode',
title: '产品编码'
},
{
field: 'serialNumber',
title: '产品序列号'
},
{ {
field: 'remark', field: 'id',
title: '备注' title: '主键',
}, },
] {
}; field: 'orderCode',
$.table.init(options); title: '合同编号'
}); },
{
field: 'productCode',
title: '产品编码'
},
{
field: 'serialNumber',
title: '产品序列号'
},
{
field: 'remark',
title: '备注'
},
]
};
$.table.init(options);
});
function downloadTem(){ function downloadTem(){
$.modal.loading("正在下载，请稍候..."); $.modal.loading("正在下载，请稍候...");
$.post( prefix + "/export", {deliveryId:-1,productCode:'',serialNumber:''}, function(result) { $.post( prefix + "/export", {deliveryId:-1,productCode:'',serialNumber:''}, function(result) {

13
ruoyi-admin/src/main/resources/templates/manage/order/add.html
View File

@ -98,8 +98,11 @@
<div class="form-group"> <div class="form-group">
<label class="col-sm-4 control-label is-required">代理商编码：</label> <label class="col-sm-4 control-label is-required">代理商编码：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="partenerDept" type="hidden" id="treeId1" class="form-control" required> <div class="input-group">
<input class="form-control" type="text" name="orderDeptName" onclick="selectDeptTreePartener()" id="treeName1" required> <input class="form-control" type="text" name="orderDeptName" onclick="selectDeptTreePartner()" id="treeName1" required>
<input name="partnerDept" type="hidden" id="treeId1" >
<span class="input-group-addon"><i class="fa fa-search"></i></span>
</div>
</div> </div>
</div> </div>
</div> </div>
@ -248,7 +251,7 @@
$("#treeName").val(body.find('#treeName').val()); $("#treeName").val(body.find('#treeName').val());
$.modal.close(index); $.modal.close(index);
} }
function selectDeptTreePartener() { function selectDeptTreePartner() {
var deptId = $.common.isEmpty($("#treeId1").val()) ? "100" : $("#treeId1").val(); var deptId = $.common.isEmpty($("#treeId1").val()) ? "100" : $("#treeId1").val();
console.log(deptId) console.log(deptId)
var url = ctx + "system/user/selectDeptTree/" + deptId; var url = ctx + "system/user/selectDeptTree/" + deptId;
@ -256,11 +259,11 @@
title: '选择部门', title: '选择部门',
width: "380", width: "380",
url: url, url: url,
callBack: doSubmitPartener callBack: doSubmitPartner
}; };
$.modal.openOptions(options); $.modal.openOptions(options);
} }
function doSubmitPartener(index, layero){ function doSubmitPartner(index, layero){
var body = $.modal.getChildFrame(index); var body = $.modal.getChildFrame(index);
$("#treeId1").val(body.find('#treeId').val()); $("#treeId1").val(body.find('#treeId').val());
$("#treeName1").val(body.find('#treeName').val()); $("#treeName1").val(body.find('#treeName').val());

29
ruoyi-admin/src/main/resources/templates/manage/order/edit.html
View File

@ -7,7 +7,6 @@
<body class="white-bg"> <body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content"> <div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-order-edit" th:object="${orderInfo}"> <form class="form-horizontal m" id="form-order-edit" th:object="${orderInfo}">
<input name="orderDept" type="hidden" th:field="*{orderDept}" id="treeId"/>
<h4 class="form-header h4">合同档案信息</h4> <h4 class="form-header h4">合同档案信息</h4>
<input name="id" th:field="*{id}" type="hidden"> <input name="id" th:field="*{id}" type="hidden">
<div class="col-xs-6"> <div class="col-xs-6">
@ -88,13 +87,10 @@
<div class="form-group"> <div class="form-group">
<label class="col-sm-4 control-label is-required">代表处：</label> <label class="col-sm-4 control-label is-required">代表处：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<!-- <input name="orderDept" th:field="*{orderDept}" class="form-control" type="text" required>--> <div class="input-group">
<div class="col-sm-8"> <input name="orderDept" type="hidden" th:field="*{orderDept}" id="treeId"/>
<div class="input-group"> <input class="form-control" type="text" name="orderDeptName" onclick="selectDeptTree()" id="treeName" th:field="*{orderDeptName}" required>
<input class="form-control" type="text" name="orderDeptName" onclick="selectDeptTree()" id="treeName" th:field="*{orderDeptName}" required> <span class="input-group-addon"><i class="fa fa-search"></i></span>
<span class="input-group-addon"><i class="fa fa-search"></i></span>
</div>
</div> </div>
</div> </div>
</div> </div>
@ -103,8 +99,11 @@
<div class="form-group"> <div class="form-group">
<label class="col-sm-4 control-label is-required">代理商：</label> <label class="col-sm-4 control-label is-required">代理商：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="partenerDept" type="hidden" th:field="*{partenerDept}" id="treeId1" class="form-control" required> <div class="input-group">
<input class="form-control" type="text" name="orderDeptName" onclick="selectDeptTreePartener()" id="treeName1" th:field="*{partenerDeptName}" required> <input name="partnerDept" type="hidden" th:field="*{partnerDept}" id="treeId1">
<input class="form-control" type="text" name="orderDeptName" onclick="selectDeptTreePartner()" id="treeName1" th:field="*{partnerDeptName}" required>
<span class="input-group-addon"><i class="fa fa-search"></i></span>
</div>
</div> </div>
</div> </div>
</div> </div>
@ -121,8 +120,8 @@
</div> </div>
<div class="col-xs-12"> <div class="col-xs-12">
<div class="form-group"> <div class="form-group">
<label class="col-sm-4 control-label">备注：</label> <label class="col-sm-2 control-label">备注：</label>
<div class="col-sm-8"> <div class="col-sm-10">
<textarea name="remark" class="form-control">[[*{remark}]]</textarea> <textarea name="remark" class="form-control">[[*{remark}]]</textarea>
</div> </div>
</div> </div>
@ -170,7 +169,7 @@
$("#treeName").val(body.find('#treeName').val()); $("#treeName").val(body.find('#treeName').val());
$.modal.close(index); $.modal.close(index);
} }
function selectDeptTreePartener() { function selectDeptTreePartner() {
var deptId = $.common.isEmpty($("#treeId1").val()) ? "100" : $("#treeId1").val(); var deptId = $.common.isEmpty($("#treeId1").val()) ? "100" : $("#treeId1").val();
console.log(deptId) console.log(deptId)
var url = ctx + "system/user/selectDeptTree/" + deptId; var url = ctx + "system/user/selectDeptTree/" + deptId;
@ -178,11 +177,11 @@
title: '选择部门', title: '选择部门',
width: "380", width: "380",
url: url, url: url,
callBack: doSubmitPartener callBack: doSubmitPartner
}; };
$.modal.openOptions(options); $.modal.openOptions(options);
} }
function doSubmitPartener(index, layero){ function doSubmitPartner(index, layero){
var body = $.modal.getChildFrame(index); var body = $.modal.getChildFrame(index);
$("#treeId1").val(body.find('#treeId').val()); $("#treeId1").val(body.find('#treeId').val());
$("#treeName1").val(body.find('#treeName').val()); $("#treeName1").val(body.find('#treeName').val());

2
ruoyi-admin/src/main/resources/templates/manage/order/order.html
View File

@ -77,7 +77,7 @@
}, },
{ {
field: 'id', field: 'id',
title: '主键，自增', title: '主键',
visible: false visible: false
}, },
{ {

10
ruoyi-admin/src/main/resources/templates/system/product/product.html
View File

@ -11,7 +11,7 @@
<div class="select-list"> <div class="select-list">
<ul> <ul>
<li> <li>
<label>BOM编码：</label> <label>编码：</label>
<input type="text" name="productCode"/> <input type="text" name="productCode"/>
</li> </li>
<li> <li>
@ -84,14 +84,6 @@
field: 'model', field: 'model',
title: '产品型号' title: '产品型号'
}, },
{
field: 'description',
title: '产品描述'
},
{
field: 'remark',
title: '备注'
},
{ {
field: 'createdAt', field: 'createdAt',
title: '创建时间' title: '创建时间'

22
ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OrderInfo.java
View File

@ -58,8 +58,8 @@ public class OrderInfo extends BaseEntity
private String orderDeptName; private String orderDeptName;
/** 代理商编码 */ /** 代理商编码 */
private Long partenerDept; private Long partnerDept;
private String partenerDeptName; private String partnerDeptName;
/** 合同签定日期 */ /** 合同签定日期 */
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ -192,14 +192,14 @@ public class OrderInfo extends BaseEntity
return orderDept; 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) public void setOrderDate(Date orderDate)
@ -270,12 +270,12 @@ public class OrderInfo extends BaseEntity
this.orderDeptName = orderDeptName; this.orderDeptName = orderDeptName;
} }
public String getPartenerDeptName() { public String getPartnerDeptName() {
return partenerDeptName; return partnerDeptName;
} }
public void setPartenerDeptName(String partenerDeptName) { public void setPartnerDeptName(String partnerDeptName) {
this.partenerDeptName = partenerDeptName; this.partnerDeptName = partnerDeptName;
} }
@Override @Override
@ -292,7 +292,7 @@ public class OrderInfo extends BaseEntity
.append("customerEmail", getCustomerEmail()) .append("customerEmail", getCustomerEmail())
.append("orderType", getOrderType()) .append("orderType", getOrderType())
.append("orderDept", getOrderDept()) .append("orderDept", getOrderDept())
.append("partenerDept", getPartenerDept()) .append("partnerDept", getPartnerDept())
.append("orderDate", getOrderDate()) .append("orderDate", getOrderDate())
.append("status", getStatus()) .append("status", getStatus())
.append("remark", getRemark()) .append("remark", getRemark())

20
ruoyi-sip/src/main/resources/mapper/manage/OrderInfoMapper.xml
View File

@ -16,7 +16,7 @@
<result property="customerEmail" column="customer_email"/> <result property="customerEmail" column="customer_email"/>
<result property="orderType" column="order_type"/> <result property="orderType" column="order_type"/>
<result property="orderDept" column="order_dept"/> <result property="orderDept" column="order_dept"/>
<result property="partenerDept" column="partener_dept"/> <result property="partnerDept" column="partner_dept"/>
<result property="orderDate" column="order_date"/> <result property="orderDate" column="order_date"/>
<result property="status" column="status"/> <result property="status" column="status"/>
<result property="remark" column="remark"/> <result property="remark" column="remark"/>
@ -54,7 +54,7 @@
customer_email, customer_email,
order_type, order_type,
order_dept, order_dept,
partener_dept, partner_dept,
order_date, order_date,
status, status,
remark, remark,
@ -89,7 +89,7 @@
t1.customer_email, t1.customer_email,
t1.order_type, t1.order_type,
t1.order_dept, t1.order_dept,
t1.partener_dept, t1.partner_dept,
t1.order_date, t1.order_date,
t1.status, t1.status,
t1.remark, t1.remark,
@ -97,10 +97,10 @@
t1. updated_at, t1. updated_at,
t1.deleted_at, t1.deleted_at,
t2.dept_name as order_dept_name, 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 from order_info t1
left join sys_dept t2 on t1.order_dept = t2.dept_id 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} where t1.id = #{id}
</select> </select>
@ -148,11 +148,11 @@
<if test="customerEmail != null">customer_email,</if> <if test="customerEmail != null">customer_email,</if>
<if test="orderType != null">order_type,</if> <if test="orderType != null">order_type,</if>
<if test="orderDept != null">order_dept,</if> <if test="orderDept != null">order_dept,</if>
<if test="partenerDept != null">partener_dept,</if> <if test="partnerDept != null">partner_dept,</if>
<if test="orderDate != null">order_date,</if> <if test="orderDate != null">order_date,</if>
<if test="status != null">status,</if> <if test="status != null">status,</if>
<if test="remark != null">remark,</if> <if test="remark != null">remark,</if>
created_at,status, created_at,status
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="projectCode != null">#{projectCode},</if> <if test="projectCode != null">#{projectCode},</if>
@ -165,7 +165,7 @@
<if test="customerEmail != null">#{customerEmail},</if> <if test="customerEmail != null">#{customerEmail},</if>
<if test="orderType != null">#{orderType},</if> <if test="orderType != null">#{orderType},</if>
<if test="orderDept != null">#{orderDept},</if> <if test="orderDept != null">#{orderDept},</if>
<if test="partenerDept != null">#{partenerDept},</if> <if test="partnerDept != null">#{partnerDept},</if>
<if test="orderDate != null">#{orderDate},</if> <if test="orderDate != null">#{orderDate},</if>
<if test="status != null">#{status},</if> <if test="status != null">#{status},</if>
<if test="remark != null">#{remark},</if> <if test="remark != null">#{remark},</if>
@ -186,7 +186,7 @@
<if test="customerEmail != null">customer_email = #{customerEmail},</if> <if test="customerEmail != null">customer_email = #{customerEmail},</if>
<if test="orderType != null">order_type = #{orderType},</if> <if test="orderType != null">order_type = #{orderType},</if>
<if test="orderDept != null">order_dept = #{orderDept},</if> <if test="orderDept != null">order_dept = #{orderDept},</if>
<if test="partenerDept != null">partener_dept = #{partenerDept},</if> <if test="partnerDept != null">partner_dept = #{partnerDept},</if>
<if test="orderDate != null">order_date = #{orderDate},</if> <if test="orderDate != null">order_date = #{orderDate},</if>
<if test="status != null">status = #{status},</if> <if test="status != null">status = #{status},</if>
<if test="remark != null">remark = #{remark},</if> <if test="remark != null">remark = #{remark},</if>
@ -232,7 +232,7 @@
</delete> </delete>
<delete id="deleteOrderListByOrderIds" parameterType="String"> <delete id="deleteOrderListByOrderIds" parameterType="String">
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
<foreach item="orderId" collection="array" open="(" separator="," close=")"> <foreach item="orderId" collection="array" open="(" separator="," close=")">
#{orderId} #{orderId}
</foreach> </foreach>

12
ruoyi-sip/src/main/resources/mapper/system/ProductInfoMapper.xml
View File

@ -22,11 +22,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectProductInfoList" parameterType="ProductInfo" resultMap="ProductInfoResult"> <select id="selectProductInfoList" parameterType="ProductInfo" resultMap="ProductInfoResult">
<include refid="selectProductInfoVo"/> <include refid="selectProductInfoVo"/>
<where> <where>
and status = 0
<if test="productCode != null and productCode != ''"> and product_code = #{productCode}</if> <if test="productCode != null and productCode != ''"> and product_code = #{productCode}</if>
<if test="productName != null and productName != ''"> and product_name like concat('%', #{productName}, '%')</if> <if test="productName != null and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
<if test="model != null and model != ''"> and model = #{model}</if> <if test="model != null and model != ''"> and model = #{model}</if>
<if test="description != null and description != ''"> and description = #{description}</if>
</where> </where>
</select> </select>
@ -52,7 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="model != null and model != ''">model,</if> <if test="model != null and model != ''">model,</if>
<if test="description != null">description,</if> <if test="description != null">description,</if>
<if test="remark != null">remark,</if> <if test="remark != null">remark,</if>
created_at, created_at,status
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="productCode != null and productCode != ''">#{productCode},</if> <if test="productCode != null and productCode != ''">#{productCode},</if>
@ -60,7 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="model != null and model != ''">#{model},</if> <if test="model != null and model != ''">#{model},</if>
<if test="description != null">#{description},</if> <if test="description != null">#{description},</if>
<if test="remark != null">#{remark},</if> <if test="remark != null">#{remark},</if>
NOW(), NOW(),0
</trim> </trim>
</insert> </insert>
@ -80,11 +80,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</update> </update>
<delete id="deleteProductInfoById" parameterType="Long"> <delete id="deleteProductInfoById" parameterType="Long">
delete from product_info where id = #{id} update product_info set status=1, deleted_at=now() where id = #{id}
</delete> </delete>
<delete id="deleteProductInfoByIds" parameterType="String"> <delete id="deleteProductInfoByIds" parameterType="String">
delete from product_info where id in update product_info set status=1, deleted_at=now() where id in
<foreach item="id" collection="array" open="(" separator="," close=")"> <foreach item="id" collection="array" open="(" separator="," close=")">
#{id} #{id}
</foreach> </foreach>