diff --git a/api/init.json b/api/init.json index b735a35..1675b49 100644 --- a/api/init.json +++ b/api/init.json @@ -140,13 +140,13 @@ }, { "title": "付款单申请", - "href": "page/car_application_audit/payment_list.html", + "href": "page/car_application_audit/payment_tab.html", "icon": "fa fa-asterisk", "target": "_self" }, { "title": "付款单审核", - "href": "page/car_application_audit/car_audit_list.html", + "href": "page/car_application_audit/car_audit_list.html?typeData=2", "icon": "fa fa-asterisk", "target": "_self" } @@ -155,4 +155,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/css/public.css b/css/public.css index 0ace754..6bb78a3 100644 --- a/css/public.css +++ b/css/public.css @@ -1,6 +1,6 @@ html { width: 100%; - height: 100%; + height: 99%; } body { diff --git a/js/car_application_audit/car_audit_list.js b/js/car_application_audit/car_audit_list.js index 6ced0de..292f660 100644 --- a/js/car_application_audit/car_audit_list.js +++ b/js/car_application_audit/car_audit_list.js @@ -1,6 +1,13 @@ let form, table, element; let tableIns; let pageNum = 1; // 定义分页 + +let typeData = getQuery("typeData"); // type 1是记录 2 是审核 +function getQuery(name) { + let params = new URLSearchParams(window.location.search); + return params.get(name); +} + layui.use(["form", "table", 'element'], function () { form = layui.form; table = layui.table; @@ -203,7 +210,9 @@ function initTable() { } // html += "
|
详情"; if ( status == 1 ) { - html += "
|
审核"; + if(typeData ==2 ) { + html += "
|
审核"; + } } return html; }, diff --git a/js/car_application_audit/payment_tab.js b/js/car_application_audit/payment_tab.js new file mode 100644 index 0000000..9fdb71f --- /dev/null +++ b/js/car_application_audit/payment_tab.js @@ -0,0 +1,9 @@ +let form, table, element; +layui.use(["form", "table", "element"], function () { + let element = layui.element; + element.on('tab(demo-filter-tab)', function () { + let status = $(this).attr("value"); + let url = status == "1" ? "./payment_list.html" : "./car_audit_list.html?typeData='1'"; + $("#tabFrame").attr("src", url); + }); +}); diff --git a/js/car_settlement/payment_list.js b/js/car_settlement/payment_list.js index b645dbf..69af91c 100644 --- a/js/car_settlement/payment_list.js +++ b/js/car_settlement/payment_list.js @@ -180,7 +180,7 @@ function initTable() { html += "详情"; // html += "
|
付款"; if(d.money !== d.payMoney){ - html += "
|
付款"; + html += "
|
付款申请"; } return html; }, diff --git a/page/car_application_audit/payment_list.html b/page/car_application_audit/payment_list.html index 79585ee..74e7c96 100644 --- a/page/car_application_audit/payment_list.html +++ b/page/car_application_audit/payment_list.html @@ -11,10 +11,9 @@ - +
-
搜索信息
@@ -50,4 +49,4 @@ - \ No newline at end of file + diff --git a/page/car_application_audit/payment_tab.html b/page/car_application_audit/payment_tab.html new file mode 100644 index 0000000..933b701 --- /dev/null +++ b/page/car_application_audit/payment_tab.html @@ -0,0 +1,54 @@ + + + + + 付款单 申请|记录 + + + + + + + + + +
+
+
+
    +
  • 申请列表
    • +
  • 申请记录
    • +
+
+
+ +
+
+
+ + + + + + +