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

合并代码

master
rdpnr_hemingxia 2025-04-24 10:01:48 +08:00
parent fe9c167c06
commit b5cb394b44
4 changed files with 63 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -163,10 +163,12 @@
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
}; };
$.modal.openOptions(options) $.modal.openOptions(options)
} }

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

@ -166,10 +166,12 @@
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
}; };
$.modal.openOptions(options) $.modal.openOptions(options)
} }

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

@ -5,7 +5,38 @@
</head> </head>
<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>
<form id="formId">
<div class="select-list">
<ul>
<li>
<label>合同编号：</label>
<input type="text" name="orderCode"/>
</li>
<li>
<label>合同名称：</label>
<input type="text" name="orderName"/>
</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>
<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>
</li>
</ul>
</div>
</form>
</div>
<table id="bootstrap-table"></table> <table id="bootstrap-table"></table>
</div> </div>
<th:block th:include="include :: footer" /> <th:block th:include="include :: footer" />
@ -19,6 +50,8 @@
showSearch:false, showSearch:false,
showColumns:false, showColumns:false,
showToggle:false, showToggle:false,
showRefresh:false,
showPageGo:true, showPageGo:true,
params:{ params:{

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

@ -12,7 +12,7 @@
.container { .container {
/*width: 100%;*/ /*width: 100%;*/
margin: 0; margin: 0;
padding: 20px 0; padding: 10px 0;
background-color: white; background-color: white;
border-radius: 8px; border-radius: 8px;
display: flex; display: flex;
@ -62,7 +62,7 @@
display: flex; display: flex;
flex-direction: row; flex-direction: row;
gap: 20px; gap: 20px;
margin: 20px 0; margin: 30px 0 10px;
align-items: center; align-items: center;
} }
.topBox .title{ .topBox .title{
@ -77,10 +77,10 @@
background: #ccc; background: #ccc;
} }
.table-striped thead th{ .table-striped thead th{
padding: 8px; padding: 10px;
} }
.table-striped tbody td{ .table-striped tbody td{
padding: 8px; padding: 10px;
} }
.tabBtn{ .tabBtn{
display: inline-block; display: inline-block;
@ -92,24 +92,23 @@
<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">单条查询</div> <div class="title">单条查询 <span>(不支持第三方信息查询)</span></div>
<div style="color: #dd242a">H3C产品保修条款</div> <!-- <div style="color: #dd242a">H3C产品保修条款</div>-->
</div> </div>
<p>(不支持第三方信息查询)</p>
<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"> <!-- <div class="form-group">-->
<label for="productCode">产品号</label> <!-- <label for="productCode">产品号</label>-->
<input type="text" id="productCode" placeholder="请输入产品号"> <!-- <input type="text" id="productCode" placeholder="请输入产品号">-->
</div> <!-- </div>-->
<button type="button" onclick="getData()">查询</button> <button type="button" onclick="getData()">查询</button>
</div> </div>
<h2>查询结果</h2> <div style="font-size: 20px;text-align: left;width: 70vw;margin: 10px 0">查询结果</div>
<h4 style="margin-top: 20px;">产品信息</h4> <div style="font-size: 16px;text-align: left;width: 70vw;font-weight: 600;">产品信息</div>
<table class="tableBOx" id="tableBOx"> <table class="tableBOx" id="tableBOx">
<thead> <thead>
<tr> <tr>
@ -126,7 +125,7 @@
<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="btn1" class="tabBtn" onclick="changeTab(0)" style="background: #dd242a;color: #fff">合同</span>
<!-- <span id="btn2" class="tabBtn" onclick="changeTab(1)">标准保修</span>--> <span id="btn2" class="tabBtn" onclick="changeTab(1)">标准保修</span>
</div> </div>
<table class="tableBOx" id="tableBOx2"> <table class="tableBOx" id="tableBOx2">
<thead> <thead>
@ -149,11 +148,11 @@
<table class="tableBOx" id="tableBOx3" style="display: none"> <table class="tableBOx" id="tableBOx3" style="display: none">
<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>
<tbody> <tbody>
@ -170,9 +169,7 @@
}); });
function getData() { function getData() {
let serialNumber=$('#serialNumber').val() let serialNumber=$('#serialNumber').val()
let productCode=$('#productCode').val() $.operate.get(`/system/product/product=${serialNumber}`, function (res){
$.operate.get(`/system/product/query?productCode=${productCode}&serialNumber=${serialNumber}`, function (res){
let str=`<tr><td colspan="5" style="text-align: center">暂无数据</td></tr>` let str=`<tr><td colspan="5" style="text-align: center">暂无数据</td></tr>`
if(res.data.length){ if(res.data.length){
str=`` str=``
@ -188,14 +185,14 @@ let serialNumber=$('#serialNumber').val()
} }
$('#tableBOx tbody').html(str) $('#tableBOx tbody').html(str)
}) })
$.operate.get(`/manage/order/query?productCode=${productCode}&serialNumber=${serialNumber}`, function (res){ $.operate.get(`/manage/service/order=${serialNumber}`, function (res){
let str=`<tr><td colspan="9" style="text-align: center">暂无数据</td></tr>` let str=`<tr><td colspan="9" style="text-align: center">暂无数据</td></tr>`
if(res.data.length){ if(res.data.length){
str=`` str=``
res.data.forEach((ele)=>{ res.data.forEach((ele)=>{
str+=`<tr> str+=`<tr>
<td></td> <td></td>
<td>${ele.orderType=='zq'?'直签合同':'代理合同'}</td> <td>${ele.orderType == 'zq' ? '直签合同' : '代理合同'}</td>
<td></td> <td></td>
<td></td> <td></td>
<td></td> <td></td>
@ -203,7 +200,7 @@ let serialNumber=$('#serialNumber').val()
<td>${ele.createdAt}</td> <td>${ele.createdAt}</td>
<td></td> <td></td>
<td>${ele.statua==0?'有效':'无效'}</td> <td>${ele.statua == 0 ? '有效' : '无效'}</td>
</tr>` </tr>`
}) })