diff --git a/ruoyi-admin/src/main/resources/templates/manage/delivery/add.html b/ruoyi-admin/src/main/resources/templates/manage/delivery/add.html index 35918807..7d752056 100644 --- a/ruoyi-admin/src/main/resources/templates/manage/delivery/add.html +++ b/ruoyi-admin/src/main/resources/templates/manage/delivery/add.html @@ -163,10 +163,12 @@ title: "关联合同", url: prefix + '/selectOrder', skin: 'layui-layer-gray', - btn: false, + btn: ['关闭'], + yes:function(index){ + $.modal.close(index) + }, maxmin: false, full: false, - index:1000 }; $.modal.openOptions(options) } 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 ed4b1579..0f993131 100644 --- a/ruoyi-admin/src/main/resources/templates/manage/delivery/edit.html +++ b/ruoyi-admin/src/main/resources/templates/manage/delivery/edit.html @@ -166,10 +166,12 @@ title: "关联合同", url: prefix + '/selectOrder', skin: 'layui-layer-gray', - btn: false, + btn: ['关闭'], + yes:function(index){ + $.modal.close(index) + }, maxmin: false, full: false, - index:1000 }; $.modal.openOptions(options) } diff --git a/ruoyi-admin/src/main/resources/templates/manage/delivery/selectOrder.html b/ruoyi-admin/src/main/resources/templates/manage/delivery/selectOrder.html index 2d0fa3b8..98ac4fa5 100644 --- a/ruoyi-admin/src/main/resources/templates/manage/delivery/selectOrder.html +++ b/ruoyi-admin/src/main/resources/templates/manage/delivery/selectOrder.html @@ -5,7 +5,38 @@
+
+
+
+
    +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
@@ -19,6 +50,8 @@ showSearch:false, showColumns:false, showToggle:false, + showRefresh:false, + showPageGo:true, params:{ diff --git a/ruoyi-admin/src/main/resources/templates/manage/service/service.html b/ruoyi-admin/src/main/resources/templates/manage/service/service.html index e767bf82..ab910256 100644 --- a/ruoyi-admin/src/main/resources/templates/manage/service/service.html +++ b/ruoyi-admin/src/main/resources/templates/manage/service/service.html @@ -12,7 +12,7 @@ .container { /*width: 100%;*/ margin: 0; - padding: 20px 0; + padding: 10px 0; background-color: white; border-radius: 8px; display: flex; @@ -62,7 +62,7 @@ display: flex; flex-direction: row; gap: 20px; - margin: 20px 0; + margin: 30px 0 10px; align-items: center; } .topBox .title{ @@ -77,10 +77,10 @@ background: #ccc; } .table-striped thead th{ - padding: 8px; + padding: 10px; } .table-striped tbody td{ - padding: 8px; + padding: 10px; } .tabBtn{ display: inline-block; @@ -92,24 +92,23 @@
-
单条查询
-
H3C产品保修条款
+
单条查询 (不支持第三方信息查询)
+
-

(不支持第三方信息查询)

-
- - -
+ + + +
-

查询结果

-

产品信息

+
查询结果
+
产品信息
@@ -126,7 +125,7 @@
合同 - + 标准保修
@@ -149,11 +148,11 @@
- - - - - + + + + + @@ -170,9 +169,7 @@ }); function getData() { let serialNumber=$('#serialNumber').val() - let productCode=$('#productCode').val() - - $.operate.get(`/system/product/query?productCode=${productCode}&serialNumber=${serialNumber}`, function (res){ + $.operate.get(`/system/product/product=${serialNumber}`, function (res){ let str=`` if(res.data.length){ str=`` @@ -188,14 +185,14 @@ let serialNumber=$('#serialNumber').val() } $('#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=`` if(res.data.length){ str=`` res.data.forEach((ele)=>{ str+=` - + @@ -203,7 +200,7 @@ let serialNumber=$('#serialNumber').val() - +` })