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

Compare commits

base: mula:bfc73591aee4f41371c35fd522c7c7124d57feb2
Branches Tags
mula:master
...
compare: mula:339d5b32ef11171fe02f6ba47c695189b3e6558e
Branches Tags
mula:master

2 Commits
bfc73591ae ... 339d5b32ef

Author SHA1 Message Date
mula.liu 339d5b32ef 修改了服务查询界面 2025-04-24 17:29:04 +08:00
mula.liu 667e095173 修改了售后页面 2025-04-24 16:51:34 +08:00
11 changed files with 58 additions and 78 deletions
Show Stats Expand all files Collapse all files

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

@ -165,7 +165,10 @@
title: "关联合同", title: "关联合同",
url: prefix + '/selectOrder', url: prefix + '/selectOrder',
skin: 'layui-layer-gray', skin: 'layui-layer-gray',
btn: false, btn: ['关闭'],
yes:function(index){
$.modal.close(index)
},
maxmin: false, maxmin: false,
full: false, full: false,
index:1000 index:1000

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

@ -90,17 +90,13 @@
visible: false visible: false
}, },
{ {
field: 'orderId', field: 'orderCode',
title: '关联合同id' title: '关联合同编号'
},
{
field: 'orderName',
title: '关联合同名称'
}, },
{
field: 'orderCode',
title: '关联合同编号'
},
{
field: 'orderName',
title: '关联合同名称'
},
{ {
field: 'deliveryCode', field: 'deliveryCode',
title: '发货单号' title: '发货单号'

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

@ -168,7 +168,6 @@
title: "关联合同", title: "关联合同",
url: prefix + '/selectOrder', url: prefix + '/selectOrder',
skin: 'layui-layer-gray', skin: 'layui-layer-gray',
btn: true,
btn: ['关闭'], btn: ['关闭'],
yes:function(index){ yes:function(index){
$.modal.close(index) $.modal.close(index)

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

@ -17,17 +17,6 @@
<label>合同名称：</label> <label>合同名称：</label>
<input type="text" name="orderName"/> <input type="text" name="orderName"/>
</li> </li>
<li>
<label>客户名称：</label>
<input type="text" name="customerName"/>
</li>
<li>
<label>合同类型：</label>
<select name="orderType" th:with="type=${@dict.getType('order_type')}">
<option value="">所有</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</li>
<li> <li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a> <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a> <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
@ -39,9 +28,6 @@
</div> </div>
<table id="bootstrap-table"></table> <table id="bootstrap-table"></table>
</div> </div>
<div class="col-sm-12 select-table table-striped" >
<table id="bootstrap-table"></table>
</div>
<th:block th:include="include :: footer" /> <th:block th:include="include :: footer" />

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

@ -211,8 +211,6 @@
align: 'center', align: 'center',
title: "序号", title: "序号",
formatter: function (value, row, index) { formatter: function (value, row, index) {
// var columnIndex = $.common.sprintf("<input type='hidden' name='index' value='%s'>", $.table.serialNumber(index));
var html = $.common.sprintf("<input type='hidden' name='orderListList[%s].id' value='%s'>", index, value);
return $.table.serialNumber(index); return $.table.serialNumber(index);
} }
}, },

84
ruoyi-admin/src/main/resources/templates/manage/service/service.html
View File

@ -95,18 +95,14 @@
<body class="gray-bg"> <body class="gray-bg">
<div class="col-sm-12 select-table table-striped" > <div class="col-sm-12 select-table table-striped" >
<div class="topBox"> <div class="topBox">
<div class="title">单条查询 <span>(不支持第三方信息查询)</span></div> <div class="title">产品维保查询 <span>(不支持第三方信息查询)</span></div>
<!-- <div style="color: #dd242a">H3C产品保修条款</div>--> <!-- <div style="color: #dd242a">H3C产品保修条款</div>-->
</div> </div>
<div class="container"> <div class="container">
<div class="form-group"> <div class="form-group">
<label for="serialNumber">序列号</label> <label for="serialNumber">序列号</label>
<input type="text" id="serialNumber" placeholder="请输入序列号"> <input type="text" id="serialNumber" placeholder="请输入产品序列号">
</div> </div>
<!-- <div class="form-group">-->
<!-- <label for="productCode">产品号</label>-->
<!-- <input type="text" id="productCode" placeholder="请输入产品号">-->
<!-- </div>-->
<button type="button" onclick="getData()">查询</button> <button type="button" onclick="getData()">查询</button>
</div> </div>
@ -115,10 +111,10 @@
<table class="tableBOx" id="tableBOx"> <table class="tableBOx" id="tableBOx">
<thead> <thead>
<tr> <tr>
<th>硬件序列号</th> <th>序列号</th>
<th>产品号</th> <th>产品编码</th>
<th>产品描述</th> <th>产品描述</th>
<th>产品线描述</th> <th>产品名称</th>
<th>区域</th> <th>区域</th>
</tr> </tr>
</thead> </thead>
@ -127,13 +123,13 @@
</table> </table>
<div > <div >
<div style="margin: 20px 0;"> <div style="margin: 20px 0;">
<span id="btn1" class="tabBtn" onclick="changeTab(0)" style="background: #dd242a;color: #fff">合同</span> <span id="tab1" class="tabBtn" onclick="changeTab(0)" style="background: #dd242a;color: #fff">相关合同</span>
<span id="btn2" class="tabBtn" onclick="changeTab(1)">标准保修</span> <span id="tab2" class="tabBtn" onclick="changeTab(1)">标准保修</span>
</div> </div>
<table class="tableBOx" id="tableBOx2"> <table class="tableBOx" id="tableBOx2">
<thead> <thead>
<tr> <tr>
<th>服务项目识别号</th> <th>合同识别号</th>
<th>合同类型</th> <th>合同类型</th>
<th>服务级别</th> <th>服务级别</th>
<th>服务级别描述</th> <th>服务级别描述</th>
@ -142,7 +138,6 @@
<th>开始时间</th> <th>开始时间</th>
<th>结束时间</th> <th>结束时间</th>
<th>状态</th> <th>状态</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@ -168,8 +163,13 @@
<script> <script>
$(function() { $(function() {
<<<<<<< HEAD
//getData()
=======
// getData() // getData()
>>>>>>> bfc73591aee4f41371c35fd522c7c7124d57feb2
}); });
function getData() { function getData() {
let serialNumber=$('#serialNumber').val() let serialNumber=$('#serialNumber').val()
$.operate.get(`/manage/service/product?serialNumber=${serialNumber}`, function (res){ $.operate.get(`/manage/service/product?serialNumber=${serialNumber}`, function (res){
@ -178,12 +178,12 @@ let serialNumber=$('#serialNumber').val()
str=`` str=``
res.data.forEach((ele)=>{ res.data.forEach((ele)=>{
str+=`<tr> str+=`<tr>
<td>${ele.serialNumber}</td> <td>${ele.serialNumber}</td>
<td>${ele.model}</td> <td>${ele.model}</td>
<td>${ele.description}</td> <td>${ele.description}</td>
<td>${ele.productName}</td> <td>${ele.productName}</td>
<td>${ele.model}</td> <td>CN</td>
</tr>` </tr>`
}) })
} }
$('#tableBOx tbody').html(str) $('#tableBOx tbody').html(str)
@ -194,18 +194,16 @@ let serialNumber=$('#serialNumber').val()
str=`` str=``
res.data.forEach((ele)=>{ res.data.forEach((ele)=>{
str+=`<tr> str+=`<tr>
<td></td> <td>${ele.orderCode}</td>
<td>${ele.orderType == 'zq' ? '直签合同' : '代理合同'}</td> <td>${ele.orderType == 'zq' ? '直签合同' : '代理合同'}</td>
<td></td> <td></td>
<td></td> <td></td>
<td></td> <td></td>
<td></td> <td></td>
<td>${ele.createdAt}</td> <td>${ele.createdAt}</td>
<td></td> <td></td>
<td>${ele.status == 0 ? '有效' : '无效'}</td>
<td>${ele.statua == 0 ? '有效' : '无效'}</td> </tr>`
</tr>`
}) })
} }
$('#tableBOx2 tbody').html(str) $('#tableBOx2 tbody').html(str)
@ -216,15 +214,12 @@ let serialNumber=$('#serialNumber').val()
str=`` str=``
res.data.forEach((ele)=>{ res.data.forEach((ele)=>{
str+=`<tr> str+=`<tr>
<td></td> <td></td>
<td></td> <td></td>
<td>${ele.startDate}</td> <td>${ele.startDate}</td>
<td></td> <td>${ele.endDate}</td>
<td></td> <td>${ele.status == 0 ? '有效' : '无效'}</td>
</tr>`
<td>${ele.statua == 0 ? '有效' : '无效'}</td>
</tr>`
}) })
} }
$('#tableBOx3 tbody').html(str) $('#tableBOx3 tbody').html(str)
@ -232,17 +227,16 @@ let serialNumber=$('#serialNumber').val()
} }
function changeTab(show) { function changeTab(show) {
if(!show){ if(!show){
$('#btn1').css({'background': '#dd242a','color':'#fff'}) $('#tab1').css({'background': '#dd242a','color':'#fff'})
$('#btn2').css({'background': '#fff','color':'#333'}) $('#tab2').css({'background': '#fff','color':'#333'})
$('#tableBOx2').show() $('#tableBOx2').show()
$('#tableBOx3').hide() $('#tableBOx3').hide()
}else{ }else{
$('#tableBOx3').show() $('#tableBOx3').show()
$('#tableBOx2').hide() $('#tableBOx2').hide()
$('#btn2').css({'background': '#dd242a','color':'#fff'}) $('#tab2').css({'background': '#dd242a','color':'#fff'})
$('#btn1').css({'background': '#fff','color':'#333'}) $('#tab1').css({'background': '#fff','color':'#333'})
} }
} }

2
ruoyi-sip/src/main/java/com/ruoyi/sip/controller/MaintenanceController.java
View File

@ -56,6 +56,7 @@ public class MaintenanceController {
{ {
return AjaxResult.success(service.query(dto)); return AjaxResult.success(service.query(dto));
} }
@GetMapping("/product") @GetMapping("/product")
@ResponseBody @ResponseBody
@Anonymous @Anonymous
@ -63,6 +64,7 @@ public class MaintenanceController {
{ {
return AjaxResult.success(productInfoService.query(dto)); return AjaxResult.success(productInfoService.query(dto));
} }
@GetMapping("/order") @GetMapping("/order")
@ResponseBody @ResponseBody
@Anonymous @Anonymous

3
ruoyi-sip/src/main/java/com/ruoyi/sip/domain/MaintenanceRecord.java
View File

@ -22,6 +22,7 @@ import java.util.Date;
public class MaintenanceRecord { public class MaintenanceRecord {
//开始时间 //开始时间
private Date startDate; private Date startDate;
private Date endDate;
private Long status;
} }

2
ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/OrderInfoMapper.java
View File

@ -89,7 +89,7 @@ public interface OrderInfoMapper
/** /**
* 删除合同清单 * 删除合同清单
* @param id * @param orderListList
* @return * @return
*/ */
int logicRemoveListById(List<OrderList> orderListList); int logicRemoveListById(List<OrderList> orderListList);

2
ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/DeliveryListServiceImpl.java
View File

@ -120,7 +120,7 @@ public class DeliveryListServiceImpl implements IDeliveryListService {
List<String> existsProductCodeList = orderLists.stream().map(OrderList::getProductCode).collect(Collectors.toList()); List<String> existsProductCodeList = orderLists.stream().map(OrderList::getProductCode).collect(Collectors.toList());
List<String> notExistsProductCodeList = productCodeList.stream().filter(productCode -> !existsProductCodeList.contains(productCode)).collect(Collectors.toList()); List<String> notExistsProductCodeList = productCodeList.stream().filter(productCode -> !existsProductCodeList.contains(productCode)).collect(Collectors.toList());
if (!notExistsProductCodeList.isEmpty()) { if (!notExistsProductCodeList.isEmpty()) {
return AjaxResult.error(StringUtils.format("产品编码为[{}]的产品在发货单中未找到,请确认后重试;", String.join(",", notExistsProductCodeList))); return AjaxResult.error(StringUtils.format("编码为[{}]的产品在合同请单中未找到,请确认后重试;", String.join(",", notExistsProductCodeList)));
} }
for (DeliveryList list : deliveryList) { for (DeliveryList list : deliveryList) {

5
ruoyi-sip/src/main/resources/mapper/manage/MaintenanceMapper.xml
View File

@ -7,10 +7,11 @@
<resultMap type="MaintenanceRecord" id="MaintenanceRecordResult"> <resultMap type="MaintenanceRecord" id="MaintenanceRecordResult">
<result property="startDate" column="start_date"/> <result property="startDate" column="start_date"/>
<result property="endDate" column="end_date"/>
<result property="status" column="status"/>
</resultMap> </resultMap>
<select id="query" resultMap="MaintenanceRecordResult"> <select id="query" resultMap="MaintenanceRecordResult">
select delivery_date as start_date from order_delivery select delivery_date as start_date, DATE_ADD(delivery_date, INTERVAL 3 YEAR) end_date, status from order_delivery
where id in (select delivery_id from delivery_list where serial_number=#{serialNumber}) where id in (select delivery_id from delivery_list where serial_number=#{serialNumber})
</select> </select>